--- a/src/text_english.inc	Thu Mar 05 15:06:14 2020 +0100
+++ b/src/text_english.inc	Tue Apr 28 17:34:31 2020 +0200
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;	File text_english.asm                     next combined generation V3.08.8
+;	File text_english.asm                     next combined generation V3.09.4k
 ;
 ;	English texts reference file.
 ;
@@ -41,12 +41,7 @@
 	TCODE	tDivemenu_Avg_Mkr,	"Avg/Marker"			; Reset Avg, Set Marker (and Turn Dive)
 	TCODE	tDivemenu_ToggleGF,	"Toggle GF"				; Toggle GF
 	TCODE	tDivemenu_Marker,	"Set Marker"			; Set Marker
-
- IFDEF _cave_mode
-	TCODE	tDivemenu_LostGas,	"Gas avail."			; Gas Availability
- ELSE
 	TCODE	tDivemenu_LostGas,	"Lost Gas"				; Lost Gas
- ENDIF
 
  IFDEF _ccr_pscr
 	TCODE	tDivemenu_Diluent,	"Diluents"				; Diluents (CCR)
@@ -130,11 +125,8 @@
 	TCODE	tGasFirst,			"First"					; |      1: First
 	TCODE	tGasTravel,			"Work"					; |      2: Work (Travel, Bottom)
 	TCODE	tGasDeco,			"Deco"					; |      3: Deco
-	TCODE	tDilDisabled,		"Disabled"				; | Enum 0: Disabled
-	TCODE	tDilFirst,			"First"					; |      1: First
-	TCODE	tDilNorm,			"Normal"				; |      2: Normal
-	TCODE	tAir,				"Air  "					; Enum: values must follow (5 chars)
-	TCODE	tO2,				"O2   "					; tAir + 5
+	TCODE	tAir,				"Air  "					; | Enum: values must follow (5 chars)
+	TCODE	tO2,				"O2   "					; |       tAir + 5
 	TCODE	tO2Plus,			"O2 +"
 	TCODE	tO2Minus,			"O2 -"
  IFDEF _helium
@@ -149,7 +141,7 @@
 	TCODE	tDepthReset,		"Reset to MOD:"
 	TCODE	tSetup_GasMix,		"Setup Mix"
  IFDEF _ccr_pscr
-	TCODE	tSPPlus,			"ppO2+"					; pO2+
+	TCODE	tSPPlus,			"ppO2  +"				; Setpoint ppO2 +
 	TCODE	tSensorFallback,	"Fallback:"				; Fallback:
 	TCODE	tCalculated,		"calculated"			; calculated
 	TCODE	tppO2O2,			"ppO2(O2)"				; ppO2(O2)
@@ -163,7 +155,6 @@
 	TCODE	tCCRModeFixedSP,	" "						; target needed by option table
  ENDIF
 	TCODE	tSP,				"SP"					; SP (SetPoint)
-	TCODE	tppO2,				"ppO2:"					; ppO2:
 
 
 ; New batteries menu
@@ -192,11 +183,11 @@
 	TCODE	tUsbTitle,			"USB Mode"
 	TCODE	tBleTitle,			"Bluetooth Mode"
 	TCODE	tUsbStarting,		"Starting..."
-	TCODE	tUsbStartDone,		"Done."
-	TCODE	tUsbServiceMode,	"Service mode enabled"
+	TCODE	tUsbStartDone,		"done."
+	TCODE	tUsbServiceMode,	"Service Mode enabled"
 	TCODE	tUsbClosed,			"Port closed"
 	TCODE	tUsbExit,			"Exited"
-	TCODE	tUsbDownloadMode,	"Download mode enabled"
+	TCODE	tUsbDownloadMode,	"Download Mode enabled"
 	TCODE	tUsbLlBld,			"Low-level Bootloader"
 
 
@@ -239,7 +230,7 @@
 	TCODE	tExtendedStops,		"extended Stop: "		; Extended Stops
 	TCODE	tLastDecostop,		"Last Deco    : "		; last Deco Stop Depth
 	TCODE	tDvSalinity,		"Salinity     : "		; Salinity
-	TCODE	tDepthWarn,			"Depth Warning: "		; Depth Warning
+	TCODE	tDepthWarn,			"Depth Warning:"		; Depth Warning (no space after ':' on purpose)
 	TCODE	tGasUsage,			"Gas Usage"				; Gas Usage
 	TCODE	tSetWorkSAC,		"SAC Work: "			; SAC Work: (space)
 	TCODE	tSetDecoSAC,		"SAC Deco: "			; SAC Deco: (space)
@@ -249,8 +240,8 @@
  ENDIF
 	TCODE	tGasChangeTime,		"Gas Change   :+"		; additional Gas Change Time
 	TCODE	tSetup_Tank,		"Setup Tank"			; Setup Tank
-	TCODE	tTankSize,			"Tank Size"				; Tank Size
-	TCODE	tTankUsablePress,	"Turn Pres/Asc.Need"	; Tank Pressure Budget for Ascent (turn pressure) (max 19 chars)
+	TCODE	tTankSize,			"Tank Size: "			; Tank Size
+	TCODE	tTankUsablePress,	"Turn Pres: "			; Tank Pressure Budget for Ascent (turn pressure)
 	TCODE	tLiter,				" l"					; Liter as l
 	TCODE	tLiterLong,			"Liter"					; Liter as Liter
 	TCODE	t2ndDecoPlanMenu,	"2nd Deco Plan"			; 2nd Deco Plan
@@ -258,6 +249,7 @@
  IFDEF _ccr_pscr
 	TCODE	tCCmaxFracO2,		"Loop %O2 max. : "		; max O2 percent (absolute) in the loop
 	TCODE	tDilppO2Check,		"Check Dil ppO2: "		; check ppO2 of the diluent against the setpoint
+	TCODE	tGasDensityCheck,	".. Gas Density: "		; check Gas Density
 	TCODE	tPSCR_O2_drop,		"pSCR   O2 Drop: "		; pSCR O2 drop
 	TCODE	tPSCR_lungratio,	"... Lung Ratio: "		; pSCR lung ratio
 	TCODE	tCopyDilToOC,		"Copy Dil.-> OC"		; copy diluent settings to OC gas
@@ -303,7 +295,7 @@
 	TCODE	tFlip,				"Rotate Screen: "		; Rotate Screen
 	TCODE	tColorScheme,		"Colour Scheme"			; Colour Scheme
 	TCODE	tVSIgraph,			"Speed Graph : "		; Speed Graph
-	TCODE	tVSItext2,			"Var.  Speed : "		; variable Speed
+	TCODE	tVSItext2,			".. adaptive : "		; adaptive Speed
 	TCODE	tShowppO2,			"ppO2 always : "		; always show ppO2
 	TCODE	tDepthWarning,		"Depth blink.: "		; Depth blinking
 	TCODE	t2ndDepth,			"2nd Depth: "			; 2nd Depth Display Content (11 chars max)
@@ -326,17 +318,18 @@
 ; Setup menu
 	TCODE	tSystSets,			"Settings"				; System Settings
  IFDEF _compass
-	TCODE	tCompassMenu,		"Compass Calibration"
+	TCODE	tCompassMenu,		"Compass"				; Compass
+	TCODE	tCompassCalibration,"Calibration"			; Calibration
 	TCODE	tCompassGain,		"Compass Gain:"
-	TCODE	tCalX,				"Cal X:"				; Cal X
-	TCODE	tCalY,				"Cal Y:"				; Cal Y
-	TCODE	tCalZ,				"Cal Z:"				; Cal Z
+	TCODE	tCalX,				"Cal X"					; Cal X
+	TCODE	tCalY,				"Cal Y"					; Cal Y
+	TCODE	tCalZ,				"Cal Z"					; Cal Z
  ENDIF
 	TCODE	tMetric,			" m/°C"					; 0   - keep order, enum!
 	TCODE	tImperial,			"ft/°F"					; 1
 								;         111         111         111         111         111
 	; 5 rows by 12 chars each:	 123456789012123456789012123456789012123456789012123456789012
-	TCODE	tDefName,			"HW OSTC"				; "  Read the  Manual, know& understandthe inherentLimitations!"
+	TCODE	tDefName,		"HW OSTC						     "
 	TCODE	tPiezo,				"Buttons"				; Buttons
 	TCODE	tButtonleft,		"Left  Button:"			; Left  Button
 	TCODE	tButtonright,		"Right Button:"			; Right Button
@@ -467,11 +460,16 @@
 	TCODE	tgaschange,			"Change?"				; better gas found
 	TCODE	tNeed,				"Need "					; gas need (5 chars)
 	TCODE	tBattery,			"Battery"				; Battery
+	TCODE	tSAT,				"Sat:"					; Sat:  (max 4 chars)
+	TCODE	tppO2,				"ppO2:"					; ppO2: (max 5 chars)
 
  IFDEF _helium
 	TCODE	tHe,				"He"					; He
-	TCODE	tIBCD,				"IBCD N2He"				; IBCD warning
-	TCODE	tGasDensity,		"G.Density"				; Gas Density
+	TCODE	tIBCD,				"IBCD N2He"				; IBCD warning (max. 9 chars)
+ ENDIF
+
+ IFDEF _ccr_pscr
+	TCODE	tGasDensity,		"G.Density"				; Gas Density  (max. 9 chars)
  ENDIF
 
  IFDEF _rx_functions
@@ -481,14 +479,12 @@
 	TCODE	tswap,				"Swap Tank"				; swap tank (max. 9 chars)
  ENDIF
 
- IFDEF _ccr_pscr
  IFDEF _external_sensor
 	TCODE	tDiveHudMask1,		"Sensor 1"
 	TCODE	tDiveHudMask2,		"Sensor 2"
 	TCODE	tDiveHudMask3,		"Sensor 3"
 	TCODE	tSensorDisagree,	"Sensors<>"				; Sensors disagree Warning
  ENDIF
- ENDIF
 
  IFDEF _cave_mode
 	TCODE	tGasNeedsCaveMode,	"Gas Needs -CAVE-"		; title for gas needs custom view (cave mode)		| need to be
@@ -504,6 +500,7 @@
 
 
 ; Divemode menu
+	TCODE	tDiveAckn,			"Ackn?"					; Ackn?  (max. 5 chars)
 	TCODE	tDivePreMenu,		"Menu?"					; Menu?  (max. 5 chars)
 	TCODE	tDiveLayout,		"Layout"				; Layout (max. 6 chars)
  IFDEF _compass
@@ -520,7 +517,7 @@
 	TCODE	tCNS2,				"CNS: "
 	TCODE	tAVG,				"Avg: "
 	TCODE	tGF2,				"GF : "
-	TCODE	tSAT,				"Sat: "					; max  4 chars
+	TCODE	tSD2,				"S/D: "
 	TCODE	tDvSalinity2,		"Salinity :"			; max 11 chars
 	TCODE	tLastDeco,			"Last Deco:"			; max 11 chars
 	TCODE	tNoProfileData,		"no profile anymore..."	; max 21 chars
@@ -529,7 +526,8 @@
 	TCODE	tDesatTime,			"Desat:"				; amx  8 chars
 
 ; other users
-	TCODE	tGF,				"GF:"
+	TCODE	tGF,				"GF:"					; GF Factors                (3 chars)
+	TCODE	tSD,				"S/D"					; Saturation / Desaturation (3 chars)
 
 ; Logbook units
 	TCODE	tLogTunitC,			"°C"
@@ -543,7 +541,11 @@
 
 
 ; Reset menu
+ IFDEF _firmware_recovery
+	TCODE	tReboot,			"Reboot/Backup"			; Reboot/Backup
+ ELSE
 	TCODE	tReboot,			"Reboot"				; Reboot
+ ENDIF
 	TCODE	tResetMenu2,		"Are you sure?"			; Are you sure?
 	TCODE	tAbort,				"Abort"					; Abort
 	TCODE	tResetSettings,		"Reset Settings"		; Reset Settings
@@ -551,6 +553,14 @@
 	TCODE	tResetBattery,		"Reset Battery"			; Reset Battery
 	TCODE	tResetLogbook,		"Reset Logbook"			; Reset Logbook
 
+ IFDEF _firmware_recovery
+	TCODE	tRebootCurFirmware,	"Reboot  current FW"	; Reboot current Firmware
+	TCODE	tBackupFirmware,	"Backup  current FW"	; Backup current Firmware
+	TCODE	tRecoverFirmware,	"Restore"				; Restore (version will be appended)
+	TCODE	tBackingUp,			"backing up..."			; backing up current firmware
+	TCODE	tRestoring,			"restoring..."			; restoring  backup  firmware
+ ENDIF
+
 
 ; Set Time Menu/Set Date Menu
 	TCODE	tSetHours,			"Set   Hours"			; Set   Hours
@@ -593,6 +603,13 @@
 	TCODE	tColorSetName3,		"Blue"					; Blue
 
 
+; Debug Stuff
+ IFDEF _comm_debug
+	TCODE	tCommTimeout,		"RX Timeout: "
+	TCODE	tCommTimeoutU,		"0 ms"
+ ENDIF
+
+
 ; Language selection
  IF _language_1==en
 	TCODE	tLang1,				"EN"					; tLang1 is 1st language, enum context