merge translations with those from theme
merge translations with those from theme
additional safety checks
Merge pull request #2972 from AndreasErgenzinger/master

Translations for themes