Merge remote-tracking branch 'origin/develop' into develop

src/i18n/strings/en_EN.json

@@ -255,6 +255,13 @@
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
+    "Stickerpack": "Stickerpack",
+    "Sticker Messages": "Sticker Messages",
+    "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
+    "Click": "Click",
+    "here": "here",
+    "to add some!": "to add some!",
+    "Add a stickerpack": "Add a stickerpack",
     "Drop File Here": "Drop File Here",
     "Drop file here to upload": "Drop file here to upload",
     " (unsupported)": " (unsupported)",
@@ -324,6 +331,8 @@
     "Video call": "Video call",
     "Hide Apps": "Hide Apps",
     "Show Apps": "Show Apps",
+    "Hide Stickers": "Hide Stickers",
+    "Show Stickers": "Show Stickers",
     "Upload file": "Upload file",
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Send an encrypted reply…": "Send an encrypted reply…",
@@ -578,6 +587,7 @@
     "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
     "Do you want to load widget from URL:": "Do you want to load widget from URL:",
     "Allow": "Allow",
+    "Manage sticker packs": "Manage sticker packs",
     "Delete Widget": "Delete Widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
     "Delete widget": "Delete widget",