Merge l10n updates from branch 'maint' into master