Amended system messages

* Added plural support for two system messages as requested by tw.n community

Change-Id: Ib81d61f26421b966e555ab4245edaff90bbe67bc