am 33e4f5fb: (-s ours) am 8aedf941: (-s ours) Import translations. DO NOT MERGE

* commit '33e4f5fb17ee05759aa4a90e7279ec4d63d00daa':
  Import translations. DO NOT MERGE