From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2016 20:36:26 +0000 (-0700)
Subject: Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint
X-Git-Tag: v2.8.2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/625efa9decb64e2b51c4bef342922553729cf2f6?hp=-c

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"
---

625efa9decb64e2b51c4bef342922553729cf2f6