am b91e187c: (-s ours) am d7a975a2: (-s ours) Import translations. DO NOT MERGE

* commit 'b91e187ccb1e1ab6c6edc495bc31095f452f22be':