#JC-1605, JC-1608 Changed i18n messages. Added velocity placeholders.