Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Sun, 17 Jun 2018 14:36:41 +0000 (22:36 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 17 Jun 2018 14:36:41 +0000 (22:36 +0800)
* 'fr_2.18_rnd3' of git://github.com/jnavila/git:
l10n: fr.po v2.18.0 round 3

Trivial merge