From: Jiang Xin <worldhello.net@gmail.com>
Date: Sun, 24 Apr 2016 12:36:34 +0000 (+0800)
Subject: Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
X-Git-Tag: v2.8.2~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ee0fca122653572f2ecb3c3a2d5441170f8e17c;p=git

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"
---

2ee0fca122653572f2ecb3c3a2d5441170f8e17c