letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Final tweaks to the existing QR code screens to match the designs. (#4874)

Browse Source 
* Simplify QR errors even more and use the correct error state for deviceAlreadySignedIn.

* Remove the pre-defined padding on TitleAndIcon and use it in the QRCodeLoginScreen too.

* Update FullscreenDialog to allow different horizontal padding in each section.
This commit is contained in:
Doug
2025-12-17 17:23:55 +00:00
committed by GitHub
parent ec03a0a1bd
commit 10bd3015ee
94 changed files with 325 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
View File

@@ -176,7 +176,6 @@
"common_advanced_settings" = "Advanced settings";
"common_an_image" = "an image";
"common_analytics" = "Analytics";
"common_android_shortcuts_remove_reason_left_room" = "You left the room";
"common_android_shortcuts_remove_reason_session_logged_out" = "You were logged out of the session";
"common_appearance" = "Appearance";
"common_audio" = "Audio";
@@ -589,32 +588,21 @@
"screen_leave_space_subtitle_only_last_admin" = "You will not be removed from the following room(s) because you're the only administrator:";
"screen_leave_space_title" = "Leave %1$@?";
"screen_leave_space_title_last_admin" = "You are the only admin for %1$@";
"screen_link_new_device_desktop_scanning_title" = "Scan the QR code";
"screen_link_new_device_desktop_step1" = "Open %1$@ on a laptop or desktop computer";
"screen_link_new_device_desktop_step3" = "Scan the QR code with this device";
"screen_link_new_device_desktop_submit" = "Ready to scan";
"screen_link_new_device_desktop_title" = "Open %1$@ on a desktop computer to get the QR code";
"screen_link_new_device_enter_number_error_numbers_do_not_match" = "The numbers don’t match";
"screen_link_new_device_enter_number_notice" = "Enter 2-digit code";
"screen_link_new_device_enter_number_subtitle" = "This will verify that the connection to your other device is secure.";
"screen_link_new_device_enter_number_title" = "Enter the number shown on your other device";
"screen_link_new_device_error_app_not_supported_subtitle" = "Your account provider does not support %1$@.";
"screen_link_new_device_error_app_not_supported_title" = "%1$@ not supported";
"screen_link_new_device_error_not_supported_subtitle" = "Your account provider doesn’t support signing into a new device with a QR code.";
"screen_link_new_device_error_not_supported_title" = "QR code not supported";
"screen_link_new_device_error_request_cancelled_subtitle" = "The sign in was cancelled on the other device.";
"screen_link_new_device_error_request_cancelled_title" = "Sign in request cancelled";
"screen_link_new_device_error_request_timeout_subtitle" = "Sign in expired. Please try again.";
"screen_link_new_device_error_request_timeout_title" = "The sign in was not completed in time";
"screen_link_new_device_mobile_step1" = "Open %1$@ on the other device";
"screen_link_new_device_mobile_step2" = "Select %1$@";
"screen_link_new_device_mobile_step2_action" = "“Sign in with QR code”";
"screen_link_new_device_mobile_step3" = "Scan the QR code shown here with the other device";
"screen_link_new_device_mobile_title" = "Open %1$@ on the other device";
"screen_link_new_device_root_desktop_computer" = "Desktop computer";
"screen_link_new_device_root_loading_qr_code" = "Loading QR code…";
"screen_link_new_device_root_mobile_device" = "Mobile device";
"screen_link_new_device_root_title" = "What type of device do you want to link?";
"screen_link_new_device_wrong_number_subtitle" = "Please try again and make sure that you’ve entered the 2-digit code correctly. If the numbers still don’t match then contact your account provider.";
"screen_manage_authorized_spaces_header" = "Spaces where members can join the room without an invitation.";
"screen_manage_authorized_spaces_title" = "Manage spaces";
"screen_manage_authorized_spaces_unknown_space" = "(Unknown space)";
@@ -985,6 +973,8 @@
"screen_qr_code_login_error_cancelled_title" = "Sign in request cancelled";
"screen_qr_code_login_error_declined_subtitle" = "The sign in was declined on the other device.";
"screen_qr_code_login_error_declined_title" = "Sign in declined";
"screen_qr_code_login_error_device_already_signed_in_subtitle" = "You don’t need to do anything else.";
"screen_qr_code_login_error_device_already_signed_in_title" = "Your other device is already signed in";
"screen_qr_code_login_error_expired_subtitle" = "Sign in expired. Please try again.";
"screen_qr_code_login_error_expired_title" = "The sign in was not completed in time";
"screen_qr_code_login_error_linking_not_suported_subtitle" = "Your other device does not support signing in to %@ with a QR code.\n\nTry signing in manually, or scan the QR code with another device.";
@@ -1005,7 +995,6 @@
"screen_qr_code_login_no_camera_permission_state_description" = "You need to give permission for %1$@ to use your device’s camera in order to continue.";
"screen_qr_code_login_no_camera_permission_state_title" = "Allow camera access to scan the QR code";
"screen_qr_code_login_scanning_state_title" = "Scan the QR code";
"screen_qr_code_login_start_over_button" = "Start over";
"screen_qr_code_login_unknown_error_description" = "An unexpected error occurred. Please try again.";
"screen_qr_code_login_verify_code_loading" = "Waiting for your other device";
"screen_qr_code_login_verify_code_subtitle" = "Your account provider may ask for the following code to verify the sign in.";
@@ -1332,7 +1321,6 @@
"troubleshoot_notifications_test_blocked_users_description" = "Checking blocked users";
"troubleshoot_notifications_test_blocked_users_quick_fix" = "View blocked users";
"troubleshoot_notifications_test_blocked_users_result_none" = "No users are blocked.";
"troubleshoot_notifications_test_blocked_users_title" = "Blocked users";
"troubleshoot_notifications_entry_point_section" = "Troubleshoot";
"troubleshoot_notifications_screen_action" = "Run tests";
"troubleshoot_notifications_screen_action_again" = "Run tests again";
@@ -1381,6 +1369,7 @@
"troubleshoot_notifications_test_unified_push_title" = "Check UnifiedPush";
"a11y_poll" = "Poll";
"banner_set_up_recovery_submit" = "Set up recovery";
"common_android_shortcuts_remove_reason_left_room" = "You left the room";
"dialog_file_too_large_to_upload_subtitle" = "The max file size allowed is: %1$@";
"dialog_default_video_quality_selector_title" = "Video upload quality";
"dialog_title_error" = "Error";
@@ -1400,6 +1389,19 @@
"screen_home_tab_spaces" = "Spaces";
"screen_join_room_decline_and_block_button_title" = "Decline and block";
"screen_knock_requests_list_title" = "Requests to join";
"screen_link_new_device_desktop_scanning_title" = "Scan the QR code";
"screen_link_new_device_desktop_step3" = "Scan the QR code with this device";
"screen_link_new_device_desktop_submit" = "Ready to scan";
"screen_link_new_device_error_app_not_supported_subtitle" = "Your account provider does not support %1$@.";
"screen_link_new_device_error_app_not_supported_title" = "%1$@ not supported";
"screen_link_new_device_error_not_supported_title" = "QR code not supported";
"screen_link_new_device_error_request_cancelled_subtitle" = "The sign in was cancelled on the other device.";
"screen_link_new_device_error_request_cancelled_title" = "Sign in request cancelled";
"screen_link_new_device_error_request_timeout_subtitle" = "Sign in expired. Please try again.";
"screen_link_new_device_error_request_timeout_title" = "The sign in was not completed in time";
"screen_link_new_device_mobile_step2" = "Select %1$@";
"screen_link_new_device_mobile_title" = "Open %1$@ on the other device";
"screen_link_new_device_wrong_number_title" = "The numbers don’t match";
"screen_pinned_timeline_screen_title_empty" = "Pinned messages";
"screen_report_room_title" = "Report room";
"screen_room_mentions_at_room_title" = "Everyone";
@@ -1450,6 +1452,7 @@
"screen_notification_settings_mentions_section_title" = "Mentions";
"screen_onboarding_sign_in_to" = "Sign in to %1$@";
"screen_qr_code_login_invalid_scan_state_retry_button" = "Try again";
"screen_qr_code_login_start_over_button" = "Start over";
"screen_recovery_key_change_generate_key_description" = "Do not share this with anyone!";
"screen_recovery_key_confirm_title" = "Enter your recovery key";
"screen_report_content_block_user" = "Block user";
@@ -1496,5 +1499,6 @@
"screen_signout_preference_item" = "Sign out";
"screen_signout_save_recovery_key_title" = "Have you saved your recovery key?";
"timeline_decryption_failure_historical_event_user_not_joined" = "You don't have access to this message";
"troubleshoot_notifications_test_blocked_users_title" = "Blocked users";
"troubleshoot_notifications_entry_point_push_history_title" = "Push history";
"troubleshoot_notifications_entry_point_title" = "Troubleshoot notifications";