Regen i18n due to merge

src/i18n/strings/en_EN.json

@@ -515,6 +515,28 @@
     "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Roles & Permissions": "Roles & Permissions",
     "Permissions": "Permissions",
+    "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
+    "You should not yet trust it to secure data": "You should not yet trust it to secure data",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
+    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
+    "Click here to fix": "Click here to fix",
+    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
+    "Only people who have been invited": "Only people who have been invited",
+    "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
+    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
+    "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.",
+    "Anyone": "Anyone",
+    "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
+    "Members only (since they were invited)": "Members only (since they were invited)",
+    "Members only (since they joined)": "Members only (since they joined)",
+    "Security & Privacy": "Security & Privacy",
+    "Encryption": "Encryption",
+    "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
+    "Encrypted": "Encrypted",
+    "Who can access this room?": "Who can access this room?",
+    "Who can read history?": "Who can read history?",
     "Unignore": "Unignore",
     "<not supported>": "<not supported>",
     "Import E2E room keys": "Import E2E room keys",
@@ -730,18 +752,7 @@
     "Favourite": "Favourite",
     "Tagged as: ": "Tagged as: ",
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
-    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
-    "Click here to fix": "Click here to fix",
-    "Who can access this room?": "Who can access this room?",
-    "Only people who have been invited": "Only people who have been invited",
-    "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
-    "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
     "Publish this room to the public in %(domain)s's room directory?": "Publish this room to the public in %(domain)s's room directory?",
-    "Who can read history?": "Who can read history?",
-    "Anyone": "Anyone",
-    "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
-    "Members only (since they were invited)": "Members only (since they were invited)",
-    "Members only (since they joined)": "Members only (since they joined)",
     "Internal room ID: ": "Internal room ID: ",
     "Room version number: ": "Room version number: ",
     "Add a topic": "Add a topic",