am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE
automerge: 4d23238  -s ours

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