Merge "Revert "Fixed that OK button is not localized""