am 715ec84d: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '715ec84d4cd67dcb8227228b41a9d0bc5b95c953':
  Import translations. DO NOT MERGE