am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521  -s ours
automerge: ecd9daa  -s ours

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