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

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