#3152 several fixes for multilingual files