am 7f4c7641: (-s ours) am c6adece0: Import translations. DO NOT MERGE

* commit '7f4c7641e0ce85162eb8f5c8846e35db29a068f7':
  Import translations. DO NOT MERGE