am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE