Fixed some LangPlugin.getAlternativeFile issues
Merge branch 'refactoring'