Merge branch 'main' into 'VaultAusir-main-patch-43441'

# Conflicts:
#   locale/no/translations.suml
This commit is contained in:
Avris 2021-08-08 15:32:28 +00:00
commit 3c99c8fa67
1 changed files with 12 additions and 1 deletions

View File

@ -49,7 +49,18 @@ nouns:
inclusive: inclusive:
enabled: false enabled: false
terms: terms:
enabled: false enabled: true
categories:
- 'seksuell legning'
- 'romantisk legning'
- 'tertiær legning'
- 'kjønn'
- 'kjønns uttrykk'
- 'forholds modell'
- 'språk'
- 'attraksjon'
- 'politikk'
route: 'terminologi'
names: names:
enabled: false enabled: false