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

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