felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 23:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
This commit is contained in:
Gil Eluard
2022-01-13 16:30:55 +01:00
parent ea9183d70e 0135ac83dd
commit b4eee99d03
294 changed files with 5987 additions and 914 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+30 -7
View File
@@ -72,6 +72,7 @@
"new_word" = "New";
"existing" = "Existing";
"add" = "Add";
"ok" = "OK";
// Call Bar
"callbar_only_single_active" = "Tap to return to the call (%@)";
@@ -661,6 +662,8 @@ Tap the + to start adding people.";
"settings_show_NSFW_public_rooms" = "Show NSFW public rooms";
"settings_enable_room_message_bubbles" = "Message bubbles";
// Security settings
"security_settings_title" = "Security";
"security_settings_crypto_sessions" = "MY SESSIONS";
@@ -985,7 +988,7 @@ Tap the + to start adding people.";
// Analytics
"analytics_prompt_title" = "Help improve %@";
"analytics_prompt_message_new_user" = "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
"analytics_prompt_message_new_user" = "Help us identify issues and improve %@ by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
"analytics_prompt_message_upgrade" = "You previously consented to share anonymous usage data with us. Now, to help understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
/* Note: The placeholder is for the contents of analytics_prompt_terms_link_new_user */
"analytics_prompt_terms_new_user" = "You can read all our terms %@.";
@@ -1809,7 +1812,7 @@ Tap the + to start adding people.";
"spaces_coming_soon_title" = "Coming soon";
"spaces_add_rooms_coming_soon_title" = "Adding rooms coming soon";
"spaces_invites_coming_soon_title" = "Invites coming soon";
"spaces_coming_soon_detail" = "This feature hasn’t been implemented here, but it’s on the way. For now, you can do that with Element on your computer.";
"spaces_coming_soon_detail" = "This feature hasn’t been implemented here, but it’s on the way. For now, you can do that with %@ on your computer.";
"space_participants_action_remove" = "Remove from this space";
"space_participants_action_ban" = "Ban from this space";
"space_home_show_all_rooms" = "Show all rooms";
@@ -1943,8 +1946,6 @@ Tap the + to start adding people.";
"poll_edit_form_post_failure_subtitle" = "Please try again";
"poll_edit_form_post_failure_action" = "OK";
"poll_timeline_one_vote" = "1 vote";
"poll_timeline_votes_count" = "%lu votes";
@@ -1967,10 +1968,32 @@ Tap the + to start adding people.";
"poll_timeline_vote_not_registered_subtitle" = "Sorry, your vote was not registered, please try again";
"poll_timeline_vote_not_registered_action" = "OK";
"poll_timeline_not_closed_title" = "Failed to end poll";
"poll_timeline_not_closed_subtitle" = "Please try again";
"poll_timeline_not_closed_action" = "OK";
// MARK: - Location sharing
"location_sharing_title" = "Location";
"location_sharing_close_action" = "Close";
"location_sharing_share_action" = "Share";
"location_sharing_loading_map_error_title" = "%@ could not load the map. Please try again later.";
"location_sharing_locating_user_error_title" = "%@ could not access your location. Please try again later.";
"location_sharing_invalid_authorization_error_title" = "%@ does not have permission to access your location. You can enable access in Settings > Location";
"location_sharing_invalid_authorization_not_now" = "Not now";
"location_sharing_invalid_authorization_settings" = "Settings";
"location_sharing_open_apple_maps" = "Open in Apple Maps";
"location_sharing_open_google_maps" = "Open in Google Maps";
"location_sharing_settings_header" = "Location sharing";
"location_sharing_settings_toggle_title" = "Enable location sharing";