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

Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing

Browse Source 
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
This commit is contained in:
Gil Eluard
2021-12-13 15:09:40 +01:00
parent 50c50a0a3c 1ae9b708a1
commit 2a09ca3947
52 changed files with 1746 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+40 -2
View File
@@ -358,6 +358,8 @@ Tap the + to start adding people.";
"room_delete_unsent_messages" = "Delete unsent messages";
"room_event_action_copy" = "Copy";
"room_event_action_quote" = "Quote";
"room_event_action_remove_poll" = "Remove poll";
"room_event_action_end_poll" = "End poll";
"room_event_action_redact" = "Remove";
"room_event_action_more" = "More";
"room_event_action_share" = "Share";
@@ -568,7 +570,7 @@ Tap the + to start adding people.";
"settings_labs_create_conference_with_jitsi" = "Create conference calls with jitsi";
"settings_labs_message_reaction" = "React to messages with emoji";
"settings_labs_enable_ringing_for_group_calls" = "Ring for group calls";
"settings_labs_voice_messages" = "Voice messages";
"settings_labs_enabled_polls" = "Polls";
"settings_version" = "Version %@";
"settings_olm_version" = "Olm Version %@";
@@ -1803,6 +1805,42 @@ Tap the + to start adding people.";
"poll_edit_form_create_options" = "Create options";
"poll_edit_form_option_number" = "Option %d";
"poll_edit_form_option_number" = "Option %lu";
"poll_edit_form_add_option" = "Add option";
"poll_edit_form_post_failure_title" = "Failed to post poll";
"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";
"poll_timeline_total_no_votes" = "No votes cast";
"poll_timeline_total_one_vote" = "1 vote cast";
"poll_timeline_total_votes" = "%lu votes cast";
"poll_timeline_total_one_vote_not_voted" = "1 vote cast. Vote to the see the results";
"poll_timeline_total_votes_not_voted" = "%lu votes cast. Vote to the see the results";
"poll_timeline_total_final_results_one_vote" = "Final results based on 1 vote";
"poll_timeline_total_final_results" = "Final results based on %lu votes";
"poll_timeline_vote_not_registered_title" = "Vote not registered";
"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";