am 6508e48e: (-s ours) Import translations. DO NOT MERGE

* commit '6508e48e9e2edcebb8fc615dcaaaaeaf6321b7e5':
  Import translations. DO NOT MERGE