🐛 fix invalid semver version causing crashes in frontend

Ref #3262

messages/bg-BG.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Получавайте заявки чрез суров TCP/UDP с използване на портен номер. Изисква се сайтовете да се свързват към отдалечен възел.",
     "resourceCreate": "Създайте ресурс",
     "resourceCreateDescription": "Следвайте стъпките по-долу, за да създадете нов ресурс",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Конфигуриране на основните настройки на ресурса, включително име и тип",
     "resourceSeeAll": "Вижте всички ресурси",
     "resourceCreateGeneral": "Основни параметри",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Вътрешен",
     "emailInvalid": "Невалиден имейл адрес",
     "inviteValidityDuration": "Моля, изберете продължителност",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Моля, изберете роля",
     "removeOwnAdminRoleConfirmTitle": "Премахване на административния ви достъп?",
     "removeOwnAdminRoleConfirmDescription": "След записване няма да имате повече администраторски права в тази организация. Друг администратор може да възстанови достъпа, ако е необходимо.",
     "removeOwnAdminRoleConfirmButton": "Премахнете административния ми достъп",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Базово удостоверяване чрез заглавие",
     "policyAuthHeaderAuthDescription": "Валидирайте собствено HTTP заглавие и стойност при всяка заявка",
     "policyAuthHeaderAuthSummary": "Конфигурирано заглавие",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Име на заглавието",
+    "policyAuthHeaderValue": "Очаквана стойност",
     "policyAuthSetPasscode": "Задайте парола",
     "policyAuthSetPincode": "Задайте ПИН код",
     "policyAuthSetEmailWhitelist": "Задайте списък с имейли",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Задайте ПИН код на ресурса",
     "actionSetResourceEmailWhitelist": "Задайте списък на одобрените имейл адреси за ресурса",
     "actionGetResourceEmailWhitelist": "Вземете списък на одобрените имейл адреси за ресурса",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Създайте цел",
     "actionDeleteTarget": "Изтрийте цел",
     "actionGetTarget": "Вземете цел",
@@ -1519,30 +1507,6 @@
     "navbar": "Навигационно меню",
     "navbarDescription": "Главно навигационно меню за приложението",
     "navbarDocsLink": "Документация",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Не може да се активира 2FA",
     "otpErrorEnableDescription": "Възникна грешка при активиране на 2FA",
     "otpSetupCheckCode": "Моля, въведете 6-цифрен код",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Управление",
     "sidebarBillingAndLicenses": "Фактуриране & Лицензи",
     "sidebarLogsAnalytics": "Анализи",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Извеждане на предупреждения",
     "alertingDescription": "Определете източници, тригери и действия за уведомления",
     "alertingRules": "Правила за предупреждение",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Домейни",
     "billingOrganizations": "Организации",
     "billingRemoteExitNodes": "Дистанционни възли",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Няма конфигуриран лимит",
     "billingEstimatedPeriod": "Очакван период на фактуриране",
     "billingIncludedUsage": "Включено използване",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Колко потребители можете да използвате",
     "billingDomainInfo": "Колко домейни можете да използвате",
     "billingRemoteExitNodesInfo": "Колко дистанционни възли можете да използвате",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Лицензионни ключове",
     "billingLicenseKeysDescription": "Управлявайте вашите абонаменти за лицензионни ключове",
     "billingLicenseSubscription": "Абонамент за лиценз",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Затвори",
     "createInternalResourceDialogCreateClientResource": "Създаване на частен ресурс",
     "createInternalResourceDialogCreateClientResourceDescription": "Създайте нов ресурс, който ще бъде достъпен само за клиенти, свързани към организацията",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Свойства на ресурса",
     "createInternalResourceDialogName": "Име",
     "createInternalResourceDialogSite": "Сайт",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Няма налични възли за тази организация. Първо създайте възел, за да използвате местни сайтове.",
     "exitNode": "Изходен възел",
     "country": "Държава",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Понастоящем на базата на изходния IP",
     "region": "Регион",
     "selectRegion": "Изберете регион",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Добавяне на потребители.",
     "editInternalResourceDialogAddClients": "Добавяне на клиенти.",
     "editInternalResourceDialogDestinationLabel": "Дестинация.",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Посочете адреса дестинация за вътрешния ресурс. Това може да бъде име на хост, IP адрес или CIDR обхват в зависимост от избрания режим. По избор настройте вътрешен DNS алиас за по-лесно идентифициране.",
     "internalResourceFormMultiSiteRoutingHelp": "Избирайки няколко сайта, се осигурява сигурен път и пренасочване при висока достъпност.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Научете повече",
     "editInternalResourceDialogPortRestrictionsDescription": "Ограничете достъпа до конкретни TCP/UDP портове или позволете/блокирайте всички портове.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ресурсът е деактивиран",
     "memberPortalShowingResources": "Показва {start}-{end} от {total} ресурси",
     "resourceLauncherTitle": "Стартер за Ресурси",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Преглеждайте детайлите на ресурса и ги стартирайте от едно място",
+    "resourceLauncherSearchPlaceholder": "Търсете във всички сайтове...",
     "resourceLauncherDefaultView": "По Подразбиране",
     "resourceLauncherSaveView": "Запазете Изгледа",
     "resourceLauncherSaveToCurrentView": "Запазете в Текущ Изглед",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Нулирайте Изгледа",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Запазете като Нов Изглед",
     "resourceLauncherSaveAsNewViewDescription": "Дайте име на този изглед, за да запазите текущите си филтри и оформление.",
     "resourceLauncherSaveForEveryone": "Запазете за Всеки",
     "resourceLauncherSaveForEveryoneDescription": "Споделете този изглед с всички членове на организацията. Когато е изключено, изгледът е видим само за вас.",
     "resourceLauncherMakePersonal": "Направи Личен",
     "resourceLauncherFilter": "Филтър",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Сортиране",
     "resourceLauncherSortAscending": "Сортиране възходящо",
     "resourceLauncherSortDescending": "Сортиране низходящо",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Групирай По",
     "resourceLauncherGroupBySite": "Сайт",
     "resourceLauncherGroupByLabel": "Етикет",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Оформление",
     "resourceLauncherLayoutGrid": "Мрежа",
     "resourceLauncherLayoutList": "Списък",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Показване на Тагове на Сайт",
     "resourceLauncherShowRecents": "Показване на Последни",
     "resourceLauncherDeleteView": "Изтриване на Изглед",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Вижте като Админ",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Вижте детайлите за този ресурс.",
     "resourceLauncherUnlabeled": "Без Етикет",
     "resourceLauncherNoSite": "Няма Сайт",
     "resourceLauncherNoResourcesInGroup": "Няма ресурси в тази група",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Няма Намерени Ресурси",
     "resourceLauncherEmptyStateNoResultsDescription": "Никакви ресурси не съвпадат с текущото ви търсене или филтри. Опитайте да ги коригирате, за да намерите това, което търсите.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Никакви ресурси не съвпадат с \"{query}\". Опитайте да коригирате търсенето или да изтриете филтри, за да видите всички ресурси.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Копирано в клипборда",
     "resourceLauncherCopiedAccessDescription": "Достъпът до ресурса е копиран на вашия клипборд.",
     "resourceLauncherViewNamePlaceholder": "Име на Изгледа",

messages/cs-CZ.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy požadavky na syrové TCP/UDP pomocí čísla portu. Vyžaduje připojení stránek ke vzdálenému uzlu.",
     "resourceCreate": "Vytvořit zdroj",
     "resourceCreateDescription": "Postupujte podle níže uvedených kroků, abyste vytvořili a připojili nový zdroj",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Konfigurace základních nastavení zdroje včetně názvu a typu",
     "resourceSeeAll": "Zobrazit všechny zdroje",
     "resourceCreateGeneral": "Obecné",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Interní",
     "emailInvalid": "Neplatná e-mailová adresa",
     "inviteValidityDuration": "Zvolte prosím dobu trvání",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Vyberte prosím roli",
     "removeOwnAdminRoleConfirmTitle": "Odebrat přístup správce?",
     "removeOwnAdminRoleConfirmDescription": "Po uložení již nebudete mít oprávnění správce v této organizaci. Další administrátor vám může přístup obnovit, pokud bude potřeba.",
     "removeOwnAdminRoleConfirmButton": "Odebrat mé administrátorské oprávnění",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Základní Ověření Záhlaví",
     "policyAuthHeaderAuthDescription": "Ověřit vlastní HTTP hlavičku názvu a hodnoty při každém požadavku",
     "policyAuthHeaderAuthSummary": "Nastaveno hlavička",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Název hlavičky",
+    "policyAuthHeaderValue": "Očekávaná hodnota",
     "policyAuthSetPasscode": "Nastavit přístupový kód",
     "policyAuthSetPincode": "Nastavit PIN kód",
     "policyAuthSetEmailWhitelist": "Nastavit e-mailový whitelist",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Nastavit zdrojový kód",
     "actionSetResourceEmailWhitelist": "Nastavit seznam povolených dokumentů",
     "actionGetResourceEmailWhitelist": "Získat seznam povolených dokumentů",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Create Target",
     "actionDeleteTarget": "Odstranit cíl",
     "actionGetTarget": "Získat cíl",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigation Menu",
     "navbarDescription": "Hlavní navigační menu aplikace",
     "navbarDocsLink": "Dokumentace",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "2FA nelze povolit",
     "otpErrorEnableDescription": "Došlo k chybě při povolování 2FA",
     "otpSetupCheckCode": "Zadejte 6místný kód",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Správa",
     "sidebarBillingAndLicenses": "Fakturace a licence",
     "sidebarLogsAnalytics": "Analytici",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Upozornění",
     "alertingDescription": "Definujte zdroje, spouštěče a akce pro oznámení",
     "alertingRules": "Pravidla upozornění",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domény",
     "billingOrganizations": "Tělo",
     "billingRemoteExitNodes": "Vzdálené uzly",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Žádný limit nenastaven",
     "billingEstimatedPeriod": "Odhadované období fakturace",
     "billingIncludedUsage": "Zahrnuto využití",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Kolik uživatelů můžete použít",
     "billingDomainInfo": "Kolik domén můžete použít",
     "billingRemoteExitNodesInfo": "Kolik vzdálených uzlů můžete použít",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licenční klíče",
     "billingLicenseKeysDescription": "Spravovat předplatné licenčního klíče",
     "billingLicenseSubscription": "Předplatné licence",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Zavřít",
     "createInternalResourceDialogCreateClientResource": "Vytvořit soukromý zdroj",
     "createInternalResourceDialogCreateClientResourceDescription": "Vytvořte nový zdroj, který bude přístupný pouze klientům připojeným k organizaci",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Vlastnosti zdroje",
     "createInternalResourceDialogName": "Jméno",
     "createInternalResourceDialogSite": "Lokalita",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Pro tuto organizaci nejsou k dispozici žádné uzly. Nejprve vytvořte uzel pro použití lokálních stránek.",
     "exitNode": "Ukončit uzel",
     "country": "L 343, 22.12.2009, s. 1).",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Aktuálně založené na zdrojové IP adrese",
     "region": "Oblasti",
     "selectRegion": "Vyberte region",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Přidat uživatele",
     "editInternalResourceDialogAddClients": "Přidat klienty",
     "editInternalResourceDialogDestinationLabel": "Cíl",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Určete cílovou adresu pro interní prostředek. Může se jednat o hostname, IP adresu, nebo rozsah CIDR v závislosti na vybraném režimu. Volitelně nastavte interní DNS alias pro snazší identifikaci.",
     "internalResourceFormMultiSiteRoutingHelp": "Výběrem více webů se povolí odolné směrování a přepojení pro vysokou dostupnost.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Zjistit více",
     "editInternalResourceDialogPortRestrictionsDescription": "Omezte přístup na specifické TCP/UDP porty nebo povolte/blokujte všechny porty.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Zdroj je zakázán",
     "memberPortalShowingResources": "Zobrazeny {start}-{end} z {total} zdrojů",
     "resourceLauncherTitle": "Spouštěč zdrojů",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Podívejte se na podrobnosti o zdrojích a spusťte je z jednoho místa",
+    "resourceLauncherSearchPlaceholder": "Hledat všechny lokality...",
     "resourceLauncherDefaultView": "Výchozí",
     "resourceLauncherSaveView": "Uložit pohled",
     "resourceLauncherSaveToCurrentView": "Uložit do aktuálního pohledu",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Obnovit pohled",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Uložit jako nový pohled",
     "resourceLauncherSaveAsNewViewDescription": "Uložte tento pohled k uloženému filtrování a rozvržení.",
     "resourceLauncherSaveForEveryone": "Uložit pro všechny",
     "resourceLauncherSaveForEveryoneDescription": "Sdílejte tento pohled se všemi členy organizace. Pokud není zaškrtnuto, pohled je viditelný pouze vám.",
     "resourceLauncherMakePersonal": "Udělat osobní",
     "resourceLauncherFilter": "Filtr",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Řadit",
     "resourceLauncherSortAscending": "Řadit vzestupně",
     "resourceLauncherSortDescending": "Řadit sestupně",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Seskupit podle",
     "resourceLauncherGroupBySite": "Lokalita",
     "resourceLauncherGroupByLabel": "Název",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Rozvržení",
     "resourceLauncherLayoutGrid": "Mřížka",
     "resourceLauncherLayoutList": "Seznam",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Zobrazit značky lokality",
     "resourceLauncherShowRecents": "Zobrazit nedávné",
     "resourceLauncherDeleteView": "Smazat pohled",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Zobrazit jako administrátor",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Podívejte se na podrobnosti o tomto zdroji.",
     "resourceLauncherUnlabeled": "Bez nálepky",
     "resourceLauncherNoSite": "Žádná lokalita",
     "resourceLauncherNoResourcesInGroup": "V této skupině nejsou žádné zdroje",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Nebyl nalezen žádný zdroj",
     "resourceLauncherEmptyStateNoResultsDescription": "Žádný zdroj neodpovídá vašemu aktuálnímu vyhledávání nebo filtrům. Zkuste je upravit, abyste našli to, co hledáte.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Žádné zdroje neodpovídají \"{query}\". Zkuste upravit vyhledávání nebo vymazat filtry, abyste viděli všechny zdroje.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Zkopírováno do schránky",
     "resourceLauncherCopiedAccessDescription": "Přístup ke zdroji byl zkopírován do vaší schránky.",
     "resourceLauncherViewNamePlaceholder": "Název pohledu",

messages/da-DK.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxyforespørgsler over rå TCP/UDP ved hjælp af et portnummer. Kræver, at sites opretter forbindelse til en ekstern node.",
     "resourceCreate": "Opret ressource",
     "resourceCreateDescription": "Følg trinene nedenfor for at oprette en ny ressource",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Konfigurer de grunnleggende ressourceindstillingerne inklusive navnet og typen",
     "resourceSeeAll": "Se alle ressourcer",
     "resourceCreateGeneral": "Generelt",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Intern",
     "emailInvalid": "Ugyldig e-mailadresse",
     "inviteValidityDuration": "Vælg venligst en varighed",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Vælg venligst en rolle",
     "removeOwnAdminRoleConfirmTitle": "Fjern din administratoradgang?",
     "removeOwnAdminRoleConfirmDescription": "Du vil ikke længere have administratorrettigheder i denne organisation efter gemning. En anden administrator kan gendanne adgang hvis nødvendig.",
     "removeOwnAdminRoleConfirmButton": "Fjern min administratoradgang",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grunnleggende Header Autentificering",
     "policyAuthHeaderAuthDescription": "Bekræft et tilpasset HTTP-headernavn og værdi ved hver forespørgsel",
     "policyAuthHeaderAuthSummary": "Header konfigureret",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Headernavn",
+    "policyAuthHeaderValue": "Forventet værdi",
     "policyAuthSetPasscode": "Angiv adgangskode",
     "policyAuthSetPincode": "Sett PIN-kode",
     "policyAuthSetEmailWhitelist": "Angiv e-mail hviteliste",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Angiv ressource-PIN-kode",
     "actionSetResourceEmailWhitelist": "Angiv e-mailwhitelist for ressource",
     "actionGetResourceEmailWhitelist": "Hent e-mailwhitelist for ressource",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Opret mål",
     "actionDeleteTarget": "Slet mål",
     "actionGetTarget": "Hent mål",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigationsmenu",
     "navbarDescription": "Hovednavigasjonsmeny for applikationen",
     "navbarDocsLink": "Dokumentation",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Kunne ikke aktivere 2FA",
     "otpErrorEnableDescription": "En fejl opstod under aktivering af 2FA",
     "otpSetupCheckCode": "Indtast venligst en 6-sifret kode",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Administration",
     "sidebarBillingAndLicenses": "Fakturering & licenser",
     "sidebarLogsAnalytics": "Analyser",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Varsling",
     "alertingDescription": "Definer kilder, triggere og handlinger for varsler",
     "alertingRules": "Varslingsregler",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domæner",
     "billingOrganizations": "Orger",
     "billingRemoteExitNodes": "Eksterne noder",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Ingen grænse konfigureret",
     "billingEstimatedPeriod": "Estimert faktureringsperiode",
     "billingIncludedUsage": "Inklusive Brug",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Hvor mange brugere du kan bruge",
     "billingDomainInfo": "Hvor mange domæner du kan bruge",
     "billingRemoteExitNodesInfo": "Hvor mange fjernnoder du kan bruge",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licensnøgler",
     "billingLicenseKeysDescription": "Administrer dine licensnøgleabonnementer",
     "billingLicenseSubscription": "Licens abonnement",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Luk",
     "createInternalResourceDialogCreateClientResource": "Opret privat ressource",
     "createInternalResourceDialogCreateClientResourceDescription": "Opret en ny ressource som kun vil være tilgængelig for kunder som er forbundet til organisationen",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Ressourceegenskaber",
     "createInternalResourceDialogName": "Navn",
     "createInternalResourceDialogSite": "Websted",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Ingen noder er tilgængelige for denne organisation. Opret en node først for at bruge lokale sites.",
     "exitNode": "Exitnode",
     "country": "Land",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "I øjeblikket baseret på kilde-IP",
     "region": "Fylke",
     "selectRegion": "Vælg region",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Tilføj brugere",
     "editInternalResourceDialogAddClients": "Tilføj klienter",
     "editInternalResourceDialogDestinationLabel": "Destination",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Angiv destinationsadressen for den interne ressource. Dette kan være et værtsnavn, en IP-adresse eller et CIDR-område afhængigt af den valgte tilstand. Du kan også konfigurere et internt DNS-alias for nemmere identifikation.",
     "internalResourceFormMultiSiteRoutingHelp": "Valg af flere sites muliggør robust routing og failover for høj tilgængelighed.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Læs mere",
     "editInternalResourceDialogPortRestrictionsDescription": "Begrens adgang til specifikke TCP/UDP-porte eller tillade/blokere alle porte.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ressource deaktiveret",
     "memberPortalShowingResources": "Viser {start}-{end} af {total} ressourcer",
     "resourceLauncherTitle": "Ressource Starter",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Se ressource detaljer og start dem fra ét sted",
+    "resourceLauncherSearchPlaceholder": "Søg i alle sites...",
     "resourceLauncherDefaultView": "Standard",
     "resourceLauncherSaveView": "Gem Visning",
     "resourceLauncherSaveToCurrentView": "Gem til nuværende visning",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Nulstil Visning",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Gem som Ny Visning",
     "resourceLauncherSaveAsNewViewDescription": "Giv denne visning et navn for at gemme dine nuværende filtre og layout.",
     "resourceLauncherSaveForEveryone": "Gem for Alle",
     "resourceLauncherSaveForEveryoneDescription": "Del denne visning med alle organisationsmedlemmer. Når den er ikke markeret, er visningen kun synlig for dig.",
     "resourceLauncherMakePersonal": "Gør Personlig",
     "resourceLauncherFilter": "Filter",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sortér",
     "resourceLauncherSortAscending": "Sortér stigende",
     "resourceLauncherSortDescending": "Sortér faldende",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Gruppér Efter",
     "resourceLauncherGroupBySite": "Websted",
     "resourceLauncherGroupByLabel": "Etikett",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Layout",
     "resourceLauncherLayoutGrid": "Gitter",
     "resourceLauncherLayoutList": "Liste",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Vis Site Tags",
     "resourceLauncherShowRecents": "Vis Seneste",
     "resourceLauncherDeleteView": "Slet Visning",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Vis som Admin",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Se detaljer for denne ressource.",
     "resourceLauncherUnlabeled": "Uden Etiket",
     "resourceLauncherNoSite": "Ingen Site",
     "resourceLauncherNoResourcesInGroup": "Ingen ressourcer i denne gruppe",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Ingen ressourcer fundet",
     "resourceLauncherEmptyStateNoResultsDescription": "Ingen ressourcer matcher din nuværende søgning eller filtre. Prøv at justere dem for at finde det, du leder efter.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Ingen ressourcer matcher \"{query}\". Prøv at justere din søgning eller rydde filtre for at se alle ressourcer.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Kopieret til udklipsholderen",
     "resourceLauncherCopiedAccessDescription": "Ressourcetilgangen er kopieret til din udklipsholder.",
     "resourceLauncherViewNamePlaceholder": "Vis navn",

messages/de-DE.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy-Anfragen über rohe TCP/UDP mit Portnummer. Benötigt Sites, um sich mit einem entfernten Knoten zu verbinden.",
     "resourceCreate": "Ressource erstellen",
     "resourceCreateDescription": "Folgen Sie den Schritten unten, um eine neue Ressource zu erstellen",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Konfigurieren Sie die Grundeinstellungen der Ressource, einschließlich Name und Typ",
     "resourceSeeAll": "Alle Ressourcen anzeigen",
     "resourceCreateGeneral": "Allgemein",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Intern",
     "emailInvalid": "Ungültige E-Mail-Adresse",
     "inviteValidityDuration": "Bitte wählen Sie eine Dauer",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Bitte wählen Sie eine Rolle",
     "removeOwnAdminRoleConfirmTitle": "Möchten Sie Ihren Administratorzugriff entfernen?",
     "removeOwnAdminRoleConfirmDescription": "Nach dem Speichern haben Sie keine Administratorrechte mehr in dieser Organisation. Ein anderer Administrator kann den Zugriff bei Bedarf wiederherstellen.",
     "removeOwnAdminRoleConfirmButton": "Meinen Administratorzugriff entfernen",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grundlegende Header-Authentifizierung",
     "policyAuthHeaderAuthDescription": "Überprüfen Sie einen benutzerdefinierten HTTP-Headernamen und -wert bei jeder Anfrage",
     "policyAuthHeaderAuthSummary": "Header konfiguriert",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Header-Name",
+    "policyAuthHeaderValue": "Erwarteter Wert",
     "policyAuthSetPasscode": "Passcode setzen",
     "policyAuthSetPincode": "PIN-Code festlegen",
     "policyAuthSetEmailWhitelist": "E-Mail-Whitelist festlegen",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Ressourcen-PIN festlegen",
     "actionSetResourceEmailWhitelist": "Ressourcen-E-Mail-Whitelist festlegen",
     "actionGetResourceEmailWhitelist": "Ressourcen-E-Mail-Whitelist abrufen",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Ziel erstellen",
     "actionDeleteTarget": "Ziel löschen",
     "actionGetTarget": "Ziel abrufen",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigationsmenü",
     "navbarDescription": "Hauptnavigationsmenü für die Anwendung",
     "navbarDocsLink": "Dokumentation",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "2FA konnte nicht aktiviert werden",
     "otpErrorEnableDescription": "Beim Aktivieren der 2FA ist ein Fehler aufgetreten",
     "otpSetupCheckCode": "Bitte geben Sie einen 6-stelligen Code ein",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Management",
     "sidebarBillingAndLicenses": "Abrechnung & Lizenzen",
     "sidebarLogsAnalytics": "Analytik",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Benachrichtigung",
     "alertingDescription": "Quellen, Auslöser und Aktionen für Benachrichtigungen festlegen",
     "alertingRules": "Benachrichtigungsregeln",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domänen",
     "billingOrganizations": "Orden",
     "billingRemoteExitNodes": "Entfernte Knoten",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Kein Limit konfiguriert",
     "billingEstimatedPeriod": "Geschätzter Abrechnungszeitraum",
     "billingIncludedUsage": "Inklusive Nutzung",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Wie viele Benutzer Sie verwenden können",
     "billingDomainInfo": "Wie viele Domains Sie verwenden können",
     "billingRemoteExitNodesInfo": "Wie viele entfernte Knoten Sie verwenden können",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lizenzschlüssel",
     "billingLicenseKeysDescription": "Verwalten Sie Ihre Lizenzschlüssel Abonnements",
     "billingLicenseSubscription": "Lizenzabonnement",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Schließen",
     "createInternalResourceDialogCreateClientResource": "Private Ressource erstellen",
     "createInternalResourceDialogCreateClientResourceDescription": "Erstelle eine neue Ressource, die nur für Clients zugänglich ist, die mit der Organisation verbunden sind",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Ressourceneigenschaften",
     "createInternalResourceDialogName": "Name",
     "createInternalResourceDialogSite": "Standort",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Für diese Organisation sind keine Knoten verfügbar. Erstellen Sie zuerst einen Knoten, um lokale Standorte zu verwenden.",
     "exitNode": "Exit-Node",
     "country": "Land",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Derzeit basierend auf der Quell-IP",
     "region": "Region",
     "selectRegion": "Region wählen...",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Nutzer hinzufügen",
     "editInternalResourceDialogAddClients": "Clients hinzufügen",
     "editInternalResourceDialogDestinationLabel": "Ziel",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Geben Sie die Zieladresse für die interne Ressource an. Dies kann ein Hostname, eine IP-Adresse oder ein CIDR-Bereich sein, abhängig vom gewählten Modus. Legen Sie optional einen internen DNS-Alias für eine vereinfachte Identifizierung fest.",
     "internalResourceFormMultiSiteRoutingHelp": "Durch die Auswahl mehrerer Seiten wird ein ausfallsicheres Routing und Failover für hohe Verfügbarkeit ermöglicht.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Mehr erfahren",
     "editInternalResourceDialogPortRestrictionsDescription": "Den Zugriff auf bestimmte TCP/UDP-Ports beschränken oder alle Ports erlauben/blockieren.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ressource deaktiviert",
     "memberPortalShowingResources": "Zeige {start}-{end} von {total} Ressourcen",
     "resourceLauncherTitle": "Ressourcenstarter",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Sehen Sie sich Ressourcendetails an und starten Sie sie von einem Ort aus",
+    "resourceLauncherSearchPlaceholder": "Alle Standorte durchsuchen...",
     "resourceLauncherDefaultView": "Standard",
     "resourceLauncherSaveView": "Ansicht speichern",
     "resourceLauncherSaveToCurrentView": "In aktueller Ansicht speichern",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Ansicht zurücksetzen",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Als neue Ansicht speichern",
     "resourceLauncherSaveAsNewViewDescription": "Geben Sie dieser Ansicht einen Namen, um Ihre aktuellen Filter und das Layout zu speichern.",
     "resourceLauncherSaveForEveryone": "Für alle speichern",
     "resourceLauncherSaveForEveryoneDescription": "Teilen Sie diese Ansicht mit allen Organisationsmitgliedern. Wenn nicht aktiviert, ist die Ansicht nur für Sie sichtbar.",
     "resourceLauncherMakePersonal": "Persönlich machen",
     "resourceLauncherFilter": "Filter",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sortieren",
     "resourceLauncherSortAscending": "Aufsteigend sortieren",
     "resourceLauncherSortDescending": "Absteigend sortieren",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Gruppieren nach",
     "resourceLauncherGroupBySite": "Standort",
     "resourceLauncherGroupByLabel": "Etikett",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Layout",
     "resourceLauncherLayoutGrid": "Raster",
     "resourceLauncherLayoutList": "Liste",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Standort-Tags anzeigen",
     "resourceLauncherShowRecents": "Kürzlich anzeigen",
     "resourceLauncherDeleteView": "Ansicht löschen",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Ansicht als Administrator anzeigen",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Anzeigen von Details zu dieser Ressource.",
     "resourceLauncherUnlabeled": "Nicht etikettiert",
     "resourceLauncherNoSite": "Kein Standort",
     "resourceLauncherNoResourcesInGroup": "Keine Ressourcen in dieser Gruppe",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Keine Ressourcen gefunden",
     "resourceLauncherEmptyStateNoResultsDescription": "Keine Ressourcen entsprechen Ihrer aktuellen Suche oder den Filtern. Versuchen Sie, diese anzupassen, um zu finden, wonach Sie suchen.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Keine Ressourcen entsprechen \"{query}\". Versuchen Sie, Ihre Suche anzupassen oder die Filter zu löschen, um alle Ressourcen anzuzeigen.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "In die Zwischenablage kopiert",
     "resourceLauncherCopiedAccessDescription": "Der Ressourcenzugriff wurde in Ihre Zwischenablage kopiert.",
     "resourceLauncherViewNamePlaceholder": "Ansichtsname",

messages/en-US.json

@@ -266,6 +266,8 @@
     "resourceRawDescriptionCloud": "Proxy requests over raw TCP/UDP using a port number. Requires sites to connect to a remote node.",
     "resourceCreate": "Create Resource",
     "resourceCreateDescription": "Follow the steps below to create a new resource",
+    "resourcePublicCreate": "Create Public Resource",
+    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configure the basic resource settings including the name and the type",
     "resourceSeeAll": "See All Resources",
     "resourceCreateGeneral": "General",
@@ -613,7 +615,8 @@
     "idpNameInternal": "Internal",
     "emailInvalid": "Invalid email address",
     "inviteValidityDuration": "Please select a duration",
-    "accessRoleSelectPlease": "Please select a role",
+    "accessRoleSelectPlease": "A user must belong to at least one role.",
+    "accessRoleRequired": "Role required",
     "removeOwnAdminRoleConfirmTitle": "Remove your administrator access?",
     "removeOwnAdminRoleConfirmDescription": "You will no longer have administrator permissions in this organization after saving. Another administrator can restore access if needed.",
     "removeOwnAdminRoleConfirmButton": "Remove My Administrator Access",
@@ -864,8 +867,8 @@
     "policyAuthHeaderAuthTitle": "Basic Header Auth",
     "policyAuthHeaderAuthDescription": "Validate a custom HTTP header name and value on each request",
     "policyAuthHeaderAuthSummary": "Header configured",
-    "policyAuthHeaderName": "Header name",
-    "policyAuthHeaderValue": "Expected value",
+    "policyAuthHeaderName": "Username",
+    "policyAuthHeaderValue": "Password",
     "policyAuthSetPasscode": "Set Passcode",
     "policyAuthSetPincode": "Set PIN Code",
     "policyAuthSetEmailWhitelist": "Set Email Whitelist",
@@ -1431,6 +1434,15 @@
     "actionSetResourcePincode": "Set Resource Pincode",
     "actionSetResourceEmailWhitelist": "Set Resource Email Whitelist",
     "actionGetResourceEmailWhitelist": "Get Resource Email Whitelist",
+    "actionGetResourcePolicy": "Get Resource Policy",
+    "actionUpdateResourcePolicy": "Update Resource Policy",
+    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
+    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
+    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
+    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
+    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
+    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
+    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Create Target",
     "actionDeleteTarget": "Delete Target",
     "actionGetTarget": "Get Target",
@@ -1915,6 +1927,9 @@
     "billingDomains": "Domains",
     "billingOrganizations": "Orgs",
     "billingRemoteExitNodes": "Remote Nodes",
+    "billingPublicResources": "Public Resources",
+    "billingPrivateResources": "Private Resources",
+    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "No limit configured",
     "billingEstimatedPeriod": "Estimated Billing Period",
     "billingIncludedUsage": "Included Usage",
@@ -1943,6 +1958,9 @@
     "billingUsersInfo": "How many users you can use",
     "billingDomainInfo": "How many domains you can use",
     "billingRemoteExitNodesInfo": "How many remote nodes you can use",
+    "billingPublicResourcesInfo": "How many public resources you can use",
+    "billingPrivateResourcesInfo": "How many private resources you can use",
+    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "License Keys",
     "billingLicenseKeysDescription": "Manage your license key subscriptions",
     "billingLicenseSubscription": "License Subscription",
@@ -2311,6 +2329,12 @@
     "createInternalResourceDialogClose": "Close",
     "createInternalResourceDialogCreateClientResource": "Create Private Resource",
     "createInternalResourceDialogCreateClientResourceDescription": "Create a new resource that will only be accessible to clients connected to the organization",
+    "privateResourceCreatePageSeeAll": "See All Private Resources",
+    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
+    "privateResourceNetworkAccess": "Network Access",
+    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
+    "hostSettings": "Host Settings",
+    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Resource Properties",
     "createInternalResourceDialogName": "Name",
     "createInternalResourceDialogSite": "Site",
@@ -3571,18 +3595,24 @@
     "memberPortalResourceDisabled": "Resource Disabled",
     "memberPortalShowingResources": "Showing {start}-{end} of {total} resources",
     "resourceLauncherTitle": "Resource Launcher",
-    "resourceLauncherDescription": "View resource details and launch them from one place",
-    "resourceLauncherSearchPlaceholder": "Search all sites...",
+    "resourceSidebarLauncherTitle": "Launcher",
+    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
+    "resourceLauncherSearchPlaceholder": "Search your resources...",
     "resourceLauncherDefaultView": "Default",
     "resourceLauncherSaveView": "Save View",
     "resourceLauncherSaveToCurrentView": "Save to Current View",
+    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Reset View",
+    "resourceLauncherResetSystemDefault": "Reset to System Default",
+    "resourceLauncherSystemDefaultRestored": "System default restored",
+    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Save as New View",
     "resourceLauncherSaveAsNewViewDescription": "Give this view a name to save your current filters and layout.",
     "resourceLauncherSaveForEveryone": "Save for Everyone",
     "resourceLauncherSaveForEveryoneDescription": "Share this view with all organization members. When unchecked, the view is only visible to you.",
     "resourceLauncherMakePersonal": "Make Personal",
     "resourceLauncherFilter": "Filter",
+    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sort",
     "resourceLauncherSortAscending": "Sort ascending",
     "resourceLauncherSortDescending": "Sort descending",
@@ -3590,6 +3620,7 @@
     "resourceLauncherGroupBy": "Group By",
     "resourceLauncherGroupBySite": "Site",
     "resourceLauncherGroupByLabel": "Label",
+    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Layout",
     "resourceLauncherLayoutGrid": "Grid",
     "resourceLauncherLayoutList": "List",
@@ -3597,8 +3628,20 @@
     "resourceLauncherShowSiteTags": "Show Site Tags",
     "resourceLauncherShowRecents": "Show Recents",
     "resourceLauncherDeleteView": "Delete View",
+    "resourceLauncherDeleteViewTitle": "Delete View",
+    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
+    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "View as Admin",
-    "resourceLauncherResourceDetailsDescription": "View details for this resource.",
+    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
+    "resourceLauncherResourceDetails": "Resource Details",
+    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
+    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
+    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
+    "resourceLauncherDownloadClient": "Download client",
+    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
+    "resourceLauncherNoPortRestrictions": "No port restrictions",
+    "resourceLauncherTcp": "TCP",
+    "resourceLauncherUdp": "UDP",
     "resourceLauncherUnlabeled": "Unlabeled",
     "resourceLauncherNoSite": "No Site",
     "resourceLauncherNoResourcesInGroup": "No resources in this group",
@@ -3607,6 +3650,12 @@
     "resourceLauncherEmptyStateNoResultsTitle": "No Resources Found",
     "resourceLauncherEmptyStateNoResultsDescription": "No resources match your current search or filters. Try adjusting them to find what you are looking for.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "No resources match \"{query}\". Try adjusting your search or clearing filters to see all resources.",
+    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
+    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
+    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
+    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
+    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
+    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Copied to clipboard",
     "resourceLauncherCopiedAccessDescription": "Resource access has been copied to your clipboard.",
     "resourceLauncherViewNamePlaceholder": "View name",

messages/es-ES.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Las peticiones de proxy sobre TCP/UDP crudas usando un número de puerto. Requiere que los sitios se conecten a un nodo remoto.",
     "resourceCreate": "Crear Recurso",
     "resourceCreateDescription": "Siga los siguientes pasos para crear un nuevo recurso",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configurar la configuración básica del recurso, incluido el nombre y el tipo",
     "resourceSeeAll": "Ver todos los recursos",
     "resourceCreateGeneral": "General",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Interno",
     "emailInvalid": "Dirección de correo inválida",
     "inviteValidityDuration": "Por favor, seleccione una duración",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Por favor, seleccione un rol",
     "removeOwnAdminRoleConfirmTitle": "¿Eliminar su acceso de administrador?",
     "removeOwnAdminRoleConfirmDescription": "Ya no tendrá permisos de administrador en esta organización después de guardar. Otro administrador puede restaurar el acceso si es necesario.",
     "removeOwnAdminRoleConfirmButton": "Eliminar Mi Acceso de Administrador",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticación Básica del Encabezado",
     "policyAuthHeaderAuthDescription": "Valida un nombre y valor de encabezado HTTP personalizado en cada petición",
     "policyAuthHeaderAuthSummary": "Encabezado configurado",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nombre del encabezado",
+    "policyAuthHeaderValue": "Valor esperado",
     "policyAuthSetPasscode": "Establecer Código de Acceso",
     "policyAuthSetPincode": "Establecer Código PIN",
     "policyAuthSetEmailWhitelist": "Establecer Lista Blanca de Correo",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Establecer Pincode del recurso",
     "actionSetResourceEmailWhitelist": "Establecer lista blanca de correo de recursos",
     "actionGetResourceEmailWhitelist": "Obtener correo electrónico de recursos",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Crear destino",
     "actionDeleteTarget": "Eliminar destino",
     "actionGetTarget": "Obtener objetivo",
@@ -1519,30 +1507,6 @@
     "navbar": "Menú de navegación",
     "navbarDescription": "Menú de navegación principal para la aplicación",
     "navbarDocsLink": "Documentación",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "No se puede habilitar 2FA",
     "otpErrorEnableDescription": "Se ha producido un error al habilitar 2FA",
     "otpSetupCheckCode": "Por favor, introduzca un código de 6 dígitos",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Gestión",
     "sidebarBillingAndLicenses": "Facturación y licencias",
     "sidebarLogsAnalytics": "Analíticas",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Alertas",
     "alertingDescription": "Definir fuentes, disparadores y acciones para notificaciones",
     "alertingRules": "Reglas de alerta",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Dominios",
     "billingOrganizations": "Orgánico",
     "billingRemoteExitNodes": "Nodos remotos",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "No se ha configurado ningún límite",
     "billingEstimatedPeriod": "Período de facturación estimado",
     "billingIncludedUsage": "Uso incluido",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Cuántos usuarios puedes usar",
     "billingDomainInfo": "Cuántos dominios puedes usar",
     "billingRemoteExitNodesInfo": "Cuántos nodos remotos puedes usar",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Claves de licencia",
     "billingLicenseKeysDescription": "Administrar las suscripciones de su clave de licencia",
     "billingLicenseSubscription": "Suscripción de licencia",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Cerrar",
     "createInternalResourceDialogCreateClientResource": "Crear recurso privado",
     "createInternalResourceDialogCreateClientResourceDescription": "Crear un nuevo recurso que sólo será accesible a los clientes conectados a la organización",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Propiedades del recurso",
     "createInternalResourceDialogName": "Nombre",
     "createInternalResourceDialogSite": "Sitio",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "No hay nodos disponibles para esta organización. Crea un nodo primero para usar sitios locales.",
     "exitNode": "Nodo de Salida",
     "country": "País",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Actualmente basado en IP de origen",
     "region": "Región",
     "selectRegion": "Seleccionar región",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Agregar usuarios",
     "editInternalResourceDialogAddClients": "Agregar clientes",
     "editInternalResourceDialogDestinationLabel": "Destino",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Especifique la dirección de destino para el recurso interno. Puede ser un nombre de host, dirección IP o rango CIDR dependiendo del modo seleccionado. Opcionalmente establezca un alias DNS interno para una identificación más fácil.",
     "internalResourceFormMultiSiteRoutingHelp": "Seleccionar múltiples sitios habilita el enrutamiento resistente y la conmutación por error para alta disponibilidad.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Más información",
     "editInternalResourceDialogPortRestrictionsDescription": "Restringir el acceso a puertos TCP/UDP específicos o permitir/bloquear todos los puertos.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Recurso Deshabilitado",
     "memberPortalShowingResources": "Mostrando {start}-{end} de {total} recursos",
     "resourceLauncherTitle": "Lanzador de Recursos",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Ve los detalles de los recursos y lánzalos desde un solo lugar",
+    "resourceLauncherSearchPlaceholder": "Buscar en todos los sitios...",
     "resourceLauncherDefaultView": "Predeterminado",
     "resourceLauncherSaveView": "Guardar Vista",
     "resourceLauncherSaveToCurrentView": "Guardar en la Vista Actual",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Restablecer Vista",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Guardar como Nueva Vista",
     "resourceLauncherSaveAsNewViewDescription": "Ponle un nombre a esta vista para guardar tus filtros y diseño actuales.",
     "resourceLauncherSaveForEveryone": "Guardar para Todos",
     "resourceLauncherSaveForEveryoneDescription": "Comparte esta vista con todos los miembros de la organización. Si está desmarcado, la vista solo es visible para ti.",
     "resourceLauncherMakePersonal": "Hacer Personal",
     "resourceLauncherFilter": "Filtro",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Ordenar",
     "resourceLauncherSortAscending": "Ordenar Ascendente",
     "resourceLauncherSortDescending": "Ordenar Descendente",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Agrupar Por",
     "resourceLauncherGroupBySite": "Sitio",
     "resourceLauncherGroupByLabel": "Etiqueta",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Disposición",
     "resourceLauncherLayoutGrid": "Cuadrícula",
     "resourceLauncherLayoutList": "Lista",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Mostrar Etiquetas del Sitio",
     "resourceLauncherShowRecents": "Mostrar Recientes",
     "resourceLauncherDeleteView": "Eliminar Vista",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Ver como Administrador",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Ver detalles de este recurso.",
     "resourceLauncherUnlabeled": "Sin Etiqueta",
     "resourceLauncherNoSite": "Sin Sitio",
     "resourceLauncherNoResourcesInGroup": "No hay recursos en este grupo",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "No se Encontraron Recursos",
     "resourceLauncherEmptyStateNoResultsDescription": "No hay recursos que coincidan con tu búsqueda o filtros actuales. Intenta ajustarlos para encontrar lo que buscas.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "No hay recursos que coincidan con \"{query}\". Intenta ajustar tu búsqueda o borrar filtros para ver todos los recursos.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Copiado al portapapeles",
     "resourceLauncherCopiedAccessDescription": "El acceso al recurso ha sido copiado a tu portapapeles.",
     "resourceLauncherViewNamePlaceholder": "Nombre de la Vista",

messages/fr-FR.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Requêtes de proxy sur TCP/UDP brute en utilisant un numéro de port. Nécessite des sites pour se connecter à un noeud distant.",
     "resourceCreate": "Créer une ressource",
     "resourceCreateDescription": "Suivez les étapes ci-dessous pour créer une nouvelle ressource",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configurer les paramètres de ressource de base, y compris le nom et le type",
     "resourceSeeAll": "Voir toutes les ressources",
     "resourceCreateGeneral": "Général",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Interne",
     "emailInvalid": "Adresse e-mail invalide",
     "inviteValidityDuration": "Veuillez sélectionner une durée",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Veuillez sélectionner un rôle",
     "removeOwnAdminRoleConfirmTitle": "Retirer votre accès administrateur ?",
     "removeOwnAdminRoleConfirmDescription": "Vous n'aurez plus de droits d'administrateur dans cette organisation après avoir enregistré. Un autre administrateur pourra restaurer cet accès si nécessaire.",
     "removeOwnAdminRoleConfirmButton": "Retirer mon accès administrateur",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Authentification de l'en-tête de base",
     "policyAuthHeaderAuthDescription": "Validez un nom et une valeur d'en-tête HTTP personnalisé à chaque requête",
     "policyAuthHeaderAuthSummary": "En-tête configuré",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nom de l'en-tête",
+    "policyAuthHeaderValue": "Valeur attendue",
     "policyAuthSetPasscode": "Définir le code confidentiel",
     "policyAuthSetPincode": "Définir le code PIN",
     "policyAuthSetEmailWhitelist": "Définir la liste blanche des e-mails",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Définir le code PIN de la ressource",
     "actionSetResourceEmailWhitelist": "Définir la liste blanche des emails de la ressource",
     "actionGetResourceEmailWhitelist": "Obtenir la liste blanche des emails de la ressource",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Créer une cible",
     "actionDeleteTarget": "Supprimer une cible",
     "actionGetTarget": "Obtenir une cible",
@@ -1519,30 +1507,6 @@
     "navbar": "Menu de navigation",
     "navbarDescription": "Menu de navigation principal de l'application",
     "navbarDocsLink": "Documentation",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Impossible d'activer l'A2F",
     "otpErrorEnableDescription": "Une erreur s'est produite lors de l'activation de l'A2F",
     "otpSetupCheckCode": "Veuillez entrer un code à 6 chiffres",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Gestion",
     "sidebarBillingAndLicenses": "Facturation & Licences",
     "sidebarLogsAnalytics": "Analyses",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Alertes",
     "alertingDescription": "Définissez des sources, des déclencheurs et des actions pour les notifications",
     "alertingRules": "Règles d'alerte",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domaines",
     "billingOrganizations": "Organes",
     "billingRemoteExitNodes": "Nœuds distants",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Aucune limite configurée",
     "billingEstimatedPeriod": "Période de facturation estimée",
     "billingIncludedUsage": "Utilisation incluse",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Combien d'utilisateurs vous pouvez utiliser",
     "billingDomainInfo": "Combien de domaines vous pouvez utiliser",
     "billingRemoteExitNodesInfo": "Combien de nœuds distants vous pouvez utiliser",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Clés de licence",
     "billingLicenseKeysDescription": "Gérer vos abonnements à la clé de licence",
     "billingLicenseSubscription": "Abonnement à la licence",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Fermer",
     "createInternalResourceDialogCreateClientResource": "Créer une ressource privée",
     "createInternalResourceDialogCreateClientResourceDescription": "Créer une nouvelle ressource qui ne sera accessible qu'aux clients connectés à l'organisation",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Propriétés de la ressource",
     "createInternalResourceDialogName": "Nom",
     "createInternalResourceDialogSite": "Site",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Aucun noeud n'est disponible pour cette organisation. Créez d'abord un noeud pour utiliser des sites locaux.",
     "exitNode": "Nœud de sortie",
     "country": "Pays",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Actuellement basé sur l'IP source",
     "region": "Région",
     "selectRegion": "Sélectionner une région",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Ajouter des utilisateurs",
     "editInternalResourceDialogAddClients": "Ajouter des clients",
     "editInternalResourceDialogDestinationLabel": "Destination",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Indiquez l'adresse de destination pour la ressource interne. Cela peut être un nom d'hôte, une adresse IP ou une plage CIDR selon le mode sélectionné. Définissez éventuellement un alias DNS interne pour une identification plus facile.",
     "internalResourceFormMultiSiteRoutingHelp": "La sélection de plusieurs sites permet un routage résilient et un basculement pour une haute disponibilité.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "En savoir plus",
     "editInternalResourceDialogPortRestrictionsDescription": "Restreindre l'accès à des ports TCP/UDP spécifiques ou autoriser/bloquer tous les ports.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ressource désactivée",
     "memberPortalShowingResources": "Affichage de {start}-{end} sur {total} ressources",
     "resourceLauncherTitle": "Lanceur de ressources",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Afficher les détails des ressources et les lancer depuis un seul endroit",
+    "resourceLauncherSearchPlaceholder": "Rechercher sur tous les sites...",
     "resourceLauncherDefaultView": "Par défaut",
     "resourceLauncherSaveView": "Enregistrer la vue",
     "resourceLauncherSaveToCurrentView": "Enregistrer dans la vue actuelle",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Réinitialiser la vue",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Enregistrer comme nouvelle vue",
     "resourceLauncherSaveAsNewViewDescription": "Donnez un nom à cette vue pour enregistrer vos filtres et mise en page actuels.",
     "resourceLauncherSaveForEveryone": "Enregistrer pour tout le monde",
     "resourceLauncherSaveForEveryoneDescription": "Partagez cette vue avec tous les membres de l'organisation. Lorsque décochée, la vue est visible uniquement par vous.",
     "resourceLauncherMakePersonal": "Rendre personnel",
     "resourceLauncherFilter": "Filtrer",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Trier",
     "resourceLauncherSortAscending": "Trier par ordre croissant",
     "resourceLauncherSortDescending": "Trier par ordre décroissant",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Grouper par",
     "resourceLauncherGroupBySite": "Nœud",
     "resourceLauncherGroupByLabel": "Étiquette",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Mise en page",
     "resourceLauncherLayoutGrid": "Grille",
     "resourceLauncherLayoutList": "Liste",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Afficher les tags de site",
     "resourceLauncherShowRecents": "Afficher les récents",
     "resourceLauncherDeleteView": "Supprimer la vue",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Voir en tant qu'admin",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Afficher les détails pour cette ressource.",
     "resourceLauncherUnlabeled": "Non étiqueté",
     "resourceLauncherNoSite": "Aucun nœud",
     "resourceLauncherNoResourcesInGroup": "Aucune ressource dans ce groupe",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Aucune ressource trouvée",
     "resourceLauncherEmptyStateNoResultsDescription": "Aucune ressource ne correspond à votre recherche ou filtre actuel. Essayez de les ajuster pour trouver ce que vous cherchez.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Aucune ressource ne correspond à \"{query}\". Essayez d'ajuster votre recherche ou de supprimer les filtres pour voir toutes les ressources.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Copié dans le presse-papiers",
     "resourceLauncherCopiedAccessDescription": "L'accès à la ressource a été copié dans votre presse-papiers.",
     "resourceLauncherViewNamePlaceholder": "Nom de la vue",

messages/it-IT.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Richiesta proxy su TCP/UDP grezzo utilizzando un numero di porta. Richiede siti per connettersi a un nodo remoto.",
     "resourceCreate": "Crea Risorsa",
     "resourceCreateDescription": "Segui i passaggi seguenti per creare una nuova risorsa",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configura le impostazioni generali delle risorse, inclusi il nome e il tipo",
     "resourceSeeAll": "Vedi Tutte Le Risorse",
     "resourceCreateGeneral": "Generale",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Interno",
     "emailInvalid": "Indirizzo email non valido",
     "inviteValidityDuration": "Seleziona una durata",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Seleziona un ruolo",
     "removeOwnAdminRoleConfirmTitle": "Rimuovere il tuo accesso amministrativo?",
     "removeOwnAdminRoleConfirmDescription": "Non avrai più i permessi di amministratore in questa organizzazione dopo il salvataggio. Un altro amministratore può ripristinare l'accesso se necessario.",
     "removeOwnAdminRoleConfirmButton": "Rimuovere il Mio Accesso Amministrativo",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticazione Header Base",
     "policyAuthHeaderAuthDescription": "Convalida un nome e un valore di intestazione HTTP personalizzato su ogni richiesta",
     "policyAuthHeaderAuthSummary": "Intestazione configurata",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nome dell'intestazione",
+    "policyAuthHeaderValue": "Valore atteso",
     "policyAuthSetPasscode": "Imposta Codice di Accesso",
     "policyAuthSetPincode": "Imposta Codice PIN",
     "policyAuthSetEmailWhitelist": "Imposta Lista Autorizzazioni Email",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Imposta Codice PIN Risorsa",
     "actionSetResourceEmailWhitelist": "Imposta Lista Autorizzazioni Email Risorsa",
     "actionGetResourceEmailWhitelist": "Ottieni Lista Autorizzazioni Email Risorsa",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Crea Target",
     "actionDeleteTarget": "Elimina Target",
     "actionGetTarget": "Ottieni Target",
@@ -1519,30 +1507,6 @@
     "navbar": "Menu di Navigazione",
     "navbarDescription": "Menu di navigazione principale dell'applicazione",
     "navbarDocsLink": "Documentazione",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Impossibile abilitare 2FA",
     "otpErrorEnableDescription": "Si è verificato un errore durante l'abilitazione di 2FA",
     "otpSetupCheckCode": "Inserisci un codice a 6 cifre",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Gestione",
     "sidebarBillingAndLicenses": "Fatturazione E Licenze",
     "sidebarLogsAnalytics": "Analisi",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Allerta",
     "alertingDescription": "Definisci fonti, trigger e azioni per le notifiche",
     "alertingRules": "Regole di allerta",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domini",
     "billingOrganizations": "Organi",
     "billingRemoteExitNodes": "Nodi Remoti",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nessun limite configurato",
     "billingEstimatedPeriod": "Periodo di Fatturazione Stimato",
     "billingIncludedUsage": "Utilizzo Incluso",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Quanti utenti puoi usare",
     "billingDomainInfo": "Quanti domini puoi usare",
     "billingRemoteExitNodesInfo": "Quanti nodi remoti puoi usare",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Chiavi di Licenza",
     "billingLicenseKeysDescription": "Gestisci le sottoscrizioni alla chiave di licenza",
     "billingLicenseSubscription": "Abbonamento Licenza",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Chiudi",
     "createInternalResourceDialogCreateClientResource": "Crea Risorsa Privata",
     "createInternalResourceDialogCreateClientResourceDescription": "Crea una nuova risorsa che sarà accessibile solo ai client connessi all'organizzazione",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Proprietà della Risorsa",
     "createInternalResourceDialogName": "Nome",
     "createInternalResourceDialogSite": "Sito",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Non ci sono nodi disponibili per questa organizzazione. Crea un nodo prima per usare i siti locali.",
     "exitNode": "Nodo di Uscita",
     "country": "Paese",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Attualmente basato sull'IP di origine",
     "region": "Regione",
     "selectRegion": "Seleziona regione",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Aggiungi Utenti",
     "editInternalResourceDialogAddClients": "Aggiungi Clienti",
     "editInternalResourceDialogDestinationLabel": "Destinazione",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Specifica l'indirizzo di destinazione per la risorsa interna. Può essere un hostname, indirizzo IP o un intervallo CIDR a seconda della modalità selezionata. Opzionalmente imposta un alias DNS interno per una più facile identificazione.",
     "internalResourceFormMultiSiteRoutingHelp": "Selezionare più siti consente un routing resiliente e Failover per alta disponibilità.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Scopri di più",
     "editInternalResourceDialogPortRestrictionsDescription": "Limita l'accesso a porte TCP/UDP specifiche o consenti/blocca tutte le porte.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Risorsa Disabilitata",
     "memberPortalShowingResources": "Mostrando {start}-{end} di {total} risorse",
     "resourceLauncherTitle": "Lanscia Risorse",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Visualizza i dettagli delle risorse e lanciale da un solo posto",
+    "resourceLauncherSearchPlaceholder": "Cerca tutti i siti...",
     "resourceLauncherDefaultView": "Predefinito",
     "resourceLauncherSaveView": "Salva Visualizzazione",
     "resourceLauncherSaveToCurrentView": "Salva alla Visualizzazione Corrente",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Reimposta Visualizzazione",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Salva come Nuova Visualizzazione",
     "resourceLauncherSaveAsNewViewDescription": "Dai un nome a questa visualizzazione per salvare i tuoi filtri e layout attuali.",
     "resourceLauncherSaveForEveryone": "Salva per Tutti",
     "resourceLauncherSaveForEveryoneDescription": "Condividi questa visualizzazione con tutti i membri dell'organizzazione. Quando non è selezionata, la visualizzazione è visibile solo a te.",
     "resourceLauncherMakePersonal": "Rendi Personale",
     "resourceLauncherFilter": "Filtro",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Ordina",
     "resourceLauncherSortAscending": "Ordina in ordine crescente",
     "resourceLauncherSortDescending": "Ordina in ordine decrescente",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Raggruppa per",
     "resourceLauncherGroupBySite": "Sito",
     "resourceLauncherGroupByLabel": "Etichetta",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Layout",
     "resourceLauncherLayoutGrid": "Griglia",
     "resourceLauncherLayoutList": "Lista",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Mostra Tag di Sito",
     "resourceLauncherShowRecents": "Mostra Recenti",
     "resourceLauncherDeleteView": "Elimina Visualizzazione",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Visualizza come Admin",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Visualizza i dettagli per questa risorsa.",
     "resourceLauncherUnlabeled": "Non Etichettato",
     "resourceLauncherNoSite": "Nessun Sito",
     "resourceLauncherNoResourcesInGroup": "Nessuna risorsa in questo gruppo",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Nessuna risorsa trovata",
     "resourceLauncherEmptyStateNoResultsDescription": "Nessuna risorsa corrisponde alla tua ricerca o ai tuoi filtri attuali. Prova a modificarli per trovare ciò che stai cercando.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Nessuna risorsa corrisponde a \"{query}\". Prova a modificare la tua ricerca o a cancellare i filtri per vedere tutte le risorse.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Copiato negli appunti",
     "resourceLauncherCopiedAccessDescription": "L'accesso alla risorsa è stato copiato nei tuoi appunti.",
     "resourceLauncherViewNamePlaceholder": "Nome Visualizzazione",

messages/ko-KR.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "포트 번호를 사용하여 원격 노드에 연결해야 합니다. 원격 노드에서 리소스를 사용하려면 사용자 지정 도메인을 사용하십시오.",
     "resourceCreate": "리소스 생성",
     "resourceCreateDescription": "아래 단계를 따라 새 리소스를 생성하세요.",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "이름 및 유형을 포함한 기본 리소스 설정 구성",
     "resourceSeeAll": "모든 리소스 보기",
     "resourceCreateGeneral": "일반",
@@ -615,8 +613,7 @@
     "idpNameInternal": "내부",
     "emailInvalid": "유효하지 않은 이메일 주소입니다.",
     "inviteValidityDuration": "지속 시간을 선택하십시오.",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "역할을 선택하세요",
     "removeOwnAdminRoleConfirmTitle": "관리자 권한을 제거하시겠습니까?",
     "removeOwnAdminRoleConfirmDescription": "저장 후 이 조직에 대한 관리자 권한이 없어집니다. 필요한 경우 다른 관리자가 접근 권한을 복구할 수 있습니다.",
     "removeOwnAdminRoleConfirmButton": "내 관리자 권한 제거",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "기본 헤더 인증",
     "policyAuthHeaderAuthDescription": "각 요청에서 맞춤 HTTP 헤더 이름 및 값을 검증",
     "policyAuthHeaderAuthSummary": "헤더 구성됨",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "헤더 이름",
+    "policyAuthHeaderValue": "예상 값",
     "policyAuthSetPasscode": "패스코드 설정",
     "policyAuthSetPincode": "PIN 코드 설정",
     "policyAuthSetEmailWhitelist": "이메일 화이트리스트 설정",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "리소스 핀코드 설정",
     "actionSetResourceEmailWhitelist": "리소스 이메일 화이트리스트 설정",
     "actionGetResourceEmailWhitelist": "리소스 이메일 화이트리스트 가져오기",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "대상 만들기",
     "actionDeleteTarget": "대상 삭제",
     "actionGetTarget": "대상 가져오기",
@@ -1519,30 +1507,6 @@
     "navbar": "탐색 메뉴",
     "navbarDescription": "애플리케이션의 주요 탐색 메뉴",
     "navbarDocsLink": "문서",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "2FA를 활성화할 수 없습니다.",
     "otpErrorEnableDescription": "2FA를 활성화하는 동안 오류가 발생했습니다",
     "otpSetupCheckCode": "6자리 코드를 입력하세요",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "관리",
     "sidebarBillingAndLicenses": "결제 및 라이선스",
     "sidebarLogsAnalytics": "분석",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "알림",
     "alertingDescription": "알림에 대한 소스, 트리거 및 작업 정의",
     "alertingRules": "알림 규칙",
@@ -1990,9 +1915,6 @@
     "billingDomains": "도메인",
     "billingOrganizations": "조직",
     "billingRemoteExitNodes": "원격 노드",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "구성된 한도가 없습니다.",
     "billingEstimatedPeriod": "예상 청구 기간",
     "billingIncludedUsage": "포함 사용량",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "사용할 수 있는 사용자 수",
     "billingDomainInfo": "사용할 수 있는 도메인 수",
     "billingRemoteExitNodesInfo": "사용할 수 있는 원격 노드 수",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "라이센스 키",
     "billingLicenseKeysDescription": "라이센스 키 구독을 관리하세요",
     "billingLicenseSubscription": "라이센스 구독",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "닫기",
     "createInternalResourceDialogCreateClientResource": "사이트 리소스 생성",
     "createInternalResourceDialogCreateClientResourceDescription": "선택한 사이트에 연결된 클라이언트에 접근할 새 리소스를 생성합니다",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "리소스 속성",
     "createInternalResourceDialogName": "이름",
     "createInternalResourceDialogSite": "사이트",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "이 조직에 사용 가능한 노드가 없습니다. 로컬 사이트를 사용하려면 먼저 노드를 생성하세요.",
     "exitNode": "종단 노드",
     "country": "국가",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "현재 소스 IP를 기반으로 합니다",
     "region": "지역",
     "selectRegion": "지역 선택",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "사용자 추가",
     "editInternalResourceDialogAddClients": "클라이언트 추가",
     "editInternalResourceDialogDestinationLabel": "대상지",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "내부 리소스의 목적지 주소를 지정하세요. 선택한 모드에 따라 이 주소는 호스트명, IP 주소, 또는 CIDR 범위가 될 수 있습니다. 더욱 쉽게 식별할 수 있도록 내부 DNS 별칭을 설정할 수 있습니다.",
     "internalResourceFormMultiSiteRoutingHelp": "다중 사이트를 선택하면 높은 가용성을 위해 회복력 있는 라우팅 및 페일오버가 가능해집니다.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "자세히 알아보기",
     "editInternalResourceDialogPortRestrictionsDescription": "특정 TCP/UDP 포트에 대한 접근을 제한하거나 모든 포트를 허용/차단하십시오.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "리소스 비활성화됨",
     "memberPortalShowingResources": "{start}-{end} 중 {total}개의 리소스를 표시 중",
     "resourceLauncherTitle": "리소스 런처",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "리소스 세부 정보를 보고 한 곳에서 실행하세요",
+    "resourceLauncherSearchPlaceholder": "모든 사이트 검색...",
     "resourceLauncherDefaultView": "기본값",
     "resourceLauncherSaveView": "보기를 저장",
     "resourceLauncherSaveToCurrentView": "현재 보기로 저장",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "보기를 재설정",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "새 보기로 저장",
     "resourceLauncherSaveAsNewViewDescription": "현재 필터와 레이아웃을 저장할 이름을 입력하세요.",
     "resourceLauncherSaveForEveryone": "모두에게 저장",
     "resourceLauncherSaveForEveryoneDescription": "이 보기를 모든 조직 구성원과 공유합니다. 체크 해제하면 해당 뷰는 사용자에게만 표시됩니다.",
     "resourceLauncherMakePersonal": "개인적으로 만들기",
     "resourceLauncherFilter": "필터",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "정렬",
     "resourceLauncherSortAscending": "오름차순 정렬",
     "resourceLauncherSortDescending": "내림차순 정렬",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "그룹화 기준",
     "resourceLauncherGroupBySite": "사이트",
     "resourceLauncherGroupByLabel": "레이블",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "레이아웃",
     "resourceLauncherLayoutGrid": "그리드",
     "resourceLauncherLayoutList": "목록",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "사이트 태그 표시",
     "resourceLauncherShowRecents": "최근 항목 표시",
     "resourceLauncherDeleteView": "보기 삭제",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "관리자로 보기",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "이 리소스의 세부정보를 봅니다.",
     "resourceLauncherUnlabeled": "레이블 없음",
     "resourceLauncherNoSite": "사이트 없음",
     "resourceLauncherNoResourcesInGroup": "이 그룹에는 리소스가 없습니다",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "리소스를 찾을 수 없음",
     "resourceLauncherEmptyStateNoResultsDescription": "현재 검색이나 필터에 맞는 리소스가 없습니다. 필터를 조정하여 찾으려는 항목을 확인해보세요.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "\"{query}\"와 일치하는 리소스가 없습니다. 검색을 조정하거나 필터를 지워서 모든 리소스를 확인해보세요.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "클립보드에 복사됨",
     "resourceLauncherCopiedAccessDescription": "리소스 액세스가 클립보드에 복사되었습니다.",
     "resourceLauncherViewNamePlaceholder": "보기 이름",

messages/nb-NO.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy forespørsler om rå TCP/UDP ved hjelp av et portnummer. Krever sider for å koble til en ekstern node.",
     "resourceCreate": "Opprett ressurs",
     "resourceCreateDescription": "Følg trinnene nedenfor for å opprette en ny ressurs",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Konfigurer de grunnleggende ressursinnstillingene inkludert navnet og typen",
     "resourceSeeAll": "Se alle ressurser",
     "resourceCreateGeneral": "Generelt",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Intern",
     "emailInvalid": "Ugyldig e-postadresse",
     "inviteValidityDuration": "Vennligst velg en varighet",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Vennligst velg en rolle",
     "removeOwnAdminRoleConfirmTitle": "Fjern din administratoradgang?",
     "removeOwnAdminRoleConfirmDescription": "Du vil ikke lenger ha administratorrettigheter i denne organisasjonen etter lagring. En annen administrator kan gjenopprette tilgang hvis nødvendig.",
     "removeOwnAdminRoleConfirmButton": "Fjern min administratoradgang",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grunnleggende Header Autentisering",
     "policyAuthHeaderAuthDescription": "Bekreft et tilpasset HTTP-headernavn og verdi ved hver forespørsel",
     "policyAuthHeaderAuthSummary": "Header konfigurert",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Headernavn",
+    "policyAuthHeaderValue": "Forventet verdi",
     "policyAuthSetPasscode": "Angi passordkode",
     "policyAuthSetPincode": "Sett PIN-kode",
     "policyAuthSetEmailWhitelist": "Angi e-post hviteliste",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Angi ressurspinkode",
     "actionSetResourceEmailWhitelist": "Angi e-post-hviteliste for ressurs",
     "actionGetResourceEmailWhitelist": "Hent e-post-hviteliste for ressurs",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Opprett mål",
     "actionDeleteTarget": "Slett mål",
     "actionGetTarget": "Hent mål",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigasjonsmeny",
     "navbarDescription": "Hovednavigasjonsmeny for applikasjonen",
     "navbarDocsLink": "Dokumentasjon",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Kunne ikke aktivere 2FA",
     "otpErrorEnableDescription": "En feil oppstod under aktivering av 2FA",
     "otpSetupCheckCode": "Vennligst skriv inn en 6-sifret kode",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Administrasjon",
     "sidebarBillingAndLicenses": "Fakturering & lisenser",
     "sidebarLogsAnalytics": "Analyser",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Varsling",
     "alertingDescription": "Definer kilder, triggere og handlinger for varsler",
     "alertingRules": "Varslingsregler",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domener",
     "billingOrganizations": "Orger",
     "billingRemoteExitNodes": "Eksterne Noder",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Ingen grense konfigurert",
     "billingEstimatedPeriod": "Estimert faktureringsperiode",
     "billingIncludedUsage": "Inkludert Bruk",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Hvor mange brukere du kan bruke",
     "billingDomainInfo": "Hvor mange domener du kan bruke",
     "billingRemoteExitNodesInfo": "Hvor mange fjernnoder du kan bruke",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lisensnøkler",
     "billingLicenseKeysDescription": "Administrer dine lisensnøkkelabonnementer",
     "billingLicenseSubscription": "Lisens abonnement",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Lukk",
     "createInternalResourceDialogCreateClientResource": "Opprett privat ressurs",
     "createInternalResourceDialogCreateClientResourceDescription": "Opprett en ny ressurs som bare vil være tilgjengelig for kunder som er koblet til organisasjonen",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Ressursegenskaper",
     "createInternalResourceDialogName": "Navn",
     "createInternalResourceDialogSite": "Område",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Ingen noder er tilgjengelige for denne organisasjonen. Opprett en node først for å bruke lokale nettsteder.",
     "exitNode": "Utgangsnode",
     "country": "Land",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "For tiden basert på kilde IP",
     "region": "Fylke",
     "selectRegion": "Velg region",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Legg til brukere",
     "editInternalResourceDialogAddClients": "Legg til klienter",
     "editInternalResourceDialogDestinationLabel": "Destinasjon",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Spesifiser destinasjonsadressen for den interne ressursen. Dette kan være et vertsnavn, IP-adresse eller CIDR-sjikt avhengig av valgt modus. Valgfrie oppsett av intern DNS-alias for enklere identifikasjon.",
     "internalResourceFormMultiSiteRoutingHelp": "Valg av flere nettsteder muliggjør motstandskraftig ruting og failover for høy tilgjengelighet.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Lær mer",
     "editInternalResourceDialogPortRestrictionsDescription": "Begrens tilgang til spesifikke TCP/UDP-porter eller tillate/blokkere alle porter.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ressurs deaktivert",
     "memberPortalShowingResources": "Viser {start}-{end} av {total} ressurser",
     "resourceLauncherTitle": "Ressurslansering",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Vis ressursdetaljer og start dem fra ett sted",
+    "resourceLauncherSearchPlaceholder": "Søk i alle områder...",
     "resourceLauncherDefaultView": "Standard",
     "resourceLauncherSaveView": "Lagre visning",
     "resourceLauncherSaveToCurrentView": "Lagre til nåværende visning",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Tilbakestill visning",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Lagre som ny visning",
     "resourceLauncherSaveAsNewViewDescription": "Gi denne visningen et navn for å lagre dine nåværende filtre og oppsett.",
     "resourceLauncherSaveForEveryone": "Lagre for alle",
     "resourceLauncherSaveForEveryoneDescription": "Del denne visningen med alle organisasjonsmedlemmer. Når avkrysset, er visningen synlig bare for deg.",
     "resourceLauncherMakePersonal": "Gjør personlig",
     "resourceLauncherFilter": "Filter",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sorter",
     "resourceLauncherSortAscending": "Sorter stigende",
     "resourceLauncherSortDescending": "Sorter synkende",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Grupper etter",
     "resourceLauncherGroupBySite": "Område",
     "resourceLauncherGroupByLabel": "Etikett",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Oppsett",
     "resourceLauncherLayoutGrid": "Rutenett",
     "resourceLauncherLayoutList": "Liste",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Vis områdestikkord",
     "resourceLauncherShowRecents": "Vis nylige",
     "resourceLauncherDeleteView": "Slett visning",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Vis som administrator",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Vis detaljer for denne ressursen.",
     "resourceLauncherUnlabeled": "Umerket",
     "resourceLauncherNoSite": "Ingen område",
     "resourceLauncherNoResourcesInGroup": "Ingen ressurser i denne gruppen",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Ingen ressurser funnet",
     "resourceLauncherEmptyStateNoResultsDescription": "Ingen ressurser matcher dine nåværende søk eller filtre. Prøv å justere dem for å finne det du leter etter.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Ingen ressurser samsvarer med \"{query}\". Prøv å justere søket eller fjern filtrene for å se alle ressursene.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Kopiert til utklippstavlen",
     "resourceLauncherCopiedAccessDescription": "Ressurstilgang er kopiert til utklippstavlen din.",
     "resourceLauncherViewNamePlaceholder": "Visningsnavn",

messages/nl-NL.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy verzoeken over rauwe TCP/UDP met behulp van een poortnummer. Vereist sites om verbinding te maken met een remote node.",
     "resourceCreate": "Bron maken",
     "resourceCreateDescription": "Volg de onderstaande stappen om een nieuwe bron te maken",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configureer de basisinstellingen van de bron, inclusief de naam en het type",
     "resourceSeeAll": "Alle bronnen bekijken",
     "resourceCreateGeneral": "Algemeen",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Intern",
     "emailInvalid": "Ongeldig e-mailadres",
     "inviteValidityDuration": "Selecteer een tijdsduur",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Selecteer een rol",
     "removeOwnAdminRoleConfirmTitle": "Uw beheerderstoegang verwijderen?",
     "removeOwnAdminRoleConfirmDescription": "U zult na het opslaan geen beheerdersrechten meer hebben in deze organisatie. Een andere beheerder kan de toegang indien nodig herstellen.",
     "removeOwnAdminRoleConfirmButton": "Verwijder Mijn Beheerderstoegang",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Basic Header Authenticatie",
     "policyAuthHeaderAuthDescription": "Valideer een aangepaste HTTP-headernaam en waarde bij elk verzoek",
     "policyAuthHeaderAuthSummary": "Header geconfigureerd",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Header naam",
+    "policyAuthHeaderValue": "Verwachte waarde",
     "policyAuthSetPasscode": "Stel toegangscode in",
     "policyAuthSetPincode": "Stel Pincode in",
     "policyAuthSetEmailWhitelist": "Stel E-mail Whitelist in",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Stel Resource Pincode in",
     "actionSetResourceEmailWhitelist": "Stel Resource e-mail whitelist in",
     "actionGetResourceEmailWhitelist": "Verkrijg Resource E-mail Whitelist",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Doelwit aanmaken",
     "actionDeleteTarget": "Verwijder doel",
     "actionGetTarget": "Verkrijg Doel",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigatiemenu",
     "navbarDescription": "Hoofd navigatie menu voor de applicatie",
     "navbarDocsLink": "Documentatie",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Kan 2FA niet inschakelen",
     "otpErrorEnableDescription": "Er is een fout opgetreden tijdens het inschakelen van 2FA",
     "otpSetupCheckCode": "Voer een 6-cijferige code in",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Beheer",
     "sidebarBillingAndLicenses": "Facturatie & Licenties",
     "sidebarLogsAnalytics": "Analyses",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Waarschuwingen",
     "alertingDescription": "Definieer bronnen, triggers en acties voor meldingen",
     "alertingRules": "Waarschuwingsregels",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domeinen",
     "billingOrganizations": "Ordenen",
     "billingRemoteExitNodes": "Externe knooppunten",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Geen limiet ingesteld",
     "billingEstimatedPeriod": "Geschatte Facturatie Periode",
     "billingIncludedUsage": "Opgenomen Gebruik",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Hoeveel gebruikers je kan gebruiken",
     "billingDomainInfo": "Hoeveel domeinen je kunt gebruiken",
     "billingRemoteExitNodesInfo": "Hoeveel externe nodes je kunt gebruiken",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licentie Sleutels",
     "billingLicenseKeysDescription": "Beheer uw licentiesleutelabonnementen",
     "billingLicenseSubscription": "Licentie abonnement",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Sluiten",
     "createInternalResourceDialogCreateClientResource": "Privé bron maken",
     "createInternalResourceDialogCreateClientResourceDescription": "Maak een nieuwe bron aan die alleen toegankelijk is voor klanten die verbonden zijn met de organisatie",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Bron-eigenschappen",
     "createInternalResourceDialogName": "Naam",
     "createInternalResourceDialogSite": "Site",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Er zijn geen knooppunten beschikbaar voor deze organisatie. Maak eerst een knooppunt aan om lokale sites te gebruiken.",
     "exitNode": "Exit Node",
     "country": "Land",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Momenteel gebaseerd op bron IP",
     "region": "Regio",
     "selectRegion": "Selecteer regio",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Gebruikers toevoegen",
     "editInternalResourceDialogAddClients": "Clienten toevoegen",
     "editInternalResourceDialogDestinationLabel": "Bestemming",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Specificeer het bestemmingsadres voor de interne bron. Dit kan een hostnaam, IP-adres of CIDR-bereik zijn, afhankelijk van de geselecteerde modus. Stel optioneel een interne DNS-alias in voor eenvoudigere identificatie.",
     "internalResourceFormMultiSiteRoutingHelp": "Selecteren van meerdere sites maakt veerkrachtige routing en failover mogelijk voor hoge beschikbaarheid.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Meer informatie",
     "editInternalResourceDialogPortRestrictionsDescription": "Beperk toegang tot specifieke TCP/UDP-poorten of sta alle poorten toe/blokkeer.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Bron Uitgeschakeld",
     "memberPortalShowingResources": "Toont {start}-{end} van {total} bronnen",
     "resourceLauncherTitle": "Bron Launcher",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Bekijk brongegevens en start ze vanaf één plek",
+    "resourceLauncherSearchPlaceholder": "Zoek alle sites...",
     "resourceLauncherDefaultView": "Standaard",
     "resourceLauncherSaveView": "Weergave Opslaan",
     "resourceLauncherSaveToCurrentView": "Opslaan naar huidige weergave",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Weergave Herstellen",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Opslaan als Nieuwe Weergave",
     "resourceLauncherSaveAsNewViewDescription": "Geef deze weergave een naam om je huidige filters en indeling op te slaan.",
     "resourceLauncherSaveForEveryone": "Opslaan voor Iedereen",
     "resourceLauncherSaveForEveryoneDescription": "Deel deze weergave met alle organisatieleden. Als dit niet is aangevinkt, is de weergave alleen zichtbaar voor jou.",
     "resourceLauncherMakePersonal": "Persoonlijk Maken",
     "resourceLauncherFilter": "Filter",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sorteren",
     "resourceLauncherSortAscending": "Oplopend sorteren",
     "resourceLauncherSortDescending": "Aflopend sorteren",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Groep Op",
     "resourceLauncherGroupBySite": "Site",
     "resourceLauncherGroupByLabel": "Label",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Lay-out",
     "resourceLauncherLayoutGrid": "Raster",
     "resourceLauncherLayoutList": "Lijst",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Site Tags Weergeven",
     "resourceLauncherShowRecents": "Recente Weergeven",
     "resourceLauncherDeleteView": "Weergave Verwijderen",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Bekijk als Admin",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Bekijk details voor deze bron.",
     "resourceLauncherUnlabeled": "Geen label",
     "resourceLauncherNoSite": "Geen Site",
     "resourceLauncherNoResourcesInGroup": "Geen bronnen in deze groep",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Geen Bronnen Gevonden",
     "resourceLauncherEmptyStateNoResultsDescription": "Geen bronnen komen overeen met je huidige zoekopdracht of filters. Probeer ze aan te passen om te vinden wat je zoekt.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Geen bronnen komen overeen met \"{query}\". Probeer je zoekopdracht aan te passen of filters te wissen om alle bronnen te zien.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Gekopieerd naar klembord",
     "resourceLauncherCopiedAccessDescription": "Toegang tot bron is gekopieerd naar je klembord.",
     "resourceLauncherViewNamePlaceholder": "Weergavenaam",

messages/pl-PL.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Żądania proxy nad surowym TCP/UDP przy użyciu numeru portu. Wymaga stron aby połączyć się ze zdalnym węzłem.",
     "resourceCreate": "Utwórz zasób",
     "resourceCreateDescription": "Wykonaj poniższe kroki, aby utworzyć nowy zasób",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Skonfiguruj podstawowe ustawienia zasobu, w tym nazwę i typ",
     "resourceSeeAll": "Zobacz wszystkie zasoby",
     "resourceCreateGeneral": "Ogólny",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Wewnętrzny",
     "emailInvalid": "Nieprawidłowy adres e-mail",
     "inviteValidityDuration": "Proszę wybrać okres ważności",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Proszę wybrać rolę",
     "removeOwnAdminRoleConfirmTitle": "Usunąć dostęp administratora?",
     "removeOwnAdminRoleConfirmDescription": "Po zapisaniu nie będziesz już posiadał uprawnień administratora w tej organizacji. Inny administrator może przywrócić dostęp, jeśli to konieczne.",
     "removeOwnAdminRoleConfirmButton": "Usuń mój dostęp administratora",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Podstawowe Uwierzytelnianie Nagłówka",
     "policyAuthHeaderAuthDescription": "Walidacja niestandardowej nazwy i wartości nagłówka HTTP przy każdym żądaniu",
     "policyAuthHeaderAuthSummary": "Skonfigurowany nagłówek",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nazwa nagłówka",
+    "policyAuthHeaderValue": "Oczekiwana wartość",
     "policyAuthSetPasscode": "Ustaw hasło dostępu",
     "policyAuthSetPincode": "Ustaw kod PIN",
     "policyAuthSetEmailWhitelist": "Ustaw białą listę e-mail",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Ustaw kod PIN zasobu",
     "actionSetResourceEmailWhitelist": "Ustaw białą listę email zasobu",
     "actionGetResourceEmailWhitelist": "Pobierz białą listę email zasobu",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Utwórz cel",
     "actionDeleteTarget": "Usuń cel",
     "actionGetTarget": "Pobierz cel",
@@ -1519,30 +1507,6 @@
     "navbar": "Menu nawigacyjne",
     "navbarDescription": "Główne menu nawigacyjne aplikacji",
     "navbarDocsLink": "Dokumentacja",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Nie można włączyć 2FA",
     "otpErrorEnableDescription": "Wystąpił błąd podczas włączania 2FA",
     "otpSetupCheckCode": "Wprowadź 6-cyfrowy kod",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Zarządzanie",
     "sidebarBillingAndLicenses": "Płatność i licencje",
     "sidebarLogsAnalytics": "Analityka",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Alarmowanie",
     "alertingDescription": "Zdefiniuj źródła, ustawienia, i działania dla powiadomień",
     "alertingRules": "Reguły alarmowe",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domeny",
     "billingOrganizations": "O masie całkowitej pojazdu przekraczającej 5 ton, ale nieprzekraczającej 5 ton",
     "billingRemoteExitNodes": "Zdalne węzły",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nie skonfigurowano limitu",
     "billingEstimatedPeriod": "Szacowany Okres Rozliczeniowy",
     "billingIncludedUsage": "Zawarte użycie",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Ile użytkowników możesz użyć",
     "billingDomainInfo": "Ile domen możesz użyć",
     "billingRemoteExitNodesInfo": "Ile zdalnych węzłów możesz użyć",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Klucze licencyjne",
     "billingLicenseKeysDescription": "Zarządzaj subskrypcjami kluczy licencyjnych",
     "billingLicenseSubscription": "Subskrypcja licencji",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Zamknij",
     "createInternalResourceDialogCreateClientResource": "Utwórz zasób prywatny",
     "createInternalResourceDialogCreateClientResourceDescription": "Utwórz nowy zasób, który będzie dostępny tylko dla klientów podłączonych do organizacji",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Właściwości zasobów",
     "createInternalResourceDialogName": "Nazwa",
     "createInternalResourceDialogSite": "Witryna",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Węzły nie są dostępne dla tej organizacji. Utwórz węzeł, aby używać lokalnych witryn.",
     "exitNode": "Węzeł Wyjściowy",
     "country": "Kraj",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Obecnie bazuje na adresie IP źródła",
     "region": "Region",
     "selectRegion": "Wybierz region",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Dodaj użytkowników",
     "editInternalResourceDialogAddClients": "Dodaj klientów",
     "editInternalResourceDialogDestinationLabel": "Miejsce docelowe",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Określ adres docelowy dla wewnętrznego zasobu. Może to być nazwa hosta, adres IP lub zakres CIDR, w zależności od wybranego trybu. Opcjonalnie ustaw wewnętrzny alias DNS dla łatwiejszej identyfikacji.",
     "internalResourceFormMultiSiteRoutingHelp": "Wybór wielu stron umożliwia odporne trasowanie i awarię dla wysokiej dostępności.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Dowiedz się więcej",
     "editInternalResourceDialogPortRestrictionsDescription": "Ogranicz dostęp do konkretnych portów TCP/UDP lub zezwól/zablokuj wszystkie porty.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Zasób wyłączony",
     "memberPortalShowingResources": "Wyświetlanie zasobów od {start} do {end} z {total}",
     "resourceLauncherTitle": "Uruchamiacz Zasobów",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Przeglądaj szczegóły zasobów i uruchamiaj je z jednego miejsca",
+    "resourceLauncherSearchPlaceholder": "Szukaj we wszystkich stronach...",
     "resourceLauncherDefaultView": "Domyślny",
     "resourceLauncherSaveView": "Zapisz Widok",
     "resourceLauncherSaveToCurrentView": "Zapisz do bieżącego widoku",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Resetuj Widok",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Zapisz jako Nowy Widok",
     "resourceLauncherSaveAsNewViewDescription": "Nadaj nazwę temu widokowi, aby zapisać swoje bieżące filtry i układ.",
     "resourceLauncherSaveForEveryone": "Zapisz dla wszystkich",
     "resourceLauncherSaveForEveryoneDescription": "Udostępnij ten widok wszystkim członkom organizacji. Gdy jest niezaznaczone, widok jest widoczny tylko dla Ciebie.",
     "resourceLauncherMakePersonal": "Zrób osobisty",
     "resourceLauncherFilter": "Filtr",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sortuj",
     "resourceLauncherSortAscending": "Sortuj rosnąco",
     "resourceLauncherSortDescending": "Sortuj malejąco",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Grupuj według",
     "resourceLauncherGroupBySite": "Witryna",
     "resourceLauncherGroupByLabel": "Etykieta",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Układ",
     "resourceLauncherLayoutGrid": "Siatka",
     "resourceLauncherLayoutList": "Lista",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Pokaż tagi stron",
     "resourceLauncherShowRecents": "Pokaż ostatnie",
     "resourceLauncherDeleteView": "Usuń Widok",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Przeglądaj jako Administrator",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Pokaż szczegóły tego zasobu.",
     "resourceLauncherUnlabeled": "Bez etykiety",
     "resourceLauncherNoSite": "Brak strony",
     "resourceLauncherNoResourcesInGroup": "W tej grupie nie ma zasobów",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Nie znaleziono zasobów",
     "resourceLauncherEmptyStateNoResultsDescription": "Żadne zasoby nie spełniają twojego bieżącego wyszukiwania lub filtrów. Spróbuj je dostosować, aby znaleźć to, czego szukasz.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Żadne zasoby nie odpowiadają \"{query}\". Spróbuj dostosować swoje wyszukiwanie lub usunąć filtry, aby zobaczyć wszystkie zasoby.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Skopiowano do schowka",
     "resourceLauncherCopiedAccessDescription": "Dostęp do zasobu został skopiowany do schowka.",
     "resourceLauncherViewNamePlaceholder": "Nazwa widoku",

messages/pt-PT.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy solicita por TCP/UDP bruto usando um número de porta. Requer que sites se conectem a um nó remoto.",
     "resourceCreate": "Criar Recurso",
     "resourceCreateDescription": "Siga os passos abaixo para criar um novo recurso",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Configure as configurações gerais do recurso, incluindo o nome e o tipo",
     "resourceSeeAll": "Ver todos os recursos",
     "resourceCreateGeneral": "Gerais",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Interno",
     "emailInvalid": "Endereço de email inválido",
     "inviteValidityDuration": "Por favor, selecione uma duração",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Por favor, selecione uma função",
     "removeOwnAdminRoleConfirmTitle": "Remover seu acesso de administrador?",
     "removeOwnAdminRoleConfirmDescription": "Você não terá mais permissões de administrador nesta organização após salvar. Outro administrador pode restaurar seu acesso, se necessário.",
     "removeOwnAdminRoleConfirmButton": "Remover Meu Acesso de Administrador",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticação de Cabeçalho Básico",
     "policyAuthHeaderAuthDescription": "Valide um nome e valor de cabeçalho HTTP personalizado em cada solicitação",
     "policyAuthHeaderAuthSummary": "Cabeçalho configurado",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nome do Cabeçalho",
+    "policyAuthHeaderValue": "Valor esperado",
     "policyAuthSetPasscode": "Definir Código de Acesso",
     "policyAuthSetPincode": "Definir Código PIN",
     "policyAuthSetEmailWhitelist": "Definir Lista de E-mails Permitidos",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Definir Código PIN do Recurso",
     "actionSetResourceEmailWhitelist": "Definir Lista Permitida de Emails do Recurso",
     "actionGetResourceEmailWhitelist": "Obter Lista Permitida de Emails do Recurso",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Criar Alvo",
     "actionDeleteTarget": "Eliminar Alvo",
     "actionGetTarget": "Obter Alvo",
@@ -1519,30 +1507,6 @@
     "navbar": "Menu de Navegação",
     "navbarDescription": "Menu de navegação principal da aplicação",
     "navbarDocsLink": "Documentação",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Não foi possível ativar 2FA",
     "otpErrorEnableDescription": "Ocorreu um erro ao ativar 2FA",
     "otpSetupCheckCode": "Por favor, insira um código de 6 dígitos",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Gestão",
     "sidebarBillingAndLicenses": "Faturamento e Licenças",
     "sidebarLogsAnalytics": "Análises",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Alertas",
     "alertingDescription": "Defina fontes, gatilhos e ações para notificações",
     "alertingRules": "Regras de alerta",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Domínios",
     "billingOrganizations": "Órgãos",
     "billingRemoteExitNodes": "Nós remotos",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nenhum limite configurado",
     "billingEstimatedPeriod": "Período Estimado de Cobrança",
     "billingIncludedUsage": "Uso Incluído",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Quantos usuários você pode usar",
     "billingDomainInfo": "Quantos domínios você pode usar",
     "billingRemoteExitNodesInfo": "Quantos nós remotos você pode usar",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Chaves de Licença",
     "billingLicenseKeysDescription": "Gerenciar suas subscrições de chave de licença",
     "billingLicenseSubscription": "Assinatura de Licença",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Fechar",
     "createInternalResourceDialogCreateClientResource": "Criar Recurso Privado",
     "createInternalResourceDialogCreateClientResourceDescription": "Criar um novo recurso que só será acessível para clientes conectados à organização",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Propriedades do Recurso",
     "createInternalResourceDialogName": "Nome",
     "createInternalResourceDialogSite": "Site",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Nenhum nó está disponível para esta organização. Crie um nó primeiro para usar sites locais.",
     "exitNode": "Nodo de Saída",
     "country": "País",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Atualmente baseado no IP de origem",
     "region": "Região",
     "selectRegion": "Selecionar região",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Adicionar Usuários",
     "editInternalResourceDialogAddClients": "Adicionar Clientes",
     "editInternalResourceDialogDestinationLabel": "Destino",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Especifique o endereço de destino para o recurso interno. Isso pode ser um nome de host, endereço IP ou intervalo CIDR, dependendo do modo selecionado. Opcionalmente, defina um alias interno de DNS para facilitar a identificação.",
     "internalResourceFormMultiSiteRoutingHelp": "Selecionar múltiplos sites permite roteamento resiliente e failover para alta disponibilidade.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Saiba mais",
     "editInternalResourceDialogPortRestrictionsDescription": "Restrinja o acesso a portas TCP/UDP específicas ou permita/bloqueie todas as portas.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Recurso Desativado",
     "memberPortalShowingResources": "Mostrando {start}-{end} de {total} recursos",
     "resourceLauncherTitle": "Lançador de Recursos",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Veja os detalhes do recurso e lance-os de um só lugar",
+    "resourceLauncherSearchPlaceholder": "Procurar todos os sites...",
     "resourceLauncherDefaultView": "Padrão",
     "resourceLauncherSaveView": "Salvar Visualização",
     "resourceLauncherSaveToCurrentView": "Salvar na Visualização Atual",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Redefinir Visualização",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Salvar como Nova Visualização",
     "resourceLauncherSaveAsNewViewDescription": "Dê um nome a esta visualização para salvar os filtros e layout atuais.",
     "resourceLauncherSaveForEveryone": "Salvar para Todos",
     "resourceLauncherSaveForEveryoneDescription": "Compartilhe esta visualização com todos os membros da organização. Quando desmarcado, a visualização é visível apenas para você.",
     "resourceLauncherMakePersonal": "Tornar Pessoal",
     "resourceLauncherFilter": "Filtro",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Ordenar",
     "resourceLauncherSortAscending": "Ordenar ascendente",
     "resourceLauncherSortDescending": "Ordenar descendente",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Agrupar por",
     "resourceLauncherGroupBySite": "Site",
     "resourceLauncherGroupByLabel": "Marcador",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Layout",
     "resourceLauncherLayoutGrid": "Grade",
     "resourceLauncherLayoutList": "Lista",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Mostrar Etiquetas de Site",
     "resourceLauncherShowRecents": "Mostrar Recents",
     "resourceLauncherDeleteView": "Excluir Visualização",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Visualizar como Administrador",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Veja detalhes deste recurso.",
     "resourceLauncherUnlabeled": "Sem Etiqueta",
     "resourceLauncherNoSite": "Sem Site",
     "resourceLauncherNoResourcesInGroup": "Nenhum recurso neste grupo",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Nenhum Recurso Encontrado",
     "resourceLauncherEmptyStateNoResultsDescription": "Nenhum recurso corresponde à sua busca ou filtros atuais. Experimente ajustá-los para encontrar o que está procurando.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Nenhum recurso corresponde a \"{query}\". Tente ajustar sua busca ou limpar os filtros para ver todos os recursos.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Copiado para a área de transferência",
     "resourceLauncherCopiedAccessDescription": "O acesso ao recurso foi copiado para sua área de transferência.",
     "resourceLauncherViewNamePlaceholder": "Nome da Visualização",

messages/ru-RU.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Прокси запросы через необработанный TCP/UDP с использованием номера порта. Требуется подключение сайтов к удаленному узлу.",
     "resourceCreate": "Создание ресурса",
     "resourceCreateDescription": "Следуйте инструкциям ниже для создания нового ресурса",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Настройте основные параметры ресурса, включая его имя и тип",
     "resourceSeeAll": "Посмотреть все ресурсы",
     "resourceCreateGeneral": "Общие",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Внутренний",
     "emailInvalid": "Неверный адрес Email",
     "inviteValidityDuration": "Пожалуйста, выберите продолжительность",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Пожалуйста, выберите роль",
     "removeOwnAdminRoleConfirmTitle": "Удалить доступ администратора?",
     "removeOwnAdminRoleConfirmDescription": "После сохранения у вас больше не будет прав администратора в этой организации. Другой администратор может восстановить доступ, если это необходимо.",
     "removeOwnAdminRoleConfirmButton": "Удалить мой доступ администратора",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Базовая аутентификация заголовка",
     "policyAuthHeaderAuthDescription": "Проверка пользовательского имени и значения HTTP-заголовка для каждого запроса",
     "policyAuthHeaderAuthSummary": "Заголовок настроен",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Имя заголовка",
+    "policyAuthHeaderValue": "Ожидаемое значение",
     "policyAuthSetPasscode": "Установить пароль",
     "policyAuthSetPincode": "Установить ПИН-код",
     "policyAuthSetEmailWhitelist": "Установить белый список email",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Установить ПИН-код ресурса",
     "actionSetResourceEmailWhitelist": "Настроить белый список ресурсов email",
     "actionGetResourceEmailWhitelist": "Получить белый список ресурсов email",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Создать цель",
     "actionDeleteTarget": "Удалить цель",
     "actionGetTarget": "Получить цель",
@@ -1519,30 +1507,6 @@
     "navbar": "Навигационное меню",
     "navbarDescription": "Главное навигационное меню приложения",
     "navbarDocsLink": "Документация",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "Невозможно включить 2FA",
     "otpErrorEnableDescription": "Произошла ошибка при включении 2FA",
     "otpSetupCheckCode": "Пожалуйста, введите 6-значный код",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Управление",
     "sidebarBillingAndLicenses": "Биллинг и лицензии",
     "sidebarLogsAnalytics": "Статистика",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Оповещения",
     "alertingDescription": "Определите источники, триггеры и действия для уведомлений",
     "alertingRules": "Правила оповещений",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Домены",
     "billingOrganizations": "Орги",
     "billingRemoteExitNodes": "Удаленные узлы",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Лимит не установлен",
     "billingEstimatedPeriod": "Предполагаемый период выставления счетов",
     "billingIncludedUsage": "Включенное использование",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Сколько пользователей вы можете использовать",
     "billingDomainInfo": "Сколько доменов вы можете использовать",
     "billingRemoteExitNodesInfo": "Сколько удаленных узлов вы можете использовать",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Лицензионные ключи",
     "billingLicenseKeysDescription": "Управление подписками на лицензионные ключи",
     "billingLicenseSubscription": "Лицензионное соглашение",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Закрыть",
     "createInternalResourceDialogCreateClientResource": "Создать приватный ресурс",
     "createInternalResourceDialogCreateClientResourceDescription": "Создать новый ресурс, который будет доступен только клиентам, подключенным к организации",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Свойства ресурса",
     "createInternalResourceDialogName": "Имя",
     "createInternalResourceDialogSite": "Сайт",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Для этой организации узлы не доступны. Сначала создайте узел, чтобы использовать локальные сайты.",
     "exitNode": "Узел выхода",
     "country": "Страна",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "В настоящее время основано на исходном IP",
     "region": "Регион",
     "selectRegion": "Выберите регион",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Добавить пользователей",
     "editInternalResourceDialogAddClients": "Добавить клиентов",
     "editInternalResourceDialogDestinationLabel": "Пункт назначения",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Укажите адрес назначения для внутреннего ресурса. Это может быть имя хоста, IP-адрес или диапазон CIDR в зависимости от выбранного режима. При необходимости установите внутренний DNS-алиас для облегчения идентификации.",
     "internalResourceFormMultiSiteRoutingHelp": "Выбор нескольких сайтов позволяет обеспечить отказоустойчивую маршрутизацию и фейловер для высокой доступности.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Узнать больше",
     "editInternalResourceDialogPortRestrictionsDescription": "Ограничьте доступ к определенным TCP/UDP-портам или разрешите/заблокируйте все порты.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Ресурс отключён",
     "memberPortalShowingResources": "Показаны {start}-{end} из {total} ресурсов",
     "resourceLauncherTitle": "Запуск ресурса",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Просмотр деталей ресурса и запуск их из одного места",
+    "resourceLauncherSearchPlaceholder": "Поиск всех сайтов...",
     "resourceLauncherDefaultView": "По умолчанию",
     "resourceLauncherSaveView": "Сохранить вид",
     "resourceLauncherSaveToCurrentView": "Сохранить в текущий вид",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Сбросить вид",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Сохранить как новый вид",
     "resourceLauncherSaveAsNewViewDescription": "Дайте этому виду имя, чтобы сохранить текущие фильтры и макет.",
     "resourceLauncherSaveForEveryone": "Сохранить для всех",
     "resourceLauncherSaveForEveryoneDescription": "Поделитесь этим видом со всеми членами организации. Если не отмечено, видимость только для вас.",
     "resourceLauncherMakePersonal": "Сделать личным",
     "resourceLauncherFilter": "Фильтр",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Сортировать",
     "resourceLauncherSortAscending": "Сортировать по возрастанию",
     "resourceLauncherSortDescending": "Сортировать по убыванию",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Группировать по",
     "resourceLauncherGroupBySite": "Сайт",
     "resourceLauncherGroupByLabel": "Метка",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Макет",
     "resourceLauncherLayoutGrid": "Сетка",
     "resourceLauncherLayoutList": "Список",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Показать теги сайта",
     "resourceLauncherShowRecents": "Показать недавно",
     "resourceLauncherDeleteView": "Удалить вид",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Просмотр как администратор",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Просмотр деталей этого ресурса.",
     "resourceLauncherUnlabeled": "Без меток",
     "resourceLauncherNoSite": "Без сайта",
     "resourceLauncherNoResourcesInGroup": "Нет ресурсов в данной группе",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Ресурсы не найдены",
     "resourceLauncherEmptyStateNoResultsDescription": "Ни один ресурс не соответствует вашему текущему поисковому запросу или фильтрам. Попробуйте их изменить, чтобы найти нужное.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "Ни один ресурс не соответствует \"{query}\". Попробуйте изменить параметры поиска или очистить фильтры, чтобы увидеть все ресурсы.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Скопировано в буфер обмена",
     "resourceLauncherCopiedAccessDescription": "Доступ к ресурсу был скопирован в ваш буфер обмена.",
     "resourceLauncherViewNamePlaceholder": "Имя вида",

messages/tr-TR.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "Proxy isteklerini bir port numarası kullanarak ham TCP/UDP üzerinden yapın. Sitelerin uzak bir düğüme bağlanması gereklidir.",
     "resourceCreate": "Kaynak Oluştur",
     "resourceCreateDescription": "Yeni bir kaynak oluşturmak için aşağıdaki adımları izleyin",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "Adı ve türü dahil temel kaynak ayarlarını yapılandırın",
     "resourceSeeAll": "Tüm Kaynakları Gör",
     "resourceCreateGeneral": "Genel",
@@ -615,8 +613,7 @@
     "idpNameInternal": "Dahili",
     "emailInvalid": "Geçersiz e-posta adresi",
     "inviteValidityDuration": "Lütfen bir süre seçin",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "Lütfen bir rol seçin",
     "removeOwnAdminRoleConfirmTitle": "Yönetici erişiminizi kaldırmak istiyor musunuz?",
     "removeOwnAdminRoleConfirmDescription": "Kaydettikten sonra, bu organizasyonda artık yönetici izinleriniz olmayacak. Gerekirse başka bir yönetici erişimi geri yükleyebilir.",
     "removeOwnAdminRoleConfirmButton": "Yönetici Erişimi Kaldır",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Temel Başlık Kimlik Doğrulama",
     "policyAuthHeaderAuthDescription": "Her istekte özel bir HTTP başlık adını ve değerini doğrulayın",
     "policyAuthHeaderAuthSummary": "Başlık yapılandırıldı",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Başlık adı",
+    "policyAuthHeaderValue": "Beklenen değer",
     "policyAuthSetPasscode": "Şifreyi Ayarla",
     "policyAuthSetPincode": "PIN Kodunu Ayarla",
     "policyAuthSetEmailWhitelist": "E-posta Beyaz Listesini Ayarla",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "Kaynak PIN Kodunu Ayarla",
     "actionSetResourceEmailWhitelist": "Kaynak E-posta Beyaz Listesi Ayarla",
     "actionGetResourceEmailWhitelist": "Kaynak E-posta Beyaz Listesini Al",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "Hedef Oluştur",
     "actionDeleteTarget": "Hedefi Sil",
     "actionGetTarget": "Hedefi Al",
@@ -1519,30 +1507,6 @@
     "navbar": "Navigasyon Menüsü",
     "navbarDescription": "Uygulamanın ana navigasyon menüsü",
     "navbarDocsLink": "Dokümantasyon",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "2FA etkinleştirilemedi",
     "otpErrorEnableDescription": "2FA etkinleştirilirken bir hata oluştu",
     "otpSetupCheckCode": "6 haneli bir kod girin",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "Yönetim",
     "sidebarBillingAndLicenses": "Faturalandırma & Lisanslar",
     "sidebarLogsAnalytics": "Analitik",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "Uyarı",
     "alertingDescription": "Bildirimler için kaynakları, tetikleyicileri ve eylemleri tanımlayın",
     "alertingRules": "Uyarı kuralları",
@@ -1990,9 +1915,6 @@
     "billingDomains": "Alan Adları",
     "billingOrganizations": "Organizasyonlar",
     "billingRemoteExitNodes": "Uzak Düğümler",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Hiçbir limit yapılandırılmadı",
     "billingEstimatedPeriod": "Tahmini Fatura Dönemi",
     "billingIncludedUsage": "Dahil Kullanım",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "Kaç tane kullanıcı kullanabileceğiniz",
     "billingDomainInfo": "Kaç tane alan adı kullanabileceğiniz",
     "billingRemoteExitNodesInfo": "Kaç tane uzaktan düğüm kullanabileceğiniz",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lisans Anahtarları",
     "billingLicenseKeysDescription": "Lisans anahtarı aboneliklerinizi yönetin",
     "billingLicenseSubscription": "Lisans Aboneliği",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "Kapat",
     "createInternalResourceDialogCreateClientResource": "Özel Kaynak Oluştur",
     "createInternalResourceDialogCreateClientResourceDescription": "Seçilen siteye bağlı istemcilere erişilebilir olacak yeni bir kaynak oluşturun",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "Kaynak Özellikleri",
     "createInternalResourceDialogName": "Ad",
     "createInternalResourceDialogSite": "Site",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "Bu organizasyon için düğüm mevcut değil. Yerel siteleri kullanmak için önce bir düğüm oluşturun.",
     "exitNode": "Çıkış Düğümü",
     "country": "Ülke",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "Şu anda kaynak IP'ye dayanarak",
     "region": "Bölge",
     "selectRegion": "Bölgeyi seçin",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "Kullanıcılar Ekle",
     "editInternalResourceDialogAddClients": "Müşteriler Ekle",
     "editInternalResourceDialogDestinationLabel": "Hedef",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "Dahili kaynak için hedef adresi belirtin. Seçilen moda bağlı olarak bu bir ana bilgisayar adı, IP adresi veya CIDR aralığı olabilir. Daha kolay tanımlama için isteğe bağlı olarak dahili bir DNS takma adı ayarlayın.",
     "internalResourceFormMultiSiteRoutingHelp": "Birden fazla site seçmek, yüksek kullanılabilirlik için dirençli yönlendirme ve yedeklik sağlar.",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "Daha fazla bilgi",
     "editInternalResourceDialogPortRestrictionsDescription": "Belirtilen TCP/UDP portlarına erişimi kısıtlayın veya tüm portlara izin/engelleme verin.",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "Kaynak Devre Dışı",
     "memberPortalShowingResources": "{total} kaynaktan {start}-{end} gösteriliyor",
     "resourceLauncherTitle": "Kaynak Başlatıcı",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "Kaynağın detaylarını görüntüleyin ve tek bir yerden başlatın",
+    "resourceLauncherSearchPlaceholder": "Tüm siteleri ara...",
     "resourceLauncherDefaultView": "Varsayılan",
     "resourceLauncherSaveView": "Görünümü Kaydet",
     "resourceLauncherSaveToCurrentView": "Mevcut Görünüme Kaydet",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "Görünümü Sıfırla",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "Yeni Görünüm Olarak Kaydet",
     "resourceLauncherSaveAsNewViewDescription": "Geçerli filtrelerinizi ve düzeninizi kaydetmek için bu görünüme bir ad verin.",
     "resourceLauncherSaveForEveryone": "Herkes İçin Kaydet",
     "resourceLauncherSaveForEveryoneDescription": "Bu görünümü tüm kuruluş üyeleriyle paylaşın. İşaretli değilse, görünüm yalnızca size görünür olur.",
     "resourceLauncherMakePersonal": "Kişisel Yap",
     "resourceLauncherFilter": "Filtre",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "Sıralama",
     "resourceLauncherSortAscending": "Artan sırala",
     "resourceLauncherSortDescending": "Azalan sırala",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "Grupla",
     "resourceLauncherGroupBySite": "Site",
     "resourceLauncherGroupByLabel": "Etiket",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "Düzen",
     "resourceLauncherLayoutGrid": "Izgara",
     "resourceLauncherLayoutList": "Liste",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "Site Etiketlerini Göster",
     "resourceLauncherShowRecents": "Son Eklenenleri Göster",
     "resourceLauncherDeleteView": "Görünümü Sil",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "Yönetici Olarak Görüntüle",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "Bu kaynağın detaylarını görüntüleyin.",
     "resourceLauncherUnlabeled": "Etiketsiz",
     "resourceLauncherNoSite": "Site Yok",
     "resourceLauncherNoResourcesInGroup": "Bu grupta kaynak yok",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "Kaynak Bulunamadı",
     "resourceLauncherEmptyStateNoResultsDescription": "Mevcut arama veya filtrelerinizle eşleşen kaynak yok. Aradığınızı bulmak için ayarları değiştirmeyi deneyin.",
     "resourceLauncherEmptyStateNoResultsWithQuery": "\"{query}\" ile eşleşen kaynak yok. Tüm kaynakları görmek için aramayı düzenlemeyi veya filtreleri temizlemeyi deneyin.",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "Panoya kopyalandı",
     "resourceLauncherCopiedAccessDescription": "Kaynağa erişim panonuza kopyalandı.",
     "resourceLauncherViewNamePlaceholder": "Görünüm adı",

messages/zh-CN.json

@@ -266,8 +266,6 @@
     "resourceRawDescriptionCloud": "正在使用端口号使用 TCP/UDP 代理请求。需要站点连接到远程节点。",
     "resourceCreate": "创建资源",
     "resourceCreateDescription": "按照下面的步骤创建新资源",
-    "resourcePublicCreate": "Create Public Resource",
-    "resourcePublicCreateDescription": "Follow the steps below to create a new public resource that is accessible through a web browser",
     "resourceCreateGeneralDescription": "配置基本资源设置，包括名称和类型",
     "resourceSeeAll": "查看所有资源",
     "resourceCreateGeneral": "概览",
@@ -615,8 +613,7 @@
     "idpNameInternal": "内部设置",
     "emailInvalid": "无效的电子邮件地址",
     "inviteValidityDuration": "请选择持续时间",
-    "accessRoleSelectPlease": "A user must belong to at least one role.",
-    "accessRoleRequired": "Role required",
+    "accessRoleSelectPlease": "请选择一个角色",
     "removeOwnAdminRoleConfirmTitle": "移除你的管理员权限？",
     "removeOwnAdminRoleConfirmDescription": "保存后，你将不再拥有该组织的管理员权限。如果需要，其他管理员可以恢复访问。",
     "removeOwnAdminRoleConfirmButton": "移除我的管理员访问权限",
@@ -867,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "基础标题认证",
     "policyAuthHeaderAuthDescription": "在每次请求上验证自定义 HTTP 标头名称和值",
     "policyAuthHeaderAuthSummary": "标头已配置",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "标头名称",
+    "policyAuthHeaderValue": "预期值",
     "policyAuthSetPasscode": "设定密码",
     "policyAuthSetPincode": "设置 PIN 码",
     "policyAuthSetEmailWhitelist": "设置电子邮件白名单",
@@ -1434,15 +1431,6 @@
     "actionSetResourcePincode": "设置资源粉码",
     "actionSetResourceEmailWhitelist": "设置资源电子邮件白名单",
     "actionGetResourceEmailWhitelist": "获取资源电子邮件白名单",
-    "actionGetResourcePolicy": "Get Resource Policy",
-    "actionUpdateResourcePolicy": "Update Resource Policy",
-    "actionSetResourcePolicyUsers": "Set Resource Policy Users",
-    "actionSetResourcePolicyRoles": "Set Resource Policy Roles",
-    "actionSetResourcePolicyPassword": "Set Resource Policy Password",
-    "actionSetResourcePolicyPincode": "Set Resource Policy Pincode",
-    "actionSetResourcePolicyHeaderAuth": "Set Resource Policy Header Authentication",
-    "actionSetResourcePolicyWhitelist": "Set Resource Policy Email Whitelist",
-    "actionSetResourcePolicyRules": "Set Resource Policy Rules",
     "actionCreateTarget": "创建目标",
     "actionDeleteTarget": "删除目标",
     "actionGetTarget": "获取目标",
@@ -1519,30 +1507,6 @@
     "navbar": "导航菜单",
     "navbarDescription": "应用程序的主导航菜单",
     "navbarDocsLink": "文件",
-    "commandPaletteTitle": "Command Palette",
-    "commandPaletteDescription": "Search for pages, organizations, resources, and actions",
-    "commandPaletteSearchPlaceholder": "Search pages, resources, actions...",
-    "commandPaletteNoResults": "No results found.",
-    "commandPaletteSearching": "Searching...",
-    "commandPaletteNavigation": "Navigation",
-    "commandPaletteOrganizations": "Organizations",
-    "commandPaletteSites": "Sites",
-    "commandPaletteResources": "Resources",
-    "commandPaletteUsers": "Users",
-    "commandPaletteClients": "Machine Clients",
-    "commandPaletteActions": "Actions",
-    "commandPaletteCreateSite": "Create Site",
-    "commandPaletteCreateProxyResource": "Create Public Resource",
-    "commandPaletteCreatePrivateResource": "Create Private Resource",
-    "commandPaletteCreateUser": "Create User",
-    "commandPaletteCreateApiKey": "Create API Key",
-    "commandPaletteCreateMachineClient": "Create Machine Client",
-    "commandPaletteCreateAlertRule": "Create Alert Rule",
-    "commandPaletteCreateIdentityProvider": "Create Identity Provider",
-    "commandPaletteToggleTheme": "Toggle Theme",
-    "commandPaletteChooseOrganization": "Choose Organization",
-    "commandPaletteShortcutMac": "⌘K",
-    "commandPaletteShortcutWindows": "Ctrl K",
     "otpErrorEnable": "无法启用 2FA",
     "otpErrorEnableDescription": "启用 2FA 时出错",
     "otpSetupCheckCode": "请输入您的6位数字代码",
@@ -1620,45 +1584,6 @@
     "sidebarManagement": "管理",
     "sidebarBillingAndLicenses": "帐单和许可证",
     "sidebarLogsAnalytics": "分析",
-    "commandSites": "Sites",
-    "commandActionModeInfo": "Type \">\" To Open Action Mode",
-    "commandResources": "Resources",
-    "commandProxyResources": "Public Resources",
-    "commandClientResources": "Private Resources",
-    "commandClients": "Clients",
-    "commandUserDevices": "User Devices",
-    "commandMachineClients": "Machine Clients",
-    "commandDomains": "Domains",
-    "commandRemoteExitNodes": "Remote Nodes",
-    "commandTeam": "Team",
-    "commandUsers": "Users",
-    "commandRoles": "Roles",
-    "commandInvitations": "Invitations",
-    "commandPolicies": "Shared Policies",
-    "commandResourcePolicies": "Public Resources Policies",
-    "commandIdentityProviders": "Identity Providers",
-    "commandApprovals": "Approval Requests",
-    "commandShareableLinks": "Shareable Links",
-    "commandOrganization": "Organization",
-    "commandLogsAndAnalytics": "Logs & Analytics",
-    "commandLogsAnalytics": "Analytics",
-    "commandLogsRequest": "HTTP Request Logs",
-    "commandLogsAccess": "Authentication Logs",
-    "commandLogsAction": "Admin Action Logs",
-    "commandLogsConnection": "Network Logs",
-    "commandLogsStreaming": "Event Streaming",
-    "commandManagement": "Management",
-    "commandAlerting": "Alerting",
-    "commandProvisioning": "Provisioning",
-    "commandBluePrints": "Blueprints",
-    "commandApiKeys": "API Keys",
-    "commandBillingAndLicenses": "Billing & Licenses",
-    "commandBilling": "Billing",
-    "commandEnterpriseLicenses": "Licenses",
-    "commandSettings": "Settings",
-    "commandLauncher": "Launcher",
-    "commandResourceLauncher": "Resource Launcher",
-    "commandSearchResults": "Search Results",
     "alertingTitle": "告警",
     "alertingDescription": "定义通知的来源、触发器和操作",
     "alertingRules": "告警规则",
@@ -1990,9 +1915,6 @@
     "billingDomains": "域",
     "billingOrganizations": "球队",
     "billingRemoteExitNodes": "远程节点",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "未配置限制",
     "billingEstimatedPeriod": "估计结算周期",
     "billingIncludedUsage": "包含的使用量",
@@ -2021,9 +1943,6 @@
     "billingUsersInfo": "您可以使用多少用户",
     "billingDomainInfo": "您可以使用多少域",
     "billingRemoteExitNodesInfo": "您可以使用多少远程节点",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "许可证密钥",
     "billingLicenseKeysDescription": "管理您的许可证密钥订阅",
     "billingLicenseSubscription": "许可订阅",
@@ -2392,12 +2311,6 @@
     "createInternalResourceDialogClose": "关闭",
     "createInternalResourceDialogCreateClientResource": "创建私有资源",
     "createInternalResourceDialogCreateClientResourceDescription": "创建一个新资源只能为连接到组织的客户端访问",
-    "privateResourceCreatePageSeeAll": "See All Private Resources",
-    "privateResourceAllowIcmpPing": "Allow ICMP Ping",
-    "privateResourceNetworkAccess": "Network Access",
-    "privateResourceNetworkAccessDescription": "Control TCP/UDP port access and whether ICMP ping is allowed for this resource.",
-    "hostSettings": "Host Settings",
-    "cidrSettings": "CIDR Settings",
     "createInternalResourceDialogResourceProperties": "资源属性",
     "createInternalResourceDialogName": "名称",
     "createInternalResourceDialogSite": "站点",
@@ -2546,7 +2459,6 @@
     "noRemoteExitNodesAvailableDescription": "此组织没有可用的节点。首先创建一个节点来使用本地站点。",
     "exitNode": "出口节点",
     "country": "国家",
-    "countryIsNot": "Country Is Not",
     "rulesMatchCountry": "当前基于源 IP",
     "region": "地区",
     "selectRegion": "选择区域",
@@ -3265,7 +3177,7 @@
     "editInternalResourceDialogAddUsers": "添加用户",
     "editInternalResourceDialogAddClients": "添加客户端",
     "editInternalResourceDialogDestinationLabel": "目标",
-    "editInternalResourceDialogDestinationDescription": "Choose where this resource runs and how clients reach it",
+    "editInternalResourceDialogDestinationDescription": "指定内部资源的目标地址。根据选择的模式，这可以是主机名、IP地址或CIDR范围。可选的，设置一个内部DNS别名以便于识别。",
     "internalResourceFormMultiSiteRoutingHelp": "选择多个站点可以实现高可用性的弹性路由和故障转移。",
     "internalResourceFormMultiSiteRoutingHelpLearnMore": "了解更多",
     "editInternalResourceDialogPortRestrictionsDescription": "限制访问特定的TCP/UDP端口或允许/阻止所有端口。",
@@ -3659,24 +3571,18 @@
     "memberPortalResourceDisabled": "资源已禁用",
     "memberPortalShowingResources": "显示 {start}-{end} 共 {total} 个资源",
     "resourceLauncherTitle": "资源启动器",
-    "resourceSidebarLauncherTitle": "Launcher",
-    "resourceLauncherDescription": "View all available resources and launch them from one central hub",
-    "resourceLauncherSearchPlaceholder": "Search your resources...",
+    "resourceLauncherDescription": "查看资源详情并从一个地方启动它们",
+    "resourceLauncherSearchPlaceholder": "搜索所有站点……",
     "resourceLauncherDefaultView": "默认",
     "resourceLauncherSaveView": "保存视图",
     "resourceLauncherSaveToCurrentView": "保存至当前视图",
-    "resourceLauncherSaveDefaultPersonal": "Save for Me",
     "resourceLauncherResetView": "重置视图",
-    "resourceLauncherResetSystemDefault": "Reset to System Default",
-    "resourceLauncherSystemDefaultRestored": "System default restored",
-    "resourceLauncherSystemDefaultRestoredDescription": "The default view has been reset to the original settings.",
     "resourceLauncherSaveAsNewView": "另存为新视图",
     "resourceLauncherSaveAsNewViewDescription": "为此视图命名，以便保存您当前的过滤器和布局。",
     "resourceLauncherSaveForEveryone": "为所有人保存",
     "resourceLauncherSaveForEveryoneDescription": "与所有组织成员共享此视图。如果未选中，此视图仅对您可见。",
     "resourceLauncherMakePersonal": "创建个人",
     "resourceLauncherFilter": "筛选",
-    "resourceLauncherFilterWithCount": "Filter, {count} applied",
     "resourceLauncherSort": "排序",
     "resourceLauncherSortAscending": "按升序排序",
     "resourceLauncherSortDescending": "按降序排序",
@@ -3684,7 +3590,6 @@
     "resourceLauncherGroupBy": "按组",
     "resourceLauncherGroupBySite": "站点",
     "resourceLauncherGroupByLabel": "标签",
-    "resourceLauncherGroupByNone": "None",
     "resourceLauncherLayout": "布局",
     "resourceLauncherLayoutGrid": "网格",
     "resourceLauncherLayoutList": "列表",
@@ -3692,20 +3597,8 @@
     "resourceLauncherShowSiteTags": "显示站点标签",
     "resourceLauncherShowRecents": "显示最近使用",
     "resourceLauncherDeleteView": "删除视图",
-    "resourceLauncherDeleteViewTitle": "Delete View",
-    "resourceLauncherDeleteViewQuestion": "Are you sure you want to delete this launcher view?",
-    "resourceLauncherDeleteViewConfirm": "Delete View",
     "resourceLauncherViewAsAdmin": "以管理员身份查看",
-    "resourceLauncherResourceDetailsDescription": "Connection information and status for this resource.",
-    "resourceLauncherResourceDetails": "Resource Details",
-    "resourceLauncherAuthMethodsDescription": "Authentication methods enabled for this resource.",
-    "resourceLauncherPrivateClientRequired": "Connect with a client on your device to access this resource privately.",
-    "resourceLauncherPrivateClientRequiredTitle": "Client Connection Required",
-    "resourceLauncherDownloadClient": "Download client",
-    "resourceLauncherFailedToLoadDetails": "Could not load resource details. You may no longer have access to this resource.",
-    "resourceLauncherNoPortRestrictions": "No port restrictions",
-    "resourceLauncherTcp": "TCP",
-    "resourceLauncherUdp": "UDP",
+    "resourceLauncherResourceDetailsDescription": "查看此资源的详细信息。",
     "resourceLauncherUnlabeled": "未标记",
     "resourceLauncherNoSite": "无站点",
     "resourceLauncherNoResourcesInGroup": "此组中没有资源",
@@ -3714,12 +3607,6 @@
     "resourceLauncherEmptyStateNoResultsTitle": "未找到资源",
     "resourceLauncherEmptyStateNoResultsDescription": "没有资源与您当前的搜索或过滤器匹配。尝试调整它们以找到您想要的内容。",
     "resourceLauncherEmptyStateNoResultsWithQuery": "没有资源匹配\"{query}\"。尝试调整您的搜索或清除过滤器以查看所有资源。",
-    "resourceLauncherSearchFirstTitle": "Search or Filter to Browse",
-    "resourceLauncherSearchFirstDescription": "You have access to many resources. Use search or filter by site or label to find what you need.",
-    "resourceLauncherSiteGroupingDisabled": "Site grouping is unavailable at this scale. Filter by site to group a smaller set.",
-    "resourceLauncherLabelGroupingDisabled": "Label grouping is unavailable at this scale.",
-    "resourceLauncherCompactModeHint": "Showing a simplified list for faster browsing. Use search or filters to narrow results.",
-    "resourceLauncherCompactGroupingHint": "Apply site or label filters to enable grouping.",
     "resourceLauncherCopiedToClipboard": "已复制到剪贴板",
     "resourceLauncherCopiedAccessDescription": "资源访问权限已复制到剪贴板。",
     "resourceLauncherViewNamePlaceholder": "查看名称",

server/db/pg/poolConfig.ts

@@ -1,3 +1,4 @@
+import config from "@server/lib/config";
 import { Pool, PoolConfig } from "pg";
 
 export function createPoolConfig(
@@ -39,6 +40,28 @@ export function attachPoolErrorHandlers(pool: Pool, label: string): void {
                 `Failed to set statement_timeout on ${label} client: ${err.message}`
             );
         });
+
+        // Disable JIT compilation for this connection. Our hot-path queries
+        // (e.g. resource-by-domain lookups) join many tables but only ever
+        // return a handful of rows. When planner row estimates drift (e.g.
+        // due to autovacuum lag under write-heavy load), Postgres decides
+        // these plans are expensive enough to JIT-compile, which can add
+        // multiple seconds of pure compilation overhead per query and
+        // saturate the connection pool. JIT never pays off for these
+        // short-lived OLTP queries, so it's disabled outright rather than
+        // relying on statistics staying fresh.
+        //
+        // Set via a runtime SET command rather than the `options: "-c
+        // jit=off"` startup parameter: connections in SaaS mode go through
+        // a pooler (e.g. PgBouncer) that rejects arbitrary startup packet
+        // options with a protocol_violation (08P01) error.
+        if (config.getRawConfig().postgres?.pool.jit_mode == false) {
+            client.query("SET jit = off").catch((err: Error) => {
+                console.warn(
+                    `Failed to set jit=off on ${label} client: ${err.message}`
+                );
+            });
+        }
     });
 }
 

server/db/pg/schema/schema.ts

@@ -232,6 +232,7 @@ export const launcherViews = pgTable("launcherViews", {
     }),
     name: varchar("name").notNull(),
     config: text("config").notNull(),
+    isDefault: boolean("isDefault").notNull().default(false),
     createdAt: varchar("createdAt").notNull(),
     updatedAt: varchar("updatedAt").notNull()
 });

server/db/sqlite/schema/schema.ts

@@ -233,6 +233,9 @@ export const launcherViews = sqliteTable("launcherViews", {
     }),
     name: text("name").notNull(),
     config: text("config").notNull(),
+    isDefault: integer("isDefault", { mode: "boolean" })
+        .notNull()
+        .default(false),
     createdAt: text("createdAt").notNull(),
     updatedAt: text("updatedAt").notNull()
 });

server/lib/billing/features.ts

@@ -27,6 +27,12 @@ export async function getFeatureDisplayName(
             return "Remote Exit Nodes";
         case LimitId.ORGANIZATIONS:
             return "Organizations";
+        case LimitId.PUBLIC_RESOURCES:
+            return "Public Resources";
+        case LimitId.PRIVATE_RESOURCES:
+            return "Private Resources";
+        case LimitId.MACHINE_CLIENTS:
+            return "Machine Clients";
         case LimitId.TIER1:
             return "Home Lab";
         default:

server/lib/billing/tierMatrix.ts

@@ -23,7 +23,6 @@ export enum TierFeature {
     StandaloneHealthChecks = "standaloneHealthChecks",
     AlertingRules = "alertingRules",
     WildcardSubdomain = "wildcardSubdomain",
-    Labels = "labels",
     NewtAutoUpdate = "newtAutoUpdate",
     ResourcePolicies = "resourcePolicies",
     AdvancedPublicResources = "advancedPublicResources",
@@ -31,7 +30,6 @@ export enum TierFeature {
 }
 
 export const tierMatrix: Record<TierFeature, Tier[]> = {
-    [TierFeature.Labels]: ["tier1", "tier2", "tier3", "enterprise"],
     [TierFeature.OrgOidc]: ["tier1", "tier2", "tier3", "enterprise"],
     [TierFeature.LoginPageDomain]: ["tier1", "tier2", "tier3", "enterprise"],
     [TierFeature.DeviceApprovals]: ["tier1", "tier3", "enterprise"],

server/lib/blueprints/applyNewtDockerBlueprint.ts

@@ -116,7 +116,7 @@ export async function applyNewtDockerBlueprint(
             source: "NEWT"
         });
     } catch (error) {
-        logger.error(`Failed to update database from config: ${error}`);
+        logger.debug(`Failed to update database from config: ${error}`);
         await sendToClient(newtId, {
             type: "newt/blueprint/results",
             data: {

server/lib/consts.ts

@@ -2,7 +2,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 // This is a placeholder value replaced by the build process
-export const APP_VERSION = "1.19.0";
+export const APP_VERSION = "1.20.0";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);

server/lib/dbRetry.ts

@@ -0,0 +1,83 @@
+import logger from "@server/logger";
+
+const MAX_RETRIES = 5;
+const BASE_DELAY_MS = 50;
+
+/**
+ * Detect transient errors that are safe to retry (connection drops, deadlocks,
+ * serialization failures). PostgreSQL deadlocks (40P01) are always safe to
+ * retry: the database guarantees exactly one winner per deadlock pair, so the
+ * loser just needs to try again.
+ */
+export function isTransientError(error: any): boolean {
+    if (!error) return false;
+
+    const message = (error.message || "").toLowerCase();
+    const causeMessage = (error.cause?.message || "").toLowerCase();
+    const code = error.code || error.cause?.code || "";
+
+    // Connection timeout / terminated
+    if (
+        message.includes("connection timeout") ||
+        message.includes("connection terminated") ||
+        message.includes("timeout exceeded when trying to connect") ||
+        causeMessage.includes("connection terminated unexpectedly") ||
+        causeMessage.includes("connection timeout")
+    ) {
+        return true;
+    }
+
+    // PostgreSQL deadlock detected - always safe to retry (one winner guaranteed)
+    if (code === "40P01" || message.includes("deadlock")) {
+        return true;
+    }
+
+    // PostgreSQL serialization failure
+    if (code === "40001") {
+        return true;
+    }
+
+    // ECONNRESET, ECONNREFUSED, EPIPE, ETIMEDOUT
+    if (
+        code === "ECONNRESET" ||
+        code === "ECONNREFUSED" ||
+        code === "EPIPE" ||
+        code === "ETIMEDOUT"
+    ) {
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Simple retry wrapper with exponential backoff for transient errors
+ * (deadlocks, connection timeouts, unexpected disconnects).
+ */
+export async function withRetry<T>(
+    operation: () => Promise<T>,
+    context: string,
+    maxRetries: number = MAX_RETRIES,
+    baseDelayMs: number = BASE_DELAY_MS
+): Promise<T> {
+    let attempt = 0;
+    while (true) {
+        try {
+            return await operation();
+        } catch (error: any) {
+            if (isTransientError(error) && attempt < maxRetries) {
+                attempt++;
+                const baseDelay = Math.pow(2, attempt - 1) * baseDelayMs;
+                const jitter = Math.random() * baseDelay;
+                const delay = baseDelay + jitter;
+                logger.warn(
+                    `Transient DB error in ${context}, retrying attempt ${attempt}/${maxRetries} after ${delay.toFixed(0)}ms`,
+                    { code: error?.code ?? error?.cause?.code }
+                );
+                await new Promise((resolve) => setTimeout(resolve, delay));
+                continue;
+            }
+            throw error;
+        }
+    }
+}

server/lib/exitNodes/subnet.ts

@@ -1,30 +1,55 @@
-import { db, exitNodes } from "@server/db";
+import { db, exitNodes, Transaction } from "@server/db";
 import config from "@server/lib/config";
 import { findNextAvailableCidr } from "@server/lib/ip";
+import { lockManager } from "#dynamic/lib/lock";
 
-export async function getNextAvailableSubnet(): Promise<string> {
-    // Get all existing subnets from routes table
-    const existingAddresses = await db
-        .select({
-            address: exitNodes.address
-        })
-        .from(exitNodes);
-
-    const addresses = existingAddresses.map((a) => a.address);
-    let subnet = findNextAvailableCidr(
-        addresses,
-        config.getRawConfig().gerbil.block_size,
-        config.getRawConfig().gerbil.subnet_group
-    );
-    if (!subnet) {
-        throw new Error("No available subnets remaining in space");
+/**
+ * Reserves the next available exit node subnet.
+ *
+ * Exit node subnets must never overlap with one another - regardless of
+ * which org(s) they belong to - since HA exit nodes can end up routing for
+ * the same org. This acquires a lock that the caller MUST release (via the
+ * returned `release`) only after the chosen address has been durably
+ * persisted (e.g. after the enclosing transaction commits), otherwise
+ * concurrent callers can race and pick the same subnet.
+ */
+export async function getNextAvailableSubnet(
+    trx: Transaction | typeof db = db
+): Promise<{ value: string; release: () => Promise<void> }> {
+    const lockKey = "exit-node-subnet-allocation";
+    const acquired = await lockManager.acquireLockWithRetry(lockKey, 6000);
+    if (!acquired) {
+        throw new Error(`Failed to acquire lock: ${lockKey}`);
     }
+    const release = () => lockManager.releaseLock(lockKey, acquired);
 
-    // replace the last octet with 1
-    subnet =
-        subnet.split(".").slice(0, 3).join(".") +
-        ".1" +
-        "/" +
-        subnet.split("/")[1];
-    return subnet;
+    try {
+        // Get all existing subnets from routes table
+        const existingAddresses = await trx
+            .select({
+                address: exitNodes.address
+            })
+            .from(exitNodes);
+
+        const addresses = existingAddresses.map((a) => a.address);
+        let subnet = findNextAvailableCidr(
+            addresses,
+            config.getRawConfig().gerbil.block_size,
+            config.getRawConfig().gerbil.subnet_group
+        );
+        if (!subnet) {
+            throw new Error("No available subnets remaining in space");
+        }
+
+        // replace the last octet with 1
+        subnet =
+            subnet.split(".").slice(0, 3).join(".") +
+            ".1" +
+            "/" +
+            subnet.split("/")[1];
+        return { value: subnet, release };
+    } catch (e) {
+        await release();
+        throw e;
+    }
 }

server/lib/readConfigFile.ts

@@ -184,7 +184,8 @@ export const configSchema = z
                             .number()
                             .positive()
                             .optional()
-                            .default(5000)
+                            .default(5000),
+                        jit_mode: z.boolean().default(true)
                     })
                     .optional()
                     .prefault({})

server/lib/rebuildClientAssociations.ts

@@ -45,6 +45,7 @@ import {
 } from "@server/routers/client/targets";
 import { lockManager } from "#dynamic/lib/lock";
 import { rebuildQueue } from "#dynamic/lib/rebuildQueue";
+import { withRetry, isTransientError } from "@server/lib/dbRetry";
 import {
     checkOrgRebuildRateLimit,
     decrementOrgRebuildCount,
@@ -285,10 +286,20 @@ export async function rebuildClientAssociationsFromSiteResource(
 ) {
     await incrementOrgRebuildCount(siteResource.orgId);
     try {
-        return await lockManager.withLock(
-            `rebuild-client-associations:site-resource:${siteResource.siteResourceId}`,
-            () => rebuildClientAssociationsFromSiteResourceImpl(siteResource),
-            REBUILD_ASSOCIATIONS_LOCK_TTL_MS
+        // The whole locked rebuild is idempotent (it diffs full expected vs.
+        // actual state each time), so on a transient DB error it's safe to
+        // retry the entire thing rather than just the failed query.
+        return await withRetry(
+            () =>
+                lockManager.withLock(
+                    `rebuild-client-associations:site-resource:${siteResource.siteResourceId}`,
+                    () =>
+                        rebuildClientAssociationsFromSiteResourceImpl(
+                            siteResource
+                        ),
+                    REBUILD_ASSOCIATIONS_LOCK_TTL_MS
+                ),
+            `rebuildClientAssociationsFromSiteResource:${siteResource.siteResourceId}`
         );
     } catch (err: any) {
         if (
@@ -304,6 +315,17 @@ export async function rebuildClientAssociationsFromSiteResource(
             });
             return { mergedAllClients: [] };
         }
+        if (isTransientError(err)) {
+            logger.warn(
+                `rebuildClientAssociations: transient DB error rebuilding site resource ${siteResource.siteResourceId} persisted after retries, queuing for deferred processing:`,
+                err
+            );
+            await rebuildQueue.enqueue({
+                type: "site-resource",
+                id: siteResource.siteResourceId
+            });
+            return { mergedAllClients: [] };
+        }
         throw err;
     } finally {
         await decrementOrgRebuildCount(siteResource.orgId);
@@ -463,6 +485,7 @@ async function rebuildClientAssociationsFromSiteResourceImpl(
         await trx
             .insert(clientSiteResourcesAssociationsCache)
             .values(clientSiteResourcesToInsert)
+            .onConflictDoNothing()
             .returning();
         logger.debug(
             `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteResourceId=${siteResource.siteResourceId} inserted clientSiteResource associations`
@@ -510,121 +533,148 @@ async function rebuildClientAssociationsFromSiteResourceImpl(
     for (const site of sitesToProcess) {
         const siteId = site.siteId;
 
-        logger.debug(
-            `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] processing siteId=${siteId} for siteResourceId=${siteResource.siteResourceId}`
-        );
+        try {
+            logger.debug(
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] processing siteId=${siteId} for siteResourceId=${siteResource.siteResourceId}`
+            );
 
-        const existingClientSites = await trx
-            .select({
-                clientId: clientSitesAssociationsCache.clientId
-            })
-            .from(clientSitesAssociationsCache)
-            .where(eq(clientSitesAssociationsCache.siteId, siteId));
+            const existingClientSites = await trx
+                .select({
+                    clientId: clientSitesAssociationsCache.clientId
+                })
+                .from(clientSitesAssociationsCache)
+                .where(eq(clientSitesAssociationsCache.siteId, siteId));
 
-        const existingClientSiteIds = existingClientSites.map(
-            (row) => row.clientId
-        );
+            const existingClientSiteIds = existingClientSites.map(
+                (row) => row.clientId
+            );
 
-        logger.debug(
-            `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} existingClientSiteIds=[${existingClientSiteIds.join(", ")}]`
-        );
+            logger.debug(
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} existingClientSiteIds=[${existingClientSiteIds.join(", ")}]`
+            );
 
-        // Get full client details for existing clients (needed for sending delete messages)
-        const existingClients =
-            existingClientSiteIds.length > 0
-                ? await trx
-                      .select({
-                          clientId: clients.clientId,
-                          pubKey: clients.pubKey,
-                          subnet: clients.subnet
-                      })
-                      .from(clients)
-                      .where(inArray(clients.clientId, existingClientSiteIds))
+            // Get full client details for existing clients (needed for sending delete messages)
+            const existingClients =
+                existingClientSiteIds.length > 0
+                    ? await trx
+                          .select({
+                              clientId: clients.clientId,
+                              pubKey: clients.pubKey,
+                              subnet: clients.subnet
+                          })
+                          .from(clients)
+                          .where(
+                              inArray(clients.clientId, existingClientSiteIds)
+                          )
+                    : [];
+
+            const otherResourceClientIds =
+                clientsFromOtherResourcesBySite.get(siteId) ??
+                new Set<number>();
+
+            logger.debug(
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} otherResourceClientIds=[${[...otherResourceClientIds].join(", ")}] mergedAllClientIds=[${mergedAllClientIds.join(", ")}]`
+            );
+
+            // Expected clients from this resource are site-scoped: if this site is
+            // no longer attached to the resource, the expected set is empty.
+            const expectedClientIdsForSite = currentSiteIdSet.has(siteId)
+                ? mergedAllClientIds
                 : [];
 
-        const otherResourceClientIds =
-            clientsFromOtherResourcesBySite.get(siteId) ?? new Set<number>();
-
-        logger.debug(
-            `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} otherResourceClientIds=[${[...otherResourceClientIds].join(", ")}] mergedAllClientIds=[${mergedAllClientIds.join(", ")}]`
-        );
-
-        // Expected clients from this resource are site-scoped: if this site is
-        // no longer attached to the resource, the expected set is empty.
-        const expectedClientIdsForSite = currentSiteIdSet.has(siteId)
-            ? mergedAllClientIds
-            : [];
-
-        const clientSitesToAdd = expectedClientIdsForSite.filter(
-            (clientId) =>
-                !existingClientSiteIds.includes(clientId) &&
-                !otherResourceClientIds.has(clientId) // dont add if already connected via another site resource
-        );
-
-        const clientSitesToInsert = clientSitesToAdd.map((clientId) => ({
-            clientId,
-            siteId
-        }));
-
-        logger.debug(
-            `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} clientSites toAdd=[${clientSitesToAdd.join(", ")}]`
-        );
-
-        if (clientSitesToInsert.length > 0) {
-            logger.debug(
-                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} inserting ${clientSitesToInsert.length} clientSite association(s)`
+            // Note: we deliberately do NOT exclude clients covered by another
+            // site resource here (unlike clientSitesToRemove below). Doing so
+            // previously caused a permanent gap: if resource A saw resource B's
+            // cache row and skipped adding (assuming B would maintain it), and
+            // B's own rebuild made the same assumption about A, the site-level
+            // row could end up never inserted by anyone even though both
+            // resources' client associations were otherwise correct.
+            // onConflictDoNothing makes a redundant insert harmless, so there's
+            // no correctness reason to skip here.
+            const clientSitesToAdd = expectedClientIdsForSite.filter(
+                (clientId) => !existingClientSiteIds.includes(clientId)
             );
-            await trx
-                .insert(clientSitesAssociationsCache)
-                .values(clientSitesToInsert)
-                .returning();
-            logger.debug(
-                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} inserted clientSite associations`
-            );
-        } else {
-            logger.debug(
-                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} no clientSite associations to insert`
-            );
-        }
 
-        // Now remove any client-site associations that should no longer exist
-        const clientSitesToRemove = existingClientSiteIds.filter(
-            (clientId) =>
-                !expectedClientIdsForSite.includes(clientId) &&
-                !otherResourceClientIds.has(clientId) // dont remove if there is still another connection for another site resource
-        );
+            const clientSitesToInsert = clientSitesToAdd.map((clientId) => ({
+                clientId,
+                siteId
+            }));
 
-        logger.debug(
-            `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} clientSites toRemove=[${clientSitesToRemove.join(", ")}]`
-        );
-
-        if (clientSitesToRemove.length > 0) {
             logger.debug(
-                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} deleting ${clientSitesToRemove.length} clientSite association(s)`
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} clientSites toAdd=[${clientSitesToAdd.join(", ")}]`
             );
-            await trx
-                .delete(clientSitesAssociationsCache)
-                .where(
-                    and(
-                        eq(clientSitesAssociationsCache.siteId, siteId),
-                        inArray(
-                            clientSitesAssociationsCache.clientId,
-                            clientSitesToRemove
-                        )
-                    )
+
+            if (clientSitesToInsert.length > 0) {
+                logger.debug(
+                    `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} inserting ${clientSitesToInsert.length} clientSite association(s)`
                 );
-        }
+                await trx
+                    .insert(clientSitesAssociationsCache)
+                    .values(clientSitesToInsert)
+                    .onConflictDoNothing()
+                    .returning();
+                logger.debug(
+                    `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} inserted clientSite associations`
+                );
+            } else {
+                logger.debug(
+                    `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} no clientSite associations to insert`
+                );
+            }
 
-        // Now handle the messages to add/remove peers on both the newt and olm sides
-        await handleMessagesForSiteClients(
-            site,
-            siteId,
-            mergedAllClients,
-            existingClients,
-            clientSitesToAdd,
-            clientSitesToRemove,
-            trx
-        );
+            // Now remove any client-site associations that should no longer exist
+            const clientSitesToRemove = existingClientSiteIds.filter(
+                (clientId) =>
+                    !expectedClientIdsForSite.includes(clientId) &&
+                    !otherResourceClientIds.has(clientId) // dont remove if there is still another connection for another site resource
+            );
+
+            logger.debug(
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} clientSites toRemove=[${clientSitesToRemove.join(", ")}]`
+            );
+
+            if (clientSitesToRemove.length > 0) {
+                logger.debug(
+                    `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} deleting ${clientSitesToRemove.length} clientSite association(s)`
+                );
+                await trx
+                    .delete(clientSitesAssociationsCache)
+                    .where(
+                        and(
+                            eq(clientSitesAssociationsCache.siteId, siteId),
+                            inArray(
+                                clientSitesAssociationsCache.clientId,
+                                clientSitesToRemove
+                            )
+                        )
+                    );
+            }
+
+            // Now handle the messages to add/remove peers on both the newt and olm sides
+            await handleMessagesForSiteClients(
+                site,
+                siteId,
+                mergedAllClients,
+                existingClients,
+                clientSitesToAdd,
+                clientSitesToRemove,
+                trx
+            );
+        } catch (err) {
+            // Don't let a failure on one site abort processing of every
+            // other site queued after it in this run. Since we're not
+            // re-throwing, the outer wrapper's retry/requeue logic never
+            // sees this failure, so explicitly queue this resource for a
+            // follow-up pass to reconcile whatever this site didn't get to.
+            logger.error(
+                `rebuildClientAssociations: [rebuildClientAssociationsFromSiteResource] siteId=${siteId} failed while processing site for siteResourceId=${siteResource.siteResourceId}, continuing with remaining sites and queuing a follow-up pass:`,
+                err
+            );
+            await rebuildQueue.enqueue({
+                type: "site-resource",
+                id: siteResource.siteResourceId
+            });
+        }
     }
 
     // Handle subnet proxy target updates for the resource associations
@@ -657,7 +707,7 @@ async function handleMessagesForSiteClients(
     trx: Transaction | typeof db = db
 ): Promise<void> {
     if (!site.exitNodeId) {
-        logger.warn(
+        logger.debug(
             `Exit node ID not on site ${site.siteId} so there is no reason to update clients because it must be offline`
         );
         return;
@@ -671,14 +721,14 @@ async function handleMessagesForSiteClients(
         .limit(1);
 
     if (!exitNode) {
-        logger.warn(
+        logger.debug(
             `Exit node not found for site ${site.siteId} so there is no reason to update clients because it must be offline`
         );
         return;
     }
 
     if (!site.publicKey) {
-        logger.warn(
+        logger.debug(
             `Site publicKey not set for site ${site.siteId} so cannot add peers to clients`
         );
         return;
@@ -692,7 +742,7 @@ async function handleMessagesForSiteClients(
         .where(eq(newts.siteId, siteId))
         .limit(1);
     if (!newt) {
-        logger.warn(
+        logger.debug(
             `Newt not found for site ${siteId} so cannot add peers to clients`
         );
         return;
@@ -917,7 +967,7 @@ export async function updateClientSiteDestinations(
 
     for (const site of sitesData) {
         if (!site.sites.subnet) {
-            logger.warn(`Site ${site.sites.siteId} has no subnet, skipping`);
+            logger.debug(`Site ${site.sites.siteId} has no subnet, skipping`);
             continue;
         }
 
@@ -1656,10 +1706,17 @@ export async function rebuildClientAssociationsFromClient(
     await incrementOrgRebuildCount(client.orgId);
     try {
         const trx = primaryDb;
-        return await lockManager.withLock(
-            `rebuild-client-associations:client:${client.clientId}`,
-            () => rebuildClientAssociationsFromClientImpl(client, trx),
-            REBUILD_ASSOCIATIONS_LOCK_TTL_MS
+        // The whole locked rebuild is idempotent (it diffs full expected vs.
+        // actual state each time), so on a transient DB error it's safe to
+        // retry the entire thing rather than just the failed query.
+        return await withRetry(
+            () =>
+                lockManager.withLock(
+                    `rebuild-client-associations:client:${client.clientId}`,
+                    () => rebuildClientAssociationsFromClientImpl(client, trx),
+                    REBUILD_ASSOCIATIONS_LOCK_TTL_MS
+                ),
+            `rebuildClientAssociationsFromClient:${client.clientId}`
         );
     } catch (err: any) {
         if (
@@ -1675,6 +1732,17 @@ export async function rebuildClientAssociationsFromClient(
             });
             return;
         }
+        if (isTransientError(err)) {
+            logger.warn(
+                `rebuildClientAssociations: transient DB error rebuilding client ${client.clientId} persisted after retries, queuing for deferred processing:`,
+                err
+            );
+            await rebuildQueue.enqueue({
+                type: "client",
+                id: client.clientId
+            });
+            return;
+        }
         throw err;
     } finally {
         await decrementOrgRebuildCount(client.orgId);
@@ -1826,12 +1894,15 @@ async function rebuildClientAssociationsFromClientImpl(
 
     // Insert new associations
     if (resourcesToAdd.length > 0) {
-        await trx.insert(clientSiteResourcesAssociationsCache).values(
-            resourcesToAdd.map((siteResourceId) => ({
-                clientId: client.clientId,
-                siteResourceId
-            }))
-        );
+        await trx
+            .insert(clientSiteResourcesAssociationsCache)
+            .values(
+                resourcesToAdd.map((siteResourceId) => ({
+                    clientId: client.clientId,
+                    siteResourceId
+                }))
+            )
+            .onConflictDoNothing();
     }
 
     // Remove old associations
@@ -1869,12 +1940,15 @@ async function rebuildClientAssociationsFromClientImpl(
 
     // Insert new site associations
     if (sitesToAdd.length > 0) {
-        await trx.insert(clientSitesAssociationsCache).values(
-            sitesToAdd.map((siteId) => ({
-                clientId: client.clientId,
-                siteId
-            }))
-        );
+        await trx
+            .insert(clientSitesAssociationsCache)
+            .values(
+                sitesToAdd.map((siteId) => ({
+                    clientId: client.clientId,
+                    siteId
+                }))
+            )
+            .onConflictDoNothing();
     }
 
     // Remove old site associations

server/lib/rebuildQueue.ts

@@ -1,10 +1,14 @@
 import logger from "@server/logger";
+import { isTransientError } from "@server/lib/dbRetry";
 
 export type RebuildJobType = "site-resource" | "client";
 
 export interface RebuildJob {
     type: RebuildJobType;
     id: number;
+    // Number of times this job has already been re-queued after a transient
+    // failure. Absent/0 means it has not failed yet.
+    attempt?: number;
 }
 
 export interface RebuildJobHandlers {
@@ -24,6 +28,10 @@ export interface RebuildQueueManager {
 // retried shortly after against fresh DB state.
 const POLL_INTERVAL_MS = 500;
 const BATCH_SIZE = 5;
+// A job that fails with a transient DB error gets re-queued with backoff
+// instead of being dropped, up to this many times.
+const MAX_JOB_ATTEMPTS = 5;
+const JOB_RETRY_BASE_DELAY_MS = 1000;
 
 function dedupeKey(job: RebuildJob): string {
     return `${job.type}:${job.id}`;
@@ -106,10 +114,29 @@ class InMemoryRebuildQueue implements RebuildQueueManager {
                         `Rebuild queue: completed ${job.type}:${job.id}`
                     );
                 } catch (err) {
-                    logger.error(
-                        `Rebuild queue: job ${job.type}:${job.id} threw an error:`,
-                        err
-                    );
+                    const attempt = (job.attempt ?? 0) + 1;
+                    if (isTransientError(err) && attempt <= MAX_JOB_ATTEMPTS) {
+                        const delay =
+                            JOB_RETRY_BASE_DELAY_MS * Math.pow(2, attempt - 1);
+                        logger.warn(
+                            `Rebuild queue: job ${job.type}:${job.id} hit a transient error (attempt ${attempt}/${MAX_JOB_ATTEMPTS}), re-queuing in ${delay}ms:`,
+                            err
+                        );
+                        setTimeout(() => {
+                            this.enqueue({ ...job, attempt }).catch(
+                                (enqueueErr) =>
+                                    logger.error(
+                                        `Rebuild queue: failed to re-queue ${job.type}:${job.id} after transient error:`,
+                                        enqueueErr
+                                    )
+                            );
+                        }, delay);
+                    } else {
+                        logger.error(
+                            `Rebuild queue: job ${job.type}:${job.id} threw an error:`,
+                            err
+                        );
+                    }
                 }
             }
         } finally {

server/private/lib/orgRebuildCounter.ts

@@ -14,7 +14,7 @@
 import { redis } from "#private/lib/redis";
 import logger from "@server/logger";
 
-export const ORG_REBUILD_CONCURRENCY_LIMIT = 5;
+export const ORG_REBUILD_CONCURRENCY_LIMIT = 10;
 
 // Safety-net TTL: slightly longer than the rebuild lock TTL (120 s). If a
 // server process dies while holding a rebuild, this ensures the counter key

server/private/lib/rebuildQueue.ts

@@ -14,12 +14,16 @@
 import { redis } from "#private/lib/redis";
 import { lockManager } from "#private/lib/lock";
 import logger from "@server/logger";
+import { isTransientError } from "@server/lib/dbRetry";
 
 export type RebuildJobType = "site-resource" | "client";
 
 export interface RebuildJob {
     type: RebuildJobType;
     id: number;
+    // Number of times this job has already been re-queued after a transient
+    // failure. Absent/0 means it has not failed yet.
+    attempt?: number;
 }
 
 export interface RebuildJobHandlers {
@@ -43,6 +47,11 @@ const PROCESSOR_LOCK_TTL_MS = 120000 * BATCH_SIZE + 30000; // ~630 s
 
 const POLL_INTERVAL_MS = 500;
 
+// A job that fails with a transient DB error gets re-queued with backoff
+// instead of being dropped, up to this many times.
+const MAX_JOB_ATTEMPTS = 5;
+const JOB_RETRY_BASE_DELAY_MS = 1000;
+
 class RedisRebuildQueue {
     private processingStarted = false;
 
@@ -180,10 +189,33 @@ class RedisRebuildQueue {
                                 `Rebuild queue: completed ${job.type}:${job.id}`
                             );
                         } catch (err) {
-                            logger.error(
-                                `Rebuild queue: job ${job.type}:${job.id} threw an error:`,
-                                err
-                            );
+                            const attempt = (job.attempt ?? 0) + 1;
+                            if (
+                                isTransientError(err) &&
+                                attempt <= MAX_JOB_ATTEMPTS
+                            ) {
+                                const delay =
+                                    JOB_RETRY_BASE_DELAY_MS *
+                                    Math.pow(2, attempt - 1);
+                                logger.warn(
+                                    `Rebuild queue: job ${job.type}:${job.id} hit a transient error (attempt ${attempt}/${MAX_JOB_ATTEMPTS}), re-queuing in ${delay}ms:`,
+                                    err
+                                );
+                                setTimeout(() => {
+                                    this.enqueue({ ...job, attempt }).catch(
+                                        (enqueueErr) =>
+                                            logger.error(
+                                                `Rebuild queue: failed to re-queue ${job.type}:${job.id} after transient error:`,
+                                                enqueueErr
+                                            )
+                                    );
+                                }, delay);
+                            } else {
+                                logger.error(
+                                    `Rebuild queue: job ${job.type}:${job.id} threw an error:`,
+                                    err
+                                );
+                            }
                         }
                     }
                 },

server/private/lib/redis.ts

@@ -894,6 +894,19 @@ class RegionalRedisManager {
         return opts;
     }
 
+    // The regional Redis StatefulSet's "redis" service pins to pod redis-0
+    // (primary). The replica (redis-1) is only reachable through the
+    // per-pod headless service: <svc>.<namespace>.svc.cluster.local ->
+    // redis-1.redis-headless.<namespace>.svc.cluster.local. Returns null
+    // if the configured host doesn't match that pattern (e.g. local dev),
+    // in which case callers should fall back to the primary for reads.
+    private getReplicaHost(primaryHost: string): string | null {
+        const match = primaryHost.match(/^redis\.([^.]+)\.svc\.cluster\.local$/);
+        if (!match) return null;
+        const namespace = match[1];
+        return `redis-1.redis-headless.${namespace}.svc.cluster.local`;
+    }
+
     private initializeClients(): void {
         const cfg = this.getConfig();
         const baseOpts = {
@@ -907,35 +920,42 @@ class RegionalRedisManager {
 
         try {
             this.writeClient = new Redis(baseOpts);
-            // redis-1 (replica) handles reads; fall back to primary if not resolvable
-            this.readClient = new Redis({
-                ...baseOpts,
-                host: cfg.host!.replace(/^(.*?)(\.\S+)$/, (_, h, rest) => {
-                    // Derive replica hostname from the headless service pattern:
-                    // redis.redis.svc.cluster.local -> redis-1.redis-headless.redis.svc.cluster.local
-                    // If it doesn't look like a k8s service, just use the same host
-                    return h + rest;
-                })
-            });
 
-            // For simplicity use same host for both; callers can always read from primary
-            // The real replica routing is handled by the StatefulSet headless service
-            this.readClient = this.writeClient;
+            const replicaHost = this.getReplicaHost(cfg.host!);
+            this.readClient = replicaHost
+                ? new Redis({ ...baseOpts, host: replicaHost })
+                : this.writeClient;
 
             this.writeClient.on("ready", () => {
-                logger.info("Regional Redis client ready");
+                logger.info("Regional Redis write client ready");
                 this.isHealthy = true;
             });
             this.writeClient.on("error", (err) => {
-                logger.error("Regional Redis client error:", err);
+                logger.error("Regional Redis write client error:", err);
                 this.isHealthy = false;
             });
             this.writeClient.on("reconnecting", () => {
-                logger.info("Regional Redis client reconnecting...");
+                logger.info("Regional Redis write client reconnecting...");
                 this.isHealthy = false;
             });
 
-            logger.info("Regional Redis client initialized");
+            if (this.readClient !== this.writeClient) {
+                this.readClient.on("ready", () => {
+                    logger.info("Regional Redis read client ready");
+                });
+                this.readClient.on("error", (err) => {
+                    logger.error("Regional Redis read client error:", err);
+                });
+                this.readClient.on("reconnecting", () => {
+                    logger.info("Regional Redis read client reconnecting...");
+                });
+            }
+
+            logger.info(
+                replicaHost
+                    ? `Regional Redis client initialized (reads routed to replica ${replicaHost})`
+                    : "Regional Redis client initialized (no replica resolvable, reads routed to primary)"
+            );
         } catch (error) {
             logger.error("Failed to initialize regional Redis client:", error);
             this.isEnabled = false;
@@ -1041,11 +1061,14 @@ class RegionalRedisManager {
 
     public async disconnect(): Promise<void> {
         try {
+            if (this.readClient && this.readClient !== this.writeClient) {
+                await this.readClient.quit();
+            }
+            this.readClient = null;
             if (this.writeClient) {
                 await this.writeClient.quit();
                 this.writeClient = null;
             }
-            this.readClient = null;
             logger.info("Regional Redis client disconnected");
         } catch (error) {
             logger.error("Error disconnecting regional Redis client:", error);

server/private/middlewares/verifySubscription.ts

@@ -17,6 +17,7 @@ import HttpCode from "@server/types/HttpCode";
 import { build } from "@server/build";
 import { getOrgTierData } from "#private/lib/billing";
 import { Tier } from "@server/types/Tiers";
+import logger from "@server/logger";
 
 export function verifyValidSubscription(tiers: Tier[]) {
     return async function (
@@ -30,9 +31,9 @@ export function verifyValidSubscription(tiers: Tier[]) {
             }
 
             const orgId =
-                req.params.orgId ||
-                req.body.orgId ||
-                req.query.orgId ||
+                req.params?.orgId ||
+                req.body?.orgId ||
+                req.query?.orgId ||
                 req.userOrgId;
 
             if (!orgId) {
@@ -65,6 +66,7 @@ export function verifyValidSubscription(tiers: Tier[]) {
 
             return next();
         } catch (e) {
+            logger.error(e);
             return next(
                 createHttpError(
                     HttpCode.INTERNAL_SERVER_ERROR,

server/private/routers/billing/getOrgUsage.ts

@@ -104,6 +104,18 @@ export async function getOrgUsage(
             orgId,
             LimitId.ORGANIZATIONS
         );
+        const publicResources = await usageService.getUsage(
+            orgId,
+            LimitId.PUBLIC_RESOURCES
+        );
+        const privateResources = await usageService.getUsage(
+            orgId,
+            LimitId.PRIVATE_RESOURCES
+        );
+        const machineClients = await usageService.getUsage(
+            orgId,
+            LimitId.MACHINE_CLIENTS
+        );
         // const egressData = await usageService.getUsage(
         //     orgId,
         //     FeatureId.EGRESS_DATA_MB
@@ -127,6 +139,15 @@ export async function getOrgUsage(
         if (organizations) {
             usageData.push(organizations);
         }
+        if (publicResources) {
+            usageData.push(publicResources);
+        }
+        if (privateResources) {
+            usageData.push(privateResources);
+        }
+        if (machineClients) {
+            usageData.push(machineClients);
+        }
 
         const orgLimits = await db
             .select()

server/private/routers/external.ts

@@ -31,7 +31,6 @@ import * as siteProvisioning from "#private/routers/siteProvisioning";
 import * as eventStreamingDestination from "#private/routers/eventStreamingDestination";
 import * as alertRule from "#private/routers/alertRule";
 import * as healthChecks from "#private/routers/healthChecks";
-import * as labels from "#private/routers/labels";
 import * as client from "@server/routers/client";
 import * as resource from "#private/routers/resource";
 import * as policy from "#private/routers/policy";
@@ -810,59 +809,6 @@ authenticated.get(
     alertRule.getAlertRule
 );
 
-authenticated.get(
-    "/org/:orgId/labels",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.listOrgLabels),
-    labels.listOrgLabels
-);
-
-authenticated.post(
-    "/org/:orgId/labels",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.createOrgLabel),
-    labels.createOrgLabel
-);
-
-authenticated.patch(
-    "/org/:orgId/label/:labelId",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.updateOrgLabel),
-    labels.updateOrgLabel
-);
-
-authenticated.delete(
-    "/org/:orgId/label/:labelId",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.deleteOrgLabel),
-    labels.deleteOrgLabel
-);
-
-authenticated.put(
-    "/org/:orgId/label/:labelId/attach",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.attachLabelToItem),
-    labels.attachLabelToItem
-);
-
-authenticated.put(
-    "/org/:orgId/label/:labelId/detach",
-    verifyValidLicense,
-    verifyOrgAccess,
-    verifyValidSubscription(tierMatrix.labels),
-    verifyUserHasAction(ActionsEnum.detachLabelFromItem),
-    labels.detachLabelFromItem
-);
-
 authenticated.get(
     "/org/:orgId/health-checks",
     verifyValidLicense,

server/private/routers/gerbil/createExitNode.ts

@@ -29,37 +29,41 @@ export async function createExitNode(
         .where(eq(exitNodes.publicKey, publicKey));
     let exitNode: ExitNode;
     if (!exitNodeQuery) {
-        const address = await getNextAvailableSubnet();
-        // TODO: eventually we will want to get the next available port so that we can multiple exit nodes
-        // const listenPort = await getNextAvailablePort();
-        const listenPort = config.getRawConfig().gerbil.start_port;
-        let subEndpoint = "";
-        if (config.getRawConfig().gerbil.use_subdomain) {
-            subEndpoint = await getUniqueExitNodeEndpointName();
+        const { value: address, release } = await getNextAvailableSubnet();
+        try {
+            // TODO: eventually we will want to get the next available port so that we can multiple exit nodes
+            // const listenPort = await getNextAvailablePort();
+            const listenPort = config.getRawConfig().gerbil.start_port;
+            let subEndpoint = "";
+            if (config.getRawConfig().gerbil.use_subdomain) {
+                subEndpoint = await getUniqueExitNodeEndpointName();
+            }
+
+            const exitNodeName =
+                config.getRawConfig().gerbil.exit_node_name ||
+                `Exit Node ${publicKey.slice(0, 8)}`;
+
+            // create a new exit node
+            [exitNode] = await db
+                .insert(exitNodes)
+                .values({
+                    publicKey,
+                    endpoint: `${subEndpoint}${subEndpoint != "" ? "." : ""}${config.getRawConfig().gerbil.base_endpoint}`,
+                    address,
+                    listenPort,
+                    online: true,
+                    reachableAt,
+                    name: exitNodeName
+                })
+                .returning()
+                .execute();
+
+            logger.info(
+                `Created new exit node ${exitNode.name} with address ${exitNode.address} and port ${exitNode.listenPort}`
+            );
+        } finally {
+            await release();
         }
-
-        const exitNodeName =
-            config.getRawConfig().gerbil.exit_node_name ||
-            `Exit Node ${publicKey.slice(0, 8)}`;
-
-        // create a new exit node
-        [exitNode] = await db
-            .insert(exitNodes)
-            .values({
-                publicKey,
-                endpoint: `${subEndpoint}${subEndpoint != "" ? "." : ""}${config.getRawConfig().gerbil.base_endpoint}`,
-                address,
-                listenPort,
-                online: true,
-                reachableAt,
-                name: exitNodeName
-            })
-            .returning()
-            .execute();
-
-        logger.info(
-            `Created new exit node ${exitNode.name} with address ${exitNode.address} and port ${exitNode.listenPort}`
-        );
     } else {
         // update the reachable at
         [exitNode] = await db

server/private/routers/labels/index.ts

@@ -1,19 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-export * from "./listOrgLabels";
-export * from "./createOrgLabel";
-export * from "./updateOrgLabel";
-export * from "./attachLabelToItem";
-export * from "./detachLabelFromItem";
-export * from "./deleteOrgLabel";

server/private/routers/remoteExitNode/createRemoteExitNode.ts

@@ -114,8 +114,6 @@ export async function createRemoteExitNode(
         }
 
         const secretHash = await hashPassword(secret);
-        // const address = await getNextAvailableSubnet();
-        const address = "100.89.140.1/24"; // FOR NOW LETS HARDCODE THESE ADDRESSES
 
         const [existingRemoteExitNode] = await db
             .select()
@@ -191,89 +189,106 @@ export async function createRemoteExitNode(
             );
         }
 
-        await db.transaction(async (trx) => {
-            if (!existingExitNode) {
-                const [res] = await trx
-                    .insert(exitNodes)
-                    .values({
-                        name: remoteExitNodeId,
-                        address,
-                        endpoint: "",
-                        publicKey: "",
-                        listenPort: 0,
-                        online: false,
-                        type: "remoteExitNode"
-                    })
-                    .returning();
-                existingExitNode = res;
-            }
+        // If this remote exit node isn't already backing an exit node in
+        // another org, we're about to create a brand new one. Reserve a
+        // subnet for it up front so the allocation lock is held across the
+        // whole insert - this guarantees exit node subnets never overlap,
+        // even under concurrent creation, which matters for HA setups.
+        let releaseSubnetLock: (() => Promise<void>) | null = null;
+        let newExitNodeAddress: string | null = null;
+        if (!existingExitNode) {
+            const { value, release } = await getNextAvailableSubnet();
+            newExitNodeAddress = value;
+            releaseSubnetLock = release;
+        }
 
-            if (!existingRemoteExitNode) {
-                await trx.insert(remoteExitNodes).values({
-                    remoteExitNodeId: remoteExitNodeId,
-                    secretHash,
-                    dateCreated: moment().toISOString(),
-                    exitNodeId: existingExitNode.exitNodeId
-                });
-            } else {
-                // update the existing remote exit node
-                await trx
-                    .update(remoteExitNodes)
-                    .set({
-                        exitNodeId: existingExitNode.exitNodeId
-                    })
-                    .where(
-                        eq(
-                            remoteExitNodes.remoteExitNodeId,
-                            existingRemoteExitNode.remoteExitNodeId
-                        )
-                    );
-            }
-
-            if (!existingExitNodeOrg) {
-                await trx.insert(exitNodeOrgs).values({
-                    exitNodeId: existingExitNode.exitNodeId,
-                    orgId: orgId
-                });
-            }
-
-            // calculate if the node is in any other of the orgs before we count it as an add to the billing org
-            if (org.billingOrgId) {
-                const otherBillingOrgs = await trx
-                    .select()
-                    .from(orgs)
-                    .where(
-                        and(
-                            eq(orgs.billingOrgId, org.billingOrgId),
-                            ne(orgs.orgId, orgId)
-                        )
-                    );
-
-                const billingOrgIds = otherBillingOrgs.map((o) => o.orgId);
-
-                const orgsInBillingDomainThatTheNodeIsStillIn = await trx
-                    .select()
-                    .from(exitNodeOrgs)
-                    .where(
-                        and(
-                            eq(
-                                exitNodeOrgs.exitNodeId,
-                                existingExitNode.exitNodeId
-                            ),
-                            inArray(exitNodeOrgs.orgId, billingOrgIds)
-                        )
-                    );
-
-                if (orgsInBillingDomainThatTheNodeIsStillIn.length === 0) {
-                    await usageService.add(
-                        orgId,
-                        LimitId.REMOTE_EXIT_NODES,
-                        1,
-                        trx
-                    );
+        try {
+            await db.transaction(async (trx) => {
+                if (!existingExitNode) {
+                    const [res] = await trx
+                        .insert(exitNodes)
+                        .values({
+                            name: remoteExitNodeId,
+                            address: newExitNodeAddress!,
+                            endpoint: "",
+                            publicKey: "",
+                            listenPort: 0,
+                            online: false,
+                            type: "remoteExitNode"
+                        })
+                        .returning();
+                    existingExitNode = res;
                 }
-            }
-        });
+
+                if (!existingRemoteExitNode) {
+                    await trx.insert(remoteExitNodes).values({
+                        remoteExitNodeId: remoteExitNodeId,
+                        secretHash,
+                        dateCreated: moment().toISOString(),
+                        exitNodeId: existingExitNode.exitNodeId
+                    });
+                } else {
+                    // update the existing remote exit node
+                    await trx
+                        .update(remoteExitNodes)
+                        .set({
+                            exitNodeId: existingExitNode.exitNodeId
+                        })
+                        .where(
+                            eq(
+                                remoteExitNodes.remoteExitNodeId,
+                                existingRemoteExitNode.remoteExitNodeId
+                            )
+                        );
+                }
+
+                if (!existingExitNodeOrg) {
+                    await trx.insert(exitNodeOrgs).values({
+                        exitNodeId: existingExitNode.exitNodeId,
+                        orgId: orgId
+                    });
+                }
+
+                // calculate if the node is in any other of the orgs before we count it as an add to the billing org
+                if (org.billingOrgId) {
+                    const otherBillingOrgs = await trx
+                        .select()
+                        .from(orgs)
+                        .where(
+                            and(
+                                eq(orgs.billingOrgId, org.billingOrgId),
+                                ne(orgs.orgId, orgId)
+                            )
+                        );
+
+                    const billingOrgIds = otherBillingOrgs.map((o) => o.orgId);
+
+                    const orgsInBillingDomainThatTheNodeIsStillIn = await trx
+                        .select()
+                        .from(exitNodeOrgs)
+                        .where(
+                            and(
+                                eq(
+                                    exitNodeOrgs.exitNodeId,
+                                    existingExitNode.exitNodeId
+                                ),
+                                inArray(exitNodeOrgs.orgId, billingOrgIds)
+                            )
+                        );
+
+                    if (orgsInBillingDomainThatTheNodeIsStillIn.length === 0) {
+                        await usageService.add(
+                            orgId,
+                            LimitId.REMOTE_EXIT_NODES,
+                            1,
+                            trx
+                        );
+                    }
+                }
+            });
+        } finally {
+            await releaseSubnetLock?.();
+        }
 
         const token = generateSessionToken();
         await createRemoteExitNodeSession(token, remoteExitNodeId);

server/routers/blueprints/applyJSONBlueprint.ts

@@ -99,7 +99,7 @@ export async function applyJSONBlueprint(
                 source: "API"
             });
         } catch (error) {
-            logger.error(`Failed to update database from config: ${error}`);
+            logger.debug(`Failed to update database from config: ${error}`);
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,

server/routers/client/listClients.ts

@@ -304,11 +304,6 @@ export async function listClients(
             (client) => client.clientId
         );
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         // Get client count with filter
         const conditions = [
             and(
@@ -341,7 +336,7 @@ export async function listClients(
             conditions.push(or(...filterAggregates));
         }
 
-        if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {
+        if (labelFilter && labelFilter.length > 0) {
             conditions.push(
                 inArray(
                     clients.clientId,
@@ -361,25 +356,20 @@ export async function listClients(
             const q = "%" + query.toLowerCase() + "%";
             const queryList = [
                 like(sql`LOWER(${clients.name})`, q),
-                like(sql`LOWER(${clients.niceId})`, q)
+                like(sql`LOWER(${clients.niceId})`, q),
+                inArray(
+                    clients.clientId,
+                    db
+                        .select({ id: clientLabels.clientId })
+                        .from(clientLabels)
+                        .innerJoin(
+                            labels,
+                            eq(labels.labelId, clientLabels.labelId)
+                        )
+                        .where(like(sql`LOWER(${labels.name})`, q))
+                )
             ];
 
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        clients.clientId,
-                        db
-                            .select({ id: clientLabels.clientId })
-                            .from(clientLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, clientLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-
             conditions.push(or(...queryList));
         }
 
@@ -414,7 +404,7 @@ export async function listClients(
             clientId: number;
         }> = [];
 
-        if (isLabelFeatureEnabled && clientIds.length > 0) {
+        if (clientIds.length > 0) {
             labelsForClients = await db
                 .select({
                     labelId: labels.labelId,

server/routers/external.ts

@@ -54,6 +54,7 @@ import { build } from "@server/build";
 import { createStore } from "#dynamic/lib/rateLimitStore";
 import { logActionAudit } from "#dynamic/middlewares";
 import { checkRoundTripMessage } from "./ws";
+import * as labels from "@server/routers/labels";
 
 // Root routes
 export const unauthenticated = Router();
@@ -327,6 +328,14 @@ authenticated.get(
     siteResource.listAllSiteResourcesByOrg
 );
 
+authenticated.get(
+    "/org/:orgId/site-resource/:siteResourceId",
+    verifyOrgAccess,
+    verifySiteResourceAccess,
+    verifyUserHasAction(ActionsEnum.getSiteResource),
+    siteResource.getSiteResource
+);
+
 authenticated.get(
     "/site-resource/:siteResourceId",
     verifySiteResourceAccess,
@@ -470,6 +479,12 @@ authenticated.get(
     launcher.listLauncherGroups
 );
 
+authenticated.get(
+    "/org/:orgId/launcher/scale",
+    verifyOrgAccess,
+    launcher.listLauncherScale
+);
+
 authenticated.get(
     "/org/:orgId/launcher/resources",
     verifyOrgAccess,
@@ -494,6 +509,12 @@ authenticated.get(
     launcher.listLauncherViews
 );
 
+authenticated.post(
+    "/org/:orgId/launcher/invalidate-cache",
+    verifyOrgAccess,
+    launcher.invalidateLauncherCache
+);
+
 authenticated.post(
     "/org/:orgId/launcher/views",
     verifyOrgAccess,
@@ -506,6 +527,18 @@ authenticated.put(
     launcher.updateLauncherView
 );
 
+authenticated.put(
+    "/org/:orgId/launcher/default-view",
+    verifyOrgAccess,
+    launcher.upsertLauncherDefaultView
+);
+
+authenticated.delete(
+    "/org/:orgId/launcher/default-view",
+    verifyOrgAccess,
+    launcher.deleteLauncherDefaultView
+);
+
 authenticated.delete(
     "/org/:orgId/launcher/views/:viewId",
     verifyOrgAccess,
@@ -1303,6 +1336,48 @@ authenticated.get(
 
 authenticated.get("/ws/round-trip-message/:messageId", checkRoundTripMessage);
 
+authenticated.get(
+    "/org/:orgId/labels",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.listOrgLabels),
+    labels.listOrgLabels
+);
+
+authenticated.post(
+    "/org/:orgId/labels",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.createOrgLabel),
+    labels.createOrgLabel
+);
+
+authenticated.patch(
+    "/org/:orgId/label/:labelId",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.updateOrgLabel),
+    labels.updateOrgLabel
+);
+
+authenticated.delete(
+    "/org/:orgId/label/:labelId",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.deleteOrgLabel),
+    labels.deleteOrgLabel
+);
+
+authenticated.put(
+    "/org/:orgId/label/:labelId/attach",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.attachLabelToItem),
+    labels.attachLabelToItem
+);
+
+authenticated.put(
+    "/org/:orgId/label/:labelId/detach",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.detachLabelFromItem),
+    labels.detachLabelFromItem
+);
+
 // Auth routes
 export const authRouter = Router();
 unauthenticated.use("/auth", authRouter);

server/routers/gerbil/createExitNode.ts

@@ -13,37 +13,41 @@ export async function createExitNode(
     const [exitNodeQuery] = await db.select().from(exitNodes).limit(1);
     let exitNode: ExitNode;
     if (!exitNodeQuery) {
-        const address = await getNextAvailableSubnet();
-        // TODO: eventually we will want to get the next available port so that we can multiple exit nodes
-        // const listenPort = await getNextAvailablePort();
-        const listenPort = config.getRawConfig().gerbil.start_port;
-        let subEndpoint = "";
-        if (config.getRawConfig().gerbil.use_subdomain) {
-            subEndpoint = await getUniqueExitNodeEndpointName();
+        const { value: address, release } = await getNextAvailableSubnet();
+        try {
+            // TODO: eventually we will want to get the next available port so that we can multiple exit nodes
+            // const listenPort = await getNextAvailablePort();
+            const listenPort = config.getRawConfig().gerbil.start_port;
+            let subEndpoint = "";
+            if (config.getRawConfig().gerbil.use_subdomain) {
+                subEndpoint = await getUniqueExitNodeEndpointName();
+            }
+
+            const exitNodeName =
+                config.getRawConfig().gerbil.exit_node_name ||
+                `Exit Node ${publicKey.slice(0, 8)}`;
+
+            // create a new exit node
+            [exitNode] = await db
+                .insert(exitNodes)
+                .values({
+                    publicKey,
+                    endpoint: `${subEndpoint}${subEndpoint != "" ? "." : ""}${config.getRawConfig().gerbil.base_endpoint}`,
+                    address,
+                    online: true,
+                    listenPort,
+                    reachableAt,
+                    name: exitNodeName
+                })
+                .returning()
+                .execute();
+
+            logger.info(
+                `Created new exit node ${exitNode.name} with address ${exitNode.address} and port ${exitNode.listenPort}`
+            );
+        } finally {
+            await release();
         }
-
-        const exitNodeName =
-            config.getRawConfig().gerbil.exit_node_name ||
-            `Exit Node ${publicKey.slice(0, 8)}`;
-
-        // create a new exit node
-        [exitNode] = await db
-            .insert(exitNodes)
-            .values({
-                publicKey,
-                endpoint: `${subEndpoint}${subEndpoint != "" ? "." : ""}${config.getRawConfig().gerbil.base_endpoint}`,
-                address,
-                online: true,
-                listenPort,
-                reachableAt,
-                name: exitNodeName
-            })
-            .returning()
-            .execute();
-
-        logger.info(
-            `Created new exit node ${exitNode.name} with address ${exitNode.address} and port ${exitNode.listenPort}`
-        );
     } else {
         // update the existing exit node
         [exitNode] = await db

server/routers/integration.ts

@@ -895,12 +895,6 @@ authenticated.delete(
     user.removeUserOrg
 );
 
-// authenticated.put(
-//     "/newt",
-//     verifyApiKeyHasAction(ActionsEnum.createNewt),
-//     newt.createNewt
-// );
-
 authenticated.get(
     `/org/:orgId/api-keys`,
     verifyApiKeyIsRoot,

server/routers/labels/attachLabelToItem.ts

@@ -1,16 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
 import {
     clients,
     clientLabels,

server/routers/labels/createOrgLabel.ts

@@ -1,15 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
 import {
     db,
     labels,

server/routers/labels/deleteOrgLabel.ts

@@ -1,15 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
 import { db, labels } from "@server/db";
 import response from "@server/lib/response";
 import logger from "@server/logger";

server/routers/labels/detachLabelFromItem.ts

@@ -1,16 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
 import {
     clients,
     clientLabels,

server/routers/labels/index.ts

@@ -0,0 +1,6 @@
+export * from "./listOrgLabels";
+export * from "./createOrgLabel";
+export * from "./updateOrgLabel";
+export * from "./attachLabelToItem";
+export * from "./detachLabelFromItem";
+export * from "./deleteOrgLabel";

server/routers/labels/listOrgLabels.ts

@@ -1,16 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
 import { db, labels } from "@server/db";
 import response from "@server/lib/response";
 import logger from "@server/logger";

server/routers/labels/updateOrgLabel.ts

@@ -1,16 +1,3 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
 import { db, labels } from "@server/db";
 import response from "@server/lib/response";
 import logger from "@server/logger";

server/routers/launcher/createLauncherView.ts

@@ -79,7 +79,8 @@ export async function createLauncherView(
                 ),
                 createdAt: created.createdAt,
                 updatedAt: created.updatedAt,
-                isOrgWide: created.userId == null
+                isOrgWide: created.userId == null,
+                isDefault: created.isDefault
             },
             success: true,
             error: false,

server/routers/launcher/deleteLauncherDefaultView.ts

@@ -0,0 +1,104 @@
+import { response } from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import { NextFunction, Request, Response } from "express";
+import createHttpError from "http-errors";
+import { fromZodError } from "zod-validation-error";
+import { z } from "zod";
+import { ActionsEnum, checkUserActionPermission } from "@server/auth/actions";
+import {
+    deleteAllDefaultViewOverrides,
+    deleteDefaultViewOverride
+} from "./launcherDefaultView";
+
+const deleteLauncherDefaultViewBodySchema = z.strictObject({
+    orgWide: z.boolean().optional().default(false),
+    all: z.boolean().optional().default(false)
+});
+
+export async function deleteLauncherDefaultView(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const orgId = req.userOrgId;
+        const userId = req.user!.userId;
+
+        if (!orgId) {
+            return next(
+                createHttpError(HttpCode.BAD_REQUEST, "Invalid organization ID")
+            );
+        }
+
+        const parsed = deleteLauncherDefaultViewBodySchema.safeParse(req.body);
+        if (!parsed.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromZodError(parsed.error)
+                )
+            );
+        }
+
+        if (parsed.data.all) {
+            const canManageOrgWide = await checkUserActionPermission(
+                ActionsEnum.createOrgWideLauncherView,
+                req
+            );
+            if (!canManageOrgWide) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "User does not have permission perform this action"
+                    )
+                );
+            }
+
+            await deleteAllDefaultViewOverrides(orgId, userId);
+        } else if (parsed.data.orgWide) {
+            const canManageOrgWide = await checkUserActionPermission(
+                ActionsEnum.createOrgWideLauncherView,
+                req
+            );
+            if (!canManageOrgWide) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "User does not have permission perform this action"
+                    )
+                );
+            }
+
+            await deleteDefaultViewOverride({
+                orgId,
+                userId,
+                orgWide: true
+            });
+        } else {
+            await deleteDefaultViewOverride({
+                orgId,
+                userId,
+                orgWide: false
+            });
+        }
+
+        return response(res, {
+            data: null,
+            success: true,
+            error: false,
+            message: "Launcher default view reset successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        if (createHttpError.isHttpError(error)) {
+            return next(error);
+        }
+        console.error("Error resetting launcher default view:", error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Internal server error"
+            )
+        );
+    }
+}

server/routers/launcher/deleteLauncherView.ts

@@ -46,6 +46,15 @@ export async function deleteLauncherView(
             );
         }
 
+        if (existing.isDefault) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "The default view cannot be deleted from here"
+                )
+            );
+        }
+
         const isPersonalView = existing.userId === userId;
         const isOrgWideView = existing.userId == null;
         const canManageOrgWide = await checkUserActionPermission(

server/routers/launcher/index.ts

@@ -1,5 +1,6 @@
 export * from "./types";
 export { listLauncherGroups } from "./listLauncherGroups";
+export { listLauncherScale } from "./listLauncherScale";
 export { listLauncherResources } from "./listLauncherResources";
 export { listLauncherSites } from "./listLauncherSites";
 export { listLauncherLabels } from "./listLauncherLabels";
@@ -7,3 +8,6 @@ export { listLauncherViews } from "./listLauncherViews";
 export { createLauncherView } from "./createLauncherView";
 export { updateLauncherView } from "./updateLauncherView";
 export { deleteLauncherView } from "./deleteLauncherView";
+export { upsertLauncherDefaultView } from "./upsertLauncherDefaultView";
+export { deleteLauncherDefaultView } from "./deleteLauncherDefaultView";
+export { invalidateLauncherCache } from "./invalidateLauncherCache";

server/routers/launcher/invalidateLauncherCache.ts

@@ -0,0 +1,65 @@
+import { regionalCache as cache } from "#dynamic/lib/cache";
+import { response } from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import { NextFunction, Request, Response } from "express";
+import createHttpError from "http-errors";
+
+async function invalidateLauncherCacheForUser(
+    orgId: string,
+    userId: string
+): Promise<void> {
+    const prefixes = [
+        `launcherAccessibleIds:${orgId}:${userId}:`,
+        `launcher:groups:${orgId}:${userId}:`,
+        `launcher:results:${orgId}:${userId}:`,
+        `launcher:scale:counts:${orgId}:${userId}:`
+    ];
+
+    const keys = (
+        await Promise.all(
+            prefixes.map((prefix) => cache.keysWithPrefix(prefix))
+        )
+    ).flat();
+
+    if (keys.length > 0) {
+        await cache.del(keys);
+    }
+}
+
+export async function invalidateLauncherCache(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const orgId = req.userOrgId;
+        const userId = req.user!.userId;
+
+        if (!orgId) {
+            return next(
+                createHttpError(HttpCode.BAD_REQUEST, "Invalid organization ID")
+            );
+        }
+
+        await invalidateLauncherCacheForUser(orgId, userId);
+
+        return response(res, {
+            data: null,
+            success: true,
+            error: false,
+            message: "Launcher cache invalidated successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        if (createHttpError.isHttpError(error)) {
+            return next(error);
+        }
+        console.error("Error invalidating launcher cache:", error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Internal server error"
+            )
+        );
+    }
+}

server/routers/launcher/launcherDefaultView.ts

@@ -0,0 +1,137 @@
+import { db, launcherViews } from "@server/db";
+import { and, eq, isNull } from "drizzle-orm";
+import moment from "moment";
+import {
+    launcherViewConfigSchema,
+    type LauncherDefaultViewOverrides,
+    type LauncherViewConfig,
+    type LauncherViewRecord
+} from "./types";
+
+export function mapViewRow(
+    row: typeof launcherViews.$inferSelect
+): LauncherViewRecord {
+    return {
+        viewId: row.viewId,
+        orgId: row.orgId,
+        userId: row.userId,
+        name: row.name,
+        config: launcherViewConfigSchema.parse(JSON.parse(row.config)),
+        createdAt: row.createdAt,
+        updatedAt: row.updatedAt,
+        isOrgWide: row.userId == null,
+        isDefault: row.isDefault
+    };
+}
+
+export function extractDefaultViewOverrides(
+    rows: Array<typeof launcherViews.$inferSelect>
+): LauncherDefaultViewOverrides {
+    const overrideRows = rows.filter((row) => row.isDefault);
+
+    const personalRow = overrideRows.find((row) => row.userId !== null);
+    const orgWideRow = overrideRows.find((row) => row.userId === null);
+
+    return {
+        personal: personalRow ? mapViewRow(personalRow) : null,
+        orgWide: orgWideRow ? mapViewRow(orgWideRow) : null
+    };
+}
+
+export function listVisibleLauncherViews(
+    rows: Array<typeof launcherViews.$inferSelect>
+): LauncherViewRecord[] {
+    return rows.filter((row) => !row.isDefault).map(mapViewRow);
+}
+
+export async function findDefaultViewOverride(
+    orgId: string,
+    orgWide: boolean,
+    userId: string
+) {
+    const [existing] = await db
+        .select()
+        .from(launcherViews)
+        .where(
+            and(
+                eq(launcherViews.orgId, orgId),
+                eq(launcherViews.isDefault, true),
+                orgWide
+                    ? isNull(launcherViews.userId)
+                    : eq(launcherViews.userId, userId)
+            )
+        )
+        .limit(1);
+
+    return existing ?? null;
+}
+
+export async function upsertDefaultViewOverride({
+    orgId,
+    userId,
+    orgWide,
+    config
+}: {
+    orgId: string;
+    userId: string;
+    orgWide: boolean;
+    config: LauncherViewConfig;
+}) {
+    const now = moment().toISOString();
+    const existing = await findDefaultViewOverride(orgId, orgWide, userId);
+
+    if (existing) {
+        const [updated] = await db
+            .update(launcherViews)
+            .set({
+                config: JSON.stringify(config),
+                updatedAt: now
+            })
+            .where(eq(launcherViews.viewId, existing.viewId))
+            .returning();
+
+        return mapViewRow(updated);
+    }
+
+    const [created] = await db
+        .insert(launcherViews)
+        .values({
+            orgId,
+            userId: orgWide ? null : userId,
+            name: "",
+            isDefault: true,
+            config: JSON.stringify(config),
+            createdAt: now,
+            updatedAt: now
+        })
+        .returning();
+
+    return mapViewRow(created);
+}
+
+export async function deleteDefaultViewOverride({
+    orgId,
+    userId,
+    orgWide
+}: {
+    orgId: string;
+    userId: string;
+    orgWide: boolean;
+}) {
+    const existing = await findDefaultViewOverride(orgId, orgWide, userId);
+    if (!existing) {
+        return;
+    }
+
+    await db
+        .delete(launcherViews)
+        .where(eq(launcherViews.viewId, existing.viewId));
+}
+
+export async function deleteAllDefaultViewOverrides(
+    orgId: string,
+    userId: string
+) {
+    await deleteDefaultViewOverride({ orgId, userId, orgWide: false });
+    await deleteDefaultViewOverride({ orgId, userId, orgWide: true });
+}

server/routers/launcher/launcherResourceAccess.ts

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { db } from "@server/db";
 import {
     exitNodes,
@@ -31,13 +32,15 @@ import {
     isNull,
     like,
     or,
-    sql
+    sql,
+    type SQL
 } from "drizzle-orm";
 import {
     formatPublicResourceAccess,
     formatSiteResourceAccess
 } from "./formatLauncherAccess";
 import {
+    LAUNCHER_FLAT_GROUP_KEY,
     LAUNCHER_NO_SITE_GROUP_KEY,
     LAUNCHER_UNLABELED_GROUP_KEY,
     type LauncherFilterListQuery,
@@ -59,6 +62,68 @@ export type AccessibleIds = {
 };
 
 const LAUNCHER_ACCESSIBLE_IDS_TTL_SEC = 60;
+const LAUNCHER_RESOURCES_RESULT_TTL_SEC = 60;
+const LAUNCHER_GROUPS_RESULT_TTL_SEC = 60;
+
+type LauncherResourcesCacheEntry = {
+    items: LauncherResource[];
+    total: number;
+};
+
+type LauncherGroupsCacheEntry = {
+    groups: LauncherGroup[];
+    total: number;
+};
+
+function launcherListQueryHash(
+    userRoleIds: number[],
+    query: LauncherListQuery,
+    extra?: Record<string, string>
+) {
+    const payload = JSON.stringify({
+        roles: [...userRoleIds].sort((a, b) => a - b),
+        query: query.query,
+        groupBy: query.groupBy,
+        siteIds: query.siteIds ?? "",
+        labelIds: query.labelIds ?? "",
+        sort_by: query.sort_by,
+        order: query.order,
+        ...extra
+    });
+    return createHash("sha256").update(payload).digest("hex").slice(0, 16);
+}
+
+function launcherResourcesQueryHash(
+    userRoleIds: number[],
+    query: LauncherListQuery & { groupKey: string }
+) {
+    return launcherListQueryHash(userRoleIds, query, {
+        groupKey: query.groupKey
+    });
+}
+
+function launcherGroupsQueryHash(
+    userRoleIds: number[],
+    query: LauncherListQuery
+) {
+    return launcherListQueryHash(userRoleIds, query);
+}
+
+function launcherResourcesCacheKey(
+    orgId: string,
+    userId: string,
+    queryHash: string
+) {
+    return `launcher:results:${orgId}:${userId}:${queryHash}`;
+}
+
+function launcherGroupsCacheKey(
+    orgId: string,
+    userId: string,
+    queryHash: string
+) {
+    return `launcher:groups:${orgId}:${userId}:${queryHash}`;
+}
 
 function launcherAccessibleIdsCacheKey(
     orgId: string,
@@ -194,10 +259,22 @@ function searchPattern(query: string) {
     return `%${query.trim()}%`;
 }
 
-function buildSearchConditionForPublic(
-    query: string,
-    labelsFeatureEnabled: boolean
-) {
+function combineOrConditions(
+    ...conditions: (SQL | undefined)[]
+): SQL | undefined {
+    const parts = conditions.filter(
+        (condition): condition is SQL => !!condition
+    );
+    if (parts.length === 0) {
+        return undefined;
+    }
+    if (parts.length === 1) {
+        return parts[0];
+    }
+    return or(...parts);
+}
+
+function buildSearchConditionForPublic(query: string) {
     if (!query.trim()) {
         return undefined;
     }
@@ -205,32 +282,31 @@ function buildSearchConditionForPublic(
     const queryList = [
         like(sql`LOWER(${resources.name})`, pattern),
         like(sql`LOWER(${resources.fullDomain})`, pattern),
-        like(sql`LOWER(cast(${resources.proxyPort} as text))`, pattern)
+        like(sql`LOWER(cast(${resources.proxyPort} as text))`, pattern),
+        inArray(
+            resources.resourceId,
+            db
+                .select({ id: resources.resourceId })
+                .from(resources)
+                .leftJoin(targets, eq(targets.resourceId, resources.resourceId))
+                .leftJoin(sites, eq(targets.siteId, sites.siteId))
+                .leftJoin(exitNodes, eq(sites.exitNodeId, exitNodes.exitNodeId))
+                .where(like(sql`LOWER(${exitNodes.endpoint})`, pattern))
+        ),
+        inArray(
+            resources.resourceId,
+            db
+                .select({ id: resourceLabels.resourceId })
+                .from(resourceLabels)
+                .innerJoin(labels, eq(labels.labelId, resourceLabels.labelId))
+                .where(like(sql`LOWER(${labels.name})`, pattern))
+        )
     ];
 
-    if (labelsFeatureEnabled) {
-        queryList.push(
-            inArray(
-                resources.resourceId,
-                db
-                    .select({ id: resourceLabels.resourceId })
-                    .from(resourceLabels)
-                    .innerJoin(
-                        labels,
-                        eq(labels.labelId, resourceLabels.labelId)
-                    )
-                    .where(like(sql`LOWER(${labels.name})`, pattern))
-            )
-        );
-    }
-
     return or(...queryList);
 }
 
-function buildSearchConditionForSiteResource(
-    query: string,
-    labelsFeatureEnabled: boolean
-) {
+function buildSearchConditionForSiteResource(query: string) {
     if (!query.trim()) {
         return undefined;
     }
@@ -238,32 +314,99 @@ function buildSearchConditionForSiteResource(
     const queryList = [
         like(sql`LOWER(${siteResources.name})`, pattern),
         like(sql`LOWER(${siteResources.destination})`, pattern),
+        like(
+            sql`LOWER(cast(${siteResources.destinationPort} as text))`,
+            pattern
+        ),
+        like(sql`LOWER(${siteResources.scheme})`, pattern),
         like(sql`LOWER(${siteResources.alias})`, pattern),
         like(sql`LOWER(${siteResources.fullDomain})`, pattern),
-        like(sql`LOWER(${siteResources.aliasAddress})`, pattern)
+        like(sql`LOWER(${siteResources.aliasAddress})`, pattern),
+        inArray(
+            siteResources.siteResourceId,
+            db
+                .select({ id: siteResourceLabels.siteResourceId })
+                .from(siteResourceLabels)
+                .innerJoin(
+                    labels,
+                    eq(labels.labelId, siteResourceLabels.labelId)
+                )
+                .where(like(sql`LOWER(${labels.name})`, pattern))
+        )
     ];
 
-    if (labelsFeatureEnabled) {
-        queryList.push(
-            inArray(
-                siteResources.siteResourceId,
-                db
-                    .select({ id: siteResourceLabels.siteResourceId })
-                    .from(siteResourceLabels)
-                    .innerJoin(
-                        labels,
-                        eq(labels.labelId, siteResourceLabels.labelId)
-                    )
-                    .where(like(sql`LOWER(${labels.name})`, pattern))
-            )
-        );
-    }
-
     return or(...queryList);
 }
 
-async function labelsEnabled(orgId: string): Promise<boolean> {
-    return isLicensedOrSubscribed(orgId, tierMatrix.labels);
+async function filterPublicResourceIdsByTextSearch(
+    orgId: string,
+    resourceIds: number[],
+    query: string
+): Promise<number[]> {
+    if (!query.trim() || resourceIds.length === 0) {
+        return resourceIds;
+    }
+
+    const textMatch = combineOrConditions(
+        buildSearchConditionForPublic(query),
+        buildSiteNameSearchCondition(query)
+    );
+    if (!textMatch) {
+        return resourceIds;
+    }
+
+    const rows = await db
+        .selectDistinct({ resourceId: resources.resourceId })
+        .from(resources)
+        .leftJoin(targets, eq(targets.resourceId, resources.resourceId))
+        .leftJoin(sites, eq(targets.siteId, sites.siteId))
+        .where(
+            and(
+                inArray(resources.resourceId, resourceIds),
+                eq(resources.orgId, orgId),
+                eq(resources.enabled, true),
+                textMatch
+            )
+        );
+
+    return rows.map((row) => row.resourceId);
+}
+
+async function filterSiteResourceIdsByTextSearch(
+    orgId: string,
+    siteResourceIds: number[],
+    query: string
+): Promise<number[]> {
+    if (!query.trim() || siteResourceIds.length === 0) {
+        return siteResourceIds;
+    }
+
+    const textMatch = combineOrConditions(
+        buildSearchConditionForSiteResource(query),
+        buildSiteNameSearchCondition(query)
+    );
+    if (!textMatch) {
+        return siteResourceIds;
+    }
+
+    const rows = await db
+        .selectDistinct({ siteResourceId: siteResources.siteResourceId })
+        .from(siteResources)
+        .leftJoin(
+            siteNetworks,
+            eq(siteResources.networkId, siteNetworks.networkId)
+        )
+        .leftJoin(sites, eq(siteNetworks.siteId, sites.siteId))
+        .where(
+            and(
+                inArray(siteResources.siteResourceId, siteResourceIds),
+                eq(siteResources.orgId, orgId),
+                eq(siteResources.enabled, true),
+                textMatch
+            )
+        );
+
+    return rows.map((row) => row.siteResourceId);
 }
 
 async function fetchLabelsForResources(
@@ -277,10 +420,6 @@ async function fetchLabelsForResources(
     const byResourceId = new Map<number, LauncherLabel[]>();
     const bySiteResourceId = new Map<number, LauncherLabel[]>();
 
-    if (!(await labelsEnabled(orgId))) {
-        return { byResourceId, bySiteResourceId };
-    }
-
     const [resourceLabelRows, siteResourceLabelRows] = await Promise.all([
         resourceIds.length === 0
             ? Promise.resolve([])
@@ -356,15 +495,8 @@ async function listSiteGroups(
 ): Promise<{ groups: LauncherGroup[]; total: number }> {
     const siteFilterIds = parseIdListParam(query.siteIds);
     const labelFilterIds = parseIdListParam(query.labelIds);
-    const labelsFeatureEnabled = await labelsEnabled(orgId);
-    const searchPublic = buildSearchConditionForPublic(
-        query.query,
-        labelsFeatureEnabled
-    );
-    const searchSite = buildSearchConditionForSiteResource(
-        query.query,
-        labelsFeatureEnabled
-    );
+    const searchPublic = buildSearchConditionForPublic(query.query);
+    const searchSite = buildSearchConditionForSiteResource(query.query);
     const siteCountMap = new Map<number, SiteGroupRow>();
 
     if (accessible.resourceIds.length > 0) {
@@ -588,9 +720,8 @@ async function listSiteGroups(
     });
 
     const total = groups.length;
-    const offset = (query.page - 1) * query.pageSize;
     return {
-        groups: groups.slice(offset, offset + query.pageSize),
+        groups,
         total
     };
 }
@@ -608,10 +739,6 @@ async function listLabelGroups(
     >();
     let unlabeledCount = 0;
 
-    if (!(await labelsEnabled(orgId))) {
-        return { groups: [], total: 0 };
-    }
-
     const matchesLabelFilters = (labelId: number) =>
         labelFilterIds.length === 0 || labelFilterIds.includes(labelId);
 
@@ -621,7 +748,7 @@ async function listLabelGroups(
             eq(resources.orgId, orgId),
             eq(resources.enabled, true)
         ];
-        const searchPublic = buildSearchConditionForPublic(query.query, true);
+        const searchPublic = buildSearchConditionForPublic(query.query);
         if (searchPublic) {
             publicConditions.push(searchPublic);
         }
@@ -685,10 +812,7 @@ async function listLabelGroups(
             eq(siteResources.orgId, orgId),
             eq(siteResources.enabled, true)
         ];
-        const searchSite = buildSearchConditionForSiteResource(
-            query.query,
-            true
-        );
+        const searchSite = buildSearchConditionForSiteResource(query.query);
         if (searchSite) {
             siteConditions.push(searchSite);
         }
@@ -788,26 +912,53 @@ async function listLabelGroups(
     });
 
     const total = groups.length;
-    const offset = (query.page - 1) * query.pageSize;
     return {
-        groups: groups.slice(offset, offset + query.pageSize),
+        groups,
         total
     };
 }
 
+async function listLauncherGroupsForUserUncached(
+    orgId: string,
+    userId: string,
+    userRoleIds: number[],
+    query: LauncherListQuery
+): Promise<LauncherGroupsCacheEntry> {
+    const accessible = await resolveAccessibleIds(orgId, userId, userRoleIds);
+
+    if (query.groupBy === "label") {
+        return listLabelGroups(orgId, accessible, query);
+    }
+
+    return listSiteGroups(orgId, accessible, query);
+}
+
 export async function listLauncherGroupsForUser(
     orgId: string,
     userId: string,
     userRoleIds: number[],
     query: LauncherListQuery
 ): Promise<{ groups: LauncherGroup[]; total: number }> {
-    const accessible = await resolveAccessibleIds(orgId, userId, userRoleIds);
+    const queryHash = launcherGroupsQueryHash(userRoleIds, query);
+    const cacheKey = launcherGroupsCacheKey(orgId, userId, queryHash);
+    const cached = await cache.get<LauncherGroupsCacheEntry>(cacheKey);
 
-    if (query.groupBy === "label") {
-        return listLabelGroups(orgId, accessible, query);
+    let result = cached;
+    if (!result) {
+        result = await listLauncherGroupsForUserUncached(
+            orgId,
+            userId,
+            userRoleIds,
+            query
+        );
+        await cache.set(cacheKey, result, LAUNCHER_GROUPS_RESULT_TTL_SEC);
     }
 
-    return listSiteGroups(orgId, accessible, query);
+    const offset = (query.page - 1) * query.pageSize;
+    return {
+        groups: result.groups.slice(offset, offset + query.pageSize),
+        total: result.total
+    };
 }
 
 async function mapPublicResources(
@@ -1018,26 +1169,6 @@ function filterResourcesByLabel(
     );
 }
 
-function filterResourcesBySearch(
-    items: LauncherResource[],
-    query: string
-): LauncherResource[] {
-    if (!query.trim()) {
-        return items;
-    }
-    const pattern = query.trim().toLowerCase();
-    return items.filter(
-        (item) =>
-            item.name.toLowerCase().includes(pattern) ||
-            item.accessDisplay.toLowerCase().includes(pattern) ||
-            item.accessCopyValue.toLowerCase().includes(pattern) ||
-            item.labels.some((label) =>
-                label.name.toLowerCase().includes(pattern)
-            ) ||
-            item.site?.name.toLowerCase().includes(pattern)
-    );
-}
-
 function sortLauncherResources(
     items: LauncherResource[],
     order: "asc" | "desc"
@@ -1050,12 +1181,12 @@ function sortLauncherResources(
     });
 }
 
-export async function listLauncherResourcesForUser(
+async function listLauncherResourcesForUserUncached(
     orgId: string,
     userId: string,
     userRoleIds: number[],
     query: LauncherListQuery & { groupKey: string }
-): Promise<{ resources: LauncherResource[]; total: number }> {
+): Promise<LauncherResourcesCacheEntry> {
     const accessible = await resolveAccessibleIds(orgId, userId, userRoleIds);
 
     const siteFilterIds = parseIdListParam(query.siteIds);
@@ -1128,6 +1259,23 @@ export async function listLauncherResourcesForUser(
         }
     }
 
+    if (query.query.trim()) {
+        if (filteredResourceIds.length > 0) {
+            filteredResourceIds = await filterPublicResourceIdsByTextSearch(
+                orgId,
+                filteredResourceIds,
+                query.query
+            );
+        }
+        if (filteredSiteResourceIds.length > 0) {
+            filteredSiteResourceIds = await filterSiteResourceIdsByTextSearch(
+                orgId,
+                filteredSiteResourceIds,
+                query.query
+            );
+        }
+    }
+
     const labelMaps = await fetchLabelsForResources(
         orgId,
         filteredResourceIds,
@@ -1159,21 +1307,48 @@ export async function listLauncherResourcesForUser(
     ]);
 
     let items = [...publicItems, ...siteItems];
-    items = filterResourcesBySearch(items, query.query);
 
-    if (query.groupBy === "label") {
-        items = filterResourcesByLabel(items, query.groupKey);
-    } else if (query.groupBy === "site") {
-        items = filterResourcesBySite(items, query.groupKey);
+    if (query.groupKey !== LAUNCHER_FLAT_GROUP_KEY) {
+        if (query.groupBy === "label") {
+            items = filterResourcesByLabel(items, query.groupKey);
+        } else if (query.groupBy === "site") {
+            items = filterResourcesBySite(items, query.groupKey);
+        }
     }
 
     items = sortLauncherResources(items, query.order);
 
-    const total = items.length;
+    return {
+        items,
+        total: items.length
+    };
+}
+
+export async function listLauncherResourcesForUser(
+    orgId: string,
+    userId: string,
+    userRoleIds: number[],
+    query: LauncherListQuery & { groupKey: string }
+): Promise<{ resources: LauncherResource[]; total: number }> {
+    const queryHash = launcherResourcesQueryHash(userRoleIds, query);
+    const cacheKey = launcherResourcesCacheKey(orgId, userId, queryHash);
+    const cached = await cache.get<LauncherResourcesCacheEntry>(cacheKey);
+
+    let result = cached;
+    if (!result) {
+        result = await listLauncherResourcesForUserUncached(
+            orgId,
+            userId,
+            userRoleIds,
+            query
+        );
+        await cache.set(cacheKey, result, LAUNCHER_RESOURCES_RESULT_TTL_SEC);
+    }
+
     const offset = (query.page - 1) * query.pageSize;
     return {
-        resources: items.slice(offset, offset + query.pageSize),
-        total
+        resources: result.items.slice(offset, offset + query.pageSize),
+        total: result.total
     };
 }
 
@@ -1296,10 +1471,6 @@ async function collectAccessibleLabels(
 ): Promise<Map<number, LauncherLabel>> {
     const labelMap = new Map<number, LauncherLabel>();
 
-    if (!(await labelsEnabled(orgId))) {
-        return labelMap;
-    }
-
     if (accessible.resourceIds.length > 0) {
         const publicConditions = [
             inArray(resources.resourceId, accessible.resourceIds),

server/routers/launcher/launcherScale.ts

@@ -0,0 +1,133 @@
+import { regionalCache as cache } from "#dynamic/lib/cache";
+import {
+    listLauncherGroupsForUser,
+    resolveAccessibleIds
+} from "./launcherResourceAccess";
+import {
+    parseIdListParam,
+    type LauncherScaleInfo,
+    type LauncherScaleQuery
+} from "./types";
+
+export const LAUNCHER_FULL_MAX_RESOURCES = 2000;
+export const LAUNCHER_FULL_MAX_SITE_GROUPS = 200;
+export const LAUNCHER_FULL_MAX_LABEL_GROUPS = 100;
+export const LAUNCHER_FILTERED_SITE_GROUPING_MAX = 20;
+
+const LAUNCHER_SCALE_COUNTS_TTL_SEC = 60;
+
+type LauncherScaleCountsCacheEntry = {
+    resourceCount: number;
+    siteGroupCount: number;
+    labelGroupCount: number;
+    mode: LauncherScaleInfo["mode"];
+};
+
+function launcherScaleCountsCacheKey(
+    orgId: string,
+    userId: string,
+    roleIds: number[]
+) {
+    const rolesKey = [...roleIds].sort((a, b) => a - b).join(",");
+    return `launcher:scale:counts:${orgId}:${userId}:${rolesKey}`;
+}
+
+function buildScaleCapabilities(
+    counts: LauncherScaleCountsCacheEntry,
+    query: LauncherScaleQuery
+): LauncherScaleInfo["capabilities"] {
+    const siteFilterIds = parseIdListParam(query.siteIds);
+    const labelFilterIds = parseIdListParam(query.labelIds);
+
+    return {
+        allowSiteGrouping:
+            counts.siteGroupCount <= LAUNCHER_FULL_MAX_SITE_GROUPS ||
+            (siteFilterIds.length > 0 &&
+                siteFilterIds.length <= LAUNCHER_FILTERED_SITE_GROUPING_MAX),
+        allowLabelGrouping:
+            counts.labelGroupCount <= LAUNCHER_FULL_MAX_LABEL_GROUPS ||
+            (labelFilterIds.length > 0 &&
+                labelFilterIds.length <= LAUNCHER_FILTERED_SITE_GROUPING_MAX),
+        requireSearchOrFilter:
+            counts.mode === "compact" &&
+            counts.resourceCount > LAUNCHER_FULL_MAX_RESOURCES
+    };
+}
+
+async function getLauncherScaleCountsForUser(
+    orgId: string,
+    userId: string,
+    userRoleIds: number[]
+): Promise<LauncherScaleCountsCacheEntry> {
+    const cacheKey = launcherScaleCountsCacheKey(orgId, userId, userRoleIds);
+    const cached = await cache.get<LauncherScaleCountsCacheEntry>(cacheKey);
+    if (cached) {
+        return cached;
+    }
+
+    const accessible = await resolveAccessibleIds(orgId, userId, userRoleIds);
+    const resourceCount =
+        accessible.resourceIds.length + accessible.siteResourceIds.length;
+
+    const baselineQuery = {
+        query: "",
+        groupBy: "site" as const,
+        siteIds: undefined,
+        labelIds: undefined,
+        sort_by: "name" as const,
+        order: "asc" as const,
+        page: 1,
+        pageSize: 1
+    };
+
+    const [{ total: siteGroupCount }, { total: labelGroupCount }] =
+        await Promise.all([
+            listLauncherGroupsForUser(
+                orgId,
+                userId,
+                userRoleIds,
+                baselineQuery
+            ),
+            listLauncherGroupsForUser(orgId, userId, userRoleIds, {
+                ...baselineQuery,
+                groupBy: "label"
+            })
+        ]);
+
+    const mode =
+        resourceCount <= LAUNCHER_FULL_MAX_RESOURCES &&
+        siteGroupCount <= LAUNCHER_FULL_MAX_SITE_GROUPS
+            ? "full"
+            : "compact";
+
+    const result: LauncherScaleCountsCacheEntry = {
+        resourceCount,
+        siteGroupCount,
+        labelGroupCount,
+        mode
+    };
+
+    await cache.set(cacheKey, result, LAUNCHER_SCALE_COUNTS_TTL_SEC);
+    return result;
+}
+
+export async function getLauncherScaleForUser(
+    orgId: string,
+    userId: string,
+    userRoleIds: number[],
+    query: LauncherScaleQuery
+): Promise<LauncherScaleInfo> {
+    const counts = await getLauncherScaleCountsForUser(
+        orgId,
+        userId,
+        userRoleIds
+    );
+
+    return {
+        mode: counts.mode,
+        resourceCount: counts.resourceCount,
+        siteGroupCount: counts.siteGroupCount,
+        labelGroupCount: counts.labelGroupCount,
+        capabilities: buildScaleCapabilities(counts, query)
+    };
+}

server/routers/launcher/listLauncherScale.ts

@@ -0,0 +1,60 @@
+import { response } from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import { NextFunction, Request, Response } from "express";
+import createHttpError from "http-errors";
+import { fromZodError } from "zod-validation-error";
+import { getLauncherScaleForUser } from "./launcherScale";
+import { launcherScaleQuerySchema } from "./types";
+
+export async function listLauncherScale(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const orgId = req.userOrgId;
+        const userId = req.user!.userId;
+
+        if (!orgId) {
+            return next(
+                createHttpError(HttpCode.BAD_REQUEST, "Invalid organization ID")
+            );
+        }
+
+        const parsed = launcherScaleQuerySchema.safeParse(req.query);
+        if (!parsed.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromZodError(parsed.error)
+                )
+            );
+        }
+
+        const scale = await getLauncherScaleForUser(
+            orgId,
+            userId,
+            req.userOrgRoleIds ?? [],
+            parsed.data
+        );
+
+        return response(res, {
+            data: { scale },
+            success: true,
+            error: false,
+            message: "Launcher scale retrieved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        if (createHttpError.isHttpError(error)) {
+            return next(error);
+        }
+        console.error("Error listing launcher scale:", error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Internal server error"
+            )
+        );
+    }
+}

server/routers/launcher/listLauncherViews.ts

@@ -4,22 +4,10 @@ import HttpCode from "@server/types/HttpCode";
 import { and, eq, isNull, or } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import { launcherViewConfigSchema, type LauncherViewRecord } from "./types";
-
-function mapViewRow(
-    row: typeof launcherViews.$inferSelect
-): LauncherViewRecord {
-    return {
-        viewId: row.viewId,
-        orgId: row.orgId,
-        userId: row.userId,
-        name: row.name,
-        config: launcherViewConfigSchema.parse(JSON.parse(row.config)),
-        createdAt: row.createdAt,
-        updatedAt: row.updatedAt,
-        isOrgWide: row.userId == null
-    };
-}
+import {
+    extractDefaultViewOverrides,
+    listVisibleLauncherViews
+} from "./launcherDefaultView";
 
 export async function listLauncherViews(
     req: Request,
@@ -51,7 +39,8 @@ export async function listLauncherViews(
 
         return response(res, {
             data: {
-                views: rows.map(mapViewRow)
+                views: listVisibleLauncherViews(rows),
+                defaultViewOverrides: extractDefaultViewOverrides(rows)
             },
             success: true,
             error: false,

server/routers/launcher/types.ts

@@ -2,9 +2,10 @@ import { z } from "zod";
 
 export const LAUNCHER_UNLABELED_GROUP_KEY = "unlabeled";
 export const LAUNCHER_NO_SITE_GROUP_KEY = "no-site";
+export const LAUNCHER_FLAT_GROUP_KEY = "__all__";
 
 export const launcherViewConfigSchema = z.object({
-    groupBy: z.enum(["site", "label"]).default("site"),
+    groupBy: z.enum(["site", "label", "none"]).default("site"),
     layout: z.enum(["grid", "list"]).default("grid"),
     sortBy: z.literal("name").default("name"),
     order: z.enum(["asc", "desc"]).default("asc"),
@@ -88,10 +89,31 @@ export type LauncherViewRecord = {
     createdAt: string;
     updatedAt: string;
     isOrgWide: boolean;
+    isDefault: boolean;
 };
 
+export type LauncherDefaultViewOverrides = {
+    personal: LauncherViewRecord | null;
+    orgWide: LauncherViewRecord | null;
+};
+
+export function getEffectiveDefaultLauncherConfig(
+    overrides: LauncherDefaultViewOverrides
+): LauncherViewConfig {
+    if (overrides.personal) {
+        return overrides.personal.config;
+    }
+
+    if (overrides.orgWide) {
+        return overrides.orgWide.config;
+    }
+
+    return defaultLauncherViewConfig;
+}
+
 export type ListLauncherViewsResponse = {
     views: LauncherViewRecord[];
+    defaultViewOverrides: LauncherDefaultViewOverrides;
 };
 
 export const launcherFilterListQuerySchema = z.strictObject({
@@ -100,8 +122,8 @@ export const launcherFilterListQuerySchema = z.strictObject({
         .int()
         .positive()
         .optional()
-        .catch(500)
-        .default(500),
+        .catch(20)
+        .default(20),
     page: z.coerce.number().int().min(1).optional().catch(1).default(1),
     query: z.string().optional().default("")
 });
@@ -138,7 +160,7 @@ export const launcherListQuerySchema = z.strictObject({
         .default(20),
     page: z.coerce.number().int().min(1).optional().catch(1).default(1),
     query: z.string().optional().default(""),
-    groupBy: z.enum(["site", "label"]).optional().default("site"),
+    groupBy: z.enum(["site", "label", "none"]).optional().default("site"),
     groupKey: z.string().optional(),
     siteIds: z.string().optional(),
     labelIds: z.string().optional(),
@@ -163,3 +185,32 @@ export const DEFAULT_LAUNCHER_VIEW_ID = "default" as const;
 export type LauncherViewSelection =
     | { type: "default" }
     | { type: "saved"; viewId: number };
+
+export type LauncherScaleCapabilities = {
+    allowSiteGrouping: boolean;
+    allowLabelGrouping: boolean;
+    requireSearchOrFilter: boolean;
+};
+
+export type LauncherScaleInfo = {
+    mode: "full" | "compact";
+    resourceCount: number;
+    siteGroupCount: number;
+    labelGroupCount: number;
+    capabilities: LauncherScaleCapabilities;
+};
+
+export type ListLauncherScaleResponse = {
+    scale: LauncherScaleInfo;
+};
+
+export const launcherScaleQuerySchema = z.strictObject({
+    query: z.string().optional().default(""),
+    groupBy: z.enum(["site", "label", "none"]).optional().default("site"),
+    siteIds: z.string().optional(),
+    labelIds: z.string().optional(),
+    sort_by: z.literal("name").optional().default("name"),
+    order: z.enum(["asc", "desc"]).optional().default("asc")
+});
+
+export type LauncherScaleQuery = z.infer<typeof launcherScaleQuerySchema>;

server/routers/launcher/updateLauncherView.ts

@@ -66,6 +66,15 @@ export async function updateLauncherView(
             );
         }
 
+        if (existing.isDefault) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Use the default view save endpoint for this view"
+                )
+            );
+        }
+
         const isPersonalView = existing.userId === userId;
         const isOrgWideView = existing.userId == null;
         const canManageOrgWide = await checkUserActionPermission(
@@ -135,7 +144,8 @@ export async function updateLauncherView(
                 ),
                 createdAt: updated.createdAt,
                 updatedAt: updated.updatedAt,
-                isOrgWide: updated.userId == null
+                isOrgWide: updated.userId == null,
+                isDefault: updated.isDefault
             },
             success: true,
             error: false,

server/routers/launcher/upsertLauncherDefaultView.ts

@@ -0,0 +1,82 @@
+import { response } from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import { NextFunction, Request, Response } from "express";
+import createHttpError from "http-errors";
+import { fromZodError } from "zod-validation-error";
+import { z } from "zod";
+import { ActionsEnum, checkUserActionPermission } from "@server/auth/actions";
+import { upsertDefaultViewOverride } from "./launcherDefaultView";
+import { launcherViewConfigSchema } from "./types";
+
+const upsertLauncherDefaultViewBodySchema = z.strictObject({
+    config: launcherViewConfigSchema,
+    orgWide: z.boolean().optional().default(false)
+});
+
+export async function upsertLauncherDefaultView(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const orgId = req.userOrgId;
+        const userId = req.user!.userId;
+
+        if (!orgId) {
+            return next(
+                createHttpError(HttpCode.BAD_REQUEST, "Invalid organization ID")
+            );
+        }
+
+        const parsed = upsertLauncherDefaultViewBodySchema.safeParse(req.body);
+        if (!parsed.success) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromZodError(parsed.error)
+                )
+            );
+        }
+
+        if (parsed.data.orgWide) {
+            const canManageOrgWide = await checkUserActionPermission(
+                ActionsEnum.createOrgWideLauncherView,
+                req
+            );
+            if (!canManageOrgWide) {
+                return next(
+                    createHttpError(
+                        HttpCode.FORBIDDEN,
+                        "User does not have permission perform this action"
+                    )
+                );
+            }
+        }
+
+        const view = await upsertDefaultViewOverride({
+            orgId,
+            userId,
+            orgWide: parsed.data.orgWide,
+            config: parsed.data.config
+        });
+
+        return response(res, {
+            data: view,
+            success: true,
+            error: false,
+            message: "Launcher default view saved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        if (createHttpError.isHttpError(error)) {
+            return next(error);
+        }
+        console.error("Error saving launcher default view:", error);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Internal server error"
+            )
+        );
+    }
+}

server/routers/newt/buildConfiguration.ts

@@ -52,13 +52,13 @@ export async function buildClientConfigurationForNewtClient(
             clientsRes
                 .filter((client) => {
                     if (!client.clients.pubKey) {
-                        logger.warn(
+                        logger.debug(
                             `Client ${client.clients.clientId} has no public key, skipping`
                         );
                         return false;
                     }
                     if (!client.clients.subnet) {
-                        logger.warn(
+                        logger.debug(
                             `Client ${client.clients.clientId} has no subnet, skipping`
                         );
                         return false;

server/routers/newt/handleApplyBlueprintMessage.ts

@@ -50,7 +50,7 @@ export const handleApplyBlueprintMessage: MessageHandler = async (context) => {
             source: "NEWT"
         });
     } catch (error) {
-        logger.error(`Failed to update database from config: ${error}`);
+        logger.debug(`Failed to update database from config: ${error}`);
         return {
             message: {
                 type: "newt/blueprint/results",

server/routers/newt/handleNewtDisconnectingMessage.ts

@@ -19,7 +19,7 @@ export const handleNewtDisconnectingMessage: MessageHandler = async (
     }
 
     if (!newt.siteId) {
-        logger.warn("Newt has no client ID!");
+        logger.warn("Newt has no site ID!");
         return;
     }
 
@@ -34,6 +34,12 @@ export const handleNewtDisconnectingMessage: MessageHandler = async (
                 .where(eq(sites.siteId, newt.siteId!))
                 .returning();
 
+            if (!site) {
+                throw new Error(
+                    `Could not find site ${newt.siteId} to update disconnection from disconnect message`
+                );
+            }
+
             await fireSiteOfflineAlert(
                 site.orgId,
                 site.siteId,
@@ -43,6 +49,6 @@ export const handleNewtDisconnectingMessage: MessageHandler = async (
             );
         });
     } catch (error) {
-        logger.error("Error handling disconnecting message", { error });
+        logger.error("Error handling site disconnecting message", error);
     }
 };

server/routers/newt/handleNewtPingMessage.ts

@@ -5,8 +5,21 @@ import { Newt } from "@server/db";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
 import { sendNewtSyncMessage } from "./sync";
+import semver from "semver";
 import { recordSitePing } from "./pingAccumulator";
 
+const NEWT_SUPPORTS_SYNC_VERSION = ">=1.14.0";
+const PONG = {
+    message: {
+        type: "pong",
+        data: {
+            timestamp: new Date().toISOString()
+        }
+    },
+    broadcast: false,
+    excludeSender: false
+};
+
 /**
  * Handles ping messages from newt clients.
  *
@@ -37,6 +50,14 @@ export const handleNewtPingMessage: MessageHandler = async (context) => {
     // cross-region latency to the database.
     recordSitePing(newt.siteId);
 
+    if (
+        newt.version &&
+        !semver.satisfies(newt.version, NEWT_SUPPORTS_SYNC_VERSION)
+    ) {
+        // Newt does not support the sync message so not checking - stop here -
+        return PONG;
+    }
+
     // Check config version and sync if stale.
     const configVersion = await getClientConfigVersion(newt.newtId);
 
@@ -65,14 +86,5 @@ export const handleNewtPingMessage: MessageHandler = async (context) => {
         await sendNewtSyncMessage(newt, site);
     }
 
-    return {
-        message: {
-            type: "pong",
-            data: {
-                timestamp: new Date().toISOString()
-            }
-        },
-        broadcast: false,
-        excludeSender: false
-    };
+    return PONG;
 };

server/routers/newt/pingAccumulator.ts

@@ -3,6 +3,7 @@ import { sites, clients, olms } from "@server/db";
 import { and, eq, inArray } from "drizzle-orm";
 import logger from "@server/logger";
 import { fireSiteOnlineAlert } from "@server/lib/alerts";
+import { withRetry } from "@server/lib/dbRetry";
 
 /**
  * Ping Accumulator
@@ -22,8 +23,6 @@ import { fireSiteOnlineAlert } from "@server/lib/alerts";
  */
 
 const FLUSH_INTERVAL_MS = 10_000; // Flush every 10 seconds
-const MAX_RETRIES = 5;
-const BASE_DELAY_MS = 50;
 
 // ── Site (newt) pings ──────────────────────────────────────────────────
 // Map of siteId -> latest ping timestamp (unix seconds)
@@ -266,85 +265,7 @@ export async function flushPingsToDb(): Promise<void> {
 }
 
 // ── Retry / Error Helpers ──────────────────────────────────────────────
-
-/**
- * Simple retry wrapper with exponential backoff for transient errors
- * (deadlocks, connection timeouts, unexpected disconnects).
- *
- * PostgreSQL deadlocks (40P01) are always safe to retry: the database
- * guarantees exactly one winner per deadlock pair, so the loser just needs
- * to try again. MAX_RETRIES is intentionally higher than typical connection
- * retry budgets to give deadlock victims enough chances to succeed.
- */
-async function withRetry<T>(
-    operation: () => Promise<T>,
-    context: string
-): Promise<T> {
-    let attempt = 0;
-    while (true) {
-        try {
-            return await operation();
-        } catch (error: any) {
-            if (isTransientError(error) && attempt < MAX_RETRIES) {
-                attempt++;
-                const baseDelay = Math.pow(2, attempt - 1) * BASE_DELAY_MS;
-                const jitter = Math.random() * baseDelay;
-                const delay = baseDelay + jitter;
-                logger.warn(
-                    `Transient DB error in ${context}, retrying attempt ${attempt}/${MAX_RETRIES} after ${delay.toFixed(0)}ms`,
-                    { code: error?.code ?? error?.cause?.code }
-                );
-                await new Promise((resolve) => setTimeout(resolve, delay));
-                continue;
-            }
-            throw error;
-        }
-    }
-}
-
-/**
- * Detect transient errors that are safe to retry.
- */
-function isTransientError(error: any): boolean {
-    if (!error) return false;
-
-    const message = (error.message || "").toLowerCase();
-    const causeMessage = (error.cause?.message || "").toLowerCase();
-    const code = error.code || error.cause?.code || "";
-
-    // Connection timeout / terminated
-    if (
-        message.includes("connection timeout") ||
-        message.includes("connection terminated") ||
-        message.includes("timeout exceeded when trying to connect") ||
-        causeMessage.includes("connection terminated unexpectedly") ||
-        causeMessage.includes("connection timeout")
-    ) {
-        return true;
-    }
-
-    // PostgreSQL deadlock detected - always safe to retry (one winner guaranteed)
-    if (code === "40P01" || message.includes("deadlock")) {
-        return true;
-    }
-
-    // PostgreSQL serialization failure
-    if (code === "40001") {
-        return true;
-    }
-
-    // ECONNRESET, ECONNREFUSED, EPIPE, ETIMEDOUT
-    if (
-        code === "ECONNRESET" ||
-        code === "ECONNREFUSED" ||
-        code === "EPIPE" ||
-        code === "ETIMEDOUT"
-    ) {
-        return true;
-    }
-
-    return false;
-}
+// See @server/lib/dbRetry for the shared withRetry/isTransientError helpers.
 
 // ── Lifecycle ──────────────────────────────────────────────────────────
 

server/routers/newt/sync.ts

@@ -9,45 +9,45 @@ import {
 import { canCompress } from "@server/lib/clientVersionChecks";
 
 export async function sendNewtSyncMessage(newt: Newt, site: Site) {
-    // const {
-    //     tcpTargets,
-    //     udpTargets,
-    //     validHealthCheckTargets,
-    //     browserGatewayTargets,
-    //     remoteExitNodeSubnets
-    // } = await buildTargetConfigurationForNewtClient(site.siteId);
-    // let exitNode: ExitNode | undefined;
-    // if (site.exitNodeId) {
-    //     [exitNode] = await db
-    //         .select()
-    //         .from(exitNodes)
-    //         .where(eq(exitNodes.exitNodeId, site.exitNodeId))
-    //         .limit(1);
-    // }
-    // const { peers, targets } = await buildClientConfigurationForNewtClient(
-    //     site,
-    //     exitNode
-    // );
-    // await sendToClient(
-    //     newt.newtId,
-    //     {
-    //         type: "newt/sync",
-    //         data: {
-    //             proxyTargets: {
-    //                 udp: udpTargets,
-    //                 tcp: tcpTargets
-    //             },
-    //             healthCheckTargets: validHealthCheckTargets,
-    //             peers: peers,
-    //             clientTargets: targets,
-    //             browserGatewayTargets: browserGatewayTargets,
-    //             remoteExitNodeSubnets: remoteExitNodeSubnets
-    //         }
-    //     },
-    //     {
-    //         compress: canCompress(newt.version, "newt")
-    //     }
-    // ).catch((error) => {
-    //     logger.warn(`Error sending newt sync message:`, error);
-    // });
+    const {
+        tcpTargets,
+        udpTargets,
+        validHealthCheckTargets,
+        browserGatewayTargets,
+        remoteExitNodeSubnets
+    } = await buildTargetConfigurationForNewtClient(site.siteId);
+    let exitNode: ExitNode | undefined;
+    if (site.exitNodeId) {
+        [exitNode] = await db
+            .select()
+            .from(exitNodes)
+            .where(eq(exitNodes.exitNodeId, site.exitNodeId))
+            .limit(1);
+    }
+    const { peers, targets } = await buildClientConfigurationForNewtClient(
+        site,
+        exitNode
+    );
+    await sendToClient(
+        newt.newtId,
+        {
+            type: "newt/sync",
+            data: {
+                proxyTargets: {
+                    udp: udpTargets,
+                    tcp: tcpTargets
+                },
+                healthCheckTargets: validHealthCheckTargets,
+                peers: peers,
+                clientTargets: targets,
+                browserGatewayTargets: browserGatewayTargets,
+                remoteExitNodeSubnets: remoteExitNodeSubnets
+            }
+        },
+        {
+            compress: canCompress(newt.version, "newt")
+        }
+    ).catch((error) => {
+        logger.warn(`Error sending newt sync message:`, error);
+    });
 }

server/routers/olm/buildConfiguration.ts

@@ -161,7 +161,7 @@ export async function buildSiteConfigurationForOlmClient(
         }
 
         if (!site.subnet) {
-            logger.warn(`Site ${site.siteId} has no subnet, skipping`);
+            logger.debug(`Site ${site.siteId} has no subnet, skipping`);
             continue;
         }
 

server/routers/olm/handleOlmDisconnectingMessage.ts

@@ -6,7 +6,9 @@ import logger from "@server/logger";
 /**
  * Handles disconnecting messages from clients to show disconnected in the ui
  */
-export const handleOlmDisconnectingMessage: MessageHandler = async (context) => {
+export const handleOlmDisconnectingMessage: MessageHandler = async (
+    context
+) => {
     const { message, client: c, sendToClient } = context;
     const olm = c as Olm;
 
@@ -29,6 +31,6 @@ export const handleOlmDisconnectingMessage: MessageHandler = async (context) =>
             })
             .where(eq(clients.clientId, olm.clientId));
     } catch (error) {
-        logger.error("Error handling disconnecting message", { error });
+        logger.error("Error handling client disconnecting message", error);
     }
 };

server/routers/resource/addEmailToResourceWhitelist.ts

@@ -1,7 +1,12 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { resources, resourceWhitelist } from "@server/db";
+import {
+    resources,
+    resourceWhitelist,
+    resourcePolicies,
+    resourcePolicyWhiteList
+} from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -103,40 +108,99 @@ export async function addEmailToResourceWhitelist(
             );
         }
 
-        if (!resource.emailWhitelistEnabled) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Email whitelist is not enabled for this resource"
-                )
-            );
+        // A shared policy takes precedence over the resource's inline
+        // (default) policy, which takes precedence over the resource's own
+        // direct whitelist fields. This mirrors the precedence used at
+        // request time in authWithWhitelist.ts / getResourceAuthInfo.ts.
+        const policyId =
+            resource.resourcePolicyId ?? resource.defaultResourcePolicyId;
+
+        if (policyId !== null) {
+            const [policy] = await db
+                .select()
+                .from(resourcePolicies)
+                .where(eq(resourcePolicies.resourcePolicyId, policyId));
+
+            if (!policy) {
+                return next(
+                    createHttpError(
+                        HttpCode.NOT_FOUND,
+                        "Resource policy not found"
+                    )
+                );
+            }
+
+            if (!policy.emailWhitelistEnabled) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Email whitelist is not enabled for this resource"
+                    )
+                );
+            }
+
+            const existingEntry = await db
+                .select()
+                .from(resourcePolicyWhiteList)
+                .where(
+                    and(
+                        eq(
+                            resourcePolicyWhiteList.resourcePolicyId,
+                            policyId
+                        ),
+                        eq(resourcePolicyWhiteList.email, email)
+                    )
+                );
+
+            if (existingEntry.length > 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.CONFLICT,
+                        "Email already exists in whitelist"
+                    )
+                );
+            }
+
+            await db.insert(resourcePolicyWhiteList).values({
+                email,
+                resourcePolicyId: policyId
+            });
+        } else {
+            if (!resource.emailWhitelistEnabled) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Email whitelist is not enabled for this resource"
+                    )
+                );
+            }
+
+            // Check if email already exists in whitelist
+            const existingEntry = await db
+                .select()
+                .from(resourceWhitelist)
+                .where(
+                    and(
+                        eq(resourceWhitelist.resourceId, resourceId),
+                        eq(resourceWhitelist.email, email)
+                    )
+                );
+
+            if (existingEntry.length > 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.CONFLICT,
+                        "Email already exists in whitelist"
+                    )
+                );
+            }
+
+            await db.insert(resourceWhitelist).values({
+                email,
+                resourceId
+            });
         }
 
-        // Check if email already exists in whitelist
-        const existingEntry = await db
-            .select()
-            .from(resourceWhitelist)
-            .where(
-                and(
-                    eq(resourceWhitelist.resourceId, resourceId),
-                    eq(resourceWhitelist.email, email)
-                )
-            );
-
-        if (existingEntry.length > 0) {
-            return next(
-                createHttpError(
-                    HttpCode.CONFLICT,
-                    "Email already exists in whitelist"
-                )
-            );
-        }
-
-        await db.insert(resourceWhitelist).values({
-            email,
-            resourceId
-        });
-
         return response(res, {
             data: {},
             success: true,

server/routers/resource/getResourceWhitelist.ts

@@ -96,13 +96,17 @@ export async function getResourceWhitelist(
             );
         }
 
-        const isInlinePolicy =
-            resource.resourcePolicyId === null &&
-            resource.defaultResourcePolicyId !== null;
+        // A shared policy takes precedence over the resource's inline
+        // (default) policy, which takes precedence over the resource's own
+        // direct whitelist fields. This mirrors the precedence used at
+        // request time in authWithWhitelist.ts / getResourceAuthInfo.ts.
+        const policyId =
+            resource.resourcePolicyId ?? resource.defaultResourcePolicyId;
 
-        const whitelist = isInlinePolicy
-            ? await queryPolicyWhitelist(resource.defaultResourcePolicyId!)
-            : await queryWhitelist(resourceId);
+        const whitelist =
+            policyId !== null
+                ? await queryPolicyWhitelist(policyId)
+                : await queryWhitelist(resourceId);
 
         return response<GetResourceWhitelistResponse>(res, {
             data: {

server/routers/resource/getUserResources.ts

@@ -363,11 +363,6 @@ export async function getUserResources(
             (r) => r.siteResourceId
         );
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         let labelsForResources: Array<{
             labelId: number;
             name: string;
@@ -381,49 +376,45 @@ export async function getUserResources(
             siteResourceId: number;
         }> = [];
 
-        if (isLabelFeatureEnabled) {
-            [labelsForResources, labelsForSiteResources] = await Promise.all([
-                resourceIdList.length === 0
-                    ? Promise.resolve([])
-                    : db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              resourceId: resourceLabels.resourceId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              resourceLabels,
-                              eq(resourceLabels.labelId, labels.labelId)
+        [labelsForResources, labelsForSiteResources] = await Promise.all([
+            resourceIdList.length === 0
+                ? Promise.resolve([])
+                : db
+                      .select({
+                          labelId: labels.labelId,
+                          name: labels.name,
+                          color: labels.color,
+                          resourceId: resourceLabels.resourceId
+                      })
+                      .from(labels)
+                      .innerJoin(
+                          resourceLabels,
+                          eq(resourceLabels.labelId, labels.labelId)
+                      )
+                      .where(inArray(resourceLabels.resourceId, resourceIdList))
+                      .orderBy(asc(resourceLabels.resourceLabelId)),
+            siteResourceIdList.length === 0
+                ? Promise.resolve([])
+                : db
+                      .select({
+                          labelId: labels.labelId,
+                          name: labels.name,
+                          color: labels.color,
+                          siteResourceId: siteResourceLabels.siteResourceId
+                      })
+                      .from(labels)
+                      .innerJoin(
+                          siteResourceLabels,
+                          eq(siteResourceLabels.labelId, labels.labelId)
+                      )
+                      .where(
+                          inArray(
+                              siteResourceLabels.siteResourceId,
+                              siteResourceIdList
                           )
-                          .where(
-                              inArray(resourceLabels.resourceId, resourceIdList)
-                          )
-                          .orderBy(asc(resourceLabels.resourceLabelId)),
-                siteResourceIdList.length === 0
-                    ? Promise.resolve([])
-                    : db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              siteResourceId: siteResourceLabels.siteResourceId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              siteResourceLabels,
-                              eq(siteResourceLabels.labelId, labels.labelId)
-                          )
-                          .where(
-                              inArray(
-                                  siteResourceLabels.siteResourceId,
-                                  siteResourceIdList
-                              )
-                          )
-                          .orderBy(asc(siteResourceLabels.siteResourceLabelId))
-            ]);
-        }
+                      )
+                      .orderBy(asc(siteResourceLabels.siteResourceLabelId))
+        ]);
 
         // Check for password, pincode, and whitelist protection for each resource
         const resourcesWithAuth = await Promise.all(

server/routers/resource/listResources.ts

@@ -484,11 +484,6 @@ export async function listResources(
             );
         }
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         let accessibleResources: Array<{ resourceId: number }>;
         if (req.user) {
             accessibleResources = await db
@@ -616,8 +611,8 @@ export async function listResources(
                         and(
                             inArray(resources.mode, browserGatewayModes),
                             or(
-                                eq(effectiveSso, true),
-                                eq(effectiveWhitelist, true),
+                                effectiveSso,
+                                effectiveWhitelist,
                                 not(isNull(effectiveHeaderAuthId)),
                                 not(isNull(effectivePincodeId)),
                                 not(isNull(effectivePasswordId))
@@ -629,8 +624,8 @@ export async function listResources(
                     conditions.push(
                         and(
                             inArray(resources.mode, browserGatewayModes),
-                            not(eq(effectiveSso, true)),
-                            not(eq(effectiveWhitelist, true)),
+                            not(effectiveSso),
+                            not(effectiveWhitelist),
                             isNull(effectiveHeaderAuthId),
                             isNull(effectivePincodeId),
                             isNull(effectivePasswordId)
@@ -676,7 +671,7 @@ export async function listResources(
             );
         }
 
-        if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {
+        if (labelFilter && labelFilter.length > 0) {
             conditions.push(
                 inArray(
                     resources.resourceId,
@@ -697,25 +692,20 @@ export async function listResources(
             const queryList = [
                 like(sql`LOWER(${resources.name})`, q),
                 like(sql`LOWER(${resources.niceId})`, q),
-                like(sql`LOWER(${resources.fullDomain})`, q)
+                like(sql`LOWER(${resources.fullDomain})`, q),
+                inArray(
+                    resources.resourceId,
+                    db
+                        .select({ id: resourceLabels.resourceId })
+                        .from(resourceLabels)
+                        .innerJoin(
+                            labels,
+                            eq(labels.labelId, resourceLabels.labelId)
+                        )
+                        .where(like(sql`LOWER(${labels.name})`, q))
+                )
             ];
 
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        resources.resourceId,
-                        db
-                            .select({ id: resourceLabels.resourceId })
-                            .from(resourceLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, resourceLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-
             conditions.push(or(...queryList));
         }
 
@@ -747,27 +737,23 @@ export async function listResources(
             resourceId: number;
         }> = [];
 
-        if (isLabelFeatureEnabled) {
-            labelsForResources =
-                resourceIdList.length === 0
-                    ? []
-                    : await db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              resourceId: resourceLabels.resourceId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              resourceLabels,
-                              eq(resourceLabels.labelId, labels.labelId)
-                          )
-                          .where(
-                              inArray(resourceLabels.resourceId, resourceIdList)
-                          )
-                          .orderBy(asc(resourceLabels.resourceLabelId));
-        }
+        labelsForResources =
+            resourceIdList.length === 0
+                ? []
+                : await db
+                      .select({
+                          labelId: labels.labelId,
+                          name: labels.name,
+                          color: labels.color,
+                          resourceId: resourceLabels.resourceId
+                      })
+                      .from(labels)
+                      .innerJoin(
+                          resourceLabels,
+                          eq(resourceLabels.labelId, labels.labelId)
+                      )
+                      .where(inArray(resourceLabels.resourceId, resourceIdList))
+                      .orderBy(asc(resourceLabels.resourceLabelId));
 
         const allResourceTargets =
             resourceIdList.length === 0

server/routers/resource/listUserResourceAliases.ts

@@ -248,11 +248,6 @@ export async function listUserResourceAliases(
             });
         }
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         const whereConditions = [
             eq(siteResources.orgId, orgId),
             eq(siteResources.enabled, true),
@@ -262,7 +257,7 @@ export async function listUserResourceAliases(
             inArray(siteResources.siteResourceId, accessibleSiteResourceIds)
         ];
 
-        if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {
+        if (labelFilter && labelFilter.length > 0) {
             whereConditions.push(
                 inArray(
                     siteResources.siteResourceId,
@@ -310,7 +305,7 @@ export async function listUserResourceAliases(
                 siteResourceId: number;
             }> = [];
 
-            if (isLabelFeatureEnabled && siteResourceIdList.length > 0) {
+            if (siteResourceIdList.length > 0) {
                 labelsForSiteResources = await db
                     .select({
                         name: labels.name,

server/routers/resource/removeEmailFromResourceWhitelist.ts

@@ -1,7 +1,12 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { resources, resourceWhitelist } from "@server/db";
+import {
+    resources,
+    resourceWhitelist,
+    resourcePolicies,
+    resourcePolicyWhiteList
+} from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -102,44 +107,110 @@ export async function removeEmailFromResourceWhitelist(
             );
         }
 
-        if (!resource.emailWhitelistEnabled) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Email whitelist is not enabled for this resource"
-                )
-            );
+        // A shared policy takes precedence over the resource's inline
+        // (default) policy, which takes precedence over the resource's own
+        // direct whitelist fields. This mirrors the precedence used at
+        // request time in authWithWhitelist.ts / getResourceAuthInfo.ts.
+        const policyId =
+            resource.resourcePolicyId ?? resource.defaultResourcePolicyId;
+
+        if (policyId !== null) {
+            const [policy] = await db
+                .select()
+                .from(resourcePolicies)
+                .where(eq(resourcePolicies.resourcePolicyId, policyId));
+
+            if (!policy) {
+                return next(
+                    createHttpError(
+                        HttpCode.NOT_FOUND,
+                        "Resource policy not found"
+                    )
+                );
+            }
+
+            if (!policy.emailWhitelistEnabled) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Email whitelist is not enabled for this resource"
+                    )
+                );
+            }
+
+            const existingEntry = await db
+                .select()
+                .from(resourcePolicyWhiteList)
+                .where(
+                    and(
+                        eq(
+                            resourcePolicyWhiteList.resourcePolicyId,
+                            policyId
+                        ),
+                        eq(resourcePolicyWhiteList.email, email)
+                    )
+                );
+
+            if (existingEntry.length === 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.NOT_FOUND,
+                        "Email not found in whitelist"
+                    )
+                );
+            }
+
+            await db
+                .delete(resourcePolicyWhiteList)
+                .where(
+                    and(
+                        eq(
+                            resourcePolicyWhiteList.resourcePolicyId,
+                            policyId
+                        ),
+                        eq(resourcePolicyWhiteList.email, email)
+                    )
+                );
+        } else {
+            if (!resource.emailWhitelistEnabled) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Email whitelist is not enabled for this resource"
+                    )
+                );
+            }
+
+            // Check if email exists in whitelist
+            const existingEntry = await db
+                .select()
+                .from(resourceWhitelist)
+                .where(
+                    and(
+                        eq(resourceWhitelist.resourceId, resourceId),
+                        eq(resourceWhitelist.email, email)
+                    )
+                );
+
+            if (existingEntry.length === 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.NOT_FOUND,
+                        "Email not found in whitelist"
+                    )
+                );
+            }
+
+            await db
+                .delete(resourceWhitelist)
+                .where(
+                    and(
+                        eq(resourceWhitelist.resourceId, resourceId),
+                        eq(resourceWhitelist.email, email)
+                    )
+                );
         }
 
-        // Check if email exists in whitelist
-        const existingEntry = await db
-            .select()
-            .from(resourceWhitelist)
-            .where(
-                and(
-                    eq(resourceWhitelist.resourceId, resourceId),
-                    eq(resourceWhitelist.email, email)
-                )
-            );
-
-        if (existingEntry.length === 0) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    "Email not found in whitelist"
-                )
-            );
-        }
-
-        await db
-            .delete(resourceWhitelist)
-            .where(
-                and(
-                    eq(resourceWhitelist.resourceId, resourceId),
-                    eq(resourceWhitelist.email, email)
-                )
-            );
-
         return response(res, {
             data: {},
             success: true,

server/routers/resource/setResourceWhitelist.ts

@@ -109,13 +109,14 @@ export async function setResourceWhitelist(
             );
         }
 
-        const isInlinePolicy =
-            resource.resourcePolicyId === null &&
-            resource.defaultResourcePolicyId !== null;
-
-        if (isInlinePolicy) {
-            const policyId = resource.defaultResourcePolicyId!;
+        // A shared policy takes precedence over the resource's inline
+        // (default) policy, which takes precedence over the resource's own
+        // direct whitelist fields. This mirrors the precedence used at
+        // request time in authWithWhitelist.ts / getResourceAuthInfo.ts.
+        const policyId =
+            resource.resourcePolicyId ?? resource.defaultResourcePolicyId;
 
+        if (policyId !== null) {
             const [policy] = await db
                 .select()
                 .from(resourcePolicies)

server/routers/site/createSite.ts

@@ -268,7 +268,11 @@ export async function createSite(
 
         let newSite: Site | undefined;
         try {
-            if (subnet && exitNodeId) {
+            if (type === "wireguard" && subnet && exitNodeId) {
+                // Only wireguard sites actually persist the provided subnet/exitNodeId.
+                // Newt sites have their subnet/exit node chosen (under a lock) when the
+                // newt connects, so validating them here is both unnecessary and racy,
+                // since pickSiteDefaults does not lock the subnet it suggests.
                 //make sure the subnet is in the range of the exit node if provided
                 const [exitNode] = await db
                     .select()

server/routers/site/listSites.ts

@@ -235,11 +235,6 @@ export async function listSites(
             );
         }
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         const {
             pageSize,
             page,
@@ -291,7 +286,7 @@ export async function listSites(
             conditions.push(eq(sites.status, status));
         }
 
-        if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {
+        if (labelFilter && labelFilter.length > 0) {
             conditions.push(
                 inArray(
                     sites.siteId,
@@ -311,24 +306,20 @@ export async function listSites(
             const q = "%" + query.toLowerCase() + "%";
             const queryList = [
                 like(sql`LOWER(${sites.name})`, q),
-                like(sql`LOWER(${sites.niceId})`, q)
+                like(sql`LOWER(${sites.niceId})`, q),
+                inArray(
+                    sites.siteId,
+                    db
+                        .select({ id: siteLabels.siteId })
+                        .from(siteLabels)
+                        .innerJoin(
+                            labels,
+                            eq(labels.labelId, siteLabels.labelId)
+                        )
+                        .where(like(sql`LOWER(${labels.name})`, q))
+                )
             ];
 
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        sites.siteId,
-                        db
-                            .select({ id: siteLabels.siteId })
-                            .from(siteLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, siteLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
             conditions.push(or(...queryList)!);
         }
 
@@ -366,25 +357,23 @@ export async function listSites(
             siteId: number;
         }> = [];
 
-        if (isLabelFeatureEnabled) {
-            labelsForSites =
-                siteIds.length === 0
-                    ? []
-                    : await db
-                          .select({
-                              labelId: labels.labelId,
-                              name: labels.name,
-                              color: labels.color,
-                              siteId: siteLabels.siteId
-                          })
-                          .from(labels)
-                          .innerJoin(
-                              siteLabels,
-                              eq(siteLabels.labelId, labels.labelId)
-                          )
-                          .where(inArray(siteLabels.siteId, siteIds))
-                          .orderBy(asc(siteLabels.siteLabelId));
-        }
+        labelsForSites =
+            siteIds.length === 0
+                ? []
+                : await db
+                      .select({
+                          labelId: labels.labelId,
+                          name: labels.name,
+                          color: labels.color,
+                          siteId: siteLabels.siteId
+                      })
+                      .from(labels)
+                      .innerJoin(
+                          siteLabels,
+                          eq(siteLabels.labelId, labels.labelId)
+                      )
+                      .where(inArray(siteLabels.siteId, siteIds))
+                      .orderBy(asc(siteLabels.siteLabelId));
 
         const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {
             const siteWithUpdate: SiteWithUpdateAvailable = { ...site };

server/routers/siteResource/createSiteResource.ts

@@ -55,7 +55,7 @@ const createSiteResourceSchema = z
         siteIds: z.array(z.int()).optional(),
         siteId: z.number().int().positive().optional(), // DEPRECATED: for backward compatibility, we will convert this to siteIds array if provided
         destinationPort: z.int().positive().optional(),
-        destination: z.string().min(1).optional(),
+        destination: z.string().min(1).nullish(),
         enabled: z.boolean().default(true),
         alias: z
             .string()
@@ -161,7 +161,8 @@ const createSiteResourceSchema = z
                 return true;
             }
             return (
-                data.destination !== undefined && data.destination.trim() !== ""
+                data.destination !== undefined &&
+                data.destination?.trim() !== ""
             );
         },
         {

server/routers/siteResource/listAllSiteResourcesByOrg.ts

@@ -286,11 +286,6 @@ export async function listAllSiteResourcesByOrg(
             labels: labelFilter
         } = parsedQuery.data;
 
-        const isLabelFeatureEnabled = await isLicensedOrSubscribed(
-            orgId,
-            tierMatrix.labels
-        );
-
         const conditions = [and(eq(siteResources.orgId, orgId))];
 
         if (siteId != null) {
@@ -320,7 +315,7 @@ export async function listAllSiteResourcesByOrg(
             conditions.push(eq(siteResources.mode, mode));
         }
 
-        if (isLabelFeatureEnabled && labelFilter && labelFilter.length > 0) {
+        if (labelFilter && labelFilter.length > 0) {
             conditions.push(
                 inArray(
                     siteResources.siteResourceId,
@@ -344,25 +339,20 @@ export async function listAllSiteResourcesByOrg(
                 like(sql`LOWER(${siteResources.destination})`, q),
                 like(sql`LOWER(${siteResources.alias})`, q),
                 like(sql`LOWER(${siteResources.aliasAddress})`, q),
-                like(sql`LOWER(${sites.name})`, q)
+                like(sql`LOWER(${sites.name})`, q),
+                inArray(
+                    siteResources.siteResourceId,
+                    db
+                        .select({ id: siteResourceLabels.siteResourceId })
+                        .from(siteResourceLabels)
+                        .innerJoin(
+                            labels,
+                            eq(labels.labelId, siteResourceLabels.labelId)
+                        )
+                        .where(like(sql`LOWER(${labels.name})`, q))
+                )
             ];
 
-            if (isLabelFeatureEnabled) {
-                queryList.push(
-                    inArray(
-                        siteResources.siteResourceId,
-                        db
-                            .select({ id: siteResourceLabels.siteResourceId })
-                            .from(siteResourceLabels)
-                            .innerJoin(
-                                labels,
-                                eq(labels.labelId, siteResourceLabels.labelId)
-                            )
-                            .where(like(sql`LOWER(${labels.name})`, q))
-                    )
-                );
-            }
-
             conditions.push(or(...queryList));
         }
 
@@ -403,7 +393,7 @@ export async function listAllSiteResourcesByOrg(
             siteResourceId: number;
         }> = [];
 
-        if (isLabelFeatureEnabled && siteResourceIdList.length > 0) {
+        if (siteResourceIdList.length > 0) {
             labelsForSiteResources = await db
                 .select({
                     labelId: labels.labelId,

server/routers/siteResource/updateSiteResource.ts

@@ -54,7 +54,7 @@ const updateSiteResourceSchema = z
         ssl: z.boolean().optional(),
         scheme: z.enum(["http", "https"]).nullish(),
         destinationPort: z.int().positive().nullish(),
-        destination: z.string().min(1).optional(),
+        destination: z.string().min(1).nullish(),
         enabled: z.boolean().optional(),
         alias: z
             .string()
@@ -68,9 +68,9 @@ const updateSiteResourceSchema = z
                     "Fully qualified domain name with optional wildcards, e.g., example.internal, *.example.internal, or host-0?.example.internal",
                 example: "service.example.internal"
             }),
-        userIds: z.array(z.string()),
-        roleIds: z.array(z.int()),
-        clientIds: z.array(z.int()),
+        userIds: z.array(z.string()).optional(),
+        roleIds: z.array(z.int()).optional(),
+        clientIds: z.array(z.int()).optional(),
         tcpPortRangeString: portRangeStringSchema,
         udpPortRangeString: portRangeStringSchema,
         disableIcmp: z.boolean().optional(),
@@ -157,7 +157,8 @@ const updateSiteResourceSchema = z
                 return true;
             }
             return (
-                data.destination !== undefined && data.destination.trim() !== ""
+                data.destination !== undefined &&
+                data.destination?.trim() !== ""
             );
         },
         {
@@ -167,6 +168,10 @@ const updateSiteResourceSchema = z
     )
     .refine(
         (data) => {
+            // if neither is provided, the existing site associations are left unchanged
+            if (data.siteIds === undefined && data.siteId === undefined) {
+                return true;
+            }
             return (
                 (data.siteIds !== undefined && data.siteIds.length > 0) ||
                 data.siteId !== undefined
@@ -263,7 +268,7 @@ export async function updateSiteResource(
         const { siteResourceId } = parsedParams.data;
         const {
             name,
-            siteIds: siteIdsInput = [], // because it can change
+            siteIds: siteIdsInput,
             siteId,
             niceId,
             mode,
@@ -287,9 +292,14 @@ export async function updateSiteResource(
         } = parsedBody.data;
 
         // Backward compatibility: merge deprecated siteId into siteIds array
-        const siteIds = [...siteIdsInput];
-        if (siteId !== undefined && !siteIds.includes(siteId)) {
-            siteIds.push(siteId);
+        const siteIdsProvided =
+            siteIdsInput !== undefined || siteId !== undefined;
+        let siteIds: number[] | undefined;
+        if (siteIdsProvided) {
+            siteIds = [...(siteIdsInput ?? [])];
+            if (siteId !== undefined && !siteIds.includes(siteId)) {
+                siteIds.push(siteId);
+            }
         }
 
         // Check if site resource exists
@@ -356,20 +366,22 @@ export async function updateSiteResource(
         }
 
         // Verify the site exists and belongs to the org
-        const sitesToAssign = await db
-            .select()
-            .from(sites)
-            .where(
-                and(
-                    inArray(sites.siteId, siteIds),
-                    eq(sites.orgId, existingSiteResource.orgId)
-                )
-            );
+        if (siteIds !== undefined) {
+            const sitesToAssign = await db
+                .select()
+                .from(sites)
+                .where(
+                    and(
+                        inArray(sites.siteId, siteIds),
+                        eq(sites.orgId, existingSiteResource.orgId)
+                    )
+                );
 
-        if (sitesToAssign.length !== siteIds.length) {
-            return next(
-                createHttpError(HttpCode.NOT_FOUND, "Some site not found")
-            );
+            if (sitesToAssign.length !== siteIds.length) {
+                return next(
+                    createHttpError(HttpCode.NOT_FOUND, "Some site not found")
+                );
+            }
         }
 
         // Only check if destination is an IP address
@@ -463,7 +475,8 @@ export async function updateSiteResource(
         }
 
         let updatedSiteResource: SiteResource | undefined;
-        let updatedSiteIds: number[] = [];
+        // defaults to the existing sites; only overwritten below if siteIds/siteId was provided
+        let updatedSiteIds: number[] = [...existingSiteIds];
         await db.transaction(async (trx) => {
             // Update the site resource
             const sshPamSet =
@@ -522,81 +535,100 @@ export async function updateSiteResource(
 
             //////////////////// update the associations ////////////////////
 
-            // delete the site - site resources associations
-            await trx
-                .delete(siteNetworks)
-                .where(
-                    eq(siteNetworks.networkId, updatedSiteResource.networkId!)
-                );
-
-            for (const siteId of siteIds) {
-                await trx.insert(siteNetworks).values({
-                    siteId: siteId,
-                    networkId: updatedSiteResource.networkId!
-                });
-                updatedSiteIds.push(siteId);
-            }
-
-            await trx
-                .delete(clientSiteResources)
-                .where(eq(clientSiteResources.siteResourceId, siteResourceId));
-
-            if (clientIds.length > 0) {
-                await trx.insert(clientSiteResources).values(
-                    clientIds.map((clientId) => ({
-                        clientId,
-                        siteResourceId
-                    }))
-                );
-            }
-
-            await trx
-                .delete(userSiteResources)
-                .where(eq(userSiteResources.siteResourceId, siteResourceId));
-
-            if (userIds.length > 0) {
-                await trx.insert(userSiteResources).values(
-                    userIds.map((userId) => ({
-                        userId,
-                        siteResourceId
-                    }))
-                );
-            }
-
-            // Get all admin role IDs for this org to exclude from deletion
-            const adminRoles = await trx
-                .select()
-                .from(roles)
-                .where(
-                    and(
-                        eq(roles.isAdmin, true),
-                        eq(roles.orgId, updatedSiteResource.orgId)
-                    )
-                );
-            const adminRoleIds = adminRoles.map((role) => role.roleId);
-
-            if (adminRoleIds.length > 0) {
-                await trx.delete(roleSiteResources).where(
-                    and(
-                        eq(roleSiteResources.siteResourceId, siteResourceId),
-                        ne(roleSiteResources.roleId, adminRoleIds[0]) // delete all but the admin role
-                    )
-                );
-            } else {
+            if (siteIds !== undefined) {
+                // delete the site - site resources associations
                 await trx
-                    .delete(roleSiteResources)
+                    .delete(siteNetworks)
                     .where(
-                        eq(roleSiteResources.siteResourceId, siteResourceId)
+                        eq(
+                            siteNetworks.networkId,
+                            updatedSiteResource.networkId!
+                        )
                     );
+
+                updatedSiteIds = [];
+                for (const siteId of siteIds) {
+                    await trx.insert(siteNetworks).values({
+                        siteId: siteId,
+                        networkId: updatedSiteResource.networkId!
+                    });
+                    updatedSiteIds.push(siteId);
+                }
             }
 
-            if (roleIds.length > 0) {
-                await trx.insert(roleSiteResources).values(
-                    roleIds.map((roleId) => ({
-                        roleId,
-                        siteResourceId
-                    }))
-                );
+            if (clientIds !== undefined) {
+                await trx
+                    .delete(clientSiteResources)
+                    .where(
+                        eq(clientSiteResources.siteResourceId, siteResourceId)
+                    );
+
+                if (clientIds.length > 0) {
+                    await trx.insert(clientSiteResources).values(
+                        clientIds.map((clientId) => ({
+                            clientId,
+                            siteResourceId
+                        }))
+                    );
+                }
+            }
+
+            if (userIds !== undefined) {
+                await trx
+                    .delete(userSiteResources)
+                    .where(
+                        eq(userSiteResources.siteResourceId, siteResourceId)
+                    );
+
+                if (userIds.length > 0) {
+                    await trx.insert(userSiteResources).values(
+                        userIds.map((userId) => ({
+                            userId,
+                            siteResourceId
+                        }))
+                    );
+                }
+            }
+
+            if (roleIds !== undefined) {
+                // Get all admin role IDs for this org to exclude from deletion
+                const adminRoles = await trx
+                    .select()
+                    .from(roles)
+                    .where(
+                        and(
+                            eq(roles.isAdmin, true),
+                            eq(roles.orgId, updatedSiteResource.orgId)
+                        )
+                    );
+                const adminRoleIds = adminRoles.map((role) => role.roleId);
+
+                if (adminRoleIds.length > 0) {
+                    await trx.delete(roleSiteResources).where(
+                        and(
+                            eq(
+                                roleSiteResources.siteResourceId,
+                                siteResourceId
+                            ),
+                            ne(roleSiteResources.roleId, adminRoleIds[0]) // delete all but the admin role
+                        )
+                    );
+                } else {
+                    await trx
+                        .delete(roleSiteResources)
+                        .where(
+                            eq(roleSiteResources.siteResourceId, siteResourceId)
+                        );
+                }
+
+                if (roleIds.length > 0) {
+                    await trx.insert(roleSiteResources).values(
+                        roleIds.map((roleId) => ({
+                            roleId,
+                            siteResourceId
+                        }))
+                    );
+                }
             }
 
             logger.info(`Updated site resource ${siteResourceId}`);

server/setup/ensureActions.ts

@@ -3,8 +3,12 @@ import { db, orgs } from "@server/db";
 import { actions, roles, roleActions } from "@server/db";
 import { eq, inArray } from "drizzle-orm";
 import logger from "@server/logger";
+import { build } from "@server/build";
 
 export async function ensureActions() {
+    if (build == "saas") {
+        return;
+    }
     await db.transaction(async (trx) => {
         const actionIds = Object.values(ActionsEnum);
         const existingActions = await trx.select().from(actions).execute();

server/setup/migrationsPg.ts

@@ -26,6 +26,7 @@ import m17 from "./scriptsPg/1.18.0";
 import m18 from "./scriptsPg/1.18.3";
 import m19 from "./scriptsPg/1.18.4";
 import m20 from "./scriptsPg/1.19.0";
+import m21 from "./scriptsPg/1.20.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -51,7 +52,8 @@ const migrations = [
     { version: "1.18.0", run: m17 },
     { version: "1.18.3", run: m18 },
     { version: "1.18.4", run: m19 },
-    { version: "1.19.0", run: m20 }
+    { version: "1.19.0", run: m20 },
+    { version: "1.20.0", run: m21 }
     // Add new migrations here as they are created
 ] as {
     version: string;

server/setup/migrationsSqlite.ts

@@ -45,7 +45,7 @@ import m39 from "./scriptsSqlite/1.18.3";
 import m40 from "./scriptsSqlite/1.18.4";
 import m41 from "./scriptsSqlite/1.19.0";
 import m42 from "./scriptsSqlite/1.19.1";
-import m43 from "./scriptsSqlite/1.19.5";
+import m43 from "./scriptsSqlite/1.20.0";
 
 // THIS CANNOT IMPORT ANYTHING FROM THE SERVER
 // EXCEPT FOR THE DATABASE AND THE SCHEMA
@@ -89,7 +89,7 @@ const migrations = [
     { version: "1.18.4", run: m40 },
     { version: "1.19.0", run: m41 },
     { version: "1.19.1", run: m42 },
-    { version: "1.19.5", run: m43 }
+    { version: "1.20.0", run: m43 }
     // Add new migrations here as they are created
 ] as const;
 

server/setup/scriptsPg/1.20.0.ts

@@ -0,0 +1,104 @@
+import { db } from "@server/db/pg/driver";
+import { sql } from "drizzle-orm";
+
+const version = "1.20.0";
+
+export default async function migration() {
+    console.log(`Running setup script ${version}...`);
+
+    try {
+        await db.execute(sql`BEGIN`);
+
+        await db.execute(sql`
+            CREATE TABLE "remoteExitNodePreferenceLabels" (
+                "remoteExitNodePreferenceLabelId" serial PRIMARY KEY NOT NULL,
+                "remoteExitNodeId" varchar NOT NULL,
+                "labelId" integer NOT NULL,
+                CONSTRAINT "remote_exit_node_preference_label_uniq" UNIQUE("remoteExitNodeId","labelId")
+            );
+        `);
+
+        await db.execute(sql`
+            CREATE TABLE "remoteExitNodeResources" (
+                "remoteExitNodeResourceId" serial PRIMARY KEY NOT NULL,
+                "remoteExitNodeId" varchar NOT NULL,
+                "destination" varchar NOT NULL
+            );
+        `);
+
+        await db.execute(sql`
+            CREATE TABLE "launcherViews" (
+                "viewId" serial PRIMARY KEY NOT NULL,
+                "orgId" varchar NOT NULL,
+                "userId" varchar,
+                "name" varchar NOT NULL,
+                "config" text NOT NULL,
+                "isDefault" boolean DEFAULT false NOT NULL,
+                "createdAt" varchar NOT NULL,
+                "updatedAt" varchar NOT NULL
+            );
+        `);
+
+        await db.execute(
+            sql`ALTER TABLE "domains" ADD COLUMN "lastCheckedAt" integer;`
+        );
+
+        await db.execute(sql`
+            ALTER TABLE "remoteExitNodePreferenceLabels" ADD CONSTRAINT "remoteExitNodePreferenceLabels_remoteExitNodeId_remoteExitNode_id_fk" FOREIGN KEY ("remoteExitNodeId") REFERENCES "public"."remoteExitNode"("id") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "remoteExitNodePreferenceLabels" ADD CONSTRAINT "remoteExitNodePreferenceLabels_labelId_labels_labelId_fk" FOREIGN KEY ("labelId") REFERENCES "public"."labels"("labelId") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "remoteExitNodeResources" ADD CONSTRAINT "remoteExitNodeResources_remoteExitNodeId_remoteExitNode_id_fk" FOREIGN KEY ("remoteExitNodeId") REFERENCES "public"."remoteExitNode"("id") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "launcherViews" ADD CONSTRAINT "launcherViews_orgId_orgs_orgId_fk" FOREIGN KEY ("orgId") REFERENCES "public"."orgs"("orgId") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        await db.execute(sql`
+            ALTER TABLE "launcherViews" ADD CONSTRAINT "launcherViews_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_clients_orgid_niceid" ON "clients" USING btree ("orgId","niceId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_networks_orgid" ON "networks" USING btree ("orgId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_resourcepolicies_orgid_niceid" ON "resourcePolicies" USING btree ("orgId","niceId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_resources_niceid" ON "resources" USING btree ("niceId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_resources_orgid_niceid" ON "resources" USING btree ("orgId","niceId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_siteresources_orgid_niceid" ON "siteResources" USING btree ("orgId","niceId");
+        `);
+
+        await db.execute(sql`
+            CREATE INDEX "idx_sites_orgid_niceid" ON "sites" USING btree ("orgId","niceId");
+        `);
+
+        await db.execute(sql`COMMIT`);
+        console.log("Migrated database");
+    } catch (e) {
+        await db.execute(sql`ROLLBACK`);
+        console.log("Unable to migrate database");
+        console.log(e);
+        throw e;
+    }
+
+    console.log(`${version} migration complete`);
+}

server/setup/scriptsSqlite/1.20.0.ts

@@ -2,7 +2,7 @@ import { APP_PATH } from "@server/lib/consts";
 import Database from "better-sqlite3";
 import path from "path";
 
-const version = "1.19.5";
+const version = "1.20.0";
 
 export default async function migration() {
     console.log(`Running setup script ${version}...`);
@@ -92,6 +92,64 @@ export default async function migration() {
             db.prepare(
                 `ALTER TABLE 'resourceSessions_new' RENAME TO 'resourceSessions';`
             ).run();
+
+            db.prepare(
+                `
+            CREATE TABLE 'remoteExitNodePreferenceLabels' (
+                'remoteExitNodePreferenceLabelId' integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+                'remoteExitNodeId' text NOT NULL,
+                'labelId' integer NOT NULL,
+                FOREIGN KEY ('remoteExitNodeId') REFERENCES 'remoteExitNode'('id') ON UPDATE no action ON DELETE cascade,
+                FOREIGN KEY ('labelId') REFERENCES 'labels'('labelId') ON UPDATE no action ON DELETE cascade
+            );
+                `
+            ).run();
+
+            db.prepare(
+                `
+            CREATE UNIQUE INDEX 'remote_exit_node_preference_label_uniq' ON 'remoteExitNodePreferenceLabels' ('remoteExitNodeId','labelId');
+                `
+            ).run();
+
+            db.prepare(
+                `
+            CREATE TABLE 'remoteExitNodeResources' (
+                'remoteExitNodeResourceId' integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+                'remoteExitNodeId' text NOT NULL,
+                'destination' text NOT NULL,
+                FOREIGN KEY ('remoteExitNodeId') REFERENCES 'remoteExitNode'('id') ON UPDATE no action ON DELETE cascade
+            );
+                `
+            ).run();
+
+            db.prepare(
+                `
+            CREATE TABLE 'launcherViews' (
+                'viewId' integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+                'orgId' text NOT NULL,
+                'userId' text,
+                'name' text NOT NULL,
+                'config' text NOT NULL,
+                'isDefault' integer DEFAULT false NOT NULL,
+                'createdAt' text NOT NULL,
+                'updatedAt' text NOT NULL,
+                FOREIGN KEY ('orgId') REFERENCES 'orgs'('orgId') ON UPDATE no action ON DELETE cascade,
+                FOREIGN KEY ('userId') REFERENCES 'user'('id') ON UPDATE no action ON DELETE cascade
+            );
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'domains' ADD 'customCertResolver' text;
+                `
+            ).run();
+
+            db.prepare(
+                `
+            ALTER TABLE 'domains' ADD 'lastCheckedAt' integer;
+                `
+            ).run();
         })();
 
         db.pragma("foreign_keys = ON");

src/app/[orgId]/page.tsx

@@ -82,9 +82,11 @@ export default async function OrgPage(props: OrgPageProps) {
                         orgId={orgId}
                         isAdmin={isAdminOrOwner}
                         views={launcherData.views}
+                        defaultViewOverrides={launcherData.defaultViewOverrides}
                         activeViewId={launcherData.activeViewId}
                         config={launcherData.config}
                         savedConfig={launcherData.savedConfig}
+                        scale={launcherData.scale}
                         groups={launcherData.groups}
                         groupsPagination={launcherData.groupsPagination}
                     />

src/app/[orgId]/settings/(private)/billing/page.tsx

@@ -158,6 +158,9 @@ const tierLimits: Record<
         domains: number;
         remoteNodes: number;
         organizations: number;
+        publicResources: number;
+        privateResources: number;
+        machineClients: number;
     }
 > = {
     basic: {
@@ -165,35 +168,50 @@ const tierLimits: Record<
         sites: freeLimitSet[LimitId.SITES]?.value ?? 0,
         domains: freeLimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: freeLimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: freeLimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: freeLimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: freeLimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: freeLimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: freeLimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier1: {
         users: tier1LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier1LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier1LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier1LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier1LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier1LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier1LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier1LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier1LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier2: {
         users: tier2LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier2LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier2LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier2LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier2LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier2LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier2LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier2LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier2LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier3: {
         users: tier3LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier3LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier3LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier3LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier3LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier3LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier3LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier3LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier3LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     enterprise: {
         users: 0, // Custom for enterprise
         sites: 0, // Custom for enterprise
         domains: 0, // Custom for enterprise
         remoteNodes: 0, // Custom for enterprise
-        organizations: 0 // Custom for enterprise
+        organizations: 0, // Custom for enterprise
+        publicResources: 0, // Custom for enterprise
+        privateResources: 0, // Custom for enterprise
+        machineClients: 0 // Custom for enterprise
     }
 };
 
@@ -234,6 +252,9 @@ export default function BillingPage() {
     const DOMAINS = "domains";
     const REMOTE_EXIT_NODES = "remoteExitNodes";
     const ORGINIZATIONS = "organizations";
+    const PUBLIC_RESOURCES = "publicResources";
+    const PRIVATE_RESOURCES = "privateResources";
+    const MACHINE_CLIENTS = "machineClients";
 
     // Confirmation dialog state
     const [showConfirmDialog, setShowConfirmDialog] = useState(false);
@@ -269,7 +290,13 @@ export default function BillingPage() {
                     setHasSubscription(
                         tierSub.subscription.status === "active"
                     );
-                    setIsTrial(tierSub.subscription.expiresAt != null);
+                    // expiresAt is only meaningful while the trial hasn't
+                    // actually run out yet; a stale row with a past
+                    // expiresAt should no longer be treated as a live trial
+                    const expiresAt = tierSub.subscription.expiresAt;
+                    setIsTrial(
+                        expiresAt != null && expiresAt * 1000 > Date.now()
+                    );
                 }
 
                 // Find license subscription
@@ -797,6 +824,45 @@ export default function BillingPage() {
             });
         }
 
+        // Check public resources
+        const publicResourcesUsage = getUsageValue(PUBLIC_RESOURCES);
+        if (
+            limits.publicResources > 0 &&
+            publicResourcesUsage > limits.publicResources
+        ) {
+            violations.push({
+                feature: "Public Resources",
+                currentUsage: publicResourcesUsage,
+                newLimit: limits.publicResources
+            });
+        }
+
+        // Check private resources
+        const privateResourcesUsage = getUsageValue(PRIVATE_RESOURCES);
+        if (
+            limits.privateResources > 0 &&
+            privateResourcesUsage > limits.privateResources
+        ) {
+            violations.push({
+                feature: "Private Resources",
+                currentUsage: privateResourcesUsage,
+                newLimit: limits.privateResources
+            });
+        }
+
+        // Check machine clients
+        const machineClientsUsage = getUsageValue(MACHINE_CLIENTS);
+        if (
+            limits.machineClients > 0 &&
+            machineClientsUsage > limits.machineClients
+        ) {
+            violations.push({
+                feature: "Machine Clients",
+                currentUsage: machineClientsUsage,
+                newLimit: limits.machineClients
+            });
+        }
+
         return violations;
     };
 
@@ -997,21 +1063,23 @@ export default function BillingPage() {
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
                 <SettingsSectionBody>
-                    <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    <div className="grid grid-cols-1 md:grid-cols-4 gap-6">
                         {/* Current Usage */}
-                        <div className="border rounded-lg p-4">
+                        <div className="border rounded-lg p-4 md:col-span-1">
                             <div className="text-sm text-muted-foreground mb-2">
                                 {t("billingCurrentUsage") || "Current Usage"}
                             </div>
-                            <div className="flex items-baseline gap-2">
-                                <span className="text-3xl font-semibold">
-                                    {getUserCount()}
-                                </span>
-                                <span className="text-lg">
-                                    {t("billingUsers") || "Users"}
-                                </span>
+                            <div className="flex flex-col items-start gap-1">
+                                <div className="flex items-baseline gap-2">
+                                    <span className="text-3xl font-semibold">
+                                        {getUserCount()}
+                                    </span>
+                                    <span className="text-lg">
+                                        {t("billingUsers") || "Users"}
+                                    </span>
+                                </div>
                                 {hasSubscription && getPricePerUser() > 0 && (
-                                    <div className="text-sm text-muted-foreground mt-1">
+                                    <div className="text-sm text-muted-foreground">
                                         x ${getPricePerUser()} / month = $
                                         {getUserCount() * getPricePerUser()} /
                                         month
@@ -1021,11 +1089,11 @@ export default function BillingPage() {
                         </div>
 
                         {/* Maximum Limits */}
-                        <div className="border rounded-lg p-4">
+                        <div className="border rounded-lg p-4 md:col-span-3">
                             <div className="text-sm text-muted-foreground mb-3">
                                 {t("billingMaximumLimits") || "Maximum Limits"}
                             </div>
-                            <InfoSections cols={5}>
+                            <InfoSections cols={8}>
                                 <InfoSection>
                                     <InfoSectionTitle className="flex items-center gap-1 text-xs">
                                         {t("billingUsers") || "Users"}
@@ -1308,6 +1376,168 @@ export default function BillingPage() {
                                         )}
                                     </InfoSectionContent>
                                 </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingPublicResources") ||
+                                            "Public Resources"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(PUBLIC_RESOURCES) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            PUBLIC_RESOURCES
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        PUBLIC_RESOURCES
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        PUBLIC_RESOURCES
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(PUBLIC_RESOURCES)}) exceeds limit (${getLimitValue(PUBLIC_RESOURCES)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    PUBLIC_RESOURCES
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingPrivateResources") ||
+                                            "Private Resources"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(PRIVATE_RESOURCES) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            PRIVATE_RESOURCES
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        PRIVATE_RESOURCES
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        PRIVATE_RESOURCES
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(PRIVATE_RESOURCES)}) exceeds limit (${getLimitValue(PRIVATE_RESOURCES)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    PRIVATE_RESOURCES
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingMachineClients") ||
+                                            "Machine Clients"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(MACHINE_CLIENTS) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            MACHINE_CLIENTS
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        MACHINE_CLIENTS
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        MACHINE_CLIENTS
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(MACHINE_CLIENTS)}) exceeds limit (${getLimitValue(MACHINE_CLIENTS)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    MACHINE_CLIENTS
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
                             </InfoSections>
                         </div>
                     </div>
@@ -1507,6 +1737,45 @@ export default function BillingPage() {
                                                         "Remote Nodes"}
                                                 </span>
                                             </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].publicResources
+                                                    }{" "}
+                                                    {t(
+                                                        "billingPublicResources"
+                                                    ) || "Public Resources"}
+                                                </span>
+                                            </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].privateResources
+                                                    }{" "}
+                                                    {t(
+                                                        "billingPrivateResources"
+                                                    ) || "Private Resources"}
+                                                </span>
+                                            </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].machineClients
+                                                    }{" "}
+                                                    {t(
+                                                        "billingMachineClients"
+                                                    ) || "Machine Clients"}
+                                                </span>
+                                            </div>
                                         </div>
                                     </div>
                                 )}

src/app/[orgId]/settings/access/users/[userId]/access-controls/page.tsx

@@ -111,7 +111,7 @@ export default function AccessControlsPage() {
         if (values.roles.length === 0) {
             toast({
                 variant: "destructive",
-                title: t("accessRoleErrorAdd"),
+                title: t("accessRoleRequired"),
                 description: t("accessRoleSelectPlease")
             });
             return;
@@ -173,15 +173,13 @@ export default function AccessControlsPage() {
         if (values.roles.length === 0) {
             toast({
                 variant: "destructive",
-                title: t("accessRoleErrorAdd"),
+                title: t("accessRoleRequired"),
                 description: t("accessRoleSelectPlease")
             });
             return;
         }
 
-        const willHaveAdminRole = values.roles.some(
-            (r) => r.isAdmin === true
-        );
+        const willHaveAdminRole = values.roles.some((r) => r.isAdmin === true);
 
         const isRemovingOwnAdmin =
             sessionUser.userId === user.userId &&
@@ -226,7 +224,9 @@ export default function AccessControlsPage() {
                     <SettingsSectionForm>
                         <Form {...form}>
                             <form
-                                onSubmit={(e) => void handleAccessControlsSubmit(e)}
+                                onSubmit={(e) =>
+                                    void handleAccessControlsSubmit(e)
+                                }
                                 className="space-y-4"
                                 id="access-controls-form"
                             >

src/app/[orgId]/settings/clients/user/[niceId]/general/page.tsx

@@ -195,9 +195,9 @@ export default function GeneralPage() {
         if (agent in latestPlatformVersions) {
             const agentVersion = latestPlatformVersions[agent];
 
-            updateAvailable = semver.lt(
-                client.olmVersion,
-                agentVersion.latestVersion
+            updateAvailable = Boolean(
+                semver.valid(client.olmVersion) &&
+                semver.lt(client.olmVersion, agentVersion.latestVersion)
             );
         }
     }

src/app/[orgId]/settings/labels/page.tsx

@@ -3,9 +3,7 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListOrgLabelsResponse } from "@server/routers/labels/types";
 import { AxiosResponse } from "axios";
 import OrgLabelsTable from "@app/components/OrgLabelsTable";
-import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import { tierMatrix } from "@server/lib/billing/tierMatrix";
 import type { Metadata } from "next";
 import { getTranslations } from "next-intl/server";
 
@@ -51,8 +49,6 @@ export default async function LabelsPage({ params, searchParams }: Props) {
                 description={t("orgLabelsDescription")}
             />
 
-            <PaidFeaturesAlert tiers={tierMatrix.labels} />
-
             <OrgLabelsTable
                 labels={labels}
                 orgId={orgId}

src/app/[orgId]/settings/logs/access/page.tsx

@@ -15,6 +15,7 @@ import { ColumnFilterButton } from "@app/components/ColumnFilterButton";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
 import { build } from "@server/build";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
+import { getPrivateResourceSettingsHref } from "@app/lib/launcherResourceAdminHref";
 import axios from "axios";
 import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
 import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
@@ -343,7 +344,10 @@ export default function GeneralPage() {
                     <Link
                         href={
                             row.original.siteResourceId != null
-                                ? `/${row.original.orgId}/settings/resources/private?query=${row.original.resourceNiceId}`
+                                ? getPrivateResourceSettingsHref(
+                                      row.original.orgId,
+                                      row.original.resourceNiceId
+                                  )
                                 : `/${row.original.orgId}/settings/resources/public/${row.original.resourceNiceId}`
                         }
                     >

src/app/[orgId]/settings/logs/connection/page.tsx

@@ -11,6 +11,7 @@ import { useStoredPageSize } from "@app/hooks/useStoredPageSize";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient } from "@app/lib/api";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
+import { getPrivateResourceSettingsHref } from "@app/lib/launcherResourceAdminHref";
 import { logQueries } from "@app/lib/queries";
 import { build } from "@server/build";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
@@ -323,7 +324,10 @@ export default function ConnectionLogsPage() {
                 if (row.original.resourceName && row.original.resourceNiceId) {
                     return (
                         <Link
-                            href={`/${row.original.orgId}/settings/resources/private/?query=${row.original.resourceNiceId}`}
+                            href={getPrivateResourceSettingsHref(
+                                row.original.orgId,
+                                row.original.resourceNiceId
+                            )}
                         >
                             <Button variant="outline" size="sm">
                                 {row.original.resourceName}

src/app/[orgId]/settings/logs/request/page.tsx

@@ -9,6 +9,7 @@ import { toast } from "@app/hooks/useToast";
 import { createApiClient } from "@app/lib/api";
 import { useTranslations } from "next-intl";
 import { getSevenDaysAgo } from "@app/lib/getSevenDaysAgo";
+import { getPrivateResourceSettingsHref } from "@app/lib/launcherResourceAdminHref";
 import { logQueries } from "@app/lib/queries";
 import { ColumnDef } from "@tanstack/react-table";
 import { useQuery } from "@tanstack/react-query";
@@ -395,7 +396,10 @@ export default function GeneralPage() {
                     <Link
                         href={
                             row.original.reason == 108 // for now the client will only have reason 108 so we know where to go
-                                ? `/${row.original.orgId}/settings/resources/private?query=${row.original.resourceNiceId}`
+                                ? getPrivateResourceSettingsHref(
+                                      row.original.orgId,
+                                      row.original.resourceNiceId
+                                  )
                                 : `/${row.original.orgId}/settings/resources/public/${row.original.resourceNiceId}`
                         }
                         onClick={(e) => e.stopPropagation()}

src/app/[orgId]/settings/resources/private/PrivateResourceAccessFields.tsx

@@ -0,0 +1,112 @@
+"use client";
+
+import { MachinesSelector } from "@app/components/machines-selector";
+import { RolesSelector } from "@app/components/roles-selector";
+import { UsersSelector } from "@app/components/users-selector";
+import { SettingsFormCell, SettingsFormGrid } from "@app/components/Settings";
+import type { Tag } from "@app/components/tags/tag-input";
+import {
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage
+} from "@app/components/ui/form";
+import type { PrivateResourceClient } from "@app/lib/privateResourceForm";
+import { useTranslations } from "next-intl";
+import type { Control } from "react-hook-form";
+
+type AccessFormValues = {
+    roles?: Tag[];
+    users?: Tag[];
+    clients?: PrivateResourceClient[];
+};
+
+type PrivateResourceAccessFieldsProps = {
+    control: Control<AccessFormValues>;
+    orgId: string;
+    loading?: boolean;
+    hasMachineClients?: boolean;
+};
+
+export function PrivateResourceAccessFields({
+    control,
+    orgId,
+    loading = false,
+    hasMachineClients = false
+}: PrivateResourceAccessFieldsProps) {
+    const t = useTranslations();
+
+    if (loading) {
+        return (
+            <div className="text-sm text-muted-foreground">{t("loading")}</div>
+        );
+    }
+
+    return (
+        <SettingsFormGrid>
+            <SettingsFormCell span="full">
+                <FormField
+                    control={control}
+                    name="roles"
+                    render={({ field }) => (
+                        <FormItem className="flex flex-col items-start">
+                            <FormLabel>{t("roles")}</FormLabel>
+                            <FormControl>
+                                <RolesSelector
+                                    selectedRoles={field.value ?? []}
+                                    orgId={orgId}
+                                    restrictAdminRole
+                                    onSelectRoles={(newRoles) => {
+                                        field.onChange(newRoles);
+                                    }}
+                                />
+                            </FormControl>
+                            <FormMessage />
+                        </FormItem>
+                    )}
+                />
+            </SettingsFormCell>
+            <SettingsFormCell span="full">
+                <FormField
+                    control={control}
+                    name="users"
+                    render={({ field }) => (
+                        <FormItem className="flex flex-col items-start">
+                            <FormLabel>{t("users")}</FormLabel>
+                            <UsersSelector
+                                selectedUsers={field.value ?? []}
+                                orgId={orgId}
+                                onSelectUsers={(newUsers) => {
+                                    field.onChange(newUsers);
+                                }}
+                            />
+                            <FormMessage />
+                        </FormItem>
+                    )}
+                />
+            </SettingsFormCell>
+            {hasMachineClients && (
+                <SettingsFormCell span="full">
+                    <FormField
+                        control={control}
+                        name="clients"
+                        render={({ field }) => (
+                            <FormItem className="flex flex-col items-start">
+                                <FormLabel>{t("machineClients")}</FormLabel>
+                                <MachinesSelector
+                                    selectedMachines={field.value ?? []}
+                                    orgId={orgId}
+                                    onSelectMachines={(machines) => {
+                                        field.onChange(machines);
+                                    }}
+                                />
+                                <FormMessage />
+                            </FormItem>
+                        )}
+                    />
+                </SettingsFormCell>
+            )}
+        </SettingsFormGrid>
+    );
+}

src/app/[orgId]/settings/resources/private/PrivateResourceDestinationFields.tsx

@@ -0,0 +1,175 @@
+"use client";
+
+import { SettingsFormCell, SettingsFormGrid } from "@app/components/Settings";
+import {
+    FormControl,
+    FormDescription,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage
+} from "@app/components/ui/form";
+import { Input } from "@app/components/ui/input";
+import { useTranslations } from "next-intl";
+import type { Control, UseFormWatch } from "react-hook-form";
+
+type PrivateResourceAliasFieldProps = {
+    control: Control<any>;
+    watch: UseFormWatch<any>;
+    labelPrefix?: "create" | "edit";
+    disabled?: boolean;
+};
+
+export function PrivateResourceAliasField({
+    control,
+    watch,
+    labelPrefix = "edit",
+    disabled = false
+}: PrivateResourceAliasFieldProps) {
+    const t = useTranslations();
+    const aliasLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogAlias"
+            : "editInternalResourceDialogAlias";
+    const aliasDescriptionKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogAliasDescription"
+            : "editInternalResourceDialogAliasDescription";
+
+    const aliasValue = watch("alias");
+    const aliasEndsWithLocal =
+        typeof aliasValue === "string" &&
+        aliasValue.trim().toLowerCase().endsWith(".local");
+
+    return (
+        <FormField
+            control={control}
+            name="alias"
+            render={({ field }) => (
+                <FormItem>
+                    <FormLabel>{t(aliasLabelKey)}</FormLabel>
+                    <FormControl>
+                        <Input
+                            {...field}
+                            className="w-full"
+                            value={field.value ?? ""}
+                            disabled={disabled}
+                        />
+                    </FormControl>
+                    {aliasEndsWithLocal && (
+                        <p className="text-xs text-amber-700/80 mt-1">
+                            {t("internalResourceAliasLocalWarning")}
+                        </p>
+                    )}
+                    <FormMessage />
+                    <FormDescription>{t(aliasDescriptionKey)}</FormDescription>
+                </FormItem>
+            )}
+        />
+    );
+}
+
+type PrivateResourceHostDestinationFieldsProps = {
+    control: Control<any>;
+    watch: UseFormWatch<any>;
+    labelPrefix?: "create" | "edit";
+    hideAlias?: boolean;
+};
+
+export function PrivateResourceHostDestinationFields({
+    control,
+    watch,
+    labelPrefix = "edit",
+    hideAlias = false
+}: PrivateResourceHostDestinationFieldsProps) {
+    const t = useTranslations();
+    const destinationLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogDestination"
+            : "editInternalResourceDialogDestination";
+
+    const destinationField = (
+        <FormField
+            control={control}
+            name="destination"
+            render={({ field }) => (
+                <FormItem>
+                    <FormLabel>{t(destinationLabelKey)}</FormLabel>
+                    <FormControl>
+                        <Input
+                            {...field}
+                            className="w-full"
+                            value={field.value ?? ""}
+                            onChange={(e) =>
+                                field.onChange(
+                                    e.target.value === ""
+                                        ? null
+                                        : e.target.value
+                                )
+                            }
+                        />
+                    </FormControl>
+                    <FormMessage />
+                </FormItem>
+            )}
+        />
+    );
+
+    if (hideAlias) {
+        return destinationField;
+    }
+
+    return (
+        <SettingsFormGrid>
+            <SettingsFormCell span="half">{destinationField}</SettingsFormCell>
+            <SettingsFormCell span="half">
+                <PrivateResourceAliasField
+                    control={control}
+                    watch={watch}
+                    labelPrefix={labelPrefix}
+                />
+            </SettingsFormCell>
+        </SettingsFormGrid>
+    );
+}
+
+export function PrivateResourceCidrDestinationField({
+    control,
+    labelPrefix = "edit"
+}: {
+    control: Control<any>;
+    labelPrefix?: "create" | "edit";
+}) {
+    const t = useTranslations();
+    const destinationLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogDestination"
+            : "editInternalResourceDialogDestination";
+
+    return (
+        <FormField
+            control={control}
+            name="destination"
+            render={({ field }) => (
+                <FormItem>
+                    <FormLabel>{t(destinationLabelKey)}</FormLabel>
+                    <FormControl>
+                        <Input
+                            {...field}
+                            className="w-full"
+                            value={field.value ?? ""}
+                            onChange={(e) =>
+                                field.onChange(
+                                    e.target.value === ""
+                                        ? null
+                                        : e.target.value
+                                )
+                            }
+                        />
+                    </FormControl>
+                    <FormMessage />
+                </FormItem>
+            )}
+        />
+    );
+}

src/app/[orgId]/settings/resources/private/PrivateResourceHttpFields.tsx

@@ -0,0 +1,297 @@
+"use client";
+
+import DomainPicker from "@app/components/DomainPicker";
+import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
+import {
+    SettingsFormCell,
+    SettingsFormGrid,
+    SettingsSubsectionDescription,
+    SettingsSubsectionHeader,
+    SettingsSubsectionTitle
+} from "@app/components/Settings";
+import { SwitchInput } from "@app/components/SwitchInput";
+import {
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage
+} from "@app/components/ui/form";
+import { Input } from "@app/components/ui/input";
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue
+} from "@app/components/ui/select";
+import { tierMatrix } from "@server/lib/billing/tierMatrix";
+import { useTranslations } from "next-intl";
+import type { Control, UseFormSetValue, UseFormWatch } from "react-hook-form";
+
+type PrivateResourceHttpFieldsProps = {
+    control: Control<any>;
+    setValue: UseFormSetValue<any>;
+    orgId: string;
+    watch: UseFormWatch<any>;
+    disabled?: boolean;
+    siteResourceId?: number;
+    labelPrefix?: "create" | "edit";
+    hideDomainPicker?: boolean;
+    hidePaidFeaturesAlert?: boolean;
+};
+
+export function PrivateResourceHttpFields({
+    control,
+    setValue,
+    orgId,
+    watch,
+    disabled = false,
+    siteResourceId,
+    labelPrefix = "edit",
+    hideDomainPicker = false,
+    hidePaidFeaturesAlert = false
+}: PrivateResourceHttpFieldsProps) {
+    const t = useTranslations();
+    const schemeLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogScheme"
+            : "editInternalResourceDialogScheme";
+    const destinationLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogDestination"
+            : "editInternalResourceDialogDestination";
+    const destinationPortLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogModePort"
+            : "editInternalResourceDialogModePort";
+    const httpConfigurationTitleKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogHttpConfiguration"
+            : "editInternalResourceDialogHttpConfiguration";
+    const httpConfigurationDescriptionKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogHttpConfigurationDescription"
+            : "editInternalResourceDialogHttpConfigurationDescription";
+    const enableSslLabelKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogEnableSsl"
+            : "editInternalResourceDialogEnableSsl";
+    const enableSslDescriptionKey =
+        labelPrefix === "create"
+            ? "createInternalResourceDialogEnableSslDescription"
+            : "editInternalResourceDialogEnableSslDescription";
+
+    const httpConfigSubdomain = watch("httpConfigSubdomain");
+    const httpConfigDomainId = watch("httpConfigDomainId");
+    const httpConfigFullDomain = watch("httpConfigFullDomain");
+
+    return (
+        <SettingsFormGrid>
+            {!hidePaidFeaturesAlert && (
+                <SettingsFormCell span="full">
+                    <PaidFeaturesAlert
+                        tiers={tierMatrix.advancedPrivateResources}
+                    />
+                </SettingsFormCell>
+            )}
+
+            <SettingsFormCell span="quarter">
+                <FormField
+                    control={control}
+                    name="scheme"
+                    render={({ field }) => (
+                        <FormItem>
+                            <FormLabel>{t(schemeLabelKey)}</FormLabel>
+                            <Select
+                                onValueChange={field.onChange}
+                                value={field.value ?? "http"}
+                                disabled={disabled}
+                            >
+                                <FormControl>
+                                    <SelectTrigger className="w-full">
+                                        <SelectValue />
+                                    </SelectTrigger>
+                                </FormControl>
+                                <SelectContent>
+                                    <SelectItem value="http">http</SelectItem>
+                                    <SelectItem value="https">https</SelectItem>
+                                </SelectContent>
+                            </Select>
+                            <FormMessage />
+                        </FormItem>
+                    )}
+                />
+            </SettingsFormCell>
+            <SettingsFormCell span="half">
+                <FormField
+                    control={control}
+                    name="destination"
+                    render={({ field }) => (
+                        <FormItem>
+                            <FormLabel>{t(destinationLabelKey)}</FormLabel>
+                            <FormControl>
+                                <Input
+                                    {...field}
+                                    className="w-full"
+                                    value={field.value ?? ""}
+                                    disabled={disabled}
+                                    onChange={(e) =>
+                                        field.onChange(
+                                            e.target.value === ""
+                                                ? null
+                                                : e.target.value
+                                        )
+                                    }
+                                />
+                            </FormControl>
+                            <FormMessage />
+                        </FormItem>
+                    )}
+                />
+            </SettingsFormCell>
+            <SettingsFormCell span="quarter">
+                <FormField
+                    control={control}
+                    name="destinationPort"
+                    render={({ field }) => (
+                        <FormItem>
+                            <FormLabel>{t(destinationPortLabelKey)}</FormLabel>
+                            <FormControl>
+                                <Input
+                                    className="w-full"
+                                    type="number"
+                                    min={1}
+                                    max={65535}
+                                    value={field.value ?? ""}
+                                    disabled={disabled}
+                                    onChange={(e) => {
+                                        const raw = e.target.value;
+                                        if (raw === "") {
+                                            field.onChange(null);
+                                            return;
+                                        }
+                                        const n = Number(raw);
+                                        field.onChange(
+                                            Number.isFinite(n) ? n : null
+                                        );
+                                    }}
+                                />
+                            </FormControl>
+                            <FormMessage />
+                        </FormItem>
+                    )}
+                />
+            </SettingsFormCell>
+
+            {!hideDomainPicker && (
+                <>
+                    <SettingsFormCell span="full">
+                        <SettingsSubsectionHeader>
+                            <SettingsSubsectionTitle>
+                                {t(httpConfigurationTitleKey)}
+                            </SettingsSubsectionTitle>
+                            <SettingsSubsectionDescription>
+                                {t(httpConfigurationDescriptionKey)}
+                            </SettingsSubsectionDescription>
+                        </SettingsSubsectionHeader>
+                    </SettingsFormCell>
+                    <SettingsFormCell span="full">
+                        <div
+                            className={
+                                disabled
+                                    ? "pointer-events-none opacity-50"
+                                    : undefined
+                            }
+                        >
+                            <DomainPicker
+                                key={
+                                    siteResourceId
+                                        ? `http-domain-${siteResourceId}`
+                                        : "http-domain-create"
+                                }
+                                orgId={orgId}
+                                cols={2}
+                                hideFreeDomain
+                                defaultSubdomain={
+                                    httpConfigSubdomain ?? undefined
+                                }
+                                defaultDomainId={
+                                    httpConfigDomainId ?? undefined
+                                }
+                                defaultFullDomain={
+                                    httpConfigFullDomain ?? undefined
+                                }
+                                onDomainChange={(res) => {
+                                    if (res === null) {
+                                        setValue("httpConfigSubdomain", null);
+                                        setValue("httpConfigDomainId", null);
+                                        setValue("httpConfigFullDomain", null);
+                                        return;
+                                    }
+                                    setValue(
+                                        "httpConfigSubdomain",
+                                        res.subdomain ?? null
+                                    );
+                                    setValue(
+                                        "httpConfigDomainId",
+                                        res.domainId
+                                    );
+                                    setValue(
+                                        "httpConfigFullDomain",
+                                        res.fullDomain
+                                    );
+                                }}
+                            />
+                        </div>
+                    </SettingsFormCell>
+                    <SettingsFormCell span="half">
+                        <FormField
+                            control={control}
+                            name="ssl"
+                            render={({ field }) => (
+                                <FormItem>
+                                    <FormControl>
+                                        <SwitchInput
+                                            id="private-resource-ssl"
+                                            label={t(enableSslLabelKey)}
+                                            description={t(
+                                                enableSslDescriptionKey
+                                            )}
+                                            checked={!!field.value}
+                                            onCheckedChange={field.onChange}
+                                            disabled={disabled}
+                                        />
+                                    </FormControl>
+                                </FormItem>
+                            )}
+                        />
+                    </SettingsFormCell>
+                </>
+            )}
+
+            {hideDomainPicker && (
+                <SettingsFormCell span="half">
+                    <FormField
+                        control={control}
+                        name="ssl"
+                        render={({ field }) => (
+                            <FormItem>
+                                <FormControl>
+                                    <SwitchInput
+                                        id="private-resource-ssl"
+                                        label={t(enableSslLabelKey)}
+                                        description={t(enableSslDescriptionKey)}
+                                        checked={!!field.value}
+                                        onCheckedChange={field.onChange}
+                                        disabled={disabled}
+                                    />
+                                </FormControl>
+                            </FormItem>
+                        )}
+                    />
+                </SettingsFormCell>
+            )}
+        </SettingsFormGrid>
+    );
+}

src/app/[orgId]/settings/resources/private/PrivateResourceMultiSiteRoutingHelp.tsx

@@ -0,0 +1,24 @@
+"use client";
+
+import { ExternalLink } from "lucide-react";
+import { useTranslations } from "next-intl";
+
+export function PrivateResourceMultiSiteRoutingHelp() {
+    const t = useTranslations();
+
+    return (
+        <p className="text-sm text-muted-foreground mt-2">
+            {t("internalResourceFormMultiSiteRoutingHelp")}{" "}
+            <a
+                href="https://docs.pangolin.net/manage/resources/private/multi-site-routing"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-primary hover:underline inline-flex items-center gap-1"
+            >
+                {t("internalResourceFormMultiSiteRoutingHelpLearnMore")}
+                <ExternalLink className="size-3.5 shrink-0" />
+            </a>
+            .
+        </p>
+    );
+}

src/app/[orgId]/settings/resources/private/PrivateResourcePortRanges.tsx

@@ -0,0 +1,300 @@
+"use client";
+
+import {
+    SettingsFormCell,
+    SettingsFormGrid,
+    SettingsSubsectionDescription,
+    SettingsSubsectionHeader,
+    SettingsSubsectionTitle
+} from "@app/components/Settings";
+import { SwitchInput } from "@app/components/SwitchInput";
+import {
+    FormControl,
+    FormField,
+    FormItem,
+    FormLabel,
+    FormMessage
+} from "@app/components/ui/form";
+import { Input } from "@app/components/ui/input";
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue
+} from "@app/components/ui/select";
+import {
+    getPortModeFromString,
+    getPortStringFromMode,
+    type PortMode
+} from "@app/lib/privateResourceForm";
+import { useTranslations } from "next-intl";
+import { useEffect, useState, type ReactNode } from "react";
+import type { Control, UseFormSetValue } from "react-hook-form";
+
+type PrivateResourceNetworkAccessFieldsProps = {
+    control: Control<any>;
+    setValue: UseFormSetValue<any>;
+    showPortRanges?: boolean;
+    initialTcp?: string | null;
+    initialUdp?: string | null;
+    disabled?: boolean;
+    icmpId?: string;
+    embedInParentGrid?: boolean;
+};
+
+export function PrivateResourceAllowIcmpField({
+    control,
+    id = "private-resource-allow-icmp",
+    disabled = false
+}: {
+    control: Control<any>;
+    id?: string;
+    disabled?: boolean;
+}) {
+    const t = useTranslations();
+
+    return (
+        <FormField
+            control={control}
+            name="disableIcmp"
+            render={({ field }) => (
+                <FormItem>
+                    <FormControl>
+                        <SwitchInput
+                            id={id}
+                            label={t("privateResourceAllowIcmpPing")}
+                            checked={!field.value}
+                            onCheckedChange={(checked) =>
+                                field.onChange(!checked)
+                            }
+                            disabled={disabled}
+                        />
+                    </FormControl>
+                    <FormMessage />
+                </FormItem>
+            )}
+        />
+    );
+}
+
+function PrivateResourceNetworkAccessHeader() {
+    const t = useTranslations();
+
+    return (
+        <SettingsFormCell span="full">
+            <SettingsSubsectionHeader>
+                <SettingsSubsectionTitle>
+                    {t("privateResourceNetworkAccess")}
+                </SettingsSubsectionTitle>
+                <SettingsSubsectionDescription>
+                    {t("privateResourceNetworkAccessDescription")}
+                </SettingsSubsectionDescription>
+            </SettingsSubsectionHeader>
+        </SettingsFormCell>
+    );
+}
+
+export function PrivateResourceNetworkAccessFields({
+    control,
+    setValue,
+    showPortRanges = true,
+    initialTcp,
+    initialUdp,
+    disabled = false,
+    icmpId = "private-resource-allow-icmp",
+    embedInParentGrid = false
+}: PrivateResourceNetworkAccessFieldsProps) {
+    const t = useTranslations();
+    const [tcpPortMode, setTcpPortMode] = useState<PortMode>(() =>
+        getPortModeFromString(initialTcp)
+    );
+    const [udpPortMode, setUdpPortMode] = useState<PortMode>(() =>
+        getPortModeFromString(initialUdp)
+    );
+    const [tcpCustomPorts, setTcpCustomPorts] = useState(() =>
+        initialTcp && initialTcp !== "*" ? initialTcp : ""
+    );
+    const [udpCustomPorts, setUdpCustomPorts] = useState(() =>
+        initialUdp && initialUdp !== "*" ? initialUdp : ""
+    );
+
+    useEffect(() => {
+        if (!showPortRanges) return;
+
+        setValue(
+            "tcpPortRangeString",
+            getPortStringFromMode(tcpPortMode, tcpCustomPorts)
+        );
+    }, [showPortRanges, tcpPortMode, tcpCustomPorts, setValue]);
+
+    useEffect(() => {
+        if (!showPortRanges) return;
+
+        setValue(
+            "udpPortRangeString",
+            getPortStringFromMode(udpPortMode, udpCustomPorts)
+        );
+    }, [showPortRanges, udpPortMode, udpCustomPorts, setValue]);
+
+    const content: ReactNode = (
+        <>
+            <PrivateResourceNetworkAccessHeader />
+
+            {showPortRanges ? (
+                <>
+                    <SettingsFormCell span="full">
+                        <FormField
+                            control={control}
+                            name="tcpPortRangeString"
+                            render={() => (
+                                <FormItem>
+                                    <FormLabel>
+                                        {t("editInternalResourceDialogTcp")}
+                                    </FormLabel>
+                                    <div className="flex items-center gap-2">
+                                        <Select
+                                            value={tcpPortMode}
+                                            onValueChange={(v: PortMode) =>
+                                                setTcpPortMode(v)
+                                            }
+                                        >
+                                            <FormControl>
+                                                <SelectTrigger className="w-[110px]">
+                                                    <SelectValue />
+                                                </SelectTrigger>
+                                            </FormControl>
+                                            <SelectContent>
+                                                <SelectItem value="all">
+                                                    {t("allPorts")}
+                                                </SelectItem>
+                                                <SelectItem value="blocked">
+                                                    {t("blocked")}
+                                                </SelectItem>
+                                                <SelectItem value="custom">
+                                                    {t("custom")}
+                                                </SelectItem>
+                                            </SelectContent>
+                                        </Select>
+                                        {tcpPortMode === "custom" ? (
+                                            <FormControl>
+                                                <Input
+                                                    className="flex-1"
+                                                    placeholder="80,443,8000-9000"
+                                                    value={tcpCustomPorts}
+                                                    onChange={(e) =>
+                                                        setTcpCustomPorts(
+                                                            e.target.value
+                                                        )
+                                                    }
+                                                />
+                                            </FormControl>
+                                        ) : (
+                                            <Input
+                                                className="flex-1"
+                                                disabled
+                                                placeholder={
+                                                    tcpPortMode === "all"
+                                                        ? t("allPortsAllowed")
+                                                        : t("allPortsBlocked")
+                                                }
+                                            />
+                                        )}
+                                    </div>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                    </SettingsFormCell>
+
+                    <SettingsFormCell span="full">
+                        <FormField
+                            control={control}
+                            name="udpPortRangeString"
+                            render={() => (
+                                <FormItem>
+                                    <FormLabel>
+                                        {t("editInternalResourceDialogUdp")}
+                                    </FormLabel>
+                                    <div className="flex items-center gap-2">
+                                        <Select
+                                            value={udpPortMode}
+                                            onValueChange={(v: PortMode) =>
+                                                setUdpPortMode(v)
+                                            }
+                                        >
+                                            <FormControl>
+                                                <SelectTrigger className="w-[110px]">
+                                                    <SelectValue />
+                                                </SelectTrigger>
+                                            </FormControl>
+                                            <SelectContent>
+                                                <SelectItem value="all">
+                                                    {t("allPorts")}
+                                                </SelectItem>
+                                                <SelectItem value="blocked">
+                                                    {t("blocked")}
+                                                </SelectItem>
+                                                <SelectItem value="custom">
+                                                    {t("custom")}
+                                                </SelectItem>
+                                            </SelectContent>
+                                        </Select>
+                                        {udpPortMode === "custom" ? (
+                                            <FormControl>
+                                                <Input
+                                                    className="flex-1"
+                                                    placeholder="53,123,500-600"
+                                                    value={udpCustomPorts}
+                                                    onChange={(e) =>
+                                                        setUdpCustomPorts(
+                                                            e.target.value
+                                                        )
+                                                    }
+                                                />
+                                            </FormControl>
+                                        ) : (
+                                            <Input
+                                                className="flex-1"
+                                                disabled
+                                                placeholder={
+                                                    udpPortMode === "all"
+                                                        ? t("allPortsAllowed")
+                                                        : t("allPortsBlocked")
+                                                }
+                                            />
+                                        )}
+                                    </div>
+                                    <FormMessage />
+                                </FormItem>
+                            )}
+                        />
+                    </SettingsFormCell>
+                </>
+            ) : null}
+
+            <SettingsFormCell span="full">
+                <PrivateResourceAllowIcmpField
+                    control={control}
+                    id={icmpId}
+                    disabled={disabled}
+                />
+            </SettingsFormCell>
+        </>
+    );
+
+    if (embedInParentGrid) {
+        return content;
+    }
+
+    return <SettingsFormGrid>{content}</SettingsFormGrid>;
+}
+
+export function PrivateResourcePortRanges(
+    props: Omit<
+        PrivateResourceNetworkAccessFieldsProps,
+        "showPortRanges" | "embedInParentGrid"
+    >
+) {
+    return <PrivateResourceNetworkAccessFields showPortRanges {...props} />;
+}