am 57d484c5: (-s ours) am 17f22104: (-s ours) Import translations. DO NOT MERGE

* commit '57d484c5c24532f00e5358e1544c28b20fe564c0':
  Import translations. DO NOT MERGE