am 3d1d7a77: (-s ours) am 66838ce1: (-s ours) am cc665090: (-s ours) Import translations. DO NOT MERGE automerge: 0b9aa50  -s ours
automerge: 41e0749  -s ours

* commit '41e074910614698183a3f8fe94fac7b819e83abd':
  Import translations. DO NOT MERGE