summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po276
1 files changed, 148 insertions, 128 deletions
diff --git a/po/fr.po b/po/fr.po
index 63069c3..facc5c6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-12-11 23:36+0800\n"
-"PO-Revision-Date: 2015-12-18 21:55+0100\n"
+"POT-Creation-Date: 2015-12-22 22:50+0800\n"
+"PO-Revision-Date: 2015-12-24 07:36+0100\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -140,7 +140,7 @@ msgstr "fmt"
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:430 builtin/log.c:1228
+#: archive.c:430 builtin/log.c:1229
msgid "prefix"
msgstr "préfixe"
@@ -352,7 +352,7 @@ msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083
#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334
-#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358
+#: builtin/log.c:849 builtin/log.c:1461 builtin/log.c:1694 builtin/merge.c:358
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -392,7 +392,7 @@ msgstr "rev-list a disparu"
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261
+#: bundle.c:443 builtin/log.c:157 builtin/log.c:1369 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
@@ -1349,16 +1349,16 @@ msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: revision.c:2191
+#: revision.c:2193
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2194
+#: revision.c:2196
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2388
+#: revision.c:2390
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
@@ -1778,32 +1778,21 @@ msgstr "impossible d'accéder à '%s' : %s"
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:611
-#, c-format
-msgid "unable to look up current user in the passwd file: %s"
-msgstr ""
-"impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
-"passe : %s"
-
-#: wrapper.c:612
-msgid "no such user"
-msgstr "utilisateur inconnu"
-
-#: wrapper.c:620
+#: wrapper.c:608
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:647
+#: wrapper.c:635
#, c-format
msgid "could not open %s for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: wrapper.c:658 builtin/am.c:425
+#: wrapper.c:646 builtin/am.c:425
#, c-format
msgid "could not write to %s"
msgstr "Impossible d'écrire dans %s"
-#: wrapper.c:664
+#: wrapper.c:652
#, c-format
msgid "could not close %s"
msgstr "impossible de fermer %s"
@@ -2343,14 +2332,14 @@ msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110
-#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545
+#: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:543
#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162
msgid "dry run"
msgstr "simuler l'action"
#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19
#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558
-#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114
+#: builtin/log.c:1645 builtin/mv.c:109 builtin/read-tree.c:114
msgid "be verbose"
msgstr "mode verbeux"
@@ -2541,7 +2530,7 @@ msgstr ""
msgid "Patch is empty. Was it split wrong?"
msgstr "Le patch est vide. Le découpage était-il bon ?"
-#: builtin/am.c:1417 builtin/log.c:1344
+#: builtin/am.c:1417 builtin/log.c:1347
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
@@ -4389,7 +4378,7 @@ msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250
+#: builtin/checkout.c:1151 builtin/log.c:1266 parse-options.h:250
msgid "style"
msgstr "style"
@@ -4411,7 +4400,7 @@ msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112
-#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560
+#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:558
#: builtin/send-pack.c:168
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
@@ -4731,7 +4720,9 @@ msgstr "régler la configuration dans le nouveau dépôt"
#: builtin/clone.c:300
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "extraire le dépôt de référence '%s' comme une extraction liée n'est pas encore supporté"
+msgstr ""
+"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
+"encore supporté"
#: builtin/clone.c:302
#, c-format
@@ -5305,7 +5296,7 @@ msgstr "afficher le statut avec concision"
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546
+#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:544
#: builtin/worktree.c:423
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
@@ -5434,7 +5425,7 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
-#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86
+#: builtin/commit.c:1588 builtin/log.c:1216 builtin/revert.c:86
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
@@ -6008,7 +5999,7 @@ msgstr "approfondir l'historique d'un clone superficiel"
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:118 builtin/log.c:1232
+#: builtin/fetch.c:118 builtin/log.c:1233
msgid "dir"
msgstr "dir"
@@ -6371,7 +6362,8 @@ msgid ""
msgstr ""
"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n"
"la cause et supprimer %s.\n"
-"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit supprimé.\n"
+"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit "
+"supprimé.\n"
"\n"
"%s"
@@ -7346,184 +7338,188 @@ msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1210
+#: builtin/log.c:1211
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1213
+#: builtin/log.c:1214
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1217
+#: builtin/log.c:1218
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1219
+#: builtin/log.c:1220
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1221
+#: builtin/log.c:1222
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1222
+#: builtin/log.c:1223
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1223
+#: builtin/log.c:1224
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1225
+#: builtin/log.c:1226
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1227
+#: builtin/log.c:1228
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1229
+#: builtin/log.c:1230
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1232
+#: builtin/log.c:1233
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1235
+#: builtin/log.c:1236
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1238
+#: builtin/log.c:1239
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1240
+#: builtin/log.c:1241
+msgid "output all-zero hash in From header"
+msgstr "écrire une empreinte à zéro dans l'entête From"
+
+#: builtin/log.c:1243
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1242
+#: builtin/log.c:1245
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1244
+#: builtin/log.c:1247
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1245
+#: builtin/log.c:1248
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1246
+#: builtin/log.c:1249
msgid "add email header"
msgstr "ajouter l'en-tête d'e-mail"
-#: builtin/log.c:1247 builtin/log.c:1249
+#: builtin/log.c:1250 builtin/log.c:1252
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1247
+#: builtin/log.c:1250
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1249
+#: builtin/log.c:1252
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1251
+#: builtin/log.c:1254
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1252
+#: builtin/log.c:1255
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1254
+#: builtin/log.c:1257
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1255
+#: builtin/log.c:1258
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1256 builtin/log.c:1259
+#: builtin/log.c:1259 builtin/log.c:1262
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1257
+#: builtin/log.c:1260
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1260
+#: builtin/log.c:1263
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1264
+#: builtin/log.c:1267
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1266
+#: builtin/log.c:1269
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1267
+#: builtin/log.c:1270
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1269
+#: builtin/log.c:1272
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1270
+#: builtin/log.c:1273
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1359
+#: builtin/log.c:1362
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1361
+#: builtin/log.c:1364
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix et -k sont mutuellement exclusifs."
-#: builtin/log.c:1369
+#: builtin/log.c:1372
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1371
+#: builtin/log.c:1374
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1373
+#: builtin/log.c:1376
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1396
+#: builtin/log.c:1401
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1398
+#: builtin/log.c:1403
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1495
+#: builtin/log.c:1500
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1558
+#: builtin/log.c:1563
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1606
+#: builtin/log.c:1611
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1660
+#: builtin/log.c:1665
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -7531,7 +7527,7 @@ msgstr ""
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/log.c:1671 builtin/log.c:1673 builtin/log.c:1685
+#: builtin/log.c:1676 builtin/log.c:1678 builtin/log.c:1690
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
@@ -8982,19 +8978,19 @@ msgstr "Impossible de fusionner de multiples branches sur une tête vide."
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/push.c:15
+#: builtin/push.c:16
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:86
+#: builtin/push.c:88
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:96
+#: builtin/push.c:98
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:140
+#: builtin/push.c:142
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -9003,7 +8999,7 @@ msgstr ""
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:143
+#: builtin/push.c:145
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -9028,7 +9024,7 @@ msgstr ""
" git push %s %s\n"
"%s"
-#: builtin/push.c:158
+#: builtin/push.c:160
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -9043,7 +9039,7 @@ msgstr ""
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:172
+#: builtin/push.c:174
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -9057,13 +9053,13 @@ msgstr ""
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:180
+#: builtin/push.c:182
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:183
+#: builtin/push.c:185
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -9074,7 +9070,7 @@ msgstr ""
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:206
+#: builtin/push.c:208
msgid ""
"push.default is unset; its implicit value has changed in\n"
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
@@ -9125,14 +9121,14 @@ msgstr ""
"'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes "
"versions de Git)"
-#: builtin/push.c:273
+#: builtin/push.c:275
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:280
+#: builtin/push.c:282
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -9147,7 +9143,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:286
+#: builtin/push.c:288
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
@@ -9162,7 +9158,7 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:292
+#: builtin/push.c:294
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
@@ -9180,13 +9176,13 @@ msgstr ""
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:299
+#: builtin/push.c:301
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:302
+#: builtin/push.c:304
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
@@ -9198,22 +9194,22 @@ msgstr ""
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:361
+#: builtin/push.c:363
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:365
+#: builtin/push.c:367
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:395
+#: builtin/push.c:397
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -9235,101 +9231,105 @@ msgstr ""
"\n"
" git push <nom>\n"
-#: builtin/push.c:411
+#: builtin/push.c:413
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:412
+#: builtin/push.c:414
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:417
+#: builtin/push.c:419
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:418
+#: builtin/push.c:420
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:423
+#: builtin/push.c:425
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:539
+#: builtin/push.c:537
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:540 builtin/send-pack.c:161
+#: builtin/push.c:538 builtin/send-pack.c:161
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:541 builtin/send-pack.c:163
+#: builtin/push.c:539 builtin/send-pack.c:163
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:543
+#: builtin/push.c:541
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:544
+#: builtin/push.c:542
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:547 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:164
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:549 builtin/send-pack.c:175
+#: builtin/push.c:547 builtin/send-pack.c:175
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:550 builtin/send-pack.c:176
+#: builtin/push.c:548 builtin/send-pack.c:176
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:553
+#: builtin/push.c:550
+msgid "check|on-demand|no"
+msgstr "check|on-demand|no"
+
+#: builtin/push.c:551
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:555 builtin/send-pack.c:169
+#: builtin/push.c:553 builtin/send-pack.c:169
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158
+#: builtin/push.c:554 builtin/push.c:555 builtin/send-pack.c:158
#: builtin/send-pack.c:159
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:558
+#: builtin/push.c:556
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:561
+#: builtin/push.c:559
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:563
+#: builtin/push.c:561
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:564
+#: builtin/push.c:562
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:567 builtin/send-pack.c:166
+#: builtin/push.c:565 builtin/send-pack.c:166
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:569 builtin/send-pack.c:170
+#: builtin/push.c:567 builtin/send-pack.c:170
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:579
+#: builtin/push.c:577
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:581
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
@@ -10660,7 +10660,9 @@ msgstr "git stripspace [-c | --comment-lines]"
#: builtin/stripspace.c:35
msgid "skip and remove all lines starting with comment character"
-msgstr "sauter et supprimer toutes les lignes commençant par le caractère de commentaire"
+msgstr ""
+"sauter et supprimer toutes les lignes commençant par le caractère de "
+"commentaire"
#: builtin/stripspace.c:38
msgid "prepend comment character and blank to each line"
@@ -10681,7 +10683,9 @@ msgstr "git submodule--helper <nom> <chemin>"
#: builtin/submodule--helper.c:120
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
-msgstr "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le chemin '%s'"
+msgstr ""
+"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
+"chemin '%s'"
#: builtin/submodule--helper.c:170
msgid "where the new submodule will be cloned to"
@@ -10703,7 +10707,10 @@ msgstr "profondeur de l'historique des clones superficiels"
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]"
-msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] [<chemin>...]"
+msgstr ""
+"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
+"<dépôt>] [--name <nom>] [--url <url>][--depth <profondeur>] [--] "
+"[<chemin>...]"
#: builtin/submodule--helper.c:202 builtin/submodule--helper.c:208
#: builtin/submodule--helper.c:216
@@ -10733,7 +10740,9 @@ msgstr "impossible de créer le répertoire de sous-module pour '%s'"
#: builtin/submodule--helper.c:273
msgid "fatal: submodule--helper subcommand must be called with a subcommand"
-msgstr "fatal : la sous-commande submodule--helper doit être appelée avec une sous-commande"
+msgstr ""
+"fatal : la sous-commande submodule--helper doit être appelée avec une sous-"
+"commande"
#: builtin/submodule--helper.c:280
#, c-format
@@ -11677,7 +11686,9 @@ msgstr "impossible de modifier la signification du terme '$term'"
#: git-bisect.sh:606
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
-msgstr "Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/$TERM_GOOD."
+msgstr ""
+"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
+"$TERM_GOOD."
#: git-bisect.sh:636
msgid "no terms defined"
@@ -11690,7 +11701,8 @@ msgid ""
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"argument invalide $arg pour 'git bisect terms'.\n"
-"Les options supportées sont : --term-good|--term-old et --term-bad|--term-new."
+"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
+"new."
#: git-rebase.sh:57
msgid ""
@@ -12284,6 +12296,14 @@ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
+#~ msgid "unable to look up current user in the passwd file: %s"
+#~ msgstr ""
+#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de "
+#~ "passe : %s"
+
+#~ msgid "no such user"
+#~ msgstr "utilisateur inconnu"
+
#~ msgid "branch '%s' does not point at a commit"
#~ msgstr "la branche '%s' ne pointe pas sur un commit"