am 8025ec07: (-s ours) am aea3b16e: (-s ours) Import translations. DO NOT MERGE

* commit '8025ec07e63090713f965d761787a87668cdb13e':
  Import translations. DO NOT MERGE