l10n-2.8.0-rnd3-fr
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXHL5eAAoJEMek6Rt1RHoou9QP/0GgI8fbrRmSgXv7tVB3mG/Q hyboK/lLll2uVioIQjXnkHkp3Q7k9dl/MPVJDaPZ0chogxs078YwumWGFFbB4+DU lkuAQAQr4mGVflgzwBhKZ2GwaZvWuBZFlFWPLj1Z2T1s2q8VBy87oajh/Q4G7yv1 lEdbde0sZk7tvmgm5iHLQkzg/ihtiEikbm/ivnUR5KSngc6OrlkWokYVojSIt2nT lAbBx/16XGC4hI9uqnEB/t5hhaf+tzDbW9ZwJkYLj5cXV4gQgWaAnAr1jp9n5IDb 51AjZKB+bYyjCmpAJb2M1RxElVB+O5R7IBqlN5U3OY8pN4Web4XxMMl21aFwIbeX hsRkL3CFxZ/GFAgQ6HH/jS12QRLh9L7EGsxIr+IXtS+6OX7nSTh/d/ofAfBIyw3b CfVjBEZ4uCLSwisRvjLrS1WE5izgTQQkmz+n2iiLX2bxsGTnQ8OsdLbqz14Q6uuF ut4iJLHxWYHQffWT2dB1i535LpfUkQGW9M5NJL8XhSUY9gCZgRz5hrD6D0ZwC4S9 A32TfqDIHflrdD1HCNq64Du6aBGEguKVSy7UNO928FNqydR6tI2E1ymqPIpit8rw bRVa1Gw4kWdat9SNweyeIXE5DUqtwfwCjptICkGl2UfPFs9l8lpUpw8Um4JlfjSd fTDwGhYKqLOFFazZMLcP =Ho/5 -----END PGP SIGNATURE----- Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint l10n-2.8.0-rnd3-fr * tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir"
This commit is contained in:
commit
625efa9dec
10
po/fr.po
10
po/fr.po
@ -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/pull.c:159 builtin/revert.c:92 builtin/tag.c:355
|
||||
msgid "key-id"
|
||||
msgstr "id de clé"
|
||||
msgstr "id-clé"
|
||||
|
||||
#: builtin/am.c:2322
|
||||
msgid "GPG-sign commits"
|
||||
@ -4545,7 +4545,7 @@ msgstr "style"
|
||||
|
||||
#: builtin/checkout.c:1154
|
||||
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
|
||||
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
|
||||
msgid "dir"
|
||||
msgstr "dir"
|
||||
msgstr "répertoire"
|
||||
|
||||
#: builtin/fetch.c:123
|
||||
msgid "prepend this to submodule path output"
|
||||
@ -10809,11 +10809,11 @@ msgstr "git show-ref --exclude-existing[=<motif>]"
|
||||
|
||||
#: builtin/show-ref.c:165
|
||||
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
|
||||
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
|
||||
msgid "stricter reference checking, requires exact ref path"
|
||||
|
Loading…
Reference in New Issue
Block a user