[GIT PULL] l10n updates for maint branch (2.8.2)

Hi Junio,

Please pull this update to the maint branch.  It should have been merged to
Git 2.8.0, but I was busy these weeks and forgot to check my private mailbox.

The following changes since commit 26e4cbec4558ea21cd572bfc915a462f63c1ebb4:

  l10n: zh_CN: review for git v2.8.0 l10n round 2 (2016-03-20 18:46:02 +0800)

are available in the git repository at:

  git://github.com/git-l10n/git-po tags/l10n-2.8.0-rnd3-fr

for you to fetch changes up to 2ee0fca122653572f2ecb3c3a2d5441170f8e17c:

  Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into
maint (2016-04-24 20:36:34 +0800)

----------------------------------------------------------------
l10n-2.8.0-rnd3-fr

----------------------------------------------------------------
Jean-Noël Avila (1):
      Merge pull request #9 from vascool/fr

Jiang Xin (1):
      Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint

Vasco Almeida (4):
      l10n: fr: fix transcation of "dir"
      l10n: fr: fix wrongly translated option name
      l10n: fr: change "id de clé" to match "id-clé"
      l10n: fr: don't translate "merge" as a parameter

 po/fr.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--
Jiang Xin