am a38f80f1: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit 'a38f80f184b0604bff81232c2559784cc64e0aea':