translations refactoring and update