3c7f0888de
fix(i18n): complete French translations and resolve merge conflicts with main
fix(i18n): complete French translations and resolve merge conflicts with main