am 41b8bbf7: (-s ours) am 0458b213: (-s ours) Import translations. DO NOT MERGE

* commit '41b8bbf74679a33036c668085180904a7e7f545f':
  Import translations. DO NOT MERGE