Fix issues with previous commit

1 files changed, 60 insertions, 59 deletions

diff --git a/locale/template.txt b/locale/template.txt
index e96f6f0..17e2f72 100644
--- a/locale/template.txt
+++ b/locale/template.txt
@@ -16,10 +16,10 @@ Car-top Inspection Box, On State (you hacker you!)=
 Full-Glass Elevator Car=
 Glass-Back Elevator Car=
 Metal Elevator Car=
-Metal Glass-Back Elevator Car=
-Basic Elevator Car=
 Can't place car here - position @1m to the right, @2m up, and @3m back is blocked!=
 Can't place car here - position @1m to the right, @2m up, and @3m back is protected!=
+Metal Glass-Back Elevator Car=
+Basic Elevator Car=
 Places a car call at the specified landing on the specified elevator=
 <car ID> <landing number>=
 Invalid car ID=
@@ -44,11 +44,6 @@ Controller (top section - you hacker you!)=
 Controller (top section, car in motion - you hacker you!)=
 Controller (top section, open - you hacker you!)=
 Controller (top section, open, car in motion - you hacker you!)=
-Firmware reloaded successfully=
-Can't place cabinet - no room for the top half!=
-Can't place cabinet - top half is protected!=
-Hold the sneak button while digging to remove.=
-Can't open cabinet - cabinet is locked.=
 Door Open Timeout=
 Door Close Timeout=
 Lost Communication With Drive=
@@ -111,6 +106,7 @@ Allow Swing Calls When Not In Swing Operation=
 Unlock in Independent=
 Extra Allowed Users=
 Hide Button=
+Also Hide in Fire/Independent Service=
 Main landing cannot be locked=
 Suppress Beep Sound=
 ID @1: Floor @2 - @3 - @4=
@@ -120,12 +116,22 @@ FIRE SVC=
 IND SVC=
 CAR LIGHT=
 CAR FAN=
+Normal Operation=
+Fault=
+Emergency Stop=
+Independent Service=
+Swing Operation=
+Doors Opening=
+Doors Open=
+Doors Closing=
+Doors Closed=
 Please select a floor:=
 Please use elevator=
 ERROR=
 Could not find a suitable elevator=
 Please try again later=
 Elevator Destination Entry Kiosk=
+Landing Number=
 Elevator Elastomeric Buffer=
 Elevator Oil-Filled Buffer=
 Elevator Oil-Filled Buffer (top half - you hacker you!)=
@@ -144,12 +150,15 @@ Elevator Digilines Input/Output=
 Channel=
 Elevator Digilines Multi-Car Input/Output=
 You need either the 'protection_bypass' or 'server' privilege to use this.=
-Car ID=
-Save=
 Elevator Dispatcher=
 Dispatcher (door open - you hacker you!)=
 Dispatcher (top section - you hacker you!)=
 Dispatcher (top section, open - you hacker you!)=
+Firmware reloaded successfully=
+Can't place cabinet - no room for the top half!=
+Can't place cabinet - top half is protected!=
+Hold the sneak button while digging to remove.=
+Can't open cabinet - cabinet is locked.=
 Welcome to your new MTronic XT elevator dispatcher!=
 Before continuing, make sure you have at least two controllers in group operation mode and ready to connect.=
 This applies to the whole celevator mod, not just this dispatcher:=
@@ -190,6 +199,18 @@ Floor Height=
 Floor Name=
 Edit Floor Table=
 Back=
+No Connections=
+New Connection=
+Edit Connection=
+NEW CONNECTION=
+EDIT CONNECTION=
+CAR @1=
+ IN=
+OUT=
+OK=
+Move Up=
+Move Down=
+ID: @1=
 Glass Hoistway Door (fast, bottom - you hacker you!)=
 Glass Hoistway Door (fast, middle - you hacker you!)=
 Glass Hoistway Door (fast, top - you hacker you!)=
@@ -204,6 +225,8 @@ Steel Hoistway Door (slow, bottom - you hacker you!)=
 Steel Hoistway Door (slow, middle - you hacker you!)=
 Steel Hoistway Door (slow, top - you hacker you!)=
 Steel Elevator Hoistway Door=
+Can't place door here - position @1m to the right and @2m up is blocked!=
+Can't place door here - position @1m to the right and @2m up is protected!=
 Glass Hoistway Door (left, bottom - you hacker you!)=
 Glass Hoistway Door (left, middle - you hacker you!)=
 Glass Hoistway Door (left, top - you hacker you!)=
@@ -218,8 +241,6 @@ Steel Hoistway Door (right, bottom - you hacker you!)=
 Steel Hoistway Door (right, middle - you hacker you!)=
 Steel Hoistway Door (right, top - you hacker you!)=
 Center-Opening Steel Elevator Hoistway Door=
-Can't place door here - position @1m to the right and @2m up is blocked!=
-Can't place door here - position @1m to the right and @2m up is protected!=
 Hoistway Door Open-State Placeholder (you hacker you!)=
 Hoistway Door Sill, Double Track (you hacker you!)=
 Elevator Drive=
@@ -251,7 +272,8 @@ Elevator Fire Service Phase 1 Keyswitch (lit - you hacker you!)=
 Elevator Fire Service Phase 1 Keyswitch (on state, lit - you hacker you!)=
 Elevator Fire Service Phase 1 Keyswitch (reset state, lit - you hacker you!)=
 Can't connect to a controller/dispatcher you don't have access to.=
-You don't have a key for this switch.=
+Save=
+Car ID=
 Elevator Keyswitch=
 Elevator Keyswitch (maintained, off state - you hacker you!)=
 Elevator Keyswitch (maintained, on state - you hacker you!)=
@@ -260,7 +282,32 @@ Elevator Keyswitch (momentary, on state - you hacker you!)=
 (none)=
 ON=
 OFF=
-Landing Number=
+Dispatcher ID=
+You don't have a key for this switch.=
+Car Call at Landing:=
+Up Call (simplex car) at Landing:=
+Down Call (simplex car) at Landing:=
+Up Call (swing) at Landing:=
+Down Call (swing) at Landing:=
+Deactivate Fire Service Phase 1=
+Activate Fire Service (main landing) Phase 1=
+Activate Fire Service (alternate landing) Phase 1=
+Machine Room or Hoistway Smoke Detector=
+Lock Car Calls at Landing:=
+Require Auth for Car Calls at Landing:=
+Unlock Car Calls at Landing:=
+Activate Swing Operation=
+Deactivate Swing Operation=
+Up Call at Landing:=
+Down Call at Landing:=
+Activate Fire Service Phase 1=
+Controller=
+Dispatcher=
+Not all signal options require a landing number.=
+Dispatcher: @1=
+Car: @1=
+Can't connect to a dispatcher you don't have access to.=
+Can't connect to a controller you don't have access to.=
 Elevator Governor=
 Governor Sheave (you hacker you!)=
 Remote interface for MTronic XT elevator controllers=
@@ -297,18 +344,6 @@ Follow Car=
 Position: @1m Speed: @2m/s PI: @3=
 Fault(s) Active=
 No Current Faults=
-ID: @1=
-No Connections=
-New Connection=
-Edit Connection=
-NEW CONNECTION=
-EDIT CONNECTION=
-CAR @1=
- IN=
-OUT=
-OK=
-Move Up=
-Move Down=
 Inspection (Any)=
 Fire Service=
 Fire Service Phase 1=
@@ -329,40 +364,6 @@ Elevator Mesecons Output=
 Elevator Mesecons Output (on state - you hacker you!)=
 Elevator Mesecons Input=
 Elevator Mesecons Input (on state - you hacker you!)=
-Car Call at Landing:=
-Up Call (simplex car) at Landing:=
-Down Call (simplex car) at Landing:=
-Up Call (swing) at Landing:=
-Down Call (swing) at Landing:=
-Deactivate Fire Service Phase 1=
-Activate Fire Service (main landing) Phase 1=
-Activate Fire Service (alternate landing) Phase 1=
-Machine Room or Hoistway Smoke Detector=
-Lock Car Calls at Landing:=
-Require Auth for Car Calls at Landing:=
-Unlock Car Calls at Landing:=
-Activate Swing Operation=
-Deactivate Swing Operation=
-Up Call at Landing:=
-Down Call at Landing:=
-Activate Fire Service Phase 1=
-Controller=
-Dispatcher=
-Not all signal options require a landing number.=
-Dispatcher: @1=
-Car: @1=
-Dispatcher ID=
-Can't connect to a dispatcher you don't have access to.=
-Can't connect to a controller you don't have access to.=
-Normal Operation=
-Fault=
-Emergency Stop=
-Independent Service=
-Swing Operation=
-Doors Opening=
-Doors Open=
-Doors Closing=
-Doors Closed=
 Elevator Position Indicator=
 Elevator Up Lantern=
 Elevator Up Lantern (vertical)=