am c6fc5287: (-s ours) Import translations. DO NOT MERGE
automerge: aea95a6  -s ours

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