Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
authorJiang Xin <worldhello.net@gmail.com>
Sun, 24 Apr 2016 12:36:34 +0000 (20:36 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 24 Apr 2016 12:36:34 +0000 (20:36 +0800)
commit2ee0fca122653572f2ecb3c3a2d5441170f8e17c
tree61163fef1c4fbac1a6e9beac283e482e1fb556ad
parent26e4cbec4558ea21cd572bfc915a462f63c1ebb4
parent47caafddc3d15e499d45c83a91d1f8c58efbe1a3
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"