am d84ce330: (-s ours) am f518d9d0: (-s ours) am c34237fd: (-s ours) Import translations. DO NOT MERGE

* commit 'd84ce3307a46b46844cc1751f7efdecf2156cdf0':
  Import translations. DO NOT MERGE