I went with solution two as it seems the most consistent one. I've applied the fix also for XWiki 16.10.9 as the missing translations for those properties also affect XWiki 16.10.x.
This message was sent by Atlassian Jira (v9.3.0#930000-sha1:287aeb6)
If image attachments aren't displayed, see this article.
