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 f87fc3f99c75968c21e3ce76d7c322503561855d Merge: 61b43f420 4dd7a84df Author: Mike Jumper <[email protected]> AuthorDate: Tue Aug 6 00:13:03 2024 -0700 GUACAMOLE-1196: Merge parameter definition and translation for option to disable display resize. .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 5 +++++ guacamole/src/main/frontend/src/translations/en.json | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --cc guacamole/src/main/frontend/src/translations/en.json index 30a6957ad,cfa0a0153..0cd0cc9cf --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@@ -906,12 -906,12 +906,13 @@@ "FIELD_HEADER_CURSOR" : "Cursor:", "FIELD_HEADER_DEST_HOST" : "Destination host:", "FIELD_HEADER_DEST_PORT" : "Destination port:", - "FIELD_HEADER_DISABLE_COPY" : "Disable copying from remote desktop:", - "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:", - "FIELD_HEADER_DISABLE_SERVER_INPUT" : "Disable server input when client is connected:", + "FIELD_HEADER_DISABLE_COPY" : "Disable copying from remote desktop:", + "FIELD_HEADER_DISABLE_DISPLAY_RESIZE" : "Disable resize of remote display:", + "FIELD_HEADER_DISABLE_PASTE" : "Disable pasting from client:", + "FIELD_HEADER_DISABLE_SERVER_INPUT" : "Disable server input when client is connected:", "FIELD_HEADER_ENABLE_AUDIO" : "Enable audio:", "FIELD_HEADER_ENABLE_SFTP" : "Enable SFTP:", + "FIELD_HEADER_ENCODINGS" : "Display encodings:", "FIELD_HEADER_FORCE_LOSSLESS" : "Force lossless compression:", "FIELD_HEADER_HOSTNAME" : "Hostname:", "FIELD_HEADER_USERNAME" : "Username:",
