french translation for new categories
fixed typo
fix merge conflict