skip empty translations during language file import and overwrite old translations by imported
improve translations in templates
Merge branch 'fixg2_branch'