Added translation update
Fixed up TextView to avoid race for Settings.