Merge branch 'dev' into alerting-rules

messages/en-US.json

@@ -167,7 +167,7 @@
     "proxyResourceTitle": "Manage Public Resources",
     "proxyResourceDescription": "Create and manage resources that are publicly accessible through a web browser",
     "proxyResourcesBannerTitle": "Web-based Public Access",
-    "proxyResourcesBannerDescription": "Public resources are HTTPS or TCP/UDP proxies accessible to anyone on the internet through a web browser. Unlike private resources, they do not require client-side software and can include identity and context-aware access policies.",
+    "proxyResourcesBannerDescription": "Public resources are HTTPS proxies accessible to anyone on the internet through a web browser. Unlike private resources, they do not require client-side software and can include identity and context-aware access policies.",
     "clientResourceTitle": "Manage Private Resources",
     "clientResourceDescription": "Create and manage resources that are only accessible through a connected client",
     "privateResourcesBannerTitle": "Zero-Trust Private Access",
@@ -384,7 +384,7 @@
     "userTitle": "Manage All Users",
     "userDescription": "View and manage all users in the system",
     "userAbount": "About User Management",
-    "userAbountDescription": "This table displays all root user objects in the system. Each user may belong to multiple organizations. Removing a user from an organization does not delete their root user object - they will remain in the system. To completely remove a user from the system, you must delete their root user object using the delete action in this table.",
+    "userAbountDescription": "This table displays all base user objects in the system. Each user may belong to multiple organizations. Removing a user from an organization does not delete their base user object. They will remain in the system. To completely remove a user from the system, you must delete their base user object using the delete action in this table.",
     "userServer": "Server Users",
     "userSearch": "Search server users...",
     "userErrorDelete": "Error deleting user",
@@ -527,7 +527,7 @@
     "userSettings": "User Information",
     "userSettingsDescription": "Enter the details for the new user",
     "inviteEmailSent": "Send invite email to user",
-    "inviteValid": "Valid For",
+    "inviteValid": "Invite Valid For (days)",
     "selectDuration": "Select duration",
     "selectResource": "Select Resource",
     "filterByResource": "Filter By Resource",
@@ -2565,7 +2565,7 @@
     "action": "Action",
     "actor": "Actor",
     "timestamp": "Timestamp",
-    "accessLogs": "Access Logs",
+    "accessLogs": "Authentication Logs",
     "exportCsv": "Export CSV",
     "exportError": "Unknown error when exporting CSV",
     "exportCsvTooltip": "Within Time Range",
@@ -2586,25 +2586,25 @@
     "noMoreAuthMethods": "No Valid Auth",
     "ip": "IP",
     "reason": "Reason",
-    "requestLogs": "Request Logs",
+    "requestLogs": "HTTPS Request Logs",
     "requestAnalytics": "Request Analytics",
     "host": "Host",
     "location": "Location",
-    "actionLogs": "Action Logs",
-    "sidebarLogsRequest": "Request Logs",
-    "sidebarLogsAccess": "Access Logs",
-    "sidebarLogsAction": "Action Logs",
+    "actionLogs": "Admin Action Logs",
+    "sidebarLogsRequest": "HTTPS Request Logs",
+    "sidebarLogsAccess": "Authentication Logs",
+    "sidebarLogsAction": "Admin Action Logs",
     "logRetention": "Log Retention",
     "logRetentionDescription": "Manage how long different types of logs are retained for this organization or disable them",
-    "requestLogsDescription": "View detailed request logs for resources in this organization",
+    "requestLogsDescription": "View detailed request logs for HTTPS resources in this organization",
     "requestAnalyticsDescription": "View detailed request analytics for resources in this organization",
-    "logRetentionRequestLabel": "Request Log Retention",
+    "logRetentionRequestLabel": "HTTPS Request Log Retention",
     "logRetentionRequestDescription": "How long to retain request logs",
-    "logRetentionAccessLabel": "Access Log Retention",
+    "logRetentionAccessLabel": "Authentication Log Retention",
     "logRetentionAccessDescription": "How long to retain access logs",
-    "logRetentionActionLabel": "Action Log Retention",
+    "logRetentionActionLabel": "Admin Action Log Retention",
     "logRetentionActionDescription": "How long to retain action logs",
-    "logRetentionConnectionLabel": "Connection Log Retention",
+    "logRetentionConnectionLabel": "Network Log Retention",
     "logRetentionConnectionDescription": "How long to retain connection logs",
     "logRetentionDisabled": "Disabled",
     "logRetention3Days": "3 days",
@@ -2616,10 +2616,10 @@
     "logRetentionEndOfFollowingYear": "End of following year",
     "actionLogsDescription": "View a history of actions performed in this organization",
     "accessLogsDescription": "View access auth requests for resources in this organization",
-    "connectionLogs": "Connection Logs",
-    "connectionLogsDescription": "View connection logs for tunnels in this organization",
-    "sidebarLogsConnection": "Connection Logs",
-    "sidebarLogsStreaming": "Streaming",
+    "connectionLogs": "Network Logs",
+    "connectionLogsDescription": "View network session logs handled by sites in this organization",
+    "sidebarLogsConnection": "Network Logs",
+    "sidebarLogsStreaming": "Event Streaming",
     "sourceAddress": "Source Address",
     "destinationAddress": "Destination Address",
     "duration": "Duration",
@@ -3051,13 +3051,13 @@
     "httpDestFormatSingleDescription": "Sends a separate HTTP POST for each individual event. Use only for endpoints that cannot handle batches.",
     "httpDestLogTypesTitle": "Log Types",
     "httpDestLogTypesDescription": "Choose which log types are forwarded to this destination. Only enabled log types will be streamed.",
-    "httpDestAccessLogsTitle": "Access Logs",
+    "httpDestAccessLogsTitle": "Authentication Logs",
     "httpDestAccessLogsDescription": "Resource access attempts, including authenticated and denied requests.",
-    "httpDestActionLogsTitle": "Action Logs",
+    "httpDestActionLogsTitle": "Admin Action Logs",
     "httpDestActionLogsDescription": "Administrative actions performed by users within the organization.",
-    "httpDestConnectionLogsTitle": "Connection Logs",
+    "httpDestConnectionLogsTitle": "Network Logs",
     "httpDestConnectionLogsDescription": "Site and tunnel connection events, including connects and disconnects.",
-    "httpDestRequestLogsTitle": "Request Logs",
+    "httpDestRequestLogsTitle": "HTTPS Request Logs",
     "httpDestRequestLogsDescription": "HTTP request logs for proxied resources, including method, path, and response code.",
     "httpDestSaveChanges": "Save Changes",
     "httpDestCreateDestination": "Create Destination",