am 8cb24434: (-s ours) Import translations. DO NOT MERGE

* commit '8cb24434280f88b69dfb6944cd53c2a3e5eb28ec':
  Import translations. DO NOT MERGE