Fix merging local language

Avoid overriding English language file and ensure that all sub objects are deep merged.

This fix was also included in #685 among other things, but this pull request should be more clean to merge in.