i18n cleanup (affects foodcoops#137)
more i18n cleanup (affects foodcoops#137)
fix forgotten i18n string (affects foodcoops#137)
localeapp roundtrip
Resolve merge conflicts