am 8c304144: (-s ours) am 3a80fc38: (-s ours) Import translations. DO NOT MERGE

* commit '8c304144d2b8e9735ad21184c42f69e5c7a6f026':
  Import translations. DO NOT MERGE