GUACAMOLE-422: Resolve commit conflict due to translation updates.

This commit is contained in:
Virtually Nick
2019-05-10 12:37:56 -04:00
parent dd9062a841
commit b0698585f0

View File

@@ -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:",