From b0698585f08b5d652883257c6e95fc3392e9b55c Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Fri, 10 May 2019 12:37:56 -0400 Subject: [PATCH] GUACAMOLE-422: Resolve commit conflict due to translation updates. --- guacamole/src/main/webapp/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index 291f67b9a..a0a547888 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -506,7 +506,7 @@ "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:", "FIELD_HEADER_SFTP_ROOT_DIRECTORY" : "File browser root directory:", "FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:", - "FIELD_HEADER_TIMEZONE" : "Timezone:", + "FIELD_HEADER_TIMEZONE" : "Time zone ($TZ):", "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",