Website translated in french, with all upstream conflicts resolved.