am 85eee52a: am 257de1d9: (-s ours) Import translations. DO NOT MERGE

* commit '85eee52a76b68f698c3b739907b6aada4fb7cee3':