Merge "Fixed the translation of messages" into rvc-dev