am 3074b5cd: (-s ours) am b126b820: (-s ours) Import translations. DO NOT MERGE

* commit '3074b5cd7cb881e36750c7b9fc57e94066fb48f3':
  Import translations. DO NOT MERGE