Fix missing translations for emails and spree_flexi_variants
Merge branch 'staging'