am 2a2d9f39: (-s ours) am d714f5bf: (-s ours) Import translations. DO NOT MERGE

* commit '2a2d9f39c444757166713f7e54efafe3d6a24518':
  Import translations. DO NOT MERGE