Fixed {{PLURAL...}} and other minor i18n things

Change-Id: Ib6da6948b605c264e309a5d31bc1c5a3c14b3f27