Merge branch 'dev' into feature/30-profile-forgot-link

# Conflicts:
#	src/locales/en.json
#	src/views/Home.vue
This commit is contained in:
2021-04-01 19:58:37 +02:00
5 changed files with 146 additions and 23 deletions

View File

@@ -1,9 +1,14 @@
{
"access_is_only_provided_via_your_email_link": "Access is only provided via the link you received upon registration.",
"all_data_deleted": "All Data deleted!",
"already_have_an_account": "Already have an account?",
"apartment_suite_etc": "Apartment, suite, etc.",
"cancel_keep_my_data": "Cancel, keep my data",
"configuration_error": "Configuration error",
"confirm_delete_all_of_my_data": "Confirm, delete all of my data",
"confirm_personal_data": "I hereby confirm that the above information is complete and correct",
"delete_my_data": "Delete my data",
"deletion_in_progress": "Deletion in progress...",
"distance": "Distance",
"download_certificate": "Download certificate",
"e_mail_adress": "mail address",