From 0ca32c46f87f7c49d88657d677db6e2116b4ed5e Mon Sep 17 00:00:00 2001 From: Marius Lindvall Date: Thu, 12 Dec 2019 11:02:56 +0100 Subject: [PATCH] Improve end-to-end encryption UX; fixes #96 --- android/app/src/main/res/values/strings.xml | 4 ++-- backend-php/include/lang/en/texts.php | 4 ++-- frontend/assets/lang/en.json | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 1e34581..f646773 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -13,9 +13,9 @@ Update interval (seconds) Preferred link ID <randomly generated> - Encrypt share + Password protect share - Encryption key + Encryption password Sharing mode: Allow adoption: diff --git a/backend-php/include/lang/en/texts.php b/backend-php/include/lang/en/texts.php index f91bcbe..677ed3d 100644 --- a/backend-php/include/lang/en/texts.php +++ b/backend-php/include/lang/en/texts.php @@ -16,5 +16,5 @@ $LANG['group_pin_invalid'] = 'Invalid group PIN!'; $LANG['session_invalid'] = 'Invalid session!'; $LANG['location_invalid'] = 'Invalid location!'; -$LANG['group_e2e_unsupported'] = 'End-to-end encryption cannot be used for group shares!'; -$LANG['e2e_adoption_not_allowed'] = 'This share is using end-to-end encryption and cannot be adopted!'; +$LANG['group_e2e_unsupported'] = 'Group shares cannot be password protected!'; +$LANG['e2e_adoption_not_allowed'] = 'This share is password protected and cannot be adopted!'; diff --git a/frontend/assets/lang/en.json b/frontend/assets/lang/en.json index 17c5068..5c6d393 100644 --- a/frontend/assets/lang/en.json +++ b/frontend/assets/lang/en.json @@ -2,12 +2,12 @@ "page_title": "Hauk", "expired_head": "Location expired", "expired_body": "The shared location you tried to access was not found on the server. If this link worked before, the share might have expired.", - "e2e_title": "End-to-end encryption", - "e2e_placeholder": "Encryption password", - "e2e_password_prompt": "This share is protected by end-to-end encryption. Please enter the encryption password to access the share.", - "e2e_incorrect": "The encryption password you entered was wrong. Please try again.", - "e2e_unavailable_secure": "This share is protected by end-to-end encryption. Decryption is currently unavailable because you are not using HTTPS. Please ensure you are using HTTPS, then try again.", - "e2e_unsupported": "This share is protected by end-to-end encryption. Your browser does not appear to support the cryptographic functions required to decrypt such shares. Please try again with another web browser.", + "e2e_title": "Password protected", + "e2e_placeholder": "Enter password", + "e2e_password_prompt": "This share is password protected. Please enter the password to access the share.", + "e2e_incorrect": "The password you entered was wrong. Please try again.", + "e2e_unavailable_secure": "This share is password protected. You cannot unlock this share because you are not using HTTPS. Please ensure you are using HTTPS, then try again.", + "e2e_unsupported": "This share is password protected. Your browser lacks the functionality required to open such shares. Please try again with another web browser.", "gnss_signal_head": "Please wait", "gnss_signal_body": "Sender is waiting for GPS signal", "point_app_to": "Point the Hauk app to this server to share your location:", @@ -23,7 +23,7 @@ "last_update_days": "{{time}}d ago", "btn_dismiss": "Dismiss", "btn_cancel": "Cancel", - "btn_decrypt": "Decrypt", + "btn_decrypt": "Unlock", "f_droid_badge_url": "https://fdroid.gitlab.io/artwork/badge/get-it-on.png", "google_play_badge_url": "https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" }