Merge upstream/dev - preserve local UI enhancements (Logs in menu, conditional search, hover edit buttons)

surfsense_web/messages/en.json

@@ -688,7 +688,28 @@
 		"expand_sidebar": "Expand sidebar",
 		"collapse_sidebar": "Collapse sidebar",
 		"user_settings": "User settings",
-		"logout": "Logout"
+		"language": "Language",
+		"theme": "Theme",
+		"light": "Light",
+		"dark": "Dark",
+		"system": "System",
+		"logout": "Logout",
+		"inbox": "Inbox",
+		"search_inbox": "Search inbox",
+		"mark_all_read": "Mark all as read",
+		"mark_as_read": "Mark as read",
+		"mentions": "Mentions",
+		"status": "Status",
+		"no_results_found": "No results found",
+		"no_mentions": "No mentions",
+		"no_mentions_hint": "You'll see mentions from others here",
+		"no_status_updates": "No status updates",
+		"no_status_updates_hint": "Document and connector updates will appear here",
+		"filter": "Filter",
+		"all": "All",
+		"unread": "Unread",
+		"connectors": "Connectors",
+		"all_connectors": "All connectors"
 	},
 	"errors": {
 		"something_went_wrong": "Something went wrong",