am 71a80d9f: (-s ours) am baf687ff: (-s ours) Import translations. DO NOT MERGE

* commit '71a80d9ffd76954a3e96ef1e8690a8645575ee18':