Old dictionary: fr
Merge branch 'fr'