am d46cb0cd: am 85e9cc3b: (-s ours) Import translations. DO NOT MERGE

* commit 'd46cb0cd3ca94a1aad70d63b21b13ae8a7b616c2':