l10n: fr.po v2.33 rnd 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Jean-Noël Avila committed
Aug 14, 2021 at 08:28 UTC
0934645bf83c358675460e015a32ca44862413a0
1 file changed
+543
-507
po/fr.po
+543
-507
@@ -76,8 +76,8 @@ msgid ""
76
msgstr ""
77
"Project-Id-Version: git\n"
78
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
79
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
80
-"PO-Revision-Date: 2021-08-12 21:06+0200\n"
79
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
80
+"PO-Revision-Date: 2021-08-14 08:28+0200\n"
81
"Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
82
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
83
"Language: fr\n"
@@ -92,7 +92,7 @@ msgstr ""
92
msgid "Huh (%s)?"
93
msgstr "Hein (%s) ?"
94
95
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
95
+#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
96
#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
97
#: builtin/rebase.c:1953
98
msgid "could not read index"
@@ -122,7 +122,7 @@ msgstr "Mise à jour"
122
msgid "could not stage '%s'"
123
msgstr "impossible d'indexer '%s'"
124
125
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
125
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
126
msgid "could not write index"
127
msgstr "impossible d'écrire l'index"
128
@@ -284,9 +284,10 @@ msgstr "non-indexé"
284
#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
285
#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
286
#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
287
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
288
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
289
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
287
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
288
+#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
289
+#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
290
+#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
291
#: git-add--interactive.perl:213
292
msgid "path"
293
msgstr "chemin"
@@ -868,7 +869,7 @@ msgstr ""
869
msgid "Exiting because of an unresolved conflict."
870
msgstr "Abandon à cause de conflit non résolu."
871
871
-#: advice.c:283 builtin/merge.c:1374
872
+#: advice.c:283 builtin/merge.c:1375
873
msgid "You have not concluded your merge (MERGE_HEAD exists)."
874
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
875
@@ -1662,7 +1663,7 @@ msgstr "impossible de lire %s"
1663
1664
#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
1665
#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
1665
-#: builtin/merge.c:1143
1666
+#: builtin/merge.c:1144
1667
#, c-format
1668
msgid "could not read '%s'"
1669
msgstr "impossible de lire '%s'"
@@ -1751,7 +1752,8 @@ msgid "list supported archive formats"
1752
msgstr "afficher les formats d'archive supportés"
1753
1754
#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
1754
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1755
+#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
1756
+#: builtin/submodule--helper.c:2902
1757
msgid "repo"
1758
msgstr "dépôt"
1759
@@ -1947,7 +1949,7 @@ msgstr ""
1949
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
1950
"dernier commit"
1951
1950
-#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
1952
+#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
1953
#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
1954
#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
1955
#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
@@ -3241,7 +3243,7 @@ msgstr "type de filtre inattendu"
3243
msgid "path name too long for external filter"
3244
msgstr "nom de chemin trop long pour un filtre externe"
3245
3244
-#: convert.c:934
3246
+#: convert.c:935
3247
#, c-format
3248
msgid ""
3249
"external filter '%s' is not available anymore although not all paths have "
@@ -3250,16 +3252,16 @@ msgstr ""
3252
"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
3253
"n'aient pas été filtrés"
3254
3253
-#: convert.c:1234
3255
+#: convert.c:1236
3256
msgid "true/false are no valid working-tree-encodings"
3257
msgstr "true/false ne sont pas des encodages d'arbre de travail valides"
3258
3257
-#: convert.c:1414 convert.c:1447
3259
+#: convert.c:1416 convert.c:1449
3260
#, c-format
3261
msgid "%s: clean filter '%s' failed"
3262
msgstr "%s : le filtre clean '%s' a échoué"
3263
3262
-#: convert.c:1490
3264
+#: convert.c:1492
3265
#, c-format
3266
msgid "%s: smudge filter %s failed"
3267
msgstr "%s : le filtre smudge '%s' a échoué"
@@ -3441,7 +3443,9 @@ msgstr " Paramètre dirstat inconnu '%s'\n"
3443
msgid ""
3444
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3445
"'dimmed-zebra', 'plain'"
3444
-msgstr "le paramètre de couleur de déplacement doit être parmi 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
3446
+msgstr ""
3447
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
3448
+"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
3449
3450
#: diff.c:325
3451
#, c-format
@@ -3492,13 +3496,17 @@ msgstr "-G, -S et --find-object sont mutuellement exclusifs"
3496
#: diff.c:4640
3497
msgid ""
3498
"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
3495
-msgstr "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex avec -S"
3499
+msgstr ""
3500
+"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
3501
+"avec -S"
3502
3503
#: diff.c:4643
3504
msgid ""
3499
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3505
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
3506
"with -G and -S"
3501
-msgstr "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --pickaxe-all avec -G et -S"
3507
+msgstr ""
3508
+"--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --"
3509
+"pickaxe-all avec -G et -S"
3510
3511
#: diff.c:4722
3512
msgid "--follow requires exactly one pathspec"
@@ -4061,7 +4069,9 @@ msgstr "Sortie vers un fichier spécifié"
4069
4070
#: diff.c:6298
4071
msgid "exhaustive rename detection was skipped due to too many files."
4064
-msgstr "détection exhaustive de renommage annulée à cause d'un trop grand nombre de fichiers."
4072
+msgstr ""
4073
+"détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
4074
+"fichiers."
4075
4076
#: diff.c:6301
4077
msgid "only found copies from modified paths due to too many files."
@@ -4082,7 +4092,7 @@ msgstr ""
4092
msgid "failed to read orderfile '%s'"
4093
msgstr "impossible de lire le fichier de commande '%s'"
4094
4085
-#: diffcore-rename.c:1510
4095
+#: diffcore-rename.c:1514
4096
msgid "Performing inexact rename detection"
4097
msgstr "Détection de renommage inexact en cours"
4098
@@ -4102,51 +4112,51 @@ msgstr ""
4112
msgid "unrecognized pattern: '%s'"
4113
msgstr "motif non reconnu : '%s'"
4114
4105
-#: dir.c:792 dir.c:806
4115
+#: dir.c:790 dir.c:804
4116
#, c-format
4117
msgid "unrecognized negative pattern: '%s'"
4118
msgstr "motif négatif non reconnu : '%s'"
4119
4110
-#: dir.c:824
4120
+#: dir.c:820
4121
#, c-format
4122
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
4123
msgstr ""
4124
"votre fichier d'extraction partielle pourrait présenter des problèmes : le "
4125
"motif '%s' est répété"
4126
4117
-#: dir.c:834
4127
+#: dir.c:830
4128
msgid "disabling cone pattern matching"
4129
msgstr "désactivation de la correspondance de motif de cone"
4130
4121
-#: dir.c:1221
4131
+#: dir.c:1214
4132
#, c-format
4133
msgid "cannot use %s as an exclude file"
4134
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
4135
4126
-#: dir.c:2358
4136
+#: dir.c:2351
4137
#, c-format
4138
msgid "could not open directory '%s'"
4139
msgstr "impossible d'ouvrir le répertoire '%s'"
4140
4131
-#: dir.c:2660
4141
+#: dir.c:2653
4142
msgid "failed to get kernel name and information"
4143
msgstr "echec de l'obtention d'information de kernel"
4144
4135
-#: dir.c:2784
4145
+#: dir.c:2777
4146
msgid "untracked cache is disabled on this system or location"
4147
msgstr "le cache non suivi est désactivé sur ce système ou sur cet endroit"
4148
4139
-#: dir.c:3617
4149
+#: dir.c:3610
4150
#, c-format
4151
msgid "index file corrupt in repo %s"
4152
msgstr "fichier d'index corrompu dans le dépôt %s"
4153
4144
-#: dir.c:3664 dir.c:3669
4154
+#: dir.c:3657 dir.c:3662
4155
#, c-format
4156
msgid "could not create directories for %s"
4157
msgstr "impossible de créer les répertoires pour %s"
4158
4149
-#: dir.c:3698
4159
+#: dir.c:3691
4160
#, c-format
4161
msgid "could not migrate git directory from '%s' to '%s'"
4162
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
@@ -4172,7 +4182,7 @@ msgstr "impossible de stat le fichier '%s'"
4182
msgid "bad git namespace path \"%s\""
4183
msgstr "espaces de nom de Git \"%s\""
4184
4175
-#: environment.c:335
4185
+#: environment.c:334
4186
#, c-format
4187
msgid "could not set GIT_DIR to '%s'"
4188
msgstr "impossible de régler GIT_DIR à '%s'"
@@ -4815,34 +4825,34 @@ msgstr "CRLF citées détectées"
4825
msgid "bad action '%s' for '%s'"
4826
msgstr "action invalide '%s' pour '%s'"
4827
4818
-#: merge-ort.c:1228 merge-recursive.c:1206
4828
+#: merge-ort.c:1569 merge-recursive.c:1201
4829
#, c-format
4830
msgid "Failed to merge submodule %s (not checked out)"
4831
msgstr "Échec de la fusion du sous-module %s (non extrait)"
4832
4823
-#: merge-ort.c:1237 merge-recursive.c:1213
4833
+#: merge-ort.c:1578 merge-recursive.c:1208
4834
#, c-format
4835
msgid "Failed to merge submodule %s (commits not present)"
4836
msgstr "Échec de fusion du sous-module %s (commits non présents)"
4837
4828
-#: merge-ort.c:1246 merge-recursive.c:1220
4838
+#: merge-ort.c:1587 merge-recursive.c:1215
4839
#, c-format
4840
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4841
msgstr ""
4842
"Échec de la fusion du sous-module %s (les commits ne descendent pas de la "
4843
"base de fusion)"
4844
4835
-#: merge-ort.c:1256 merge-ort.c:1263
4845
+#: merge-ort.c:1597 merge-ort.c:1604
4846
#, c-format
4847
msgid "Note: Fast-forwarding submodule %s to %s"
4848
msgstr "Note : Avance rapide du sous-module %s à %s"
4849
4840
-#: merge-ort.c:1284
4850
+#: merge-ort.c:1625
4851
#, c-format
4852
msgid "Failed to merge submodule %s"
4853
msgstr "Échec de la fusion du sous-module %s"
4854
4845
-#: merge-ort.c:1291
4855
+#: merge-ort.c:1632
4856
#, c-format
4857
msgid ""
4858
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4852,7 +4862,7 @@ msgstr ""
4862
"existe :\n"
4863
"%s\n"
4864
4855
-#: merge-ort.c:1295 merge-recursive.c:1274
4865
+#: merge-ort.c:1636 merge-recursive.c:1269
4866
#, c-format
4867
msgid ""
4868
"If this is correct simply add it to the index for example\n"
@@ -4869,7 +4879,7 @@ msgstr ""
4879
"\n"
4880
"qui acceptera cette suggestion.\n"
4881
4872
-#: merge-ort.c:1308
4882
+#: merge-ort.c:1649
4883
#, c-format
4884
msgid ""
4885
"Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4879,21 +4889,21 @@ msgstr ""
4889
"existent :\n"
4890
"%s"
4891
4882
-#: merge-ort.c:1527 merge-recursive.c:1363
4892
+#: merge-ort.c:1868 merge-recursive.c:1358
4893
msgid "Failed to execute internal merge"
4894
msgstr "Échec à l'exécution de la fusion interne"
4895
4886
-#: merge-ort.c:1532 merge-recursive.c:1368
4896
+#: merge-ort.c:1873 merge-recursive.c:1363
4897
#, c-format
4898
msgid "Unable to add %s to database"
4899
msgstr "Impossible d'ajouter %s à la base de données"
4900
4891
-#: merge-ort.c:1539 merge-recursive.c:1401
4901
+#: merge-ort.c:1880 merge-recursive.c:1396
4902
#, c-format
4903
msgid "Auto-merging %s"
4904
msgstr "Fusion automatique de %s"
4905
4896
-#: merge-ort.c:1678 merge-recursive.c:2123
4906
+#: merge-ort.c:2019 merge-recursive.c:2118
4907
#, c-format
4908
msgid ""
4909
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4902,7 +4912,7 @@ msgstr ""
4912
"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
4913
"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
4914
4905
-#: merge-ort.c:1688 merge-recursive.c:2133
4915
+#: merge-ort.c:2029 merge-recursive.c:2128
4916
#, c-format
4917
msgid ""
4918
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4911,7 +4921,7 @@ msgstr ""
4921
"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
4922
"plusieurs chemins sur %s ; les chemins concernés sont : %s"
4923
4914
-#: merge-ort.c:1746
4924
+#: merge-ort.c:2087
4925
#, c-format
4926
msgid ""
4927
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4922,7 +4932,7 @@ msgstr ""
4932
"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
4933
"aucune destination récupérant la majorité des fichiers."
4934
4925
-#: merge-ort.c:1900 merge-recursive.c:2469
4935
+#: merge-ort.c:2241 merge-recursive.c:2464
4936
#, c-format
4937
msgid ""
4938
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4931,7 +4941,7 @@ msgstr ""
4941
"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
4942
"renommé."
4943
4934
-#: merge-ort.c:2044 merge-recursive.c:3252
4944
+#: merge-ort.c:2385 merge-recursive.c:3247
4945
#, c-format
4946
msgid ""
4947
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4940,7 +4950,7 @@ msgstr ""
4950
"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
4951
"en %s ; déplacé dans %s."
4952
4943
-#: merge-ort.c:2051 merge-recursive.c:3259
4953
+#: merge-ort.c:2392 merge-recursive.c:3254
4954
#, c-format
4955
msgid ""
4956
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4949,7 +4959,7 @@ msgstr ""
4959
"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
4960
"renommé en %s ; déplacé dans %s."
4961
4952
-#: merge-ort.c:2064 merge-recursive.c:3255
4962
+#: merge-ort.c:2405 merge-recursive.c:3250
4963
#, c-format
4964
msgid ""
4965
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4959,7 +4969,7 @@ msgstr ""
4969
"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
4970
"vers %s."
4971
4962
-#: merge-ort.c:2072 merge-recursive.c:3262
4972
+#: merge-ort.c:2413 merge-recursive.c:3257
4973
#, c-format
4974
msgid ""
4975
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4969,13 +4979,13 @@ msgstr ""
4979
"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
4980
"être déplacé vers %s."
4981
4972
-#: merge-ort.c:2228
4982
+#: merge-ort.c:2569
4983
#, c-format
4984
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4985
msgstr ""
4986
"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
4987
4978
-#: merge-ort.c:2323
4988
+#: merge-ort.c:2664
4989
#, c-format
4990
msgid ""
4991
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4986,24 +4996,24 @@ msgstr ""
4996
"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
4997
"peut resulter en des marqueurs de conflit imbriqués."
4998
4989
-#: merge-ort.c:2342 merge-ort.c:2366
4999
+#: merge-ort.c:2683 merge-ort.c:2707
5000
#, c-format
5001
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
5002
msgstr ""
5003
"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "
5004
"supprimé dans %s."
5005
4996
-#: merge-ort.c:2819 merge-recursive.c:3013
5006
+#: merge-ort.c:3182 merge-recursive.c:3008
5007
#, c-format
5008
msgid "cannot read object %s"
5009
msgstr "impossible de lire l'objet %s"
5010
5001
-#: merge-ort.c:2822 merge-recursive.c:3016
5011
+#: merge-ort.c:3185 merge-recursive.c:3011
5012
#, c-format
5013
msgid "object %s is not a blob"
5014
msgstr "l'objet %s n'est pas un blob"
5015
5006
-#: merge-ort.c:3250
5016
+#: merge-ort.c:3613
5017
#, c-format
5018
msgid ""
5019
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
@@ -5012,7 +5022,7 @@ msgstr ""
5022
"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
5023
"déplacement dans %s à la place."
5024
5015
-#: merge-ort.c:3326
5025
+#: merge-ort.c:3689
5026
#, c-format
5027
msgid ""
5028
"CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -5021,7 +5031,7 @@ msgstr ""
5031
"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
5032
"renommé chacune de manière à pouvoir enregistrer les deux quelque part."
5033
5024
-#: merge-ort.c:3333
5034
+#: merge-ort.c:3696
5035
#, c-format
5036
msgid ""
5037
"CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -5031,24 +5041,24 @@ msgstr ""
5041
"renommé une d'entre elles de manière à pouvoir enregistrer les deux quelque "
5042
"part."
5043
5034
-#: merge-ort.c:3433 merge-recursive.c:3092
5044
+#: merge-ort.c:3796 merge-recursive.c:3087
5045
msgid "content"
5046
msgstr "contenu"
5047
5038
-#: merge-ort.c:3435 merge-recursive.c:3096
5048
+#: merge-ort.c:3798 merge-recursive.c:3091
5049
msgid "add/add"
5050
msgstr "ajout/ajout"
5051
5042
-#: merge-ort.c:3437 merge-recursive.c:3141
5052
+#: merge-ort.c:3800 merge-recursive.c:3136
5053
msgid "submodule"
5054
msgstr "sous-module"
5055
5046
-#: merge-ort.c:3439 merge-recursive.c:3142
5056
+#: merge-ort.c:3802 merge-recursive.c:3137
5057
#, c-format
5058
msgid "CONFLICT (%s): Merge conflict in %s"
5059
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
5060
5051
-#: merge-ort.c:3470
5061
+#: merge-ort.c:3833
5062
#, c-format
5063
msgid ""
5064
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5057,7 +5067,7 @@ msgstr ""
5067
"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
5068
"Version %s de %s laissée dans l'arbre."
5069
5060
-#: merge-ort.c:3757
5070
+#: merge-ort.c:4120
5071
#, c-format
5072
msgid ""
5073
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5069,12 +5079,12 @@ msgstr ""
5079
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
5080
#. base, and 2-3) the trees for the two trees we're merging.
5081
#.
5072
-#: merge-ort.c:4116
5082
+#: merge-ort.c:4487
5083
#, c-format
5084
msgid "collecting merge info failed for trees %s, %s, %s"
5085
msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
5086
5077
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
5087
+#: merge-ort-wrappers.c:13 merge-recursive.c:3702
5088
#, c-format
5089
msgid ""
5090
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5084,106 +5094,106 @@ msgstr ""
5094
"fusion :\n"
5095
" %s"
5096
5087
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
5097
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
5098
msgid "Already up to date."
5099
msgstr "Déjà à jour."
5100
5091
-#: merge-recursive.c:357
5101
+#: merge-recursive.c:352
5102
msgid "(bad commit)\n"
5103
msgstr "(mauvais commit)\n"
5104
5095
-#: merge-recursive.c:380
5105
+#: merge-recursive.c:375
5106
#, c-format
5107
msgid "add_cacheinfo failed for path '%s'; merge aborting."
5108
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
5109
5100
-#: merge-recursive.c:389
5110
+#: merge-recursive.c:384
5111
#, c-format
5112
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
5113
msgstr "échec de add_cacheinfo pour le chemin '%s' ; abandon de la fusion."
5114
5105
-#: merge-recursive.c:877
5115
+#: merge-recursive.c:872
5116
#, c-format
5117
msgid "failed to create path '%s'%s"
5118
msgstr "impossible de créer le chemin '%s' %s"
5119
5110
-#: merge-recursive.c:888
5120
+#: merge-recursive.c:883
5121
#, c-format
5122
msgid "Removing %s to make room for subdirectory\n"
5123
msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n"
5124
5115
-#: merge-recursive.c:902 merge-recursive.c:921
5125
+#: merge-recursive.c:897 merge-recursive.c:916
5126
msgid ": perhaps a D/F conflict?"
5127
msgstr ": peut-être un conflit D/F ?"
5128
5119
-#: merge-recursive.c:911
5129
+#: merge-recursive.c:906
5130
#, c-format
5131
msgid "refusing to lose untracked file at '%s'"
5132
msgstr "refus de perdre le fichier non suivi '%s'"
5133
5124
-#: merge-recursive.c:952 builtin/cat-file.c:41
5134
+#: merge-recursive.c:947 builtin/cat-file.c:41
5135
#, c-format
5136
msgid "cannot read object %s '%s'"
5137
msgstr "impossible de lire l'objet %s '%s'"
5138
5129
-#: merge-recursive.c:957
5139
+#: merge-recursive.c:952
5140
#, c-format
5141
msgid "blob expected for %s '%s'"
5142
msgstr "blob attendu pour %s '%s'"
5143
5134
-#: merge-recursive.c:982
5144
+#: merge-recursive.c:977
5145
#, c-format
5146
msgid "failed to open '%s': %s"
5147
msgstr "échec à l'ouverture de '%s' : %s"
5148
5139
-#: merge-recursive.c:993
5149
+#: merge-recursive.c:988
5150
#, c-format
5151
msgid "failed to symlink '%s': %s"
5152
msgstr "échec à la création du lien symbolique '%s' : %s"
5153
5144
-#: merge-recursive.c:998
5154
+#: merge-recursive.c:993
5155
#, c-format
5156
msgid "do not know what to do with %06o %s '%s'"
5157
msgstr "ne sait pas traiter %06o %s '%s'"
5158
5149
-#: merge-recursive.c:1228 merge-recursive.c:1240
5159
+#: merge-recursive.c:1223 merge-recursive.c:1235
5160
#, c-format
5161
msgid "Fast-forwarding submodule %s to the following commit:"
5162
msgstr "Avance rapide du sous-module %s au commit suivant :"
5163
5154
-#: merge-recursive.c:1231 merge-recursive.c:1243
5164
+#: merge-recursive.c:1226 merge-recursive.c:1238
5165
#, c-format
5166
msgid "Fast-forwarding submodule %s"
5167
msgstr "Avance rapide du sous-module %s"
5168
5159
-#: merge-recursive.c:1266
5169
+#: merge-recursive.c:1261
5170
#, c-format
5171
msgid "Failed to merge submodule %s (merge following commits not found)"
5172
msgstr ""
5173
"Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)"
5174
5165
-#: merge-recursive.c:1270
5175
+#: merge-recursive.c:1265
5176
#, c-format
5177
msgid "Failed to merge submodule %s (not fast-forward)"
5178
msgstr "Échec de fusion du sous-module %s (pas en avance rapide)"
5179
5170
-#: merge-recursive.c:1271
5180
+#: merge-recursive.c:1266
5181
msgid "Found a possible merge resolution for the submodule:\n"
5182
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
5183
5174
-#: merge-recursive.c:1283
5184
+#: merge-recursive.c:1278
5185
#, c-format
5186
msgid "Failed to merge submodule %s (multiple merges found)"
5187
msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)"
5188
5179
-#: merge-recursive.c:1425
5189
+#: merge-recursive.c:1420
5190
#, c-format
5191
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5192
msgstr ""
5193
"Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la "
5194
"place."
5195
5186
-#: merge-recursive.c:1497
5196
+#: merge-recursive.c:1492
5197
#, c-format
5198
msgid ""
5199
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5192,7 +5202,7 @@ msgstr ""
5202
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
5203
"%s laissée dans l'arbre."
5204
5195
-#: merge-recursive.c:1502
5205
+#: merge-recursive.c:1497
5206
#, c-format
5207
msgid ""
5208
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5201,7 +5211,7 @@ msgstr ""
5211
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
5212
"%s de %s laissée dans l'arbre."
5213
5204
-#: merge-recursive.c:1509
5214
+#: merge-recursive.c:1504
5215
#, c-format
5216
msgid ""
5217
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5210,7 +5220,7 @@ msgstr ""
5220
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
5221
"%s laissée dans l'arbre dans le fichier %s."
5222
5213
-#: merge-recursive.c:1514
5223
+#: merge-recursive.c:1509
5224
#, c-format
5225
msgid ""
5226
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5219,41 +5229,41 @@ msgstr ""
5229
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
5230
"%s de %s laissée dans l'arbre dans le fichier %s."
5231
5222
-#: merge-recursive.c:1549
5232
+#: merge-recursive.c:1544
5233
msgid "rename"
5234
msgstr "renommage"
5235
5226
-#: merge-recursive.c:1549
5236
+#: merge-recursive.c:1544
5237
msgid "renamed"
5238
msgstr "renommé"
5239
5230
-#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
5240
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
5241
#, c-format
5242
msgid "Refusing to lose dirty file at %s"
5243
msgstr "Refus de perdre le fichier modifié %s"
5244
5235
-#: merge-recursive.c:1610
5245
+#: merge-recursive.c:1605
5246
#, c-format
5247
msgid "Refusing to lose untracked file at %s, even though it's in the way."
5248
msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne."
5249
5240
-#: merge-recursive.c:1668
5250
+#: merge-recursive.c:1663
5251
#, c-format
5252
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5253
msgstr ""
5254
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
5255
5246
-#: merge-recursive.c:1699
5256
+#: merge-recursive.c:1694
5257
#, c-format
5258
msgid "%s is a directory in %s adding as %s instead"
5259
msgstr "%s est un répertoire dans %s ajouté plutôt comme %s"
5260
5251
-#: merge-recursive.c:1704
5261
+#: merge-recursive.c:1699
5262
#, c-format
5263
msgid "Refusing to lose untracked file at %s; adding as %s instead"
5264
msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place"
5265
5256
-#: merge-recursive.c:1731
5266
+#: merge-recursive.c:1726
5267
#, c-format
5268
msgid ""
5269
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5262,18 +5272,18 @@ msgstr ""
5272
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
5273
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
5274
5265
-#: merge-recursive.c:1736
5275
+#: merge-recursive.c:1731
5276
msgid " (left unresolved)"
5277
msgstr " (laissé non résolu)"
5278
5269
-#: merge-recursive.c:1828
5279
+#: merge-recursive.c:1823
5280
#, c-format
5281
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5282
msgstr ""
5283
"CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
5284
">'%s' dans %s"
5285
5276
-#: merge-recursive.c:2091
5286
+#: merge-recursive.c:2086
5287
#, c-format
5288
msgid ""
5289
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5284,7 +5294,7 @@ msgstr ""
5294
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
5295
"sans aucune destination récupérant la majorité des fichiers."
5296
5287
-#: merge-recursive.c:2225
5297
+#: merge-recursive.c:2220
5298
#, c-format
5299
msgid ""
5300
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5293,79 +5303,79 @@ msgstr ""
5303
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
5304
"Renommage de répertoire %s->%s dans %s"
5305
5296
-#: merge-recursive.c:3080
5306
+#: merge-recursive.c:3075
5307
msgid "modify"
5308
msgstr "modification"
5309
5300
-#: merge-recursive.c:3080
5310
+#: merge-recursive.c:3075
5311
msgid "modified"
5312
msgstr "modifié"
5313
5304
-#: merge-recursive.c:3119
5314
+#: merge-recursive.c:3114
5315
#, c-format
5316
msgid "Skipped %s (merged same as existing)"
5317
msgstr "%s sauté (fusion identique à l'existant)"
5318
5309
-#: merge-recursive.c:3172
5319
+#: merge-recursive.c:3167
5320
#, c-format
5321
msgid "Adding as %s instead"
5322
msgstr "Ajout plutôt comme %s"
5323
5314
-#: merge-recursive.c:3376
5324
+#: merge-recursive.c:3371
5325
#, c-format
5326
msgid "Removing %s"
5327
msgstr "Suppression de %s"
5328
5319
-#: merge-recursive.c:3399
5329
+#: merge-recursive.c:3394
5330
msgid "file/directory"
5331
msgstr "fichier/répertoire"
5332
5323
-#: merge-recursive.c:3404
5333
+#: merge-recursive.c:3399
5334
msgid "directory/file"
5335
msgstr "répertoire/fichier"
5336
5327
-#: merge-recursive.c:3411
5337
+#: merge-recursive.c:3406
5338
#, c-format
5339
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5340
msgstr ""
5341
"CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
5342
5333
-#: merge-recursive.c:3420
5343
+#: merge-recursive.c:3415
5344
#, c-format
5345
msgid "Adding %s"
5346
msgstr "Ajout de %s"
5347
5338
-#: merge-recursive.c:3429
5348
+#: merge-recursive.c:3424
5349
#, c-format
5350
msgid "CONFLICT (add/add): Merge conflict in %s"
5351
msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
5352
5343
-#: merge-recursive.c:3482
5353
+#: merge-recursive.c:3477
5354
#, c-format
5355
msgid "merging of trees %s and %s failed"
5356
msgstr "échec de fusion des arbres %s et %s"
5357
5348
-#: merge-recursive.c:3576
5358
+#: merge-recursive.c:3571
5359
msgid "Merging:"
5360
msgstr "Fusion :"
5361
5352
-#: merge-recursive.c:3589
5362
+#: merge-recursive.c:3584
5363
#, c-format
5364
msgid "found %u common ancestor:"
5365
msgid_plural "found %u common ancestors:"
5366
msgstr[0] "%u ancêtre commun trouvé :"
5367
msgstr[1] "%u ancêtres communs trouvés :"
5368
5359
-#: merge-recursive.c:3639
5369
+#: merge-recursive.c:3634
5370
msgid "merge returned no commit"
5371
msgstr "la fusion n'a pas retourné de commit"
5372
5363
-#: merge-recursive.c:3804
5373
+#: merge-recursive.c:3799
5374
#, c-format
5375
msgid "Could not parse object '%s'"
5376
msgstr "Impossible d'analyser l'objet '%s'"
5377
5368
-#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
5378
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
5379
#: builtin/stash.c:473
5380
msgid "Unable to write index."
5381
msgstr "Impossible d'écrire l'index."
@@ -5375,7 +5385,7 @@ msgid "failed to read the cache"
5385
msgstr "impossible de lire le cache"
5386
5387
#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
5378
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
5388
+#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
5389
#: builtin/stash.c:267
5390
msgid "unable to write new index file"
5391
msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -5461,7 +5471,8 @@ msgstr "impossible de stocker le fichier d'index inversé"
5471
5472
#: midx.c:920
5473
msgid "ignoring existing multi-pack-index; checksum mismatch"
5464
-msgstr "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
5474
+msgstr ""
5475
+"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
5476
5477
#: midx.c:943
5478
msgid "Adding packfiles to multi-pack-index"
@@ -6529,10 +6540,10 @@ msgstr "entrées de préparation non ordonnées pour '%s'"
6540
6541
#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
6542
#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
6532
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
6543
+#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
6544
#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
6545
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
6535
-#: builtin/submodule--helper.c:331
6546
+#: builtin/submodule--helper.c:333
6547
msgid "index file corrupt"
6548
msgstr "fichier d'index corrompu"
6549
@@ -6586,36 +6597,36 @@ msgstr "impossible de rafraîchir l'index partagé '%s'"
6597
msgid "broken index, expect %s in %s, got %s"
6598
msgstr "index cassé, %s attendu dans %s, %s obtenu"
6599
6589
-#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
6600
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
6601
#, c-format
6602
msgid "could not close '%s'"
6603
msgstr "impossible de fermer '%s'"
6604
6594
-#: read-cache.c:3074
6605
+#: read-cache.c:3075
6606
msgid "failed to convert to a sparse-index"
6607
msgstr "échec de conversion d'un index clairsemé"
6608
6598
-#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
6609
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
6610
#, c-format
6611
msgid "could not stat '%s'"
6612
msgstr "impossible de stat '%s'"
6613
6603
-#: read-cache.c:3158
6614
+#: read-cache.c:3159
6615
#, c-format
6616
msgid "unable to open git dir: %s"
6617
msgstr "impossible d'ouvrir le répertoire git : %s"
6618
6608
-#: read-cache.c:3170
6619
+#: read-cache.c:3171
6620
#, c-format
6621
msgid "unable to unlink: %s"
6622
msgstr "échec lors de l'unlink : %s"
6623
6613
-#: read-cache.c:3199
6624
+#: read-cache.c:3200
6625
#, c-format
6626
msgid "cannot fix permission bits on '%s'"
6627
msgstr "impossible de régler les bits de droit de '%s'"
6628
6618
-#: read-cache.c:3348
6629
+#: read-cache.c:3349
6630
#, c-format
6631
msgid "%s: cannot drop to stage #0"
6632
msgstr "%s : impossible de revenir à l'étape 0"
@@ -7034,17 +7045,17 @@ msgstr "réf avec un nom cassé %s ignoré"
7045
msgid "ignoring broken ref %s"
7046
msgstr "réf cassé %s ignoré"
7047
7037
-#: ref-filter.c:2498
7048
+#: ref-filter.c:2502
7049
#, c-format
7050
msgid "format: %%(end) atom missing"
7051
msgstr "format: atome %%(end) manquant"
7052
7042
-#: ref-filter.c:2592
7053
+#: ref-filter.c:2596
7054
#, c-format
7055
msgid "malformed object name %s"
7056
msgstr "nom d'objet malformé %s"
7057
7047
-#: ref-filter.c:2597
7058
+#: ref-filter.c:2601
7059
#, c-format
7060
msgid "option `%s' must point to a commit"
7061
msgstr "l'option '%s' doit pointer sur un commit"
@@ -7513,7 +7524,7 @@ msgid "Recorded preimage for '%s'"
7524
msgstr "Pré-image enregistrée pour '%s'"
7525
7526
#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
7516
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
7527
+#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
7528
#, c-format
7529
msgid "could not create directory '%s'"
7530
msgstr "impossible de créer le répertoire '%s'"
@@ -7551,7 +7562,7 @@ msgstr "impossible d'ouvrir le répertoire rr-cache"
7562
msgid "could not determine HEAD revision"
7563
msgstr "impossible de déterminer la révision HEAD"
7564
7554
-#: reset.c:70 reset.c:76 sequencer.c:3689
7565
+#: reset.c:69 reset.c:75 sequencer.c:3689
7566
#, c-format
7567
msgid "failed to find tree of %s"
7568
msgstr "impossible de trouver l'arbre de %s"
@@ -7763,7 +7774,7 @@ msgid "unable to dequote value of '%s'"
7774
msgstr "impossible de décoter la valeur de '%s'"
7775
7776
#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
7766
-#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
7777
+#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
7778
#, c-format
7779
msgid "could not open '%s' for reading"
7780
msgstr "impossible d'ouvrir '%s' en lecture"
@@ -7914,7 +7925,7 @@ msgstr "impossible de lire HEAD"
7925
msgid "HEAD %s is not a commit!"
7926
msgstr "HEAD %s n'est pas un commit !"
7927
7917
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
7928
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
7929
msgid "could not parse HEAD commit"
7930
msgstr "impossible d'analyser le commit HEAD"
7931
@@ -7922,7 +7933,7 @@ msgstr "impossible d'analyser le commit HEAD"
7933
msgid "unable to parse commit author"
7934
msgstr "impossible d'analyser l'auteur du commit"
7935
7925
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
7936
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
7937
msgid "git write-tree failed to write a tree"
7938
msgstr "git write-tree a échoué à écrire un arbre"
7939
@@ -7940,8 +7951,8 @@ msgstr "identité d'auteur invalide '%s'"
7951
msgid "corrupt author: missing date information"
7952
msgstr "auteur corrompu : information de date manquante"
7953
7943
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
7944
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
7954
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
7955
+#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
7956
msgid "failed to write commit object"
7957
msgstr "échec de l'écriture de l'objet commit"
7958
@@ -8630,7 +8641,8 @@ msgstr[1] "extensions de dépôt inconnues trouvées :"
8641
#: setup.c:680
8642
msgid "repo version is 0, but v1-only extension found:"
8643
msgid_plural "repo version is 0, but v1-only extensions found:"
8633
-msgstr[0] "la version du dépôt est 0, mais une extension uniquement v1 trouvée :"
8644
+msgstr[0] ""
8645
+"la version du dépôt est 0, mais une extension uniquement v1 trouvée :"
8646
msgstr[1] ""
8647
"la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
8648
@@ -8739,11 +8751,11 @@ msgstr "échec du setsid"
8751
msgid "attempting to use sparse-index without cone mode"
8752
msgstr "tentative d'utilisation de l'index partiel sans mode cone"
8753
8742
-#: sparse-index.c:174
8754
+#: sparse-index.c:176
8755
msgid "unable to update cache-tree, staying full"
8756
msgstr "impossible de mettre à jour l'arbre de cache, full conservé"
8757
8746
-#: sparse-index.c:261
8758
+#: sparse-index.c:263
8759
#, c-format
8760
msgid "index entry is a directory, but not sparse (%08x)"
8761
msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
@@ -8901,7 +8913,7 @@ msgstr ""
8913
msgid "process for submodule '%s' failed"
8914
msgstr "le processus pour le sous-module '%s' a échoué"
8915
8904
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
8916
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
8917
msgid "Failed to resolve HEAD as a valid ref."
8918
msgstr "Échec de résolution de HEAD comme référence valide."
8919
@@ -9659,7 +9671,7 @@ msgstr ""
9671
msgid "Updating index flags"
9672
msgstr "Mise à jour des drapeaux de l'index"
9673
9662
-#: unpack-trees.c:2707
9674
+#: unpack-trees.c:2718
9675
#, c-format
9676
msgid "worktree and untracked commit have duplicate entries: %s"
9677
msgstr ""
@@ -10464,7 +10476,7 @@ msgstr "simuler l'action"
10476
msgid "interactive picking"
10477
msgstr "sélection interactive"
10478
10467
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
10479
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
10480
msgid "select hunks interactively"
10481
msgstr "sélection interactive des sections"
10482
@@ -10600,12 +10612,12 @@ msgstr ""
10612
msgid "--chmod param '%s' must be either -x or +x"
10613
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
10614
10603
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
10615
+#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
10616
#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
10617
msgid "--pathspec-from-file is incompatible with pathspec arguments"
10618
msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
10619
10608
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
10620
+#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
10621
#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
10622
msgid "--pathspec-file-nul requires --pathspec-from-file"
10623
msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
@@ -11440,7 +11452,7 @@ msgstr ""
11452
msgid "show work cost statistics"
11453
msgstr "montrer les statistiques de coût d'activité"
11454
11443
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
11455
+#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
11456
#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
11457
#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
11458
#: builtin/push.c:566 builtin/send-pack.c:198
@@ -12253,7 +12265,7 @@ msgid "terminate input and output records by a NUL character"
12265
msgstr ""
12266
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
12267
12256
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
12268
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
12269
#: builtin/worktree.c:493
12270
msgid "suppress progress reporting"
12271
msgstr "supprimer l'état d'avancement"
@@ -12312,9 +12324,10 @@ msgid "git checkout--worker [<options>]"
12324
msgstr "git checkout--worker [<options>]"
12325
12326
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
12315
-#: builtin/column.c:31 builtin/submodule--helper.c:1824
12316
-#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
12317
-#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
12327
+#: builtin/column.c:31 builtin/submodule--helper.c:1892
12328
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
12329
+#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
12330
+#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
12331
#: builtin/worktree.c:728
12332
msgid "string"
12333
msgstr "chaîne"
@@ -12411,70 +12424,70 @@ msgstr "chemin '%s' : impossible de fusionner"
12424
msgid "Unable to add merge result for '%s'"
12425
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
12426
12414
-#: builtin/checkout.c:414
12427
+#: builtin/checkout.c:411
12428
#, c-format
12429
msgid "Recreated %d merge conflict"
12430
msgid_plural "Recreated %d merge conflicts"
12431
msgstr[0] "%d conflit du fusion recréé"
12432
msgstr[1] "%d conflits du fusion recréés"
12433
12421
-#: builtin/checkout.c:419
12434
+#: builtin/checkout.c:416
12435
#, c-format
12436
msgid "Updated %d path from %s"
12437
msgid_plural "Updated %d paths from %s"
12438
msgstr[0] "%d chemin mis à jour depuis %s"
12439
msgstr[1] "%d chemins mis à jour depuis %s"
12440
12428
-#: builtin/checkout.c:426
12441
+#: builtin/checkout.c:423
12442
#, c-format
12443
msgid "Updated %d path from the index"
12444
msgid_plural "Updated %d paths from the index"
12445
msgstr[0] "%d chemin mis à jour depuis l'index"
12446
msgstr[1] "%d chemins mis à jour depuis l'index"
12447
12435
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
12436
-#: builtin/checkout.c:459
12448
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
12449
+#: builtin/checkout.c:456
12450
#, c-format
12451
msgid "'%s' cannot be used with updating paths"
12452
msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
12453
12441
-#: builtin/checkout.c:462 builtin/checkout.c:465
12454
+#: builtin/checkout.c:459 builtin/checkout.c:462
12455
#, c-format
12456
msgid "'%s' cannot be used with %s"
12457
msgstr "'%s' ne peut pas être utilisé avec %s"
12458
12446
-#: builtin/checkout.c:469
12459
+#: builtin/checkout.c:466
12460
#, c-format
12461
msgid "Cannot update paths and switch to branch '%s' at the same time."
12462
msgstr ""
12463
"Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
12464
"même temps."
12465
12453
-#: builtin/checkout.c:473
12466
+#: builtin/checkout.c:470
12467
#, c-format
12468
msgid "neither '%s' or '%s' is specified"
12469
msgstr "ni '%s', ni '%s' spécifié"
12470
12458
-#: builtin/checkout.c:477
12471
+#: builtin/checkout.c:474
12472
#, c-format
12473
msgid "'%s' must be used when '%s' is not specified"
12474
msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
12475
12463
-#: builtin/checkout.c:482 builtin/checkout.c:487
12476
+#: builtin/checkout.c:479 builtin/checkout.c:484
12477
#, c-format
12478
msgid "'%s' or '%s' cannot be used with %s"
12479
msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
12480
12468
-#: builtin/checkout.c:563 builtin/checkout.c:570
12481
+#: builtin/checkout.c:558 builtin/checkout.c:565
12482
#, c-format
12483
msgid "path '%s' is unmerged"
12484
msgstr "le chemin '%s' n'est pas fusionné"
12485
12473
-#: builtin/checkout.c:739
12486
+#: builtin/checkout.c:734
12487
msgid "you need to resolve your current index first"
12488
msgstr "vous devez d'abord résoudre votre index courant"
12489
12477
-#: builtin/checkout.c:793
12490
+#: builtin/checkout.c:788
12491
#, c-format
12492
msgid ""
12493
"cannot continue with staged changes in the following files:\n"
@@ -12484,50 +12497,50 @@ msgstr ""
12497
"suivants :\n"
12498
"%s"
12499
12487
-#: builtin/checkout.c:886
12500
+#: builtin/checkout.c:881
12501
#, c-format
12502
msgid "Can not do reflog for '%s': %s\n"
12503
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
12504
12492
-#: builtin/checkout.c:928
12505
+#: builtin/checkout.c:923
12506
msgid "HEAD is now at"
12507
msgstr "HEAD est maintenant sur"
12508
12496
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
12509
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
12510
msgid "unable to update HEAD"
12511
msgstr "impossible de mettre à jour HEAD"
12512
12500
-#: builtin/checkout.c:936
12513
+#: builtin/checkout.c:931
12514
#, c-format
12515
msgid "Reset branch '%s'\n"
12516
msgstr "Remise à zéro de la branche '%s'\n"
12517
12505
-#: builtin/checkout.c:939
12518
+#: builtin/checkout.c:934
12519
#, c-format
12520
msgid "Already on '%s'\n"
12521
msgstr "Déjà sur '%s'\n"
12522
12510
-#: builtin/checkout.c:943
12523
+#: builtin/checkout.c:938
12524
#, c-format
12525
msgid "Switched to and reset branch '%s'\n"
12526
msgstr "Basculement et remise à zéro de la branche '%s'\n"
12527
12515
-#: builtin/checkout.c:945 builtin/checkout.c:1376
12528
+#: builtin/checkout.c:940 builtin/checkout.c:1371
12529
#, c-format
12530
msgid "Switched to a new branch '%s'\n"
12531
msgstr "Basculement sur la nouvelle branche '%s'\n"
12532
12520
-#: builtin/checkout.c:947
12533
+#: builtin/checkout.c:942
12534
#, c-format
12535
msgid "Switched to branch '%s'\n"
12536
msgstr "Basculement sur la branche '%s'\n"
12537
12525
-#: builtin/checkout.c:998
12538
+#: builtin/checkout.c:993
12539
#, c-format
12540
msgid " ... and %d more.\n"
12541
msgstr " ... et %d en plus.\n"
12542
12530
-#: builtin/checkout.c:1004
12543
+#: builtin/checkout.c:999
12544
#, c-format
12545
msgid ""
12546
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12550,7 +12563,7 @@ msgstr[1] ""
12563
"\n"
12564
"%s\n"
12565
12553
-#: builtin/checkout.c:1023
12566
+#: builtin/checkout.c:1018
12567
#, c-format
12568
msgid ""
12569
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12579,19 +12592,19 @@ msgstr[1] ""
12592
"git branch <nouvelle-branche> %s\n"
12593
"\n"
12594
12582
-#: builtin/checkout.c:1058
12595
+#: builtin/checkout.c:1053
12596
msgid "internal error in revision walk"
12597
msgstr "erreur interne lors du parcours des révisions"
12598
12586
-#: builtin/checkout.c:1062
12599
+#: builtin/checkout.c:1057
12600
msgid "Previous HEAD position was"
12601
msgstr "La position précédente de HEAD était sur"
12602
12590
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
12603
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
12604
msgid "You are on a branch yet to be born"
12605
msgstr "Vous êtes sur une branche qui doit encore naître"
12606
12594
-#: builtin/checkout.c:1184
12607
+#: builtin/checkout.c:1179
12608
#, c-format
12609
msgid ""
12610
"'%s' could be both a local file and a tracking branch.\n"
@@ -12600,7 +12613,7 @@ msgstr ""
12613
"'%s' pourrait être un fichier local ou un branche de suivi.\n"
12614
"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
12615
12603
-#: builtin/checkout.c:1191
12616
+#: builtin/checkout.c:1186
12617
msgid ""
12618
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
12619
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12620,51 +12633,51 @@ msgstr ""
12633
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
12634
"votre config."
12635
12623
-#: builtin/checkout.c:1201
12636
+#: builtin/checkout.c:1196
12637
#, c-format
12638
msgid "'%s' matched multiple (%d) remote tracking branches"
12639
msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
12640
12628
-#: builtin/checkout.c:1267
12641
+#: builtin/checkout.c:1262
12642
msgid "only one reference expected"
12643
msgstr "une seule référence attendue"
12644
12632
-#: builtin/checkout.c:1284
12645
+#: builtin/checkout.c:1279
12646
#, c-format
12647
msgid "only one reference expected, %d given."
12648
msgstr "une seule référence attendue, %d fournies."
12649
12637
-#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
12650
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
12651
#, c-format
12652
msgid "invalid reference: %s"
12653
msgstr "référence invalide : %s"
12654
12642
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
12655
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
12656
#, c-format
12657
msgid "reference is not a tree: %s"
12658
msgstr "la référence n'est pas un arbre : %s"
12659
12647
-#: builtin/checkout.c:1390
12660
+#: builtin/checkout.c:1385
12661
#, c-format
12662
msgid "a branch is expected, got tag '%s'"
12663
msgstr "branche attendue, mais étiquette '%s' reçue"
12664
12652
-#: builtin/checkout.c:1392
12665
+#: builtin/checkout.c:1387
12666
#, c-format
12667
msgid "a branch is expected, got remote branch '%s'"
12668
msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
12669
12657
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
12670
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
12671
#, c-format
12672
msgid "a branch is expected, got '%s'"
12673
msgstr "une branche est attendue, mais '%s' a été reçue"
12674
12662
-#: builtin/checkout.c:1396
12675
+#: builtin/checkout.c:1391
12676
#, c-format
12677
msgid "a branch is expected, got commit '%s'"
12678
msgstr "une branche est attendue, mais un commit '%s' a été reçu"
12679
12667
-#: builtin/checkout.c:1412
12680
+#: builtin/checkout.c:1407
12681
msgid ""
12682
"cannot switch branch while merging\n"
12683
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12672,7 +12685,7 @@ msgstr ""
12685
"impossible de basculer de branche pendant une fusion\n"
12686
"Envisagez \"git merge --quit\" ou \"git worktree add\"."
12687
12675
-#: builtin/checkout.c:1416
12688
+#: builtin/checkout.c:1411
12689
msgid ""
12690
"cannot switch branch in the middle of an am session\n"
12691
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -12680,7 +12693,7 @@ msgstr ""
12693
"impossible de basculer de branche pendant une session am\n"
12694
"Envisagez \"git am --quit\" ou \"git worktree add\"."
12695
12683
-#: builtin/checkout.c:1420
12696
+#: builtin/checkout.c:1415
12697
msgid ""
12698
"cannot switch branch while rebasing\n"
12699
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12688,7 +12701,7 @@ msgstr ""
12701
"impossible de basculer de branche pendant un rebasage\n"
12702
"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
12703
12691
-#: builtin/checkout.c:1424
12704
+#: builtin/checkout.c:1419
12705
msgid ""
12706
"cannot switch branch while cherry-picking\n"
12707
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12696,7 +12709,7 @@ msgstr ""
12709
"impossible de basculer de branche pendant un picorage\n"
12710
"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
12711
12699
-#: builtin/checkout.c:1428
12712
+#: builtin/checkout.c:1423
12713
msgid ""
12714
"cannot switch branch while reverting\n"
12715
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12704,139 +12717,139 @@ msgstr ""
12717
"impossible de basculer de branche pendant un retour\n"
12718
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
12719
12707
-#: builtin/checkout.c:1432
12720
+#: builtin/checkout.c:1427
12721
msgid "you are switching branch while bisecting"
12722
msgstr "vous basculez de branche en cours de bissection"
12723
12711
-#: builtin/checkout.c:1439
12724
+#: builtin/checkout.c:1434
12725
msgid "paths cannot be used with switching branches"
12726
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
12727
12715
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
12728
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
12729
#, c-format
12730
msgid "'%s' cannot be used with switching branches"
12731
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
12732
12720
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
12721
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
12733
+#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
12734
+#: builtin/checkout.c:1460 builtin/checkout.c:1465
12735
#, c-format
12736
msgid "'%s' cannot be used with '%s'"
12737
msgstr "'%s' ne peut pas être utilisé avec '%s'"
12738
12726
-#: builtin/checkout.c:1467
12739
+#: builtin/checkout.c:1462
12740
#, c-format
12741
msgid "'%s' cannot take <start-point>"
12742
msgstr "'%s' n'accepte pas <point-de-départ>"
12743
12731
-#: builtin/checkout.c:1475
12744
+#: builtin/checkout.c:1470
12745
#, c-format
12746
msgid "Cannot switch branch to a non-commit '%s'"
12747
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
12748
12736
-#: builtin/checkout.c:1482
12749
+#: builtin/checkout.c:1477
12750
msgid "missing branch or commit argument"
12751
msgstr "argument de branche ou de commit manquant"
12752
12740
-#: builtin/checkout.c:1525
12753
+#: builtin/checkout.c:1520
12754
msgid "perform a 3-way merge with the new branch"
12755
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
12756
12744
-#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
12757
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
12758
msgid "style"
12759
msgstr "style"
12760
12748
-#: builtin/checkout.c:1527
12761
+#: builtin/checkout.c:1522
12762
msgid "conflict style (merge or diff3)"
12763
msgstr "style de conflit (merge (fusion) ou diff3)"
12764
12752
-#: builtin/checkout.c:1539 builtin/worktree.c:488
12765
+#: builtin/checkout.c:1534 builtin/worktree.c:488
12766
msgid "detach HEAD at named commit"
12767
msgstr "détacher la HEAD au commit nommé"
12768
12756
-#: builtin/checkout.c:1540
12769
+#: builtin/checkout.c:1535
12770
msgid "set upstream info for new branch"
12771
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
12772
12760
-#: builtin/checkout.c:1542
12773
+#: builtin/checkout.c:1537
12774
msgid "force checkout (throw away local modifications)"
12775
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
12776
12764
-#: builtin/checkout.c:1544
12777
+#: builtin/checkout.c:1539
12778
msgid "new-branch"
12779
msgstr "nouvelle branche"
12780
12768
-#: builtin/checkout.c:1544
12781
+#: builtin/checkout.c:1539
12782
msgid "new unparented branch"
12783
msgstr "nouvelle branche sans parent"
12784
12772
-#: builtin/checkout.c:1546 builtin/merge.c:301
12785
+#: builtin/checkout.c:1541 builtin/merge.c:301
12786
msgid "update ignored files (default)"
12787
msgstr "mettre à jour les fichiers ignorés (par défaut)"
12788
12776
-#: builtin/checkout.c:1549
12789
+#: builtin/checkout.c:1544
12790
msgid "do not check if another worktree is holding the given ref"
12791
msgstr ""
12792
"ne pas vérifier si une autre copie de travail contient le référence fournie"
12793
12781
-#: builtin/checkout.c:1562
12794
+#: builtin/checkout.c:1557
12795
msgid "checkout our version for unmerged files"
12796
msgstr "extraire notre version pour les fichiers non fusionnés"
12797
12785
-#: builtin/checkout.c:1565
12798
+#: builtin/checkout.c:1560
12799
msgid "checkout their version for unmerged files"
12800
msgstr "extraire leur version pour les fichiers non fusionnés"
12801
12789
-#: builtin/checkout.c:1569
12802
+#: builtin/checkout.c:1564
12803
msgid "do not limit pathspecs to sparse entries only"
12804
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
12805
12793
-#: builtin/checkout.c:1624
12806
+#: builtin/checkout.c:1622
12807
#, c-format
12808
msgid "-%c, -%c and --orphan are mutually exclusive"
12809
msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
12810
12798
-#: builtin/checkout.c:1628
12811
+#: builtin/checkout.c:1626
12812
msgid "-p and --overlay are mutually exclusive"
12813
msgstr "-p et --overlay sont mutuellement exclusifs"
12814
12802
-#: builtin/checkout.c:1665
12815
+#: builtin/checkout.c:1663
12816
msgid "--track needs a branch name"
12817
msgstr "--track requiert un nom de branche"
12818
12806
-#: builtin/checkout.c:1670
12819
+#: builtin/checkout.c:1668
12820
#, c-format
12821
msgid "missing branch name; try -%c"
12822
msgstr "nom de branche manquant ; essayez -%c"
12823
12811
-#: builtin/checkout.c:1702
12824
+#: builtin/checkout.c:1700
12825
#, c-format
12826
msgid "could not resolve %s"
12827
msgstr "impossible de résoudre %s"
12828
12816
-#: builtin/checkout.c:1718
12829
+#: builtin/checkout.c:1716
12830
msgid "invalid path specification"
12831
msgstr "spécification de chemin invalide"
12832
12820
-#: builtin/checkout.c:1725
12833
+#: builtin/checkout.c:1723
12834
#, c-format
12835
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
12836
msgstr ""
12837
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
12838
12826
-#: builtin/checkout.c:1729
12839
+#: builtin/checkout.c:1727
12840
#, c-format
12841
msgid "git checkout: --detach does not take a path argument '%s'"
12842
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
12843
12831
-#: builtin/checkout.c:1738
12844
+#: builtin/checkout.c:1736
12845
msgid "--pathspec-from-file is incompatible with --detach"
12846
msgstr "--pathspec-from-file est incompatible avec --detach"
12847
12835
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
12848
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
12849
msgid "--pathspec-from-file is incompatible with --patch"
12850
msgstr "--pathspec-from-file est incompatible avec --patch"
12851
12839
-#: builtin/checkout.c:1754
12852
+#: builtin/checkout.c:1752
12853
msgid ""
12854
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
12855
"checking out of the index."
@@ -12844,71 +12857,72 @@ msgstr ""
12857
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
12858
"de l'extraction de l'index."
12859
12847
-#: builtin/checkout.c:1759
12860
+#: builtin/checkout.c:1757
12861
msgid "you must specify path(s) to restore"
12862
msgstr "vous devez spécifier un ou des chemins à restaurer"
12863
12851
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
12852
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
12853
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
12864
+#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
12865
+#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
12866
+#: builtin/remote.c:172 builtin/submodule--helper.c:2736
12867
+#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
12868
#: builtin/worktree.c:486
12869
msgid "branch"
12870
msgstr "branche"
12871
12858
-#: builtin/checkout.c:1786
12872
+#: builtin/checkout.c:1784
12873
msgid "create and checkout a new branch"
12874
msgstr "créer et extraire une nouvelle branche"
12875
12862
-#: builtin/checkout.c:1788
12876
+#: builtin/checkout.c:1786
12877
msgid "create/reset and checkout a branch"
12878
msgstr "créer/réinitialiser et extraire une branche"
12879
12866
-#: builtin/checkout.c:1789
12880
+#: builtin/checkout.c:1787
12881
msgid "create reflog for new branch"
12882
msgstr "créer un reflog pour une nouvelle branche"
12883
12870
-#: builtin/checkout.c:1791
12884
+#: builtin/checkout.c:1789
12885
msgid "second guess 'git checkout <no-such-branch>' (default)"
12886
msgstr ""
12887
"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
12888
12875
-#: builtin/checkout.c:1792
12889
+#: builtin/checkout.c:1790
12890
msgid "use overlay mode (default)"
12891
msgstr "utiliser le mode de superposition (défaut)"
12892
12879
-#: builtin/checkout.c:1837
12893
+#: builtin/checkout.c:1835
12894
msgid "create and switch to a new branch"
12895
msgstr "créer et basculer sur une nouvelle branche"
12896
12883
-#: builtin/checkout.c:1839
12897
+#: builtin/checkout.c:1837
12898
msgid "create/reset and switch to a branch"
12899
msgstr "créer/réinitialiser et basculer sur une branche"
12900
12887
-#: builtin/checkout.c:1841
12901
+#: builtin/checkout.c:1839
12902
msgid "second guess 'git switch <no-such-branch>'"
12903
msgstr "interpréter 'git switch <branche-inexistante>'"
12904
12891
-#: builtin/checkout.c:1843
12905
+#: builtin/checkout.c:1841
12906
msgid "throw away local modifications"
12907
msgstr "laisser tomber les modifications locales"
12908
12895
-#: builtin/checkout.c:1877
12909
+#: builtin/checkout.c:1875
12910
msgid "which tree-ish to checkout from"
12911
msgstr "de quel <arbre-esque> faire l'extraction"
12912
12899
-#: builtin/checkout.c:1879
12913
+#: builtin/checkout.c:1877
12914
msgid "restore the index"
12915
msgstr "restaurer l'index"
12916
12903
-#: builtin/checkout.c:1881
12917
+#: builtin/checkout.c:1879
12918
msgid "restore the working tree (default)"
12919
msgstr "restaurer l'arbre de travail (par défaut)"
12920
12907
-#: builtin/checkout.c:1883
12921
+#: builtin/checkout.c:1881
12922
msgid "ignore unmerged entries"
12923
msgstr "ignorer les entrées non-fusionnées"
12924
12911
-#: builtin/checkout.c:1884
12925
+#: builtin/checkout.c:1882
12926
msgid "use overlay mode"
12927
msgstr "utiliser le mode de superposition"
12928
@@ -13138,13 +13152,13 @@ msgstr "répertoire-modèle"
13152
msgid "directory from which templates will be used"
13153
msgstr "répertoire depuis lequel les modèles vont être utilisés"
13154
13141
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
13142
-#: builtin/submodule--helper.c:2336
13155
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
13156
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
13157
msgid "reference repository"
13158
msgstr "dépôt de référence"
13159
13146
-#: builtin/clone.c:123 builtin/submodule--helper.c:1833
13147
-#: builtin/submodule--helper.c:2338
13160
+#: builtin/clone.c:123 builtin/submodule--helper.c:1901
13161
+#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
13162
msgid "use --reference only while cloning"
13163
msgstr "utiliser seulement --reference pour cloner"
13164
@@ -13194,8 +13208,8 @@ msgid "deepen history of shallow clone, excluding rev"
13208
msgstr ""
13209
"approfondir l'historique d'un clone superficiel en excluant une révision"
13210
13197
-#: builtin/clone.c:137 builtin/submodule--helper.c:1843
13198
-#: builtin/submodule--helper.c:2352
13211
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
13212
+#: builtin/submodule--helper.c:2369
13213
msgid "clone only one branch, HEAD or --branch"
13214
msgstr "cloner seulement une branche, HEAD ou --branch"
13215
@@ -13869,8 +13883,10 @@ msgid ""
13883
"Please enter the commit message for your changes. Lines starting\n"
13884
"with '%c' will be kept; you may remove them yourself if you want to.\n"
13885
msgstr ""
13872
-"Veuillez saisir le message de validation pour vos modifications. Les lignes commençant\n"
13873
-"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le souhaitez.\n"
13886
+"Veuillez saisir le message de validation pour vos modifications. Les lignes "
13887
+"commençant\n"
13888
+"par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le "
13889
+"souhaitez.\n"
13890
13891
#: builtin/commit.c:903
13892
#, c-format
@@ -14263,37 +14279,37 @@ msgstr "accepter d'enregistrer une modification vide"
14279
msgid "ok to record a change with an empty message"
14280
msgstr "accepter d'enregistrer une modification avec un message vide"
14281
14266
-#: builtin/commit.c:1747
14282
+#: builtin/commit.c:1750
14283
#, c-format
14284
msgid "Corrupt MERGE_HEAD file (%s)"
14285
msgstr "Fichier MERGE_HEAD corrompu (%s)"
14286
14271
-#: builtin/commit.c:1754
14287
+#: builtin/commit.c:1757
14288
msgid "could not read MERGE_MODE"
14289
msgstr "impossible de lire MERGE_MODE"
14290
14275
-#: builtin/commit.c:1775
14291
+#: builtin/commit.c:1778
14292
#, c-format
14293
msgid "could not read commit message: %s"
14294
msgstr "impossible de lire le message de validation : %s"
14295
14280
-#: builtin/commit.c:1782
14296
+#: builtin/commit.c:1785
14297
#, c-format
14298
msgid "Aborting commit due to empty commit message.\n"
14299
msgstr "Abandon de la validation dû à un message de validation vide.\n"
14300
14285
-#: builtin/commit.c:1787
14301
+#: builtin/commit.c:1790
14302
#, c-format
14303
msgid "Aborting commit; you did not edit the message.\n"
14304
msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"
14305
14290
-#: builtin/commit.c:1798
14306
+#: builtin/commit.c:1801
14307
#, c-format
14308
msgid "Aborting commit due to empty commit message body.\n"
14309
msgstr ""
14310
"Abandon de la validation dû à un corps de message de validation vide.\n"
14311
14296
-#: builtin/commit.c:1834
14312
+#: builtin/commit.c:1837
14313
msgid ""
14314
"repository has been updated, but unable to write\n"
14315
"new_index file. Check that disk is not full and quota is\n"
@@ -15327,7 +15343,9 @@ msgstr "lancer 'maintenance --auto' après la récupération"
15343
15344
#: builtin/fetch.c:217 builtin/pull.c:243
15345
msgid "check for forced-updates on all updated branches"
15330
-msgstr "vérifier les mises à jour forcées (forced-updates) sur toutes les branches mises à jour"
15346
+msgstr ""
15347
+"vérifier les mises à jour forcées (forced-updates) sur toutes les branches "
15348
+"mises à jour"
15349
15350
#: builtin/fetch.c:219
15351
msgid "write the commit-graph after fetching"
@@ -15427,7 +15445,9 @@ msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
15445
#: builtin/fetch.c:1129
15446
#, c-format
15447
msgid "rejected %s because shallow roots are not allowed to be updated"
15430
-msgstr "%s rejeté parce que les mises à jour de racines superficielles ne sont pas permises"
15448
+msgstr ""
15449
+"%s rejeté parce que les mises à jour de racines superficielles ne sont pas "
15450
+"permises"
15451
15452
#: builtin/fetch.c:1206 builtin/fetch.c:1357
15453
#, c-format
@@ -15680,15 +15700,15 @@ msgstr "afficher seulement les références qui ne contiennent pas le commit"
15700
msgid "git for-each-repo --config=<config> <command-args>"
15701
msgstr "git for-each-repo --config=<config> <arguments-de-commande>"
15702
15683
-#: builtin/for-each-repo.c:37
15703
+#: builtin/for-each-repo.c:34
15704
msgid "config"
15705
msgstr "config"
15706
15687
-#: builtin/for-each-repo.c:38
15707
+#: builtin/for-each-repo.c:35
15708
msgid "config key storing a list of repository paths"
15709
msgstr "clé de config qui stocke la liste des chemins de dépôts"
15710
15691
-#: builtin/for-each-repo.c:46
15711
+#: builtin/for-each-repo.c:43
15712
msgid "missing --config=<config>"
15713
msgstr "--config=<config> manquant"
15714
@@ -18091,38 +18111,38 @@ msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
18111
msgid "'%s' does not point to a commit"
18112
msgstr "'%s' ne pointe pas sur un commit"
18113
18094
-#: builtin/merge.c:602
18114
+#: builtin/merge.c:603
18115
#, c-format
18116
msgid "Bad branch.%s.mergeoptions string: %s"
18117
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
18118
18099
-#: builtin/merge.c:728
18119
+#: builtin/merge.c:729
18120
msgid "Not handling anything other than two heads merge."
18121
msgstr "Impossible de gérer autre chose que la fusion de deux têtes."
18122
18103
-#: builtin/merge.c:741
18123
+#: builtin/merge.c:742
18124
#, c-format
18125
msgid "Unknown option for merge-recursive: -X%s"
18126
msgstr "Options inconnue pour merge-recursive : -X%s"
18127
18108
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
18128
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
18129
#, c-format
18130
msgid "unable to write %s"
18131
msgstr "impossible d'écrire %s"
18132
18113
-#: builtin/merge.c:812
18133
+#: builtin/merge.c:813
18134
#, c-format
18135
msgid "Could not read from '%s'"
18136
msgstr "Impossible de lire depuis '%s'"
18137
18118
-#: builtin/merge.c:821
18138
+#: builtin/merge.c:822
18139
#, c-format
18140
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
18141
msgstr ""
18142
"Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
18143
"fusion.\n"
18144
18125
-#: builtin/merge.c:827
18145
+#: builtin/merge.c:828
18146
msgid ""
18147
"Please enter a commit message to explain why this merge is necessary,\n"
18148
"especially if it merges an updated upstream into a topic branch.\n"
@@ -18134,11 +18154,11 @@ msgstr ""
18154
"branche de sujet.\n"
18155
"\n"
18156
18137
-#: builtin/merge.c:832
18157
+#: builtin/merge.c:833
18158
msgid "An empty message aborts the commit.\n"
18159
msgstr "Un message vide abandonne la validation.\n"
18160
18141
-#: builtin/merge.c:835
18161
+#: builtin/merge.c:836
18162
#, c-format
18163
msgid ""
18164
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18147,74 +18167,74 @@ msgstr ""
18167
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
18168
"abandonne la validation.\n"
18169
18150
-#: builtin/merge.c:888
18170
+#: builtin/merge.c:889
18171
msgid "Empty commit message."
18172
msgstr "Message de validation vide."
18173
18154
-#: builtin/merge.c:903
18174
+#: builtin/merge.c:904
18175
#, c-format
18176
msgid "Wonderful.\n"
18177
msgstr "Merveilleux.\n"
18178
18159
-#: builtin/merge.c:964
18179
+#: builtin/merge.c:965
18180
#, c-format
18181
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
18182
msgstr ""
18183
"La fusion automatique a échoué ; réglez les conflits et validez le "
18184
"résultat.\n"
18185
18166
-#: builtin/merge.c:1003
18186
+#: builtin/merge.c:1004
18187
msgid "No current branch."
18188
msgstr "Pas de branche courante."
18189
18170
-#: builtin/merge.c:1005
18190
+#: builtin/merge.c:1006
18191
msgid "No remote for the current branch."
18192
msgstr "Pas de branche distante pour la branche courante."
18193
18174
-#: builtin/merge.c:1007
18194
+#: builtin/merge.c:1008
18195
msgid "No default upstream defined for the current branch."
18196
msgstr "Pas de branche amont par défaut définie pour la branche courante."
18197
18178
-#: builtin/merge.c:1012
18198
+#: builtin/merge.c:1013
18199
#, c-format
18200
msgid "No remote-tracking branch for %s from %s"
18201
msgstr "Pas de branche de suivi pour %s depuis %s"
18202
18183
-#: builtin/merge.c:1069
18203
+#: builtin/merge.c:1070
18204
#, c-format
18205
msgid "Bad value '%s' in environment '%s'"
18206
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
18207
18188
-#: builtin/merge.c:1172
18208
+#: builtin/merge.c:1173
18209
#, c-format
18210
msgid "not something we can merge in %s: %s"
18211
msgstr "pas possible de fusionner ceci dans %s : %s"
18212
18193
-#: builtin/merge.c:1206
18213
+#: builtin/merge.c:1207
18214
msgid "not something we can merge"
18215
msgstr "pas possible de fusionner ceci"
18216
18197
-#: builtin/merge.c:1316
18217
+#: builtin/merge.c:1317
18218
msgid "--abort expects no arguments"
18219
msgstr "--abort n'accepte pas d'argument"
18220
18201
-#: builtin/merge.c:1320
18221
+#: builtin/merge.c:1321
18222
msgid "There is no merge to abort (MERGE_HEAD missing)."
18223
msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
18224
18205
-#: builtin/merge.c:1338
18225
+#: builtin/merge.c:1339
18226
msgid "--quit expects no arguments"
18227
msgstr "--quit n'accepte pas d'argument"
18228
18209
-#: builtin/merge.c:1351
18229
+#: builtin/merge.c:1352
18230
msgid "--continue expects no arguments"
18231
msgstr "--continue ne supporte aucun argument"
18232
18213
-#: builtin/merge.c:1355
18233
+#: builtin/merge.c:1356
18234
msgid "There is no merge in progress (MERGE_HEAD missing)."
18235
msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
18236
18217
-#: builtin/merge.c:1371
18237
+#: builtin/merge.c:1372
18238
msgid ""
18239
"You have not concluded your merge (MERGE_HEAD exists).\n"
18240
"Please, commit your changes before you merge."
@@ -18222,7 +18242,7 @@ msgstr ""
18242
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
18243
"Veuillez valider vos modifications avant de pouvoir fusionner."
18244
18225
-#: builtin/merge.c:1378
18245
+#: builtin/merge.c:1379
18246
msgid ""
18247
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
18248
"Please, commit your changes before you merge."
@@ -18230,90 +18250,90 @@ msgstr ""
18250
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
18251
"Veuillez valider vos modifications avant de pouvoir fusionner."
18252
18233
-#: builtin/merge.c:1381
18253
+#: builtin/merge.c:1382
18254
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
18255
msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
18256
18237
-#: builtin/merge.c:1395
18257
+#: builtin/merge.c:1396
18258
msgid "You cannot combine --squash with --no-ff."
18259
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
18260
18241
-#: builtin/merge.c:1397
18261
+#: builtin/merge.c:1398
18262
msgid "You cannot combine --squash with --commit."
18263
msgstr "Vous ne pouvez pas combiner --squash avec --commit."
18264
18245
-#: builtin/merge.c:1413
18265
+#: builtin/merge.c:1414
18266
msgid "No commit specified and merge.defaultToUpstream not set."
18267
msgstr ""
18268
"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
18269
18250
-#: builtin/merge.c:1430
18270
+#: builtin/merge.c:1431
18271
msgid "Squash commit into empty head not supported yet"
18272
msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
18273
18254
-#: builtin/merge.c:1432
18274
+#: builtin/merge.c:1433
18275
msgid "Non-fast-forward commit does not make sense into an empty head"
18276
msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
18277
18258
-#: builtin/merge.c:1437
18278
+#: builtin/merge.c:1438
18279
#, c-format
18280
msgid "%s - not something we can merge"
18281
msgstr "%s - pas possible de fusionner ceci"
18282
18263
-#: builtin/merge.c:1439
18283
+#: builtin/merge.c:1440
18284
msgid "Can merge only exactly one commit into empty head"
18285
msgstr ""
18286
"Possible de fusionner exactement une seule validation dans une tête vide"
18287
18268
-#: builtin/merge.c:1520
18288
+#: builtin/merge.c:1521
18289
msgid "refusing to merge unrelated histories"
18290
msgstr "refus de fusionner des historiques sans relation"
18291
18272
-#: builtin/merge.c:1539
18292
+#: builtin/merge.c:1540
18293
#, c-format
18294
msgid "Updating %s..%s\n"
18295
msgstr "Mise à jour %s..%s\n"
18296
18277
-#: builtin/merge.c:1585
18297
+#: builtin/merge.c:1587
18298
#, c-format
18299
msgid "Trying really trivial in-index merge...\n"
18300
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
18301
18282
-#: builtin/merge.c:1592
18302
+#: builtin/merge.c:1594
18303
#, c-format
18304
msgid "Nope.\n"
18305
msgstr "Non.\n"
18306
18287
-#: builtin/merge.c:1623
18307
+#: builtin/merge.c:1625
18308
msgid "Not possible to fast-forward, aborting."
18309
msgstr "Pas possible d'avancer rapidement, abandon."
18310
18291
-#: builtin/merge.c:1651 builtin/merge.c:1716
18311
+#: builtin/merge.c:1653 builtin/merge.c:1719
18312
#, c-format
18313
msgid "Rewinding the tree to pristine...\n"
18314
msgstr "Retour de l'arbre à l'original...\n"
18315
18296
-#: builtin/merge.c:1655
18316
+#: builtin/merge.c:1657
18317
#, c-format
18318
msgid "Trying merge strategy %s...\n"
18319
msgstr "Essai de la stratégie de fusion %s...\n"
18320
18301
-#: builtin/merge.c:1707
18321
+#: builtin/merge.c:1709
18322
#, c-format
18323
msgid "No merge strategy handled the merge.\n"
18324
msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
18325
18306
-#: builtin/merge.c:1709
18326
+#: builtin/merge.c:1711
18327
#, c-format
18328
msgid "Merge with strategy %s failed.\n"
18329
msgstr "La fusion avec la stratégie %s a échoué.\n"
18330
18311
-#: builtin/merge.c:1718
18331
+#: builtin/merge.c:1721
18332
#, c-format
18313
-msgid "Using the %s to prepare resolving by hand.\n"
18333
+msgid "Using the %s strategy to prepare resolving by hand.\n"
18334
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
18335
18316
-#: builtin/merge.c:1732
18336
+#: builtin/merge.c:1735
18337
#, c-format
18338
msgid "Automatic merge went well; stopped before committing as requested\n"
18339
msgstr ""
@@ -20698,7 +20718,7 @@ msgid "fatal: no such branch/commit '%s'"
20718
msgstr "fatal : pas de branche ou commit '%s'"
20719
20720
#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
20701
-#: builtin/submodule--helper.c:2414
20721
+#: builtin/submodule--helper.c:2431
20722
#, c-format
20723
msgid "No such ref: %s"
20724
msgstr "Référence inexistante : %s"
@@ -22445,7 +22465,9 @@ msgstr ""
22465
#: builtin/show-branch.c:711
22466
msgid ""
22467
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
22448
-msgstr "--reflog est incompatible avec --all, --remotes, --independent et --merge-base"
22468
+msgstr ""
22469
+"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
22470
+"base"
22471
22472
#: builtin/show-branch.c:735
22473
msgid "no branches given, and HEAD is not valid"
@@ -22590,37 +22612,37 @@ msgstr "impossible de modifier la configuration d'index clairsemé"
22612
msgid "failed to open '%s'"
22613
msgstr "échec à l'ouverture de '%s'"
22614
22593
-#: builtin/sparse-checkout.c:419
22615
+#: builtin/sparse-checkout.c:413
22616
#, c-format
22617
msgid "could not normalize path %s"
22618
msgstr "impossible de normaliser le chemin '%s'"
22619
22598
-#: builtin/sparse-checkout.c:431
22620
+#: builtin/sparse-checkout.c:425
22621
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
22622
msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
22623
22602
-#: builtin/sparse-checkout.c:456
22624
+#: builtin/sparse-checkout.c:450
22625
#, c-format
22626
msgid "unable to unquote C-style string '%s'"
22627
msgstr "impossible de décoter la chaîne en style C '%s'"
22628
22607
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
22629
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
22630
msgid "unable to load existing sparse-checkout patterns"
22631
msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
22632
22611
-#: builtin/sparse-checkout.c:579
22633
+#: builtin/sparse-checkout.c:573
22634
msgid "read patterns from standard in"
22635
msgstr "lire les motifs depuis l'entrée standard"
22636
22615
-#: builtin/sparse-checkout.c:594
22637
+#: builtin/sparse-checkout.c:588
22638
msgid "git sparse-checkout reapply"
22639
msgstr "git sparse-checkout reapply"
22640
22619
-#: builtin/sparse-checkout.c:613
22641
+#: builtin/sparse-checkout.c:607
22642
msgid "git sparse-checkout disable"
22643
msgstr "git sparse-checkout disable"
22644
22623
-#: builtin/sparse-checkout.c:644
22645
+#: builtin/sparse-checkout.c:638
22646
msgid "error while refreshing working directory"
22647
msgstr "erreur lors du rafraîchissement du répertoire de travail"
22648
@@ -22908,7 +22930,7 @@ msgstr ""
22930
msgid "prepend comment character and space to each line"
22931
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
22932
22911
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
22933
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
22934
#, c-format
22935
msgid "Expecting a full ref name, got %s"
22936
msgstr "Nom de référence complet attendu, %s obtenu"
@@ -22922,26 +22944,27 @@ msgstr "submodule--helper print-default-remote n'accepte aucun argument"
22944
msgid "cannot strip one component off url '%s'"
22945
msgstr "impossible de supprimer un composant de l'URL '%s'"
22946
22925
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
22947
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
22948
+#: builtin/submodule--helper.c:2891
22949
msgid "alternative anchor for relative paths"
22950
msgstr "ancre alternative pour les chemins relatifs"
22951
22929
-#: builtin/submodule--helper.c:414
22952
+#: builtin/submodule--helper.c:416
22953
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
22954
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
22955
22933
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
22934
-#: builtin/submodule--helper.c:652
22956
+#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
22957
+#: builtin/submodule--helper.c:654
22958
#, c-format
22959
msgid "No url found for submodule path '%s' in .gitmodules"
22960
msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
22961
22939
-#: builtin/submodule--helper.c:524
22962
+#: builtin/submodule--helper.c:526
22963
#, c-format
22964
msgid "Entering '%s'\n"
22965
msgstr "Entrée dans '%s'\n"
22966
22944
-#: builtin/submodule--helper.c:527
22967
+#: builtin/submodule--helper.c:529
22968
#, c-format
22969
msgid ""
22970
"run_command returned non-zero status for %s\n"
@@ -22950,7 +22973,7 @@ msgstr ""
22973
"run_command a retourné un statut non-nul pour %s\n"
22974
"."
22975
22953
-#: builtin/submodule--helper.c:549
22976
+#: builtin/submodule--helper.c:551
22977
#, c-format
22978
msgid ""
22979
"run_command returned non-zero status while recursing in the nested "
@@ -22961,21 +22984,21 @@ msgstr ""
22984
"modules inclus de %s\n"
22985
"."
22986
22964
-#: builtin/submodule--helper.c:565
22987
+#: builtin/submodule--helper.c:567
22988
msgid "suppress output of entering each submodule command"
22989
msgstr ""
22990
"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
22991
22969
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
22970
-#: builtin/submodule--helper.c:1487
22992
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
22993
+#: builtin/submodule--helper.c:1489
22994
msgid "recurse into nested submodules"
22995
msgstr "parcourir récursivement les sous-modules"
22996
22974
-#: builtin/submodule--helper.c:572
22997
+#: builtin/submodule--helper.c:574
22998
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
22999
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
23000
22978
-#: builtin/submodule--helper.c:599
23001
+#: builtin/submodule--helper.c:601
23002
#, c-format
23003
msgid ""
23004
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22984,60 +23007,60 @@ msgstr ""
23007
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
23008
"son propre amont d'autorité."
23009
22987
-#: builtin/submodule--helper.c:666
23010
+#: builtin/submodule--helper.c:668
23011
#, c-format
23012
msgid "Failed to register url for submodule path '%s'"
23013
msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
23014
22992
-#: builtin/submodule--helper.c:670
23015
+#: builtin/submodule--helper.c:672
23016
#, c-format
23017
msgid "Submodule '%s' (%s) registered for path '%s'\n"
23018
msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n"
23019
22997
-#: builtin/submodule--helper.c:680
23020
+#: builtin/submodule--helper.c:682
23021
#, c-format
23022
msgid "warning: command update mode suggested for submodule '%s'\n"
23023
msgstr ""
23024
"attention : nous vous suggérons de spécifier une commande de mode de mise à "
23025
"jour pour le sous-module '%s'\n"
23026
23004
-#: builtin/submodule--helper.c:687
23027
+#: builtin/submodule--helper.c:689
23028
#, c-format
23029
msgid "Failed to register update mode for submodule path '%s'"
23030
msgstr ""
23031
"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
23032
"'%s'"
23033
23011
-#: builtin/submodule--helper.c:709
23034
+#: builtin/submodule--helper.c:711
23035
msgid "suppress output for initializing a submodule"
23036
msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
23037
23015
-#: builtin/submodule--helper.c:714
23038
+#: builtin/submodule--helper.c:716
23039
msgid "git submodule--helper init [<options>] [<path>]"
23040
msgstr "git submodule--helper init [<options>] [<chemin>]"
23041
23019
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
23042
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
23043
#, c-format
23044
msgid "no submodule mapping found in .gitmodules for path '%s'"
23045
msgstr ""
23046
"pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
23047
"chemin '%s'"
23048
23026
-#: builtin/submodule--helper.c:835
23049
+#: builtin/submodule--helper.c:837
23050
#, c-format
23051
msgid "could not resolve HEAD ref inside the submodule '%s'"
23052
msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
23053
23031
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
23054
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
23055
#, c-format
23056
msgid "failed to recurse into submodule '%s'"
23057
msgstr "récursion impossible dans le sous-module '%s'"
23058
23036
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
23059
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
23060
msgid "suppress submodule status output"
23061
msgstr "supprimer la sortie d'état du sous-module"
23062
23040
-#: builtin/submodule--helper.c:887
23063
+#: builtin/submodule--helper.c:889
23064
msgid ""
23065
"use commit stored in the index instead of the one stored in the submodule "
23066
"HEAD"
@@ -23045,98 +23068,98 @@ msgstr ""
23068
"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
23069
"du sous-module"
23070
23048
-#: builtin/submodule--helper.c:893
23071
+#: builtin/submodule--helper.c:895
23072
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
23073
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
23074
23052
-#: builtin/submodule--helper.c:917
23075
+#: builtin/submodule--helper.c:919
23076
msgid "git submodule--helper name <path>"
23077
msgstr "git submodule--helper <nom> <chemin>"
23078
23056
-#: builtin/submodule--helper.c:989
23079
+#: builtin/submodule--helper.c:991
23080
#, c-format
23081
msgid "* %s %s(blob)->%s(submodule)"
23082
msgstr "* %s %s(blob)->%s(submodule)"
23083
23061
-#: builtin/submodule--helper.c:992
23084
+#: builtin/submodule--helper.c:994
23085
#, c-format
23086
msgid "* %s %s(submodule)->%s(blob)"
23087
msgstr "* %s %s(submodule)->%s(blob)"
23088
23066
-#: builtin/submodule--helper.c:1005
23089
+#: builtin/submodule--helper.c:1007
23090
#, c-format
23091
msgid "%s"
23092
msgstr "%s"
23093
23071
-#: builtin/submodule--helper.c:1055
23094
+#: builtin/submodule--helper.c:1057
23095
#, c-format
23096
msgid "couldn't hash object from '%s'"
23097
msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
23098
23076
-#: builtin/submodule--helper.c:1059
23099
+#: builtin/submodule--helper.c:1061
23100
#, c-format
23101
msgid "unexpected mode %o\n"
23102
msgstr "mode %o inattendu\n"
23103
23081
-#: builtin/submodule--helper.c:1300
23104
+#: builtin/submodule--helper.c:1302
23105
msgid "use the commit stored in the index instead of the submodule HEAD"
23106
msgstr ""
23107
"utiliser le commit stocké dans l'index au lieu de la HEAD du sous-module"
23108
23086
-#: builtin/submodule--helper.c:1302
23109
+#: builtin/submodule--helper.c:1304
23110
msgid "compare the commit in the index with that in the submodule HEAD"
23111
msgstr "comparer le commit dans l'index avec celui dans la HEAD du sous-module"
23112
23090
-#: builtin/submodule--helper.c:1304
23113
+#: builtin/submodule--helper.c:1306
23114
msgid "skip submodules with 'ignore_config' value set to 'all'"
23115
msgstr "sauter les sous-modules avec la valeur 'ignore_config' à 'all'"
23116
23094
-#: builtin/submodule--helper.c:1306
23117
+#: builtin/submodule--helper.c:1308
23118
msgid "limit the summary size"
23119
msgstr "limiter la taille du résumé"
23120
23098
-#: builtin/submodule--helper.c:1311
23121
+#: builtin/submodule--helper.c:1313
23122
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
23123
msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
23124
23102
-#: builtin/submodule--helper.c:1335
23125
+#: builtin/submodule--helper.c:1337
23126
msgid "could not fetch a revision for HEAD"
23127
msgstr "impossible de récupérer une révision pour HEAD"
23128
23106
-#: builtin/submodule--helper.c:1340
23129
+#: builtin/submodule--helper.c:1342
23130
msgid "--cached and --files are mutually exclusive"
23131
msgstr "--cached et --files sont mutuellement exclusifs"
23132
23110
-#: builtin/submodule--helper.c:1407
23133
+#: builtin/submodule--helper.c:1409
23134
#, c-format
23135
msgid "Synchronizing submodule url for '%s'\n"
23136
msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
23137
23115
-#: builtin/submodule--helper.c:1413
23138
+#: builtin/submodule--helper.c:1415
23139
#, c-format
23140
msgid "failed to register url for submodule path '%s'"
23141
msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'"
23142
23120
-#: builtin/submodule--helper.c:1427
23143
+#: builtin/submodule--helper.c:1429
23144
#, c-format
23145
msgid "failed to get the default remote for submodule '%s'"
23146
msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'"
23147
23125
-#: builtin/submodule--helper.c:1438
23148
+#: builtin/submodule--helper.c:1440
23149
#, c-format
23150
msgid "failed to update remote for submodule '%s'"
23151
msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'"
23152
23130
-#: builtin/submodule--helper.c:1485
23153
+#: builtin/submodule--helper.c:1487
23154
msgid "suppress output of synchronizing submodule url"
23155
msgstr ""
23156
"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
23157
23135
-#: builtin/submodule--helper.c:1492
23158
+#: builtin/submodule--helper.c:1494
23159
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
23160
msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
23161
23139
-#: builtin/submodule--helper.c:1546
23162
+#: builtin/submodule--helper.c:1548
23163
#, c-format
23164
msgid ""
23165
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23146,7 +23169,7 @@ msgstr ""
23169
"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
23170
"historique)"
23171
23149
-#: builtin/submodule--helper.c:1558
23172
+#: builtin/submodule--helper.c:1560
23173
#, c-format
23174
msgid ""
23175
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23155,48 +23178,48 @@ msgstr ""
23178
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
23179
"utilisez '-f' pour les annuler"
23180
23158
-#: builtin/submodule--helper.c:1566
23181
+#: builtin/submodule--helper.c:1568
23182
#, c-format
23183
msgid "Cleared directory '%s'\n"
23184
msgstr "Répertoire '%s' nettoyé\n"
23185
23163
-#: builtin/submodule--helper.c:1568
23186
+#: builtin/submodule--helper.c:1570
23187
#, c-format
23188
msgid "Could not remove submodule work tree '%s'\n"
23189
msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
23190
23168
-#: builtin/submodule--helper.c:1579
23191
+#: builtin/submodule--helper.c:1581
23192
#, c-format
23193
msgid "could not create empty submodule directory %s"
23194
msgstr "impossible de créer le répertoire vide du sous-module %s"
23195
23173
-#: builtin/submodule--helper.c:1595
23196
+#: builtin/submodule--helper.c:1597
23197
#, c-format
23198
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
23199
msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
23200
23178
-#: builtin/submodule--helper.c:1624
23201
+#: builtin/submodule--helper.c:1626
23202
msgid "remove submodule working trees even if they contain local changes"
23203
msgstr ""
23204
"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
23205
"modifications locales"
23206
23184
-#: builtin/submodule--helper.c:1625
23207
+#: builtin/submodule--helper.c:1627
23208
msgid "unregister all submodules"
23209
msgstr "désenregistrer tous les sous-modules"
23210
23188
-#: builtin/submodule--helper.c:1630
23211
+#: builtin/submodule--helper.c:1632
23212
msgid ""
23213
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
23214
msgstr ""
23215
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
23216
23194
-#: builtin/submodule--helper.c:1644
23217
+#: builtin/submodule--helper.c:1646
23218
msgid "Use '--all' if you really want to deinitialize all submodules"
23219
msgstr ""
23220
"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
23221
23199
-#: builtin/submodule--helper.c:1713
23222
+#: builtin/submodule--helper.c:1690
23223
msgid ""
23224
"An alternate computed from a superproject's alternate is invalid.\n"
23225
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23208,47 +23231,69 @@ msgstr ""
23231
"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
23232
"clonez avec '--reference-if-able' au lieu de '--reference'."
23233
23211
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
23234
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
23235
#, c-format
23236
msgid "submodule '%s' cannot add alternate: %s"
23237
msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s"
23238
23216
-#: builtin/submodule--helper.c:1791
23239
+#: builtin/submodule--helper.c:1768
23240
#, c-format
23241
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
23242
msgstr ""
23243
"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
23244
23222
-#: builtin/submodule--helper.c:1798
23245
+#: builtin/submodule--helper.c:1775
23246
#, c-format
23247
msgid "Value '%s' for submodule.alternateLocation is not recognized"
23248
msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue"
23249
23227
-#: builtin/submodule--helper.c:1822
23250
+#: builtin/submodule--helper.c:1800
23251
+#, c-format
23252
+msgid "refusing to create/use '%s' in another submodule's git dir"
23253
+msgstr ""
23254
+"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
23255
+
23256
+#: builtin/submodule--helper.c:1841
23257
+#, c-format
23258
+msgid "clone of '%s' into submodule path '%s' failed"
23259
+msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
23260
+
23261
+#: builtin/submodule--helper.c:1846
23262
+#, c-format
23263
+msgid "directory not empty: '%s'"
23264
+msgstr "le répertoire n'est pas vide : '%s'"
23265
+
23266
+#: builtin/submodule--helper.c:1858
23267
+#, c-format
23268
+msgid "could not get submodule directory for '%s'"
23269
+msgstr "impossible de créer le répertoire de sous-module pour '%s'"
23270
+
23271
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
23272
msgid "where the new submodule will be cloned to"
23273
msgstr "emplacement où le sous-module sera cloné"
23274
23231
-#: builtin/submodule--helper.c:1825
23275
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
23276
msgid "name of the new submodule"
23277
msgstr "nom du nouveau sous-module"
23278
23235
-#: builtin/submodule--helper.c:1828
23279
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
23280
msgid "url where to clone the submodule from"
23281
msgstr "URL depuis laquelle cloner le sous-module"
23282
23239
-#: builtin/submodule--helper.c:1836
23283
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
23284
msgid "depth for shallow clones"
23285
msgstr "profondeur de l'historique des clones superficiels"
23286
23243
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
23287
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
23288
+#: builtin/submodule--helper.c:2909
23289
msgid "force cloning progress"
23290
msgstr "forcer l'affichage de la progression du clonage"
23291
23247
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
23292
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
23293
msgid "disallow cloning into non-empty directory"
23294
msgstr "interdire de cloner dans un répertoire non-vide"
23295
23251
-#: builtin/submodule--helper.c:1848
23296
+#: builtin/submodule--helper.c:1916
23297
msgid ""
23298
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
23299
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23258,105 +23303,84 @@ msgstr ""
23303
"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
23304
"--path <chemin>"
23305
23261
-#: builtin/submodule--helper.c:1873
23262
-#, c-format
23263
-msgid "refusing to create/use '%s' in another submodule's git dir"
23264
-msgstr ""
23265
-"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
23266
-
23267
-#: builtin/submodule--helper.c:1884
23268
-#, c-format
23269
-msgid "clone of '%s' into submodule path '%s' failed"
23270
-msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué"
23271
-
23272
-#: builtin/submodule--helper.c:1888
23273
-#, c-format
23274
-msgid "directory not empty: '%s'"
23275
-msgstr "le répertoire n'est pas vide : '%s'"
23276
-
23277
-#: builtin/submodule--helper.c:1900
23278
-#, c-format
23279
-msgid "could not get submodule directory for '%s'"
23280
-msgstr "impossible de créer le répertoire de sous-module pour '%s'"
23281
-
23282
-#: builtin/submodule--helper.c:1936
23306
+#: builtin/submodule--helper.c:1953
23307
#, c-format
23308
msgid "Invalid update mode '%s' for submodule path '%s'"
23309
msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
23310
23287
-#: builtin/submodule--helper.c:1940
23311
+#: builtin/submodule--helper.c:1957
23312
#, c-format
23313
msgid "Invalid update mode '%s' configured for submodule path '%s'"
23314
msgstr ""
23315
"Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
23316
23293
-#: builtin/submodule--helper.c:2041
23317
+#: builtin/submodule--helper.c:2058
23318
#, c-format
23319
msgid "Submodule path '%s' not initialized"
23320
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
23321
23298
-#: builtin/submodule--helper.c:2045
23322
+#: builtin/submodule--helper.c:2062
23323
msgid "Maybe you want to use 'update --init'?"
23324
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
23325
23302
-#: builtin/submodule--helper.c:2075
23326
+#: builtin/submodule--helper.c:2092
23327
#, c-format
23328
msgid "Skipping unmerged submodule %s"
23329
msgstr "Sous-module non fusionné %s non traité"
23330
23307
-#: builtin/submodule--helper.c:2104
23331
+#: builtin/submodule--helper.c:2121
23332
#, c-format
23333
msgid "Skipping submodule '%s'"
23334
msgstr "Sous-module '%s' non traité"
23335
23312
-#: builtin/submodule--helper.c:2254
23336
+#: builtin/submodule--helper.c:2271
23337
#, c-format
23338
msgid "Failed to clone '%s'. Retry scheduled"
23339
msgstr "Impossible de cloner '%s'. Réessai prévu"
23340
23317
-#: builtin/submodule--helper.c:2265
23341
+#: builtin/submodule--helper.c:2282
23342
#, c-format
23343
msgid "Failed to clone '%s' a second time, aborting"
23344
msgstr "Impossible de cloner '%s' pour la seconde fois, abandon"
23345
23322
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
23346
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
23347
msgid "path into the working tree"
23348
msgstr "chemin dans la copie de travail"
23349
23326
-#: builtin/submodule--helper.c:2330
23350
+#: builtin/submodule--helper.c:2347
23351
msgid "path into the working tree, across nested submodule boundaries"
23352
msgstr ""
23353
"chemin dans la copie de travail, traversant les frontières de sous-modules"
23354
23331
-#: builtin/submodule--helper.c:2334
23355
+#: builtin/submodule--helper.c:2351
23356
msgid "rebase, merge, checkout or none"
23357
msgstr "valeurs possibles : rebase, merge, checkout ou none"
23358
23335
-#: builtin/submodule--helper.c:2340
23359
+#: builtin/submodule--helper.c:2357
23360
msgid "create a shallow clone truncated to the specified number of revisions"
23361
msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié"
23362
23339
-#: builtin/submodule--helper.c:2343
23363
+#: builtin/submodule--helper.c:2360
23364
msgid "parallel jobs"
23365
msgstr "jobs parallèles"
23366
23343
-#: builtin/submodule--helper.c:2345
23367
+#: builtin/submodule--helper.c:2362
23368
msgid "whether the initial clone should follow the shallow recommendation"
23369
msgstr "spécifie si le clonage initial doit être aussi superficiel"
23370
23347
-#: builtin/submodule--helper.c:2346
23371
+#: builtin/submodule--helper.c:2363
23372
msgid "don't print cloning progress"
23373
msgstr "ne pas afficher la progression du clonage"
23374
23351
-#: builtin/submodule--helper.c:2357
23375
+#: builtin/submodule--helper.c:2374
23376
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
23377
msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
23378
23355
-#: builtin/submodule--helper.c:2370
23379
+#: builtin/submodule--helper.c:2387
23380
msgid "bad value for update parameter"
23381
msgstr "valeur invalide pour la mise à jour du paramètre"
23382
23359
-#: builtin/submodule--helper.c:2418
23383
+#: builtin/submodule--helper.c:2435
23384
#, c-format
23385
msgid ""
23386
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23365,86 +23389,140 @@ msgstr ""
23389
"La branche du sous-module %s est configurée pour hériter de la branche du "
23390
"superprojet, mais le superprojet n'est sur aucune branche"
23391
23368
-#: builtin/submodule--helper.c:2541
23392
+#: builtin/submodule--helper.c:2558
23393
#, c-format
23394
msgid "could not get a repository handle for submodule '%s'"
23395
msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
23396
23373
-#: builtin/submodule--helper.c:2574
23397
+#: builtin/submodule--helper.c:2591
23398
msgid "recurse into submodules"
23399
msgstr "parcourir récursivement les sous-modules"
23400
23377
-#: builtin/submodule--helper.c:2580
23401
+#: builtin/submodule--helper.c:2597
23402
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
23403
msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
23404
23381
-#: builtin/submodule--helper.c:2636
23405
+#: builtin/submodule--helper.c:2653
23406
msgid "check if it is safe to write to the .gitmodules file"
23407
msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
23408
23385
-#: builtin/submodule--helper.c:2639
23409
+#: builtin/submodule--helper.c:2656
23410
msgid "unset the config in the .gitmodules file"
23411
msgstr "désactiver la configuration dans le fichier .gitmodules"
23412
23389
-#: builtin/submodule--helper.c:2644
23413
+#: builtin/submodule--helper.c:2661
23414
msgid "git submodule--helper config <name> [<value>]"
23415
msgstr "git submodule--helper config name [<valeur>]"
23416
23393
-#: builtin/submodule--helper.c:2645
23417
+#: builtin/submodule--helper.c:2662
23418
msgid "git submodule--helper config --unset <name>"
23419
msgstr "git submodule--helper config --unset <nom>"
23420
23397
-#: builtin/submodule--helper.c:2646
23421
+#: builtin/submodule--helper.c:2663
23422
msgid "git submodule--helper config --check-writeable"
23423
msgstr "git submodule--helper config --check-writeable"
23424
23401
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
23425
+#: builtin/submodule--helper.c:2682 git-submodule.sh:150
23426
#, sh-format
23427
msgid "please make sure that the .gitmodules file is in the working tree"
23428
msgstr ""
23429
"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
23430
23407
-#: builtin/submodule--helper.c:2681
23431
+#: builtin/submodule--helper.c:2698
23432
msgid "suppress output for setting url of a submodule"
23433
msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module"
23434
23411
-#: builtin/submodule--helper.c:2685
23435
+#: builtin/submodule--helper.c:2702
23436
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
23437
msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
23438
23415
-#: builtin/submodule--helper.c:2718
23439
+#: builtin/submodule--helper.c:2735
23440
msgid "set the default tracking branch to master"
23441
msgstr "régler la branche de suivi par défaut à master"
23442
23419
-#: builtin/submodule--helper.c:2720
23443
+#: builtin/submodule--helper.c:2737
23444
msgid "set the default tracking branch"
23445
msgstr "régler la branche de suivi par défaut"
23446
23423
-#: builtin/submodule--helper.c:2724
23447
+#: builtin/submodule--helper.c:2741
23448
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
23449
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>"
23450
23427
-#: builtin/submodule--helper.c:2725
23451
+#: builtin/submodule--helper.c:2742
23452
msgid ""
23453
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
23454
msgstr ""
23455
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> "
23456
"<chemin>"
23457
23434
-#: builtin/submodule--helper.c:2732
23458
+#: builtin/submodule--helper.c:2749
23459
msgid "--branch or --default required"
23460
msgstr "--branch ou --default requis"
23461
23438
-#: builtin/submodule--helper.c:2735
23462
+#: builtin/submodule--helper.c:2752
23463
msgid "--branch and --default are mutually exclusive"
23464
msgstr "--branch et --default sont mutuellement exclusifs"
23465
23442
-#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
23466
+#: builtin/submodule--helper.c:2815
23467
+#, c-format
23468
+msgid "Adding existing repo at '%s' to the index\n"
23469
+msgstr "Ajout du dépôt existant à '%s' dans l'index\n"
23470
+
23471
+#: builtin/submodule--helper.c:2818
23472
+#, c-format
23473
+msgid "'%s' already exists and is not a valid git repo"
23474
+msgstr "'%s' existe déjà et n'est pas un dépôt git valide"
23475
+
23476
+#: builtin/submodule--helper.c:2828
23477
+#, c-format
23478
+msgid "A git directory for '%s' is found locally with remote(s):"
23479
+msgstr "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) distant(s) :"
23480
+
23481
+#: builtin/submodule--helper.c:2833
23482
+#, c-format
23483
+msgid ""
23484
+"If you want to reuse this local git directory instead of cloning again from\n"
23485
+" %s\n"
23486
+"use the '--force' option. If the local git directory is not the correct "
23487
+"repo\n"
23488
+"or if you are unsure what this means, choose another name with the '--name' "
23489
+"option.\n"
23490
+msgstr ""
23491
+"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner depuis\n"
23492
+" %s\n"
23493
+"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt correct\n"
23494
+"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'.\n"
23495
+
23496
+#: builtin/submodule--helper.c:2842
23497
+#, c-format
23498
+msgid "Reactivating local git directory for submodule '%s'\n"
23499
+msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n"
23500
+
23501
+#: builtin/submodule--helper.c:2875
23502
+#, c-format
23503
+msgid "unable to checkout submodule '%s'"
23504
+msgstr "Impossible d'extraire le sous-module '%s'"
23505
+
23506
+#: builtin/submodule--helper.c:2888
23507
+msgid "branch of repository to checkout on cloning"
23508
+msgstr "la branche du dépôt à extraire lors du clonage"
23509
+
23510
+#: builtin/submodule--helper.c:2910
23511
+msgid "allow adding an otherwise ignored submodule path"
23512
+msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
23513
+
23514
+#: builtin/submodule--helper.c:2917
23515
+msgid ""
23516
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
23517
+"name <name>"
23518
+msgstr "git submodule--helper add-clone [<options>...] --url <url> --path <chemin> --name <nom>"
23519
+
23520
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
23521
#, c-format
23522
msgid "%s doesn't support --super-prefix"
23523
msgstr "%s ne gère pas --super-prefix"
23524
23447
-#: builtin/submodule--helper.c:2798
23525
+#: builtin/submodule--helper.c:2991
23526
#, c-format
23527
msgid "'%s' is not a valid submodule--helper subcommand"
23528
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -25719,73 +25797,29 @@ msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
25797
msgid "'$sm_path' does not have a commit checked out"
25798
msgstr "'$sm_path' n'a pas de commit extrait"
25799
25722
-#: git-submodule.sh:249
25723
-#, sh-format
25724
-msgid "Adding existing repo at '$sm_path' to the index"
25725
-msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
25726
-
25727
-#: git-submodule.sh:251
25728
-#, sh-format
25729
-msgid "'$sm_path' already exists and is not a valid git repo"
25730
-msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
25731
-
25732
-#: git-submodule.sh:259
25733
-#, sh-format
25734
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
25735
-msgstr ""
25736
-"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
25737
-"distant(s) :"
25738
-
25739
-#: git-submodule.sh:261
25740
-#, sh-format
25741
-msgid ""
25742
-"If you want to reuse this local git directory instead of cloning again from\n"
25743
-" $realrepo\n"
25744
-"use the '--force' option. If the local git directory is not the correct "
25745
-"repo\n"
25746
-"or you are unsure what this means choose another name with the '--name' "
25747
-"option."
25748
-msgstr ""
25749
-"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner "
25750
-"depuis\n"
25751
-" $realrepo\n"
25752
-"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt "
25753
-"correct\n"
25754
-"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
25755
-
25756
-#: git-submodule.sh:267
25757
-#, sh-format
25758
-msgid "Reactivating local git directory for submodule '$sm_name'."
25759
-msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
25760
-
25761
-#: git-submodule.sh:279
25762
-#, sh-format
25763
-msgid "Unable to checkout submodule '$sm_path'"
25764
-msgstr "Impossible d'extraire le sous-module '$sm_path'"
25765
-
25766
-#: git-submodule.sh:284
25800
+#: git-submodule.sh:248
25801
#, sh-format
25802
msgid "Failed to add submodule '$sm_path'"
25803
msgstr "Échec d'ajout du sous-module '$sm_path'"
25804
25771
-#: git-submodule.sh:293
25805
+#: git-submodule.sh:257
25806
#, sh-format
25807
msgid "Failed to register submodule '$sm_path'"
25808
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
25809
25776
-#: git-submodule.sh:568
25810
+#: git-submodule.sh:532
25811
#, sh-format
25812
msgid "Unable to find current revision in submodule path '$displaypath'"
25813
msgstr ""
25814
"Impossible de trouver la révision courante dans le chemin de sous-module "
25815
"'$displaypath'"
25816
25783
-#: git-submodule.sh:578
25817
+#: git-submodule.sh:542
25818
#, sh-format
25819
msgid "Unable to fetch in submodule path '$sm_path'"
25820
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
25821
25788
-#: git-submodule.sh:583
25822
+#: git-submodule.sh:547
25823
#, sh-format
25824
msgid ""
25825
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25794,7 +25828,7 @@ msgstr ""
25828
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
25829
"chemin de sous-module '$sm_path'"
25830
25797
-#: git-submodule.sh:601
25831
+#: git-submodule.sh:565
25832
#, sh-format
25833
msgid ""
25834
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -25803,7 +25837,7 @@ msgstr ""
25837
"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
25838
"de rapatriement direct de $sha1 :"
25839
25806
-#: git-submodule.sh:607
25840
+#: git-submodule.sh:571
25841
#, sh-format
25842
msgid ""
25843
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -25812,52 +25846,52 @@ msgstr ""
25846
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
25847
"$sha1. La récupération directe de ce commit a échoué."
25848
25815
-#: git-submodule.sh:614
25849
+#: git-submodule.sh:578
25850
#, sh-format
25851
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
25852
msgstr ""
25853
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
25854
25821
-#: git-submodule.sh:615
25855
+#: git-submodule.sh:579
25856
#, sh-format
25857
msgid "Submodule path '$displaypath': checked out '$sha1'"
25858
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
25859
25826
-#: git-submodule.sh:619
25860
+#: git-submodule.sh:583
25861
#, sh-format
25862
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
25863
msgstr ""
25864
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
25865
25832
-#: git-submodule.sh:620
25866
+#: git-submodule.sh:584
25867
#, sh-format
25868
msgid "Submodule path '$displaypath': rebased into '$sha1'"
25869
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
25870
25837
-#: git-submodule.sh:625
25871
+#: git-submodule.sh:589
25872
#, sh-format
25873
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
25874
msgstr ""
25875
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
25876
25843
-#: git-submodule.sh:626
25877
+#: git-submodule.sh:590
25878
#, sh-format
25879
msgid "Submodule path '$displaypath': merged in '$sha1'"
25880
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
25881
25848
-#: git-submodule.sh:631
25882
+#: git-submodule.sh:595
25883
#, sh-format
25884
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
25885
msgstr ""
25886
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
25887
"'$displaypath'"
25888
25855
-#: git-submodule.sh:632
25889
+#: git-submodule.sh:596
25890
#, sh-format
25891
msgid "Submodule path '$displaypath': '$command $sha1'"
25892
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
25893
25860
-#: git-submodule.sh:663
25894
+#: git-submodule.sh:627
25895
#, sh-format
25896
msgid "Failed to recurse into submodule path '$displaypath'"
25897
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
@@ -26629,8 +26663,10 @@ msgid ""
26663
"Set sendemail.forbidSendmailVariables to false to disable this check.\n"
26664
msgstr ""
26665
"fatal : options de configuration trouvées pour 'sendmail'\n"
26632
-"git-send-email est configuré avec des options sendemail.* - veuillez noter le 'e'.\n"
26633
-"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette vérification.\n"
26666
+"git-send-email est configuré avec des options sendemail.* - veuillez noter "
26667
+"le 'e'.\n"
26668
+"Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
26669
+"vérification.\n"
26670
26671
#: git-send-email.perl:530 git-send-email.perl:746
26672
msgid "Cannot run git format-patch from outside a repository\n"