Maurice
069fd99341
Merge branch 'pr-169'
# Conflicts:
# client/src/i18n/translations/ar.ts
# client/src/i18n/translations/br.ts
# client/src/i18n/translations/cs.ts
# client/src/i18n/translations/de.ts
# client/src/i18n/translations/en.ts
# client/src/i18n/translations/es.ts
# client/src/i18n/translations/fr.ts
# client/src/i18n/translations/hu.ts
# client/src/i18n/translations/it.ts
# client/src/i18n/translations/nl.ts
# client/src/i18n/translations/ru.ts
# client/src/i18n/translations/zh.ts
# client/src/pages/SettingsPage.tsx