Convention views french translation
Merge origin/master