GUACAMOLE-600: Merge settings and translations for timeout parameters.

This commit is contained in:
Mike Jumper
2024-08-26 23:52:32 -07:00
committed by GitHub
5 changed files with 27 additions and 2 deletions

View File

@@ -12,6 +12,10 @@
{ {
"name" : "port", "name" : "port",
"type" : "NUMERIC" "type" : "NUMERIC"
},
{
"name" : "timeout",
"type" : "NUMERIC"
} }
] ]
}, },
@@ -420,6 +424,10 @@
"name" : "sftp-port", "name" : "sftp-port",
"type" : "NUMERIC" "type" : "NUMERIC"
}, },
{
"name" : "sftp-timeout",
"type" : "NUMERIC"
},
{ {
"name" : "sftp-host-key", "name" : "sftp-host-key",
"type" : "TEXT" "type" : "TEXT"

View File

@@ -16,6 +16,10 @@
{ {
"name" : "host-key", "name" : "host-key",
"type" : "TEXT" "type" : "TEXT"
},
{
"name" : "timeout",
"type" : "NUMERIC"
} }
] ]
}, },

View File

@@ -12,6 +12,10 @@
{ {
"name" : "port", "name" : "port",
"type" : "NUMERIC" "type" : "NUMERIC"
},
{
"name" : "timeout",
"type" : "NUMERIC"
} }
] ]
}, },

View File

@@ -175,6 +175,10 @@
"name" : "sftp-port", "name" : "sftp-port",
"type" : "NUMERIC" "type" : "NUMERIC"
}, },
{
"name" : "sftp-timeout",
"type" : "NUMERIC"
},
{ {
"name" : "sftp-host-key", "name" : "sftp-host-key",
"type" : "TEXT" "type" : "TEXT"

View File

@@ -636,6 +636,7 @@
"FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:", "FIELD_HEADER_SERVER_LAYOUT" : "Keyboard layout:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:",
"FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
@@ -644,9 +645,10 @@
"FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PORT" : "Port:",
"FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_TIMEOUT" : "SFTP connection timeout:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:", "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
"FIELD_HEADER_TIMEOUT" : "Connection timeout",
"FIELD_HEADER_TIMEZONE" : "Time zone:", "FIELD_HEADER_TIMEZONE" : "Time zone:",
"FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_USERNAME" : "Username:",
"FIELD_HEADER_WIDTH" : "Width:", "FIELD_HEADER_WIDTH" : "Width:",
@@ -754,6 +756,7 @@
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TIMEOUT" : "Connection timeout:",
"FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):", "FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
@@ -840,6 +843,7 @@
"FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:", "FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TIMEOUT" : "Connection timeout:",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
"FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING" : "@:APP.FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING", "FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING" : "@:APP.FIELD_HEADER_TYPESCRIPT_WRITE_EXISTING",
@@ -928,6 +932,7 @@
"FIELD_HEADER_RECORDING_PATH" : "Recording path:", "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:", "FIELD_HEADER_SFTP_DIRECTORY" : "Default upload directory:",
"FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:", "FIELD_HEADER_SFTP_DISABLE_DOWNLOAD" : "Disable file download:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:",
"FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):", "FIELD_HEADER_SFTP_HOST_KEY" : "Public host key (Base64):",
"FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:", "FIELD_HEADER_SFTP_HOSTNAME" : "Hostname:",
"FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:", "FIELD_HEADER_SFTP_SERVER_ALIVE_INTERVAL" : "SFTP keepalive interval:",
@@ -936,7 +941,7 @@
"FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PORT" : "Port:",
"FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:",
"FIELD_HEADER_SFTP_DISABLE_UPLOAD" : "Disable file upload:", "FIELD_HEADER_SFTP_TIMEOUT" : "SFTP connection timeout:",
"FIELD_HEADER_SFTP_USERNAME" : "Username:", "FIELD_HEADER_SFTP_USERNAME" : "Username:",
"FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:", "FIELD_HEADER_SWAP_RED_BLUE" : "Swap red/blue components:",
"FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:", "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:",