Merge branch 'master' into pinecil

Translation Editor/translation_bg.json

@@ -23,7 +23,10 @@
 		"OffString": "Изкл.",
 		"ResetOKMessage": "Нулиране завършено",
 		"YourGainMessage": "Усилване:",
-		"SettingsResetMessage": "Настройките бяха\nнулирани!"
+		"SettingsResetMessage": "Настройките бяха\nнулирани!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -239,7 +245,7 @@
 			],
 			"desc": "Промяна на температура при задържане на бутон!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Захранващ",
 				"импулс"
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_cs.json

@@ -23,7 +23,10 @@
 		"OffString": "Vyp",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Zisk:",
-		"SettingsResetMessage": "Tov. nas. obnov."
+		"SettingsResetMessage": "Tov. nas. obnov.",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_da.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "S",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_de.json

@@ -24,7 +24,10 @@
 		"OffString": "Aus",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your Gain:",
-		"SettingsResetMessage": "Einstellungen\nzurück gesetzt!"
+		"SettingsResetMessage": "Einstellungen\nzurück gesetzt!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -36,10 +39,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -232,8 +238,7 @@
 				"Taste kurz?"
 			],
 			"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
-		}
+		},
-		,
 		"TempChangeLongStep": {
 			"text2": [
 				"T. Schritt",
@@ -241,7 +246,7 @@
 			],
 			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -261,6 +266,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -24,7 +24,10 @@
 		"OffString": "Off",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:",
-		"SettingsResetMessage": "Settings were\nreset!"
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -36,10 +39,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -240,7 +246,7 @@
 			],
 			"desc": "Temperature change steps on long button press"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -260,6 +266,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_es.json

@@ -23,7 +23,10 @@
 		"OffString": " No",
 		"ResetOKMessage": "Hecho.       ",
 		"YourGainMessage": "Gananc.:",
-		"SettingsResetMessage": "Ajustes borrados"
+		"SettingsResetMessage": "Ajustes borrados",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "R",
 		"SettingStartSleepOffChar": "F",
 		"SettingStartNoneChar": "N",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_fi.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "O",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -16,12 +16,17 @@
 		"WarningSimpleString": "CHAUD!",
 		"WarningAdvancedString": "ATTENTION! CHAUD!",
 		"SleepingTipAdvancedString": "Panne:",
-		"IdleTipString": "Tip:",
+		"IdleTipString": "Act:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Reg:",
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Gain:",
+		"SettingsResetMessage": "Réglage réinit.!",
+		"LockingKeysString": "VERROUIL",
+		"UnlockingKeysString": "DEVERROU",
+		"WarningKeysLockedString": "! VERR.!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "V",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "D",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "V"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -183,8 +191,8 @@
 		},
 		"TipModel": {
 			"text2": [
-				"Panne",
+				"Modèle de",
-				"Modèle"
+				"la panne"
 			],
 			"desc": "Sélection du modèle de la panne"
 		},
@@ -212,44 +220,51 @@
 		"PowerLimit": {
 			"text2": [
 				"Puissance",
-				"Limite"
+				"limite"
 			],
 			"desc": "Puissance maximale utilisable <Watts>"
 		},
 		"ReverseButtonTempChange": {
 			"text2": [
-				"Key +-",
+				"Inverser les",
-				"Inverser?"
+				"touches + - ?"
 			],
 			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
 		},
 		"TempChangeShortStep": {
 			"text2": [
-				"Temp change",
+				"Incrément",
-				"Court?"
+				"appui court"
 			],
 			"desc": "Incrément de changement de température sur appui court."
 		},
 		"TempChangeLongStep": {
 			"text2": [
-				"Temp change",
+				"Incrément",
-				"Long?"
+				"appui long"
 			],
 			"desc": "Incrément de changement de température sur appui long."
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
-				"Power",
+				"Puissance des",
-				"Pulse W"
+				"impulsion W"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries"
 		},
 		"TipGain": {
 			"text2": [
-				"Modify",
+				"Modifier",
-				"tip gain"
+				"gain panne"
 			],
-			"desc": "Tip gain"
+			"desc": "Modifier le gain de la panne"
+		},
+		"LockingMode": {
+			"text2": [
+				"Autoriser le",
+				"verrouillage"
+			],
+			"desc": "Permet de verrouiller les touches pendant la soudure sur un appuis long des 2 bouttons <D=Désactiver, B=Boost seulement, V=Verr. total>"
 		},
 		"HallEffSensitivity": {
 			"text2": [

Translation Editor/translation_hr.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_hu.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
 		"OffString": "Ki",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "J",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Telj power",
 				"bank üzem W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_it.json

@@ -23,7 +23,10 @@
 		"OffString": "OFF",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Guad.: ",
-		"SettingsResetMessage": "Reset effettuato"
+		"SettingsResetMessage": "Reset effettuato",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "D",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_lt.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
 		"OffString": "Išj",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_nl.json

@@ -3,25 +3,30 @@
 	"languageLocalName": "Nederlands",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Calibratie klaar!",
-		"SettingsCalibrationWarning": "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!",
+		"SettingsCalibrationWarning": "Zorg ervoor dat te punt op kamertemperatuur is voor je verder gaat!",
-		"SettingsResetWarning": "Ben je zeker dat je alle instellingen naar de standaardwaardes wilt terugzetten?",
+		"SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wil zetten?",
-		"UVLOWarningString": "DC LAAG",
+		"UVLOWarningString": "DC Laag",
 		"UndervoltageString": "Onderspanning",
 		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Punt temp: ",
-		"BadTipString": "DEFECT",
+		"BadTipString": "DEFECTE PUNT",
-		"SleepingSimpleString": "Zzz ",
+		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Slaapstand...",
-		"WarningSimpleString": "HEET",
+		"WarningSimpleString": "HEET!",
-		"WarningAdvancedString": "!!! TIP HEET !!!",
+		"WarningAdvancedString": "!!! PUNT HOT !!!",
-		"SleepingTipAdvancedString": "Tip:",
+		"SleepingTipAdvancedString": "Punt:",
-		"IdleTipString": "Tip:",
+		"IdleTipString": "Punt:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Zet:",
-		"TipDisconnectedString": "TIP LOSGEKOPPELD",
+		"TipDisconnectedString": "PUNT LOSGEKOPPELT",
-		"SolderingAdvancedPowerPrompt": "vermogen: ",
+		"SolderingAdvancedPowerPrompt": "Vermogen: ",
-		"OffString": "Off",
+		"OffString": "Uit",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Niveau:",
+		"SettingsResetMessage": "Instellingen zijn\ngereset!",
+		"LockingKeysString": " GEBLOKKEERD",
+		"UnlockingKeysString": "GEDEBLOKKEERD",
+		"WarningKeysLockedString": "!GEBLOKKEERD!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingLockDisableChar": "U",
-		"SettingSensitivityLow":"L",
+		"SettingLockBoostChar": "B",
-		"SettingSensitivityMedium":"M",
+		"SettingLockFullChar": "V",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -44,28 +52,28 @@
 				"Soldeer",
 				"Instellingen"
 			],
-			"desc": "Soldeerinstellingen"
+			"desc": "Soldeer instellingen"
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Slaap",
 				"Modes"
 			],
-			"desc": "Batterijbesparingsinstellingen"
+			"desc": "Stroom besparings instellingen"
 		},
 		"UIMenu": {
 			"text2": [
 				"Gebruikers-",
-				"Interface"
+				"interface"
 			],
-			"desc": "Gebruikersinterface Instellingen"
+			"desc": "Gebruikers-interface instellingen"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"geavanceerde",
+				"Geavanceerde",
 				"Instellingen"
 			],
-			"desc": "geavanceerde Instellingen"
+			"desc": "Geavanceerde Instellingen"
 		}
 	},
 	"menuOptions": {
@@ -81,14 +89,14 @@
 				"Slaap",
 				"temp"
 			],
-			"desc": "Temperatuur in slaapstand <C>"
+			"desc": "Temperatuur in slaapstand"
 		},
 		"SleepTimeout": {
 			"text2": [
 				"Slaap",
 				"time-out"
 			],
-			"desc": "Slaapstand time-out <Minuten/Seconden>"
+			"desc": "Slaap time-out <Minuten/Seconden>"
 		},
 		"ShutdownTimeout": {
 			"text2": [
@@ -102,7 +110,7 @@
 				"Bewegings-",
 				"gevoeligheid"
 			],
-			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
+			"desc": "Bewegingsgevoeligheid <0=uit 1=minst gevoelig 9=meest gevoelig>"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -114,30 +122,30 @@
 		"AdvancedIdle": {
 			"text2": [
 				"Gedetailleerd",
-				"slaapscherm"
+				"startscherm"
 			],
-			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm."
+			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het startscherm."
 		},
 		"DisplayRotation": {
 			"text2": [
 				"Scherm-",
 				"oriëntatie"
 			],
-			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
+			"desc": "Schermoriëntatie <A=Automatisch L=Linkshandig R=Rechtshandig>"
 		},
 		"BoostTemperature": {
 			"text2": [
 				"Boost",
 				"temp"
 			],
-			"desc": "Temperatuur in boostmodes"
+			"desc": "Temperatuur in boostmode"
 		},
 		"AutoStart": {
 			"text2": [
 				"Auto",
 				"start"
 			],
-			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
+			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. <T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit>"
 		},
 		"CooldownBlink": {
 			"text2": [
@@ -165,7 +173,7 @@
 				"Calibreer",
 				"input-voltage?"
 			],
-			"desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen."
+			"desc": "VIN Calibreren. <druk lang om te sluiten>."
 		},
 		"AdvancedSoldering": {
 			"text2": [
@@ -183,73 +191,73 @@
 		},
 		"TipModel": {
 			"text2": [
-				"Tip",
+				"Punt",
 				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Punt Model selecteren"
 		},
 		"SimpleCalibrationMode": {
 			"text2": [
-				"Simple",
+				"Simpele",
-				"Calibration"
+				"Calibratie"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Simpele Calibratie met warm water"
 		},
 		"AdvancedCalibrationMode": {
 			"text2": [
-				"Advanced",
+				"Geavanceerde",
-				"Calibration"
+				"Calibratie"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Geavanceerde calibratie met een thermokoppel op de punt"
 		},
 		"PowerInput": {
 			"text2": [
 				"Power",
 				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Wattage van de gebruikte voeding"
 		},
 		"PowerLimit": {
 			"text2": [
-				"Power",
+				"Vermogen",
-				"Limit"
+				"limiet"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maximaal vermogen <Watts>"
 		},
 		"ReverseButtonTempChange": {
 			"text2": [
-				"Key +-",
+				"Draai",
-				"reverse?"
+				"+ - knoppen om"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Keer de +- knoppen om de termperatuur van de punt te regelen om."
 		},
 		"TempChangeShortStep": {
 			"text2": [
-				"Temp change",
+				"Temp veranderen",
-				"short?"
+				"kort"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Temperatuur verandering bij kort drukken"
 		},
 		"TempChangeLongStep": {
 			"text2": [
-				"Temp change",
+				"Temp veranderen",
-				"long?"
+				"lang"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Temperatuur verandering bij lang drukken"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
-				"Power",
+				"Vermogen",
-				"Pulse W"
+				"Puls W"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Vermogen van puls om soldeerbout aan te houden"
 		},
 		"TipGain": {
 			"text2": [
-				"Modify",
+				"Verander",
-				"tip gain"
+				"punt gain"
 			],
-			"desc": "Tip gain"
+			"desc": "Punt gain"
 		},
 		"HallEffSensitivity": {
 			"text2": [
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blokkeer",
+				"knoppen"
+			],
+			"desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. <U=Uit, B=Alleen boost, V=Volledig blokkeren>"
 		}
 	}
 }

Translation Editor/translation_nl_be.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
 		"OffString": "Uit",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_no.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "I",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -24,7 +24,10 @@
 		"OffString": "Wyłącz",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Twój zysk:",
-		"SettingsResetMessage": "Ustawienia zostały\nzresetowane!"
+		"SettingsResetMessage": "Ustawienia zostały\nzresetowane!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -36,10 +39,13 @@
 		"SettingStartSleepChar": "Z",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "B",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -240,7 +246,7 @@
 			],
 			"desc": "Zmiany temperatury krok po korku, po długim naciśnięciu przycisku"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Moc pulsu",
 				"w W"
@@ -260,6 +266,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_pt.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_ru.json

@@ -23,7 +23,10 @@
 		"OffString": "Выкл.",
 		"ResetOKMessage": "Сброс OK",
 		"YourGainMessage": "Прирост:",
-		"SettingsResetMessage": "Настройки сброшены!"
+		"SettingsResetMessage": "Настройки сброшены!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "О",
 		"SettingStartSleepOffChar": "К",
 		"SettingStartNoneChar": "В",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -239,7 +245,7 @@
 			],
 			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sk.json

@@ -23,7 +23,10 @@
 		"OffString": "Vyp",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Zisk:",
-		"SettingsResetMessage": "Nast. Obnovené!"
+		"SettingsResetMessage": "Nast. Obnovené!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "K",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "N",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sl.json

@@ -22,7 +22,11 @@
 		"SolderingAdvancedPowerPrompt": "Moč: ",
 		"OffString": "Izk",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Ojačan.:"
+		"YourGainMessage": "Ojačan.:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -34,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -238,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -258,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sr_cyrl.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
 		"OffString": "Иск",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sr_latn.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Isk",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sv.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_tr.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "UÇ ÇIKARILDI",
 		"SolderingAdvancedPowerPrompt": "Güç: ",
 		"OffString": "Kapalı",
-		"ResetOKMessage": "Reset Tamam"
+		"ResetOKMessage": "Reset Tamam",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -33,10 +38,13 @@
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
 		"SettingStartNoneChar": "F",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -237,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -257,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_uk.json

@@ -23,7 +23,10 @@
 		"OffString": "Вимк",
 		"ResetOKMessage": "Скидання OK",
 		"YourGainMessage": "Приріст:",
-		"SettingsResetMessage": "Налаштування скинуті!"
+		"SettingsResetMessage": "Налаштування скинуті!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
@@ -35,10 +38,13 @@
 		"SettingStartSleepChar": "О",
 		"SettingStartSleepOffChar": "К",
 		"SettingStartNoneChar": "В",
-		"SettingSensitivityOff":"O",
+		"SettingSensitivityOff": "O",
-		"SettingSensitivityLow":"L",
+		"SettingSensitivityLow": "L",
-		"SettingSensitivityMedium":"M",
+		"SettingSensitivityMedium": "M",
-		"SettingSensitivityHigh":"H"
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -239,7 +245,7 @@
 			],
 			"desc": "Змінювати температуру при довгому натисканні!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Пульс.",
 				"Навантаж."
@@ -259,6 +265,13 @@
 				"Sensitivity"
 			],
 			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translations_def.js

@@ -94,6 +94,21 @@ var def =
 			"id": "SettingsResetMessage",
 			"maxLen": 16,
 			"default": "Settings were\nreset!"
+		},
+		{
+			"id": "LockingKeysString",
+			"maxLen": 8,
+			"default": "LOCKING"
+		},
+		{
+			"id": "UnlockingKeysString",
+			"maxLen": 8,
+			"default": "UNLOCK"
+		},
+		{
+			"id": "WarningKeysLockedString",
+			"maxLen": 8,
+			"default": "LOCKED!"
 		}
 	],
 	"characters": [
@@ -148,6 +163,20 @@ var def =
 		{
 			"id": "SettingSensitivityHigh",
 			"len": 1
+		}, {
+			"id": "SettingLockDisableChar",
+			"len": 1,
+			"default": "D"
+		},
+		{
+			"id": "SettingLockBoostChar",
+			"len": 1,
+			"default": "B"
+		},
+		{
+			"id": "SettingLockFullChar",
+			"len": 1,
+			"default": "F"
 		}
 	],
 	"menuGroups": [
@@ -303,6 +332,10 @@ var def =
 			"id": "HallEffSensitivity",
 			"maxLen": 6,
 			"maxLen2": 8
+		}, {
+			"id": "LockingMode",
+			"maxLen": 6,
+			"maxLen2": 13
 		}
 	]
 }

workspace/TS100/Core/Drivers/Buttons.cpp

@@ -42,7 +42,7 @@ ButtonState getButtonState() {
 			else if (currentState == 0x02)
 				return BUTTON_B_LONG;
 			else
-				return BUTTON_NONE; // Both being held case, we dont long hold this
+				return BUTTON_BOTH_LONG; // Both being held case
 		} else
 			return BUTTON_NONE;
 	} else {

workspace/TS100/Core/Drivers/Buttons.hpp

@@ -17,6 +17,7 @@ enum ButtonState {
 	BUTTON_F_LONG = 4, /* User is  holding the front button*/
 	BUTTON_B_LONG = 8, /* User is  holding the back button*/
 	BUTTON_BOTH = 16, /* User has pressed both buttons*/
+	BUTTON_BOTH_LONG = 32, /* User is holding both buttons*/
 
 /*
  * Note:

workspace/TS100/Core/Inc/Settings.h

@@ -11,7 +11,7 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "unit.h"
-#define SETTINGSVERSION   ( 0x21 )
+#define SETTINGSVERSION (0x22)
 /*Change this if you change the struct below to prevent people getting \
           out of sync*/
 
@@ -19,27 +19,29 @@
  * This struct must be a multiple of 2 bytes as it is saved / restored from
  * flash in uint16_t chunks
  */
-typedef struct {
+typedef struct
+{
 	uint8_t version; // Used to track if a reset is needed on firmware upgrade
 
 	uint16_t SolderingTemp;		 // current set point for the iron
 	uint16_t SleepTemp;			 // temp to drop to in sleep
 	uint8_t SleepTime;			 // minutes timeout to sleep
 	uint8_t cutoutSetting;		 // The voltage we cut out at for under voltage OR Power level for TS80
-	uint8_t OrientationMode :2; // If true we want to invert the display for lefties
+	uint8_t OrientationMode : 2; // If true we want to invert the display for lefties
-	uint8_t sensitivity :4;  // Sensitivity of accelerometer (5 bits)
+	uint8_t sensitivity : 4;	 // Sensitivity of accelerometer (5 bits)
-	uint8_t autoStartMode :2;  // Should the unit automatically jump straight
+	uint8_t autoStartMode : 2;	 // Should the unit automatically jump straight
 								 // into soldering mode when power is applied
 	uint8_t ShutdownTime;		 // Time until unit shuts down if left alone
 
-	uint8_t coolingTempBlink :1;  // Should the temperature blink on the cool
+	uint8_t coolingTempBlink : 1;  // Should the temperature blink on the cool
 								   // down screen until its <50C
-	uint8_t detailedIDLE :1;       // Detailed idle screen
+	uint8_t detailedIDLE : 1;	   // Detailed idle screen
-	uint8_t detailedSoldering :1;  // Detailed soldering screens
+	uint8_t detailedSoldering : 1; // Detailed soldering screens
 #ifdef ENABLED_FAHRENHEIT_SUPPORT
-	uint8_t temperatureInF :1;       // Should the temp be in F or C (true is F)
+	uint8_t temperatureInF : 1; // Should the temp be in F or C (true is F)
 #endif
-	uint8_t descriptionScrollSpeed :1;  // Description scroll speed
+	uint8_t descriptionScrollSpeed : 1; // Description scroll speed
+	uint8_t lockingMode : 2;			// Store the locking mode
 	uint8_t KeepAwakePulse;				// Keep Awake pulse power in 0.1 watts (10 = 1Watt)
 
 	uint16_t voltageDiv;		// Voltage divisor factor
@@ -55,6 +57,7 @@ typedef struct {
 	uint16_t TempChangeLongStep;			// Change the plus and minus button assigment
 	uint16_t TempChangeShortStep;			// Change the plus and minus button assigment
 	uint8_t hallEffectSensitivity;			//Operating mode of the hall effect sensor
+
 	uint32_t padding; // This is here for in case we are not an even divisor so
 					  // that nothing gets cut off
 					  //MUST BE LAST

workspace/TS100/Core/Inc/Translation.h

@@ -15,8 +15,8 @@ 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 char *SettingsShortNames[28][2];
+extern const char *SettingsShortNames[29][2];
-extern const char *SettingsDescriptions[28];
+extern const char *SettingsDescriptions[29];
 extern const char *SettingsMenuEntries[4];
 
 extern const char *SettingsCalibrationDone;
@@ -41,6 +41,9 @@ extern const char *OffString;
 extern const char *ResetOKMessage;
 extern const char *YourGainMessage;
 extern const char *SettingsResetMessage;
+extern const char *LockingKeysString;
+extern const char *UnlockingKeysString;
+extern const char *WarningKeysLockedString;
 
 extern const char *SettingTrueChar;
 extern const char *SettingFalseChar;
@@ -55,6 +58,9 @@ extern const char *SettingSensitivityOff;
 extern const char *SettingSensitivityLow;
 extern const char *SettingSensitivityMedium;
 extern const char *SettingSensitivityHigh;
+extern const char *SettingLockDisableChar;
+extern const char *SettingLockBoostChar;
+extern const char *SettingLockFullChar;
 
 extern const char *SettingFastChar;
 extern const char *SettingSlowChar;

workspace/TS100/Core/Src/Settings.cpp

@@ -65,6 +65,7 @@ void resetSettings() {
 	systemSettings.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off
 	systemSettings.BoostTemp = BOOST_TEMP;    // default to 400C
 	systemSettings.autoStartMode = AUTO_START_MODE; // Auto start off for safety
+	systemSettings.lockingMode = LOCKING_MODE; // Disable locking for safety
 	systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C
 #ifdef ENABLED_FAHRENHEIT_SUPPORT
 			systemSettings.temperatureInF = TEMPERATURE_INF;          // default to 0

workspace/TS100/Core/Threads/GUIThread.cpp

@@ -432,8 +432,10 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	 * PID control
 	 * --> Long hold back button to exit
 	 * --> Double button to exit
+	 * --> Long hold double button to toggle key lock
 	 */
 	bool boostModeOn = false;
+	bool buttonsLocked = false;
 
 	if (jumpToSleep) {
 		if (gui_SolderingSleepingMode(jumpToSleep == 2)) {
@@ -443,6 +445,45 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	}
 	for (;;) {
 		ButtonState buttons = getButtonState();
+		if (buttonsLocked && (systemSettings.lockingMode != 0)) { // If buttons locked
+			switch (buttons) {
+			case BUTTON_NONE:
+				// stay
+				boostModeOn = false;
+				break;
+			case BUTTON_BOTH_LONG:
+				// Unlock buttons
+				buttonsLocked = false;
+				OLED::setCursor(0, 0);
+				OLED::clearScreen();
+				OLED::setFont(0);
+				OLED::print(UnlockingKeysString);
+				OLED::refresh();
+				waitForButtonPressOrTimeout(1000);
+				break;
+			case BUTTON_F_LONG:
+				// if boost mode is enabled turn it on
+				if (systemSettings.BoostTemp && (systemSettings.lockingMode == 1)) {
+					boostModeOn = true;
+					break;
+				};
+				// fall through
+			case BUTTON_BOTH:
+			case BUTTON_B_LONG:
+			case BUTTON_F_SHORT:
+			case BUTTON_B_SHORT:
+				// Do nothing and display a lock warming
+				OLED::setCursor(0, 0);
+				OLED::clearScreen();
+				OLED::setFont(0);
+				OLED::print(WarningKeysLockedString);
+				OLED::refresh();
+				waitForButtonPressOrTimeout(500);
+				break;
+			default:
+				break;
+			}
+		} else { // Button not locked
 			switch (buttons) {
 				case BUTTON_NONE:
 				// stay
@@ -469,9 +510,22 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 					}
 				}
 				break;
+				case BUTTON_BOTH_LONG:
+					if (systemSettings.lockingMode != 0) {
+						// Lock buttons
+						buttonsLocked = true;
+						OLED::setCursor(0, 0);
+						OLED::clearScreen();
+						OLED::setFont(0);
+						OLED::print(LockingKeysString);
+						OLED::refresh();
+						waitForButtonPressOrTimeout(1000);
+					}
+					break;
 				default:
 				break;
 			}
+		}
 		// else we update the screen information
 		OLED::setCursor(0, 0);
 		OLED::clearScreen();

workspace/TS100/configuration.h

@@ -40,6 +40,16 @@
  */
 #define AUTO_START_MODE 0 // Default to none
 
+/**
+ * Locking Mode
+ * When in soldering mode a long press on both keys toggle the lock of the buttons
+ * Possible values are:
+ *  0 - Desactivated
+ *  1 - Lock except boost
+ *  2 - Full lock
+ */
+#define LOCKING_MODE           0         // Default to desactivated for safety
+
 /**
  * OLED Orientation
  *