Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 20:36:26 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 20:36:26 +0000 (13:36 -0700)
commit625efa9decb64e2b51c4bef342922553729cf2f6
tree471a64f2147f1f420060ff024899b1a9d0c15847
parent6a6636270fbaf74609cd3e1bd207dd2c420d640a
parent2ee0fca122653572f2ecb3c3a2d5441170f8e17c
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"