bbb7d710ea · matheusbsbs/matheus-bagliano

@@ -77,8 +77,8 @@ msgid ""

77 msgstr ""

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

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

80 -"POT-Creation-Date: 2021-11-04 08:34+0800\n"

81 -"PO-Revision-Date: 2021-11-05 20:38+0100\n"

80 +"POT-Creation-Date: 2021-11-10 08:55+0800\n"

81 +"PO-Revision-Date: 2021-11-10 22:00+0100\n"

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

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

84 "Language: fr\n"

@@ -284,7 +284,7 @@ msgstr "non-indexé"

284

285 #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

286 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

287 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190

287 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194

288 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

289 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

290 #: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

@@ -10686,7 +10686,7 @@ msgstr ""

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

10687

10688 #: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124

10689 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550

10689 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550

10690 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194

10691 msgid "dry run"

10692 msgstr "simuler l'action"

@@ -11159,11 +11159,11 @@ msgstr "le passer jusqu'à git-apply"

11159

11160 #: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17

11161 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262

11162 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217

11162 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221

11163 #: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655

11164 #: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172

11165 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175

11166 -#: parse-options.h:316

11166 +#: parse-options.h:315

11167 msgid "n"

11168 msgstr "n"

11169

@@ -11214,7 +11214,7 @@ msgid "use current timestamp for author date"

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

11215

11216 #: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642

11217 -#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099

11217 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099

11218 #: builtin/revert.c:117 builtin/tag.c:460

11219 msgid "key-id"

11220 msgstr "id-clé"

@@ -11728,7 +11728,7 @@ msgstr "montrer les statistiques de coût d'activité"

11728 #: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179

11729 #: builtin/merge.c:298 builtin/multi-pack-index.c:103

11730 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178

11731 -#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566

11731 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566

11732 #: builtin/send-pack.c:202

11733 msgid "force progress reporting"

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

@@ -13022,7 +13022,7 @@ msgstr "argument de branche ou de commit manquant"

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

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

13024

13025 -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322

13025 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321

13026 msgid "style"

13027 msgstr "style"

13028

@@ -13450,7 +13450,7 @@ msgid "path to git-upload-pack on the remote"

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

13451

13452 #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876

13453 -#: builtin/pull.c:208

13453 +#: builtin/pull.c:212

13454 msgid "depth"

13455 msgstr "profondeur"

13456

@@ -13459,7 +13459,7 @@ msgid "create a shallow clone of that depth"

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

13460

13461 #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933

13462 -#: builtin/pull.c:211

13462 +#: builtin/pull.c:215

13463 msgid "time"

13464 msgstr "heure"

13465

@@ -13468,11 +13468,11 @@ msgid "create a shallow clone since a specific time"

13468 msgstr "créer un clone superficiel depuis une date spécifique"

13469

13470 #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207

13471 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022

13471 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022

13472 msgid "revision"

13473 msgstr "révision"

13474

13475 -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215

13475 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219

13476 msgid "deepen history of shallow clone, excluding rev"

13477 msgstr ""

13478 "approfondir l'historique d'un clone superficiel en excluant une révision"

@@ -13509,21 +13509,21 @@ msgid "set config inside the new repository"

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

13510

13511 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77

13512 -#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200

13512 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200

13513 msgid "server-specific"

13514 msgstr "spécifique au serveur"

13515

13516 #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77

13517 -#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201

13517 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201

13518 msgid "option to transmit"

13519 msgstr "option à transmettre"

13520

13521 -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234

13521 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238

13522 #: builtin/push.c:576

13523 msgid "use IPv4 addresses only"

13524 msgstr "n'utiliser que des adresses IPv4"

13525

13526 -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237

13526 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241

13527 #: builtin/push.c:578

13528 msgid "use IPv6 addresses only"

13529 msgstr "n'utiliser que des adresses IPv6"

@@ -13926,7 +13926,7 @@ msgid "read commit log message from file"

13926 msgstr "lire le message de validation depuis un fichier"

13927

13928 #: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300

13929 -#: builtin/pull.c:176 builtin/revert.c:118

13929 +#: builtin/pull.c:180 builtin/revert.c:118

13930 msgid "GPG sign commit"

13931 msgstr "signer la validation avec GPG"

13932

@@ -14342,7 +14342,7 @@ msgstr "terminer les éléments par NUL"

14342

14343 #: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668

14344 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202

14345 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336

14345 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335

14346 msgid "mode"

14347 msgstr "mode"

14348

@@ -14424,7 +14424,7 @@ msgid "override date for commit"

14424 msgstr "remplacer la date pour la validation"

14425

14426 #: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634

14427 -#: parse-options.h:328 ref-filter.h:92

14427 +#: parse-options.h:327 ref-filter.h:92

14428 msgid "commit"

14429 msgstr "commit"

14430

@@ -14469,7 +14469,7 @@ msgid "add custom trailer(s)"

14469 msgstr "ajouter des lignes terminales personnaliser"

14470

14471 #: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303

14472 -#: builtin/pull.c:145 builtin/revert.c:110

14472 +#: builtin/pull.c:146 builtin/revert.c:110

14473 msgid "add a Signed-off-by trailer"

14474 msgstr "ajouter une ligne terminale Signed-off-by"

14475

@@ -15466,15 +15466,15 @@ msgstr "git fetch --all [<options>]"

15466 msgid "fetch.parallel cannot be negative"

15467 msgstr "fetch.parallel ne peut pas être négatif"

15468

15469 -#: builtin/fetch.c:145 builtin/pull.c:185

15469 +#: builtin/fetch.c:145 builtin/pull.c:189

15470 msgid "fetch from all remotes"

15471 msgstr "récupérer depuis tous les dépôts distants"

15472

15473 -#: builtin/fetch.c:147 builtin/pull.c:245

15473 +#: builtin/fetch.c:147 builtin/pull.c:249

15474 msgid "set upstream for git pull/fetch"

15475 msgstr "définir la branche amont pour git pull/fetch"

15476

15477 -#: builtin/fetch.c:149 builtin/pull.c:188

15477 +#: builtin/fetch.c:149 builtin/pull.c:192

15478 msgid "append to .git/FETCH_HEAD instead of overwriting"

15479 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

15480

@@ -15482,7 +15482,7 @@ msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

15482 msgid "use atomic transaction to update references"

15483 msgstr "utiliser une transaction atomique pour mettre à jour les références"

15484

15485 -#: builtin/fetch.c:153 builtin/pull.c:191

15485 +#: builtin/fetch.c:153 builtin/pull.c:195

15486 msgid "path to upload pack on remote end"

15487 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

15488

@@ -15494,7 +15494,7 @@ msgstr "forcer l'écrasement de la branche locale"

15494 msgid "fetch from multiple remotes"

15495 msgstr "récupérer depuis plusieurs dépôts distants"

15496

15497 -#: builtin/fetch.c:158 builtin/pull.c:195

15497 +#: builtin/fetch.c:158 builtin/pull.c:199

15498 msgid "fetch all tags and associated objects"

15499 msgstr "récupérer toutes les étiquettes et leurs objets associés"

15500

@@ -15512,7 +15512,7 @@ msgstr ""

15512 "modifier le spécificateur de référence pour placer les références dans refs/"

15513 "prefetch/"

15514

15515 -#: builtin/fetch.c:166 builtin/pull.c:198

15515 +#: builtin/fetch.c:166 builtin/pull.c:202

15516 msgid "prune remote-tracking branches no longer on remote"

15517 msgstr ""

15518 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

@@ -15524,7 +15524,7 @@ msgstr ""

15524 "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "

15525 "encombrent les étiquettes modifiées"

15526

15527 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122

15527 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123

15528 msgid "on-demand"

15529 msgstr "à la demande"

15530

@@ -15536,7 +15536,7 @@ msgstr "contrôler la récupération récursive dans les sous-modules"

15536 msgid "write fetched references to the FETCH_HEAD file"

15537 msgstr "écrire les références récupérées dans le fichier FETCH_HEAD"

15538

15539 -#: builtin/fetch.c:176 builtin/pull.c:206

15539 +#: builtin/fetch.c:176 builtin/pull.c:210

15540 msgid "keep downloaded pack"

15541 msgstr "conserver le paquet téléchargé"

15542

@@ -15544,16 +15544,16 @@ msgstr "conserver le paquet téléchargé"

15544 msgid "allow updating of HEAD ref"

15545 msgstr "permettre la mise à jour de la référence HEAD"

15546

15547 -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209

15548 -#: builtin/pull.c:218

15547 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213

15548 +#: builtin/pull.c:222

15549 msgid "deepen history of shallow clone"

15550 msgstr "approfondir l'historique d'un clone superficiel"

15551

15552 -#: builtin/fetch.c:183 builtin/pull.c:212

15552 +#: builtin/fetch.c:183 builtin/pull.c:216

15553 msgid "deepen history of shallow repository based on time"

15554 msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date"

15555

15556 -#: builtin/fetch.c:189 builtin/pull.c:221

15556 +#: builtin/fetch.c:189 builtin/pull.c:225

15557 msgid "convert to a complete repository"

15558 msgstr "convertir en un dépôt complet"

15559

@@ -15569,19 +15569,19 @@ msgstr ""

15569 "par défaut pour la récupération récursive de sous-modules (priorité plus "

15570 "basse que les fichiers de config)"

15571

15572 -#: builtin/fetch.c:199 builtin/pull.c:224

15572 +#: builtin/fetch.c:199 builtin/pull.c:228

15573 msgid "accept refs that update .git/shallow"

15574 msgstr "accepter les références qui mettent à jour .git/shallow"

15575

15576 -#: builtin/fetch.c:200 builtin/pull.c:226

15576 +#: builtin/fetch.c:200 builtin/pull.c:230

15577 msgid "refmap"

15578 msgstr "correspondance de référence"

15579

15580 -#: builtin/fetch.c:201 builtin/pull.c:227

15580 +#: builtin/fetch.c:201 builtin/pull.c:231

15581 msgid "specify fetch refmap"

15582 msgstr "spécifier une correspondance de référence pour la récupération"

15583

15584 -#: builtin/fetch.c:208 builtin/pull.c:240

15584 +#: builtin/fetch.c:208 builtin/pull.c:244

15585 msgid "report that we have only objects reachable from this object"

15586 msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"

15587

@@ -15595,7 +15595,7 @@ msgstr ""

15595 msgid "run 'maintenance --auto' after fetching"

15596 msgstr "lancer 'maintenance --auto' après la récupération"

15597

15598 -#: builtin/fetch.c:217 builtin/pull.c:243

15598 +#: builtin/fetch.c:217 builtin/pull.c:247

15599 msgid "check for forced-updates on all updated branches"

15600 msgstr ""

15601 "vérifier les mises à jour forcées (forced-updates) sur toutes les branches "

@@ -18307,33 +18307,33 @@ msgstr "Les stratégies disponibles sont :"

18307 msgid "Available custom strategies are:"

18308 msgstr "Les stratégies personnalisées sont :"

18309

18310 -#: builtin/merge.c:257 builtin/pull.c:133

18310 +#: builtin/merge.c:257 builtin/pull.c:134

18311 msgid "do not show a diffstat at the end of the merge"

18312 msgstr "ne pas afficher un diffstat à la fin de la fusion"

18313

18314 -#: builtin/merge.c:260 builtin/pull.c:136

18314 +#: builtin/merge.c:260 builtin/pull.c:137

18315 msgid "show a diffstat at the end of the merge"

18316 msgstr "afficher un diffstat à la fin de la fusion"

18317

18318 -#: builtin/merge.c:261 builtin/pull.c:139

18318 +#: builtin/merge.c:261 builtin/pull.c:140

18319 msgid "(synonym to --stat)"

18320 msgstr "(synonyme de --stat)"

18321

18322 -#: builtin/merge.c:263 builtin/pull.c:142

18322 +#: builtin/merge.c:263 builtin/pull.c:143

18323 msgid "add (at most <n>) entries from shortlog to merge commit message"

18324 msgstr ""

18325 "ajouter (au plus <n>) éléments du journal court au message de validation de "

18326 "la fusion"

18327

18328 -#: builtin/merge.c:266 builtin/pull.c:148

18328 +#: builtin/merge.c:266 builtin/pull.c:149

18329 msgid "create a single commit instead of doing a merge"

18330 msgstr "créer une validation unique au lieu de faire une fusion"

18331

18332 -#: builtin/merge.c:268 builtin/pull.c:151

18332 +#: builtin/merge.c:268 builtin/pull.c:152

18333 msgid "perform a commit if the merge succeeds (default)"

18334 msgstr "effectuer une validation si la fusion réussit (défaut)"

18335

18336 -#: builtin/merge.c:270 builtin/pull.c:154

18336 +#: builtin/merge.c:270 builtin/pull.c:155

18337 msgid "edit message before committing"

18338 msgstr "éditer le message avant la validation"

18339

@@ -18341,28 +18341,28 @@ msgstr "éditer le message avant la validation"

18341 msgid "allow fast-forward (default)"

18342 msgstr "autoriser l'avance rapide (défaut)"

18343

18344 -#: builtin/merge.c:274 builtin/pull.c:161

18344 +#: builtin/merge.c:274 builtin/pull.c:162

18345 msgid "abort if fast-forward is not possible"

18346 msgstr "abandonner si l'avance rapide n'est pas possible"

18347

18348 -#: builtin/merge.c:278 builtin/pull.c:164

18348 +#: builtin/merge.c:278 builtin/pull.c:168

18349 msgid "verify that the named commit has a valid GPG signature"

18350 msgstr "vérifier que le commit nommé a une signature GPG valide"

18351

18352 -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168

18352 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172

18353 #: builtin/rebase.c:1117 builtin/revert.c:114

18354 msgid "strategy"

18355 msgstr "stratégie"

18356

18357 -#: builtin/merge.c:280 builtin/pull.c:169

18357 +#: builtin/merge.c:280 builtin/pull.c:173

18358 msgid "merge strategy to use"

18359 msgstr "stratégie de fusion à utiliser"

18360

18361 -#: builtin/merge.c:281 builtin/pull.c:172

18361 +#: builtin/merge.c:281 builtin/pull.c:176

18362 msgid "option=value"

18363 msgstr "option=valeur"

18364

18365 -#: builtin/merge.c:282 builtin/pull.c:173

18365 +#: builtin/merge.c:282 builtin/pull.c:177

18366 msgid "option for selected merge strategy"

18367 msgstr "option pour la stratégie de fusion sélectionnée"

18368

@@ -18383,7 +18383,7 @@ msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"

18383 msgid "continue the current in-progress merge"

18384 msgstr "continuer la fusion en cours"

18385

18386 -#: builtin/merge.c:297 builtin/pull.c:180

18386 +#: builtin/merge.c:297 builtin/pull.c:184

18387 msgid "allow merging unrelated histories"

18388 msgstr "permettre la fusion d'historiques sans rapport"

18389

@@ -19818,44 +19818,48 @@ msgstr "Valeur invalide pour %s : %s"

19818 msgid "git pull [<options>] [<repository> [<refspec>...]]"

19819 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"

19820

19821 -#: builtin/pull.c:123

19821 +#: builtin/pull.c:124

19822 msgid "control for recursive fetching of submodules"

19823 msgstr "contrôler la récupération récursive dans les sous-modules"

19824

19825 -#: builtin/pull.c:127

19825 +#: builtin/pull.c:128

19826 msgid "Options related to merging"

19827 msgstr "Options relatives à la fusion"

19828

19829 -#: builtin/pull.c:130

19829 +#: builtin/pull.c:131

19830 msgid "incorporate changes by rebasing rather than merging"

19831 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"

19832

19833 -#: builtin/pull.c:158 builtin/revert.c:126

19833 +#: builtin/pull.c:159 builtin/revert.c:126

19834 msgid "allow fast-forward"

19835 msgstr "autoriser l'avance rapide"

19836

19837 -#: builtin/pull.c:167 parse-options.h:339

19837 +#: builtin/pull.c:165

19838 +msgid "control use of pre-merge-commit and commit-msg hooks"

19839 +msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg"

19840 +

19841 +#: builtin/pull.c:171 parse-options.h:338

19842 msgid "automatically stash/stash pop before and after"

19843 msgstr "remiser et réappliquer automatiquement avant et après"

19844

19841 -#: builtin/pull.c:183

19845 +#: builtin/pull.c:187

19846 msgid "Options related to fetching"

19847 msgstr "Options relatives au rapatriement"

19848

19845 -#: builtin/pull.c:193

19849 +#: builtin/pull.c:197

19850 msgid "force overwrite of local branch"

19851 msgstr "forcer l'écrasement de la branche locale"

19852

19849 -#: builtin/pull.c:201

19853 +#: builtin/pull.c:205

19854 msgid "number of submodules pulled in parallel"

19855 msgstr "nombre de sous-modules tirés en parallèle"

19856

19853 -#: builtin/pull.c:317

19857 +#: builtin/pull.c:321

19858 #, c-format

19859 msgid "Invalid value for pull.ff: %s"

19860 msgstr "Valeur invalide pour pull.ff : %s"

19861

19858 -#: builtin/pull.c:445

19862 +#: builtin/pull.c:449

19863 msgid ""

19864 "There is no candidate for rebasing against among the refs that you just "

19865 "fetched."

@@ -19863,14 +19867,14 @@ msgstr ""

19867 "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "

19868 "venez de récupérer."

19869

19866 -#: builtin/pull.c:447

19870 +#: builtin/pull.c:451

19871 msgid ""

19872 "There are no candidates for merging among the refs that you just fetched."

19873 msgstr ""

19874 "Il n'y a pas de candidate avec laquelle fusionner parmi les références que "

19875 "vous venez de récupérer."

19876

19873 -#: builtin/pull.c:448

19877 +#: builtin/pull.c:452

19878 msgid ""

19879 "Generally this means that you provided a wildcard refspec which had no\n"

19880 "matches on the remote end."

@@ -19878,7 +19882,7 @@ msgstr ""

19882 "Généralement, cela signifie que vous avez indiqué un spécificateur\n"

19883 "de référence joker qui n'a pas eu de correspondance sur le serveur distant."

19884

19881 -#: builtin/pull.c:451

19885 +#: builtin/pull.c:455

19886 #, c-format

19887 msgid ""

19888 "You asked to pull from the remote '%s', but did not specify\n"

@@ -19890,43 +19894,43 @@ msgstr ""

19894 "configuration\n"

19895 "pour la branche actuelle, vous devez spécifier la branche avec la commande."

19896

19893 -#: builtin/pull.c:456 builtin/rebase.c:951

19897 +#: builtin/pull.c:460 builtin/rebase.c:951

19898 msgid "You are not currently on a branch."

19899 msgstr "Vous n'êtes actuellement sur aucune branche."

19900

19897 -#: builtin/pull.c:458 builtin/pull.c:473

19901 +#: builtin/pull.c:462 builtin/pull.c:477

19902 msgid "Please specify which branch you want to rebase against."

19903 msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."

19904

19901 -#: builtin/pull.c:460 builtin/pull.c:475

19905 +#: builtin/pull.c:464 builtin/pull.c:479

19906 msgid "Please specify which branch you want to merge with."

19907 msgstr "Veuillez spécifier une branche avec laquelle fusionner."

19908

19905 -#: builtin/pull.c:461 builtin/pull.c:476

19909 +#: builtin/pull.c:465 builtin/pull.c:480

19910 msgid "See git-pull(1) for details."

19911 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."

19912

19909 -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478

19913 +#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482

19914 #: builtin/rebase.c:957

19915 msgid "<remote>"

19916 msgstr "<distant>"

19917

19914 -#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483

19918 +#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487

19919 msgid "<branch>"

19920 msgstr "<branche>"

19921

19918 -#: builtin/pull.c:471 builtin/rebase.c:949

19922 +#: builtin/pull.c:475 builtin/rebase.c:949

19923 msgid "There is no tracking information for the current branch."

19924 msgstr "Pas d'information de suivi distant pour la branche actuelle."

19925

19922 -#: builtin/pull.c:480

19926 +#: builtin/pull.c:484

19927 msgid ""

19928 "If you wish to set tracking information for this branch you can do so with:"

19929 msgstr ""

19930 "Si vous souhaitez indiquer l'information de suivi distant pour cette "

19931 "branche, vous pouvez le faire avec :"

19932

19929 -#: builtin/pull.c:485

19933 +#: builtin/pull.c:489

19934 #, c-format

19935 msgid ""

19936 "Your configuration specifies to merge with the ref '%s'\n"

@@ -19936,16 +19940,16 @@ msgstr ""

19940 "'%s'\n"

19941 "du serveur distant, mais cette référence n'a pas été récupérée."

19942

19939 -#: builtin/pull.c:596

19943 +#: builtin/pull.c:600

19944 #, c-format

19945 msgid "unable to access commit %s"

19946 msgstr "impossible d'accéder le commit %s"

19947

19944 -#: builtin/pull.c:902

19948 +#: builtin/pull.c:908

19949 msgid "ignoring --verify-signatures for rebase"

19950 msgstr "--verify-signatures est ignoré pour un rebasage"

19951

19948 -#: builtin/pull.c:936

19952 +#: builtin/pull.c:942

19953 msgid ""

19954 "You have divergent branches and need to specify how to reconcile them.\n"

19955 "You can do so by running one of the following commands sometime before\n"

@@ -19974,21 +19978,21 @@ msgstr ""

19978 "passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n"

19979 "remplacer à l'invocation la valeur par défaut configurée.\n"

19980

19977 -#: builtin/pull.c:1010

19981 +#: builtin/pull.c:1016

19982 msgid "Updating an unborn branch with changes added to the index."

19983 msgstr ""

19984 "Mise à jour d'une branche non encore créée avec les changements ajoutés dans "

19985 "l'index."

19986

19983 -#: builtin/pull.c:1014

19987 +#: builtin/pull.c:1020

19988 msgid "pull with rebase"

19989 msgstr "tirer avec un rebasage"

19990

19987 -#: builtin/pull.c:1015

19991 +#: builtin/pull.c:1021

19992 msgid "please commit or stash them."

19993 msgstr "veuillez les valider ou les remiser."

19994

19991 -#: builtin/pull.c:1040

19995 +#: builtin/pull.c:1046

19996 #, c-format

19997 msgid ""

19998 "fetch updated the current branch head.\n"

@@ -19999,7 +20003,7 @@ msgstr ""

20003 "avance rapide de votre copie de travail\n"

20004 "depuis le commit %s."

20005

20002 -#: builtin/pull.c:1046

20006 +#: builtin/pull.c:1052

20007 #, c-format

20008 msgid ""

20009 "Cannot fast-forward your working tree.\n"

@@ -20016,23 +20020,23 @@ msgstr ""

20020 "$ git reset --hard\n"

20021 "pour régénérer."

20022

20019 -#: builtin/pull.c:1061

20023 +#: builtin/pull.c:1067

20024 msgid "Cannot merge multiple branches into empty head."

20025 msgstr "Impossible de fusionner de multiples branches sur une tête vide."

20026

20023 -#: builtin/pull.c:1066

20027 +#: builtin/pull.c:1072

20028 msgid "Cannot rebase onto multiple branches."

20029 msgstr "Impossible de rebaser sur de multiples branches."

20030

20027 -#: builtin/pull.c:1068

20031 +#: builtin/pull.c:1074

20032 msgid "Cannot fast-forward to multiple branches."

20033 msgstr "Impossible d'aller en avance rapide sur de multiples branches."

20034

20031 -#: builtin/pull.c:1082

20035 +#: builtin/pull.c:1088

20036 msgid "Need to specify how to reconcile divergent branches."

20037 msgstr "Besoin de spécifier comment réconcilier des branches divergentes."

20038

20035 -#: builtin/pull.c:1096

20039 +#: builtin/pull.c:1102

20040 msgid "cannot rebase with locally recorded submodule modifications"

20041 msgstr ""

20042 "impossible de rebaser avec des modifications de sous-modules enregistrées "

@@ -25296,27 +25300,27 @@ msgstr "date-d'expiration"

25300 msgid "no-op (backward compatibility)"

25301 msgstr "sans action (rétrocompatibilité)"

25302

25299 -#: parse-options.h:309

25303 +#: parse-options.h:308

25304 msgid "be more verbose"

25305 msgstr "être plus verbeux"

25306

25303 -#: parse-options.h:311

25307 +#: parse-options.h:310

25308 msgid "be more quiet"

25309 msgstr "être plus silencieux"

25310

25307 -#: parse-options.h:317

25311 +#: parse-options.h:316

25312 msgid "use <n> digits to display object names"

25313 msgstr "utiliser <n> chiffres pour afficher les noms des objets"

25314

25311 -#: parse-options.h:336

25315 +#: parse-options.h:335

25316 msgid "how to strip spaces and #comments from message"

25317 msgstr "comment éliminer les espaces et les commentaires # du message"

25318

25315 -#: parse-options.h:337

25319 +#: parse-options.h:336

25320 msgid "read pathspec from file"

25321 msgstr "lire les spécificateurs de fichier depuis fichier"

25322

25319 -#: parse-options.h:338

25323 +#: parse-options.h:337

25324 msgid ""

25325 "with --pathspec-from-file, pathspec elements are separated with NUL character"

25326 msgstr ""

l10n: fr: v2.34.0 rnd 3