am 246035df: (-s ours) am 3f99e9f1: (-s ours) Import translations. DO NOT MERGE

* commit '246035df3fa0f33eb8e652b6c5f42f755eefe80b':
  Import translations. DO NOT MERGE