Merge 1.1.0 changes back to master.

This commit is contained in:
Virtually Nick
2019-07-16 18:39:03 -04:00
3 changed files with 10 additions and 0 deletions

View File

@@ -59,6 +59,10 @@
"type" : "ENUM",
"options" : [ "", "8", "9", "10", "11", "12", "14", "18", "24", "30", "36", "48", "60", "72", "96" ]
},
{
"name" : "scrollback",
"type" : "NUMERIC"
},
{
"name" : "read-only",
"type" : "BOOLEAN",

View File

@@ -63,6 +63,10 @@
"type" : "ENUM",
"options" : [ "", "8", "9", "10", "11", "12", "14", "18", "24", "30", "36", "48", "60", "72", "96" ]
},
{
"name" : "scrollback",
"type" : "NUMERIC"
},
{
"name" : "read-only",
"type" : "BOOLEAN",

View File

@@ -507,6 +507,7 @@
"FIELD_HEADER_PASSPHRASE" : "Passphrase:",
"FIELD_HEADER_PORT" : "Port:",
"FIELD_HEADER_PRIVATE_KEY" : "Private key:",
"FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:",
"FIELD_HEADER_READ_ONLY" : "Read-only:",
"FIELD_HEADER_RECORDING_EXCLUDE_MOUSE" : "Exclude mouse:",
"FIELD_HEADER_RECORDING_EXCLUDE_OUTPUT" : "Exclude graphics/streams:",
@@ -592,6 +593,7 @@
"FIELD_HEADER_RECORDING_INCLUDE_KEYS" : "Include key events:",
"FIELD_HEADER_RECORDING_NAME" : "Recording name:",
"FIELD_HEADER_RECORDING_PATH" : "Recording path:",
"FIELD_HEADER_SCROLLBACK" : "Maximum scrollback size:",
"FIELD_HEADER_TERMINAL_TYPE" : "Terminal type:",
"FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
"FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",