2acb3d4992 · matheusbsbs/matheus-bagliano

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

74 msgstr ""

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

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

77 -"POT-Creation-Date: 2017-12-31 10:45+0800\n"

78 -"PO-Revision-Date: 2018-01-02 22:06+0100\n"

77 +"POT-Creation-Date: 2018-01-07 07:50+0800\n"

78 +"PO-Revision-Date: 2018-01-07 18:53+0100\n"

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

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

81 "Language: fr\n"

@@ -682,7 +682,7 @@ msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."

682 msgid "Unable to write new index file"

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

684

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

685 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

686 #: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

687 #: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

688 #: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

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

699 msgid "apply changes matching the given path"

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

701

702 -#: apply.c:4927 builtin/am.c:2266

702 +#: apply.c:4927 builtin/am.c:2229

703 msgid "num"

704 msgstr "num"

705

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

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

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

763

764 -#: apply.c:4959 builtin/am.c:2245 builtin/interpret-trailers.c:95

764 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

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

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

767 msgid "action"

@@ -809,7 +809,7 @@ msgstr ""

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

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

811

812 -#: apply.c:4983 builtin/am.c:2254

812 +#: apply.c:4983 builtin/am.c:2217

813 msgid "root"

814 msgstr "racine"

815

@@ -1079,8 +1079,8 @@ msgstr ""

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

1080 "dernier commit"

1081

1082 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1179

1083 -#: sequencer.c:2367 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1082 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1083 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1084 #: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1085 #: builtin/shortlog.c:191

1086 msgid "revision walk setup failed"

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

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

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

1263

1264 -#: bundle.c:88 sequencer.c:1357 sequencer.c:1804 sequencer.c:2631

1265 -#: sequencer.c:2657 sequencer.c:2748 sequencer.c:2850 builtin/commit.c:782

1264 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1265 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1266 #, c-format

1267 msgid "could not open '%s'"

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

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

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

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

1331

1332 -#: commit.c:41 sequencer.c:1611 builtin/am.c:421 builtin/am.c:465

1333 -#: builtin/am.c:1471 builtin/am.c:2106

1332 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1333 +#: builtin/am.c:1434 builtin/am.c:2069

1334 #, c-format

1335 msgid "could not parse %s"

1336 msgstr "impossible d'analyser %s"

@@ -1776,7 +1776,9 @@ msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"

1776 #: editor.c:61

1777 #, c-format

1778 msgid "hint: Waiting for your editor to close the file...%c"

1779 -msgstr "suggestion : en attente de la fermeture du fichier par votre éditeur de texte…%c"

1779 +msgstr ""

1780 +"suggestion : en attente de la fermeture du fichier par votre éditeur de "

1781 +"texte…%c"

1782

1783 #: entry.c:177

1784 msgid "Filtering content"

@@ -2179,11 +2181,11 @@ msgstr ""

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

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

2183

2182 -#: merge.c:41

2184 +#: merge.c:74

2185 msgid "failed to read the cache"

2186 msgstr "impossible de lire le cache"

2187

2186 -#: merge.c:95 builtin/am.c:1980 builtin/am.c:2014 builtin/checkout.c:379

2188 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2189 #: builtin/checkout.c:600 builtin/clone.c:754

2190 msgid "unable to write new index file"

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

@@ -2413,36 +2415,41 @@ msgstr ""

2415 msgid "Adding %s"

2416 msgstr "Ajout de %s"

2417

2416 -#: merge-recursive.c:1955

2418 +#: merge-recursive.c:1958

2419 +#, c-format

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

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

2422 +

2423 +#: merge-recursive.c:1962

2424 msgid "Already up to date!"

2425 msgstr "Déjà à jour !"

2426

2420 -#: merge-recursive.c:1964

2427 +#: merge-recursive.c:1971

2428 #, c-format

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

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

2431

2425 -#: merge-recursive.c:2061

2432 +#: merge-recursive.c:2068

2433 msgid "Merging:"

2434 msgstr "Fusion :"

2435

2429 -#: merge-recursive.c:2074

2436 +#: merge-recursive.c:2081

2437 #, c-format

2438 msgid "found %u common ancestor:"

2439 msgid_plural "found %u common ancestors:"

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

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

2442

2436 -#: merge-recursive.c:2113

2443 +#: merge-recursive.c:2120

2444 msgid "merge returned no commit"

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

2446

2440 -#: merge-recursive.c:2176

2447 +#: merge-recursive.c:2183

2448 #, c-format

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

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

2451

2445 -#: merge-recursive.c:2190 builtin/merge.c:656 builtin/merge.c:815

2452 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2453 msgid "Unable to write index."

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

2455

@@ -2642,12 +2649,12 @@ msgstr ""

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

2650 "Utilisation de la version %i"

2651

2645 -#: read-cache.c:2370 sequencer.c:2725 wrapper.c:658 builtin/merge.c:1048

2652 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2653 #, c-format

2654 msgid "could not close '%s'"

2655 msgstr "impossible de fermer '%s'"

2656

2650 -#: read-cache.c:2442 sequencer.c:1366 sequencer.c:2093

2657 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2658 #, c-format

2659 msgid "could not stat '%s'"

2660 msgstr "stat impossible de '%s'"

@@ -3066,27 +3073,28 @@ msgid ""

3073 "You can disable this warning with `git config advice.ignoredHook false`."

3074 msgstr ""

3075 "Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n"

3069 -"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook false`."

3076 +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "

3077 +"false`."

3078

3071 -#: send-pack.c:151

3079 +#: send-pack.c:141

3080 #, c-format

3081 msgid "unable to parse remote unpack status: %s"

3082 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"

3083

3076 -#: send-pack.c:153

3084 +#: send-pack.c:143

3085 #, c-format

3086 msgid "remote unpack failed: %s"

3087 msgstr "le dépaquetage a échoué : %s"

3088

3081 -#: send-pack.c:316

3089 +#: send-pack.c:306

3090 msgid "failed to sign the push certificate"

3091 msgstr "impossible de signer le certificat de poussée"

3092

3085 -#: send-pack.c:429

3093 +#: send-pack.c:419

3094 msgid "the receiving end does not support --signed push"

3095 msgstr "Le receveur ne gère pas les poussées avec --signed"

3096

3089 -#: send-pack.c:431

3097 +#: send-pack.c:421

3098 msgid ""

3099 "not sending a push certificate since the receiving end does not support --"

3100 "signed push"

@@ -3094,11 +3102,11 @@ msgstr ""

3102 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "

3103 "poussées avec --signed"

3104

3097 -#: send-pack.c:443

3105 +#: send-pack.c:433

3106 msgid "the receiving end does not support --atomic push"

3107 msgstr "Le receveur ne gère pas les poussées avec --atomic"

3108

3101 -#: send-pack.c:448

3109 +#: send-pack.c:438

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

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

3112

@@ -3137,13 +3145,13 @@ msgstr ""

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

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

3147

3140 -#: sequencer.c:297 sequencer.c:1715

3148 +#: sequencer.c:297 sequencer.c:1718

3149 #, c-format

3150 msgid "could not lock '%s'"

3151 msgstr "impossible de verrouiller '%s'"

3152

3145 -#: sequencer.c:300 sequencer.c:1592 sequencer.c:1720 sequencer.c:1734

3146 -#: sequencer.c:2723 sequencer.c:2794 wrapper.c:656

3153 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3154 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3155 #, c-format

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

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

@@ -3153,12 +3161,12 @@ msgstr "impossible d'écrire dans '%s'"

3161 msgid "could not write eol to '%s'"

3162 msgstr "impossible d'écrire la fin de ligne dans '%s'"

3163

3156 -#: sequencer.c:308 sequencer.c:1597 sequencer.c:1722

3164 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3165 #, c-format

3166 msgid "failed to finalize '%s'."

3167 msgstr "échec lors de la finalisation de '%s'."

3168

3161 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1618 builtin/am.c:259

3169 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

3170 #: builtin/commit.c:754 builtin/merge.c:1046

3171 #, c-format

3172 msgid "could not read '%s'"

@@ -3187,12 +3195,12 @@ msgid "%s: Unable to write new index file"

3195 msgstr "%s: Impossible d'écrire le nouveau fichier index"

3196

3197 #: sequencer.c:496

3190 -msgid "could not resolve HEAD commit\n"

3191 -msgstr "impossible de résoudre le commit HEAD\n"

3198 +msgid "could not resolve HEAD commit"

3199 +msgstr "impossible de résoudre le commit HEAD"

3200

3201 #: sequencer.c:516

3194 -msgid "unable to update cache tree\n"

3195 -msgstr "impossible de mettre à jour l'arbre de cache\n"

3202 +msgid "unable to update cache tree"

3203 +msgstr "impossible de mettre à jour l'arbre de cache"

3204

3205 #: sequencer.c:600

3206 #, c-format

@@ -3225,13 +3233,13 @@ msgstr ""

3233

3234 #: sequencer.c:702

3235 #, c-format

3228 -msgid "could not parse commit %s\n"

3229 -msgstr "impossible d'analyser le commit %s\n"

3236 +msgid "could not parse commit %s"

3237 +msgstr "impossible d'analyser le commit %s"

3238

3239 #: sequencer.c:707

3240 #, c-format

3233 -msgid "could not parse parent commit %s\n"

3234 -msgstr "impossible d'analyser le commit parent %s\n"

3241 +msgid "could not parse parent commit %s"

3242 +msgstr "impossible d'analyser le commit parent %s"

3243

3244 #: sequencer.c:836

3245 #, c-format

@@ -3260,7 +3268,7 @@ msgstr ""

3268 msgid "This is a combination of %d commits."

3269 msgstr "Ceci est la combinaison de %d commits."

3270

3263 -#: sequencer.c:857 sequencer.c:2742

3271 +#: sequencer.c:857 sequencer.c:2748

3272 msgid "need a HEAD to fixup"

3273 msgstr "une HEAD est nécessaire à la correction"

3274

@@ -3329,159 +3337,169 @@ msgstr "impossible d'obtenir un message de validation pour %s"

3337

3338 #. TRANSLATORS: The first %s will be a "todo" command like

3339 #. "revert" or "pick", the second %s a SHA1.

3332 -#: sequencer.c:1025

3340 +#: sequencer.c:1023

3341 #, c-format

3342 msgid "%s: cannot parse parent commit %s"

3343 msgstr "%s : impossible d'analyser le commit parent %s"

3344

3337 -#: sequencer.c:1088 sequencer.c:1864

3345 +#: sequencer.c:1086 sequencer.c:1867

3346 #, c-format

3347 msgid "could not rename '%s' to '%s'"

3348 msgstr "impossible de renommer '%s' en '%s'"

3349

3342 -#: sequencer.c:1139

3350 +#: sequencer.c:1137

3351 #, c-format

3352 msgid "could not revert %s... %s"

3353 msgstr "impossible d'annuler %s... %s"

3354

3347 -#: sequencer.c:1140

3355 +#: sequencer.c:1138

3356 #, c-format

3357 msgid "could not apply %s... %s"

3358 msgstr "impossible d'appliquer %s... %s"

3359

3352 -#: sequencer.c:1182

3360 +#: sequencer.c:1180

3361 msgid "empty commit set passed"

3362 msgstr "l'ensemble de commits spécifié est vide"

3363

3356 -#: sequencer.c:1192

3364 +#: sequencer.c:1190

3365 #, c-format

3366 msgid "git %s: failed to read the index"

3367 msgstr "git %s : échec à la lecture de l'index"

3368

3361 -#: sequencer.c:1198

3369 +#: sequencer.c:1196

3370 #, c-format

3371 msgid "git %s: failed to refresh the index"

3372 msgstr "git %s : échec du rafraîchissement de l'index"

3373

3366 -#: sequencer.c:1319

3374 +#: sequencer.c:1270

3375 +#, c-format

3376 +msgid "%s does not accept arguments: '%s'"

3377 +msgstr "%s n'accepte pas d'argument : '%s'"

3378 +

3379 +#: sequencer.c:1279

3380 +#, c-format

3381 +msgid "missing arguments for %s"

3382 +msgstr "argument manquant pour %s"

3383 +

3384 +#: sequencer.c:1322

3385 #, c-format

3386 msgid "invalid line %d: %.*s"

3387 msgstr "ligne %d invalide : %.*s"

3388

3371 -#: sequencer.c:1327

3389 +#: sequencer.c:1330

3390 #, c-format

3391 msgid "cannot '%s' without a previous commit"

3392 msgstr "'%s' impossible avec le commit précédent"

3393

3376 -#: sequencer.c:1360 sequencer.c:2522 sequencer.c:2557 sequencer.c:2636

3377 -#: sequencer.c:2662 sequencer.c:2752 sequencer.c:2853

3394 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3395 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3396 #, c-format

3397 msgid "could not read '%s'."

3398 msgstr "impossible de lire '%s'."

3399

3382 -#: sequencer.c:1372

3400 +#: sequencer.c:1375

3401 msgid "please fix this using 'git rebase --edit-todo'."

3402 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."

3403

3386 -#: sequencer.c:1374

3404 +#: sequencer.c:1377

3405 #, c-format

3406 msgid "unusable instruction sheet: '%s'"

3407 msgstr "feuille d'instruction inutilisable : '%s'"

3408

3391 -#: sequencer.c:1379

3409 +#: sequencer.c:1382

3410 msgid "no commits parsed."

3411 msgstr "aucun commit analysé."

3412

3395 -#: sequencer.c:1390

3413 +#: sequencer.c:1393

3414 msgid "cannot cherry-pick during a revert."

3415 msgstr "impossible de picorer pendant l'annulation d'un commit."

3416

3399 -#: sequencer.c:1392

3417 +#: sequencer.c:1395

3418 msgid "cannot revert during a cherry-pick."

3419 msgstr "impossible d'annuler un commit pendant un picorage."

3420

3403 -#: sequencer.c:1459

3421 +#: sequencer.c:1462

3422 #, c-format

3423 msgid "invalid key: %s"

3424 msgstr "clé invalide : %s"

3425

3408 -#: sequencer.c:1462

3426 +#: sequencer.c:1465

3427 #, c-format

3428 msgid "invalid value for %s: %s"

3429 msgstr "valeur invalide pour %s : %s"

3430

3413 -#: sequencer.c:1528

3431 +#: sequencer.c:1531

3432 #, c-format

3433 msgid "malformed options sheet: '%s'"

3434 msgstr "feuille d'options malformée : %s"

3435

3418 -#: sequencer.c:1566

3436 +#: sequencer.c:1569

3437 msgid "a cherry-pick or revert is already in progress"

3438 msgstr "un picorage ou un retour est déjà en cours"

3439

3422 -#: sequencer.c:1567

3440 +#: sequencer.c:1570

3441 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3442 msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

3443

3426 -#: sequencer.c:1570

3444 +#: sequencer.c:1573

3445 #, c-format

3446 msgid "could not create sequencer directory '%s'"

3447 msgstr "impossible de créer le répertoire de séquenceur '%s'"

3448

3431 -#: sequencer.c:1585

3449 +#: sequencer.c:1588

3450 msgid "could not lock HEAD"

3451 msgstr "impossible de verrouiller HEAD"

3452

3435 -#: sequencer.c:1643 sequencer.c:2227

3453 +#: sequencer.c:1646 sequencer.c:2230

3454 msgid "no cherry-pick or revert in progress"

3455 msgstr "aucun picorage ou retour en cours"

3456

3439 -#: sequencer.c:1645

3457 +#: sequencer.c:1648

3458 msgid "cannot resolve HEAD"

3459 msgstr "impossible de résoudre HEAD"

3460

3443 -#: sequencer.c:1647 sequencer.c:1682

3461 +#: sequencer.c:1650 sequencer.c:1685

3462 msgid "cannot abort from a branch yet to be born"

3463 msgstr "impossible d'abandonner depuis une branche non encore créée"

3464

3447 -#: sequencer.c:1668 builtin/grep.c:713

3465 +#: sequencer.c:1671 builtin/grep.c:713

3466 #, c-format

3467 msgid "cannot open '%s'"

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

3469

3452 -#: sequencer.c:1670

3470 +#: sequencer.c:1673

3471 #, c-format

3472 msgid "cannot read '%s': %s"

3473 msgstr "impossible de lire '%s' : %s"

3474

3457 -#: sequencer.c:1671

3475 +#: sequencer.c:1674

3476 msgid "unexpected end of file"

3477 msgstr "fin de fichier inattendue"

3478

3461 -#: sequencer.c:1677

3479 +#: sequencer.c:1680

3480 #, c-format

3481 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3482 msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"

3483

3466 -#: sequencer.c:1688

3484 +#: sequencer.c:1691

3485 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3486 msgstr ""

3487 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"

3488

3471 -#: sequencer.c:1829 sequencer.c:2125

3489 +#: sequencer.c:1832 sequencer.c:2128

3490 msgid "cannot read HEAD"

3491 msgstr "impossible de lire HEAD"

3492

3475 -#: sequencer.c:1869 builtin/difftool.c:639

3493 +#: sequencer.c:1872 builtin/difftool.c:639

3494 #, c-format

3495 msgid "could not copy '%s' to '%s'"

3496 msgstr "impossible de copier '%s' vers '%s'"

3497

3480 -#: sequencer.c:1888

3498 +#: sequencer.c:1891

3499 msgid "could not read index"

3500 msgstr "impossible de lire l'index"

3501

3484 -#: sequencer.c:1893

3502 +#: sequencer.c:1896

3503 #, c-format

3504 msgid ""

3505 "execution failed: %s\n"

@@ -3496,11 +3514,11 @@ msgstr ""

3514 "git rebase --continue\n"

3515 "\n"

3516

3499 -#: sequencer.c:1899

3517 +#: sequencer.c:1902

3518 msgid "and made changes to the index and/or the working tree\n"

3519 msgstr "et a mis à jour l'index ou l'arbre de travail\n"

3520

3503 -#: sequencer.c:1905

3521 +#: sequencer.c:1908

3522 #, c-format

3523 msgid ""

3524 "execution succeeded: %s\n"

@@ -3517,17 +3535,17 @@ msgstr ""

3535 " git rebase --continue\n"

3536 "\n"

3537

3520 -#: sequencer.c:1964

3538 +#: sequencer.c:1967

3539 #, c-format

3540 msgid "Applied autostash.\n"

3541 msgstr "Autoremisage appliqué.\n"

3542

3525 -#: sequencer.c:1976

3543 +#: sequencer.c:1979

3544 #, c-format

3545 msgid "cannot store %s"

3546 msgstr "impossible de stocker %s"

3547

3530 -#: sequencer.c:1979 git-rebase.sh:175

3548 +#: sequencer.c:1982 git-rebase.sh:175

3549 #, c-format

3550 msgid ""

3551 "Applying autostash resulted in conflicts.\n"

@@ -3538,57 +3556,57 @@ msgstr ""

3556 "Vos modifications sont à l'abri dans la remise.\n"

3557 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"

3558

3541 -#: sequencer.c:2061

3559 +#: sequencer.c:2064

3560 #, c-format

3561 msgid "Stopped at %s... %.*s\n"

3562 msgstr "arrêt à %s... %.*s\n"

3563

3546 -#: sequencer.c:2103

3564 +#: sequencer.c:2106

3565 #, c-format

3566 msgid "unknown command %d"

3567 msgstr "commande inconnue %d"

3568

3551 -#: sequencer.c:2133

3569 +#: sequencer.c:2136

3570 msgid "could not read orig-head"

3571 msgstr "impossible de lire orig-head"

3572

3555 -#: sequencer.c:2138 sequencer.c:2739

3573 +#: sequencer.c:2141 sequencer.c:2745

3574 msgid "could not read 'onto'"

3575 msgstr "impossible de lire 'onto'"

3576

3559 -#: sequencer.c:2145

3577 +#: sequencer.c:2148

3578 #, c-format

3579 msgid "could not update %s"

3580 msgstr "impossible de mettre à jour %s"

3581

3564 -#: sequencer.c:2152

3582 +#: sequencer.c:2155

3583 #, c-format

3584 msgid "could not update HEAD to %s"

3585 msgstr "impossible de mettre à jour HEAD sur %s"

3586

3569 -#: sequencer.c:2236

3587 +#: sequencer.c:2239

3588 msgid "cannot rebase: You have unstaged changes."

3589 msgstr "impossible de rebaser : vous avez des modifications non indexées."

3590

3573 -#: sequencer.c:2241

3591 +#: sequencer.c:2244

3592 msgid "could not remove CHERRY_PICK_HEAD"

3593 msgstr "impossible de supprimer CHERRY_PICK_HEAD"

3594

3577 -#: sequencer.c:2250

3595 +#: sequencer.c:2253

3596 msgid "cannot amend non-existing commit"

3597 msgstr "impossible de corriger un commit non-existant"

3598

3581 -#: sequencer.c:2252

3599 +#: sequencer.c:2255

3600 #, c-format

3601 msgid "invalid file: '%s'"

3602 msgstr "fichier invalide : '%s'"

3603

3586 -#: sequencer.c:2254

3604 +#: sequencer.c:2257

3605 #, c-format

3606 msgid "invalid contents: '%s'"

3607 msgstr "contenu invalide : '%s'"

3608

3591 -#: sequencer.c:2257

3609 +#: sequencer.c:2260

3610 msgid ""

3611 "\n"

3612 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3598,45 +3616,45 @@ msgstr ""

3616 "Vous avez des modifications non validées dans votre copie de travail.\n"

3617 "Veuillez les valider d'abord, puis relancer 'git rebase --continue'."

3618

3601 -#: sequencer.c:2267

3619 +#: sequencer.c:2270

3620 msgid "could not commit staged changes."

3621 msgstr "impossible de valider les modifications indexées."

3622

3605 -#: sequencer.c:2347

3623 +#: sequencer.c:2350

3624 #, c-format

3625 msgid "%s: can't cherry-pick a %s"

3626 msgstr "%s : impossible de picorer un %s"

3627

3610 -#: sequencer.c:2351

3628 +#: sequencer.c:2354

3629 #, c-format

3630 msgid "%s: bad revision"

3631 msgstr "%s : mauvaise révision"

3632

3615 -#: sequencer.c:2384

3633 +#: sequencer.c:2387

3634 msgid "can't revert as initial commit"

3635 msgstr "impossible d'annuler en tant que commit initial"

3636

3619 -#: sequencer.c:2489

3637 +#: sequencer.c:2492

3638 msgid "make_script: unhandled options"

3639 msgstr "make_script : options non gérées"

3640

3623 -#: sequencer.c:2492

3641 +#: sequencer.c:2495

3642 msgid "make_script: error preparing revisions"

3643 msgstr "make_script : erreur lors de la préparation des révisions"

3644

3627 -#: sequencer.c:2526 sequencer.c:2561

3645 +#: sequencer.c:2529 sequencer.c:2564

3646 #, c-format

3647 msgid "unusable todo list: '%s'"

3648 msgstr "liste à faire inutilisable : '%s'"

3649

3632 -#: sequencer.c:2609

3650 +#: sequencer.c:2615

3651 #, c-format

3652 msgid ""

3653 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3654 msgstr ""

3655 "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."

3656

3639 -#: sequencer.c:2689

3657 +#: sequencer.c:2695

3658 #, c-format

3659 msgid ""

3660 "Warning: some commits may have been dropped accidentally.\n"

@@ -3645,7 +3663,7 @@ msgstr ""

3663 "Attention : certains commits ont pu être accidentellement supprimés.\n"

3664 "Commits supprimés (du plus jeune au plus vieux) :\n"

3665

3648 -#: sequencer.c:2696

3666 +#: sequencer.c:2702

3667 #, c-format

3668 msgid ""

3669 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3663,7 +3681,7 @@ msgstr ""

3681 "Les comportements disponibles sont : ignore, warn, error.\n"

3682 "\n"

3683

3666 -#: sequencer.c:2708

3684 +#: sequencer.c:2714

3685 #, c-format

3686 msgid ""

3687 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3674,18 +3692,18 @@ msgstr ""

3692 "rebase --continue'.\n"

3693 "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"

3694

3677 -#: sequencer.c:2721 sequencer.c:2788 wrapper.c:225 wrapper.c:395

3695 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3696 #: builtin/am.c:779

3697 #, c-format

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

3699 msgstr "impossible d'ouvrir '%s' en écriture"

3700

3683 -#: sequencer.c:2769

3701 +#: sequencer.c:2775

3702 #, c-format

3703 msgid "could not parse commit '%s'"

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

3705

3688 -#: sequencer.c:2891

3706 +#: sequencer.c:2897

3707 msgid "the script was already rearranged."

3708 msgstr "le script a déjà été réarrangé."

3709

@@ -4956,7 +4974,8 @@ msgstr "mettre à jour les fichiers suivis"

4974

4975 #: builtin/add.c:299

4976 msgid "renormalize EOL of tracked files (implies -u)"

4959 -msgstr "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"

4977 +msgstr ""

4978 +"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"

4979

4980 #: builtin/add.c:300

4981 msgid "record only the fact that the path will be added later"

@@ -5134,49 +5153,49 @@ msgstr "Échec de découpage des patchs."

5153 msgid "unable to write index file"

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

5155

5137 -#: builtin/am.c:1197

5156 +#: builtin/am.c:1160

5157 #, c-format

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

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

5160

5142 -#: builtin/am.c:1198

5161 +#: builtin/am.c:1161

5162 #, c-format

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

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

5165

5147 -#: builtin/am.c:1199

5166 +#: builtin/am.c:1162

5167 #, c-format

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

5169 msgstr ""

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

5171 "abort\"."

5172

5154 -#: builtin/am.c:1306

5173 +#: builtin/am.c:1269

5174 msgid "Patch is empty."

5175 msgstr "Le patch actuel est vide."

5176

5158 -#: builtin/am.c:1372

5177 +#: builtin/am.c:1335

5178 #, c-format

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

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

5181

5163 -#: builtin/am.c:1394

5182 +#: builtin/am.c:1357

5183 #, c-format

5184 msgid "unable to parse commit %s"

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

5186

5168 -#: builtin/am.c:1587

5187 +#: builtin/am.c:1550

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

5189 msgstr ""

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

5191 "points."

5192

5174 -#: builtin/am.c:1589

5193 +#: builtin/am.c:1552

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

5195 msgstr ""

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

5197

5179 -#: builtin/am.c:1608

5198 +#: builtin/am.c:1571

5199 msgid ""

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

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

@@ -5184,38 +5203,38 @@ msgstr ""

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

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

5205

5187 -#: builtin/am.c:1614

5206 +#: builtin/am.c:1577

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

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

5209

5191 -#: builtin/am.c:1639

5210 +#: builtin/am.c:1602

5211 msgid "Failed to merge in the changes."

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

5213

5195 -#: builtin/am.c:1663 builtin/merge.c:642

5214 +#: builtin/am.c:1626 builtin/merge.c:642

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

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

5217

5199 -#: builtin/am.c:1670

5218 +#: builtin/am.c:1633

5219 msgid "applying to an empty history"

5220 msgstr "application à un historique vide"

5221

5203 -#: builtin/am.c:1683 builtin/commit.c:1798 builtin/merge.c:825

5222 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

5223 #: builtin/merge.c:850

5224 msgid "failed to write commit object"

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

5226

5208 -#: builtin/am.c:1716 builtin/am.c:1720

5227 +#: builtin/am.c:1679 builtin/am.c:1683

5228 #, c-format

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

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

5231

5213 -#: builtin/am.c:1736

5232 +#: builtin/am.c:1699

5233 msgid "cannot be interactive without stdin connected to a terminal."

5234 msgstr ""

5235 "impossible d'être interactif sans entrée standard connectée à un terminal."

5236

5218 -#: builtin/am.c:1741

5237 +#: builtin/am.c:1704

5238 msgid "Commit Body is:"

5239 msgstr "Le corps de la validation est :"

5240

@@ -5223,35 +5242,35 @@ msgstr "Le corps de la validation est :"

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

5243 #. input at this point.

5244 #.

5226 -#: builtin/am.c:1751

5245 +#: builtin/am.c:1714

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

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

5248

5230 -#: builtin/am.c:1801

5249 +#: builtin/am.c:1764

5250 #, c-format

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

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

5253

5235 -#: builtin/am.c:1841 builtin/am.c:1913

5254 +#: builtin/am.c:1804 builtin/am.c:1876

5255 #, c-format

5256 msgid "Applying: %.*s"

5257 msgstr "Application de %.*s"

5258

5240 -#: builtin/am.c:1857

5259 +#: builtin/am.c:1820

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

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

5262

5244 -#: builtin/am.c:1865

5263 +#: builtin/am.c:1828

5264 #, c-format

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

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

5267

5249 -#: builtin/am.c:1871

5268 +#: builtin/am.c:1834

5269 #, c-format

5270 msgid "The copy of the patch that failed is found in: %s"

5271 msgstr "La copie du patch qui a échoué se trouve dans : %s"

5272

5254 -#: builtin/am.c:1916

5273 +#: builtin/am.c:1879

5274 msgid ""

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

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

@@ -5262,7 +5281,7 @@ msgstr ""

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

5282 "patch."

5283

5265 -#: builtin/am.c:1923

5284 +#: builtin/am.c:1886

5285 msgid ""

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

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

@@ -5275,17 +5294,17 @@ msgstr ""

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

5295 "accepter son état."

5296

5278 -#: builtin/am.c:2030 builtin/am.c:2034 builtin/am.c:2046 builtin/reset.c:332

5297 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5298 #: builtin/reset.c:340

5299 #, c-format

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

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

5302

5284 -#: builtin/am.c:2082

5303 +#: builtin/am.c:2045

5304 msgid "failed to clean index"

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

5306

5288 -#: builtin/am.c:2117

5307 +#: builtin/am.c:2080

5308 msgid ""

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

5310 "Not rewinding to ORIG_HEAD"

@@ -5293,76 +5312,76 @@ msgstr ""

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

5313 "Pas de retour à ORIG_HEAD"

5314

5296 -#: builtin/am.c:2180

5315 +#: builtin/am.c:2143

5316 #, c-format

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

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

5319

5301 -#: builtin/am.c:2213

5320 +#: builtin/am.c:2176

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

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

5323

5305 -#: builtin/am.c:2214

5324 +#: builtin/am.c:2177

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

5326 msgstr "git am [<options>] (--continue | --quit | --abort)"

5327

5309 -#: builtin/am.c:2220

5328 +#: builtin/am.c:2183

5329 msgid "run interactively"

5330 msgstr "exécution interactive"

5331

5313 -#: builtin/am.c:2222

5332 +#: builtin/am.c:2185

5333 msgid "historical option -- no-op"

5334 msgstr "option historique -- no-op"

5335

5317 -#: builtin/am.c:2224

5336 +#: builtin/am.c:2187

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

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

5339

5321 -#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57

5340 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

5341 #: builtin/repack.c:180

5342 msgid "be quiet"

5343 msgstr "être silencieux"

5344

5326 -#: builtin/am.c:2227

5345 +#: builtin/am.c:2190

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

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

5348

5330 -#: builtin/am.c:2230

5349 +#: builtin/am.c:2193

5350 msgid "recode into utf8 (default)"

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

5352

5334 -#: builtin/am.c:2232

5353 +#: builtin/am.c:2195

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

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

5356

5338 -#: builtin/am.c:2234

5357 +#: builtin/am.c:2197

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

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

5360

5342 -#: builtin/am.c:2236

5361 +#: builtin/am.c:2199

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

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

5364

5346 -#: builtin/am.c:2238

5365 +#: builtin/am.c:2201

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

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

5368

5350 -#: builtin/am.c:2241

5369 +#: builtin/am.c:2204

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

5371 msgstr ""

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

5373

5355 -#: builtin/am.c:2244

5374 +#: builtin/am.c:2207

5375 msgid "strip everything before a scissors line"

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

5377

5359 -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255

5360 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

5361 -#: builtin/am.c:2273

5378 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5379 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5380 +#: builtin/am.c:2236

5381 msgid "pass it through git-apply"

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

5383

5365 -#: builtin/am.c:2263 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5384 +#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5385 #: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5386 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5387 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

@@ -5370,58 +5389,58 @@ msgstr "le passer jusqu'à git-apply"

5389 msgid "n"

5390 msgstr "n"

5391

5373 -#: builtin/am.c:2269 builtin/branch.c:629 builtin/for-each-ref.c:38

5392 +#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

5393 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5394 msgid "format"

5395 msgstr "format"

5396

5378 -#: builtin/am.c:2270

5397 +#: builtin/am.c:2233

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

5399 msgstr "format de présentation des patchs"

5400

5382 -#: builtin/am.c:2276

5401 +#: builtin/am.c:2239

5402 msgid "override error message when patch failure occurs"

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

5404

5386 -#: builtin/am.c:2278

5405 +#: builtin/am.c:2241

5406 msgid "continue applying patches after resolving a conflict"

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

5408

5390 -#: builtin/am.c:2281

5409 +#: builtin/am.c:2244

5410 msgid "synonyms for --continue"

5411 msgstr "synonymes de --continue"

5412

5394 -#: builtin/am.c:2284

5413 +#: builtin/am.c:2247

5414 msgid "skip the current patch"

5415 msgstr "sauter le patch courant"

5416

5398 -#: builtin/am.c:2287

5417 +#: builtin/am.c:2250

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

5419 msgstr ""

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

5421

5403 -#: builtin/am.c:2291

5422 +#: builtin/am.c:2254

5423 msgid "lie about committer date"

5424 msgstr "mentir sur la date de validation"

5425

5407 -#: builtin/am.c:2293

5426 +#: builtin/am.c:2256

5427 msgid "use current timestamp for author date"

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

5429

5411 -#: builtin/am.c:2295 builtin/commit.c:1636 builtin/merge.c:236

5430 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

5431 #: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5432 msgid "key-id"

5433 msgstr "id-clé"

5434

5416 -#: builtin/am.c:2296

5435 +#: builtin/am.c:2259

5436 msgid "GPG-sign commits"

5437 msgstr "signer les commits avec GPG"

5438

5420 -#: builtin/am.c:2299

5439 +#: builtin/am.c:2262

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

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

5442

5424 -#: builtin/am.c:2317

5443 +#: builtin/am.c:2280

5444 msgid ""

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

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

@@ -5429,17 +5448,17 @@ msgstr ""

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

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

5450

5432 -#: builtin/am.c:2324

5451 +#: builtin/am.c:2287

5452 msgid "failed to read the index"

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

5454

5436 -#: builtin/am.c:2339

5455 +#: builtin/am.c:2302

5456 #, c-format

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

5458 msgstr ""

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

5460

5442 -#: builtin/am.c:2363

5461 +#: builtin/am.c:2326

5462 #, c-format

5463 msgid ""

5464 "Stray %s directory found.\n"

@@ -5448,7 +5467,7 @@ msgstr ""

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

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

5469

5451 -#: builtin/am.c:2369

5470 +#: builtin/am.c:2332

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

5472 msgstr ""

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

@@ -7590,7 +7609,9 @@ msgstr ""

7609 msgid ""

7610 "show ignored files, optional modes: traditional, matching, no. (Default: "

7611 "traditional)"

7593 -msgstr "afficher les fichiers ignorés, \"mode\" facultatif : traditional (traditionnel), matching (correspondant), no. (Défaut : traditional)"

7612 +msgstr ""

7613 +"afficher les fichiers ignorés, \"mode\" facultatif : traditional "

7614 +"(traditionnel), matching (correspondant), no. (Défaut : traditional)"

7615

7616 #: builtin/commit.c:1384 parse-options.h:155

7617 msgid "when"

@@ -7610,7 +7631,8 @@ msgstr "afficher les fichiers non suivis en colonnes"

7631

7632 #: builtin/commit.c:1406

7633 msgid "Unsupported combination of ignored and untracked-files arguments"

7613 -msgstr "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"

7634 +msgstr ""

7635 +"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"

7636

7637 #: builtin/commit.c:1469

7638 msgid "couldn't look up newly created commit"

@@ -8044,7 +8066,9 @@ msgstr "aucune étiquette ne correspond parfaitement à '%s'"

8066 #: builtin/describe.c:316

8067 #, c-format

8068 msgid "No exact match on refs or tags, searching to describe\n"

8047 -msgstr "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par describe\n"

8069 +msgstr ""

8070 +"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "

8071 +"describe\n"

8072

8073 #: builtin/describe.c:363

8074 #, c-format

@@ -13746,7 +13770,9 @@ msgstr "supprimer la sortie d'état du sous-module"

13770 msgid ""

13771 "Use commit stored in the index instead of the one stored in the submodule "

13772 "HEAD"

13749 -msgstr "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module"

13773 +msgstr ""

13774 +"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "

13775 +"du sous-module"

13776

13777 #: builtin/submodule--helper.c:679

13778 msgid "recurse into nested submodules"

@@ -14342,7 +14368,8 @@ msgstr "écrire l'index même s'il n'est pas marqué comme modifié"

14368

14369 #: builtin/update-index.c:1024

14370 msgid "enable or disable file system monitor"

14345 -msgstr "activer ou désactiver la surveillance du système de fichier (fsmonitor)"

14371 +msgstr ""

14372 +"activer ou désactiver la surveillance du système de fichier (fsmonitor)"

14373

14374 #: builtin/update-index.c:1026

14375 msgid "mark files as fsmonitor valid"

@@ -14395,7 +14422,9 @@ msgstr "Le cache non suivi est activé pour '%s'"

14422

14423 #: builtin/update-index.c:1171

14424 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"

14398 -msgstr "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment activer la surveillance du système de fichiers"

14425 +msgstr ""

14426 +"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment "

14427 +"activer la surveillance du système de fichiers"

14428

14429 #: builtin/update-index.c:1175

14430 msgid "fsmonitor enabled"

@@ -14404,7 +14433,9 @@ msgstr "fsmonitor activé"

14433 #: builtin/update-index.c:1178

14434 msgid ""

14435 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"

14407 -msgstr "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous souhaitez vraiment désactiver la surveillance du système de fichiers"

14436 +msgstr ""

14437 +"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous "

14438 +"souhaitez vraiment désactiver la surveillance du système de fichiers"

14439

14440 #: builtin/update-index.c:1182

14441 msgid "fsmonitor disabled"

@@ -14596,7 +14627,8 @@ msgstr "-b, -B et --detach sont mutuellement exclusifs"

14627

14628 #: builtin/worktree.c:453

14629 msgid "--[no-]track can only be used if a new branch is created"

14599 -msgstr "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"

14630 +msgstr ""

14631 +"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"

14632

14633 #: builtin/worktree.c:553

14634 msgid "reason for locking"

@@ -15961,7 +15993,7 @@ msgstr ""

15993 " git rebase --continue\n"

15994 "\n"

15995

15964 -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:994

15996 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995

15997 msgid "Could not execute editor"

15998 msgstr "Impossible de lancer l'éditeur"

15999

@@ -15987,14 +16019,18 @@ msgstr "Impossible de marquer comme interactif"

16019 msgid "Could not init rewritten commits"

16020 msgstr "Impossible d'initialiser les commits réécrits"

16021

15990 -#: git-rebase--interactive.sh:972

16022 +#: git-rebase--interactive.sh:897

16023 +msgid "Could not generate todo list"

16024 +msgstr "Impossible de générer la liste à-faire"

16025 +

16026 +#: git-rebase--interactive.sh:973

16027 #, sh-format

16028 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"

16029 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"

16030 msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)"

16031 msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)"

16032

15997 -#: git-rebase--interactive.sh:977

16033 +#: git-rebase--interactive.sh:978

16034 msgid ""

16035 "\n"

16036 "However, if you remove everything, the rebase will be aborted.\n"

@@ -16004,7 +16040,7 @@ msgstr ""

16040 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"

16041 "\n"

16042

16007 -#: git-rebase--interactive.sh:984

16043 +#: git-rebase--interactive.sh:985

16044 msgid "Note that empty commits are commented out"

16045 msgstr "Veuillez noter que les commits vides sont en commentaire"

16046

@@ -17211,9 +17247,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "

17247 #~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "

17248 #~ "son historique)"

17249

17214 -#~ msgid "Could not write to %s"

17215 -#~ msgstr "Impossible d'écrire dans %s"

17216 -

17250 #~ msgid "Error wrapping up %s."

17251 #~ msgstr "Erreur lors de l'emballage de %s."

17252

l10n: fr.po 2.16 round 2