am 156add61: (-s ours) am 7feaf400: (-s ours) Import translations. DO NOT MERGE

* commit '156add61575b849b9ec90e7efaf27331df3c928c':
  Import translations. DO NOT MERGE