diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js index 5fad88065b6..7c53c3a1ca7 100644 --- a/pkg/harvester/config/harvester.js +++ b/pkg/harvester/config/harvester.js @@ -818,7 +818,7 @@ export function init($plugin, store) { }); virtualType({ - label: 'Addons', + label: 'Add-ons', group: 'advanced', name: HCI.ADD_ONS, ifHaveType: HCI.ADD_ONS, diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml index b58a2569f20..4d1cf68dab5 100644 --- a/pkg/harvester/l10n/en-us.yaml +++ b/pkg/harvester/l10n/en-us.yaml @@ -262,14 +262,14 @@ harvester: goSetting: prefix: The pcidevices-controller add-on is not enabled, click middle: here - suffix: to enable it to manage your PCI devices. + suffix: to enable the add-on to successfully manage your PCI devices. noPCIPermission: Please contact your system administrator to enable the PCI devices first. enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure. devices: matrixHostName: Host Name matrixDeviceClaimName: Device Claim Name - + generic: close: Close open: Open @@ -519,7 +519,7 @@ harvester: Shutdown: Shutdown cpuPinning: label: Enable CPU Pinning - tooltip: Enable CPU Pinning brings better performance and reduce latency for the virtual machine + tooltip: Enable CPU Pinning brings better performance and reduce latency for the virtual machine restartVMMessage: Changing the CPU Pinning setting requires a virtual machine reboot for the change to take effect migrationMessage: This virtual machine can only be migrated to a target node that has CPU Manager enabled, as CPU Pinning is configured. restartNow: |- @@ -534,7 +534,7 @@ harvester: tpm: Enable TPM cpuManager: prefix: You must enable CPU Manager for at least one node in - middle: 'host page' + middle: 'host page' suffix: to enable CPU Pinning for VM usbTip: Provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC. sshTitle: Add Public SSH Key @@ -576,7 +576,7 @@ harvester: addNetwork: Add Network addPort: Add Port cloudConfig: - title: Cloud Config + title: Cloud Configuration createTemplateTitle: 'Create {name}.' createNew: Create new... cloudInit: @@ -636,7 +636,7 @@ harvester: instance: Virtual Machines monitor: Monitor Data keypairs: SSH Keys - cloudConfig: Cloud Config + cloudConfig: Cloud Configuration metrics: Virtual Machine Metrics details: title: @@ -826,7 +826,7 @@ harvester: viewSetting: prefix: Click middle: here - suffix: to view the backup config. + suffix: to view the backup configuration. testConnect: actionLabel: Test connection waitingLabel: Testing connection... @@ -899,6 +899,7 @@ harvester: cert: Upload a self-signed SSL certificate vlanChangeTip: The newly modified default network interface only applies to newly added nodes, not existing ones. defaultPhysicalNIC: Default Network Interface + modifiedMessage: Settings that have been customized from default settings are tagged with 'Modified'. percentTip: The value in parentheses represents the distribution percentage of the network interface on all hosts. If an interface less than 100% is selected, the user needs to manually specify the network interface on the host where the vlan network configuration fails. message: ca: @@ -948,7 +949,7 @@ harvester: addRewrite: Add Rewrite addMirror: Add Mirror configs: - configs: Configs + configs: Configurations registryEDQNorIP: Registry FDQN or IP registryPlaceholder: myregistry.local:5000 username: Username @@ -956,7 +957,7 @@ harvester: auth: Auth identityToken: Identity Token insecureSkipVerify: InsecureSkipVerify - addConfig: Add Config + addConfig: Add Configuration upgrade: selectExitImage: Please select the OS image to upgrade. @@ -1028,7 +1029,7 @@ harvester: configuration: label: Configuration alertmanagerConfig: - label: Alertmanager Configs + label: Alertmanager Configurations diabledMonitoringTips: prefix: 'Enable the' middle: 'monitoring' @@ -1048,13 +1049,13 @@ harvester: fluentbit: Fluentbit fluentd: Fluentd clusterFlow: - label: Cluster Flow + label: Cluster Flows clusterOutput: - label: Cluster Output + label: Cluster Outputs flow: - label: Flow + label: Flows output: - label: Output + label: Outputs diabledTips: prefix: 'Enable' middle: 'logging' @@ -1141,7 +1142,7 @@ harvester: label: Mode miimon: label: Miimon - tooltip: -1 means to keep the original value + tooltip: Miimon specifies the MII link monitoring frequency in milliseconds. -1 means to keep the original value. nodeSelector: matchingNodes: matchesSome: |- @@ -1347,9 +1348,9 @@ harvester: usb: label: USB Devices - noPermission: Please contact system admin to add Harvester addons first + noPermission: Please contact system admin to add Harvester add-ons first goSetting: - prefix: The pcidevices-controller addon is not enabled, click + prefix: The pcidevices-controller add-on is not enabled, click middle: here suffix: to enable it to manage your USB devices. enableGroup: Enable Group @@ -1469,8 +1470,8 @@ typeLabel: } harvesterhci.io.networkattachmentdefinition: |- {count, plural, - one { Virtual Machines Network } - other { Virtual Machines Networks } + one { Virtual Machine Network } + other { Virtual Machine Networks } } harvesterhci.io.volume: |- {count, plural, @@ -1494,8 +1495,8 @@ typeLabel: } harvesterhci.io.virtualmachinebackup: |- {count, plural, - one { Virtual Machines Backup } - other { Virtual Machines Backups } + one { Virtual Machine Backup } + other { Virtual Machine Backups } } harvesterhci.io.cloudtemplate: |- {count, plural, @@ -1509,8 +1510,8 @@ typeLabel: } harvesterhci.io.vmsnapshot: |- {count, plural, - one { Virtual Machines Snapshot } - other { Virtual Machines Snapshots } + one { Virtual Machine Snapshot } + other { Virtual Machine Snapshots } } network.harvesterhci.io.vlanconfig: |- {count, plural, @@ -1562,6 +1563,11 @@ typeLabel: one { Cluster Network } other { Cluster Networks } } + harvesterhci.io.addon: |- + {count, plural, + one { Add-on } + other { Add-ons } + } devices.harvesterhci.io.sriovnetworkdevice: |- {count, plural, one { SR-IOV Network Device } diff --git a/pkg/harvester/list/harvesterhci.io.setting.vue b/pkg/harvester/list/harvesterhci.io.setting.vue index d5ab7fcfa4e..1b208819ad1 100644 --- a/pkg/harvester/list/harvesterhci.io.setting.vue +++ b/pkg/harvester/list/harvesterhci.io.setting.vue @@ -138,7 +138,7 @@ export default {
- {{ t('advancedSettings.subtext') }} + {{ t('harvester.setting.modifiedMessage') }}
diff --git a/pkg/harvester/models/harvesterhci.io.addon.js b/pkg/harvester/models/harvesterhci.io.addon.js index e7ff9d459ae..3ca7e21facf 100644 --- a/pkg/harvester/models/harvesterhci.io.addon.js +++ b/pkg/harvester/models/harvesterhci.io.addon.js @@ -2,6 +2,7 @@ import HarvesterResource from './harvester'; import { HCI as HCI_ANNOTATIONS } from '../config/labels-annotations'; import jsyaml from 'js-yaml'; import startCase from 'lodash/startCase'; +import { HCI } from '../types'; export default class HciAddonConfig extends HarvesterResource { get availableActions() { @@ -106,6 +107,10 @@ export default class HciAddonConfig extends HarvesterResource { return failedCondition?.message || super.stateDescription; } + get parentNameOverride() { + return this.$rootGetters['i18n/t'](`typeLabel."${ HCI.ADD_ONS }"`, { count: 1 })?.trim(); + } + get displayName() { const isExperimental = this.metadata?.labels?.[HCI_ANNOTATIONS.ADDON_EXPERIMENTAL] === 'true'; diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml index cd79773a171..c08e93735e4 100644 --- a/shell/assets/translations/en-us.yaml +++ b/shell/assets/translations/en-us.yaml @@ -346,7 +346,7 @@ addClusterMemberDialog: title: Add Cluster Member addonConfigConfirmation: - title: Add-On Config Reset + title: Add-on Configuration Reset body: Changing the Kubernetes Version can reset the add-on configuration values. Confirm that the values are as expected before continuing. addProjectMemberDialog: @@ -749,7 +749,7 @@ backupRestoreOperator: encryption: Encryption encryptionConfigName: backuptip: 'Any secret in the cattle-resource-system namespace that has an encryption-provider-config.yaml key.
The contents of this file are necessary to perform a restore from this backup, and are not stored by Rancher Backup.' - label: Encryption Config Secret + label: Encryption Configuration Secret options: none: Store the contents of the backup unencrypted secret: 'Encrypt backups using an Encryption Configuration Secret (Recommended)' @@ -1116,7 +1116,7 @@ cluster: label: Google rancher-vsphere: label: vSphere - note: 'Important: Configure the vSphere Cloud Provider and Storage Provider options in the Add-On Configuration tab.' + note: 'Important: Configure the vSphere Cloud Provider and Storage Provider options in the Add-on Configuration tab.' harvester: label: Harvester copyConfig: Copy KubeConfig to Clipboard @@ -1532,7 +1532,7 @@ cluster: label: Cloud Init placeholder: e.g. http://my_host/cloud-config.yml note: Cloud-init file or url to set in the guestinfo - cloudConfigYaml: Cloud Config YAML + cloudConfigYaml: Cloud Configuration YAML os: Operating System tags: label: Tags @@ -4292,7 +4292,7 @@ projectMembers: servicesManage: Manage Services persistentvolumeclaimsManage: Manage Volumes workloadsManage: Manage Workloads - configmapsView: View Config Maps + configmapsView: View Configuration Maps ingressView: View Ingress monitoringUiView: View Monitoring projectcatalogsView: View Project Catalogs @@ -6805,8 +6805,8 @@ typeLabel: } management.cattle.io.rkeaddon: |- {count, plural, - one { RkeAddon } - other { RkeAddons } + one { RKEAddon } + other { RKEAddons } } management.cattle.io.rkek8sserviceoption: |- {count, plural, @@ -6815,8 +6815,8 @@ typeLabel: } management.cattle.io.rkek8ssystemimage: |- {count, plural, - one { RkeK8sSystemImage } - other { RkeK8sSystemImages } + one { RKEK8sSystemImage } + other { RKEK8sSystemImages } } rbac.authorization.k8s.io.clusterrolebinding: |- {count, plural, @@ -6955,7 +6955,7 @@ registryConfig: advancedSettings: label: Settings - subtext: Typical users will not need to change these. Proceed with caution, incorrect values can break your {appName} installation. Settings which have been customized from default settings are tagged 'Modified'. + subtext: Users will not need to change these settings. Proceed with caution as incorrect values can break your {appName} installation. Settings that have been customized from default settings are tagged with 'Modified'. show: Show hide: Hide none: None @@ -7064,7 +7064,7 @@ performance: checkboxLabel: Disable websocket notifications gc: label: Resource Garbage Collection - description: The UI will cache Kuberentes resources locally to avoid having to re-fetch them. In some cases, this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them. + description: The UI will cache Kubernetes resources locally to avoid having to re-fetch them. In some cases, this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them. checkboxLabel: Enable Garbage Collection whenRun: description: Update when garbage collection runs @@ -7183,7 +7183,7 @@ resourceQuota: helpText: Configure how much of the resources the namespace as a whole can consume. helpTextDetail: The amount of resources the namespace as a whole can consume. helpTextHarvester: VMs need to reserve additional memory overhead. - configMaps: Config Maps + configMaps: Configuration Maps limitsCpu: CPU Limit limitsMemory: Memory Limit persistentVolumeClaims: Persistent Volume Claims @@ -7302,7 +7302,7 @@ legacy: alerts: Alerts apps: Apps catalogs: Catalogs - configMaps: Config Maps + configMaps: Configuration Maps configuration: Configuration globalDnsEntries: Global DNS Entries globalDnsProviders: Global DNS Providers