am ef3b4c4f: (-s ours) am 1ccd7637: (-s ours) Import translations. DO NOT MERGE

* commit 'ef3b4c4fbe60aac90822087b56aeb87668cafc66':