am 211ddc7f: (-s ours) am a38f80f1: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit '211ddc7f4d2f4d0df6fa295fe8b82018e7860d5f':