am 04887e4d: (-s ours) am 63c4a166: (-s ours) Import translations. DO NOT MERGE

* commit '04887e4d16f2146a7db6e5ff6c6cb5bc0fa63f18':
  Import translations. DO NOT MERGE