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

Merge branch 'develop' into flescio/1040-poll_detail

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
This commit is contained in:
Flavio Alescio
2023-01-25 15:49:40 +01:00
parent 05caf71d5b b2711330ec
commit a9059d1e9c
95 changed files with 714 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+2 -9
View File
@@ -2277,15 +2277,6 @@ Tap the + to start adding people.";
"all_chats_edit_menu_leave_space" = "Leave %@";
"all_chats_edit_menu_space_settings" = "Space settings";
"all_chats_onboarding_page_title1" = "Welcome to a new view!";
"all_chats_onboarding_page_message1" = "To simplify your Element, tabs are now optional. Manage them using the top-right menu.";
"all_chats_onboarding_page_title2" = "Access Spaces";
"all_chats_onboarding_page_message2" = "Access your Spaces (bottom-left) faster and easier than ever before.";
"all_chats_onboarding_page_title3" = "Give Feedback";
"all_chats_onboarding_page_message3" = "Tap your profile to let us know what you think.";
"all_chats_onboarding_title" = "What's new";
"all_chats_onboarding_try_it" = "Try it out";
// MARK: - Room invites
"room_invites_empty_view_title" = "Nothing new.";
@@ -2312,6 +2303,8 @@ Tap the + to start adding people.";
"poll_history_no_active_poll_period_text" = "There are no active polls for the past %@ days. Load more polls to view polls for previous months";
"poll_history_no_past_poll_period_text" = "There are no past polls for the past %@ days. Load more polls to view polls for previous months";
"poll_history_detail_view_in_timeline" = "View poll in timeline";
"poll_history_load_more" = "Load more polls";
// MARK: - Polls
"poll_edit_form_create_poll" = "Create poll";