am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE

* commit '6537280fd524c5297dc50079cdbfce8db6f64b75':