am bdd7bd37: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE

* commit 'bdd7bd37af37eeacefaee9b8ca3b3c828d7641f6':