diff --git a/Translation Editor/TranslationEditor.html b/Translation Editor/TranslationEditor.html
index 5b8507c0..d6c7cf8d 100644
--- a/Translation Editor/TranslationEditor.html	
+++ b/Translation Editor/TranslationEditor.html	
@@ -1,353 +1,329 @@
-<!DOCTYPE html>
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<title>TS100 Translation Editor</title>
-
-		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-		<script src="translations_commons.js"></script>
-		<script src="translations_def.js"></script>
-		<script>
-
-	var app;
-	var defMap = {};
-	
-	function save(){
-		saveJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
-	}
-
-	function view(){
-		showJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
-	}
-
-	function fileChanged(e) {
-		var target = e;
-		var id = target.id;
-		
-		var file = target.files[0];
-		if (!file) {
-			return;
-		}
-		var fr = new FileReader();
-		fr.onload = function(e) {
-			try {
-				var json = JSON.parse(e.target.result);
-			} catch (ex) {
-				console.log(ex);
-				alert("Invalid JSON file: " + file.name);
-				return;
-			}
-				
-
-			if (id == "referent-lang-file") {
-				if (checkTranslationFile(file.name)) {
-					app.referent = json;
-					app.meta.referentLoaded = true;
-				}
-			} else if (id == "current-lang-file") {
-				if (checkTranslationFile(file.name)) {
-					app.current = json;
-					if (!app.current.cyrillicGlyphs){
-						app.current.cyrillicGlyphs = false;
-					}
-					app.meta.currentLoaded = true;
-				}
-			} 		
-			synchronizeData();
-		}
-		fr.readAsText(file);
-		
-	}
-	
-	function synchronizeData() {
-		app.obsolete = {};
-		copyMissing(app.def.messages, app.referent.messages, app.current.messages);
-		copyMissing(app.def.characters, app.referent.characters, app.current.characters);
-		copyMissing(app.def.menuGroups, app.referent.menuGroups, app.current.menuGroups);
-		copyMissing(app.def.menuOptions, app.referent.menuOptions, app.current.menuOptions);
-	}
-	
-	/**
-	 * Copy all missing properties from referent to current
-	 * for each entry in definition
-	 */
-	function copyMissing(defList, referentMap, currentMap) {
-		if (!isDefined(defList) || !isDefined(referentMap) || !isDefined(currentMap)) {
-			return;
-		}
-		var len = defList.length;
-		for (var i = 0; i < len; i++) {
-			var id = defList[i].id;
-			if (!isDefined(referentMap[id])) {
-				referentMap[id] = '';
-			}
-			if (!isDefined(currentMap[id])) {
-				currentMap[id] = referentMap[id];
-			}
-		}
-		processObsolete(defList, currentMap);
-	}
-
-	// Passes through all entries from the given map.
-	// If a corresponding entry is not found in the defList, it is removed from the map, and added into the obsolete map.
-	function processObsolete(defList, map) {
-		// Index list to map for faster search
-		var defMap = copyArrayToMap(defList);
-		Object.keys(map).forEach(function(key) {
-			if (!isDefined(defMap[key])) {
-				app.obsolete[key] = { id : key, value : map[key]};
-				delete map[key];
-			}
-		});
-	}
-
-	function length(obj, mode) {
-		if (!isDefined(mode) || mode == 0) {
-			// return direct length
-			return obj.length;
-		} else if (mode == 1) {
-			// return length of text property
-			return obj.text.length;
-		} else if (mode == 2) {
-			// return the longest length in text2 array
-			return Math.max(isDefinedNN(obj.text2[0]) ? obj.text2[0].length : 0, isDefinedNN(obj.text2[1]) ? obj.text2[1].length : 0);
-		}
-	}
-	
-	function getAttribute(obj, attribute, isDouble) {
-		var d = isDouble ? "2" : "";
-		var v = obj[attribute+d];
-		if (isDefined(v))
-			return v;
-		return obj[attribute];
-	}
-	
-	function loaded() {
-		app = new Vue({
-			el : '#app',
-			data : {
-				meta : {
-					referentLoaded : false,
-					currentLoaded : false,
-				},
-				def : {
-				},
-				referent : {
-					messages : {}
-				},
-				current : {
-					loaded: false,
-				},
-				obsolete : {},
-				menuDouble : false
-			},
-			methods : {
-				validateInput: function(valMap, id, mode) {
-					var d = defMap[id];
-					var vLen = 0;
-					if (!isDefined(mode))
-						mode = 0;
-						
-					try {
-						// Sum for complex length
-						for (var i = 0; i < d.lenSum.fields.length; i++) {
-							vLen += length(valMap[d.lenSum.fields[i]], mode);
-						}
-						d = d.lenSum;
-					} catch (e) {
-						// Single field length
-						vLen = length(valMap[id], mode);
-					}
-					var maxLen = getAttribute(d, 'maxLen', mode == 2);
-					var minLen = getAttribute(d, 'minLen', mode == 2);
-					var len = getAttribute(d, 'len', mode == 2);
-					if (isNumber(maxLen) && vLen > maxLen
-						|| isNumber(minLen) && vLen < minLen
-						|| isNumber(len) && vLen != len
-						) {
-						return "invalid";
-					}
-				},
-				
-				constraintString: function(e, d) {
-					var str = "";
-					var delim = "";
-					var v;
-					if (!isDefined(d) || d == false) {
-						d = "";
-					} else {
-						d = "2";
-					}
-
-					if (isDefinedNN(e.lenSum)) {
-						str = "len("+(e.lenSum.fields+"").replace(/,/g," + ")+") -> ";
-						e = e.lenSum;
-					}
-					v = getAttribute(e, 'len', d);
-					if (isNumber(v)) {
-						str += delim + "len=" + v;
-						delim = " and ";
-					}
-					v = getAttribute(e, 'minLen', d);
-					if (isNumber(v)) {
-						str += delim + "len>=" + v;
-						delim = " and ";
-					}
-					v = getAttribute(e, 'maxLen', d);
-					if (isNumber(v)) {
-						str += delim + "len<=" + v;
-						delim = " and ";
-					}
-					return str;
-				}
-			}
-		});
-		app.def = def;
-		copyArrayToMap(app.def.messages, defMap);
-		copyArrayToMap(app.def.characters, defMap);
-		copyArrayToMap(app.def.menuGroups, defMap);
-		copyArrayToMap(app.def.menuOptions, defMap);
-	}
-	
-	window.onload=loaded;
-</script>
-	<link href="translations.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-
-		<div id="app">
-			<h1>TS100 Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1>
-			<table class="header data">
-				<tr>
-					<td class="label">Referent Language</td>
-					<td class="value">
-						<input type="file" id="referent-lang-file" onchange="fileChanged(this)" accept=".json">
-						<span class="selected" v-if="meta.referentLoaded">{{ referent.languageLocalName }} [{{referent.languageCode}}]</span>
-					</td>
-				</tr>
-				<tr v-if="meta.referentLoaded">
-					<td class="label">Current Language</td>
-					<td class="value">
-						<input type="file" id="current-lang-file" onchange="fileChanged(this)" accept=".json">
-						<span class="selected" v-if="meta.currentLoaded">{{ current.languageLocalName }} [{{current.languageCode}}]</span>
-					</td>
-				</tr>
-				<tr v-if="meta.currentLoaded">
-					<td class="label">Local Language Code</td>
-					<td class="value"><input type="text" v-model="current.languageCode" maxlength="8" v-on:change="current.languageCode=current.languageCode.toUpperCase()" class="short"></td>
-				</tr>
-				<tr v-if="meta.currentLoaded">
-					<td class="label">Local Language Name</td>
-					<td class="value"><input type="text" v-model="current.languageLocalName" class="short"></td>
-				</tr>
-				<tr v-if="meta.currentLoaded">
-					<td class="label">Font table to use</td>
-					<td class="value">
-						<select v-model="current.cyrillicGlyphs" v-on:change="current.cyrillicGlyphs = current.cyrillicGlyphs=='true'">
-							<option value="false">Latin Extended</option>
-							<option value="true">Cyrillic Glyphs</option>
-						</select>
-					</td>
-				</tr>
-			</table>
-			
-			<div v-if="def.messages && referent.messages && current.messages">
-
-				<div class="footer">
-					<input type="button" value="Save" onclick="save()">
-					<input type="button" value="View" onclick="view()">
-				</div>
-				
-				<div v-if="Object.keys(obsolete).length > 0">
-					<h2>Obsolete</h2>
-					<table class="data">
-						<tr v-for="entry in obsolete">
-							<td class="label"><div class="stringId">{{entry.id}}</div></td>
-							<td class="value"><div class="ref">{{entry.value}}</div></td>
-						</tr>
-					</table>
-				</div>
-
-				<h2>Messages and Strings</h2>
-				<table class="data">
-					<tr v-for="message in def.messages" v-bind:class="validateInput(current.messages, message.id)">
-						<td class="label"><div class="stringId">{{message.id}}</div></td>
-						<td class="value">
-							<div class="constraint">{{constraintString(message)}}</div>
-							<div class="ref">{{referent.messages[message.id]}}</div>
-							<div class="note" v-if="message.note">{{message.note}}</div>
-							<div class="tran"><input :id="'in_'+message.id" type="text" v-model="current.messages[message.id]" v-bind:class="{unchanged : current.messages[message.id] == referent.messages[message.id], empty : current.messages[message.id]==''}"></div>
-						</td>
-					</tr>
-				</table>
-
-				<h2>Characters</h2>
-				<table class="data">
-					<tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)">
-						<td class="label"><div class="stringId">{{char.id}}</div></td>
-						<td class="value">
-							<div class="constraint">{{constraintString(char)}}</div>
-							<div class="ref">{{referent.characters[char.id]}}</div>
-							<div class="tran"><input type="text" v-model="current.characters[char.id]" v-bind:class="{unchanged : current.characters[char.id] == referent.characters[char.id], empty : current.characters[char.id].length != 1}"></div>
-						</td>
-					</tr>
-				</table>
-
-				<h2>Menu Groups</h2>
-				<table class="data">
-					<tr v-for="menu in def.menuGroups" v-bind:class="validateInput(current.menuGroups, menu.id, 2)">
-						<td class="label"><div class="stringId">{{menu.id}}</div></td>
-						<td class="value">
-							<div class="label">Menu Name</div>
-							<div class="constraint">{{constraintString(menu)}}</div>
-							<div class="ref">{{referent.menuGroups[menu.id].text2}}</div>
-							<div class="tran" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' || current.menuGroups[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuGroups[menu.id].text2[0]"><input type="text" v-model="current.menuGroups[menu.id].text2[1]"></div>
-							<div class="label">Description</div>
-							<div class="ref">{{referent.menuGroups[menu.id].desc}}</div>
-							<div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div>
-						</td>
-					</tr>
-				</table>
-
-				<h2>Menu Options</h2>
-				<table class="data">
-					<tr>
-						<td class="label">Menu Type</td>
-						<td class="value">
-							<select v-model="current.menuDouble" v-on:change="current.menuDouble = current.menuDouble=='true'">
-								<option value="false">Single-Line</option>
-								<option value="true">Double-Line</option>
-							</select>
-						</td>
-					</tr>
-					<tr v-for="menu in def.menuOptions" v-bind:class="validateInput(current.menuOptions, menu.id, (current.menuDouble ? 2 : 1))">
-						<td class="label"><div class="stringId">{{menu.id}}</div></td>
-						<td class="value">
-							<div v-bind:class="{hidden : current.menuDouble}">
-								<div class="label">Menu Name (Single-Line)</div>
-								<div class="constraint">{{constraintString(menu, current.menuDouble)}}</div>
-								<div class="ref">{{referent.menuOptions[menu.id].text}}</div>
-								<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].text" v-bind:class="{unchanged : current.menuOptions[menu.id].text == referent.menuOptions[menu.id].text, empty : current.menuOptions[menu.id].text == ''}"></div>
-							</div>
-							<div v-bind:class="{hidden : !current.menuDouble}">
-								<div class="label">Menu Name (Double-Line)</div>
-								<div class="constraint">{{constraintString(menu, current.menuDouble)}}</div>
-								<div class="ref">{{referent.menuOptions[menu.id].text2}}</div>
-								<div class="tran" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' || current.menuOptions[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuOptions[menu.id].text2[0]"><input type="text" v-model="current.menuOptions[menu.id].text2[1]"></div>
-							</div>
-							<div class="label">Description</div>
-							<div class="ref">{{referent.menuOptions[menu.id].desc}}</div>
-							<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].desc" v-bind:class="{unchanged : current.menuOptions[menu.id].desc == referent.menuOptions[menu.id].desc, empty : current.menuOptions[menu.id].desc == ''}"></div>
-						</td>
-					</tr>
-				</table>
-
-				<div class="footer">
-					<input type="button" value="Save" onclick="save()">
-					<input type="button" value="View" onclick="view()">
-				</div>
-			</div>
-		</div>
-	</body>
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>TS100 Translation Editor</title>
+
+		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+		<script src="translations_commons.js"></script>
+		<script src="translations_def.js"></script>
+		<script>
+
+	var app;
+	var defMap = {};
+	
+	function save(){
+		saveJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
+	}
+
+	function view(){
+		showJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
+	}
+
+	function fileChanged(e) {
+		var target = e;
+		var id = target.id;
+		
+		var file = target.files[0];
+		if (!file) {
+			return;
+		}
+		var fr = new FileReader();
+		fr.onload = function(e) {
+			try {
+				var json = JSON.parse(e.target.result);
+			} catch (ex) {
+				console.log(ex);
+				alert("Invalid JSON file: " + file.name);
+				return;
+			}
+				
+
+			if (id == "referent-lang-file") {
+				if (checkTranslationFile(file.name)) {
+					app.referent = json;
+					app.meta.referentLoaded = true;
+				}
+			} else if (id == "current-lang-file") {
+				if (checkTranslationFile(file.name)) {
+					app.current = json;
+					if (!app.current.cyrillicGlyphs){
+						app.current.cyrillicGlyphs = false;
+					}
+					app.meta.currentLoaded = true;
+				}
+			} 		
+			synchronizeData();
+		}
+		fr.readAsText(file);
+		
+	}
+	
+	function synchronizeData() {
+		app.obsolete = {};
+		copyMissing(app.def.messages, app.referent.messages, app.current.messages);
+		copyMissing(app.def.characters, app.referent.characters, app.current.characters);
+		copyMissing(app.def.menuGroups, app.referent.menuGroups, app.current.menuGroups);
+		copyMissing(app.def.menuOptions, app.referent.menuOptions, app.current.menuOptions);
+	}
+	
+	/**
+	 * Copy all missing properties from referent to current
+	 * for each entry in definition
+	 */
+	function copyMissing(defList, referentMap, currentMap) {
+		if (!isDefined(defList) || !isDefined(referentMap) || !isDefined(currentMap)) {
+			return;
+		}
+		var len = defList.length;
+		for (var i = 0; i < len; i++) {
+			var id = defList[i].id;
+			if (!isDefined(referentMap[id])) {
+				referentMap[id] = '';
+			}
+			if (!isDefined(currentMap[id])) {
+				currentMap[id] = referentMap[id];
+			}
+		}
+		processObsolete(defList, currentMap);
+	}
+
+	// Passes through all entries from the given map.
+	// If a corresponding entry is not found in the defList, it is removed from the map, and added into the obsolete map.
+	function processObsolete(defList, map) {
+		// Index list to map for faster search
+		var defMap = copyArrayToMap(defList);
+		Object.keys(map).forEach(function(key) {
+			if (!isDefined(defMap[key])) {
+				app.obsolete[key] = { id : key, value : map[key]};
+				delete map[key];
+			}
+		});
+	}
+
+	function length(obj, mode) {
+		if (!isDefined(mode) || mode == 0) {
+			// return direct length
+			return obj.length;
+		} 
+		// return the longest length in text2 array
+		return Math.max(isDefinedNN(obj.text2[0]) ? obj.text2[0].length : 0, isDefinedNN(obj.text2[1]) ? obj.text2[1].length : 0);
+	
+	}
+	
+	function getAttribute(obj, attribute) {
+		var d =  "2";
+		var v = obj[attribute+d];
+		if (isDefined(v))
+			return v;
+		return obj[attribute];
+	}
+	
+	function loaded() {
+		app = new Vue({
+			el : '#app',
+			data : {
+				meta : {
+					referentLoaded : false,
+					currentLoaded : false,
+				},
+				def : {
+				},
+				referent : {
+					messages : {}
+				},
+				current : {
+					loaded: false,
+				},
+				obsolete : {},
+			},
+			methods : {
+				validateInput: function(valMap, id, mode) {
+					var d = defMap[id];
+					var vLen = 0;
+					if (!isDefined(mode))
+						mode = 0;
+						
+					try {
+						// Sum for complex length
+						for (var i = 0; i < d.lenSum.fields.length; i++) {
+							vLen += length(valMap[d.lenSum.fields[i]], mode);
+						}
+						d = d.lenSum;
+					} catch (e) {
+						// Single field length
+						vLen = length(valMap[id], mode);
+					}
+					var maxLen = getAttribute(d, 'maxLen', mode == 2);
+					var minLen = getAttribute(d, 'minLen', mode == 2);
+					var len = getAttribute(d, 'len', mode == 2);
+					if (isNumber(maxLen) && vLen > maxLen
+						|| isNumber(minLen) && vLen < minLen
+						|| isNumber(len) && vLen != len
+						) {
+						return "invalid";
+					}
+				},
+				
+				constraintString: function(e) {
+					var str = "";
+					var delim = "";
+					var v;
+					d = "2";
+					if (isDefinedNN(e.lenSum)) {
+						str = "len("+(e.lenSum.fields+"").replace(/,/g," + ")+") -> ";
+						e = e.lenSum;
+					}
+					v = getAttribute(e, 'len', d);
+					if (isNumber(v)) {
+						str += delim + "len=" + v;
+						delim = " and ";
+					}
+					v = getAttribute(e, 'minLen', d);
+					if (isNumber(v)) {
+						str += delim + "len>=" + v;
+						delim = " and ";
+					}
+					v = getAttribute(e, 'maxLen', d);
+					if (isNumber(v)) {
+						str += delim + "len<=" + v;
+						delim = " and ";
+					}
+					return str;
+				}
+			}
+		});
+		app.def = def;
+		copyArrayToMap(app.def.messages, defMap);
+		copyArrayToMap(app.def.characters, defMap);
+		copyArrayToMap(app.def.menuGroups, defMap);
+		copyArrayToMap(app.def.menuOptions, defMap);
+	}
+	
+	window.onload=loaded;
+</script>
+	<link href="translations.css" rel="stylesheet" type="text/css">
+	</head>
+	<body>
+
+		<div id="app">
+			<h1>TS100 Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1>
+			<table class="header data">
+				<tr>
+					<td class="label">Referent Language</td>
+					<td class="value">
+						<input type="file" id="referent-lang-file" onchange="fileChanged(this)" accept=".json">
+						<span class="selected" v-if="meta.referentLoaded">{{ referent.languageLocalName }} [{{referent.languageCode}}]</span>
+					</td>
+				</tr>
+				<tr v-if="meta.referentLoaded">
+					<td class="label">Current Language</td>
+					<td class="value">
+						<input type="file" id="current-lang-file" onchange="fileChanged(this)" accept=".json">
+						<span class="selected" v-if="meta.currentLoaded">{{ current.languageLocalName }} [{{current.languageCode}}]</span>
+					</td>
+				</tr>
+				<tr v-if="meta.currentLoaded">
+					<td class="label">Local Language Code</td>
+					<td class="value"><input type="text" v-model="current.languageCode" maxlength="8" v-on:change="current.languageCode=current.languageCode.toUpperCase()" class="short"></td>
+				</tr>
+				<tr v-if="meta.currentLoaded">
+					<td class="label">Local Language Name</td>
+					<td class="value"><input type="text" v-model="current.languageLocalName" class="short"></td>
+				</tr>
+				<tr v-if="meta.currentLoaded">
+					<td class="label">Font table to use</td>
+					<td class="value">
+						<select v-model="current.cyrillicGlyphs" v-on:change="current.cyrillicGlyphs = current.cyrillicGlyphs=='true'">
+							<option value="false">Latin Extended</option>
+							<option value="true">Cyrillic Glyphs</option>
+						</select>
+					</td>
+				</tr>
+			</table>
+			
+			<div v-if="def.messages && referent.messages && current.messages">
+
+				<div class="footer">
+					<input type="button" value="Save" onclick="save()">
+					<input type="button" value="View" onclick="view()">
+				</div>
+				
+				<div v-if="Object.keys(obsolete).length > 0">
+					<h2>Obsolete</h2>
+					<table class="data">
+						<tr v-for="entry in obsolete">
+							<td class="label"><div class="stringId">{{entry.id}}</div></td>
+							<td class="value"><div class="ref">{{entry.value}}</div></td>
+						</tr>
+					</table>
+				</div>
+
+				<h2>Messages and Strings</h2>
+				<table class="data">
+					<tr v-for="message in def.messages" v-bind:class="validateInput(current.messages, message.id)">
+						<td class="label"><div class="stringId">{{message.id}}</div></td>
+						<td class="value">
+							<div class="constraint">{{constraintString(message)}}</div>
+							<div class="ref">{{referent.messages[message.id]}}</div>
+							<div class="note" v-if="message.note">{{message.note}}</div>
+							<div class="tran"><input :id="'in_'+message.id" type="text" v-model="current.messages[message.id]" v-bind:class="{unchanged : current.messages[message.id] == referent.messages[message.id], empty : current.messages[message.id]==''}"></div>
+						</td>
+					</tr>
+				</table>
+
+				<h2>Characters</h2>
+				<table class="data">
+					<tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)">
+						<td class="label"><div class="stringId">{{char.id}}</div></td>
+						<td class="value">
+							<div class="constraint">{{constraintString(char)}}</div>
+							<div class="ref">{{referent.characters[char.id]}}</div>
+							<div class="tran"><input type="text" v-model="current.characters[char.id]" v-bind:class="{unchanged : current.characters[char.id] == referent.characters[char.id], empty : current.characters[char.id].length != 1}"></div>
+						</td>
+					</tr>
+				</table>
+
+				<h2>Menu Groups</h2>
+				<table class="data">
+					<tr v-for="menu in def.menuGroups" v-bind:class="validateInput(current.menuGroups, menu.id, 2)">
+						<td class="label"><div class="stringId">{{menu.id}}</div></td>
+						<td class="value">
+							<div class="label">Menu Name</div>
+							<div class="constraint">{{constraintString(menu)}}</div>
+							<div class="ref">{{referent.menuGroups[menu.id].text2}}</div>
+							<div class="tran" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' || current.menuGroups[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuGroups[menu.id].text2[0]"><input type="text" v-model="current.menuGroups[menu.id].text2[1]"></div>
+							<div class="label">Description</div>
+							<div class="ref">{{referent.menuGroups[menu.id].desc}}</div>
+							<div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div>
+						</td>
+					</tr>
+				</table>
+
+				<h2>Menu Options</h2>
+				<table class="data">
+					<tr v-for="menu in def.menuOptions" v-bind:class="validateInput(current.menuOptions, menu.id, 2)">
+						<td class="label"><div class="stringId">{{menu.id}}</div></td>
+						<td class="value">
+							<div v-bind:class="{hidden : false}">
+								<div class="label">Menu Name (Double-Line)</div>
+								<div class="constraint">{{constraintString(menu)}}</div>
+								<div class="ref">{{referent.menuOptions[menu.id].text2}}</div>
+								<div class="tran" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' || current.menuOptions[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuOptions[menu.id].text2[0]"><input type="text" v-model="current.menuOptions[menu.id].text2[1]"></div>
+							</div>
+							<div class="label">Description</div>
+							<div class="ref">{{referent.menuOptions[menu.id].desc}}</div>
+							<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].desc" v-bind:class="{unchanged : current.menuOptions[menu.id].desc == referent.menuOptions[menu.id].desc, empty : current.menuOptions[menu.id].desc == ''}"></div>
+						</td>
+					</tr>
+				</table>
+
+				<div class="footer">
+					<input type="button" value="Save" onclick="save()">
+					<input type="button" value="View" onclick="view()">
+				</div>
+			</div>
+		</div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/Translation Editor/TranslationsParser.html b/Translation Editor/TranslationsParser.html
index 22991740..d47e5218 100644
--- a/Translation Editor/TranslationsParser.html	
+++ b/Translation Editor/TranslationsParser.html	
@@ -1,325 +1,322 @@
-<!DOCTYPE html>
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<title>TS100 Translation Parser</title>
-
-		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-		<script src="translations_commons.js"></script>
-		<script src="translations_def.js"></script>
-		<script>
-
-	var app;
-	var defMap = {};
-	var langMap = {};
-	var lang;
-
-	var defMsgMap;
-	var defCharMap; 	
-	var defGrpMap;	
-	var defOptMap;	
-	
-	function save(langCode){
-		saveJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
-	}
-
-	function view(langCode){
-		showJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
-	}
-
-	function translationFileSelected(e) {
-		var target = e;
-		var id = target.id;
-		
-		var file = target.files[0];
-		if (!file) {
-			return;
-		}
-		var fr = new FileReader();
-		fr.onload = function(e) {
-			parseTranslationFile(file.name, e.target.result);
-		}
-		fr.readAsText(file);
-		
-	}
-	
-	function parseTranslationFile(name, src) {
-		// remove multiline comments
-		src = src.replace(/\/\*[\s\S.]*?\*\//mg, "");
-		// remove single-line comments
-		src = src.replace(/\/\/.*/mg, "");
-		// remove empty lines
-		src = src.replace(/^\s*\n/gm, "");
-		
-		var langCode = "";
-		var srcLines = src.split("\n");
-
-		var reMessage = /const\s+char\s*\*\s+([\w\d]+)\s*=\s*"(.*)"/;
-		var reSettingsDescStart = /const\s+char\s*\*\s+SettingsDescriptions\[/;
-		var reSettingsNamesStart = /const\s+char\s*\*\s+SettingsShortNames\[/;
-		var reSettingsMenuDescStart = /const\s+char\s*\*\s+SettingsMenuEntriesDescriptions\[/;
-		var reChar = /const\s+char\s+([\w\d]+)\s*=\s*'(\w)'/;
-		var reMenuMode = /SettingsShortNameType\s*=\s*SHORT_NAME_(\w+)_LINE/;
-		
-		var reMenuStart = /\s*const\s+char\s*\*\s+SettingsMenuEntries\[/;
-
-//		var reString = /^\s*"(.*)"/;
-		var reString = /"(.*)"/;
-		var reSingleLine = /{\s*"(.*)"\s*}/;
-		var reDoubleLine = /{\s*"(.*)"\s*,\s*"(.*)"\s*}/;
-		
-		var mode = '';
-		var entryIndex = 0;
-		for (var li = 0; li < srcLines.length; li++) {
-			// trim lines
-			line = srcLines[li] = srcLines[li].trim();
-			
-			// if entering a new lang block
-			if (startsWith(line, "#ifdef LANG_")) {
-				mode = 'new-language';
-				langCode = line.substring(12);
-				lang = langMap[langCode];
-				// use existing or instantiate new
-				if (!isDefined(lang)) {
-					lang = {
-						languageCode: langCode,
-						cyrillicGlyphs: false,
-						messages: {},
-						characters: {},
-						menuDouble : false,
-						menuGroups: {},
-						menuOptions: {}
-					};
-					langMap[langCode] = lang;
-					app.languages[app.languages.length] = langCode;
-				}
-				entryIndex = 0;
-				continue;
-			}
-
-			// Use Cyrillic glyphs
-			if (startsWith(line, "#define CYRILLIC_GLYPHS")) {
-				lang.cyrillicGlyphs = true;
-				entryIndex = 0;
-				continue;
-			}
-
-			// Menu type
-			reMenuMode.lastIndex = 0;
-			match = reMenuMode.exec(line);
-			if (match) {
-				lang.menuDouble = match[1] == 'DOUBLE';
-				entryIndex = 0;
-				continue;
-			}
-			
-			// Messages
-			reMessage.lastIndex = 0;
-			match = reMessage.exec(line);
-			if (match) {
-				lang.messages[match[1]] = xunescape(match[2]);
-				entryIndex = 0;
-				continue;
-			}
-			
-			// Chars descriptions
-			reChar.lastIndex = 0;
-			match = reChar.exec(line);
-			if (match) {
-				// found description block start
-				mode = 'char';
-				lang.characters[match[1]] = xunescape(match[2]);
-				entryIndex = 0;
-				continue;
-			}
-			// Settings descriptions
-			reSettingsDescStart.lastIndex = 0;
-			match = reSettingsDescStart.exec(line);
-			if (match) {
-				// found description block start
-				mode = 'settingsDesc';
-				entryIndex = 0;
-				continue;
-			}
-			reSettingsNamesStart.lastIndex = 0;
-			match = reSettingsNamesStart.exec(line);
-			if (match) {
-				// found description block start
-				mode = 'settingsNames';
-				entryIndex = 0;
-				continue;
-			}
-			reMenuStart.lastIndex = 0;
-			match = reMenuStart.exec(line);
-			if (match) {
-				// found description block start
-				mode = 'menu';
-				entryIndex = 0;
-				continue;
-			}
-			reSettingsMenuDescStart.lastIndex = 0;
-			match = reSettingsMenuDescStart.exec(line);
-			if (match) {
-				// found description block start
-				mode = 'menuDesc';
-				entryIndex = 0;
-				continue;
-			}
-			
-			if (mode == 'menu') {
-				// processing menu group names
-				reString.lastIndex = 0;
-				match = reString.exec(line);
-				if (match) {
-					// found description string
-					var entry = getMenuGroup(entryIndex);
-					var m = match[1].split("\\n");
-					entry.text2[0] = xunescape(m[0]);
-					entry.text2[1] = xunescape(m[1]);
-					entryIndex++;
-				}
-			} else if (mode == 'menuDesc') {
-				// processing menu group descriptions
-				reString.lastIndex = 0;
-				match = reString.exec(line);
-				if (match) {
-					// found description string
-					var entry = getMenuGroup(entryIndex);
-					entry.desc = xunescape(match[1]);
-					entryIndex++;
-				}
-			} else if (mode == 'settingsDesc') {
-				// processing option descriptions
-				reString.lastIndex = 0;
-				match = reString.exec(line);
-				if (match) {
-					// found description string
-					var entry = getMenuOption(entryIndex);
-					entry.desc = xunescape(match[1]);
-					entryIndex++;
-				}
-			} else if (mode == 'settingsNames') {
-				reDoubleLine.lastIndex = 0;
-				match = reDoubleLine.exec(line);
-				if (match) {
-					var entry = getMenuOption(entryIndex);
-					entry.text2[0] = xunescape(match[1]);
-					entry.text2[1] = xunescape(match[2]);
-					entryIndex++;
-				} else {
-					reSingleLine.lastIndex = 0;
-					match = reSingleLine.exec(line);
-					if (match) {
-						var entry = getMenuOption(entryIndex);
-						entry.text = xunescape(match[1]);
-						entryIndex++;
-					}
-
-				}
-			}
-		}
-		app.done = 1;
-	}
-
-	function getMenuOption(entryIndex) {
-		var optionDef = def.menuOptions[entryIndex];
-		if (!isDefined(optionDef)) {
-			var s = "Could not find menu option with index "+entryIndex;
-			alert(s);
-			throw s;
-		}
-		var id = optionDef.id;
-		var entry = lang.menuOptions[id];
-		if (!isDefined(entry)) {
-			entry =
-			{
-				"text": "",
-				"text2": ["", ""],
-				"desc": ""
-			}
-			lang.menuOptions[id] = entry;
-		}
-		return entry;
-	}
-	
-	function getMenuGroup(entryIndex) {
-		var optionDef = def.menuGroups[entryIndex];
-		if (!isDefined(optionDef)) {
-			var s = "Could not find menu group with index "+entryIndex;
-			alert(s);
-			throw s;
-		}
-		var id = optionDef.id;
-		var entry = lang.menuGroups[id];
-		if (!isDefined(entry)) {
-			entry =
-			{
-				"text2": ["", ""],
-				"desc": ""
-			}
-			lang.menuGroups[id] = entry;
-		}
-		return entry;
-	}
-	
-	function markSaved(lang) {
-		document.getElementById("row_"+lang).classList.add("saved");
-	}
-	
-	function loaded() {
-		app = new Vue({
-			el : '#app',
-			data : {
-				languages: [],
-				done : false,
-				def : {
-				}
-				
-			},
-			methods : {
-				vSave : function(lang) {
-					save(lang);
-					markSaved(lang);
-				},
-				vView : function(lang) {
-					view(lang);
-					markSaved(lang);
-				}
-			}
-		});
-		
-		app.def = def;
-		defMsgMap = copyArrayToMap(app.def.messages);
-		defCharMap = copyArrayToMap(app.def.characters);
-		defGrpMap = copyArrayToMap(app.def.menuGroups);
-		defOptMap = copyArrayToMap(app.def.menuOptions);
-	}
-
-	window.onload=loaded;
-</script>
-	<link href="translations.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-
-		<div id="app">
-			<h1>TS100 Translation Parser</h1>
-			<table class="header data">
-				<tr>
-					<td class="label">Translation.cpp</td>
-					<td class="value">
-						<input type="file" id="translation-cpp-file" onchange="translationFileSelected(this)" accept=".cpp">
-					</td>
-				</tr>
-			</table>
-			
-			<div class="data" v-if="done">
-				<div class="value" v-for="lang in languages" :id="'row_'+lang">
-					<input type="button" :value="'Save '+lang" v-on:click="vSave(lang)">
-					<input type="button" :value="'View '+lang" v-on:click="vView(lang)">
-				</div>
-			</div>
-				
-		</div>
-	</body>
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="UTF-8">
+		<title>TS100 Translation Parser</title>
+
+		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+		<script src="translations_commons.js"></script>
+		<script src="translations_def.js"></script>
+		<script>
+
+	var app;
+	var defMap = {};
+	var langMap = {};
+	var lang;
+
+	var defMsgMap;
+	var defCharMap; 	
+	var defGrpMap;	
+	var defOptMap;	
+	
+	function save(langCode){
+		saveJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
+	}
+
+	function view(langCode){
+		showJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
+	}
+
+	function translationFileSelected(e) {
+		var target = e;
+		var id = target.id;
+		
+		var file = target.files[0];
+		if (!file) {
+			return;
+		}
+		var fr = new FileReader();
+		fr.onload = function(e) {
+			parseTranslationFile(file.name, e.target.result);
+		}
+		fr.readAsText(file);
+		
+	}
+	
+	function parseTranslationFile(name, src) {
+		// remove multiline comments
+		src = src.replace(/\/\*[\s\S.]*?\*\//mg, "");
+		// remove single-line comments
+		src = src.replace(/\/\/.*/mg, "");
+		// remove empty lines
+		src = src.replace(/^\s*\n/gm, "");
+		
+		var langCode = "";
+		var srcLines = src.split("\n");
+
+		var reMessage = /const\s+char\s*\*\s+([\w\d]+)\s*=\s*"(.*)"/;
+		var reSettingsDescStart = /const\s+char\s*\*\s+SettingsDescriptions\[/;
+		var reSettingsNamesStart = /const\s+char\s*\*\s+SettingsShortNames\[/;
+		var reSettingsMenuDescStart = /const\s+char\s*\*\s+SettingsMenuEntriesDescriptions\[/;
+		var reChar = /const\s+char\s+([\w\d]+)\s*=\s*'(\w)'/;
+		var reMenuMode = /SettingsShortNameType\s*=\s*SHORT_NAME_(\w+)_LINE/;
+		
+		var reMenuStart = /\s*const\s+char\s*\*\s+SettingsMenuEntries\[/;
+
+//		var reString = /^\s*"(.*)"/;
+		var reString = /"(.*)"/;
+		var reSingleLine = /{\s*"(.*)"\s*}/;
+		var reDoubleLine = /{\s*"(.*)"\s*,\s*"(.*)"\s*}/;
+		
+		var mode = '';
+		var entryIndex = 0;
+		for (var li = 0; li < srcLines.length; li++) {
+			// trim lines
+			line = srcLines[li] = srcLines[li].trim();
+			
+			// if entering a new lang block
+			if (startsWith(line, "#ifdef LANG_")) {
+				mode = 'new-language';
+				langCode = line.substring(12);
+				lang = langMap[langCode];
+				// use existing or instantiate new
+				if (!isDefined(lang)) {
+					lang = {
+						languageCode: langCode,
+						cyrillicGlyphs: false,
+						messages: {},
+						characters: {},
+						menuGroups: {},
+						menuOptions: {}
+					};
+					langMap[langCode] = lang;
+					app.languages[app.languages.length] = langCode;
+				}
+				entryIndex = 0;
+				continue;
+			}
+
+			// Use Cyrillic glyphs
+			if (startsWith(line, "#define CYRILLIC_GLYPHS")) {
+				lang.cyrillicGlyphs = true;
+				entryIndex = 0;
+				continue;
+			}
+
+			// Menu type
+			reMenuMode.lastIndex = 0;
+			match = reMenuMode.exec(line);
+			if (match) {
+				entryIndex = 0;
+				continue;
+			}
+			
+			// Messages
+			reMessage.lastIndex = 0;
+			match = reMessage.exec(line);
+			if (match) {
+				lang.messages[match[1]] = xunescape(match[2]);
+				entryIndex = 0;
+				continue;
+			}
+			
+			// Chars descriptions
+			reChar.lastIndex = 0;
+			match = reChar.exec(line);
+			if (match) {
+				// found description block start
+				mode = 'char';
+				lang.characters[match[1]] = xunescape(match[2]);
+				entryIndex = 0;
+				continue;
+			}
+			// Settings descriptions
+			reSettingsDescStart.lastIndex = 0;
+			match = reSettingsDescStart.exec(line);
+			if (match) {
+				// found description block start
+				mode = 'settingsDesc';
+				entryIndex = 0;
+				continue;
+			}
+			reSettingsNamesStart.lastIndex = 0;
+			match = reSettingsNamesStart.exec(line);
+			if (match) {
+				// found description block start
+				mode = 'settingsNames';
+				entryIndex = 0;
+				continue;
+			}
+			reMenuStart.lastIndex = 0;
+			match = reMenuStart.exec(line);
+			if (match) {
+				// found description block start
+				mode = 'menu';
+				entryIndex = 0;
+				continue;
+			}
+			reSettingsMenuDescStart.lastIndex = 0;
+			match = reSettingsMenuDescStart.exec(line);
+			if (match) {
+				// found description block start
+				mode = 'menuDesc';
+				entryIndex = 0;
+				continue;
+			}
+			
+			if (mode == 'menu') {
+				// processing menu group names
+				reString.lastIndex = 0;
+				match = reString.exec(line);
+				if (match) {
+					// found description string
+					var entry = getMenuGroup(entryIndex);
+					var m = match[1].split("\\n");
+					entry.text2[0] = xunescape(m[0]);
+					entry.text2[1] = xunescape(m[1]);
+					entryIndex++;
+				}
+			} else if (mode == 'menuDesc') {
+				// processing menu group descriptions
+				reString.lastIndex = 0;
+				match = reString.exec(line);
+				if (match) {
+					// found description string
+					var entry = getMenuGroup(entryIndex);
+					entry.desc = xunescape(match[1]);
+					entryIndex++;
+				}
+			} else if (mode == 'settingsDesc') {
+				// processing option descriptions
+				reString.lastIndex = 0;
+				match = reString.exec(line);
+				if (match) {
+					// found description string
+					var entry = getMenuOption(entryIndex);
+					entry.desc = xunescape(match[1]);
+					entryIndex++;
+				}
+			} else if (mode == 'settingsNames') {
+				reDoubleLine.lastIndex = 0;
+				match = reDoubleLine.exec(line);
+				if (match) {
+					var entry = getMenuOption(entryIndex);
+					entry.text2[0] = xunescape(match[1]);
+					entry.text2[1] = xunescape(match[2]);
+					entryIndex++;
+				} else {
+					reSingleLine.lastIndex = 0;
+					match = reSingleLine.exec(line);
+					if (match) {
+						var entry = getMenuOption(entryIndex);
+						entry.text = xunescape(match[1]);
+						entryIndex++;
+					}
+
+				}
+			}
+		}
+		app.done = 1;
+	}
+
+	function getMenuOption(entryIndex) {
+		var optionDef = def.menuOptions[entryIndex];
+		if (!isDefined(optionDef)) {
+			var s = "Could not find menu option with index "+entryIndex;
+			alert(s);
+			throw s;
+		}
+		var id = optionDef.id;
+		var entry = lang.menuOptions[id];
+		if (!isDefined(entry)) {
+			entry =
+			{
+				"text2": ["", ""],
+				"desc": ""
+			}
+			lang.menuOptions[id] = entry;
+		}
+		return entry;
+	}
+	
+	function getMenuGroup(entryIndex) {
+		var optionDef = def.menuGroups[entryIndex];
+		if (!isDefined(optionDef)) {
+			var s = "Could not find menu group with index "+entryIndex;
+			alert(s);
+			throw s;
+		}
+		var id = optionDef.id;
+		var entry = lang.menuGroups[id];
+		if (!isDefined(entry)) {
+			entry =
+			{
+				"text2": ["", ""],
+				"desc": ""
+			}
+			lang.menuGroups[id] = entry;
+		}
+		return entry;
+	}
+	
+	function markSaved(lang) {
+		document.getElementById("row_"+lang).classList.add("saved");
+	}
+	
+	function loaded() {
+		app = new Vue({
+			el : '#app',
+			data : {
+				languages: [],
+				done : false,
+				def : {
+				}
+				
+			},
+			methods : {
+				vSave : function(lang) {
+					save(lang);
+					markSaved(lang);
+				},
+				vView : function(lang) {
+					view(lang);
+					markSaved(lang);
+				}
+			}
+		});
+		
+		app.def = def;
+		defMsgMap = copyArrayToMap(app.def.messages);
+		defCharMap = copyArrayToMap(app.def.characters);
+		defGrpMap = copyArrayToMap(app.def.menuGroups);
+		defOptMap = copyArrayToMap(app.def.menuOptions);
+	}
+
+	window.onload=loaded;
+</script>
+	<link href="translations.css" rel="stylesheet" type="text/css">
+	</head>
+	<body>
+
+		<div id="app">
+			<h1>TS100 Translation Parser</h1>
+			<table class="header data">
+				<tr>
+					<td class="label">Translation.cpp</td>
+					<td class="value">
+						<input type="file" id="translation-cpp-file" onchange="translationFileSelected(this)" accept=".cpp">
+					</td>
+				</tr>
+			</table>
+			
+			<div class="data" v-if="done">
+				<div class="value" v-for="lang in languages" :id="'row_'+lang">
+					<input type="button" :value="'Save '+lang" v-on:click="vSave(lang)">
+					<input type="button" :value="'View '+lang" v-on:click="vView(lang)">
+				</div>
+			</div>
+				
+		</div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py
index 7757b29e..1bebe57c 100755
--- a/Translation Editor/make_translation.py	
+++ b/Translation Editor/make_translation.py	
@@ -167,11 +167,8 @@ def getLetterCounts(defs, lang):
     obj = lang['menuOptions']
     for mod in defs['menuOptions']:
         eid = mod['id']
-        if lang['menuDouble']:
-            textList.append(obj[eid]['text2'][0])
-            textList.append(obj[eid]['text2'][1])
-        else:
-            textList.append(obj[eid]['text'])
+        textList.append(obj[eid]['text2'][0])
+        textList.append(obj[eid]['text2'][1])
 
     obj = lang['menuGroups']
     for mod in defs['menuGroups']:
@@ -369,14 +366,6 @@ def writeLanguage(languageCode, defs, f):
                                              c) + "\"," + "//{} \n".format(c)))
     f.write(to_unicode("};\n\n"))
 
-    # ----- Menu Options
-
-    # Menu type
-    f.write(
-        to_unicode(
-            "const enum ShortNameType SettingsShortNameType = SHORT_NAME_" +
-            ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
-
     # ----- Writing SettingsDescriptions
     obj = lang['menuOptions']
     f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
@@ -388,19 +377,14 @@ def writeLanguage(languageCode, defs, f):
         if 'feature' in mod:
             f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
         f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] "   + eid.ljust(maxLen)[:maxLen] + " */ "))
-        if lang['menuDouble']:
-            f.write(
-                to_unicode(
-                    "{ \"" +
-                    convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
-                    "\", \"" +
-                    convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
-                    "\" }," + "//{} \n".format(obj[eid]['text2'])))
-        else:
-            f.write(
-                to_unicode("{ \"" +
-                           convStr(symbolConversionTable, (obj[eid]['text'])) +
-                           "\" }," + "//{} \n".format(obj[eid]['text'])))
+        f.write(
+            to_unicode(
+                "{ \"" +
+                convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
+                "\", \"" +
+                convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
+                "\" }," + "//{} \n".format(obj[eid]['text2'])))
+        
         if 'feature' in mod:
             f.write(to_unicode("#endif\n"))
         index = index + 1 
diff --git a/workspace/TS100/Core/Inc/Translation.h b/workspace/TS100/Core/Inc/Translation.h
index 614ea12f..b0ef244b 100644
--- a/workspace/TS100/Core/Inc/Translation.h
+++ b/workspace/TS100/Core/Inc/Translation.h
@@ -9,16 +9,12 @@
 #define TRANSLATION_H_
 #include "unit.h"
 #include "stdint.h"
-enum ShortNameType {
-	SHORT_NAME_SINGLE_LINE = 1, SHORT_NAME_DOUBLE_LINE = 2,
-};
 extern const uint8_t USER_FONT_12[];
 extern const uint8_t USER_FONT_6x8[];
 /*
  * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
  * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
  */
-extern const enum ShortNameType SettingsShortNameType;
 extern const char *SettingsShortNames[28][2];
 extern const char *SettingsDescriptions[28];
 extern const char *SettingsMenuEntries[4];
diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp
index 033e5b31..2431a7a9 100644
--- a/workspace/TS100/Core/Src/gui.cpp
+++ b/workspace/TS100/Core/Src/gui.cpp
@@ -230,12 +230,6 @@ const menuitem advancedMenu[] = {
 { NULL, NULL, NULL }  // end of menu marker. DO NOT REMOVE
 };
 
-static void printShortDescriptionSingleLine(uint32_t shortDescIndex) {
-	OLED::setFont(0);
-	OLED::setCharCursor(0, 0);
-	OLED::print(SettingsShortNames[shortDescIndex][0]);
-}
-
 static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) {
 	OLED::setFont(1);
 	OLED::setCharCursor(0, 0);
@@ -254,11 +248,7 @@ static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) {
 static void printShortDescription(uint32_t shortDescIndex,
 		uint16_t cursorCharPosition) {
 	// print short description (default single line, explicit double line)
-	if (SettingsShortNameType == SHORT_NAME_DOUBLE_LINE) {
-		printShortDescriptionDoubleLine(shortDescIndex);
-	} else {
-		printShortDescriptionSingleLine(shortDescIndex);
-	}
+	printShortDescriptionDoubleLine(shortDescIndex);
 
 	// prepare cursor for value
 	OLED::setFont(0);

Referent Language	- - {{ referent.languageLocalName }} [{{referent.languageCode}}] -
Current Language	- - {{ current.languageLocalName }} [{{current.languageCode}}] -
Local Language Code
Local Language Name
Font table to use	- -
Menu Type	- -
{{menu.id}}	- - Menu Name (Single-Line) - {{constraintString(menu, current.menuDouble)}} - {{referent.menuOptions[menu.id].text}} - - - - Menu Name (Double-Line) - {{constraintString(menu, current.menuDouble)}} - {{referent.menuOptions[menu.id].text2}} - - - Description - {{referent.menuOptions[menu.id].desc}} - -
Referent Language	+ + {{ referent.languageLocalName }} [{{referent.languageCode}}] +
Current Language	+ + {{ current.languageLocalName }} [{{current.languageCode}}] +
Local Language Code
Local Language Name
Font table to use	+ +