first part of i18n/l10n changes after review; added two more authors of the code ;)
fixed issues mentioned in @FIXME annotations
Merge branch 'consumer-sprint41-bugid-105581' into consumer-collections