c9ef57cc3a · matheusbsbs/matheus-bagliano

@@ -75,8 +75,8 @@ msgid ""

75 msgstr ""

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

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

78 -"POT-Creation-Date: 2020-03-06 14:25+0800\n"

79 -"PO-Revision-Date: 2020-03-08 23:25+0100\n"

78 +"POT-Creation-Date: 2020-03-11 15:26+0800\n"

79 +"PO-Revision-Date: 2020-03-11 21:03+0100\n"

80 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"

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

82 "Language: fr\n"

@@ -281,8 +281,8 @@ msgstr "indexé"

281 msgid "unstaged"

282 msgstr "non-indexé"

283

284 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197

285 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

284 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

285 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

286 #: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

287 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

288 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

@@ -318,7 +318,9 @@ msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "

318 msgid ""

319 "If the patch applies cleanly, the edited hunk will immediately be marked for "

320 "staging."

321 -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme indexée."

321 +msgstr ""

322 +"Si le patch s'applique proprement, la section éditée sera immédiatement "

323 +"marquée comme indexée."

324

325 #: add-patch.c:40

326 msgid ""

@@ -353,7 +355,9 @@ msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "

355 msgid ""

356 "If the patch applies cleanly, the edited hunk will immediately be marked for "

357 "stashing."

356 -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme remisée."

358 +msgstr ""

359 +"Si le patch s'applique proprement, la section éditée sera immédiatement "

360 +"marquée comme remisée."

361

362 #: add-patch.c:61

363 msgid ""

@@ -388,7 +392,9 @@ msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "

392 msgid ""

393 "If the patch applies cleanly, the edited hunk will immediately be marked for "

394 "unstaging."

391 -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme desindexée."

395 +msgstr ""

396 +"Si le patch s'applique proprement, la section éditée sera immédiatement "

397 +"marquée comme desindexée."

398

399 #: add-patch.c:84

400 msgid ""

@@ -423,7 +429,9 @@ msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "

429 msgid ""

430 "If the patch applies cleanly, the edited hunk will immediately be marked for "

431 "applying."

426 -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme appliquée."

432 +msgstr ""

433 +"Si le patch s'applique proprement, la section éditée sera immédiatement "

434 +"marquée comme appliquée."

435

436 #: add-patch.c:106

437 msgid ""

@@ -461,7 +469,9 @@ msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "

469 msgid ""

470 "If the patch applies cleanly, the edited hunk will immediately be marked for "

471 "discarding."

464 -msgstr "Si le patch s'applique proprement, la section éditée sera immédiatement marquée comme éliminée."

472 +msgstr ""

473 +"Si le patch s'applique proprement, la section éditée sera immédiatement "

474 +"marquée comme éliminée."

475

476 #: add-patch.c:128 add-patch.c:193

477 msgid ""

@@ -1380,7 +1390,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1392

1383 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390

1393 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1394 msgid "Unable to write new index file"

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

1396

@@ -1392,7 +1402,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"

1402 msgid "apply changes matching the given path"

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

1404

1395 -#: apply.c:4973 builtin/am.c:2206

1405 +#: apply.c:4973 builtin/am.c:2260

1406 msgid "num"

1407 msgstr "num"

1408

@@ -1458,7 +1468,7 @@ msgstr "les chemins sont séparés par un caractère NUL"

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

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

1470

1461 -#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98

1471 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1472 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1473 #: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1474 msgid "action"

@@ -1506,7 +1516,7 @@ msgstr ""

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

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

1518

1509 -#: apply.c:5032 builtin/am.c:2194

1519 +#: apply.c:5032 builtin/am.c:2248

1520 msgid "root"

1521 msgstr "racine"

1522

@@ -1533,7 +1543,7 @@ msgstr ""

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

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

1545

1536 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299

1546 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1547 #, c-format

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

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

@@ -2110,8 +2120,8 @@ msgstr "l'index de groupe a disparu"

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

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

2122

2113 -#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398

2114 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457

2123 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2124 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2125 #, c-format

2126 msgid "could not parse %s"

2127 msgstr "impossible d'analyser %s"

@@ -2240,7 +2250,7 @@ msgstr ""

2250 msgid "could not find commit %s"

2251 msgstr "impossible de trouver le commit %s"

2252

2243 -#: commit-graph.c:852 builtin/am.c:1287

2253 +#: commit-graph.c:852 builtin/am.c:1292

2254 #, c-format

2255 msgid "unable to parse commit %s"

2256 msgstr "impossible d'analyser le commit %s"

@@ -3269,7 +3279,7 @@ msgid "invalid --stat value: %s"

3279 msgstr "valeur invalide de --stat : %s"

3280

3281 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3272 -#: parse-options.c:199 parse-options.c:203

3282 +#: parse-options.c:197 parse-options.c:201

3283 #, c-format

3284 msgid "%s expects a numerical value"

3285 msgstr "%s attend une valeur numérique"

@@ -4478,9 +4488,9 @@ msgstr "Impossible de créer '%s.lock' : %s"

4488 msgid "failed to read the cache"

4489 msgstr "impossible de lire le cache"

4490

4481 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

4491 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4492 #: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4483 -#: builtin/stash.c:264

4493 +#: builtin/stash.c:265

4494 msgid "unable to write new index file"

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

4496

@@ -4671,33 +4681,33 @@ msgstr "renommage"

4681 msgid "renamed"

4682 msgstr "renommé"

4683

4674 -#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175

4684 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117

4685 #, c-format

4686 msgid "Refusing to lose dirty file at %s"

4687 msgstr "Refus de perdre le fichier modifié %s"

4688

4679 -#: merge-recursive.c:1616

4689 +#: merge-recursive.c:1587

4690 #, c-format

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

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

4693

4684 -#: merge-recursive.c:1674

4694 +#: merge-recursive.c:1645

4695 #, c-format

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

4697 msgstr ""

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

4699

4690 -#: merge-recursive.c:1705

4700 +#: merge-recursive.c:1676

4701 #, c-format

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

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

4704

4695 -#: merge-recursive.c:1710

4705 +#: merge-recursive.c:1681

4706 #, c-format

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

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

4709

4700 -#: merge-recursive.c:1737

4710 +#: merge-recursive.c:1708

4711 #, c-format

4712 msgid ""

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

@@ -4706,18 +4716,18 @@ msgstr ""

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

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

4718

4709 -#: merge-recursive.c:1742

4719 +#: merge-recursive.c:1713

4720 msgid " (left unresolved)"

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

4722

4713 -#: merge-recursive.c:1851

4723 +#: merge-recursive.c:1793

4724 #, c-format

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

4726 msgstr ""

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

4728 ">'%s' dans %s"

4729

4720 -#: merge-recursive.c:2114

4730 +#: merge-recursive.c:2056

4731 #, c-format

4732 msgid ""

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

@@ -4728,7 +4738,7 @@ msgstr ""

4738 "parce que le répertoire %s a été renommé en plusieurs autres répertoires, "

4739 "sans aucune destination récupérant la majorité des fichiers."

4740

4731 -#: merge-recursive.c:2146

4741 +#: merge-recursive.c:2088

4742 #, c-format

4743 msgid ""

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

@@ -4737,7 +4747,7 @@ msgstr ""

4747 "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "

4748 "des renommages implicites de répertoire déplaçant les chemins suivants : %s."

4749

4740 -#: merge-recursive.c:2156

4750 +#: merge-recursive.c:2098

4751 #, c-format

4752 msgid ""

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

@@ -4746,7 +4756,7 @@ msgstr ""

4756 "CONFLIT (renommage implicite de répertoire) : impossible de transformer "

4757 "plusieurs chemins sur %s ; les chemins concernés sont : %s"

4758

4749 -#: merge-recursive.c:2248

4759 +#: merge-recursive.c:2190

4760 #, c-format

4761 msgid ""

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

@@ -4755,7 +4765,7 @@ msgstr ""

4765 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "

4766 "Renommage de répertoire %s->%s dans %s"

4767

4758 -#: merge-recursive.c:2493

4768 +#: merge-recursive.c:2435

4769 #, c-format

4770 msgid ""

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

@@ -4764,52 +4774,52 @@ msgstr ""

4774 "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "

4775 "renommé."

4776

4767 -#: merge-recursive.c:3019

4777 +#: merge-recursive.c:2961

4778 #, c-format

4779 msgid "cannot read object %s"

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

4781

4772 -#: merge-recursive.c:3022

4782 +#: merge-recursive.c:2964

4783 #, c-format

4784 msgid "object %s is not a blob"

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

4786

4777 -#: merge-recursive.c:3086

4787 +#: merge-recursive.c:3028

4788 msgid "modify"

4789 msgstr "modification"

4790

4781 -#: merge-recursive.c:3086

4791 +#: merge-recursive.c:3028

4792 msgid "modified"

4793 msgstr "modifié"

4794

4785 -#: merge-recursive.c:3098

4795 +#: merge-recursive.c:3040

4796 msgid "content"

4797 msgstr "contenu"

4798

4789 -#: merge-recursive.c:3102

4799 +#: merge-recursive.c:3044

4800 msgid "add/add"

4801 msgstr "ajout/ajout"

4802

4793 -#: merge-recursive.c:3125

4803 +#: merge-recursive.c:3067

4804 #, c-format

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

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

4807

4798 -#: merge-recursive.c:3147 git-submodule.sh:1003

4808 +#: merge-recursive.c:3089 git-submodule.sh:1003

4809 msgid "submodule"

4810 msgstr "sous-module"

4811

4802 -#: merge-recursive.c:3148

4812 +#: merge-recursive.c:3090

4813 #, c-format

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

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

4816

4807 -#: merge-recursive.c:3178

4817 +#: merge-recursive.c:3120

4818 #, c-format

4819 msgid "Adding as %s instead"

4820 msgstr "Ajout plutôt comme %s"

4821

4812 -#: merge-recursive.c:3261

4822 +#: merge-recursive.c:3203

4823 #, c-format

4824 msgid ""

4825 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4818,7 +4828,7 @@ msgstr ""

4828 "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "

4829 "en %s ; déplacé dans %s."

4830

4821 -#: merge-recursive.c:3264

4831 +#: merge-recursive.c:3206

4832 #, c-format

4833 msgid ""

4834 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4828,7 +4838,7 @@ msgstr ""

4838 "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "

4839 "vers %s."

4840

4831 -#: merge-recursive.c:3268

4841 +#: merge-recursive.c:3210

4842 #, c-format

4843 msgid ""

4844 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4837,7 +4847,7 @@ msgstr ""

4847 "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "

4848 "renommé en %s ; déplacé dans %s."

4849

4840 -#: merge-recursive.c:3271

4850 +#: merge-recursive.c:3213

4851 #, c-format

4852 msgid ""

4853 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4847,60 +4857,60 @@ msgstr ""

4857 "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "

4858 "être déplacé vers %s."

4859

4850 -#: merge-recursive.c:3385

4860 +#: merge-recursive.c:3327

4861 #, c-format

4862 msgid "Removing %s"

4863 msgstr "Suppression de %s"

4864

4855 -#: merge-recursive.c:3408

4865 +#: merge-recursive.c:3350

4866 msgid "file/directory"

4867 msgstr "fichier/répertoire"

4868

4859 -#: merge-recursive.c:3413

4869 +#: merge-recursive.c:3355

4870 msgid "directory/file"

4871 msgstr "répertoire/fichier"

4872

4863 -#: merge-recursive.c:3420

4873 +#: merge-recursive.c:3362

4874 #, c-format

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

4876 msgstr ""

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

4878

4869 -#: merge-recursive.c:3429

4879 +#: merge-recursive.c:3371

4880 #, c-format

4881 msgid "Adding %s"

4882 msgstr "Ajout de %s"

4883

4874 -#: merge-recursive.c:3438

4884 +#: merge-recursive.c:3380

4885 #, c-format

4886 msgid "CONFLICT (add/add): Merge conflict in %s"

4887 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"

4888

4879 -#: merge-recursive.c:3482

4889 +#: merge-recursive.c:3424

4890 msgid "Already up to date!"

4891 msgstr "Déjà à jour !"

4892

4883 -#: merge-recursive.c:3491

4893 +#: merge-recursive.c:3433

4894 #, c-format

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

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

4897

4888 -#: merge-recursive.c:3595

4898 +#: merge-recursive.c:3537

4899 msgid "Merging:"

4900 msgstr "Fusion :"

4901

4892 -#: merge-recursive.c:3608

4902 +#: merge-recursive.c:3550

4903 #, c-format

4904 msgid "found %u common ancestor:"

4905 msgid_plural "found %u common ancestors:"

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

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

4908

4899 -#: merge-recursive.c:3658

4909 +#: merge-recursive.c:3600

4910 msgid "merge returned no commit"

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

4912

4903 -#: merge-recursive.c:3717

4913 +#: merge-recursive.c:3659

4914 #, c-format

4915 msgid ""

4916 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4910,12 +4920,12 @@ msgstr ""

4920 "fusion :\n"

4921 " %s"

4922

4913 -#: merge-recursive.c:3814

4923 +#: merge-recursive.c:3756

4924 #, c-format

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

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

4927

4918 -#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877

4928 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4929 msgid "Unable to write index."

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

4931

@@ -5194,7 +5204,7 @@ msgstr "%s est incompatible avec %s"

5204 msgid "%s : incompatible with something else"

5205 msgstr "%s est incompatible avec toute autre option"

5206

5197 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319

5207 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5208 #, c-format

5209 msgid "%s takes no value"

5210 msgstr "%s n'accepte aucune valeur"

@@ -5204,41 +5214,41 @@ msgstr "%s n'accepte aucune valeur"

5214 msgid "%s isn't available"

5215 msgstr "%s n'est pas disponible"

5216

5207 -#: parse-options.c:219

5217 +#: parse-options.c:217

5218 #, c-format

5219 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5220 msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"

5221

5212 -#: parse-options.c:388

5222 +#: parse-options.c:386

5223 #, c-format

5224 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5225 msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"

5226

5217 -#: parse-options.c:422 parse-options.c:430

5227 +#: parse-options.c:420 parse-options.c:428

5228 #, c-format

5229 msgid "did you mean `--%s` (with two dashes)?"

5230 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"

5231

5222 -#: parse-options.c:859

5232 +#: parse-options.c:857

5233 #, c-format

5234 msgid "unknown option `%s'"

5235 msgstr "option inconnue « %s »"

5236

5227 -#: parse-options.c:861

5237 +#: parse-options.c:859

5238 #, c-format

5239 msgid "unknown switch `%c'"

5240 msgstr "bascule inconnue « %c »"

5241

5232 -#: parse-options.c:863

5242 +#: parse-options.c:861

5243 #, c-format

5244 msgid "unknown non-ascii option in string: `%s'"

5245 msgstr "option non-ascii inconnue dans la chaîne : '%s'"

5246

5237 -#: parse-options.c:887

5247 +#: parse-options.c:885

5248 msgid "..."

5249 msgstr "..."

5250

5241 -#: parse-options.c:906

5251 +#: parse-options.c:904

5252 #, c-format

5253 msgid "usage: %s"

5254 msgstr "usage : %s"

@@ -5246,21 +5256,21 @@ msgstr "usage : %s"

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

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

5258 #.

5249 -#: parse-options.c:912

5259 +#: parse-options.c:910

5260 #, c-format

5261 msgid " or: %s"

5262 msgstr " ou : %s"

5263

5254 -#: parse-options.c:915

5264 +#: parse-options.c:913

5265 #, c-format

5266 msgid " %s"

5267 msgstr " %s"

5268

5259 -#: parse-options.c:954

5269 +#: parse-options.c:952

5270 msgid "-NUM"

5271 msgstr "-NUM"

5272

5263 -#: parse-options.c:968

5273 +#: parse-options.c:966

5274 #, c-format

5275 msgid "alias of --%s"

5276 msgstr "alias pour --%s"

@@ -5591,7 +5601,7 @@ msgstr "entrées de préparation non ordonnées pour '%s'"

5601 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5602 #: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5603 #: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5594 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271

5604 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5605 #: builtin/submodule--helper.c:332

5606 msgid "index file corrupt"

5607 msgstr "fichier d'index corrompu"

@@ -5872,7 +5882,7 @@ msgstr "id d'objet inattendu pendant l'écriture de '%s'"

5882 msgid "could not write to '%s'"

5883 msgstr "impossible d'écrire dans '%s'"

5884

5875 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5885 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5886 #: builtin/rebase.c:1029

5887 #, c-format

5888 msgid "could not open '%s' for writing"

@@ -6669,7 +6679,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'"

6679 msgid "could not delete '%s'"

6680 msgstr "Impossible de supprimer '%s'"

6681

6672 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369

6682 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6683 #, c-format

6684 msgid "could not remove '%s'"

6685 msgstr "impossible de supprimer '%s'"

@@ -6726,7 +6736,7 @@ msgid "failed to finalize '%s'"

6736 msgstr "échec lors de la finalisation de '%s'"

6737

6738 #: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6729 -#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120

6739 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6740 #: builtin/rebase.c:593

6741 #, c-format

6742 msgid "could not read '%s'"

@@ -6777,8 +6787,8 @@ msgstr "aucune clé présente dans '%.*s'"

6787 msgid "unable to dequote value of '%s'"

6788 msgstr "Impossible de décoter la valeur de '%s'"

6789

6780 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6781 -#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072

6790 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6791 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6792 #, c-format

6793 msgid "could not open '%s' for reading"

6794 msgstr "impossible d'ouvrir '%s' en lecture"

@@ -6937,7 +6947,7 @@ msgstr "impossible d'analyser le commit HEAD"

6947 msgid "unable to parse commit author"

6948 msgstr "impossible d'analyser l'auteur du commit"

6949

6940 -#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687

6950 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6951 msgid "git write-tree failed to write a tree"

6952 msgstr "git write-tree a échoué à écrire un arbre"

6953

@@ -6946,7 +6956,7 @@ msgstr "git write-tree a échoué à écrire un arbre"

6956 msgid "unable to read commit message from '%s'"

6957 msgstr "impossible de lire le message de validation de '%s'"

6958

6949 -#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886

6959 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6960 #: builtin/merge.c:911

6961 msgid "failed to write commit object"

6962 msgstr "échec de l'écriture de l'objet commit"

@@ -8040,7 +8050,9 @@ msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"

8050

8051 #: sha1-name.c:1771

8052 msgid "relative path syntax can't be used outside working tree"

8043 -msgstr "la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de travail"

8053 +msgstr ""

8054 +"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "

8055 +"travail"

8056

8057 #: sha1-name.c:1909

8058 #, c-format

@@ -8145,7 +8157,9 @@ msgstr "mauvais argument --ignore-submodules : %s"

8157 msgid ""

8158 "Submodule in commit %s at path: '%s' collides with a submodule named the "

8159 "same. Skipping it."

8148 -msgstr "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un sous-module du même nom. Ignoré."

8160 +msgstr ""

8161 +"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "

8162 +"sous-module du même nom. Ignoré."

8163

8164 #: submodule.c:910

8165 #, c-format

@@ -8157,7 +8171,9 @@ msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"

8171 msgid ""

8172 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

8173 "submodule %s"

8160 -msgstr "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n 1' dans le sous-module %s"

8174 +msgstr ""

8175 +"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "

8176 +"1' dans le sous-module %s"

8177

8178 #: submodule.c:1118

8179 #, c-format

@@ -8940,7 +8956,11 @@ msgstr "numéro de port invalide"

8956 msgid "invalid '..' path segment"

8957 msgstr "segment de chemin '..' invalide"

8958

8943 -#: worktree.c:259 builtin/am.c:2084

8959 +#: walker.c:170

8960 +msgid "Fetching objects"

8961 +msgstr "Récupération des objets"

8962 +

8963 +#: worktree.c:259 builtin/am.c:2099

8964 #, c-format

8965 msgid "failed to read '%s'"

8966 msgstr "échec de la lecture de '%s'"

@@ -9584,7 +9604,7 @@ msgstr ""

9604

9605 #: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124

9606 #: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548

9587 -#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165

9607 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165

9608 msgid "dry run"

9609 msgstr "simuler l'action"

9610

@@ -9725,12 +9745,12 @@ msgid "--chmod param '%s' must be either -x or +x"

9745 msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"

9746

9747 #: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354

9728 -#: builtin/reset.c:327

9748 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509

9749 msgid "--pathspec-from-file is incompatible with pathspec arguments"

9750 msgstr "--pathspec-from-file est incompatible avec pathspec arguments"

9751

9752 #: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360

9733 -#: builtin/reset.c:333

9753 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515

9754 msgid "--pathspec-file-nul requires --pathspec-from-file"

9755 msgstr "--pathspec-file-nul nécessite --pathspec-from-file"

9756

@@ -9749,112 +9769,112 @@ msgstr ""

9769 "Éliminez ce message en lançant\n"

9770 "\"git config advice.addEmptyPathspec false\""

9771

9752 -#: builtin/am.c:347

9772 +#: builtin/am.c:352

9773 msgid "could not parse author script"

9774 msgstr "impossible d'analyser l'auteur du script"

9775

9756 -#: builtin/am.c:431

9776 +#: builtin/am.c:436

9777 #, c-format

9778 msgid "'%s' was deleted by the applypatch-msg hook"

9779 msgstr "'%s' a été effacé par le crochet applypatch-msg"

9780

9761 -#: builtin/am.c:473

9781 +#: builtin/am.c:478

9782 #, c-format

9783 msgid "Malformed input line: '%s'."

9784 msgstr "Ligne en entrée malformée : '%s'."

9785

9766 -#: builtin/am.c:511

9786 +#: builtin/am.c:516

9787 #, c-format

9788 msgid "Failed to copy notes from '%s' to '%s'"

9789 msgstr "Impossible de copier les notes de '%s' vers '%s'"

9790

9771 -#: builtin/am.c:537

9791 +#: builtin/am.c:542

9792 msgid "fseek failed"

9793 msgstr "échec de fseek"

9794

9775 -#: builtin/am.c:725

9795 +#: builtin/am.c:730

9796 #, c-format

9797 msgid "could not parse patch '%s'"

9798 msgstr "impossible d'analyser le patch '%s'"

9799

9780 -#: builtin/am.c:790

9800 +#: builtin/am.c:795

9801 msgid "Only one StGIT patch series can be applied at once"

9802 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

9803

9784 -#: builtin/am.c:838

9804 +#: builtin/am.c:843

9805 msgid "invalid timestamp"

9806 msgstr "horodatage invalide"

9807

9788 -#: builtin/am.c:843 builtin/am.c:855

9808 +#: builtin/am.c:848 builtin/am.c:860

9809 msgid "invalid Date line"

9810 msgstr "ligne de Date invalide"

9811

9792 -#: builtin/am.c:850

9812 +#: builtin/am.c:855

9813 msgid "invalid timezone offset"

9814 msgstr "décalage horaire invalide"

9815

9796 -#: builtin/am.c:943

9816 +#: builtin/am.c:948

9817 msgid "Patch format detection failed."

9818 msgstr "Échec de détection du format du patch."

9819

9800 -#: builtin/am.c:948 builtin/clone.c:409

9820 +#: builtin/am.c:953 builtin/clone.c:409

9821 #, c-format

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

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

9824

9805 -#: builtin/am.c:953

9825 +#: builtin/am.c:958

9826 msgid "Failed to split patches."

9827 msgstr "Échec de découpage des patchs."

9828

9809 -#: builtin/am.c:1084

9829 +#: builtin/am.c:1089

9830 #, c-format

9831 msgid "When you have resolved this problem, run \"%s --continue\"."

9832 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

9833

9814 -#: builtin/am.c:1085

9834 +#: builtin/am.c:1090

9835 #, c-format

9836 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

9837 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

9838

9819 -#: builtin/am.c:1086

9839 +#: builtin/am.c:1091

9840 #, c-format

9841 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

9842 msgstr ""

9843 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

9844 "abort\"."

9845

9826 -#: builtin/am.c:1169

9846 +#: builtin/am.c:1174

9847 msgid "Patch sent with format=flowed; space at the end of lines might be lost."

9848 msgstr ""

9849 "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "

9850 "être perdus."

9851

9832 -#: builtin/am.c:1197

9852 +#: builtin/am.c:1202

9853 msgid "Patch is empty."

9854 msgstr "Le patch actuel est vide."

9855

9836 -#: builtin/am.c:1262

9856 +#: builtin/am.c:1267

9857 #, c-format

9858 msgid "missing author line in commit %s"

9859 msgstr "ligne d'auteur manquante dans le commit %s"

9860

9841 -#: builtin/am.c:1265

9861 +#: builtin/am.c:1270

9862 #, c-format

9863 msgid "invalid ident line: %.*s"

9864 msgstr "ligne d'identification invalide : %.*s"

9865

9846 -#: builtin/am.c:1484

9866 +#: builtin/am.c:1489

9867 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

9868 msgstr ""

9869 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "

9870 "points."

9871

9852 -#: builtin/am.c:1486

9872 +#: builtin/am.c:1491

9873 msgid "Using index info to reconstruct a base tree..."

9874 msgstr ""

9875 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

9876

9857 -#: builtin/am.c:1505

9877 +#: builtin/am.c:1510

9878 msgid ""

9879 "Did you hand edit your patch?\n"

9880 "It does not apply to blobs recorded in its index."

@@ -9862,24 +9882,24 @@ msgstr ""

9882 "Avez-vous édité le patch à la main ?\n"

9883 "Il ne s'applique pas aux blobs enregistrés dans son index."

9884

9865 -#: builtin/am.c:1511

9885 +#: builtin/am.c:1516

9886 msgid "Falling back to patching base and 3-way merge..."

9887 msgstr "Retour à un patch de la base et fusion à 3 points..."

9888

9869 -#: builtin/am.c:1537

9889 +#: builtin/am.c:1542

9890 msgid "Failed to merge in the changes."

9891 msgstr "Échec d'intégration des modifications."

9892

9873 -#: builtin/am.c:1569

9893 +#: builtin/am.c:1574

9894 msgid "applying to an empty history"

9895 msgstr "application à un historique vide"

9896

9877 -#: builtin/am.c:1616 builtin/am.c:1620

9897 +#: builtin/am.c:1621 builtin/am.c:1625

9898 #, c-format

9899 msgid "cannot resume: %s does not exist."

9900 msgstr "impossible de continuer : %s n'existe pas."

9901

9882 -#: builtin/am.c:1638

9902 +#: builtin/am.c:1643

9903 msgid "Commit Body is:"

9904 msgstr "Le corps de la validation est :"

9905

@@ -9887,40 +9907,39 @@ msgstr "Le corps de la validation est :"

9907 #. in your translation. The program will only accept English

9908 #. input at this point.

9909 #.

9890 -#: builtin/am.c:1648

9910 +#: builtin/am.c:1653

9911 #, c-format

9912 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

9913 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

9914

9895 -#: builtin/am.c:1695 builtin/commit.c:398

9915 +#: builtin/am.c:1700 builtin/commit.c:398

9916 msgid "unable to write index file"

9917 msgstr "impossible d'écrire le fichier d'index"

9918

9899 -#: builtin/am.c:1699

9919 +#: builtin/am.c:1704

9920 #, c-format

9921 msgid "Dirty index: cannot apply patches (dirty: %s)"

9922 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

9923

9904 -#: builtin/am.c:1739 builtin/am.c:1807

9924 +#: builtin/am.c:1744 builtin/am.c:1812

9925 #, c-format

9926 msgid "Applying: %.*s"

9927 msgstr "Application de %.*s"

9928

9909 -#: builtin/am.c:1756

9929 +#: builtin/am.c:1761

9930 msgid "No changes -- Patch already applied."

9931 msgstr "Pas de changement -- Patch déjà appliqué."

9932

9913 -#: builtin/am.c:1762

9933 +#: builtin/am.c:1767

9934 #, c-format

9935 msgid "Patch failed at %s %.*s"

9936 msgstr "le patch a échoué à %s %.*s"

9937

9918 -#: builtin/am.c:1766

9919 -msgid "Use 'git am --show-current-patch' to see the failed patch"

9920 -msgstr ""

9921 -"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"

9938 +#: builtin/am.c:1771

9939 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"

9940 +msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"

9941

9923 -#: builtin/am.c:1810

9942 +#: builtin/am.c:1815

9943 msgid ""

9944 "No changes - did you forget to use 'git add'?\n"

9945 "If there is nothing left to stage, chances are that something else\n"

@@ -9931,7 +9950,7 @@ msgstr ""

9950 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

9951 "patch."

9952

9934 -#: builtin/am.c:1817

9953 +#: builtin/am.c:1822

9954 msgid ""

9955 "You still have unmerged paths in your index.\n"

9956 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -9944,17 +9963,17 @@ msgstr ""

9963 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "

9964 "accepter son état."

9965

9947 -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346

9966 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346

9967 #: builtin/reset.c:354

9968 #, c-format

9969 msgid "Could not parse object '%s'."

9970 msgstr "Impossible d'analyser l'objet '%s'."

9971

9953 -#: builtin/am.c:1976

9972 +#: builtin/am.c:1981

9973 msgid "failed to clean index"

9974 msgstr "échec du nettoyage de l'index"

9975

9957 -#: builtin/am.c:2020

9976 +#: builtin/am.c:2025

9977 msgid ""

9978 "You seem to have moved HEAD since the last 'am' failure.\n"

9979 "Not rewinding to ORIG_HEAD"

@@ -9962,76 +9981,86 @@ msgstr ""

9981 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

9982 "Pas de retour à ORIG_HEAD"

9983

9965 -#: builtin/am.c:2117

9984 +#: builtin/am.c:2132

9985 #, c-format

9986 msgid "Invalid value for --patch-format: %s"

9987 msgstr "Valeur invalide pour --patch-format : %s"

9988

9970 -#: builtin/am.c:2153

9989 +#: builtin/am.c:2172

9990 +#, c-format

9991 +msgid "Invalid value for --show-current-patch: %s"

9992 +msgstr "Valeur invalide pour --show-current-patch : %s"

9993 +

9994 +#: builtin/am.c:2176

9995 +#, c-format

9996 +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"

9997 +msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"

9998 +

9999 +#: builtin/am.c:2207

10000 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

10001 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"

10002

9974 -#: builtin/am.c:2154

10003 +#: builtin/am.c:2208

10004 msgid "git am [<options>] (--continue | --skip | --abort)"

10005 msgstr "git am [<options>] (--continue | --skip | --abort)"

10006

9978 -#: builtin/am.c:2160

10007 +#: builtin/am.c:2214

10008 msgid "run interactively"

10009 msgstr "exécution interactive"

10010

9982 -#: builtin/am.c:2162

10011 +#: builtin/am.c:2216

10012 msgid "historical option -- no-op"

10013 msgstr "option historique -- no-op"

10014

9986 -#: builtin/am.c:2164

10015 +#: builtin/am.c:2218

10016 msgid "allow fall back on 3way merging if needed"

10017 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

10018

9990 -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58

9991 -#: builtin/repack.c:304 builtin/stash.c:811

10019 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58

10020 +#: builtin/repack.c:304 builtin/stash.c:812

10021 msgid "be quiet"

10022 msgstr "être silencieux"

10023

9995 -#: builtin/am.c:2167

10024 +#: builtin/am.c:2221

10025 msgid "add a Signed-off-by line to the commit message"

10026 msgstr "ajouter une ligne Signed-off-by au message de validation"

10027

9999 -#: builtin/am.c:2170

10028 +#: builtin/am.c:2224

10029 msgid "recode into utf8 (default)"

10030 msgstr "recoder en utf-8 (par défaut)"

10031

10003 -#: builtin/am.c:2172

10032 +#: builtin/am.c:2226

10033 msgid "pass -k flag to git-mailinfo"

10034 msgstr "passer l'option -k à git-mailinfo"

10035

10007 -#: builtin/am.c:2174

10036 +#: builtin/am.c:2228

10037 msgid "pass -b flag to git-mailinfo"

10038 msgstr "passer l'option -b à git-mailinfo"

10039

10011 -#: builtin/am.c:2176

10040 +#: builtin/am.c:2230

10041 msgid "pass -m flag to git-mailinfo"

10042 msgstr "passer l'option -m à git-mailinfo"

10043

10015 -#: builtin/am.c:2178

10044 +#: builtin/am.c:2232

10045 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

10046 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

10047

10019 -#: builtin/am.c:2181

10048 +#: builtin/am.c:2235

10049 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

10050 msgstr ""

10051 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

10052

10024 -#: builtin/am.c:2184

10053 +#: builtin/am.c:2238

10054 msgid "strip everything before a scissors line"

10055 msgstr "retirer tout le contenu avant la ligne des ciseaux"

10056

10028 -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195

10029 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207

10030 -#: builtin/am.c:2213

10057 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249

10058 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261

10059 +#: builtin/am.c:2267

10060 msgid "pass it through git-apply"

10061 msgstr "le passer jusqu'à git-apply"

10062

10034 -#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670

10063 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670

10064 #: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250

10065 #: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505

10066 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321

@@ -10040,67 +10069,67 @@ msgstr "le passer jusqu'à git-apply"

10069 msgid "n"

10070 msgstr "n"

10071

10043 -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38

10072 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38

10073 #: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38

10074 msgid "format"

10075 msgstr "format"

10076

10048 -#: builtin/am.c:2210

10077 +#: builtin/am.c:2264

10078 msgid "format the patch(es) are in"

10079 msgstr "format de présentation des patchs"

10080

10052 -#: builtin/am.c:2216

10081 +#: builtin/am.c:2270

10082 msgid "override error message when patch failure occurs"

10083 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

10084

10056 -#: builtin/am.c:2218

10085 +#: builtin/am.c:2272

10086 msgid "continue applying patches after resolving a conflict"

10087 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

10088

10060 -#: builtin/am.c:2221

10089 +#: builtin/am.c:2275

10090 msgid "synonyms for --continue"

10091 msgstr "synonymes de --continue"

10092

10064 -#: builtin/am.c:2224

10093 +#: builtin/am.c:2278

10094 msgid "skip the current patch"

10095 msgstr "sauter le patch courant"

10096

10068 -#: builtin/am.c:2227

10097 +#: builtin/am.c:2281

10098 msgid "restore the original branch and abort the patching operation."

10099 msgstr ""

10100 "restaurer la branche originale et abandonner les applications de patch."

10101

10073 -#: builtin/am.c:2230

10102 +#: builtin/am.c:2284

10103 msgid "abort the patching operation but keep HEAD where it is."

10104 msgstr "abandonne l'opération de patch mais garde HEAD où il est."

10105

10077 -#: builtin/am.c:2233

10078 -msgid "show the patch being applied."

10079 -msgstr "afficher le patch en cours d'application."

10106 +#: builtin/am.c:2288

10107 +msgid "show the patch being applied"

10108 +msgstr "afficher le patch en cours d'application"

10109

10081 -#: builtin/am.c:2237

10110 +#: builtin/am.c:2293

10111 msgid "lie about committer date"

10112 msgstr "mentir sur la date de validation"

10113

10085 -#: builtin/am.c:2239

10114 +#: builtin/am.c:2295

10115 msgid "use current timestamp for author date"

10116 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

10117

10089 -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512

10118 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512

10119 #: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517

10120 #: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418

10121 msgid "key-id"

10122 msgstr "id-clé"

10123

10095 -#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557

10124 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557

10125 msgid "GPG-sign commits"

10126 msgstr "signer les commits avec GPG"

10127

10099 -#: builtin/am.c:2245

10128 +#: builtin/am.c:2301

10129 msgid "(internal use for git-rebase)"

10130 msgstr "(utilisation interne pour git-rebase)"

10131

10103 -#: builtin/am.c:2263

10132 +#: builtin/am.c:2319

10133 msgid ""

10134 "The -b/--binary option has been a no-op for long time, and\n"

10135 "it will be removed. Please do not use it anymore."

@@ -10108,17 +10137,17 @@ msgstr ""

10137 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

10138 "et elle sera supprimée. Veuillez ne plus l'utiliser."

10139

10111 -#: builtin/am.c:2270

10140 +#: builtin/am.c:2326

10141 msgid "failed to read the index"

10142 msgstr "échec à la lecture de l'index"

10143

10115 -#: builtin/am.c:2285

10144 +#: builtin/am.c:2341

10145 #, c-format

10146 msgid "previous rebase directory %s still exists but mbox given."

10147 msgstr ""

10148 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

10149

10121 -#: builtin/am.c:2309

10150 +#: builtin/am.c:2365

10151 #, c-format

10152 msgid ""

10153 "Stray %s directory found.\n"

@@ -10127,13 +10156,13 @@ msgstr ""

10156 "Répertoire abandonné %s trouvé.\n"

10157 "Utilisez \"git am --abort\" pour le supprimer."

10158

10130 -#: builtin/am.c:2315

10159 +#: builtin/am.c:2371

10160 msgid "Resolve operation not in progress, we are not resuming."

10161 msgstr ""

10162 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

10163 "reprise."

10164

10136 -#: builtin/am.c:2325

10165 +#: builtin/am.c:2381

10166 msgid "interactive mode requires patches on the command line"

10167 msgstr "le mode interactif requiert des rustines sur la ligne de commande"

10168

@@ -11797,7 +11826,7 @@ msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

11826 msgid "--pathspec-from-file is incompatible with --detach"

11827 msgstr "--pathspec-from-file est incompatible avec --detach"

11828

11800 -#: builtin/checkout.c:1681 builtin/reset.c:324

11829 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506

11830 msgid "--pathspec-from-file is incompatible with --patch"

11831 msgstr "--pathspec-from-file est incompatible avec --patch"

11832

@@ -12487,7 +12516,7 @@ msgid "id of a parent commit object"

12516 msgstr "id d'un objet commit parent"

12517

12518 #: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271

12490 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472

12519 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477

12520 #: builtin/tag.c:412

12521 msgid "message"

12522 msgstr "message"

@@ -13292,7 +13321,9 @@ msgstr ""

13321

13322 #: builtin/config.c:159

13323 msgid "show scope of config (worktree, local, global, system, command)"

13295 -msgstr "afficher la portée de configuration (arbre de travail, local, global, système, commande)"

13324 +msgstr ""

13325 +"afficher la portée de configuration (arbre de travail, local, global, "

13326 +"système, commande)"

13327

13328 #: builtin/config.c:160 builtin/env--helper.c:40

13329 msgid "value"

@@ -17309,7 +17340,7 @@ msgstr "références-notes"

17340 msgid "use notes from <notes-ref>"

17341 msgstr "utiliser les notes depuis <références-notes>"

17342

17312 -#: builtin/notes.c:1034 builtin/stash.c:1610

17343 +#: builtin/notes.c:1034 builtin/stash.c:1643

17344 #, c-format

17345 msgid "unknown subcommand: %s"

17346 msgstr "sous-commande inconnue : %s"

@@ -17679,7 +17710,9 @@ msgstr "Énumération des objets"

17710 msgid ""

17711 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"

17712 "reused %<PRIu32>"

17682 -msgstr "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), réutilisés du pack %<PRIu32>"

17713 +msgstr ""

17714 +"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "

17715 +"réutilisés du pack %<PRIu32>"

17716

17717 #: builtin/pack-refs.c:8

17718 msgid "git pack-refs [<options>]"

@@ -18607,7 +18640,9 @@ msgstr ""

18640 msgid ""

18641 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"

18642 "\"."

18610 -msgstr "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), \"keep\" (garder) et \"ask\" (demander)."

18643 +msgstr ""

18644 +"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "

18645 +"\"keep\" (garder) et \"ask\" (demander)."

18646

18647 #: builtin/rebase.c:1401

18648 #, c-format

@@ -18725,10 +18760,6 @@ msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"

18760 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"

18761 msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"

18762

18728 -#: builtin/rebase.c:1546

18729 -msgid "{drop,keep,ask}"

18730 -msgstr "{drop,keep,ask}"

18731 -

18763 #: builtin/rebase.c:1547

18764 msgid "how to handle commits that become empty"

18765 msgstr "comment gérer les commits qui deviennent vides"

@@ -18868,7 +18899,8 @@ msgstr "--strategy requiert --merge ou --interactive"

18899

18900 #: builtin/rebase.c:1899

18901 msgid "cannot combine apply options with merge options"

18871 -msgstr "impossible de combiner les options d'application avec les options de fusion"

18902 +msgstr ""

18903 +"impossible de combiner les options d'application avec les options de fusion"

18904

18905 #: builtin/rebase.c:1912

18906 #, c-format

@@ -20133,8 +20165,8 @@ msgstr "HEAD est maintenant à %s"

20165 msgid "Cannot do a %s reset in the middle of a merge."

20166 msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion."

20167

20136 -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594

20137 -#: builtin/stash.c:618

20168 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595

20169 +#: builtin/stash.c:619

20170 msgid "be quiet, only report errors"

20171 msgstr "être silencieux, afficher seulement les erreurs"

20172

@@ -20401,38 +20433,42 @@ msgid_plural "the following files have local modifications:"

20433 msgstr[0] "le fichier suivant a des modifications locales :"

20434 msgstr[1] "les fichiers suivants ont des modifications locales :"

20435

20404 -#: builtin/rm.c:242

20436 +#: builtin/rm.c:243

20437 msgid "do not list removed files"

20438 msgstr "ne pas afficher les fichiers supprimés"

20439

20408 -#: builtin/rm.c:243

20440 +#: builtin/rm.c:244

20441 msgid "only remove from the index"

20442 msgstr "supprimer seulement de l'index"

20443

20412 -#: builtin/rm.c:244

20444 +#: builtin/rm.c:245

20445 msgid "override the up-to-date check"

20446 msgstr "outrepasser la vérification des fichiers à jour"

20447

20416 -#: builtin/rm.c:245

20448 +#: builtin/rm.c:246

20449 msgid "allow recursive removal"

20450 msgstr "autoriser la suppression récursive"

20451

20420 -#: builtin/rm.c:247

20452 +#: builtin/rm.c:248

20453 msgid "exit with a zero status even if nothing matched"

20454 msgstr "sortir avec un état zéro même si rien ne correspondait"

20455

20424 -#: builtin/rm.c:289

20456 +#: builtin/rm.c:282

20457 +msgid "No pathspec was given. Which files should I remove?"

20458 +msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"

20459 +

20460 +#: builtin/rm.c:305

20461 msgid "please stage your changes to .gitmodules or stash them to proceed"

20462 msgstr ""

20463 "veuillez indexer vos modifications de .gitmodules ou les remiser pour "

20464 "continuer"

20465

20430 -#: builtin/rm.c:307

20466 +#: builtin/rm.c:323

20467 #, c-format

20468 msgid "not removing '%s' recursively without -r"

20469 msgstr "pas de suppression récursive de '%s' sans -r"

20470

20435 -#: builtin/rm.c:346

20471 +#: builtin/rm.c:362

20472 #, c-format

20473 msgid "git rm: unable to remove %s"

20474 msgstr "git rm : impossible de supprimer %s"

@@ -20703,7 +20739,8 @@ msgstr ""

20739

20740 #: builtin/sparse-checkout.c:225

20741 msgid "failed to create directory for sparse-checkout file"

20706 -msgstr "échec de la création du répertoire pour le fichier d'extraction partielle"

20742 +msgstr ""

20743 +"échec de la création du répertoire pour le fichier d'extraction partielle"

20744

20745 #: builtin/sparse-checkout.c:266

20746 msgid "failed to set extensions.worktreeConfig setting"

@@ -20760,15 +20797,15 @@ msgstr "désactiver d'extraction partielle"

20797 msgid "error while refreshing working directory"

20798 msgstr "erreur lors du rafraîchissement du répertoire de travail"

20799

20763 -#: builtin/stash.c:22 builtin/stash.c:37

20800 +#: builtin/stash.c:22 builtin/stash.c:38

20801 msgid "git stash list [<options>]"

20802 msgstr "git stash list [<options>]"

20803

20767 -#: builtin/stash.c:23 builtin/stash.c:42

20804 +#: builtin/stash.c:23 builtin/stash.c:43

20805 msgid "git stash show [<options>] [<stash>]"

20806 msgstr "git stash show [<options>] [<remise>]"

20807

20771 -#: builtin/stash.c:24 builtin/stash.c:47

20808 +#: builtin/stash.c:24 builtin/stash.c:48

20809 msgid "git stash drop [-q|--quiet] [<stash>]"

20810 msgstr "git stash drop [-q|--quiet] [<remise>]"

20811

@@ -20776,25 +20813,27 @@ msgstr "git stash drop [-q|--quiet] [<remise>]"

20813 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

20814 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]"

20815

20779 -#: builtin/stash.c:26 builtin/stash.c:62

20816 +#: builtin/stash.c:26 builtin/stash.c:63

20817 msgid "git stash branch <branchname> [<stash>]"

20818 msgstr "git stash branch <nom-de-branche> [<remise>]"

20819

20783 -#: builtin/stash.c:27 builtin/stash.c:67

20820 +#: builtin/stash.c:27 builtin/stash.c:68

20821 msgid "git stash clear"

20822 msgstr "git stash clear"

20823

20787 -#: builtin/stash.c:28 builtin/stash.c:77

20824 +#: builtin/stash.c:28

20825 msgid ""

20826 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20827 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20828 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"

20829 " [--] [<pathspec>...]]"

20830 msgstr ""

20831 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20832 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20833 +" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"

20834 " [--] [<spécificateur-de-chemin>...]]"

20835

20797 -#: builtin/stash.c:31 builtin/stash.c:84

20836 +#: builtin/stash.c:32 builtin/stash.c:85

20837 msgid ""

20838 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20839 " [-u|--include-untracked] [-a|--all] [<message>]"

@@ -20802,188 +20841,198 @@ msgstr ""

20841 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20842 " [-u|--include-untracked] [-a|--all] [<message>]"

20843

20805 -#: builtin/stash.c:52

20844 +#: builtin/stash.c:53

20845 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"

20846 msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"

20847

20809 -#: builtin/stash.c:57

20848 +#: builtin/stash.c:58

20849 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"

20850 msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"

20851

20813 -#: builtin/stash.c:72

20852 +#: builtin/stash.c:73

20853 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"

20854 msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"

20855

20817 -#: builtin/stash.c:127

20856 +#: builtin/stash.c:78

20857 +msgid ""

20858 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20859 +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20860 +" [--] [<pathspec>...]]"

20861 +msgstr ""

20862 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

20863 +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

20864 +" [--] [<spécificateur-de-chemin>...]]"

20865 +

20866 +#: builtin/stash.c:128

20867 #, c-format

20868 msgid "'%s' is not a stash-like commit"

20869 msgstr "'%s' n'est pas une validation de type remisage"

20870

20822 -#: builtin/stash.c:147

20871 +#: builtin/stash.c:148

20872 #, c-format

20873 msgid "Too many revisions specified:%s"

20874 msgstr "Trop de révisions spécifiées : %s"

20875

20827 -#: builtin/stash.c:161 git-legacy-stash.sh:549

20876 +#: builtin/stash.c:162 git-legacy-stash.sh:549

20877 msgid "No stash entries found."

20878 msgstr "Aucune entrée de remisage trouvée."

20879

20831 -#: builtin/stash.c:175

20880 +#: builtin/stash.c:176

20881 #, c-format

20882 msgid "%s is not a valid reference"

20883 msgstr "%s n'est pas une référence valide"

20884

20836 -#: builtin/stash.c:224 git-legacy-stash.sh:75

20885 +#: builtin/stash.c:225 git-legacy-stash.sh:75

20886 msgid "git stash clear with parameters is unimplemented"

20887 msgstr "git stash clear avec des paramètres n'est pas implémenté"

20888

20840 -#: builtin/stash.c:403

20889 +#: builtin/stash.c:404

20890 msgid "cannot apply a stash in the middle of a merge"

20891 msgstr "impossible d'appliquer un remisage en cours de fusion"

20892

20844 -#: builtin/stash.c:414

20893 +#: builtin/stash.c:415

20894 #, c-format

20895 msgid "could not generate diff %s^!."

20896 msgstr "impossible de générer %s^!."

20897

20849 -#: builtin/stash.c:421

20898 +#: builtin/stash.c:422

20899 msgid "conflicts in index.Try without --index."

20900 msgstr "conflits dans l'index. Essayez sans --index."

20901

20853 -#: builtin/stash.c:427

20902 +#: builtin/stash.c:428

20903 msgid "could not save index tree"

20904 msgstr "impossible de sauvegarder l'arbre d'index"

20905

20857 -#: builtin/stash.c:436

20906 +#: builtin/stash.c:437

20907 msgid "could not restore untracked files from stash"

20908 msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"

20909

20861 -#: builtin/stash.c:450

20910 +#: builtin/stash.c:451

20911 #, c-format

20912 msgid "Merging %s with %s"

20913 msgstr "Fusion de %s avec %s"

20914

20866 -#: builtin/stash.c:460 git-legacy-stash.sh:681

20915 +#: builtin/stash.c:461 git-legacy-stash.sh:681

20916 msgid "Index was not unstashed."

20917 msgstr "L'index n'a pas été sorti de remise."

20918

20870 -#: builtin/stash.c:521 builtin/stash.c:620

20919 +#: builtin/stash.c:522 builtin/stash.c:621

20920 msgid "attempt to recreate the index"

20921 msgstr "tentative de recréer l'index"

20922

20874 -#: builtin/stash.c:554

20923 +#: builtin/stash.c:555

20924 #, c-format

20925 msgid "Dropped %s (%s)"

20926 msgstr "%s supprimé (%s)"

20927

20879 -#: builtin/stash.c:557

20928 +#: builtin/stash.c:558

20929 #, c-format

20930 msgid "%s: Could not drop stash entry"

20931 msgstr "%s : Impossible de supprimer l'élément de stash"

20932

20884 -#: builtin/stash.c:582

20933 +#: builtin/stash.c:583

20934 #, c-format

20935 msgid "'%s' is not a stash reference"

20936 msgstr "'%s' n'est pas une référence de remisage"

20937

20889 -#: builtin/stash.c:632 git-legacy-stash.sh:695

20938 +#: builtin/stash.c:633 git-legacy-stash.sh:695

20939 msgid "The stash entry is kept in case you need it again."

20940 msgstr ""

20941 "L'entrée de remisage est conservée au cas où vous en auriez encore besoin."

20942

20894 -#: builtin/stash.c:655 git-legacy-stash.sh:713

20943 +#: builtin/stash.c:656 git-legacy-stash.sh:713

20944 msgid "No branch name specified"

20945 msgstr "Aucune branche spécifiée"

20946

20898 -#: builtin/stash.c:795 builtin/stash.c:832

20947 +#: builtin/stash.c:796 builtin/stash.c:833

20948 #, c-format

20949 msgid "Cannot update %s with %s"

20950 msgstr "Impossible de mettre à jour %s avec %s"

20951

20903 -#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509

20952 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543

20953 msgid "stash message"

20954 msgstr "message pour le remisage"

20955

20907 -#: builtin/stash.c:823

20956 +#: builtin/stash.c:824

20957 msgid "\"git stash store\" requires one <commit> argument"

20958 msgstr "\"git stash store\" exige un argument <commit>"

20959

20911 -#: builtin/stash.c:1048 git-legacy-stash.sh:218

20960 +#: builtin/stash.c:1049 git-legacy-stash.sh:218

20961 msgid "No changes selected"

20962 msgstr "Aucun changement sélectionné"

20963

20915 -#: builtin/stash.c:1148 git-legacy-stash.sh:150

20964 +#: builtin/stash.c:1149 git-legacy-stash.sh:150

20965 msgid "You do not have the initial commit yet"

20966 msgstr "Vous n'avez pas encore la validation initiale"

20967

20919 -#: builtin/stash.c:1175 git-legacy-stash.sh:165

20968 +#: builtin/stash.c:1176 git-legacy-stash.sh:165

20969 msgid "Cannot save the current index state"

20970 msgstr "Impossible de sauver l'état courant de l'index"

20971

20923 -#: builtin/stash.c:1184 git-legacy-stash.sh:180

20972 +#: builtin/stash.c:1185 git-legacy-stash.sh:180

20973 msgid "Cannot save the untracked files"

20974 msgstr "Impossible de sauver les fichiers non-suivis"

20975

20927 -#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201

20976 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201

20977 #: git-legacy-stash.sh:214

20978 msgid "Cannot save the current worktree state"

20979 msgstr "Impossible de sauver l'état courant de la copie de travail"

20980

20932 -#: builtin/stash.c:1232 git-legacy-stash.sh:234

20981 +#: builtin/stash.c:1233 git-legacy-stash.sh:234

20982 msgid "Cannot record working tree state"

20983 msgstr "Impossible d'enregistrer l'état de la copie de travail"

20984

20936 -#: builtin/stash.c:1281 git-legacy-stash.sh:338

20985 +#: builtin/stash.c:1282 git-legacy-stash.sh:338

20986 msgid "Can't use --patch and --include-untracked or --all at the same time"

20987 msgstr ""

20988 "Impossible d'utiliser --patch et --include-untracked ou --all en même temps"

20989

20941 -#: builtin/stash.c:1297

20990 +#: builtin/stash.c:1298

20991 msgid "Did you forget to 'git add'?"

20992 msgstr "Vous avez sûrement oublié 'git add' ?"

20993

20945 -#: builtin/stash.c:1312 git-legacy-stash.sh:346

20994 +#: builtin/stash.c:1313 git-legacy-stash.sh:346

20995 msgid "No local changes to save"

20996 msgstr "Pas de modifications locales à sauver"

20997

20949 -#: builtin/stash.c:1319 git-legacy-stash.sh:351

20998 +#: builtin/stash.c:1320 git-legacy-stash.sh:351

20999 msgid "Cannot initialize stash"

21000 msgstr "Impossible d'initialiser le remisage"

21001

20953 -#: builtin/stash.c:1334 git-legacy-stash.sh:355

21002 +#: builtin/stash.c:1335 git-legacy-stash.sh:355

21003 msgid "Cannot save the current status"

21004 msgstr "Impossible de sauver l'état courant"

21005

20957 -#: builtin/stash.c:1339

21006 +#: builtin/stash.c:1340

21007 #, c-format

21008 msgid "Saved working directory and index state %s"

21009 msgstr "Arbre de travail et état de l'index sauvegardés dans %s"

21010

20962 -#: builtin/stash.c:1429 git-legacy-stash.sh:385

21011 +#: builtin/stash.c:1430 git-legacy-stash.sh:385

21012 msgid "Cannot remove worktree changes"

21013 msgstr "Impossible de supprimer les changements de la copie de travail"

21014

20966 -#: builtin/stash.c:1464 builtin/stash.c:1500

21015 +#: builtin/stash.c:1469 builtin/stash.c:1534

21016 msgid "keep index"

21017 msgstr "conserver l'index"

21018

20970 -#: builtin/stash.c:1466 builtin/stash.c:1502

21019 +#: builtin/stash.c:1471 builtin/stash.c:1536

21020 msgid "stash in patch mode"

21021 msgstr "remiser une mode rustine"

21022

20974 -#: builtin/stash.c:1467 builtin/stash.c:1503

21023 +#: builtin/stash.c:1472 builtin/stash.c:1537

21024 msgid "quiet mode"

21025 msgstr "mode silencieux"

21026

20978 -#: builtin/stash.c:1469 builtin/stash.c:1505

21027 +#: builtin/stash.c:1474 builtin/stash.c:1539

21028 msgid "include untracked files in stash"

21029 msgstr "inclure les fichiers non suivis dans la remise"

21030

20982 -#: builtin/stash.c:1471 builtin/stash.c:1507

21031 +#: builtin/stash.c:1476 builtin/stash.c:1541

21032 msgid "include ignore files"

21033 msgstr "inclure les fichiers ignorés"

21034

20986 -#: builtin/stash.c:1567

21035 +#: builtin/stash.c:1600

21036 #, c-format

21037 msgid "could not exec %s"

21038 msgstr "impossible d'exécuter %s"

@@ -21300,7 +21349,10 @@ msgid ""

21349 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "

21350 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "

21351 "<url> --path <path>"

21303 -msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> --path <chemin>"

21352 +msgstr ""

21353 +"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "

21354 +"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "

21355 +"--path <chemin>"

21356

21357 #: builtin/submodule--helper.c:1449

21358 #, c-format

@@ -22697,41 +22749,41 @@ msgstr "impossible de compresser la requête ; erreur de fin zlib %d"

22749 msgid "dumb http transport does not support shallow capabilities"

22750 msgstr "le protocole http idiot ne supporte la capacité superficielle"

22751

22700 -#: remote-curl.c:1037

22752 +#: remote-curl.c:1038

22753 msgid "fetch failed."

22754 msgstr "échec du récupération."

22755

22704 -#: remote-curl.c:1085

22756 +#: remote-curl.c:1086

22757 msgid "cannot fetch by sha1 over smart http"

22758 msgstr "impossible de récupérer par sha1 sur http intelligent"

22759

22708 -#: remote-curl.c:1129 remote-curl.c:1135

22760 +#: remote-curl.c:1130 remote-curl.c:1136

22761 #, c-format

22762 msgid "protocol error: expected sha/ref, got '%s'"

22763 msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"

22764

22713 -#: remote-curl.c:1147 remote-curl.c:1262

22765 +#: remote-curl.c:1148 remote-curl.c:1263

22766 #, c-format

22767 msgid "http transport does not support %s"

22768 msgstr "le transport http ne supporte pas %s"

22769

22718 -#: remote-curl.c:1183

22770 +#: remote-curl.c:1184

22771 msgid "git-http-push failed"

22772 msgstr "échec de git-http-push"

22773

22722 -#: remote-curl.c:1368

22774 +#: remote-curl.c:1369

22775 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"

22776 msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"

22777

22726 -#: remote-curl.c:1400

22778 +#: remote-curl.c:1401

22779 msgid "remote-curl: error reading command stream from git"

22780 msgstr "remote-curl : erreur de lecture du flux de commande depuis git"

22781

22730 -#: remote-curl.c:1407

22782 +#: remote-curl.c:1408

22783 msgid "remote-curl: fetch attempted without a local repo"

22784 msgstr "remote-curl : récupération tentée sans dépôt local"

22785

22734 -#: remote-curl.c:1447

22786 +#: remote-curl.c:1448

22787 #, c-format

22788 msgid "remote-curl: unknown command '%s' from git"

22789 msgstr "remote-curl : commande inconnue '%s' depuis git"

@@ -24962,100 +25014,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n"

25014 #, perl-format

25015 msgid "Do you really want to send %s? [y|N]: "

25016 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

24965 -

24966 -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "

24967 -#~ msgstr "Indexer le changement de mode [y,n,a,q,d%s,?] ? "

24968 -

24969 -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "

24970 -#~ msgstr "Indexer la suppression [y,n,a,q,d%s,?] ? "

24971 -

24972 -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "

24973 -#~ msgstr "Indexer cette section [y,n,a,q,d%s,?] ? "

24974 -

24975 -#~ msgid ""

24976 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

24977 -#~ "marked for staging.\n"

24978 -#~ msgstr ""

24979 -#~ "Si le patch s'applique proprement, la section éditée sera\n"

24980 -#~ "immédiatement marquée comme indexée.\n"

24981 -

24982 -#~ msgid ""

24983 -#~ "y - stage this hunk\n"

24984 -#~ "n - do not stage this hunk\n"

24985 -#~ "q - quit; do not stage this hunk or any of the remaining ones\n"

24986 -#~ "a - stage this and all the remaining hunks\n"

24987 -#~ "d - do not stage this hunk nor any of the remaining hunks\n"

24988 -#~ msgstr ""

24989 -#~ "y - indexer cette section\n"

24990 -#~ "n - ne pas indexer cette section\n"

24991 -#~ "q - quitter ; ne pas indexer cette section ni les autres restantes\n"

24992 -#~ "a - indexer cette section et toutes les suivantes\n"

24993 -#~ "d - ne pas indexer cette section ni les suivantes\n"

24994 -

24995 -#~ msgid "could not copy '%s' to '%s'."

24996 -#~ msgstr "impossible de copier '%s' vers '%s'."

24997 -

24998 -#~ msgid "malformed ident line"

24999 -#~ msgstr "ligne d'identification malformée"

25000 -

25001 -#~ msgid "corrupted author without date information"

25002 -#~ msgstr "ligne author corrompue sans information de date"

25003 -

25004 -#~ msgid "could not parse '%.*s'"

25005 -#~ msgstr "impossible d'analyser '%.*s'"

25006 -

25007 -#~ msgid "could not checkout %s"

25008 -#~ msgstr "extraction de %s impossible"

25009 -

25010 -#~ msgid "filename in tree entry contains backslash: '%s'"

25011 -#~ msgstr ""

25012 -#~ "le nom du fichier dans l'entrée de l'arbre contient une barre oblique "

25013 -#~ "inversée : '%s'"

25014 -

25015 -#~ msgid "Use -f if you really want to add them.\n"

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

25017 -

25018 -#~ msgid "Maybe you wanted to say 'git add .'?\n"

25019 -#~ msgstr "Vous vouliez sûrement dire 'git add .' ?\n"

25020 -

25021 -#~ msgid "packfile is invalid: %s"

25022 -#~ msgstr "le fichier packet est invalide : %s"

25023 -

25024 -#~ msgid "unable to open packfile for reuse: %s"

25025 -#~ msgstr "ouverture du fichier paquet pour réutilisation impossible : %s"

25026 -

25027 -#~ msgid "unable to seek in reused packfile"

25028 -#~ msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé"

25029 -

25030 -#~ msgid "unable to read from reused packfile"

25031 -#~ msgstr "lecture du fichier de paquet réutilisé impossible"

25032 -

25033 -#~ msgid "no HEAD?"

25034 -#~ msgstr "pas de HEAD ?"

25035 -

25036 -#~ msgid "make committer date match author date"

25037 -#~ msgstr "aligner la date de validateur sur la date d'auteur"

25038 -

25039 -#~ msgid "ignore author date and use current date"

25040 -#~ msgstr "ignorer la date d'auteur et utiliser la date actuelle"

25041 -

25042 -#~ msgid "synonym of --reset-author-date"

25043 -#~ msgstr "synonyme pour --reset-author-date"

25044 -

25045 -#~ msgid "ignore changes in whitespace"

25046 -#~ msgstr "ignorer des modifications d'espace"

25047 -

25048 -#~ msgid "preserve empty commits during rebase"

25049 -#~ msgstr "préserver les validations vides pendant le rebasage"

25050 -

25051 -#~ msgid "cannot combine --use-bitmap-index with object filtering"

25052 -#~ msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"

25053 -

25054 -#~ msgid ""

25055 -#~ "The following path is ignored by one of your .gitignore files:\n"

25056 -#~ "$sm_path\n"

25057 -#~ "Use -f if you really want to add it."

25058 -#~ msgstr ""

25059 -#~ "Le chemin suivant est ignoré par un de vos fichiers .gitignore :\n"

25060 -#~ "$sm_path\n"

25061 -#~ "Utilisez -f si vous voulez vraiment l'ajouter."

l10n: fr : v2.26.0 rnd 2