correcting l10n errors
Merge branch 'develop'