am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE

* commit '5bcbc21a59043f73a30380cf3c231104d65921f9':
  Import translations. DO NOT MERGE