mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-02 21:33:26 +00:00
LLS Sheet implementation (#5420)
* Add LiveLocationSheet and refactor existing views to share code * Implement logic for highlighting a specific LLS from a user once selected in the sheet * Updated tests, project and added new previews for the LLS sheet. # Conflicts: # PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPad-pseudo.png # PreviewTests/Sources/__Snapshots__/PreviewTests/liveLocationRoomTimelineView.Bubbles-iPhone-pseudo.png * add Equatable conformance to CLLocationCoordinate2D
This commit is contained in:
@@ -189,7 +189,7 @@
|
||||
"common_about" = "About";
|
||||
"common_acceptable_use_policy" = "Acceptable use policy";
|
||||
"common_add_account" = "Add an account";
|
||||
"common_add_another_account" = "Add another account";
|
||||
"common_add_another_account" = "Add account";
|
||||
"common_adding_caption" = "Adding caption";
|
||||
"common_advanced_settings" = "Advanced settings";
|
||||
"common_an_image" = "an image";
|
||||
@@ -903,6 +903,9 @@
|
||||
"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_link_new_device_wrong_number_title" = "The numbers don’t match";
|
||||
"screen_live_location_sheet_nobody_sharing" = "Nobody is sharing their location";
|
||||
"screen_live_location_sheet_sharing_live_location" = "Sharing live location";
|
||||
"screen_live_location_sheet_title" = "On the map";
|
||||
"screen_login_error_deactivated_account" = "This account has been deactivated.";
|
||||
"screen_login_error_invalid_credentials" = "Incorrect username and/or password";
|
||||
"screen_login_error_invalid_user_id" = "This is not a valid user identifier. Expected format: ‘@user:homeserver.org’";
|
||||
@@ -1417,14 +1420,6 @@
|
||||
"screen_signout_save_recovery_key_title" = "Make sure you have access to your recovery key before removing this device";
|
||||
"screen_space_add_room_action" = "Room";
|
||||
"screen_space_add_rooms_room_access_description" = "Adding a room will not affect the room access. To change the access go to Room settings > Security & privacy.";
|
||||
"screen_space_announcement_item1" = "View spaces you've created or joined";
|
||||
"screen_space_announcement_item2" = "Accept or decline invites to spaces";
|
||||
"screen_space_announcement_item3" = "Discover any rooms you can join in your spaces";
|
||||
"screen_space_announcement_item4" = "Join public spaces";
|
||||
"screen_space_announcement_item5" = "Leave any spaces you’ve joined";
|
||||
"screen_space_announcement_notice" = "Filtering, creating and managing spaces is coming soon.";
|
||||
"screen_space_announcement_subtitle" = "Welcome to the beta version of Spaces! With this first version you can:";
|
||||
"screen_space_announcement_title" = "Introducing Spaces";
|
||||
"screen_space_empty_state_title" = "Add your first room";
|
||||
"screen_space_list_description" = "Spaces you have created or joined.";
|
||||
"screen_space_list_details" = "%1$@ • %2$@";
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
"common_about" = "About";
|
||||
"common_acceptable_use_policy" = "Acceptable use policy";
|
||||
"common_add_account" = "Add an account";
|
||||
"common_add_another_account" = "Add another account";
|
||||
"common_add_another_account" = "Add account";
|
||||
"common_adding_caption" = "Adding caption";
|
||||
"common_advanced_settings" = "Advanced settings";
|
||||
"common_an_image" = "an image";
|
||||
@@ -903,6 +903,9 @@
|
||||
"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_link_new_device_wrong_number_title" = "The numbers don’t match";
|
||||
"screen_live_location_sheet_nobody_sharing" = "Nobody is sharing their location";
|
||||
"screen_live_location_sheet_sharing_live_location" = "Sharing live location";
|
||||
"screen_live_location_sheet_title" = "On the map";
|
||||
"screen_login_error_deactivated_account" = "This account has been deactivated.";
|
||||
"screen_login_error_invalid_credentials" = "Incorrect username and/or password";
|
||||
"screen_login_error_invalid_user_id" = "This is not a valid user identifier. Expected format: ‘@user:homeserver.org’";
|
||||
@@ -1417,14 +1420,6 @@
|
||||
"screen_signout_save_recovery_key_title" = "Make sure you have access to your recovery key before removing this device";
|
||||
"screen_space_add_room_action" = "Room";
|
||||
"screen_space_add_rooms_room_access_description" = "Adding a room will not affect the room access. To change the access go to Room settings > Security & privacy.";
|
||||
"screen_space_announcement_item1" = "View spaces you've created or joined";
|
||||
"screen_space_announcement_item2" = "Accept or decline invites to spaces";
|
||||
"screen_space_announcement_item3" = "Discover any rooms you can join in your spaces";
|
||||
"screen_space_announcement_item4" = "Join public spaces";
|
||||
"screen_space_announcement_item5" = "Leave any spaces you’ve joined";
|
||||
"screen_space_announcement_notice" = "Filtering, creating and managing spaces is coming soon.";
|
||||
"screen_space_announcement_subtitle" = "Welcome to the beta version of Spaces! With this first version you can:";
|
||||
"screen_space_announcement_title" = "Introducing Spaces";
|
||||
"screen_space_empty_state_title" = "Add your first room";
|
||||
"screen_space_list_description" = "Spaces you have created or joined.";
|
||||
"screen_space_list_details" = "%1$@ • %2$@";
|
||||
|
||||
@@ -354,6 +354,22 @@
|
||||
<key>NSStringLocalizedFormatKey</key>
|
||||
<string>%#@COUNT@</string>
|
||||
</dict>
|
||||
<key>screen_live_location_sheet_subtitle</key>
|
||||
<dict>
|
||||
<key>COUNT</key>
|
||||
<dict>
|
||||
<key>NSStringFormatSpecTypeKey</key>
|
||||
<string>NSStringPluralRuleType</string>
|
||||
<key>NSStringFormatValueTypeKey</key>
|
||||
<string>d</string>
|
||||
<key>one</key>
|
||||
<string>%1$d person</string>
|
||||
<key>other</key>
|
||||
<string>%1$d people</string>
|
||||
</dict>
|
||||
<key>NSStringLocalizedFormatKey</key>
|
||||
<string>%#@COUNT@</string>
|
||||
</dict>
|
||||
<key>screen_pinned_timeline_screen_title</key>
|
||||
<dict>
|
||||
<key>COUNT</key>
|
||||
|
||||
Reference in New Issue
Block a user