--- a/src/text_french.inc	Thu Oct 11 21:06:29 2018 +0200
+++ b/src/text_french.inc	Thu Nov 22 19:47:26 2018 +0100
@@ -1,369 +1,463 @@
-;=============================================================================   >> OCTC3 V1.13b > ClaudeDive update proposed. 
+;=============================================================================
 ;
-;    File text_french.asm							REFACTORED VERSION V2.95   
+;	File text_french.asm							REFACTORED VERSION V2.99e
 ;
-;    French texts translation file. 
+;	French texts translation file. 
 ;
-;   Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved.
+;	Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved.
 ;=============================================================================
 
 ; Basic texts
-	TCODE	tNo,		"Non"					; No
-	TCODE	tYes,		"Oui"					; Yes = No + 1
-	TCODE	tblank,		" "						; (a single space character)	## NEW (layout)
+	TCODE	tNo,				"Non"					; 0 No
+	TCODE	tYes,				"Oui"					; 1 Yes
+ IFDEF _cave_mode
+	TCODE	tCave,				"Cave"					; 2 Cave
+ ENDIF
+
+	TCODE	tblank,				" "						; (a single space character)
 
 ; Surface-mode texts
-	TCODE   tBeta,      "bêta"					; beta
-	TCODE	tMenu,		"<Menu"					; <Menu
-	TCODE   tView,      "Vues>"					; View>
-    TCODE   tHeading,   "Cap:"					; Heading:
-    TCODE   tLastDive,	"Dern.Plong"			; Last Dive (Max 10 chars)
-    TCODE   tSensorMilliVolt, "Cellules CCR mV"	; CCR Sensors mV
+	TCODE	tMenu,				"<Menu"					; <Menu
+	TCODE	tView,				"Vues>"					; View>
+	TCODE	tHeading,			"Cap:"					; Heading:
+	TCODE	tLastDive,			"Dern.Plong"			; Last Dive (Max 10 chars)
+	TCODE	tSensorMilliVolt,	"Cellules mV"			; Sensors mV
 
 ; Divemode Menu
-    TCODE   tDivemenu_Gaslist,  "Liste Gaz"     ; Gas List
-    TCODE   tDivemenu_ResetAvg, "RaZChrono"     ; Reset Avg.
-    TCODE   tDivemenu_Setpoint, "Setpoint"      ; Setpoint
-    TCODE   tDivemenu_UseSensor,"Cellules"      ; Use Sensor
-    TCODE   tDivemenu_ToggleGF, "Bascul.GF"     ; Toggle GF
-    TCODE   tDivemenu_Marker,   "Repère"        ; Set Marker
-    TCODE   tDivemenu_LostGas,  "Gaz Perdu"     ; Lost Gas
+	TCODE	tDivemenu_Gaslist,	"Liste Gaz"				; Gas List (OC)
+	TCODE	tDivemenu_Diluent,	"Liste Dil"				; Diluents (CCR)
+	TCODE	tDivemenu_Premix,	"Liste Mix"				; Premix   (pSCR)
+	TCODE	tDivemenu_ResetAvg,	"RaZChrono"				; Reset Avg.
+	TCODE	tDivemenu_Avg_Mkr,	"Avg/Marker"			; Reset Avg., Set Marker (and Turn Dive)	## pending translation
+	TCODE	tDivemenu_Setpoint,	"Setpoint"				; Setpoint
+	TCODE	tDivemenu_UseSensor,"Cellules"				; Use Sensor
+	TCODE	tDivemenu_ToggleGF,	"Bascul.GF"				; Toggle GF
+	TCODE	tDivemenu_Marker,	"Repère"				; Set Marker
+	TCODE	tDivemenu_LostGas,	"Gaz Perdu"				; Lost Gas
+ IFDEF _cave_mode
+	TCODE	tDivemenu_TurnDive,	"Turn Dive"				; Turn Dive
+ ENDIF
 
 ; Main menu
-    TCODE   tNext,      "<Suivant"				; <Next
-    TCODE   tEnter,     "Entrer>"				; Enter>
-
-    TCODE   tMainMenu,  "Menu Principal"		; Main Menu
-    TCODE   tLogbook,   "Carnet de Plongée"		; Logbook
-    TCODE   tGasSetup,  "Paramètres Gaz OC"		; OC Gas Setup
-    TCODE   tSetTime,   "Réglage Heure"			; Set Time
-	TCODE	tSetDate,	"Réglage Date"			; Set Date
-	TCODE	tSetTimeDate,"Date & Heure"			; Set Time & Date
-    TCODE   tDispSets,  "Préfér. Réglages"		; Display Settings
-    TCODE   tExit,      "Retour"				; Exit
-    TCODE	tResetMenu, "Menu RaZ"				; Reset Menu
-	TCODE	tDiveModeMenu,"Menu Déco"			; Deco Mode
-	TCODE	tInfoMenu,	"Informations"			; Information
-    TCODE   tCCRSetup,  "Paramètres CCR"		; CCR Setup
-    TCODE   tDiluentSetup,"Liste Diluants"		; Diluent Setup
-    TCODE   tFixedSetpoints,"Setpoints Fixes"	; Fixed Setpoints
-    TCODE   tCCRSensor, "Cellules CCR"			; CCR Sensor
-    TCODE   tCalibrateMenu, "Calibration"		; Calibration
-    TCODE   tCalibrationGas, "Cal. Gaz O2:"		; Cal. Gas O2:
-    TCODE   tCalibrate, "Calibrate"				; Calibrate
-	TCODE	tBack, "retour..."					; back...						## NEW 
+	TCODE	tNext,				"<Suivant"				; <Next
+	TCODE	tEnter,				"Entrer>"				; Enter>
+	TCODE	tMainMenu,			"Menu Principal"		; Main Menu
+	TCODE	tLogbook,			"Carnet de Plongée"		; Logbook
+	TCODE	tGasSetup,			"Paramètres Gaz OC"		; OC Gas Setup
+	TCODE	tSetTime,			"Réglage Heure"			; Set Time
+	TCODE	tSetDate,			"Réglage Date"			; Set Date
+	TCODE	tSetTimeDate,		"Date & Heure"			; Set Time & Date
+	TCODE	tDispSets,			"Préfér. Réglages"		; Display Settings
+	TCODE	tExit,				"Retour"				; Exit
+	TCODE	tResetMenu,			"Menu RaZ"				; Reset Menu
+	TCODE	tDiveModeMenu,		"Menu Déco"				; Deco Mode
+	TCODE	tInfoMenu,			"Informations"			; Information
+	TCODE	tTrSettings,		"Pressure Display"		; Pressure Display					## pending translation
+	TCODE	tTrMode,			"Mode: "				; Mode
+	TCODE	tTr1stPres,			"1.Pres.: "				; 1st Pressure
+	TCODE	tTr2ndPres,			"2.Pres.: "				; 2nd Pressure
+	TCODE	tTrBailPres,		"1.B/O  : "				; Bailout Pressure
+	TCODE	tTrMaxDeltaP,		"max deltaP: "			; independent double max diffenerce	## pending translation
+	TCODE	tCCRSetup,			"Paramètres CCR"		; CCR Setup
+	TCODE	tDiluentSetup,		"Liste Diluant"			; Diluent Setup
+	TCODE	tFixedSetpoints,	"Setpoints Fixes"		; Fixed Setpoints
+	TCODE	tCCRSensor,			"Cellules CCR"			; CCR Sensor
+	TCODE	tCalibrateMenu,		"Calibration"			; Calibration
+	TCODE	tCalibrationGas,	"Cal. Gaz O2:"			; Cal. Gas O2:
+	TCODE	tCalibrate,			"Calibrate"				; Calibrate
+	TCODE	tBack,				"retour"				; back
 
 ; Gas menu
-    TCODE   tGaslist,   "Liste Gaz OC"			; OC Gas List
-    TCODE   tGaslistCC, "Liste Gaz CC"			; CC Diluents
-    TCODE   tGasEdit,   "Préférence Gaz"		; Edit Gas
-    TCODE   tType,      "Type: "
-    TCODE   tGasDisabled,"Désactivé"			; Disabled
-    TCODE   tGasFirst,   "Premier"				; First
-    TCODE   tGasTravel,  "Travel"				; Travel
-    TCODE   tGasDeco,    "Déco"					; Deco
-    TCODE   tDilDisabled,"Désactivé"			; Disabled
-    TCODE   tDilFirst,   "Premier"				; First
-    TCODE   tDilNorm,   "Normal"				; Normal
-    TCODE   tAir,       "Air  "					; Enum: values must follows (5 chars)
-    TCODE   tO2,        "O2   "					; tAir + 5
-    TCODE   tO2Plus,    "O2 +"
-    TCODE   tO2Minus,   "O2 -"
-    TCODE   tHePlus,    "He +"
-    TCODE   tHeMinus,   "He -"
-    TCODE   tMOD,       "MOD:"
-    TCODE   tEAD,       "EAD:"
-    TCODE   tGasDepth,  "Prof. Changement"		; Change Depth
-    TCODE   tDepthPlus, "Prof. +"
-    TCODE   tDepthMinus,"Prof. -"
-    TCODE   tDepthReset,"MOD par défaut:"
-    TCODE   tSetup_mix, "Config. Gaz"			; Setup mix
-    TCODE   tCCRMode,   "Mode CCR:"				; CCR Mode:
-    TCODE   tCCRModeFixedSP,  "SP Fixe"			; Fixed SP
-    TCODE   tCCRModeSensor,   "Cellule"			; Sensor
-    TCODE   tCCRModeAutoSP,   "SP Auto"			; Auto SP
-    TCODE   tSP,            "SP"				; SP (SetPoint)
-    TCODE   tSPPlus,    "PpO2+"					; pO2+
-    TCODE   tSensorFallback, "Fallback:"		; Fallback:
-	TCODE	tCalculated,	"calculé"			; calculated
-    TCODE   tppO2,      "PpO2:"					; ppO2:
-    TCODE   tppO2O2,	"PpO2(O2)"				; ppO2(O2)
-    TCODE   tppO2Dil,	"PpO2(Dil)"				; ppO2(Dil)
-	TCODE   tppO2Mix,	"PpO2(Mix)"				; ppO2(Mix)
-	
+	TCODE	tGaslist,			"Liste Gaz OC"			; OC Gas List
+	TCODE	tGaslistCC,			"Liste Gaz CC"			; CC Diluents
+	TCODE	tGasEdit,			"Préférence Gaz"		; Edit Gas
+	TCODE	tType,				"Type: "
+	TCODE	tGasDisabled,		"Désactivé"				; Disabled
+	TCODE	tGasFirst,			"Premier"				; First
+	TCODE	tGasTravel,			"Travel"				; Travel
+	TCODE	tGasDeco,			"Déco"					; Deco
+	TCODE	tDilDisabled,		"Désactivé"				; Disabled
+	TCODE	tDilFirst,			"Premier"				; First
+	TCODE	tDilNorm,			"Normal"				; Normal
+	TCODE	tAir,				"Air  "					; Enum: values must follows (5 chars)
+	TCODE	tO2,				"O2   "					; tAir + 5
+	TCODE	tO2Plus,			"O2 +"
+	TCODE	tO2Minus,			"O2 -"
+	TCODE	tHePlus,			"He +"
+	TCODE	tHeMinus,			"He -"
+	TCODE	tMOD,				"MOD :"
+	TCODE	tEAD,				"EAD:"
+	TCODE	tSetup_GasDepth,	"Config. Changement"	; Change Depth
+	TCODE	tDepthPlus,			"Prof. +"
+	TCODE	tDepthMinus,		"Prof. -"
+	TCODE	tDepthReset,		"MOD par défaut:"
+	TCODE	tSetup_GasMix,		"Config. Gaz"			; Setup mix
+	TCODE	tCCRMode,			"Mode CCR:"				; CCR Mode:
+	TCODE	tCCRModeFixedSP,	"SP Fixe"				; Fixed SP
+	TCODE	tCCRModeSensor,		"Cellule"				; Sensor
+	TCODE	tCCRModeAutoSP,		"SP Auto"				; Auto SP
+	TCODE	tSP,				"SP"					; SP (SetPoint)
+	TCODE	tSPPlus,			"PpO2+"					; pO2+
+	TCODE	tSensorFallback,	"Fallback:"				; Fallback:
+	TCODE	tCalculated,		"calculé"				; calculated
+	TCODE	tppO2,				"PpO2:"					; ppO2:
+	TCODE	tppO2O2,			"PpO2(O2)"				; ppO2(O2)
+	TCODE	tppO2Dil,			"PpO2(Dil)"				; ppO2(Dil)
+	TCODE	tppO2Mix,			"PpO2(Mix)"				; ppO2(Mix)
+
 ; New batteries menu
-	TCODE   tNewBattTitle,      "Nouvelle Batterie?"
+	TCODE	tNewBattTitle,		"Nouvelle Batterie?"
 	TCODE	tNewBattOld,		"Conserver"
 	TCODE	tNewBattNew36,		"Réinit.3,6V Saft(T1)"  ; New 3,6V
 	TCODE	tNewBattNew15,		"Réinit.1,5V AA  (T0)"  ; New 1,5V
 	TCODE	tNewBattAccu,		"3,6V LiIon AA   (T2)"
-	TCODE	tNew18650,		"Internal 18650  (T3)"
-	TCODE	tNew16650,		"Internal 16650  (T4)"
-	
+	TCODE	tNew18650,			"Internal 18650  (T3)"
+	TCODE	tNew16650,			"Internal 16650  (T4)"
+
 ; Gaslist management
-    TCODE   tGas,       "Gaz"					; Gas
-    TCODE   tGasErr,    "Err"					; Err  (3 chars)
+	TCODE	tGas,				"Gaz"					; Gas
+	TCODE	tDil,				"Dil"					; Diluent
+	TCODE	tGasErr,			"Err"					; Err (3 chars)
 
 ; Communication Menu
-	TCODE	tUsbTitle,		"Mode USB"
-    TCODE   tBleTitle,      "Mode Bluetooth"
-	TCODE	tUsbStarting,  	"Début..."
-	TCODE	tUsbStartDone, 	"Ok."
-	TCODE	tUsbServiceMode,"Mode Maintenance"
-	TCODE	tUsbClosed,		"Port Fermé"
-	TCODE	tUsbExit,		"Terminé"
-	TCODE	tUsbDownloadMode,"Mode Téléchargement"
-    TCODE   tUsbLlBld,      "Chargeur Bas-Niv."
+	TCODE	tUsbTitle,			"Mode USB"
+	TCODE	tBleTitle,			"Mode Bluetooth"
+	TCODE	tUsbStarting,		"Début..."
+	TCODE	tUsbStartDone,		"Ok."
+	TCODE	tUsbServiceMode,	"Mode Maintenance"
+	TCODE	tUsbClosed,			"Port Fermé"
+	TCODE	tUsbExit,			"Terminé"
+	TCODE	tUsbDownloadMode,	"Mode Téléchargement"
+	TCODE	tUsbLlBld,			"Chargeur Bas-Niv."
 
 ; Dive Settings
-    TCODE   tDvMode,    "Mode:"
-    TCODE   tDvOC,      "OC"
-	TCODE	tDvCCR,		"CCR"
-    TCODE   tDvGauge,   "Gauge"
-    TCODE   tDvApnea,   "Apnée"
-    TCODE   tDvPSCR,	"pSCR"
-    TCODE   tDvCC,      "CC"
-    TCODE   tDkMode,    "Modèle:ZH-L16"			;								## MODIFIED (memory)
-    TCODE   tZHL16,     " "						;								## MODIFIED (memory)
-    TCODE   tZHL16GF,   "+GF"					;								## MODIFIED (memory)
-    TCODE   tPPO2Max,   "PpO2 Max :"
-    TCODE   tPPO2DECO,	"PpO2 Déco:"
-    TCODE   tPPO2MIN,   "PpO2 Min :"
-    TCODE   tPPO2MINCC, 	"Min Loop :"			; 								## NEW ppO2 min cc
-    TCODE   tLastDecostop, "Dern.Palier:"
-    TCODE   tDecoparameters, "Paramètres Déco"
-    TCODE   tGF_low,    "GF Bas:"
-    TCODE   tGF_high,   "GF Haut:"
-    TCODE   tSaturationMult,    "Saturation:"
-    TCODE   tDesaturationMult,  "Désaturation:"
-    TCODE   tFTTSMenu,  "fDTR/fB/O:"			; Future TTS
-    TCODE   taGFMenu,   "GF Alternatif"			; Alternative GF
-    TCODE   taGF_low,   "aGF Bas:"				; aGF Low
-    TCODE   taGF_high,  "aGF Haut:"				; aGF High
-    TCODE   taGF_enable,"aGF Possible:"			; aGF Selectable
-    TCODE   tDiveaGF_active,"aGF!"				; aGF!
-    TCODE   tppO2settings,"Menu PpO2"			; ppO2 Settings (max. 18 chars)
-    TCODE   tsafetystopmenu,"Palier Sécurité:"	; Safety Stop: (max. 16 chars)
-	TCODE   tGasUsage,  	"Usage Gaz"			; Gas Usage
-    TCODE   tSetBotUse, 	"Gaz Fond: "		; Bottom Gas: (space)
-    TCODE   tSetDecoUse,	"Gaz Déco: "		; Deco   Gas: (space)			## MODIFIED (layout)
-	TCODE	tCalcAscGas,	 "Calc.Gaz (B/O):"	;								## NEW bailout gas needs
-	TCODE	tTankSizes,		 "Volumes Blocs"	; Tank Sizes					## NEW bailout gas needs
-	TCODE   tLiter,			 " l"				;								## NEW bailout gas needs 
-	TCODE	tBarLiter,		"Litre"
-	TCODE	tTankFillPress,	 "Pressions Blocs"	; Tank Press Budget				## NEW bailout gas needs
-	TCODE	tGas1,			 "Gaz 1:"			;								## NEW bailout gas needs
-	TCODE	tGas2,			 "Gaz 2:"			;								## NEW bailout gas needs
-	TCODE	tGas3,			 "Gaz 3:"			;								## NEW bailout gas needs
-	TCODE	tGas4,			 "Gaz 4:"			;								## NEW bailout gas needs
-	TCODE	tGas5,			 "Gaz 5:"			;								## NEW bailout gas needs
-	TCODE	tCCmaxFracO2,	 "Loop %O2 max.:"	;								## NEW CCR max ppO2 limiter
-	TCODE	t2ndDecoPlanMenu,"Suite Menu Déco"	; 2nd Deco Plan					## NEW deco engine
+	TCODE	tDvMode,			"Mode: "
+	TCODE	tDvOC,				"OC"
+	TCODE	tDvCCR,				"CCR"
+	TCODE	tDvGauge,			"Gauge"
+	TCODE	tDvApnea,			"Apnée"
+	TCODE	tDvPSCR,			"pSCR"
+	TCODE	tDvCC,				"CC"
+	TCODE	tDkMode,			"Modèle: ZH-L16"
+	TCODE	tZHL16,				" "
+	TCODE	tZHL16GF,			"+GF"
+	TCODE	tPPO2Max,			"PpO2 Max :"
+	TCODE	tPPO2DECO,			"PpO2 Déco:"
+	TCODE	tPPO2MIN,			"PpO2 Min :"
+	TCODE	tPPO2MINCC,			"Min Loop :"
+	TCODE	tLastDecostop,		"Dern.Palier : "
+	TCODE	tAscentSpeed,		"Ascent Speed: "		; Ascent Speed							## pending translation
+	TCODE	tGasChangeTime,		"Gas Change  :+"		; additional Gas Change Time			## pending translation
+	TCODE	tDecoparameters,	"Paramètres Déco"
+	TCODE	tGF_low,			"GF  Bas :"
+	TCODE	tGF_high,			"GF  Haut:"
+	TCODE	tSaturationMult,	"Saturation  : "
+	TCODE	tDesaturationMult,	"Désaturation: "
+	TCODE	tFTTSMenu,			"Future DTR:"			; Future TTS
+	TCODE	tLastDecostopSurf,	"Dern.Palier:"			; last deco stop depth Surface Custom View
+	TCODE	tGFMenu,			"Menu GF"				; GF Settings
+	TCODE	taGF_low,			"aGF Bas :"				; aGF Low
+	TCODE	taGF_high,			"aGF Haut:"				; aGF High
+	TCODE	taGF_enable,		"aGF Possible:"			; aGF Selectable
+	TCODE	tDiveaGF_active,	"using aGF"				; using aGF								## pending translation
+	TCODE	tppO2settings,		"Menu PpO2"				; ppO2 Settings (max. 18 chars)
+	TCODE	tsafetystopmenu,	"Palier Sécurité:"		; Safety Stop: (max. 16 chars)
+	TCODE	tGasUsage,			"Usage Gaz"				; Gas Usage
+	TCODE	tSetBotUse,			"Gaz Fond: "			; Bottom Gas: (space)
+	TCODE	tSetDecoUse,		"Gaz Déco: "			; Deco   Gas: (space)
+	TCODE	tCalcAscGas,		"Calc.Gaz (B/O):"
+	TCODE	tSetup_Tank,		"Config. Blocs"			; Setup Tank
+	TCODE	tTankSize,			"Volume   Bloc"			; Tank Sizes
+	TCODE	tTankUsablePress,	"Pression Ascent"		; Tank Pressure Budget for Ascent (turn pressure) (max 19 chars)	## pending translation
+	TCODE	tCopyDilToOC,		"Copy  Dil.-> OC"		; copy diluent settings to OC gas		## pending translation
+	TCODE	tTankPairing,		"Config. Transmitter"	; select Transmitter					## pending translation
+	TCODE	tLiter,				" l"					; Liter as l
+	TCODE	tLiterLong,			"Liter"					; Liter as Liter
+	TCODE	tCCmaxFracO2,		"Loop %O2 max.:"		;
+	TCODE	t2ndDecoPlanMenu,	"Suite Menu Déco"		; 2nd Deco Plan
+
+ IFDEF _rx_functions
+	TCODE	tTrModeOff,			"off"					; off									## pending translation
+	TCODE	tTrModeOn,			"on"					; on									## pending translation
+	TCODE	tTrModeIndDouble,	"indep.Double"			; independent double					## pending translation
+	TCODE	tTrModeCCR,			"CCR Dil+O2"			; CCR diluent and O2
+	TCODE	tTrPresNone,		"none"					; none  (big enum group follows)		## pending translation
+	TCODE	tTrPresGas1,		"Gas 1"					; Gas 1
+	TCODE	tTrPresGas2,		"Gas 2"					; Gas 2
+	TCODE	tTrPresGas3,		"Gas 3"					; Gas 3
+	TCODE	tTrPresGas4,		"Gas 4"					; Gas 4
+	TCODE	tTrPresGas5,		"Gas 5"					; Gas 5
+	TCODE	tTrPresDil1,		"Dil 1"					; Dil 1
+	TCODE	tTrPresDil2,		"Dil 2"					; Dil 2
+	TCODE	tTrPresDil3,		"Dil 3"					; Dil 3
+	TCODE	tTrPresDil4,		"Dil 4"					; Dil 4
+	TCODE	tTrPresDil5,		"Dil 5"					; Dil 5
+	TCODE	tTrPresFirstGas,	"First Gas"				; first  Gas							## pending translation
+	TCODE	tTrPresActiveGas,	"active Gas"			; active Gas							## pending translation
+	TCODE	tTrPresFirstDil,	"First Dil"				; first  Dil							## pending translation
+	TCODE	tTrPresActiveDil,	"active Dil"			; active Dil							## pending translation
+ ELSE
+ 	TCODE	tTrModeOff,			""						; dummy target for entry in option table
+	TCODE	tTrPresNone,		""						; dummy target for entry in option table
+ ENDIF
 
 ; Display Settings
-    TCODE   tBright,    "Luminosité:"
-    TCODE   tEco,       "Eco"
-    TCODE   tMedium,    "Moyenne"
-    TCODE   tHigh,      "Haute"
-    TCODE   tDvSalinity,"Salinité:"				; Salinity
-    TCODE   tShowppO2,  "Afficher PpO2:"		; Always show ppO2:
-    TCODE   tFlip,      "Pivoter l'écran:"		; Rotate Screen
-    TCODE   tMODwarning,"Alerte MOD:"			; MOD warning
-	TCODE	tIBCDwarning,"Alerte CDI:"			; IBCD Warning					## NEW IBCD
-    TCODE   tTimeoutDive,"Fin Plongée:"			; Dive Timeout
+	TCODE	tBright,			"Luminosité:"
+	TCODE	tEco,				"Eco"
+	TCODE	tMedium,			"Moyenne"
+	TCODE	tHigh,				"Haute"
+	TCODE	tDvSalinity,		"Salinité:  "			; Salinity
+	TCODE	tShowppO2,			"Afficher PpO2:"		; Always show ppO2:
+	TCODE	tFlip,				"Pivoter l'écran:"		; Rotate Screen
+	TCODE	tMODwarning,		"Alerte MOD:"			; MOD warning
+	TCODE	tIBCDwarning,		"Alerte CDI:"			; IBCD Warning
+	TCODE	t2ndDepth,			"2.Prof.:"				; 2nd depth display content (10 chars max)
+	TCODE	tTimeoutDive,		"Fin Plongée:"			; Dive Timeout
 
 ; VSI display Settings
-    TCODE   tVSItext2,  "Vitesse Variable:"		; Variable speed:
-    TCODE   tVSIgraph,  "Graph. Vitesse:"		; Speed graph:
+	TCODE	tVSItext2,			"Vitesse Variable:"		; Variable speed:
+	TCODE	tVSIgraph,			"Graph.  Vitesse :"		; Speed graph:
 
 ; Setup Menu
-    TCODE   tSystSets,  "Réglages"
-    TCODE   tLanguage,  "Langue:"
-    TCODE   tEnglish,   "Anglais"
-    TCODE   tGerman,    "Allemand"
-    TCODE   tFrench,    "Français"
-    TCODE   tItalian,   "Italien"
-    TCODE   tCompassMenu,"Calibration Compas"	; Compass Calibration
-    TCODE   tCompassGain,"Sensibilité:"			; Compass Gain:
-    TCODE   tCalX,	 "Cal X:"					; Cal X
-    TCODE   tCalY,	 "Cal Y:"					; Cal Y
-    TCODE   tCalZ,	 "Cal Z:"					; Cal Z
-
-    TCODE   tUnits,     "Unités:"
-    TCODE   tMetric,     " m/°C"				; Enum menu
-    TCODE   tImperial,   "ft/°F"
-
-    TCODE   tDefName,   "HW OSTC"
-
-    TCODE   tButtonleft,"Bouton gauche:"		; Left button
-    TCODE   tButtonright,"Bouton droit:"		; Right button
+	TCODE	tSystSets,			"Réglages"
+	TCODE	tCompassMenu,		"Calibration Compas"	; Compass Calibration
+	TCODE	tCompassGain,		"Sensibilité:"			; Compass Gain:
+	TCODE	tCalX,				"Cal X:"				; Cal X
+	TCODE	tCalY,				"Cal Y:"				; Cal Y
+	TCODE	tCalZ,				"Cal Z:"				; Cal Z
+	TCODE	tUnits,				"Unités:"
+	TCODE	tMetric,			" m/°C"					; Enum menu
+	TCODE	tImperial,			"ft/°F"
+	TCODE	tDefName,			"HW OSTC"
+	TCODE	tButtonleft,		"Bouton gauche:"		; Left button
+	TCODE	tButtonright,		"Bouton droit :"		; Right button
+	TCODE	tAltMode,			"Temps Attente:"		; Waiting Time
+	TCODE	tAltModeFly,		"Avion"					; Flying
+	TCODE	tAltMode1000,		"1000m"
+	TCODE	tAltMode2000,		"2000m"
+	TCODE	tAltMode3000,		"3000m"
 
-	TCODE	tAltMode,	"Temps Attente"			;								## NEW no fly altitude
-	TCODE	tAltModeFly,	"Avion "			;								## NEW no fly altitude
-	TCODE	tAltMode1000,	"1000 m"			;								## NEW no fly altitude
-	TCODE	tAltMode2000,	"2000 m"			;								## NEW no fly altitude
-	TCODE	tAltMode3000,	"3000 m"			;								## NEW no fly altitude
-	
 ; Units for all menu
-    TCODE   tMeters,    "m"
-	TCODE	tFeets,		"ft"
-	TCODE	tFeets1,	"f"
-    TCODE   tMinutes,   "'"
-    TCODE   tPercent,   "%"
-    TCODE   tLitersMinute, "l/min"
-	TCODE	tbar,		"bar"					; bar
-	TCODE	tbar10,		"0 bar"					; bar							## NEW 2.95
-	TCODE	tMeterMinute,  "m/min"				; meter per minute				## ascent speed
-	TCODE	tmin,		"min"					; minutes
-	
+	TCODE	tMeters,			"m"
+	TCODE	tFeets,				"ft"
+	TCODE	tFeets1,			"f"
+	TCODE	tMinutes,			"'"
+	TCODE	tPercent,			"%"
+	TCODE	tLitersMinute,		"l/min"
+	TCODE	tbar,				"bar"					; bar
+	TCODE	tbar10,				"0 bar"					; xx0 bar
+	TCODE	tMeterMinute,		"m/'"					; meter per minute
+
 ; Date
-	TCODE	tDateFormat, "Date:"
-	TCODE	tDateformat, "MMJJAA"
-	TCODE	tDateformat1,"JJMMAA"
-	TCODE	tDateformat2,"AAMMJJ"
+	TCODE	tDateFormat,		"Date: "
+	TCODE	tDateformat,		"MMJJAA"
+	TCODE	tDateformat1,		"JJMMAA"
+	TCODE	tDateformat2,		"AAMMJJ"
 
 ; Simulator menu
-    TCODE   tInter, 	"Lancer Simulation"		; Start Simulator
-    TCODE   tPlan,  	"Simulateur"			; Simulator
+	TCODE	tInter,				"Lancer Simulation"		; Start Simulator
+	TCODE	tPlan,				"Simulateur"			; Simulator
 
 ; Decoplanner submenu
-    TCODE   tBtTm,  	"Temps Fond:"			; Bot. Time: (10 chars)
-    TCODE   tBtTm_short,"Temps:"				; Bot. Time: (max. 6 chars)
-    TCODE   tBtDep, 	"Prof. Max:"			; Max Depth: (10 chars)
-    TCODE   tIntvl, 	"Intervalle:"			; Interval :  (10 chars)
-	TCODE	tDecoSetup,	"Réglage Ordinateur"		;								## NEW (layout)
-    TCODE   tDeco,  	"Calcul Déco"			; Calculate Deco
-    TCODE   tDivePlan,  "Runtime:"				; Dive Plan:
-    TCODE   tNoDeco,    "Pas de Déco"			; No Deco
-    TCODE   tMore,      "Suite..."				; More...
-	TCODE	tSelectSetpoint,"Setpoint CCR: "	;								## NEW deco calculator enhancement
-	TCODE	tuseAGF,	"aGF Permis:"			;								## NEW deco calculator enhancement
-	TCODE	tCalculating,	"Calcul en cours"	; Calculating...				## NEW deco calculator enhancement
+	TCODE	tBtTm,				"Temps Fond:"			; Bot. Time: (10 chars)
+	TCODE	tBtTm_short,		"Temps:"				; Bot. Time: (max. 6 chars)
+	TCODE	tBtDep,				"Prof. Max :"			; Max Depth: (10 chars)
+	TCODE	tIntvl,				"Intervalle:"			; Interval : (10 chars)
+	TCODE	tDecoSetup,			"Réglage Ordinateur"	; Calculator Setup
+	TCODE	tDeco,				"Calcul Déco"			; Calculate Deco
+	TCODE	tDivePlan,			"Runtime:"				; Dive Plan:
+	TCODE	tNoDeco,			"Pas de Déco"			; No Deco
+	TCODE	tMore,				"Suite"					; More
+	TCODE	tSelectSetpoint,	"Setpoint  :"
+	TCODE	tuseAGF,			"aGF Permis:"			; use aGF
+	TCODE	tCalculating,		"Calcul en cours"		; Calculating
+	TCODE	tNDLleft,			"left"					; time left within NDL					## pending translation
 
 ; Information menu
-    TCODE   tFirmware,  "Logiciel:"			; Firmware: (space)
-    TCODE   tSerial,    "N° Série:"			; Serial  : (space)
-	TCODE	tTotalDives,"Nbre Plongées:"		; Total Dives: (space)
-    TCODE   tBatteryV,  "Batterie:"			; Battery:
-    TCODE   tUptime,	"Mise a Jour:"				; Uptime: 
+	TCODE	tFirmware,			"Logiciel: "			; Firmware: (space)
+	TCODE	tFirmware_rx,		"RX Ver  : "			; RX Ver  : (space)
+	TCODE	tSerial,			"N. Série: "			; Serial  : (space)
+	TCODE	tTotalDives,		"Nbre Plongées:"		; Total Dives: (space)
+	TCODE	tBatteryV,			"Batterie: "			; Battery:
+	TCODE	tUptime,			"Mise a Jour:"			; Uptime:
 
 ; Divemode screen
-    TCODE   tNDL,       "NDL"
-    TCODE   tTTS,       "DTR"
-	TCODE	tVelMetric,	 "m/min"
-	TCODE	tVelImperial,"ft/m "
-	TCODE	tGasSelect,  "Activer Gaz"			; Select Gas
-	TCODE	tSelectAir,	 "Air "					; Air
-	TCODE	tSelectO2,	 "O2  "					; O2
-    TCODE   tSelectNx,   "Nx"					; Nx
-    TCODE   tSelectTx,   "Tx"					; Tx
-    TCODE   tDepth,      "Prof."				; Depth
-    TCODE   tMaxDepth,   "Prof. Max."			; Max. Depth - max 10chars!
-    TCODE   tDivetime,   "Durée"				; Divetime
-    TCODE   tDiveHudMask1,   "cell. 1"
-    TCODE   tDiveHudMask2,   "cell. 2"
-    TCODE   tDiveHudMask3,   "cell. 3"
-    TCODE   tDiveTotalAvg,  "Prof. Moy."
-    TCODE   tDiveStopwatch, "Chrono"
-    TCODE   tDiveStopAvg,   "P.Moy.Chron"		; 11chars max
-    TCODE   tApnoeTotal,    "Totale"			; Total (Six chars, right alligned)
-    TCODE   tApnoeMax,      "Dern.Plongée"		; Last Descend
-    TCODE   tApnoeSurface,  "Tps Surface"		; Surface Time
-    TCODE   tDiveDecoplan,  "Runtime"			; Decoplan
-    TCODE   tDiveClock,     "Heure"				; Clock
-    TCODE   tDiveEAD_END,   "EAD/END"			; EAD/END
-    TCODE   tDiveTissues,   "Tissus"			; Tissues
-    TCODE   tEND,           "END:"				; END:
-    TCODE   tHe,            "He"				; He
-    TCODE   tN2,            "N2"				; N2
-    TCODE   tDiveBailout,   "Bailout"			; Bailout
-    TCODE   tGFactors,      "Valeurs GF"		; GF Values
-    TCODE   taGFactors,     "Valeurs aGF"		; aGF Values
-    TCODE   tGFInfo,        "   GF Info"		; GF Info
-    TCODE   tCeiling,       "Plafond"			; Ceiling
-    TCODE   tDiveSafetyStop,"Stop"				; Stop (Four chars, right alligned)
-    TCODE   tDiveFallback,  "Fallback!"			; Fallback! (max. nine chars)
-	TCODE	tDecoInfo,		"Zone Déco"			; Deco info
-    TCODE   tSensorCheck,   "Ctrl Cell. "		; Sensor Check
-    TCODE   tdil,	    	"Dil:"				; Diluent ppO2 Warning
-	TCODE	tmix,			"Mix:"				; Pre-Mix ppO2 Warning
-	TCODE	tSensorDisagree,"Sensors<>"			; Sensors disagree Warning		## NEW voting logic
-	TCODE	tGasNeedsWarn,	"Gas Needs"			;								## NEW bailout gas needs
-	TCODE	tGasNeedsBar,	"Besoins Gaz (bar)"	;								## NEW bailout gas needs
-	TCODE	tCNSsurf,		"SNC Surf."			; CNS Surf.						## NEW CNS at end-of-dive
-	TCODE	tCNSfTTS,		"SNC fDTR"			; CNS fTTS						## NEW CNS at end-of-dive
-	TCODE	tCNSBO,			"SNC B/O"			; CNS B/O						## NEW CNS at end-of-dive
-	TCODE	tCNSnow,		"SNC actuel"		; CNS now						## NEW CNS at end-of-dive
-	TCODE	tCNSeod,		"SNC final"			; CNS fin						## NEW CNS at end-of-dive
-	TCODE	tIBCD,			"CDI N2He"			; IBCD N2He						## NEW IBCD
-	TCODE	tMicroBubbles,	"M.Bulles "			;								## NEW microbubbles
-	TCODE	tCNS,			"SNC: "				;								## V2.95 optics
-	
+	TCODE	tNDL,				"NDL"					; 3 chars max
+	TCODE	tTTS,				"DTR"
+	TCODE	tVelMetric,			"m/min"
+	TCODE	tVelImperial,		"ft/m "
+	TCODE	tGasSelect,			"Activer Gaz"			; Select Gas
+	TCODE	tSelectAir,			"Air "					; Air
+	TCODE	tSelectO2,			"O2  "					; O2
+	TCODE	tSelectNx,			"Nx"					; Nx
+	TCODE	tSelectTx,			"Tx"					; Tx
+	TCODE	tDepth,				"Prof."					; Depth
+	TCODE	tMaxDepth,			"Prof. Max."			; Max. Depth    - max 10chars!
+	TCODE	tAvgDepth,			"Prof. Moy."			; average Depth - max 10chars!
+	TCODE	tDivetime,			"Durée"					; Divetime
+	TCODE	tDiveHudMask1,		"cell. 1"
+	TCODE	tDiveHudMask2,		"cell. 2"
+	TCODE	tDiveHudMask3,		"cell. 3"
+	TCODE	tDiveTotalAvg,		"Prof. Moy."
+	TCODE	tDiveStopwatch,		"Chrono"
+	TCODE	tDiveStopAvg,		"P.Moy.Chron"			; 11 chars max
+	TCODE	tApnoeTotal,		"Totale"				; Total (six chars, right aligned)
+	TCODE	tApnoeMax,			"Dern.Plongée"			; Last Descend
+	TCODE	tApnoeSurface,		"Tps.Surface"			; Surface Time
+	TCODE	tTime,				"Time"					; Time							## pending translation
+	TCODE	tSurface,			"Surface"				; Surface (max 12 chars)		## pending translation
+	TCODE	tDiveDecoplan,		"Runtime"				; Decoplan
+;	TCODE	tDiveClock,			"Heure"					; Clock
+	TCODE	tDiveEAD_END,		"EAD/END"				; EAD/END
+	TCODE	tDiveTissues,		"Tissus"				; Tissues
+	TCODE	tEND,				"END:"					; END:
+	TCODE	tHe,				"He"					; He
+	TCODE	tN2,				"N2"					; N2
+	TCODE	tDiveBailout,		"Bailout"				; Bailout
+	TCODE	tGFactors,			"Valeurs GF"			; GF Values
+	TCODE	taGFactors,			"Valeurs aGF"			; aGF Values
+	TCODE	tGFInfo,			"   GF Info"			; GF Info
+	TCODE	tCeiling,			"Plafond"				; Ceiling
+	TCODE	tDiveSafetyStop,	"Stop"					; Stop (four chars, right aligned)
+	TCODE	tDiveFallback,		"Fallback!"				; Fallback! (max. nine chars)
+	TCODE	tDecoInfo,			"Zone Déco"				; Deco info
+	TCODE	tSensorCheck,		"Ctrl Cell. "			; Sensor Check
+	TCODE	tdil,				"Dil:"					; Diluent ppO2 Warning
+	TCODE	tmix,				"Mix:"					; Pre-Mix ppO2 Warning
+	TCODE	tSensorDisagree,	"Sensors<>"				; Sensors disagree Warning
+	TCODE	tGasNeedsWarn,		"Gas Needs"				;
+	TCODE	tGasNeedsAscent,	"Besoins Gaz Ascent"	;								## pending translation
+	TCODE	tCNSsurf,			"SNC Surf."				; CNS Surf.
+	TCODE	tCNSfTTS,			"SNC fDTR"				; CNS fTTS
+	TCODE	tCNSBO,				"SNC B/O"				; CNS B/O
+	TCODE	tCNSnow,			"SNC actuel"			; CNS now
+	TCODE	tCNSeod,			"SNC final"				; CNS fin
+	TCODE	tIBCD,				"CDI N2He"				; IBCD N2He
+	TCODE	tnoBOgas,			"-B/O-Gaz-"				;
+	TCODE	tMicroBubbles,		"M.Bulles "				;
+	TCODE	tCNS,				"SNC: "					;
+	TCODE	tgaschange,			"Change?"				; better gas found				## pending translation
+	TCODE	tNeed,				"Need "					; gas need (5 chars)			## pending translation
+	TCODE	tBattery,			"Batterie"				; Battery
+ IFDEF _rx_functions
+	TCODE	tTransmitter,		"P.Transm."				; pressure transmitter			## pending translation
+	TCODE	tPressure,			"Pres Bloc"				; tank pressure
+	TCODE	tSAC,				"SAC"					; SAC, must be 3 chars!
+	TCODE	tswap,				"Swap Tank"				; swap tank (max. 9 chars)		## pending translation
+ ENDIF
+ IFDEF _cave_mode
+	TCODE	tGasNeedsCaveMode,	"Besoins Gaz Cave Mode"	; title for gas needs custom view
+	TCODE	tDiveTurned,		"Dv.turned"				; dive is turned      (max. 9 char)	## pending translation
+	TCODE	tCaveMode,			"Cave Mode"				; cave mode activated (max. 9 char)
+	TCODE	tCaveModeShutdown,	"X-Cave-X"				; cave mode shut down (max. 9 char)
+ ENDIF
+
 ; Divemode menu
-	TCODE   tDivePreMenu,   "Menu ?"			; Menu?
-    TCODE   tSetHeading,    "Cap"				; Bearing (Max. seven chars)
+	TCODE	tDivePreMenu,		"Menu?"					; Menu?
+	TCODE	tSetHeading,		"Cap"					; Bearing (max. 6 chars)
 
 ; Simulator menu
-	TCODE	tQuitSim,	 "Fin ?"				; Quit Simulation?
+	TCODE	tQuitSim,			"Fin"					; Quit Simulation
 
 ; Logbook
-	TCODE	tCNS2,		"SNC:"
-	TCODE	tAVG,		"Moy:"
-	TCODE	tGF,		"GF:"
-	TCODE	tSAT,		"Sat:"					; Sat:
+	TCODE	tCNS2,				"SNC:"
+	TCODE	tAVG,				"Moy:"
+	TCODE	tGF,				"GF:"
+	TCODE	tSAT,				"Sat:"
 
 ; Logbook units
-	TCODE	tLogTunitC,	"°C"	
-	TCODE	tLogTunitF,	"°F"
-	TCODE	tKGL,		"kg/l"
-	TCODE	tMBAR,		"mbar"
+	TCODE	tLogTunitC,			"°C"
+	TCODE	tLogTunitF,			"°F"
+	TCODE	tKGL,				"kg/l"
+	TCODE	tMBAR,				"hPa"
 
 ; Logbook menu
-	TCODE	tNextLog, 	"Page Suivante"
-	
+	TCODE	tNextLog,			"Page Suivante"
+
 ; Reset menu
-	TCODE	tReboot,	"Redémarrage"			;Reboot
-	TCODE	tResetMenu2,"Confirmer ?"			;Are You Sure?
-	TCODE	tAbort,     "Quitter"				;Abort
-	TCODE	tResetSettings, "RaZ Complète"		;Reset All
-	TCODE	tResetDeco,	"RaZ Déco"				;Reset Deco
-    TCODE	tResetBattery,	"RaZ Batterie"		;Reset Battery
-    TCODE	tResetLogbook,	"RaZ Carnet"		;Reset Logbook
+	TCODE	tReboot,			"Redémarrage"			; Reboot
+	TCODE	tResetMenu2,		"Confirmer?"			; Are You Sure?
+	TCODE	tAbort,				"Quitter"				; Abort
+	TCODE	tResetSettings,		"RaZ Settings"			; Reset Settings				## pending translation
+	TCODE	tResetDeco,			"RaZ Déco"				; Reset Deco
+	TCODE	tResetBattery,		"RaZ Batterie"			; Reset Battery
+	TCODE	tResetLogbook,		"RaZ Carnet"			; Reset Logbook
 
 ; Set Time Menu/Set Date Menu
-	TCODE	tSetHours,	"Ajust. Heures"			; Set Hours
-	TCODE	tSetMinutes,"Ajust. Minutes"		; Set Minutes
-	TCODE	tSetSeconds,"RaZ Secondes"			; Clear Seconds
-	TCODE	tSetDay,	"Ajust. Jours"			; Set Day
-	TCODE	tSetMonth,	"Ajust. Mois"			; Set Month
-	TCODE	tSetYear,	"Ajust. Année"			; Set Year
+	TCODE	tSetHours,			"Ajust. Heures"			; Set Hours
+	TCODE	tSetMinutes,		"Ajust. Minutes"		; Set Minutes
+	TCODE	tSetSeconds,		"RaZ Secondes"			; Clear Seconds
+	TCODE	tSetDay,			"Ajust. Jours"			; Set Day
+	TCODE	tSetMonth,			"Ajust. Mois"			; Set Month
+	TCODE	tSetYear,			"Ajust. Année"			; Set Year
 
 ; Logbook Offset Menu
-	TCODE	tLogOffset,		"N° 1ère plongée"	; Logbook offset (Max. 15 Chars!)
-	TCODE	tLogOffsetp1,	"+1"				; +1
-	TCODE	tLogOffsetp10,	"+10"				; +10
-	TCODE	tLogOffsetm1,	"-1"				; -1
-	TCODE	tLogOffsetm10,	"-10"				; -10
+	TCODE	tLogOffset,			"N° 1ère plongée"		; Logbook offset (Max. 15 Chars!)
+	TCODE	tLogOffsetp1,		"+1"					; +1
+	TCODE	tLogOffsetp10,		"+10"					; +10
+	TCODE	tLogOffsetm1,		"-1"					; -1
+	TCODE	tLogOffsetm10,		"-10"					; -10
 
 ; Compass directions
-    TCODE   tN,             "N "                ; N(orth),338°-22°
-    TCODE   tNE,            "NE"                ; North-East,23°-67°
-    TCODE   tE,             "E "                ; E(east),68°-112°
-    TCODE   tSE,            "SE"                ; South-East,113°-157°
-    TCODE   tS,             "S "                ; S(outh),157°-202°
-    TCODE   tSW,            "SO"                ; South-West,203°-247°
-    TCODE   tW,             "O "                ; W(West),248°-292°
-    TCODE   tNW,            "NO"                ; North-West,293°-337°
+	TCODE	tN,					"N "					; N(orth),    338°-22°
+	TCODE	tNE,				"NE"					; North-East,  23°-67°
+	TCODE	tE,					"E "					; E(east),     68°-112°
+	TCODE	tSE,				"SE"					; South-East, 113°-157°
+	TCODE	tS,					"S "					; S(outh),    157°-202°
+	TCODE	tSW,				"SO"					; South-West, 203°-247°
+	TCODE	tW,					"O "					; W(West),    248°-292°
+	TCODE	tNW,				"NO"					; North-West, 293°-337°
 
 ; Color Scheme menu
-    TCODE   tColorScheme,   "Jeu de Couleurs"   ; Colour scheme
-    TCODE   tColorSetDive,  "Mode Plongée:"     ; Divemode:
-    TCODE   tColorSetName0, "Blanc"             ; White
-    TCODE   tColorSetName1, "Rouge"             ; Red
-    TCODE   tColorSetName2, "Vert"              ; Green
-    TCODE   tColorSetName3, "Bleu"              ; Blue
+	TCODE	tColorScheme,		"Jeu de Couleurs"		; Colour scheme
+	TCODE	tColorSetDive,		"Mode Plongée:"			; Divemode:
+	TCODE	tColorSetName0,		"Blanc"					; White
+	TCODE	tColorSetName1,		"Rouge"					; Red
+	TCODE	tColorSetName2,		"Vert"					; Green
+	TCODE	tColorSetName3,		"Bleu"					; Blue
 
 ; PSCR Menu and Settings
-    TCODE   tPSCRMenu,	    "Menu PSCR"			; PSCR Menu
-    TCODE   tPSCR_O2_drop,  "O2 drop:"			; O2 drop
-    TCODE   tPSCR_lungratio,"Lung ratio:"		; lung ratio
+	TCODE	tPSCRMenu,			"Menu pSCR"				; PSCR Menu
+	TCODE	tPSCR_O2_drop,		"O2 Drop    "			; O2 drop
+	TCODE	tPSCR_lungratio,	"Lung Ratio "			; lung ratio
+	TCODE	tBackToLoop,		"goto loop"				; back to loop (10 chars max)	### new
+
+
+; Language selection
+ IF _language_2!=none
+	TCODE	tLanguage,			"Langue: "				; used in menu_tree
+ ENDIF
+
+ IF _language_1==en
+	TCODE	tLang1,				"Anglais"				; tLang1 is 1st language, enum context
+ ELSE
+ IF _language_1==de
+	TCODE	tLang1,				"Allemand"
+ ELSE
+ IF _language_1==fr
+	TCODE	tLang1,				"Français"
+ ELSE
+ IF _language_1==it
+	TCODE	tLang1,				"Italien"
+ ELSE
+	TCODE	tLang1,				""						; dummy target for options table
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF
+
+ IF _language_2==en
+	TCODE	tLang2,				"Anglais"
+ ELSE
+ IF _language_2==de
+	TCODE	tLang2,				"Allemand"				; tLang2 is 2nd language, enum context
+ ELSE
+ IF _language_2==fr
+	TCODE	tLang2,				"Français"
+ ELSE
+ IF _language_2==it
+	TCODE	tLang2,				"Italien"
+ ENDIF
+ ENDIF
+ ENDIF
+ ENDIF