Fix bug with propogating default language strings

Previously languages with given translations would propogate and
override the (correct) default strings for a language.
Merge branch 'language-bug' into staging2