Merge branch 'master' into patch-1

Documentation/Menu.md

@@ -34,7 +34,7 @@ To calibrate your iron:
 4. Under the advanced submenu
 5. Select the calibrate voltage option
 6. Use the front and back buttons to adjust the displayed voltage to minimize the error to your original measurement
-7. Hold both buttons to save and exit to the menu
+7. Press both buttons at the same time to save and exit to the menu
 
 ### Calibrating tip offset (Set tip model)
 

Translations/translation_EN.json

@@ -97,9 +97,9 @@
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
-				"options"
+				"settings"
 			],
-			"desc": "Advanced options"
+			"desc": "Advanced settings"
 		}
 	},
 	"menuOptions": {
@@ -108,7 +108,7 @@
 				"Power",
 				"source"
 			],
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
+			"desc": "Power source. Sets cutoff voltage. (DC 10V) (S 3.3V per cell, disable power limit)"
 		},
 		"SleepTemperature": {
 			"text2": [
@@ -122,14 +122,14 @@
 				"Sleep",
 				"timeout"
 			],
-			"desc": "Interval before \"sleep mode\" kicks in <S=seconds | M=minutes>"
+			"desc": "Interval before \"sleep mode\" kicks in (S=seconds | M=minutes)"
 		},
 		"ShutdownTimeout": {
 			"text2": [
 				"Shutdown",
 				"timeout"
 			],
-			"desc": "Interval before the iron shuts down <M=minutes>"
+			"desc": "Interval before the iron shuts down (M=minutes)"
 		},
 		"MotionSensitivity": {
 			"text2": [
@@ -168,17 +168,17 @@
 		},
 		"AutoStart": {
 			"text2": [
-				"Auto",
+				"Heat",
-				"start"
+				"on power up"
 			],
-			"desc": "Starts the iron into soldering mode on power up <O=off | S=soldering | Z=sleep | R=sleep at room temperature>"
+			"desc": "O=off | S=soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
 		},
 		"CooldownBlink": {
 			"text2": [
 				"Cooldown",
 				"blink"
 			],
-			"desc": "Flash the temperature after heating was halted, while the tip is still hot"
+			"desc": "Flash the temperature reading after heating was halted while the tip is still hot"
 		},
 		"TemperatureCalibration": {
 			"text2": [
@@ -199,7 +199,7 @@
 				"Calibrate",
 				"input voltage?"
 			],
-			"desc": "Start VIN calibration <long press to exit>"
+			"desc": "Start VIN calibration (long press to exit)"
 		},
 		"AdvancedSoldering": {
 			"text2": [
@@ -213,21 +213,21 @@
 				"Scrolling",
 				"speed"
 			],
-			"desc": "Speed info text scrolls past at <S=slow | F=fast>"
+			"desc": "Speed info text scrolls past at (S=slow | F=fast)"
 		},
 		"QCMaxVoltage": {
 			"text2": [
 				"QC",
 				"voltage"
 			],
-			"desc": "Desired max QC voltage the iron negotiates for"
+			"desc": "Max QC voltage the iron should negotiate for"
 		},
 		"PowerLimit": {
 			"text2": [
 				"Power",
 				"limit"
 			],
-			"desc": "Maximum power the iron can use <W=watt>"
+			"desc": "Maximum power the iron can use (W=watt)"
 		},
 		"ReverseButtonTempChange": {
 			"text2": [
@@ -255,28 +255,28 @@
 				"Power",
 				"pulse"
 			],
-			"desc": "Intensity of power of keep-awake-pulse <watt>"
+			"desc": "Intensity of power of keep-awake-pulse (watt)"
 		},
 		"HallEffSensitivity": {
 			"text2": [
 				"Hall sensor",
 				"sensitivity"
 			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep <O=off | L=low | M=medium | H=high>"
+			"desc": "Sensitivity of the Hall effect sensor to detect sleep (O=off | L=low | M=medium | H=high)"
 		},
 		"LockingMode": {
 			"text2": [
 				"Allow locking",
 				"buttons"
 			],
-			"desc": "When soldering, long press both buttons, to lock them <D=disable | B=\"boost mode\" only | F=full locking>"
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
 		},
 		"MinVolCell": {
 			"text2": [
 				"Minimum",
 				"voltage"
 			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+			"desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -290,7 +290,7 @@
 				"Anim.",
 				"speed"
 			],
-			"desc": "Pace of icon animations in menu <O=off | S=slow | M=medium | F=fast>"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
 		},
 		"PowerPulseWait": {
 			"text2": [

Translations/translation_FR.json

@@ -19,8 +19,8 @@
 		"WarningSimpleString": "CHAUD !",
 		"WarningAdvancedString": "ATTENTION ! CHAUD !",
 		"SleepingTipAdvancedString": "Panne : ",
-		"IdleTipString": "Act : ",
+		"IdleTipString": "Act :",
-		"IdleSetString": "Reg : ",
+		"IdleSetString": "Reg :",
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance : ",
 		"OffString": "Off",
@@ -37,8 +37,8 @@
 			"non détecté !"
 		],
 		"NoPowerDeliveryMessage": [
-			"Pas d'USB-PD",
+			"USB-PD",
-			"détecté !"
+			"non détecté !"
 		],
 		"LockingKeysString": "VERROUIL",
 		"UnlockingKeysString": "DEVERROU",
@@ -136,14 +136,14 @@
 				"Sensibilité",
 				"au mouvement"
 			],
-			"desc": "0=inactif | 1=peu sensible | ... | 9=très sensible"
+			"desc": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
 		},
 		"TemperatureUnit": {
 			"text2": [
 				"Unité de",
 				"température"
 			],
-			"desc": "Unité de température <C=Celsius | F=Fahrenheit>"
+			"desc": "C=Celsius | F=Fahrenheit"
 		},
 		"AdvancedIdle": {
 			"text2": [
@@ -157,7 +157,7 @@
 				"Orientation",
 				"de l'écran"
 			],
-			"desc": "Orientation de l'affichage <A=automatique | G=gaucher | D=droitier>"
+			"desc": "A=automatique | G=gaucher | D=droitier"
 		},
 		"BoostTemperature": {
 			"text2": [
@@ -269,7 +269,7 @@
 				"Sensibilité",
 				"capteur effet hall"
 			],
-			"desc": "Sensibilité du capteur à effet Hall lors de la détection de mise en veille <D=désactivé | B=basse | M=moyenne | H=haute>"
+			"desc": "Sensibilité du capteur à effet Hall pour la mise en veille <D=désactivé | B=basse | M=moyenne | H=haute>"
 		},
 		"MinVolCell": {
 			"text2": [
@@ -297,7 +297,7 @@
 				"Délai entre",
 				"les impulsions"
 			],
-			"desc": "Délai entre chaque impulsions pour empêcher la mise en veille (x 2.5s)"
+			"desc": "Délai entre chaque impulsion pour empêcher la mise en veille (x 2.5s)"
 		},
 		"PowerPulseDuration": {
 			"text2": [