Andrew's git / gitweb.git / diff
?
Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 20:36:26 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 20:36:26 +0000 (13:36 -0700)
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"

Trivial merge