am 824dc2fa: (-s ours) am 1e99b43a: (-s ours) Import translations. DO NOT MERGE

* commit '824dc2fa742f207ee966f502cc29b183f917b85b':
  Import translations. DO NOT MERGE