am 33c93907: (-s ours) am 99dcfed6: (-s ours) Import translations. DO NOT MERGE

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