am 1d50904e: (-s ours) am 0f78bf16: (-s ours) Import translations. DO NOT MERGE

* commit '1d50904e04e15e0f8692cd815d56ade9580c1d9e':
  Import translations. DO NOT MERGE