am 6bc6b227: (-s ours) Import translations. DO NOT MERGE

* commit '6bc6b22700976ee6cb5192089e14fbb8076fcadf':
  Import translations. DO NOT MERGE