Merge pull request #849 from danielhjames/master

Workaround lack of support for @ character in locales
Rename sr@latin localization files back to sh