Pseudomerge with PR #1. Categories translated.