removed invalid condition
Messages moved to external properties file