Merge branches 'fix-needs-plural', 'fix-plural-french' and 'fallback-in-translation'