Fix localization and improve the message string