merge translations

Change-Id: If4ea93d6c2526c4bc645beb8c840c3eb693f1590