sync with po-templates for 4.2

and force-fix errors using pocheck

Change-Id: Ic842792d6ee5fe0fc5d1b41808671f8c3ae34dc6