Merge branch 'fr_2.16' of git://github.com/jnavila/git
authorJiang Xin <worldhello.net@gmail.com>
Sat, 6 Jan 2018 02:24:52 +0000 (10:24 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Sat, 6 Jan 2018 02:24:52 +0000 (10:24 +0800)
commit4a6b2cb58889ebd7ec9782c70cbf1a82ca2498f9
treefc536941361bb3b91dd46a934135be52b2ebff7f
parent9a08e9a72b68b21ea2e5df906f4ca02fa1471cad
parent5da312d11cbe1b62ffc2616b97cf44c4f561872e
Merge branch 'fr_2.16' of git://github.com/jnavila/git

* 'fr_2.16' of git://github.com/jnavila/git:
  l10n: fr.po v2.16.0 round 1
  l10n: fr.po: "worktree list" mistranslated as prune