am 86d2f720: (-s ours) am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE

* commit '86d2f720fbd464053d6506bf7b5291fcffe1b600':
  Import translations. DO NOT MERGE