am 6af85e3f: (-s ours) am a1dfe362: (-s ours) Import translations. DO NOT MERGE

* commit '6af85e3f1bca2f6f9e8a4220998b8d76dfc997f5':
  Import translations. DO NOT MERGE