am 439b1543: (-s ours) am 17d0af91: (-s ours) Import translations. DO NOT MERGE

* commit '439b1543119fd97d134c602d92fc6ce9a517be20':
  Import translations. DO NOT MERGE