f938915aad · matheusbsbs/matheus-bagliano

@@ -73,8 +73,8 @@ msgid ""

73 msgstr ""

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

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

76 -"POT-Creation-Date: 2015-12-11 23:36+0800\n"

77 -"PO-Revision-Date: 2015-12-18 21:55+0100\n"

76 +"POT-Creation-Date: 2015-12-22 22:50+0800\n"

77 +"PO-Revision-Date: 2015-12-24 07:36+0100\n"

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

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

80 "Language: fr\n"

@@ -140,7 +140,7 @@ msgstr "fmt"

140 msgid "archive format"

141 msgstr "format d'archive"

142

143 -#: archive.c:430 builtin/log.c:1228

143 +#: archive.c:430 builtin/log.c:1229

144 msgid "prefix"

145 msgstr "préfixe"

146

@@ -352,7 +352,7 @@ msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"

352

353 #: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

354 #: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

355 -#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358

355 +#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358

356 #: builtin/shortlog.c:158

357 msgid "revision walk setup failed"

358 msgstr "échec de la préparation du parcours des révisions"

@@ -392,7 +392,7 @@ msgstr "rev-list a disparu"

392 msgid "ref '%s' is excluded by the rev-list options"

393 msgstr "la référence '%s' est exclue par les options de rev-list"

394

395 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

395 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261

396 #, c-format

397 msgid "unrecognized argument: %s"

398 msgstr "argument non reconnu : %s"

@@ -1349,16 +1349,16 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1349 msgstr ""

1350 " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"

1351

1352 -#: revision.c:2191

1352 +#: revision.c:2193

1353 msgid "your current branch appears to be broken"

1354 msgstr "votre branche actuelle semble cassée"

1355

1356 -#: revision.c:2194

1356 +#: revision.c:2196

1357 #, c-format

1358 msgid "your current branch '%s' does not have any commits yet"

1359 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

1360

1361 -#: revision.c:2388

1361 +#: revision.c:2390

1362 msgid "--first-parent is incompatible with --bisect"

1363 msgstr "--first-parent est incompatible avec --bisect"

1364

@@ -1778,32 +1778,21 @@ msgstr "impossible d'accéder à '%s' : %s"

1778 msgid "unable to access '%s'"

1779 msgstr "impossible d'accéder à '%s'"

1780

1781 -#: wrapper.c:611

1782 -#, c-format

1783 -msgid "unable to look up current user in the passwd file: %s"

1784 -msgstr ""

1785 -"impossible de rechercher l'utilisateur actuel dans le fichier de mots de "

1786 -"passe : %s"

1787 -

1788 -#: wrapper.c:612

1789 -msgid "no such user"

1790 -msgstr "utilisateur inconnu"

1791 -

1792 -#: wrapper.c:620

1781 +#: wrapper.c:608

1782 msgid "unable to get current working directory"

1783 msgstr "impossible d'accéder au répertoire de travail courant"

1784

1796 -#: wrapper.c:647

1785 +#: wrapper.c:635

1786 #, c-format

1787 msgid "could not open %s for writing"

1788 msgstr "Impossible d'ouvrir '%s' en écriture"

1789

1801 -#: wrapper.c:658 builtin/am.c:425

1790 +#: wrapper.c:646 builtin/am.c:425

1791 #, c-format

1792 msgid "could not write to %s"

1793 msgstr "Impossible d'écrire dans %s"

1794

1806 -#: wrapper.c:664

1795 +#: wrapper.c:652

1796 #, c-format

1797 msgid "could not close %s"

1798 msgstr "impossible de fermer %s"

@@ -2343,14 +2332,14 @@ msgstr ""

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

2333

2334 #: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2346 -#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2335 +#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543

2336 #: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2337 msgid "dry run"

2338 msgstr "simuler l'action"

2339

2340 #: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2341 #: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2353 -#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2342 +#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114

2343 msgid "be verbose"

2344 msgstr "mode verbeux"

2345

@@ -2541,7 +2530,7 @@ msgstr ""

2530 msgid "Patch is empty. Was it split wrong?"

2531 msgstr "Le patch est vide. Le découpage était-il bon ?"

2532

2544 -#: builtin/am.c:1417 builtin/log.c:1344

2533 +#: builtin/am.c:1417 builtin/log.c:1347

2534 #, c-format

2535 msgid "invalid ident line: %s"

2536 msgstr "ligne d'identification invalide : %s"

@@ -4389,7 +4378,7 @@ msgstr "effectuer une fusion à 3 points avec la nouvelle branche"

4378 msgid "update ignored files (default)"

4379 msgstr "mettre à jour les fichiers ignorés (par défaut)"

4380

4392 -#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4381 +#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250

4382 msgid "style"

4383 msgstr "style"

4384

@@ -4411,7 +4400,7 @@ msgstr ""

4400 "ne pas vérifier si une autre copie de travail contient le référence fournie"

4401

4402 #: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4414 -#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4403 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558

4404 #: builtin/send-pack.c:168

4405 msgid "force progress reporting"

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

@@ -4731,7 +4720,9 @@ msgstr "régler la configuration dans le nouveau dépôt"

4720 #: builtin/clone.c:300

4721 #, c-format

4722 msgid "reference repository '%s' as a linked checkout is not supported yet."

4734 -msgstr "extraire le dépôt de référence '%s' comme une extraction liée n'est pas encore supporté"

4723 +msgstr ""

4724 +"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

4725 +"encore supporté"

4726

4727 #: builtin/clone.c:302

4728 #, c-format

@@ -5305,7 +5296,7 @@ msgstr "afficher le statut avec concision"

5296 msgid "show branch information"

5297 msgstr "afficher l'information de branche"

5298

5308 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5299 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544

5300 #: builtin/worktree.c:423

5301 msgid "machine-readable output"

5302 msgstr "sortie pour traitement automatique"

@@ -5434,7 +5425,7 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)"

5425 msgstr ""

5426 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

5427

5437 -#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5428 +#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86

5429 msgid "add Signed-off-by:"

5430 msgstr "ajouter une entrée Signed-off-by :"

5431

@@ -6008,7 +5999,7 @@ msgstr "approfondir l'historique d'un clone superficiel"

5999 msgid "convert to a complete repository"

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

6001

6011 -#: builtin/fetch.c:118 builtin/log.c:1232

6002 +#: builtin/fetch.c:118 builtin/log.c:1233

6003 msgid "dir"

6004 msgstr "dir"

6005

@@ -6371,7 +6362,8 @@ msgid ""

6362 msgstr ""

6363 "Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"

6364 "la cause et supprimer %s.\n"

6374 -"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit supprimé.\n"

6365 +"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "

6366 +"supprimé.\n"

6367 "\n"

6368 "%s"

6369

@@ -7346,184 +7338,188 @@ msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"

7338 msgid "Two output directories?"

7339 msgstr "Deux répertoires de sortie ?"

7340

7349 -#: builtin/log.c:1210

7341 +#: builtin/log.c:1211

7342 msgid "use [PATCH n/m] even with a single patch"

7343 msgstr "utiliser [PATCH n/m] même avec un patch unique"

7344

7353 -#: builtin/log.c:1213

7345 +#: builtin/log.c:1214

7346 msgid "use [PATCH] even with multiple patches"

7347 msgstr "utiliser [PATCH] même avec des patchs multiples"

7348

7357 -#: builtin/log.c:1217

7349 +#: builtin/log.c:1218

7350 msgid "print patches to standard out"

7351 msgstr "afficher les patchs sur la sortie standard"

7352

7361 -#: builtin/log.c:1219

7353 +#: builtin/log.c:1220

7354 msgid "generate a cover letter"

7355 msgstr "générer une lettre de motivation"

7356

7365 -#: builtin/log.c:1221

7357 +#: builtin/log.c:1222

7358 msgid "use simple number sequence for output file names"

7359 msgstr ""

7360 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"

7361

7370 -#: builtin/log.c:1222

7362 +#: builtin/log.c:1223

7363 msgid "sfx"

7364 msgstr "sfx"

7365

7374 -#: builtin/log.c:1223

7366 +#: builtin/log.c:1224

7367 msgid "use <sfx> instead of '.patch'"

7368 msgstr "utiliser <sfx> au lieu de '.patch'"

7369

7378 -#: builtin/log.c:1225

7370 +#: builtin/log.c:1226

7371 msgid "start numbering patches at <n> instead of 1"

7372 msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"

7373

7382 -#: builtin/log.c:1227

7374 +#: builtin/log.c:1228

7375 msgid "mark the series as Nth re-roll"

7376 msgstr "marquer la série comme une Nième réédition"

7377

7386 -#: builtin/log.c:1229

7378 +#: builtin/log.c:1230

7379 msgid "Use [<prefix>] instead of [PATCH]"

7380 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"

7381

7390 -#: builtin/log.c:1232

7382 +#: builtin/log.c:1233

7383 msgid "store resulting files in <dir>"

7384 msgstr "stocker les fichiers résultats dans <répertoire>"

7385

7394 -#: builtin/log.c:1235

7386 +#: builtin/log.c:1236

7387 msgid "don't strip/add [PATCH]"

7388 msgstr "ne pas retirer/ajouter [PATCH]"

7389

7398 -#: builtin/log.c:1238

7390 +#: builtin/log.c:1239

7391 msgid "don't output binary diffs"

7392 msgstr "ne pas imprimer les diffs binaires"

7393

7402 -#: builtin/log.c:1240

7394 +#: builtin/log.c:1241

7395 +msgid "output all-zero hash in From header"

7396 +msgstr "écrire une empreinte à zéro dans l'entête From"

7397 +

7398 +#: builtin/log.c:1243

7399 msgid "don't include a patch matching a commit upstream"

7400 msgstr "ne pas inclure un patch correspondant à un commit amont"

7401

7406 -#: builtin/log.c:1242

7402 +#: builtin/log.c:1245

7403 msgid "show patch format instead of default (patch + stat)"

7404 msgstr "afficher le format du patch au lieu du défaut (patch + stat)"

7405

7410 -#: builtin/log.c:1244

7406 +#: builtin/log.c:1247

7407 msgid "Messaging"

7408 msgstr "Communication"

7409

7414 -#: builtin/log.c:1245

7410 +#: builtin/log.c:1248

7411 msgid "header"

7412 msgstr "en-tête"

7413

7418 -#: builtin/log.c:1246

7414 +#: builtin/log.c:1249

7415 msgid "add email header"

7416 msgstr "ajouter l'en-tête d'e-mail"

7417

7422 -#: builtin/log.c:1247 builtin/log.c:1249

7418 +#: builtin/log.c:1250 builtin/log.c:1252

7419 msgid "email"

7420 msgstr "e-mail"

7421

7426 -#: builtin/log.c:1247

7422 +#: builtin/log.c:1250

7423 msgid "add To: header"

7424 msgstr "ajouter l'en-tête \"To:\""

7425

7430 -#: builtin/log.c:1249

7426 +#: builtin/log.c:1252

7427 msgid "add Cc: header"

7428 msgstr "ajouter l'en-tête \"Cc:\""

7429

7434 -#: builtin/log.c:1251

7430 +#: builtin/log.c:1254

7431 msgid "ident"

7432 msgstr "ident"

7433

7438 -#: builtin/log.c:1252

7434 +#: builtin/log.c:1255

7435 msgid "set From address to <ident> (or committer ident if absent)"

7436 msgstr ""

7437 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"

7438

7443 -#: builtin/log.c:1254

7439 +#: builtin/log.c:1257

7440 msgid "message-id"

7441 msgstr "id-message"

7442

7447 -#: builtin/log.c:1255

7443 +#: builtin/log.c:1258

7444 msgid "make first mail a reply to <message-id>"

7445 msgstr "répondre dans le premier message à <id-message>"

7446

7451 -#: builtin/log.c:1256 builtin/log.c:1259

7447 +#: builtin/log.c:1259 builtin/log.c:1262

7448 msgid "boundary"

7449 msgstr "limite"

7450

7455 -#: builtin/log.c:1257

7451 +#: builtin/log.c:1260

7452 msgid "attach the patch"

7453 msgstr "attacher le patch"

7454

7459 -#: builtin/log.c:1260

7455 +#: builtin/log.c:1263

7456 msgid "inline the patch"

7457 msgstr "patch à l'intérieur"

7458

7463 -#: builtin/log.c:1264

7459 +#: builtin/log.c:1267

7460 msgid "enable message threading, styles: shallow, deep"

7461 msgstr ""

7462 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"

7463

7468 -#: builtin/log.c:1266

7464 +#: builtin/log.c:1269

7465 msgid "signature"

7466 msgstr "signature"

7467

7472 -#: builtin/log.c:1267

7468 +#: builtin/log.c:1270

7469 msgid "add a signature"

7470 msgstr "ajouter une signature"

7471

7476 -#: builtin/log.c:1269

7472 +#: builtin/log.c:1272

7473 msgid "add a signature from a file"

7474 msgstr "ajouter une signature depuis un fichier"

7475

7480 -#: builtin/log.c:1270

7476 +#: builtin/log.c:1273

7477 msgid "don't print the patch filenames"

7478 msgstr "ne pas afficher les noms de fichiers des patchs"

7479

7484 -#: builtin/log.c:1359

7480 +#: builtin/log.c:1362

7481 msgid "-n and -k are mutually exclusive."

7482 msgstr "-n et -k sont mutuellement exclusifs."

7483

7488 -#: builtin/log.c:1361

7484 +#: builtin/log.c:1364

7485 msgid "--subject-prefix and -k are mutually exclusive."

7486 msgstr "--subject-prefix et -k sont mutuellement exclusifs."

7487

7492 -#: builtin/log.c:1369

7488 +#: builtin/log.c:1372

7489 msgid "--name-only does not make sense"

7490 msgstr "--name-only n'a pas de sens"

7491

7496 -#: builtin/log.c:1371

7492 +#: builtin/log.c:1374

7493 msgid "--name-status does not make sense"

7494 msgstr "--name-status n'a pas de sens"

7495

7500 -#: builtin/log.c:1373

7496 +#: builtin/log.c:1376

7497 msgid "--check does not make sense"

7498 msgstr "--check n'a pas de sens"

7499

7504 -#: builtin/log.c:1396

7500 +#: builtin/log.c:1401

7501 msgid "standard output, or directory, which one?"

7502 msgstr "sortie standard, ou répertoire, lequel ?"

7503

7508 -#: builtin/log.c:1398

7504 +#: builtin/log.c:1403

7505 #, c-format

7506 msgid "Could not create directory '%s'"

7507 msgstr "Impossible de créer le répertoire '%s'"

7508

7513 -#: builtin/log.c:1495

7509 +#: builtin/log.c:1500

7510 #, c-format

7511 msgid "unable to read signature file '%s'"

7512 msgstr "lecture du fichier de signature '%s' impossible"

7513

7518 -#: builtin/log.c:1558

7514 +#: builtin/log.c:1563

7515 msgid "Failed to create output files"

7516 msgstr "Échec de création des fichiers en sortie"

7517

7522 -#: builtin/log.c:1606

7518 +#: builtin/log.c:1611

7519 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

7520 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"

7521

7526 -#: builtin/log.c:1660

7522 +#: builtin/log.c:1665

7523 #, c-format

7524 msgid ""

7525 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

@@ -7531,7 +7527,7 @@ msgstr ""

7527 "Impossible de trouver une branche distante suivie, merci de spécifier "

7528 "<branche_amont> manuellement.\n"

7529

7534 -#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685

7530 +#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690

7531 #, c-format

7532 msgid "Unknown commit %s"

7533 msgstr "Commit inconnu %s"

@@ -8982,19 +8978,19 @@ msgstr "Impossible de fusionner de multiples branches sur une tête vide."

8978 msgid "Cannot rebase onto multiple branches."

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

8980

8985 -#: builtin/push.c:15

8981 +#: builtin/push.c:16

8982 msgid "git push [<options>] [<repository> [<refspec>...]]"

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

8984

8989 -#: builtin/push.c:86

8985 +#: builtin/push.c:88

8986 msgid "tag shorthand without <tag>"

8987 msgstr "raccourci d'étiquette sans <étiquette>"

8988

8993 -#: builtin/push.c:96

8989 +#: builtin/push.c:98

8990 msgid "--delete only accepts plain target ref names"

8991 msgstr "--delete accepte seulement des noms entiers de références cibles"

8992

8997 -#: builtin/push.c:140

8993 +#: builtin/push.c:142

8994 msgid ""

8995 "\n"

8996 "To choose either option permanently, see push.default in 'git help config'."

@@ -9003,7 +8999,7 @@ msgstr ""

8999 "Pour choisir l'option de manière permanente, voir push.default dans 'git "

9000 "help config'."

9001

9006 -#: builtin/push.c:143

9002 +#: builtin/push.c:145

9003 #, c-format

9004 msgid ""

9005 "The upstream branch of your current branch does not match\n"

@@ -9028,7 +9024,7 @@ msgstr ""

9024 " git push %s %s\n"

9025 "%s"

9026

9031 -#: builtin/push.c:158

9027 +#: builtin/push.c:160

9028 #, c-format

9029 msgid ""

9030 "You are not currently on a branch.\n"

@@ -9043,7 +9039,7 @@ msgstr ""

9039 "\n"

9040 " git push %s HEAD:<nom-de-la-branche-amont>\n"

9041

9046 -#: builtin/push.c:172

9042 +#: builtin/push.c:174

9043 #, c-format

9044 msgid ""

9045 "The current branch %s has no upstream branch.\n"

@@ -9057,13 +9053,13 @@ msgstr ""

9053 "\n"

9054 " git push --set-upstream %s %s\n"

9055

9060 -#: builtin/push.c:180

9056 +#: builtin/push.c:182

9057 #, c-format

9058 msgid "The current branch %s has multiple upstream branches, refusing to push."

9059 msgstr ""

9060 "La branche courante %s a de multiples branches amont, impossible de pousser."

9061

9066 -#: builtin/push.c:183

9062 +#: builtin/push.c:185

9063 #, c-format

9064 msgid ""

9065 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -9074,7 +9070,7 @@ msgstr ""

9070 "pas une branche amont de votre branche courante '%s', sans me dire\n"

9071 "quoi pousser pour mettre à jour quelle branche amont."

9072

9077 -#: builtin/push.c:206

9073 +#: builtin/push.c:208

9074 msgid ""

9075 "push.default is unset; its implicit value has changed in\n"

9076 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

@@ -9125,14 +9121,14 @@ msgstr ""

9121 "'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes "

9122 "versions de Git)"

9123

9128 -#: builtin/push.c:273

9124 +#: builtin/push.c:275

9125 msgid ""

9126 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

9127 msgstr ""

9128 "Vous n'avez pas spécifié de spécifications de référence à pousser, et push."

9129 "default est \"nothing\"."

9130

9135 -#: builtin/push.c:280

9131 +#: builtin/push.c:282

9132 msgid ""

9133 "Updates were rejected because the tip of your current branch is behind\n"

9134 "its remote counterpart. Integrate the remote changes (e.g.\n"

@@ -9147,7 +9143,7 @@ msgstr ""

9143 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "

9144 "d'information."

9145

9150 -#: builtin/push.c:286

9146 +#: builtin/push.c:288

9147 msgid ""

9148 "Updates were rejected because a pushed branch tip is behind its remote\n"

9149 "counterpart. Check out this branch and integrate the remote changes\n"

@@ -9162,7 +9158,7 @@ msgstr ""

9158 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "

9159 "d'information."

9160

9165 -#: builtin/push.c:292

9161 +#: builtin/push.c:294

9162 msgid ""

9163 "Updates were rejected because the remote contains work that you do\n"

9164 "not have locally. This is usually caused by another repository pushing\n"

@@ -9180,13 +9176,13 @@ msgstr ""

9176 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "

9177 "d'information."

9178

9183 -#: builtin/push.c:299

9179 +#: builtin/push.c:301

9180 msgid "Updates were rejected because the tag already exists in the remote."

9181 msgstr ""

9182 "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "

9183 "branche distante."

9184

9189 -#: builtin/push.c:302

9185 +#: builtin/push.c:304

9186 msgid ""

9187 "You cannot update a remote ref that points at a non-commit object,\n"

9188 "or update a remote ref to make it point at a non-commit object,\n"

@@ -9198,22 +9194,22 @@ msgstr ""

9194 "pointer\n"

9195 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"

9196

9201 -#: builtin/push.c:361

9197 +#: builtin/push.c:363

9198 #, c-format

9199 msgid "Pushing to %s\n"

9200 msgstr "Poussée vers %s\n"

9201

9206 -#: builtin/push.c:365

9202 +#: builtin/push.c:367

9203 #, c-format

9204 msgid "failed to push some refs to '%s'"

9205 msgstr "impossible de pousser des références vers '%s'"

9206

9211 -#: builtin/push.c:395

9207 +#: builtin/push.c:397

9208 #, c-format

9209 msgid "bad repository '%s'"

9210 msgstr "mauvais dépôt '%s'"

9211

9216 -#: builtin/push.c:396

9212 +#: builtin/push.c:398

9213 msgid ""

9214 "No configured push destination.\n"

9215 "Either specify the URL from the command-line or configure a remote "

@@ -9235,101 +9231,105 @@ msgstr ""

9231 "\n"

9232 " git push <nom>\n"

9233

9238 -#: builtin/push.c:411

9234 +#: builtin/push.c:413

9235 msgid "--all and --tags are incompatible"

9236 msgstr "--all et --tags sont incompatibles"

9237

9242 -#: builtin/push.c:412

9238 +#: builtin/push.c:414

9239 msgid "--all can't be combined with refspecs"

9240 msgstr "--all ne peut pas être combiné avec des spécifications de référence"

9241

9246 -#: builtin/push.c:417

9242 +#: builtin/push.c:419

9243 msgid "--mirror and --tags are incompatible"

9244 msgstr "--mirror et --tags sont incompatibles"

9245

9250 -#: builtin/push.c:418

9246 +#: builtin/push.c:420

9247 msgid "--mirror can't be combined with refspecs"

9248 msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"

9249

9254 -#: builtin/push.c:423

9250 +#: builtin/push.c:425

9251 msgid "--all and --mirror are incompatible"

9252 msgstr "--all et --mirror sont incompatibles"

9253

9258 -#: builtin/push.c:539

9254 +#: builtin/push.c:537

9255 msgid "repository"

9256 msgstr "dépôt"

9257

9262 -#: builtin/push.c:540 builtin/send-pack.c:161

9258 +#: builtin/push.c:538 builtin/send-pack.c:161

9259 msgid "push all refs"

9260 msgstr "pousser toutes les références"

9261

9266 -#: builtin/push.c:541 builtin/send-pack.c:163

9262 +#: builtin/push.c:539 builtin/send-pack.c:163

9263 msgid "mirror all refs"

9264 msgstr "refléter toutes les références"

9265

9270 -#: builtin/push.c:543

9266 +#: builtin/push.c:541

9267 msgid "delete refs"

9268 msgstr "supprimer les références"

9269

9274 -#: builtin/push.c:544

9270 +#: builtin/push.c:542

9271 msgid "push tags (can't be used with --all or --mirror)"

9272 msgstr ""

9273 "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"

9274

9279 -#: builtin/push.c:547 builtin/send-pack.c:164

9275 +#: builtin/push.c:545 builtin/send-pack.c:164

9276 msgid "force updates"

9277 msgstr "forcer les mises à jour"

9278

9283 -#: builtin/push.c:549 builtin/send-pack.c:175

9279 +#: builtin/push.c:547 builtin/send-pack.c:175

9280 msgid "refname>:<expect"

9281 msgstr "nom de référence>:<attendu"

9282

9287 -#: builtin/push.c:550 builtin/send-pack.c:176

9283 +#: builtin/push.c:548 builtin/send-pack.c:176

9284 msgid "require old value of ref to be at this value"

9285 msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"

9286

9291 -#: builtin/push.c:553

9287 +#: builtin/push.c:550

9288 +msgid "check|on-demand|no"

9289 +msgstr "check|on-demand|no"

9290 +

9291 +#: builtin/push.c:551

9292 msgid "control recursive pushing of submodules"

9293 msgstr "contrôler la poussée récursive des sous-modules"

9294

9295 -#: builtin/push.c:555 builtin/send-pack.c:169

9295 +#: builtin/push.c:553 builtin/send-pack.c:169

9296 msgid "use thin pack"

9297 msgstr "utiliser un empaquetage léger"

9298

9299 -#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158

9299 +#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158

9300 #: builtin/send-pack.c:159

9301 msgid "receive pack program"

9302 msgstr "recevoir le programme d'empaquetage"

9303

9304 -#: builtin/push.c:558

9304 +#: builtin/push.c:556

9305 msgid "set upstream for git pull/status"

9306 msgstr "définir la branche amont pour git pull/status"

9307

9308 -#: builtin/push.c:561

9308 +#: builtin/push.c:559

9309 msgid "prune locally removed refs"

9310 msgstr "éliminer les références locales supprimées"

9311

9312 -#: builtin/push.c:563

9312 +#: builtin/push.c:561

9313 msgid "bypass pre-push hook"

9314 msgstr "éviter d'utiliser le crochet pre-push"

9315

9316 -#: builtin/push.c:564

9316 +#: builtin/push.c:562

9317 msgid "push missing but relevant tags"

9318 msgstr "pousser les étiquettes manquantes mais pertinentes"

9319

9320 -#: builtin/push.c:567 builtin/send-pack.c:166

9320 +#: builtin/push.c:565 builtin/send-pack.c:166

9321 msgid "GPG sign the push"

9322 msgstr "signer la poussée avec GPG"

9323

9324 -#: builtin/push.c:569 builtin/send-pack.c:170

9324 +#: builtin/push.c:567 builtin/send-pack.c:170

9325 msgid "request atomic transaction on remote side"

9326 msgstr "demande une transaction atomique sur le serveur distant"

9327

9328 -#: builtin/push.c:579

9328 +#: builtin/push.c:577

9329 msgid "--delete is incompatible with --all, --mirror and --tags"

9330 msgstr "--delete est incompatible avec --all, --mirror et --tags"

9331

9332 -#: builtin/push.c:581

9332 +#: builtin/push.c:579

9333 msgid "--delete doesn't make sense without any refs"

9334 msgstr "--delete n'a pas de sens sans aucune référence"

9335

@@ -10660,7 +10660,9 @@ msgstr "git stripspace [-c | --comment-lines]"

10660

10661 #: builtin/stripspace.c:35

10662 msgid "skip and remove all lines starting with comment character"

10663 -msgstr "sauter et supprimer toutes les lignes commençant par le caractère de commentaire"

10663 +msgstr ""

10664 +"sauter et supprimer toutes les lignes commençant par le caractère de "

10665 +"commentaire"

10666

10667 #: builtin/stripspace.c:38

10668 msgid "prepend comment character and blank to each line"

@@ -10681,7 +10683,9 @@ msgstr "git submodule--helper <nom> <chemin>"

10683 #: builtin/submodule--helper.c:120

10684 #, c-format

10685 msgid "no submodule mapping found in .gitmodules for path '%s'"

10684 -msgstr "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le chemin '%s'"

10686 +msgstr ""

10687 +"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "

10688 +"chemin '%s'"

10689

10690 #: builtin/submodule--helper.c:170

10691 msgid "where the new submodule will be cloned to"

@@ -10703,7 +10707,10 @@ msgstr "profondeur de l'historique des clones superficiels"

10707 msgid ""

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

10709 "<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"

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

10710 +msgstr ""

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

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

10713 +"[<chemin>...]"

10714

10715 #: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208

10716 #: builtin/submodule--helper.c:216

@@ -10733,7 +10740,9 @@ msgstr "impossible de créer le répertoire de sous-module pour '%s'"

10740

10741 #: builtin/submodule--helper.c:273

10742 msgid "fatal: submodule--helper subcommand must be called with a subcommand"

10736 -msgstr "fatal : la sous-commande submodule--helper doit être appelée avec une sous-commande"

10743 +msgstr ""

10744 +"fatal : la sous-commande submodule--helper doit être appelée avec une sous-"

10745 +"commande"

10746

10747 #: builtin/submodule--helper.c:280

10748 #, c-format

@@ -11677,7 +11686,9 @@ msgstr "impossible de modifier la signification du terme '$term'"

11686 #: git-bisect.sh:606

11687 #, sh-format

11688 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."

11680 -msgstr "Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/$TERM_GOOD."

11689 +msgstr ""

11690 +"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"

11691 +"$TERM_GOOD."

11692

11693 #: git-bisect.sh:636

11694 msgid "no terms defined"

@@ -11690,7 +11701,8 @@ msgid ""

11701 "Supported options are: --term-good|--term-old and --term-bad|--term-new."

11702 msgstr ""

11703 "argument invalide $arg pour 'git bisect terms'.\n"

11693 -"Les options supportées sont : --term-good|--term-old et --term-bad|--term-new."

11704 +"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"

11705 +"new."

11706

11707 #: git-rebase.sh:57

11708 msgid ""

@@ -12284,6 +12296,14 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"

12296 msgid "Synchronizing submodule url for '$displaypath'"

12297 msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"

12298

12299 +#~ msgid "unable to look up current user in the passwd file: %s"

12300 +#~ msgstr ""

12301 +#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "

12302 +#~ "passe : %s"

12303 +

12304 +#~ msgid "no such user"

12305 +#~ msgstr "utilisateur inconnu"

12306 +

12307 #~ msgid "branch '%s' does not point at a commit"

12308 #~ msgstr "la branche '%s' ne pointe pas sur un commit"

12309

l10n: fr.po v2.7.0 round 2 (2477t)