am 09d6bb2c: (-s ours) am a8ee66f3: (-s ours) am f709f76e: Import translations. DO NOT MERGE

* commit '09d6bb2c0ca5423bfafa8bace3a47f954160eb8d':