Take two on fixing ticket-1688. See take one: #1.

This makes it possible to translate permission names, both for built-in and custom permissions, while still storing the names in the database.

Custom permissions

Two steps...