am 12eae246: (-s ours) Import translations. DO NOT MERGE

* commit '12eae246c5aaf836e9ceebe55117dff650bb2821':
  Import translations. DO NOT MERGE