Tweak command output and fix translation.