This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch staging/1.6.0 in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 9884bb2c0d9fe3205ab39103937a3601d97f4a8f Merge: 53afb13a8 24443d695 Author: Mike Jumper <[email protected]> AuthorDate: Tue Aug 27 15:43:37 2024 -0700 GUACAMOLE-1290: Merge parameter definitions and translations for SSH public key (cert auth). .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/frontend/src/translations/en.json | 3 +++ 4 files changed, 15 insertions(+) diff --cc guacamole/src/main/frontend/src/translations/en.json index a0098f7a7,5414028b6..1c7e08a82 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@@ -644,11 -643,11 +644,12 @@@ "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_PUBLIC_KEY" : "Public key:", "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_STATIC_CHANNELS" : "Static channel names:", + "FIELD_HEADER_TIMEOUT" : "Connection timeout", "FIELD_HEADER_TIMEZONE" : "Time zone:", "FIELD_HEADER_USERNAME" : "Username:", "FIELD_HEADER_WIDTH" : "Width:", @@@ -940,8 -937,9 +942,9 @@@ "FIELD_HEADER_SFTP_PASSWORD" : "Password:", "FIELD_HEADER_SFTP_PORT" : "Port:", "FIELD_HEADER_SFTP_PRIVATE_KEY" : "Private key:", + "FIELD_HEADER_SFTP_PUBLIC_KEY" : "Public key:", "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_SWAP_RED_BLUE" : "Swap red/blue components:", "FIELD_HEADER_WOL_BROADCAST_ADDR" : "Broadcast address for WoL packet:",
