Makes errors translatable
Makes errors translatable
Makes errors and other string output translatable
Merge remote-tracking branch 'origin/develop' into develop