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

* commit 'ed6f7ec1b8dd8610dc1b143c11fa62fedce6add1':
  Import translations. DO NOT MERGE