am 7aaaacc1: (-s ours) Import translations. DO NOT MERGE

* commit '7aaaacc1d1f9c2928c1d4d5df457163eebbdc36f':
  Import translations. DO NOT MERGE