Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-128684 / 24.10 / Wrong Help popup text (by AlexKarpov98) #10032

Merged
merged 3 commits into from
May 7, 2024
Merged

NAS-128684 / 24.10 / Wrong Help popup text (by AlexKarpov98) #10032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a16614
Empty commit to create PR on github.
bugclerk May 6, 2024
a072d96
NAS-128684: Wrong Help popup text
AlexKarpov98 May 6, 2024
084a807
Merge branch 'NAS-128684-24.10' of https://github.com/truenas/webui i…
AlexKarpovGD May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/app/helptext/vm/devices/device-add-edit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ export const helptextDevice = {
assign a port when the VM is started, or set to a\
fixed, preferred port number.'),

wait_placeholder: T('Delay VM Boot Until VNC Connects'),
wait_tooltip: T('Wait to start VM until VNC client connects.'),
wait_placeholder: T('Delay VM Boot Until SPICE Connects'),
wait_tooltip: T('Wait to start VM until SPICE client connects.'),

resolution_tooltip: T('Select a screen resolution to use for VNC sessions.'),
bind_tooltip: T('Select an IP address to use for VNC sessions.'),
password_tooltip: T('Enter a VNC password to automatically pass to the VNC session.'),
web_tooltip: T('Set to enable connecting to the VNC web interface.'),
resolution_tooltip: T('Select a screen resolution to use for SPICE sessions.'),
bind_tooltip: T('Select an IP address to use for SPICE sessions.'),
password_tooltip: T('Enter a SPICE password to automatically pass to the SPICE session.'),
web_tooltip: T('Set to enable connecting to the SPICE web interface.'),
};
6 changes: 3 additions & 3 deletions src/app/helptext/vm/vm-wizard/vm-wizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { helptextGlobal } from 'app/helptext/global-helptext';
export const helptextVmWizard = {
os_tooltip: T('Choose the VM operating system type.'),
name_tooltip: T('Enter an alphanumeric name for the virtual machine.'),
password_tooltip: T('Enter a password for the VNC display.'),
password_tooltip: T('Enter a password for the SPICE display.'),
description_tooltip: T('Description (optional).'),
time_tooltip: T('VM system time. Default is <i>Local</i>.'),
bootloader_tooltip: T('Select <i>UEFI</i> for newer operating systems or\
Expand All @@ -15,8 +15,8 @@ export const helptextVmWizard = {
autostart_tooltip: T('Set to start this VM when the system boots.'),
enable_display_tooltip: T('Enable a Display (Virtual Network Computing) remote\
connection. Requires <i>UEFI</i> booting.'),
display_bind_tooltip: T('Select an IP address to use for remote VNC sessions.\
Note: this setting only applies if you are using a VNC client other than the TrueNAS WebUI.'),
display_bind_tooltip: T('Select an IP address to use for remote SPICE sessions.\
Note: this setting only applies if you are using a SPICE client other than the TrueNAS WebUI.'),
vcpus_warning: T('The product of vCPUs, cores and threads must not exceed {maxVcpus} on this system.'),
vcpus_tooltip: T('Number of virtual CPUs to allocate to the virtual\
machine. The VM operating system\
Expand Down
16 changes: 8 additions & 8 deletions src/assets/i18n/af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@
"Define whether the control channel, data channel, both channels, or neither channel of an FTP session must occur over SSL/TLS. The policies are described <a href=\"http://www.proftpd.org/docs/directives/configuration_full.html#TLSREQUIRED\" target=\"_blank\">here</a>": "",
"Degraded": "",
"Delay Updates": "",
"Delay VM Boot Until VNC Connects": "",
"Delay VM Boot Until SPICE Connects": "",
"Delete": "",
"Delete <b>{deviceType} {device}</b>": "",
"Delete API Key": "",
Expand Down Expand Up @@ -1444,7 +1444,7 @@
"Enter <strong>{pool}</strong> below to confirm": "",
"Enter <strong>{zvolName}</strong> below to confirm.": "",
"Enter a Name (optional)": "",
"Enter a VNC password to automatically pass to the VNC session.": "",
"Enter a SPICE password to automatically pass to the SPICE session.": "",
"Enter a description of the Cloud Backup Task.": "",
"Enter a description of the Cloud Sync Task.": "",
"Enter a description of the cron job.": "",
Expand All @@ -1465,7 +1465,7 @@
"Enter a number of seconds to wait before alerting that the service cannot reach any UPS. Warnings continue until the situation is fixed.": "",
"Enter a one to three paragraph summary of the issue. Describe the problem and provide any steps to replicate the issue.": "",
"Enter a password for the <i>rancher</i> user. This is used to log in to the VM from the serial shell.": "",
"Enter a password for the VNC display.": "",
"Enter a password for the SPICE display.": "",
"Enter a password of at least eight characters.": "",
"Enter a port to bind <a href=\"https://linux.die.net/man/8/rpc.lockd\" target=\"_blank\">rpc.lockd(8)</a>.": "",
"Enter a port to bind <a href=\"https://man7.org/linux/man-pages/man8/mountd.8.html\" target=\"_blank\">mountd(8)</a>.": "",
Expand Down Expand Up @@ -3332,15 +3332,15 @@
"Select a schedule preset or choose <i>Custom</i> to open the advanced scheduler.": "",
"Select a schedule preset or choose <i>Custom</i> to setup custom schedule.": "",
"Select a schema when Samba Schema is set.": "",
"Select a screen resolution to use for VNC sessions.": "",
"Select a screen resolution to use for SPICE sessions.": "",
"Select a sector size in bytes. <i>Default</i> leaves the sector size unset and uses the ZFS volume values. Setting a sector size changes both the logical and physical sector size.": "",
"Select a subfolder from which to restore content.": "",
"Select a template": "",
"Select a time zone.": "",
"Select a user account to run the command. The user must have permissions allowing them to run the command or script.": "",
"Select action": "",
"Select an IP address to use for VNC sessions.": "",
"Select an IP address to use for remote VNC sessions. Note: this setting only applies if you are using a VNC client other than the TrueNAS WebUI.": "",
"Select an IP address to use for SPICE sessions.": "",
"Select an IP address to use for remote SPICE sessions. Note: this setting only applies if you are using a SPICE client other than the TrueNAS WebUI.": "",
"Select an existing CSR.": "",
"Select an existing SSH connection to a remote system or choose <i>Create New</i> to create a new SSH connection.": "",
"Select an existing SSH connection to a remote system or choose Create New to create a new SSH connection.": "",
Expand Down Expand Up @@ -3490,7 +3490,7 @@
"Set to either start this replication task immediately after the linked periodic snapshot task completes or continue to create a separate <b>Schedule</b> for this replication.": "",
"Set to enable DHCP. Leave unset to create a static IPv4 or IPv6 configuration. Only one interface can be configured for DHCP.": "",
"Set to enable Samba to do DNS updates when joining a domain.": "",
"Set to enable connecting to the VNC web interface.": "",
"Set to enable connecting to the SPICE web interface.": "",
"Set to enable the File eXchange Protocol. This option makes the server vulnerable to FTP bounce attacks so it is not recommended.": "",
"Set to enable the iSCSI extent.": "",
"Set to export the certificate environment variables.": "",
Expand Down Expand Up @@ -4406,7 +4406,7 @@
"WARNING: Keys for all nested datasets with encryption applied will be downloaded.": "",
"WARNING: Only the key for the dataset in question will be downloaded.": "",
"WARNING: These unknown processes will be terminated while exporting the pool.": "",
"Wait to start VM until VNC client connects.": "",
"Wait to start VM until SPICE client connects.": "",
"Waiting": "",
"Waiting for Active TrueNAS controller to come up...": "",
"Warning": "",
Expand Down
16 changes: 8 additions & 8 deletions src/assets/i18n/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@
"Define whether the control channel, data channel, both channels, or neither channel of an FTP session must occur over SSL/TLS. The policies are described <a href=\"http://www.proftpd.org/docs/directives/configuration_full.html#TLSREQUIRED\" target=\"_blank\">here</a>": "",
"Degraded": "",
"Delay Updates": "",
"Delay VM Boot Until VNC Connects": "",
"Delay VM Boot Until SPICE Connects": "",
"Delete": "",
"Delete <b>{deviceType} {device}</b>": "",
"Delete API Key": "",
Expand Down Expand Up @@ -1444,7 +1444,7 @@
"Enter <strong>{pool}</strong> below to confirm": "",
"Enter <strong>{zvolName}</strong> below to confirm.": "",
"Enter a Name (optional)": "",
"Enter a VNC password to automatically pass to the VNC session.": "",
"Enter a SPICE password to automatically pass to the SPICE session.": "",
"Enter a description of the Cloud Backup Task.": "",
"Enter a description of the Cloud Sync Task.": "",
"Enter a description of the cron job.": "",
Expand All @@ -1465,7 +1465,7 @@
"Enter a number of seconds to wait before alerting that the service cannot reach any UPS. Warnings continue until the situation is fixed.": "",
"Enter a one to three paragraph summary of the issue. Describe the problem and provide any steps to replicate the issue.": "",
"Enter a password for the <i>rancher</i> user. This is used to log in to the VM from the serial shell.": "",
"Enter a password for the VNC display.": "",
"Enter a password for the SPICE display.": "",
"Enter a password of at least eight characters.": "",
"Enter a port to bind <a href=\"https://linux.die.net/man/8/rpc.lockd\" target=\"_blank\">rpc.lockd(8)</a>.": "",
"Enter a port to bind <a href=\"https://man7.org/linux/man-pages/man8/mountd.8.html\" target=\"_blank\">mountd(8)</a>.": "",
Expand Down Expand Up @@ -3332,15 +3332,15 @@
"Select a schedule preset or choose <i>Custom</i> to open the advanced scheduler.": "",
"Select a schedule preset or choose <i>Custom</i> to setup custom schedule.": "",
"Select a schema when Samba Schema is set.": "",
"Select a screen resolution to use for VNC sessions.": "",
"Select a screen resolution to use for SPICE sessions.": "",
"Select a sector size in bytes. <i>Default</i> leaves the sector size unset and uses the ZFS volume values. Setting a sector size changes both the logical and physical sector size.": "",
"Select a subfolder from which to restore content.": "",
"Select a template": "",
"Select a time zone.": "",
"Select a user account to run the command. The user must have permissions allowing them to run the command or script.": "",
"Select action": "",
"Select an IP address to use for VNC sessions.": "",
"Select an IP address to use for remote VNC sessions. Note: this setting only applies if you are using a VNC client other than the TrueNAS WebUI.": "",
"Select an IP address to use for SPICE sessions.": "",
"Select an IP address to use for remote SPICE sessions. Note: this setting only applies if you are using a SPICE client other than the TrueNAS WebUI.": "",
"Select an existing CSR.": "",
"Select an existing SSH connection to a remote system or choose <i>Create New</i> to create a new SSH connection.": "",
"Select an existing SSH connection to a remote system or choose Create New to create a new SSH connection.": "",
Expand Down Expand Up @@ -3490,7 +3490,7 @@
"Set to either start this replication task immediately after the linked periodic snapshot task completes or continue to create a separate <b>Schedule</b> for this replication.": "",
"Set to enable DHCP. Leave unset to create a static IPv4 or IPv6 configuration. Only one interface can be configured for DHCP.": "",
"Set to enable Samba to do DNS updates when joining a domain.": "",
"Set to enable connecting to the VNC web interface.": "",
"Set to enable connecting to the SPICE web interface.": "",
"Set to enable the File eXchange Protocol. This option makes the server vulnerable to FTP bounce attacks so it is not recommended.": "",
"Set to enable the iSCSI extent.": "",
"Set to export the certificate environment variables.": "",
Expand Down Expand Up @@ -4406,7 +4406,7 @@
"WARNING: Keys for all nested datasets with encryption applied will be downloaded.": "",
"WARNING: Only the key for the dataset in question will be downloaded.": "",
"WARNING: These unknown processes will be terminated while exporting the pool.": "",
"Wait to start VM until VNC client connects.": "",
"Wait to start VM until SPICE client connects.": "",
"Waiting": "",
"Waiting for Active TrueNAS controller to come up...": "",
"Warning": "",
Expand Down
16 changes: 8 additions & 8 deletions src/assets/i18n/ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@
"Define whether the control channel, data channel, both channels, or neither channel of an FTP session must occur over SSL/TLS. The policies are described <a href=\"http://www.proftpd.org/docs/directives/configuration_full.html#TLSREQUIRED\" target=\"_blank\">here</a>": "",
"Degraded": "",
"Delay Updates": "",
"Delay VM Boot Until VNC Connects": "",
"Delay VM Boot Until SPICE Connects": "",
"Delete": "",
"Delete <b>{deviceType} {device}</b>": "",
"Delete API Key": "",
Expand Down Expand Up @@ -1444,7 +1444,7 @@
"Enter <strong>{pool}</strong> below to confirm": "",
"Enter <strong>{zvolName}</strong> below to confirm.": "",
"Enter a Name (optional)": "",
"Enter a VNC password to automatically pass to the VNC session.": "",
"Enter a SPICE password to automatically pass to the SPICE session.": "",
"Enter a description of the Cloud Backup Task.": "",
"Enter a description of the Cloud Sync Task.": "",
"Enter a description of the cron job.": "",
Expand All @@ -1465,7 +1465,7 @@
"Enter a number of seconds to wait before alerting that the service cannot reach any UPS. Warnings continue until the situation is fixed.": "",
"Enter a one to three paragraph summary of the issue. Describe the problem and provide any steps to replicate the issue.": "",
"Enter a password for the <i>rancher</i> user. This is used to log in to the VM from the serial shell.": "",
"Enter a password for the VNC display.": "",
"Enter a password for the SPICE display.": "",
"Enter a password of at least eight characters.": "",
"Enter a port to bind <a href=\"https://linux.die.net/man/8/rpc.lockd\" target=\"_blank\">rpc.lockd(8)</a>.": "",
"Enter a port to bind <a href=\"https://man7.org/linux/man-pages/man8/mountd.8.html\" target=\"_blank\">mountd(8)</a>.": "",
Expand Down Expand Up @@ -3332,15 +3332,15 @@
"Select a schedule preset or choose <i>Custom</i> to open the advanced scheduler.": "",
"Select a schedule preset or choose <i>Custom</i> to setup custom schedule.": "",
"Select a schema when Samba Schema is set.": "",
"Select a screen resolution to use for VNC sessions.": "",
"Select a screen resolution to use for SPICE sessions.": "",
"Select a sector size in bytes. <i>Default</i> leaves the sector size unset and uses the ZFS volume values. Setting a sector size changes both the logical and physical sector size.": "",
"Select a subfolder from which to restore content.": "",
"Select a template": "",
"Select a time zone.": "",
"Select a user account to run the command. The user must have permissions allowing them to run the command or script.": "",
"Select action": "",
"Select an IP address to use for VNC sessions.": "",
"Select an IP address to use for remote VNC sessions. Note: this setting only applies if you are using a VNC client other than the TrueNAS WebUI.": "",
"Select an IP address to use for SPICE sessions.": "",
"Select an IP address to use for remote SPICE sessions. Note: this setting only applies if you are using a SPICE client other than the TrueNAS WebUI.": "",
"Select an existing CSR.": "",
"Select an existing SSH connection to a remote system or choose <i>Create New</i> to create a new SSH connection.": "",
"Select an existing SSH connection to a remote system or choose Create New to create a new SSH connection.": "",
Expand Down Expand Up @@ -3490,7 +3490,7 @@
"Set to either start this replication task immediately after the linked periodic snapshot task completes or continue to create a separate <b>Schedule</b> for this replication.": "",
"Set to enable DHCP. Leave unset to create a static IPv4 or IPv6 configuration. Only one interface can be configured for DHCP.": "",
"Set to enable Samba to do DNS updates when joining a domain.": "",
"Set to enable connecting to the VNC web interface.": "",
"Set to enable connecting to the SPICE web interface.": "",
"Set to enable the File eXchange Protocol. This option makes the server vulnerable to FTP bounce attacks so it is not recommended.": "",
"Set to enable the iSCSI extent.": "",
"Set to export the certificate environment variables.": "",
Expand Down Expand Up @@ -4406,7 +4406,7 @@
"WARNING: Keys for all nested datasets with encryption applied will be downloaded.": "",
"WARNING: Only the key for the dataset in question will be downloaded.": "",
"WARNING: These unknown processes will be terminated while exporting the pool.": "",
"Wait to start VM until VNC client connects.": "",
"Wait to start VM until SPICE client connects.": "",
"Waiting": "",
"Waiting for Active TrueNAS controller to come up...": "",
"Warning": "",
Expand Down
Loading
Loading