Fix i18n messages

Fix the last scraps of messages

Change-Id: I0494ab43fa95b7040de2b5a596fa08b9c73aab8d
Merge "Fix i18n messages"