Merge branch 'fr_v2.17.0' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Sun, 18 Mar 2018 11:46:38 +0000 (19:46 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sun, 18 Mar 2018 11:46:38 +0000 (19:46 +0800)
* 'fr_v2.17.0' of git://github.com/jnavila/git:
l10n: fr.po v2.17.0 round 1

Trivial merge