From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Apr 2016 22:18:41 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.9.0-rc0~94
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3ad15fd5e17bbb73fb1161ff4e9c3ed254d5b243

Sync with maint

* maint:
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"
---

3ad15fd5e17bbb73fb1161ff4e9c3ed254d5b243