Merge branch 'develop' into gil/SP1_space_creation

# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift

Riot/Assets/en.lproj/Vector.strings

@@ -342,7 +342,8 @@ Tap the + to start adding people.";
 "room_member_power_level_short_moderator" = "Mod";
 "room_member_power_level_short_custom" = "Custom";
 
-// Chat
+// MARK: - Chat
+
 "room_slide_to_end_group_call" = "Slide to end the call for everyone";
 "room_jump_to_first_unread" = "Jump to unread";
 "room_accessiblity_scroll_to_bottom" = "Scroll to bottom";
@@ -382,7 +383,8 @@ Tap the + to start adding people.";
 "room_event_action_more" = "More";
 "room_event_action_share" = "Share";
 "room_event_action_forward" = "Forward";
-"room_event_action_permalink" = "Permalink";
+"room_event_action_view_in_room" = "View in room";
+"room_event_action_permalink" = "Copy link to message";
 "room_event_action_view_source" = "View Source";
 "room_event_action_view_decrypted_source" = "View Decrypted Source";
 "room_event_action_report" = "Report content";
@@ -399,10 +401,12 @@ Tap the + to start adding people.";
 "room_event_action_cancel_download" = "Cancel Download";
 "room_event_action_view_encryption" = "Encryption Information";
 "room_event_action_reply" = "Reply";
+"room_event_action_reply_in_thread" = "Thread";
 "room_event_action_edit" = "Edit";
 "room_event_action_reaction_show_all" = "Show all";
 "room_event_action_reaction_show_less" = "Show less";
 "room_event_action_reaction_history" = "Reaction history";
+"room_event_copy_link_info" = "Link copied to clipboard.";
 "room_warning_about_encryption" = "End-to-end encryption is in beta and may not be reliable.\n\nYou should not yet trust it to secure data.\n\nDevices will not yet be able to decrypt history from before they joined the room.\n\nEncrypted messages will not be visible on clients that do not yet implement encryption.";
 "room_event_failed_to_send" = "Failed to send";
 "room_action_camera" = "Take photo or video";
@@ -427,12 +431,27 @@ Tap the + to start adding people.";
 "room_accessibility_upload" = "Upload";
 "room_accessibility_call" = "Call";
 "room_accessibility_video_call" = "Video Call";
+"room_accessibility_threads" = "Threads";
 "room_accessibility_hangup" = "Hang up";
+"room_accessibility_thread_more" = "More";
 "room_place_voice_call" = "Voice call";
 "room_open_dialpad" = "Dial pad";
 "room_join_group_call" = "Join";
 "room_no_privileges_to_create_group_call" = "You need to be an admin or a moderator to start a call.";
 
+// MARK: Threads
+"room_thread_title" = "Thread";
+"thread_copy_link_to_thread" = "Copy link to thread";
+"threads_title" = "Threads";
+"threads_action_all_threads" = "All threads";
+"threads_action_my_threads" = "My threads";
+"threads_empty_title" = "Keep discussions organised with threads";
+"threads_empty_info_all" = "Threads help keep your conversations on-topic and easy to track.";
+"threads_empty_info_my" = "Reply to an ongoing thread or tap a message and use “Thread” to start a new one.";
+"threads_empty_tip" = "Tip: Tap a message and use “Thread” to start one.";
+"threads_empty_show_all_threads" = "Show all threads";
+"message_from_a_thread" = "From a thread";
+
 "media_type_accessibility_image" = "Image";
 "media_type_accessibility_audio" = "Audio";
 "media_type_accessibility_video" = "Video";
@@ -589,6 +608,7 @@ Tap the + to start adding people.";
 "settings_labs_message_reaction" = "React to messages with emoji";
 "settings_labs_enable_ringing_for_group_calls" = "Ring for group calls";
 "settings_labs_enabled_polls" = "Polls";
+"settings_labs_enable_threads" = "Threaded messaging";
 
 "settings_version" = "Version %@";
 "settings_olm_version" = "Olm Version %@";
@@ -923,6 +943,7 @@ Tap the + to start adding people.";
 "event_formatter_group_call_join" = "Join";
 "event_formatter_group_call_leave" = "Leave";
 "event_formatter_group_call_incoming" = "%@ in %@";
+"event_formatter_message_deleted" = "Message deleted";
 
 // Events formatter with you
 "event_formatter_widget_added_by_you" = "You added the widget: %@";
@@ -1708,6 +1729,16 @@ Tap the + to start adding people.";
 
 "home_empty_view_title" = "Welcome to %@,\n%@";
 "home_empty_view_information" = "The all-in-one secure chat app for teams, friends and organisations. Tap the + button below to add people and rooms.";
+"home_context_menu_make_dm" = "Move to People";
+"home_context_menu_make_room" = "Move to Rooms";
+"home_context_menu_notifications" = "Notifications";
+"home_context_menu_mute" = "Mute";
+"home_context_menu_unmute" = "Unmute";
+"home_context_menu_favourite" = "Favourite";
+"home_context_menu_unfavourite" = "Remove from Favourites";
+"home_context_menu_low_priority" = "Low priority";
+"home_context_menu_normal_priority" = "Normal priority";
+"home_context_menu_leave" = "Leave";
 
 // MARK: - Favourites
 
@@ -1967,6 +1998,10 @@ Tap the + to start adding people.";
 
 "location_sharing_share_action" = "Share";
 
+"location_sharing_post_failure_title" = "We couldn’t send your location";
+
+"location_sharing_post_failure_subtitle" = "%@ could not send your location. Please try again later.";
+
 "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.";