am b8c7336b: (-s ours) am fc6cdb9e: (-s ours) am 23c73693: (-s ours) Import translations. DO NOT MERGE
automerge: 947419d  -s ours

* commit '947419d1039260eefba830fe7b35dde7cd8cd586':
  Import translations. DO NOT MERGE