am 2aea2248: (-s ours) am 62360ec4: (-s ours) Import translations. DO NOT MERGE

* commit '2aea22487d252744ad50085cba233e7d63ff0e6a':
  Import translations. DO NOT MERGE