am 9b2aab5a: (-s ours) am 1f19a311: (-s ours) Import translations. DO NOT MERGE

* commit '9b2aab5ae1ee147b18860aa6b465baed2ffdeff4':