Merge staging/1.2.0 changes back to master.

This commit is contained in:
Virtually Nick
2020-03-08 21:47:18 -04:00
2 changed files with 2 additions and 0 deletions

View File

@@ -96,6 +96,7 @@
"en-gb-qwerty",
"en-us-qwerty",
"es-es-qwerty",
"es-latam-qwerty",
"failsafe",
"fr-fr-azerty",
"fr-ch-qwertz",

View File

@@ -541,6 +541,7 @@
"FIELD_OPTION_SERVER_LAYOUT_EN_GB_QWERTY" : "UK English (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_ES_ES_QWERTY" : "Spanish (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_ES_LATAM_QWERTY" : "Latin American (Qwerty)",
"FIELD_OPTION_SERVER_LAYOUT_FAILSAFE" : "Unicode",
"FIELD_OPTION_SERVER_LAYOUT_FR_CH_QWERTZ" : "Swiss French (Qwertz)",
"FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",