aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2016-04-24 20:36:34 +0800
committerJiang Xin <worldhello.net@gmail.com>2016-04-24 20:36:34 +0800
commit2ee0fca122653572f2ecb3c3a2d5441170f8e17c (patch)
tree61163fef1c4fbac1a6e9beac283e482e1fb556ad /po
parent26e4cbec4558ea21cd572bfc915a462f63c1ebb4 (diff)
parent47caafddc3d15e499d45c83a91d1f8c58efbe1a3 (diff)
downloadgit-2ee0fca122653572f2ecb3c3a2d5441170f8e17c.tar.gz
git-2ee0fca122653572f2ecb3c3a2d5441170f8e17c.tar.xz
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git: 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"
Diffstat (limited to 'po')
-rw-r--r--po/fr.po10
1 files changed, 5 insertions, 5 deletions
diff --git a/po/fr.po b/po/fr.po
index 88b0b8a78..55ca387ba 100644
--- a/po/fr.po
+++ b/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"