am 0c6bd0af: (-s ours) am 708d6cd0: Import translations. DO NOT MERGE

* commit '0c6bd0afc37e1aad37ff9748740eaa87c8fb23fc':
  Import translations. DO NOT MERGE