@rancher/shell 0.5.3 → 1.2.1

package/assets/images/providers/aks-black.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<g>
+	<polygon points="49.9,37.8 49.9,62.2 64.6,56.3 64.6,43.2 	"/>
+	<path d="M35.4,41.3V58l11.5,4.1V37.8L35.4,41.3z M38.1,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M41.4,58.4l-2.5-0.9V42.4l2.5-0.8V58.4z
+		 M45.5,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon points="14.5,37.8 14.5,62.2 29.2,56.3 29.2,43.2 	"/>
+	<path d="M0,41.3V58l11.5,4.1V37.8L0,41.3z M2.8,57.2L1,56.5V43.2l1.8-0.5V57.2z M6,58.4l-2.5-0.9V42.4L6,41.6V58.4z M10.1,59.7
+		l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon points="85.3,37.8 85.3,62.2 100,56.3 100,43.2 	"/>
+	<path d="M70.8,41.3V58l11.5,4.1V37.8L70.8,41.3z M73.4,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M76.8,58.4l-2.5-0.9V42.4l2.5-0.8V58.4z
+		 M80.9,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon points="31.1,62.6 31.1,87 45.7,81.1 45.7,68 	"/>
+	<path d="M16.5,66.3v16.6L28,87V62.6L16.5,66.3z M19.1,82l-1.8-0.7V68.1l1.8-0.5V82z M22.5,83.2L20,82.3V67.2l2.5-0.8V83.2z
+		 M26.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
+	<polygon points="67.1,62.6 67.1,87 81.8,81.1 81.8,68 	"/>
+	<path d="M52.4,66.3v16.6L64,87V62.6L52.4,66.3z M55.2,82l-1.8-0.7V68.1l1.8-0.5V82z M58.5,83.2l-2.5-1v-15l2.5-0.8V83.2z
+		 M62.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
+	<polygon points="31.1,13 31.1,37.3 45.7,31.5 45.7,18.4 	"/>
+	<path d="M16.5,16.6v16.6L28,37.3V13L16.5,16.6z M19.1,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M22.5,33.5L20,32.7V17.6l2.5-0.8V33.5z
+		 M26.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
+	<polygon points="67.1,13 67.1,37.3 81.8,31.5 81.8,18.4 	"/>
+	<path d="M52.4,16.6v16.6L64,37.3V13L52.4,16.6z M55.2,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M58.5,33.5L56,32.7V17.6l2.5-0.8
+		C58.5,16.8,58.5,33.5,58.5,33.5z M62.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
+</g>
+</svg>

package/assets/images/providers/aks.svg

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0079D6;}
+</style>
+<g>
+	<polygon class="st0" points="49.9,37.8 49.9,62.2 64.6,56.3 64.6,43.2 	"/>
+	<path class="st0" d="M35.4,41.3V58l11.5,4.1V37.8L35.4,41.3z M38.1,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M41.4,58.4l-2.5-0.9V42.4
+		l2.5-0.8V58.4z M45.5,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon class="st0" points="14.5,37.8 14.5,62.2 29.2,56.3 29.2,43.2 	"/>
+	<path class="st0" d="M0,41.3V58l11.5,4.1V37.8L0,41.3z M2.8,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M6,58.4l-2.5-0.9V42.4L6,41.6V58.4z
+		 M10.1,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon class="st0" points="85.3,37.8 85.3,62.2 100,56.3 100,43.2 	"/>
+	<path class="st0" d="M70.8,41.3V58l11.5,4.1V37.8L70.8,41.3z M73.4,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M76.8,58.4l-2.5-0.9V42.4
+		l2.5-0.8V58.4z M80.9,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
+	<polygon class="st0" points="31.1,62.6 31.1,87 45.7,81.1 45.7,68 	"/>
+	<path class="st0" d="M16.5,66.3v16.6L28,87V62.6L16.5,66.3z M19.1,82l-1.8-0.7V68.1l1.8-0.5V82z M22.5,83.2l-2.5-0.9V67.2l2.5-0.8
+		V83.2z M26.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
+	<polygon class="st0" points="67.1,62.6 67.1,87 81.8,81.1 81.8,68 	"/>
+	<path class="st0" d="M52.4,66.3v16.6L64,87V62.6L52.4,66.3z M55.2,82l-1.8-0.7V68.1l1.8-0.5V82z M58.5,83.2L56,82.2V67.2l2.5-0.8
+		V83.2z M62.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
+	<polygon class="st0" points="31.1,13 31.1,37.3 45.7,31.5 45.7,18.4 	"/>
+	<path class="st0" d="M16.5,16.6v16.6L28,37.3V13L16.5,16.6z M19.1,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M22.5,33.5l-2.5-0.8V17.6
+		l2.5-0.8V33.5z M26.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
+	<polygon class="st0" points="67.1,13 67.1,37.3 81.8,31.5 81.8,18.4 	"/>
+	<path class="st0" d="M52.4,16.6v16.6L64,37.3V13L52.4,16.6z M55.2,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M58.5,33.5L56,32.7V17.6
+		l2.5-0.8C58.5,16.8,58.5,33.5,58.5,33.5z M62.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
+</g>
+</svg>

package/assets/styles/global/_labeled-input.scss

@@ -121,6 +121,7 @@
   .cron-label, .sub-label {
     position: absolute;
     top: 100%;
+    width: 100%;
     padding-top: 5px;
     left: 0;
     color: var(--input-label);

package/assets/styles/global/_layout.scss

@@ -54,102 +54,3 @@ HEADER {
   background-color: var(--nav-bg);
   height: var(--footer-height);
 }
-
-
-// !BEGIN This was all a part of default.vue but it wasn't scoped which meant it applied to all styles. Without layouts this style was being lazy loaded instead of on initial load. This was styling other layouts especially plain.vue.
-.dashboard-root {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-}
-
-.dashboard-content {
-  display: grid;
-  position: relative;
-  flex: 1 1 auto;
-  overflow-y: auto;
-  min-height: 0px;
-
-  &.dashboard-padding-left {
-    padding-left: $app-bar-collapsed-width;
-
-    .overlay-content-mode {
-      left: calc(var(--nav-width) + $app-bar-collapsed-width);
-    }
-  }
-
-  &.pin-right {
-    grid-template-areas:
-      "header  header  header"
-      "nav      main     wm";
-    grid-template-rows: var(--header-height) auto;
-    grid-template-columns: var(--nav-width) auto var(--wm-width, 0px);
-  }
-
-  &.pin-bottom {
-    grid-template-areas:
-      "header  header"
-      "nav       main"
-      "wm         wm";
-    grid-template-rows: var(--header-height) auto var(--wm-height, 0px);
-    grid-template-columns: var(--nav-width) auto;
-  }
-
-  &.pin-left {
-    grid-template-areas:
-      "header  header  header"
-      "wm       nav     main";
-    grid-template-rows: var(--header-height) auto;
-    grid-template-columns: var(--wm-width, 0px) var(--nav-width) auto;
-  }
-
-  >HEADER {
-    grid-area: header;
-  }
-
-  .default-side-nav {
-    grid-area: nav;
-  }
-}
-
-.wm {
-  grid-area: wm;
-  overflow-y: hidden;
-  z-index: 1;
-}
-
-.localeSelector {
-  ::v-deep .popover-inner {
-    padding: 50px 0;
-  }
-
-  ::v-deep .popover-arrow {
-    display: none;
-  }
-
-  ::v-deep .popover:focus {
-    outline: 0;
-  }
-
-  li {
-    padding: 8px 20px;
-
-    &:hover {
-      background-color: var(--primary-hover-bg);
-      color: var(--primary-hover-text);
-      text-decoration: none;
-    }
-  }
-}
-
-.drag-start {
-  z-index: 1000;
-  opacity: 0.5;
-  transition: opacity .3s ease;
-}
-
-.drag-end {
-  opacity: 1;
-}
-
-// !END

package/assets/translations/en-us.yaml

@@ -185,7 +185,7 @@ nav:
     configuration: Configuration
     hci: HCI
   search:
-    placeholder: Filter clusters by...
+    placeholder: Type to search clusters
     noResults: No matching clusters
     clusters: clusters
   resourceSearch:
@@ -243,6 +243,7 @@ suffix:
   ib: iB
   mib: MiB
   gb: GB
+  ago: ago
   revisions: |-
     {count, plural,
       =1 { Revision }
@@ -691,15 +692,6 @@ asyncButton:
     successIcon: checkmark
     waiting: ''
     waitingIcon: refresh
-  manual-refresh:
-    action: ''
-    actionIcon: refresh
-    error: ''
-    errorIcon: error
-    success: ''
-    successIcon: checkmark
-    waiting: ''
-    waitingIcon: refresh
   remove:
     action: Remove
     success: Removed
@@ -860,6 +852,9 @@ catalog:
       keywords: Keywords
     errors:
       clusterToolExists: This chart has a fixed namespace and name. A matching <a href="{url}">application</a> has been found and any changes will be made to it.
+    banner:
+      legacy: 'PSP Removal: Before upgrading a cluster to Kubernetes 1.25+, please ensure you review your Helm applications for Pod Security Policies and update them accordingly'
+    enablePSP: Enable Pod Security Policies
     global: Global
   charts:
     all: All
@@ -874,7 +869,7 @@ catalog:
     versionWindowsIncompatible: Linux only version
     header: Charts
     featuredCharts: Featured Charts
-    noCharts: 'There are no charts available, have you added any repos or set filters?'
+    noCharts: 'There are no charts available, have you added any repos?'
     noWindows: Your repos do not contain any charts capable of being deployed on a cluster with Windows nodes.
     noWindowsAndLinux: Your repos do not contain any charts capable of being deployed on a cluster with both Windows and Linux worker nodes.
     operatingSystems:
@@ -1283,6 +1278,9 @@ cluster:
         networkName: Network Name
         macAddress: Mac Address
         macFormat: 'Invalid MAC address format.'
+      vGpus:
+        errors:
+          notAllocatable: '"VGPUs" not allocatable. There are not enough [{vGpus}] devices to be allocated to each node in machine pool [{pool}]'
       volume:
         title: Volumes
         volume: Volume
@@ -1393,6 +1391,7 @@ cluster:
         label: DNS Label
       environment:
         label: Environment
+        tooltip: The environment is configured when cloud credentials are created.
       faultDomainCount:
         help: If the availability set has already been created, the fault domain count will be ignored.
         label: Fault Domain Count
@@ -1680,9 +1679,12 @@ cluster:
   banner:
     warning: 'This cluster contains a machineSelectorConfig, which this form does not fully support; use the YAML editor to manage the full configuration.'
     os: 'You are attempting to add a {newOS} worker node to a cluster with one or more {existingOS} worker nodes: some installed apps may need to be upgraded or removed.'
-    rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">documentation</a>.'
+    rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a target="blank" href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">documentation</a>.'
     desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
+    invalidPsps: You have one or more PodSecurityPolicy resource(s) in this cluster. Pod Security Policies are not available in Kubernetes v1.25 and will be automatically removed.
     haveArgInfo: Configuration information is not available for the selected Kubernetes version.  The options available on this screen will be limited; you may want to use the YAML editor.
+    deprecatedPsp: Pod Security Policies are deprecated as of Kubernetes v1.21, and have been removed in Kubernetes v1.25.
+    removedPsp: Pod Security Policies have been removed in Kubernetes v1.25. Use Pod Security Admission instead.
     cloudProviderAddConfig: 'On Kubernetes 1.27 or greater, the Amazon Cloud Provider requires additional configuration. See <a href="https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon" target="_blank" rel="noopener noreferrer nofollow">the documentation</a> for more information.'
     machinePoolError: |-
       {count, plural,
@@ -1849,6 +1851,9 @@ cluster:
       cisOverride: Changing this setting may affect cluster security as it overrides default CIS settings
       cisUnsupported: The selected Kubernetes Version no longer supports CIS Profile "{cisProfile}". Please select a supported profile. We recommend reviewing the <a href="https://docs.rke2.io/security/hardening_guide" target="_blank" rel="noopener noreferrer nofollow">documentation</a> to evaluate the impact of changing the CIS Profile.
     modal:
+      pspChange:
+        title: Pod Security Policy deprecation
+        body: <p>Kubernetes has removed support for Pod Security Policies (PSPs) starting with version 1.25. If your cluster has PodSecurityPolicy admission controller enabled via "kube-apiserver-arg.enable-admission-plugins" in Cluster YAML, it has to be <i>manually</i> removed before proceeding with the upgrade. Additionally, any PSPs that may be present in the cluster will no longer be available/enforced. Do you want to proceed?</p>
       editYamlMachinePool:
         title: Save Machine Configurations
         body: Machine Configurations define how machines in Pools are deployed.<br><br> They will be saved upfront to ensure valid Cluster YAML can be saved.
@@ -1862,10 +1867,6 @@ cluster:
       header: System Services
     cni:
       label: Container Network
-      cniNoneBanner: When CNI is set to 'none' an <a href="https://ranchermanager.docs.rancher.com/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration#additionalmanifest" target="_blank" rel="noopener noreferrer nofollow">Additional Manifest</a> deploying an alternate CNI must be specified for successful cluster provisioning.
-      cilium:
-        BandwidthManager:
-          enable: Enable Bandwidth Manager
     cloudProvider:
       label: Cloud Provider
       header: Cloud Provider Config
@@ -2049,8 +2050,6 @@ clusterIndexPage:
       etcd: Etcd
       scheduler: Scheduler
       controller-manager: Controller Manager
-    certs:
-      label: Certificates
 
 configmap:
   tabs:
@@ -2078,10 +2077,6 @@ resource:
   errors:
     update: "Error updating {name}"
 
-codeMirror:
-  keymap:
-    tooltip: Key mapping preference.
-
 cruResource:
   backToForm: Back to Form
   backBody: You will lose any changes made to the YAML.
@@ -2361,10 +2356,8 @@ glance:
   version: Kubernetes Version
   monitoringDashboard: Monitoring Dashboard
   installMonitoring: Install Monitoring
-  v1MonitoringInstalled: V1 Monitoring Installed
   clusterInfo: Cluster Information
   eventsTable: Full events list
-  secretsTable: Full secrets list
 
 clusterBadge:
   addLabel: Add Cluster Badge
@@ -2777,9 +2770,11 @@ landing:
     cpuUsed: CPU Used
     memoryUsed: Memory Used
   seeWhatsNew: Learn more about the improvements and new capabilities in this version.
-  whatsNewLink: "What's new in 2.9"
+  whatsNewLink: "What's new in 2.8"
   learnMore: Learn More
   support: Support
+  psps: PSPs
+  deprecatedPsp: Pod Security Policies are deprecated as of Kubernetes v1.21, and have been removed in Kubernetes v1.25. You have one or more PodSecurityPolicy resource(s) in this cluster.
   community:
     title: Community Support
     docs: Docs
@@ -3168,9 +3163,9 @@ monitoring:
         label: Additional Secrets
       existing: Choose an existing config secret
       info: |
-        <span class="text-bold">Create default config</span>:<br>A Secret containing your Alertmanager Config will be created in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace on deploying this chart under the name <pre class='inline-block m-0'>alertmanager-rancher-monitoring-alertmanager</pre>. By default, this Secret will never be modified on an uninstall or upgrade of this chart. <br /><br />
+        <span class="text-bold">Create default config</span>: A Secret containing your Alertmanager Config will be created in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace on deploying this chart under the name <pre class='inline-block m-0'>alertmanager-rancher-monitoring-alertmanager</pre>. By default, this Secret will never be modified on an uninstall or upgrade of this chart. <br />
         Once you have deployed this chart, you should edit the Secret via the UI in order to add your custom notification configurations that will be used by Alertmanager to send alerts. <br /> <br />
-        <span class="text-bold">Choose an existing config secret</span>:<br>You must specify a Secret that exists in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace. If the namespace does not exist, you will not be able to select an existing secret.
+        <span class="text-bold">Choose an existing config secret</span>: You must specify a Secret that exists in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace. If the namespace does not exist, you will not be able to select an existing secret.
       label: Alertmanager Secret
       new: Create default config
       radio:
@@ -3342,15 +3337,6 @@ monitoring:
       bearerTokenSecret: Bearer Token Secret
       basicAuthUsername: Secret with Basic Auth Username
       basicAuthPassword: Secret with Basic Auth Password
-  installSteps:
-    uninstallV1:
-      stepTitle: Uninstall V1
-      stepSubtext: Uninstall Previous Monitoring
-      warning1: V1 Monitoring is currently deployed. This needs to be uninstalled before V2 monitoring can be installed.
-      warning2: <a target="blank" href="{docsBase}/monitoring-alerting/guides/migrating/" target='_blank' rel='noopener nofollow'>Learn more</a> about the migration steps to V2 Monitoring.
-      promptDescription: <div class="mt-20 mb-20">You are attempting to uninstall V1 Monitoring. Please ensure you have read the migration steps.</div>
-      success1: V1 monitoring successfully uninstalled.
-      success2: Press Next to continue
   tabs:
     alerting: Alerting
     general: General
@@ -4141,9 +4127,6 @@ plugins:
         image:
           label: Catalog Image Reference
           placeholder: "e.g. hub.docker.io/example-org/my-image:latest"
-        imagePullSecrets:
-          label: Image Pull Secrets
-          tooltip: Must be of Type `kubernetes.io/dockercfg` or `kubernetes.io/dockerconfigjson`
         secrets:
           banner: "If the registry that hosts the Catalog Image requires Pull Secrets, they must be created in the following namespace:<pre>cattle-ui-plugin-system</pre>"
       banner: This will create an Deployment, Service, and Helm repository to serve the extension charts.
@@ -4356,6 +4339,10 @@ project:
   vmDefaultResourceLimit: VM Default Resource Limit
   resourceQuotas: Resource Quotas
   haveOneOwner: There must be at least one member with the Owner role.
+  psp:
+    default: Cluster Default
+    label: Pod Security Policy
+    current: "{value} (Current)"
 
 
 projectMembers:
@@ -4661,6 +4648,9 @@ rbac:
       nodetemplates-manage:
         label: Manage Node Templates
         description: Allows the user to define, edit, and remove Node Templates.
+      podsecuritypolicytemplates-manage:
+        label: Manage Pod Security Policies (PSPs)
+        description: Allows the user to define, edit, and remove PSPs.
       roles-manage:
         label: Manage Roles
         description: Allows the user to define, edit, and remove Role definitions.
@@ -4761,7 +4751,7 @@ resourceTable:
     machinePool: "<span>Pool:</span> {name}"
     notInANamespace: Not Namespaced
     notInAProject: Not in a Project
-    project: "<span>Project:</span> <span>{name}</span>"
+    project: "<span>Project:</span> {name}"
     notInAWorkspace: Not in a Workspace
     workspace: "<span>Workspace:</span> {name}"
     notInANodePool: "Not in a Pool"
@@ -4794,26 +4784,13 @@ secret:
   authentication: Authentication
   certificate:
     certificate: Certificate
-    certificates: Certificates
     certificatePlaceholder: "Paste in the CA certificate, starting with -----BEGIN CERTIFICATE----"
     cn: Domain Name
     expires: Expires
-    expiresOn: Expires On
-    expiresDuration: Expires In
-    lifetime: Lifetime
     issuer: Issuer
-    paging: |-
-      {pages, plural,
-      =0 {No {pluralLabel}}
-      =1 {{count} {count, plural, =1 {{singularLabel}} other {{pluralLabel}}}}
-      other {{from} - {to} of {count} {pluralLabel}}}
     plusMore: "+ {n} more"
     privateKey: Private Key
     privateKeyPlaceholder: "Paste in the private key, typically starting with -----BEGIN RSA PRIVATE KEY-----"
-    warnings:
-      expiring: "{count} {count, plural, =1 {Certificate expires soon} other {Certificates expire soon}}"
-      expired: "{count} {count, plural, =1 {Certificate has expired} other {Certificates have expired}}"
-      filtered: ". Not all may be visible given the selected project/namespace filter"
   data: Data
   registry:
     address: Registry
@@ -5592,6 +5569,9 @@ tableHeaders:
   users: Users
   userDisplayName: Display Name
   userId: ID
+  userDeletedIn: Delete After
+  userDisabledIn: Disable After
+  userLastLogin: Last Login
   userStatus: Status
   username: Local Username
   value: Value
@@ -5599,9 +5579,6 @@ tableHeaders:
   volume: Volume
   volumeMode: Volume Mode
   weight: Weight
-  clusterResources: Cluster Resources
-  repoPerClusterState: Cluster State
-  repoPerClusterStateTooltip: The state of the repo on the cluster
 target:
   router:
     label: Router
@@ -5615,6 +5592,10 @@ target:
     placeholder: Select a version
 
 user:
+  state:
+    active: 'Enabled'
+    inactive: 'Disabled'
+    unknown: 'Unknown'
   detail:
     username: Username
     globalPermissions:
@@ -5652,6 +5633,41 @@ user:
         placeholder: e.g. This account is for John Smith
   list:
     errorRefreshingGroupMemberships: Error refreshing group memberships
+  retention:
+    button:
+      label: User retention settings
+    growl:
+      title: Save user retention settings
+      message: User retention settings have been updated successfully
+    edit:
+      title:
+        header: "Users: Settings"
+        pre: "Users:"
+        post: Settings
+        subTitle: User retention
+      form:
+        disableAfter:
+          checkbox: Disable user accounts after an inactivity period (duration since last login)
+          input:
+            label: Inactivity period
+            tooltip: Uses duration units (e.g. use 30h for 30 hours)
+        deleteAfter:
+          checkbox: Delete user accounts after an inactivity period (duration since last login)
+          input:
+            label: Inactivity period
+            tooltip: Uses duration units (e.g. use 30h for 30 hours)
+            subLabel: This value must be larger than the Disable period, if it's active
+        cron:
+          label: User retention process schedule
+          subLabel: The user retention process runs as a cron job (required)
+          errorMessage: User retention process schedule must be a valid cron expression
+        dryRun:
+          label: Run the user retention process in DRY mode (no changes will be applied)
+          subLabel: You can check the logs to see which accounts would be affected
+        defaultLastLogin:
+          label: Default last login (ms)
+          subLabel: Accounts without a registered last login timestamp will get this as a default
+          placeholder: Unix timestamp
 validation:
   noUpperCase: 'Alphanumeric characters in "{key}" must be lowercase'
   arrayLength:
@@ -5778,10 +5794,7 @@ validation:
         required: 'Port Rule [{position}] - Target Port is required'
   setting:
     serverUrl:
-      https: Server URL must be https.
-      localhost: If the Server URL is internal to the Rancher server (e.g. localhost) the downstream clusters may not be able to communicate with Rancher.
-      trailingForwardSlash: Server URL should not have a trailing forward slash.
-      url: Server URL must be an URL.
+      https: server-url must be https.
   stringLength:
     between: '"{key}" should be between {min} and {max} {max, plural, =1 {character} other {characters}}'
     exactly: '"{key}" should be {count, plural, =1 {# character} other {# characters}}'
@@ -5899,9 +5912,7 @@ workload:
         exec:  Command run inside the container exits with status 0
     image: Container Image
     imagePullPolicy: Pull Policy
-    imagePullSecrets:
-      label: Pull Secrets
-      tooltip: Must be of Type `kubernetes.io/dockercfg` or `kubernetes.io/dockerconfigjson`
+    imagePullSecrets: Pull Secrets
     init: Init Container
     lifecycleHook:
       postStart:
@@ -7355,6 +7366,7 @@ customLinks:
     issues:     File an Issue
     getStarted: Get Started
     commercialSupport: Commercial Support
+    suseCollective: SUSE Collective
 
 
 
@@ -7405,17 +7417,6 @@ embedding:
   retry: Retry
   unavailable: Cluster Manager UI is not available
 
-v1ClusterTools:
-  monitoring:
-    label: Monitoring (Legacy)
-    description: 'Legacy V1 monitoring. V1 Monitoring is deprecated since Rancher 2.5.0. <a target="blank" href="{docsBase}/monitoring-alerting/guides/migrating/">Learn more</a> about the migration steps to V2 Monitoring.'
-  logging:
-    label: Logging (Legacy)
-    description: 'Legacy V1 logging. V1 Logging is deprecated since Rancher 2.5.0. <a target="blank" href="{docsBase}/logging/migrating/">Learn more</a> about migrating to V2 Logging.'
-  istio:
-    label: Istio (Legacy)
-    description: 'Legacy V1 Istio. Istio v1.5 has been deprecated since Rancher 2.5.0. <a target="blank" href="{docsBase}/istio/#migrate-from-previous-istio-version">Learn more</a> about migrating to the latest version.'
-
 legacy:
   alerts: Alerts
   apps: Apps
@@ -7426,6 +7427,7 @@ legacy:
   globalDnsProviders: Global DNS Providers
   notifiers: Notifiers
   monitoring: Monitoring
+  psps: Pod Security Policy Templates
   secrets: Secrets
 
   project: