am a57e72ea: (-s ours) am 2e68425e: (-s ours) am a167e65c: Import translations. DO NOT MERGE

* commit 'a57e72eaf40ab153ec06c51716d42102de1b311f':