Pull renamed strings and fix compilation errors. (#2560)

* Pull renamed strings and fix compilation errors.

* Including all languages of course 🤦‍♂️

ElementX/Resources/Localizations/en.lproj/Localizable.strings

@@ -40,6 +40,7 @@
 "action_decline" = "Decline";
 "action_delete_poll" = "Delete Poll";
 "action_disable" = "Disable";
+"action_discard" = "Discard";
 "action_done" = "Done";
 "action_edit" = "Edit";
 "action_edit_poll" = "Edit poll";
@@ -266,8 +267,6 @@
 "notification_unread_notified_messages_in_room_and_invitation" = "%1$@ in %2$@ and %3$@";
 "preference_rageshake" = "Rageshake to report bug";
 "rageshake_detection_dialog_content" = "You seem to be shaking the phone in frustration. Would you like to open the bug report screen?";
-"report_content_explanation" = "This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages.";
-"report_content_hint" = "Reason for reporting this content";
 "rich_text_editor_bullet_list" = "Toggle bullet list";
 "rich_text_editor_close_formatting_options" = "Close formatting options";
 "rich_text_editor_code_block" = "Toggle code block";
@@ -289,9 +288,6 @@
 "rich_text_editor_unindent" = "Unindent";
 "rich_text_editor_url_placeholder" = "Link";
 "rich_text_editor_a11y_add_attachment" = "Add attachment";
-"room_timeline_beginning_of_room" = "This is the beginning of %1$@.";
-"room_timeline_beginning_of_room_no_name" = "This is the beginning of this conversation.";
-"room_timeline_read_marker_title" = "New";
 "screen_advanced_settings_element_call_base_url" = "Custom Element Call base URL";
 "screen_advanced_settings_element_call_base_url_description" = "Set a custom base URL for Element Call.";
 "screen_advanced_settings_element_call_base_url_validation_error" = "Invalid URL, please make sure you include the protocol (http/https) and the correct address.";
@@ -492,6 +488,8 @@
 "screen_recovery_key_setup_success" = "Recovery setup successful";
 "screen_recovery_key_setup_title" = "Set up recovery";
 "screen_report_content_block_user_hint" = "Check if you want to hide all current and future messages from this user";
+"screen_report_content_explanation" = "This message will be reported to your homeserver’s administrator. They will not be able to read any encrypted messages.";
+"screen_report_content_hint" = "Reason for reporting this content";
 "screen_room_attachment_source_camera" = "Camera";
 "screen_room_attachment_source_camera_video" = "Record video";
 "screen_room_attachment_source_files" = "Attachment";
@@ -567,8 +565,6 @@
 "screen_room_member_list_role_moderator" = "Moderator";
 "screen_room_member_list_room_members_header_title" = "Room members";
 "screen_room_member_list_unbanning_user" = "Unbanning %1$@";
-"screen_room_message_copied" = "Message copied";
-"screen_room_no_permission_to_post" = "You do not have permission to post to this room";
 "screen_room_notification_settings_allow_custom" = "Allow custom setting";
 "screen_room_notification_settings_allow_custom_footnote" = "Turning this on will override your default setting";
 "screen_room_notification_settings_custom_settings_title" = "Notify me in this chat for";
@@ -582,8 +578,6 @@
 "screen_room_notification_settings_mentions_only_disclaimer" = "Your homeserver does not support this option in encrypted rooms, you won't get notified in this room.";
 "screen_room_notification_settings_mode_all_messages" = "All messages";
 "screen_room_notification_settings_room_custom_settings_title" = "In this room, notify me for";
-"screen_room_reactions_show_less" = "Show less";
-"screen_room_reactions_show_more" = "Show more";
 "screen_room_retry_send_menu_send_again_action" = "Send again";
 "screen_room_retry_send_menu_title" = "Your message failed to send";
 "screen_room_roles_and_permissions_admins" = "Admins";
@@ -601,7 +595,14 @@
 "screen_room_roles_and_permissions_room_details" = "Room details";
 "screen_room_roles_and_permissions_title" = "Roles and permissions";
 "screen_room_timeline_add_reaction" = "Add emoji";
+"screen_room_timeline_beginning_of_room" = "This is the beginning of %1$@.";
+"screen_room_timeline_beginning_of_room_no_name" = "This is the beginning of this conversation.";
 "screen_room_timeline_less_reactions" = "Show less";
+"screen_room_timeline_message_copied" = "Message copied";
+"screen_room_timeline_no_permission_to_post" = "You do not have permission to post to this room";
+"screen_room_timeline_reactions_show_less" = "Show less";
+"screen_room_timeline_reactions_show_more" = "Show more";
+"screen_room_timeline_read_marker_title" = "New";
 "screen_room_typing_many_members_first_component_ios" = "%1$@, %2$@ and ";
 "screen_room_typing_notification_plural_ios" = " are typing";
 "screen_room_typing_notification_singular_ios" = " is typing";

ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict

@@ -162,22 +162,6 @@
 			<string>%d rooms</string>
 		</dict>
 	</dict>
-	<key>room_timeline_state_changes</key>
-	<dict>
-		<key>NSStringLocalizedFormatKey</key>
-		<string>%#@COUNT@</string>
-		<key>COUNT</key>
-		<dict>
-			<key>NSStringFormatSpecTypeKey</key>
-			<string>NSStringPluralRuleType</string>
-			<key>NSStringFormatValueTypeKey</key>
-			<string>d</string>
-			<key>one</key>
-			<string>%1$d room change</string>
-			<key>other</key>
-			<string>%1$d room changes</string>
-		</dict>
-	</dict>
 	<key>screen_app_lock_subtitle</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -226,6 +210,22 @@
 			<string>%1$d people</string>
 		</dict>
 	</dict>
+	<key>screen_room_timeline_state_changes</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@COUNT@</string>
+		<key>COUNT</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%1$d room change</string>
+			<key>other</key>
+			<string>%1$d room changes</string>
+		</dict>
+	</dict>
 	<key>screen_room_typing_many_members</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>