am d79d0310: (-s ours) am 585a210d: (-s ours) Import translations. DO NOT MERGE
automerge: 4e46775  -s ours

* commit '4e46775ceb609220169ec8ff9c6a1310d3fd7c34':
  Import translations. DO NOT MERGE