Merge branch 'master' into translations

# Conflicts:
#	assets/translations/en.json
pull/374/head
Inex Code 2023-12-01 17:15:33 +03:00
commit e80b5b8fb3
1 changed files with 2 additions and 2 deletions

View File

@ -25,7 +25,7 @@
"username": "Username",
"loading": "Loading…",
"later": "Skip to setup later",
"connect_to_existing": "Connect to an existing SelfPrivacy server",
"connect_to_existing": "I already have a SelfPrivacy server!",
"reset": "Reset",
"details": "Details",
"no_data": "No data",
@ -475,7 +475,7 @@
},
"recovering": {
"generic_error": "Operation failed, please try again.",
"recovery_main_header": "Connecting to an existing SelfPrivacy server",
"recovery_main_header": "Connect to an existing server",
"domain_recovery_description": "Enter a server domain you want to get access for:",
"domain_recover_placeholder": "Your domain",
"domain_recover_error": "Server with such domain was not found",