am 0f260324: (-s ours) am 839ab5f2: (-s ours) Import translations. DO NOT MERGE

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