am 5ef1f488: (-s ours) am 35e7a497: (-s ours) Import translations. DO NOT MERGE

* commit '5ef1f4886c6d2d72d6e3b31cd033c0f85e36fe57':
  Import translations. DO NOT MERGE