am 8e25e529: (-s ours) am 3a3ba2b8: (-s ours) Import translations. DO NOT MERGE

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