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

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