am 60beeda7: (-s ours) am 0f76b9ad: Import translations. DO NOT MERGE

* commit '60beeda72609b4193cdda312c368e4daf319ffa2':