am 4ac4ba5d: (-s ours) am 0307a2a6: (-s ours) Import translations. DO NOT MERGE

* commit '4ac4ba5d1295b31a759609fd1e495cbf5e18ea64':
  Import translations. DO NOT MERGE