[TASK] Update translation handling