am 84fa4385: (-s ours) am 49283ea8: (-s ours) am d67d4059: Import revised translations. DO NOT MERGE

* commit '84fa438510467de6b9dce9a633ffdd9ae7efab8b':
  Import revised translations. DO NOT MERGE