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

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