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

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