Merge pull request #9 from vascool/fr

Fix inconsistencies
This commit is contained in:
Jean-Noël Avila 2016-03-25 17:11:20 +01:00
commit 47caafddc3

View File

@ -2945,7 +2945,7 @@ msgstr "utiliser l'horodatage actuel pour la date d'auteur"
#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 #: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225
#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 #: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
msgid "key-id" msgid "key-id"
msgstr "id de clé" msgstr "id-clé"
#: builtin/am.c:2322 #: builtin/am.c:2322
msgid "GPG-sign commits" msgid "GPG-sign commits"
@ -4545,7 +4545,7 @@ msgstr "style"
#: builtin/checkout.c:1154 #: builtin/checkout.c:1154
msgid "conflict style (merge or diff3)" msgid "conflict style (merge or diff3)"
msgstr "style de conflit (fusion ou diff3)" msgstr "style de conflit (merge (fusion) ou diff3)"
#: builtin/checkout.c:1157 #: builtin/checkout.c:1157
msgid "do not limit pathspecs to sparse entries only" msgid "do not limit pathspecs to sparse entries only"
@ -6197,7 +6197,7 @@ msgstr "convertir en un dépôt complet"
#: builtin/fetch.c:122 builtin/log.c:1236 #: builtin/fetch.c:122 builtin/log.c:1236
msgid "dir" msgid "dir"
msgstr "dir" msgstr "répertoire"
#: builtin/fetch.c:123 #: builtin/fetch.c:123
msgid "prepend this to submodule path output" msgid "prepend this to submodule path output"
@ -10809,11 +10809,11 @@ msgstr "git show-ref --exclude-existing[=<motif>]"
#: builtin/show-ref.c:165 #: builtin/show-ref.c:165
msgid "only show tags (can be combined with heads)" msgid "only show tags (can be combined with heads)"
msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)" msgstr "afficher seulement les étiquettes (peut être combiné avec heads)"
#: builtin/show-ref.c:166 #: builtin/show-ref.c:166
msgid "only show heads (can be combined with tags)" msgid "only show heads (can be combined with tags)"
msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)" msgstr "afficher seulement les têtes (peut être combiné avec tags)"
#: builtin/show-ref.c:167 #: builtin/show-ref.c:167
msgid "stricter reference checking, requires exact ref path" msgid "stricter reference checking, requires exact ref path"