Merge branch 'develop' into feature/fga/space_settings_iteration

This commit is contained in:
ganfra 2025-12-16 11:02:29 +01:00
commit c734d5c485
180 changed files with 3495 additions and 1242 deletions

View file

@ -156,6 +156,7 @@
<string name="action_skip">"Skip"</string>
<string name="action_start">"Start"</string>
<string name="action_start_chat">"Start chat"</string>
<string name="action_start_over">"Start over"</string>
<string name="action_start_verification">"Start verification"</string>
<string name="action_static_map_load">"Tap to load map"</string>
<string name="action_take_photo">"Take photo"</string>
@ -372,7 +373,7 @@ Reason: %1$s."</string>
<string name="common_waiting">"Waiting…"</string>
<string name="common_waiting_for_decryption_key">"Waiting for this message"</string>
<string name="common_you">"You"</string>
<string name="crypto_history_visible">"Messages you send will be shared with new members invited to this room. %1$s"</string>
<string name="crypto_history_visible">"This room has been configured so that new members can read history. %1$s"</string>
<string name="crypto_identity_change_pin_violation">"%1$s\'s identity was reset. %2$s"</string>
<string name="crypto_identity_change_pin_violation_new">"%1$ss %2$s identity was reset. %3$s"</string>
<string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
@ -433,9 +434,32 @@ Are you sure you want to continue?"</string>
<string name="screen_create_poll_options_section_title">"Options"</string>
<string name="screen_create_poll_remove_accessibility_label">"Remove %1$s"</string>
<string name="screen_create_poll_settings_section_title">"Settings"</string>
<string name="screen_link_new_device_desktop_computer">"Desktop computer"</string>
<string name="screen_link_new_device_mobile_device">"Mobile device"</string>
<string name="screen_link_new_device_title">"What type of device do you want to link?"</string>
<string name="screen_link_new_device_desktop_scanning_title">"Scan the QR code"</string>
<string name="screen_link_new_device_desktop_step1">"Open %1$s on a laptop or desktop computer"</string>
<string name="screen_link_new_device_desktop_step3">"Scan the QR code with this device"</string>
<string name="screen_link_new_device_desktop_submit">"Ready to scan"</string>
<string name="screen_link_new_device_desktop_title">"Open %1$s on a desktop computer to get the QR code"</string>
<string name="screen_link_new_device_enter_number_error_numbers_do_not_match">"The numbers dont match"</string>
<string name="screen_link_new_device_enter_number_notice">"Enter 2-digit code"</string>
<string name="screen_link_new_device_enter_number_subtitle">"This will verify that the connection to your other device is secure."</string>
<string name="screen_link_new_device_enter_number_title">"Enter the number shown on your other device"</string>
<string name="screen_link_new_device_error_app_not_supported_subtitle">"Your account provider does not support %1$s."</string>
<string name="screen_link_new_device_error_app_not_supported_title">"%1$s not supported"</string>
<string name="screen_link_new_device_error_not_supported_subtitle">"Your account provider doesnt support signing into a new device with a QR code."</string>
<string name="screen_link_new_device_error_not_supported_title">"QR code not supported"</string>
<string name="screen_link_new_device_error_request_cancelled_subtitle">"The sign in was cancelled on the other device."</string>
<string name="screen_link_new_device_error_request_cancelled_title">"Sign in request cancelled"</string>
<string name="screen_link_new_device_error_request_timeout_subtitle">"Sign in expired. Please try again."</string>
<string name="screen_link_new_device_error_request_timeout_title">"The sign in was not completed in time"</string>
<string name="screen_link_new_device_mobile_step1">"Open %1$s on the other device"</string>
<string name="screen_link_new_device_mobile_step2">"Select %1$s"</string>
<string name="screen_link_new_device_mobile_step2_action">"“Sign in with QR code”"</string>
<string name="screen_link_new_device_mobile_step3">"Scan the QR code shown here with the other device"</string>
<string name="screen_link_new_device_mobile_title">"Open %1$s on the other device"</string>
<string name="screen_link_new_device_root_desktop_computer">"Desktop computer"</string>
<string name="screen_link_new_device_root_loading_qr_code">"Loading QR code…"</string>
<string name="screen_link_new_device_root_mobile_device">"Mobile device"</string>
<string name="screen_link_new_device_root_title">"What type of device do you want to link?"</string>
<string name="screen_manage_authorized_spaces_header">"Spaces where members can join the room without an invitation."</string>
<string name="screen_manage_authorized_spaces_title">"Manage spaces"</string>
<string name="screen_manage_authorized_spaces_unknown_space">"(Unknown space)"</string>