am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

* commit '8609c70a9a218b5594d68f843584d251330aaf05':
  Import translations. DO NOT MERGE