| commit | 3ad15fd5e17bbb73fb1161ff4e9c3ed254d5b243 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:18:41 +0000 (25 15:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:18:41 +0000 (25 15:18 -0700) | ||
| tree | 57bdf2da7b866920e46d9bd7455662f057c02cdb | treesnapshot (tar.gz zip) |
| parent | e1f0df79a825325731d58784f0900358012a2e39 | commitdiff |
| parent | 625efa9decb64e2b51c4bef342922553729cf2f6 | commitdiff |
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"
* 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"