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

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