More internationalization

Change-Id: I115e2794d9321d8e908d48c8734aff0d0c839ccf