Skip to content

Commit

Permalink
Merge pull request #1260 from harvester/mergify/bp/release-harvester-…
Browse files Browse the repository at this point in the history
…v1.3/pr-1257

fix: missing vnc reconnecting label (backport #1257)
  • Loading branch information
houhoucoop authored Jan 10, 2025
2 parents 911ecf3 + 1797413 commit 1b23e30
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion pkg/harvester/components/novnc/NovncConsole.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<main class="main-layout">
<div class="text-center">
<h2 class="text-secondary mt-20">
{{ t('vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
{{ t('harvester.virtualMachine.vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
</h2>
</div>
</main>
Expand Down
31 changes: 17 additions & 14 deletions pkg/harvester/l10n/en-us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ harvester:
ipv4Address: IPv4 Address
filterLabels: Filter Labels
storageClass: Storage Class
dockerImage: Docker Image
dockerImage: Docker Image
pci:
available: Available Devices
compatibleNodes: Compatible Nodes
Expand Down Expand Up @@ -372,7 +372,7 @@ harvester:
standard: Standard
high: High-Perfomanace
customized: Customized
parameters:
parameters:
title: Ksmtuned Parameters
boost: Boost
decay: Decay
Expand Down Expand Up @@ -424,7 +424,7 @@ harvester:
addLabel: Add Disk Tag
conditions: Conditions
storageAvailable:
label: Storage Available
label: Storage Available
storageScheduled:
label: Storage Scheduled
storageMaximum:
Expand Down Expand Up @@ -473,6 +473,9 @@ harvester:
console:
novnc: Open in Web VNC
serial: Open in Serial Console
vncConsole:
reconnecting:
message: Web VNC console reconnection attempt
promptRemove:
title: 'Select the volume you want to delete:'
deleteAll: Delete All
Expand Down Expand Up @@ -756,7 +759,7 @@ harvester:
warning: WARNING
doc: Read the <a href="https://docs.harvesterhci.io/v1.3/upgrade/index" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
moreNotes: For more details about the release notes, please visit -
moreNotes: For more details about the release notes, please visit -

backup:
label: VM Backups
Expand Down Expand Up @@ -789,7 +792,7 @@ harvester:
virtualMachineName: Virtual Machine Name
keepMacAddress: Keep MAC Address
matchTarget: The current backup target does not match the existing one.
progress:
progress:
details: Volume details
tooltip:
starting: Backup initiating
Expand Down Expand Up @@ -933,7 +936,7 @@ harvester:
templateType: Template Type
userData: User Data
networkData: Network Data

support:
title: Harvester Support
kubeconfig:
Expand Down Expand Up @@ -971,7 +974,7 @@ harvester:
label: Protocols
ciphers:
label: Ciphers

monitoring:
configuration:
label: Configuration
Expand Down Expand Up @@ -1079,7 +1082,7 @@ harvester:
validate:
available: NIC "{nic}" is not available on the selected nodes
linkAttributes:
mtu:
mtu:
label: MTU
bondOptions:
mode:
Expand All @@ -1099,7 +1102,7 @@ harvester:
vlanStatus:
vlanConfig:
label: Network Config

clusterNetwork:
title: Cluster Networks/Configs
create:
Expand All @@ -1109,7 +1112,7 @@ harvester:
mgmt: mgmt is a built-in cluster management network and does not support any additional network configurations.
notExist: 'Cluster Network "{ clusterNetwork }" does not exist'
notReady: 'Cluster Network "{ clusterNetwork }" is not ready'

addons:
descriptions:
'harvester-system/vm-import-controller': vm-import-controller is an addon to help migrate VM workloads from other source clusters to an existing Harvester cluster.
Expand Down Expand Up @@ -1226,7 +1229,7 @@ harvester:
addLabel: Add CIDR
range:
addLabel: Add Range

service:
healthCheckPort:
label: Health Check Port
Expand Down Expand Up @@ -1287,15 +1290,15 @@ harvester:
deviceInTheSameHost: 'You can only select devices on the same host.'

harvesterVlanConfigMigrateDialog:
targetClusterNetwork:
targetClusterNetwork:
label: Target Cluster Network
placeholder: Choose Target Cluster Network

seeder:
banner:
enable:
prefix: Addon "harvester-seeder" is disabled now,
middle: click here
prefix: Addon "harvester-seeder" is disabled now,
middle: click here
suffix: to enable it.
noAccess: Please contact system admin to enable the Out-of-Band Access first.
noAddon: Addon "harvester-seeder" is not exist, please check if it is installed.
Expand Down

0 comments on commit 1b23e30

Please sign in to comment.