Merged core translations from 1.5 branch
Merged contrib translations from 1.5 branch
Fixed i18n test to match changed translation

Forward port of ab6ff2e0ac from stable/1.5