am 84725dfb: (-s ours) am e991b546: (-s ours) Import translations. DO NOT MERGE

* commit '84725dfb09399bde98c3541691cc330c46e4050d':
  Import translations. DO NOT MERGE