diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
index c32fdd54..19364d60 100644
--- a/Translations/translation_BE.json
+++ b/Translations/translation_BE.json
@@ -8,7 +8,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Перад тым, як працягнуць, каліласка, упэўнецеся, што джала мае комнатную тэмпературу!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Вы ўпэннены, што жадаеце зкінуць налады да першапачатковых значэнняў?",
 		"UVLOWarningString": "НАПРУГА--",
 		"UndervoltageString": "Нізкая напруга",
@@ -67,35 +67,35 @@
 				"Налады",
 				"сілкавання"
 			],
-			"desc": "Крыніца сілкавання і мінімальная напруга на ячэйку"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Налады",
 				"пайкі"
 			],
-			"desc": "Налады пайкі"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Рэжымы",
 				"сну"
 			],
-			"desc": "Налады рэжыму чакання"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Налады",
 				"інтэрфейсу"
 			],
-			"desc": "Карыстальніцкія налады знешняга выгляду"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дадатковыя",
 				"налады"
 			],
-			"desc": "Дадатковыя налады"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -106,6 +106,69 @@
 			],
 			"desc": "Крыніца сілкавання. Усталюе напругу адсечкі. (DC 10В) (S 3,3В на ячэйку, без абмежавання магутнасці)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Мін.",
+				"напр."
+			],
+			"desc": "Мінімальная дазволеная напруга на ячэйку (3S: 3 - 3,7V | 4S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Магутнасць",
+				"сілкавання"
+			],
+			"desc": "Магутнасць выкарыстоўваемай крыніцы сілкавання"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"прыпынак"
+			],
+			"desc": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"t° турба",
+				"рэжыму"
+			],
+			"desc": "Тэмпература джала ў турба-рэжыме"
+		},
+		"AutoStart": {
+			"text2": [
+				"Аўта",
+				"старт"
+			],
+			"desc": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (В=Выкл. | П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Крок тэмп.",
+				"кар. нац."
+			],
+			"desc": "Крок вымярэння тэмпературы пры кароткім націску кнопак"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Крок тэмп.",
+				"пад. нац."
+			],
+			"desc": "Крок вымярэння тэмпературы пры падоўжаным націску кнопак"
+		},
+		"LockingMode": {
+			"text2": [
+				"Дазволіць",
+				"блок. кнопак"
+			],
+			"desc": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (А=Адключана | Т=Толькі турба | П=Поўная блакіроўка)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Адчувальнасць",
+				"акселерометра"
+			],
+			"desc": "Адчувальнасць акселерометра (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Тэмп.",
@@ -127,12 +190,12 @@
 			],
 			"desc": "Час да адключэння паяльніка (Хвіліны)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Адчувальнасць",
-				"акселерометра"
+				"Эфект Хола",
+				"адчувальнасць"
 			],
-			"desc": "Адчувальнасць акселерометра (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
+			"desc": "Узровень адчувальнасці датчыка хола ў рэжыме сну (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -141,13 +204,6 @@
 			],
 			"desc": "Адзінкі вымярэння тэмпературы (C=Цэльcія | F=Фарэнгейта)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Падрабязны",
-				"рэжым чакання"
-			],
-			"desc": "Адлюстроўваць дэталёвую инфармацыю паменьшаным шрыфтом на экране чакання"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Арыентацыя",
@@ -155,20 +211,6 @@
 			],
 			"desc": "Арыентацыя экрану (П=Правая рука | Л=Левая рука | А=Аўта)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"t° турба",
-				"рэжыму"
-			],
-			"desc": "Тэмпература джала ў турба-рэжыме"
-		},
-		"AutoStart": {
-			"text2": [
-				"Аўта",
-				"старт"
-			],
-			"desc": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (В=Выкл. | П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Мігценне t°",
@@ -176,34 +218,6 @@
 			],
 			"desc": "Міргаць тэмпературай на экране астуджэння, пакуль джала яшчэ гарачае"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Каліброўка",
-				"тэмпературы"
-			],
-			"desc": "Каліброўка тэрмадатчыка джала"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Скід",
-				"наладаў"
-			],
-			"desc": "Скід наладаў да першапачатковых значэнняў"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Каліброўка",
-				"напругі"
-			],
-			"desc": "Каліброўка ўваходнай напругі (падоўжаны націск для выхаду)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Падрабязны",
-				"экран пайкі"
-			],
-			"desc": "Паказваць дэталёвую інформацыю на экране пайкі"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Хуткацсь",
@@ -211,27 +225,6 @@
 			],
 			"desc": "Хуткасць гартання тэксту (М=марудна | Х=хутка)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Магутнасць",
-				"сілкавання"
-			],
-			"desc": "Магутнасць выкарыстоўваемай крыніцы сілкавання"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"прыпынак"
-			],
-			"desc": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Межы",
-				"магутнасці"
-			],
-			"desc": "Максімальная магутнасць, якую можа выкарыстоўваць паяльнік (Ватт)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Інвертаваць",
@@ -239,55 +232,6 @@
 			],
 			"desc": "Інвертаваць кнопкі вымярэння тэмпературы"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Крок тэмп.",
-				"кар. нац."
-			],
-			"desc": "Крок вымярэння тэмпературы пры кароткім націску кнопак"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Крок тэмп.",
-				"пад. нац."
-			],
-			"desc": "Крок вымярэння тэмпературы пры падоўжаным націску кнопак"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Сіла імп.",
-				"сілкав. Вт"
-			],
-			"desc": "Сіла імпульса ўтрымливаючага ад сну павербанку ці іншай крыніцы сілкавання"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Эфект Хола",
-				"адчувальнасць"
-			],
-			"desc": "Узровень адчувальнасці датчыка хола ў рэжыме сну (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Дазволіць",
-				"блок. кнопак"
-			],
-			"desc": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (А=Адключана | Т=Толькі турба | П=Поўная блакіроўка)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Мін.",
-				"напр."
-			],
-			"desc": "Мінімальная дазволеная напруга на ячэйку (3S: 3 - 3,7V | 4S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Зацыкленая",
-				"анімацыя"
-			],
-			"desc": "Зацыкленая анімацыя гузікаў у галоўным меню"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Хуткасць",
@@ -295,26 +239,12 @@
 			],
 			"desc": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (А=Адключана | Н=Нізкая | С=Сярэдняя | В=Высокая)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Імпульс магутнасці",
-				"час чакання"
+				"Зацыкленая",
+				"анімацыя"
 			],
-			"desc": "Час чакання перад запускам кожнага імпульсу няспання (x 2.5 с)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Імпульс магутнасці",
-				"працягласць"
-			],
-			"desc": "Працягласць імпульсу няспання (x 250 мс)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Мова:",
-				" BY     Беларуская"
-			],
-			"desc": ""
+			"desc": "Зацыкленая анімацыя гузікаў у галоўным меню"
 		},
 		"Brightness": {
 			"text2": [
@@ -336,6 +266,76 @@
 				"працягласць"
 			],
 			"desc": "Усталяваць працягласць лагатыпа загрузкі (s=Секунды)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Падрабязны",
+				"рэжым чакання"
+			],
+			"desc": "Адлюстроўваць дэталёвую инфармацыю паменьшаным шрыфтом на экране чакання"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Падрабязны",
+				"экран пайкі"
+			],
+			"desc": "Паказваць дэталёвую інформацыю на экране пайкі"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Межы",
+				"магутнасці"
+			],
+			"desc": "Максімальная магутнасць, якую можа выкарыстоўваць паяльнік (Ватт)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Каліброўка",
+				"напругі"
+			],
+			"desc": "Каліброўка ўваходнай напругі (падоўжаны націск для выхаду)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Сіла імп.",
+				"сілкав. Вт"
+			],
+			"desc": "Сіла імпульса ўтрымливаючага ад сну павербанку ці іншай крыніцы сілкавання"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Імпульс магутнасці",
+				"час чакання"
+			],
+			"desc": "Час чакання перад запускам кожнага імпульсу няспання (x 2.5 с)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Імпульс магутнасці",
+				"працягласць"
+			],
+			"desc": "Працягласць імпульсу няспання (x 250 мс)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Скід",
+				"наладаў"
+			],
+			"desc": "Скід наладаў да першапачатковых значэнняў"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Мова:",
+				" BY  Беларуская"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
index 5890c16d..d0fffa64 100644
--- a/Translations/translation_BG.json
+++ b/Translations/translation_BG.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
 		"UVLOWarningString": "Ниско DC Напрежение",
 		"UndervoltageString": "Ниско Напрежение",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Поялник",
 				"Настройки"
 			],
-			"desc": "Настройки на поялника"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Режими",
 				"Настройки"
 			],
-			"desc": "Настройки енергоспестяване"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Интерфейс",
 				"Настройки"
 			],
-			"desc": "Настройки на интерфейса"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Разширени",
 				"Настройки"
 			],
-			"desc": "Допълнителни настройки"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Източник на захранване. Минимално напрежение. (DC 10V) (S 3,3V за клетка)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Мощност на",
+				"захранване"
+			],
+			"desc": "Мощност на избраното захранване"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Турбо",
+				"темп."
+			],
+			"desc": "Температура за \"турбо\" режим"
+		},
+		"AutoStart": {
+			"text2": [
+				"Автоматичен",
+				"работен режим"
+			],
+			"desc": "Режим на поялника при включване на захранването. (И=Изключен | Р=Работен | С=Сън | П=Сън температура помещение)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Промяна T",
+				"бързо?"
+			],
+			"desc": "Промяна на температура при бързо натискане на бутон!"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Промяна Т",
+				"задържане?"
+			],
+			"desc": "Промяна на температура при задържане на бутон!"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Усещане",
+				"за движение"
+			],
+			"desc": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Темп.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Изключване след (Минути)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Усещане",
-				"за движение"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"
+			"desc": "Sensitivity to magnets (0=Изключено | 1=Слабо | ... | 9=Силно)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Единици за температура (C=Целзии | F=Фаренхайт)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Детайлен",
-				"екран в покой"
-			],
-			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Ориентация",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Ориентация на дисплея (R=Дясна Ръка | L=Лява Ръка | A=Автоматично)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Турбо",
-				"темп."
-			],
-			"desc": "Температура за \"турбо\" режим"
-		},
-		"AutoStart": {
-			"text2": [
-				"Автоматичен",
-				"работен режим"
-			],
-			"desc": "Режим на поялника при включване на захранването. (И=Изключен | Р=Работен | С=Сън | П=Сън температура помещение)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Мигай при",
@@ -175,34 +217,6 @@
 			],
 			"desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Калибриране",
-				"температура?"
-			],
-			"desc": "Калибриране на температурата"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Фабрични",
-				"настройки?"
-			],
-			"desc": "Връщане на фабрични настройки"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Калибриране",
-				"напрежение?"
-			],
-			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Детайлен",
-				"работен екран"
-			],
-			"desc": "Детайлна информация в работен режим при запояване"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Скорост",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Скорост на движение на този текст"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Мощност на",
-				"захранване"
-			],
-			"desc": "Мощност на избраното захранване"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Лимит на",
-				"мощност"
-			],
-			"desc": "Максимална мощност на поялника (Watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Размяна",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Промяна T",
-				"бързо?"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Промяна на температура при бързо натискане на бутон!"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Промяна Т",
-				"задържане?"
-			],
-			"desc": "Промяна на температура при задържане на бутон!"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Захранващ",
-				"импулс"
-			],
-			"desc": "Поддържане на интензивност на захранващия импулс"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Изключено | 1=Слабо | ... | 9=Силно)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Детайлен",
+				"екран в покой"
+			],
+			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Детайлен",
+				"работен екран"
+			],
+			"desc": "Детайлна информация в работен режим при запояване"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Лимит на",
+				"мощност"
+			],
+			"desc": "Максимална мощност на поялника (Watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Калибриране",
+				"напрежение?"
+			],
+			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Захранващ",
+				"импулс"
+			],
+			"desc": "Поддържане на интензивност на захранващия импулс"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250мс)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Фабрични",
+				"настройки?"
+			],
+			"desc": "Връщане на фабрични настройки"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Език:",
-				" BG     Български"
+				" BG   Български"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
index 85d85a03..5a8c5894 100644
--- a/Translations/translation_CS.json
+++ b/Translations/translation_CS.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Ujistěte se, že hrot má pokojovou teplotu!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Opravdu chcete resetovat zařízení do továrního nastavení?",
 		"UVLOWarningString": "Nízké DC",
 		"UndervoltageString": "Nízké napětí",
@@ -66,35 +66,35 @@
 				"Napájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení napájení"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Pájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení pájení"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Režim",
 				"spánku"
 			],
-			"desc": "Nastavení úspory energie"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Uživatelské",
 				"rozhraní"
 			],
-			"desc": "Nastavení uživatelského rozhraní"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Pokročilá",
 				"nastavení"
 			],
-			"desc": "Pokročilá nastavení"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Při nižším napětí ukončit pájení (DC 10V)  (S 3,3V na článek, zakázat omezení napájení)."
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimální",
+				"napětí"
+			],
+			"desc": "Minimální dovolené napětí po článku (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Napětí",
+				"QC"
+			],
+			"desc": "Maximální napětí QC pro jednání páječkou"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "Maximální prodleva při jednání PD ve 100ms krocích pro kompatibilitu s některými QC nabíječkami"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Teplota",
+				"boostu"
+			],
+			"desc": "Teplota hrotu v \"režimu boost\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Chování",
+				"při startu"
+			],
+			"desc": "V=vypnuto | P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Krok teploty",
+				"krátký?"
+			],
+			"desc": "Velikost přídavku při změně teploty krátkým stiskem tlačítka"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Krok teploty",
+				"dlouhý?"
+			],
+			"desc": "Velikost přídavku při změně teploty dlouhým stiskem tlačítka"
+		},
+		"LockingMode": {
+			"text2": [
+				"Povolit zamč.",
+				"tlačítek"
+			],
+			"desc": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Citlivost",
+				"na pohyb"
+			],
+			"desc": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Teplota",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Interval automatického vypnutí (m=minut)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
 				"Citlivost",
-				"na pohyb"
+				"Hall. čidla"
 			],
-			"desc": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
+			"desc": "Citlivost Hallova čidla pro detekci spánku (0=vypnuto | 1=nejméně citlivé | ... | 9=nejvíce citlivé)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=Celsius | F=Fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Podrobná obr.",
-				"nečinnosti"
-			],
-			"desc": "Zobrazit detailní informace malým fontem na obrazovce nečinnosti"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientace",
@@ -154,20 +210,6 @@
 			],
 			"desc": "P=pravák | L=levák | A=automaticky"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Teplota",
-				"boostu"
-			],
-			"desc": "Teplota hrotu v \"režimu boost\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Chování",
-				"při startu"
-			],
-			"desc": "V=vypnuto | P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Blikáni při",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Blikat teplotou při chladnutí dokud je hrot horký"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibrovat",
-				"teplotu?"
-			],
-			"desc": "Začít kalibraci měření teploty hrotu"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Obnovit tovární",
-				"nastavení?"
-			],
-			"desc": "Obnovit všechna nastavení na výchozí"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibrovat",
-				"vstupní napětí?"
-			],
-			"desc": "Začít kalibraci vstupního napětí (dlouhý stisk pro ukončení)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Podrobná obr.",
-				"pájení"
-			],
-			"desc": "Zobrazit detailní informace malým fontem na obrazovce pájení"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Rychlost",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Rychlost posouvání popisků podobných tomuto (P=pomalu | R=rychle)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Napětí",
-				"QC"
-			],
-			"desc": "Maximální napětí QC pro jednání páječkou"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "Maximální prodleva při jednání PD ve 100ms krocích pro kompatibilitu s některými QC nabíječkami"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Omezení",
-				"Výkonu"
-			],
-			"desc": "Maximální příkon páječky (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Prohodit",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Prohodit tlačítka pro změnu teploty"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Krok teploty",
-				"krátký?"
-			],
-			"desc": "Velikost přídavku při změně teploty krátkým stiskem tlačítka"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Krok teploty",
-				"dlouhý?"
-			],
-			"desc": "Velikost přídavku při změně teploty dlouhým stiskem tlačítka"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Napájecí",
-				"pulz"
-			],
-			"desc": "Intenzita výkonu pulzu pro udržení páječky vzhůru (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Citlivost",
-				"Hall. čidla"
-			],
-			"desc": "Citlivost Hallova čidla pro detekci spánku (0=vypnuto | 1=nejméně citlivé | ... | 9=nejvíce citlivé)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Povolit zamč.",
-				"tlačítek"
-			],
-			"desc": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimální",
-				"napětí"
-			],
-			"desc": "Minimální dovolené napětí po článku (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"smyčka"
-			],
-			"desc": "Animovat ikony hlavního menu ve smyčce"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Anim.",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Tempo animace ikon v menu (O=vypnuto | P=pomalu | S=středně | R=rychle)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Prodleva",
-				"napáj. pulzu"
+				"Anim.",
+				"smyčka"
 			],
-			"desc": "Prodleva než je spuštěn pulz pro udržení páječky vzhůru pulzu pro udržení páječky vzhůru (x 2,5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Délka",
-				"napáj. pulzu"
-			],
-			"desc": "Délka pulzu pro udržení páječky vzhůru (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Jazyk:",
-				" CS     Český"
-			],
-			"desc": "Současný jazyk firmwaru"
+			"desc": "Animovat ikony hlavního menu ve smyčce"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"boot loga"
 			],
 			"desc": "Nastavení doby trvání boot loga (s=sekundy)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Podrobná obr.",
+				"nečinnosti"
+			],
+			"desc": "Zobrazit detailní informace malým fontem na obrazovce nečinnosti"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Podrobná obr.",
+				"pájení"
+			],
+			"desc": "Zobrazit detailní informace malým fontem na obrazovce pájení"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Omezení",
+				"Výkonu"
+			],
+			"desc": "Maximální příkon páječky (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibrovat",
+				"vstupní napětí?"
+			],
+			"desc": "Začít kalibraci vstupního napětí (dlouhý stisk pro ukončení)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Napájecí",
+				"pulz"
+			],
+			"desc": "Intenzita výkonu pulzu pro udržení páječky vzhůru (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Prodleva",
+				"napáj. pulzu"
+			],
+			"desc": "Prodleva než je spuštěn pulz pro udržení páječky vzhůru pulzu pro udržení páječky vzhůru (x 2,5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Délka",
+				"napáj. pulzu"
+			],
+			"desc": "Délka pulzu pro udržení páječky vzhůru (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Obnovit tovární",
+				"nastavení?"
+			],
+			"desc": "Obnovit všechna nastavení na výchozí"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Jazyk:",
+				" CS       Český"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
index b789683f..af4af26a 100644
--- a/Translations/translation_DA.json
+++ b/Translations/translation_DA.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden du fortsætter!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Are you sure to reset settings to default values?",
 		"UVLOWarningString": "Lav Volt",
 		"UndervoltageString": "Undervoltage",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Soldering",
 				"settings"
 			],
-			"desc": "Soldering settings"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Sleep",
 				"mode"
 			],
-			"desc": "Power saving settings"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"User",
 				"interface"
 			],
-			"desc": "User interface settings"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
 				"settings"
 			],
-			"desc": "Advanced settings"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Strømforsyning. Indstil Cutoff Spændingen. (DC 10V) (S 3,3V per cell)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltage"
+			],
+			"desc": "Max QC voltage the iron should negotiate for"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperatur i \"boost mode\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Start-up",
+				"behavior"
+			],
+			"desc": "Start automatisk med lodning når strøm sættes til. (S=Slukket | L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Motion",
+				"sensitivity"
+			],
+			"desc": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Sleep",
@@ -126,12 +189,12 @@
 			],
 			"desc": "sluknings Timeout (Minutter)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Motion",
+				"Hall sensor",
 				"sensitivity"
 			],
-			"desc": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
+			"desc": "Sensitivity to magnets (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperatur Enhed (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detailed",
-				"idle screen"
-			],
-			"desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Display",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Skærm Orientering (H=Højre Håndet | V=Venstre Håndet | A=Automatisk)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatur i \"boost\" mode"
-		},
-		"AutoStart": {
-			"text2": [
-				"Start-up",
-				"behavior"
-			],
-			"desc": "Start automatisk med lodning når strøm sættes til. (S=Slukket | L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Cooldown",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Blink temperaturen på skærmen, mens spidsen stadig er varm."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibrate",
-				"temperature?"
-			],
-			"desc": "kalibrere spids temperatur."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Restore factory",
-				"settings?"
-			],
-			"desc": "Gendan alle indstillinger"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibrate",
-				"input voltage?"
-			],
-			"desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detailed",
-				"solder screen"
-			],
-			"desc": "Vis detialieret information mens der loddes"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Scrolling",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Speed info text scrolls past at (S=slow | F=fast)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"voltage"
-			],
-			"desc": "Max QC voltage the iron should negotiate for"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detailed",
+				"idle screen"
+			],
+			"desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detailed",
+				"solder screen"
+			],
+			"desc": "Vis detialieret information mens der loddes"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibrate",
+				"input voltage?"
+			],
+			"desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Restore default",
+				"settings"
+			],
+			"desc": "Gendan alle indstillinger"
+		},
 		"LanguageSwitch": {
 			"text2": [
-				"Sprog :",
-				" DA     Dansk"
+				"Sprog:",
+				" DA       Dansk"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
index bfb7bea7..270f94f1 100644
--- a/Translations/translation_DE.json
+++ b/Translations/translation_DE.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Nur Kalibrieren wenn Lötspitze & Gerät Raumtemperatur haben!",
+		"SettingsCalibrationWarning": "Bitte sicherstellen, dass Lötspitze & Gerät beim nächsten Start Raumtemperatur haben!",
 		"SettingsResetWarning": "Sicher, dass alle Werte zurückgesetzt werden sollen?",
 		"UVLOWarningString": "V niedr.",
 		"UndervoltageString": "Unterspannung",
@@ -66,35 +66,35 @@
 				"Energie-",
 				"einstellungen"
 			],
-			"desc": "Energieeinstellungen"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Löt-",
 				"einstellungen"
 			],
-			"desc": "Löteinstellungen"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Ruhe-",
 				"modus"
 			],
-			"desc": "Energiespareinstellungen"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Anzeige-",
 				"einstellungen"
 			],
-			"desc": "Menüeinstellungen"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Erweiterte",
 				"Einstellungen"
 			],
-			"desc": "Erweiterte Einstellungen"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Spannungsquelle (Abschaltspannung) (DC=10V | nS=n*3.3V für n LiIon-Zellen)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimale",
+				"Spannung"
+			],
+			"desc": "Minimal zulässige Spannung pro Zelle (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Spannungs-",
+				"maximum"
+			],
+			"desc": "Maximal zulässige Spannung der verwendeten Spannungsversorgung (V=Volt)"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost-",
+				"temperatur"
+			],
+			"desc": "Temperatur der Lötspitze im Boostmodus"
+		},
+		"AutoStart": {
+			"text2": [
+				"Start im",
+				"Lötmodus"
+			],
+			"desc": "Heizverhalten beim Einschalten der Spannungsversorgung (A=aus | L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp-Schritt",
+				"Druck kurz"
+			],
+			"desc": "Schrittweite für Temperaturwechsel bei kurzem Tastendruck"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp-Schritt",
+				"Druck lang"
+			],
+			"desc": "Schrittweite für Temperaturwechsel bei langem Tastendruck"
+		},
+		"LockingMode": {
+			"text2": [
+				"Tasten-",
+				"sperre"
+			],
+			"desc": "Langes drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Bewegungs-",
+				"empfindlichk."
+			],
+			"desc": "0=aus | 1=minimal | ... | 9=maximal"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Ruhe-",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Dauer vor automatischer Abschaltung (m=Minuten)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Bewegungs-",
-				"empfindlichk."
+				"Empfindlichkeit",
+				"der Hall-Sonde"
 			],
-			"desc": "0=aus | 1=minimal | ... | 9=maximal"
+			"desc": "Empfindlichkeit der Hall-Sonde um den Ruhemodus auszulösen (0=aus | 1=minimal | ... | 9=maximal)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=°Celsius | F=°Fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detaillierte",
-				"Ruheansicht"
-			],
-			"desc": "Detaillierte Anzeige im Ruhemodus"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Anzeige-",
@@ -154,20 +210,6 @@
 			],
 			"desc": "R=rechtshändig | L=linkshändig | A=automatisch"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost-",
-				"temperatur"
-			],
-			"desc": "Temperatur der Lötspitze im Boostmodus"
-		},
-		"AutoStart": {
-			"text2": [
-				"Start im",
-				"Lötmodus"
-			],
-			"desc": "Heizverhalten beim Einschalten der Spannungsversorgung (A=aus | L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Abkühl-",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Temperaturanzeige blinkt beim Abkühlen, solange Spitze heiß ist"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Temperatur",
-				"kalibrieren?"
-			],
-			"desc": "Kalibrierung der Kaltstellenkompensation beim nächsten Start (nicht nötig wenn Delta T < 5°C)"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Einstellungen",
-				"zurücksetzen?"
-			],
-			"desc": "Werte auf Werkseinstellungen zurücksetzen"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Eingangsspannung",
-				"kalibrieren?"
-			],
-			"desc": "Kalibrierung der Eingangsspannung (Langer Tastendruck zum Verlassen)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detaillierte",
-				"Lötansicht"
-			],
-			"desc": "Detaillierte Anzeige im Lötmodus"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Scroll-",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Scrollgeschwindigkeit der Erläuterungen (L=langsam | S=schnell)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Spannungs-",
-				"maximum"
-			],
-			"desc": "Maximal zulässige Spannung der verwendeten Spannungsversorgung (V=Volt)"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Leistungs-",
-				"maximum"
-			],
-			"desc": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"+- Tasten",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Tastenbelegung zur Temperaturänderung umkehren"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp-Schritt",
-				"Druck kurz"
-			],
-			"desc": "Schrittweite für Temperaturwechsel bei kurzem Tastendruck"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp-Schritt",
-				"Druck lang"
-			],
-			"desc": "Schrittweite für Temperaturwechsel bei langem Tastendruck"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Leistungs-",
-				"impuls"
-			],
-			"desc": "Powerbank mit einem Impuls wach halten (Watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Empfindlichkeit",
-				"der Hall-Sonde"
-			],
-			"desc": "Empfindlichkeit der Hall-Sonde um den Ruhemodus auszulösen (0=aus | 1=minimal | ... | 9=maximal)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Tasten-",
-				"sperre"
-			],
-			"desc": "Langes drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimale",
-				"Spannung"
-			],
-			"desc": "Minimal zulässige Spannung pro Zelle (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"Schleife"
-			],
-			"desc": "Icon-Animationen im Hauptmenü wiederholen"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Anim.",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Geschwindigkeit der Icon-Animationen im Menü (A=aus | L=langsam | M=mittel | S=schnell)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Impuls-",
-				"verzögerung"
+				"Anim.",
+				"Schleife"
 			],
-			"desc": "Dauer vor Abgabe von Wachhalteimpulsen (x 2,5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Impuls-",
-				"dauer"
-			],
-			"desc": "Dauer des Wachhalteimpulses (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Sprache:",
-				" DE     Deutsch"
-			],
-			"desc": "Sprache der Firmware ändern"
+			"desc": "Icon-Animationen im Hauptmenü wiederholen"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"dauer"
 			],
 			"desc": "Legt die Dauer der Anzeige des Startlogos fest (s=Sekunden)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detaillierte",
+				"Ruheansicht"
+			],
+			"desc": "Detaillierte Anzeige im Ruhemodus"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detaillierte",
+				"Lötansicht"
+			],
+			"desc": "Detaillierte Anzeige im Lötmodus"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Leistungs-",
+				"maximum"
+			],
+			"desc": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Temperatur",
+				"kalibrieren?"
+			],
+			"desc": "Kalibrierung der Kaltstellenkompensation beim nächsten Start (nicht nötig wenn Delta T < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Eingangsspannung",
+				"kalibrieren?"
+			],
+			"desc": "Kalibrierung der Eingangsspannung (Langer Tastendruck zum Verlassen)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Leistungs-",
+				"impuls"
+			],
+			"desc": "Powerbank mit einem Impuls wach halten (Watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Impuls-",
+				"verzögerung"
+			],
+			"desc": "Dauer vor Abgabe von Wachhalteimpulsen (x 2,5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Impuls-",
+				"dauer"
+			],
+			"desc": "Dauer des Wachhalteimpulses (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Einstellungen",
+				"zurücksetzen?"
+			],
+			"desc": "Werte auf Werkseinstellungen zurücksetzen"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Sprache:",
+				" DE     Deutsch"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json
index 4c3622da..41049f46 100644
--- a/Translations/translation_EL.json
+++ b/Translations/translation_EL.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Πριν προχωρήσετε, παρακαλώ σιγουρευτείτε πως η μύτη βρίσκεται σε θερμοκρασία δωματίου!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Σίγουρα θέλετε επαναφορά αρχικών ρυθμίσεων;",
 		"UVLOWarningString": "Χαμηλ DC",
 		"UndervoltageString": "Υπόταση",
@@ -39,9 +39,9 @@
 			"ΠΛΗΚΤΡΑ!"
 		],
 		"WarningThermalRunaway": [
-				"Θερμική",
-				"Φυγή"
-			]
+			"Θερμική",
+			"Φυγή"
+		]
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -69,35 +69,35 @@
 				"Ρυθμίσεις",
 				"ενέργειας"
 			],
-			"desc": "Ρυθμίσεις ενέργειας"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Ρυθμίσεις",
 				"κόλλησης"
 			],
-			"desc": "Ρυθμίσεις κόλλησης"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Λειτουργία",
 				"ύπνου"
 			],
-			"desc": "Ρυθμίσεις εξοικ. ενέργ."
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Διεπαφή",
 				"χρήστη"
 			],
-			"desc": "Ρυθμίσεις διεπαφής χρήστη"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Προηγμένες",
 				"ρυθμίσεις"
 			],
-			"desc": "Προηγμένες ρυθμίσεις"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -108,6 +108,69 @@
 			],
 			"desc": "Πηγή ενέργειας. Oρισμός τάσης απενεργοποίησης. (DC 10V) (S 3.3V ανα κυψέλη, απενεργοποίηση ενεργειακού ορίου)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Ελάχιστη",
+				"τάση"
+			],
+			"desc": "Ελάχιστη επιτρεπτή τάση ανα κυψέλη (3 σε σειρά: 3 - 3.7V | 4-6 σε σειρά: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Τάση",
+				"QC"
+			],
+			"desc": "Μέγιστη τάση QC που να ζητά το κολλητήρι από το τροφοδοτικό"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"χρονικό όριο",
+				"PD"
+			],
+			"desc": "Χρονικό όριο διαπραγμάτευσης PD σε βήματα 100ms για συμβατότητα με κάποιους φορτιστές QC"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Θερμοκ.",
+				"boost"
+			],
+			"desc": "Θερμοκρασία στη \"λειτουργία boost\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Ζέσταμα",
+				"κατά την εν."
+			],
+			"desc": "0=off | Κ=θερμ. κόλλησης | Z=αναμονή σε θερμοκρασία ύπνου μέχρι την κίνηση | Υ=αναμονή χωρίς ζέσταμα μέχρι την κίνηση"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Αλλαγή θερμοκ.",
+				"στιγμιαίο"
+			],
+			"desc": "Βήμα αλλαγής θερμοκρασίας σε στιγμιαίο πάτημα πλήκτρου"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Αλλαγή θερμοκ.",
+				"παρατεταμένο"
+			],
+			"desc": "Βήμα αλλαγής θερμοκρασίας σε παρατεταμένο πάτημα πλήκτρου"
+		},
+		"LockingMode": {
+			"text2": [
+				"Κλείδωμα",
+				"πλήκτρων"
+			],
+			"desc": "Κατά την κόλληση, κρατήστε και τα δύο πλήκτρα για κλείδωμα (A=απενεργοποίηση | B=μόνο λειτ. boost | Π=πλήρες κλείδωμα)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Ευαισθησία",
+				"κίνησης"
+			],
+			"desc": "0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Θερμοκρ.",
@@ -129,12 +192,12 @@
 			],
 			"desc": "Χρονικό διάστημα πρίν την απενεργοποίηση του κολλητηριού (Λ=λεπτά)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Ευαισθησία",
-				"κίνησης"
+				"Ευαισθ. αισθ. ",
+				"φαιν. Hall"
 			],
-			"desc": "0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο"
+			"desc": "Ευαισθησία του αισθητήρα φαινομένου Hall για εντοπισμό αδράνειας (0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -143,13 +206,6 @@
 			],
 			"desc": "C=Κελσίου | F=Φαρενάιτ"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Λεπτομερής",
-				"οθ. αδράνειας"
-			],
-			"desc": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη αδράνειας"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Διάταξη",
@@ -157,20 +213,6 @@
 			],
 			"desc": "R=δεξιόχειρες | L=αριστερόχειρες | Α=αυτόματο"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Θερμοκ.",
-				"boost"
-			],
-			"desc": "Θερμοκρασία στη \"λειτουργία boost\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Ζέσταμα",
-				"κατά την εν."
-			],
-			"desc": "0=off | Κ=θερμ. κόλλησης | Z=αναμονή σε θερμοκρασία ύπνου μέχρι την κίνηση | Υ=αναμονή χωρίς ζέσταμα μέχρι την κίνηση"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Αναβοσβήσιμο",
@@ -178,34 +220,6 @@
 			],
 			"desc": "Αναβοσβήσιμο της ενδειξης θερμοκρασίας κατά την παύση θέρμανσης όταν η μύτη είναι ακόμα καυτή"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Βαθμονόμηση",
-				"θερμοκρασίας;"
-			],
-			"desc": "Βαθμονόμηση αρχικής θερμοκρασίας μύτης"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Επαναφορά",
-				"εργ. ρυθμίσεων;"
-			],
-			"desc": "Επαναφορά στις προεπιλεγμένες ρυθμίσεις"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Βαθμονόμηση",
-				"τάσης εισόδου;"
-			],
-			"desc": "Έναρξη βαθμονόμησης τάσης εισόδου (κράτημα για έξοδο)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Λεπτομερής",
-				"οθ. κόλλησης"
-			],
-			"desc": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη κόλλησης"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Ταχύτητα",
@@ -213,27 +227,6 @@
 			],
 			"desc": "Ταχύτητα κύλισης κειμένου (Α=αργά | Γ=γρήγορα)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Τάση",
-				"QC"
-			],
-			"desc": "Μέγιστη τάση QC που να ζητά το κολλητήρι από το τροφοδοτικό"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"χρονικό όριο",
-				"PD"
-			],
-			"desc": "Χρονικό όριο διαπραγμάτευσης PD σε βήματα 100ms για συμβατότητα με κάποιους φορτιστές QC"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Ενεργειακό",
-				"όριο"
-			],
-			"desc": "Μέγιστη ενέργεια που μπορεί να χρησιμοποιεί το κολλητήρι (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Αντιστροφή",
@@ -241,47 +234,12 @@
 			],
 			"desc": "Αντιστροφή διάταξης πλήκτρων στη ρύθμιση θερμοκρασίας"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Αλλαγή θερμοκ.",
-				"στιγμιαίο"
+				"Ταχύτητα",
+				"κιν. εικονιδ."
 			],
-			"desc": "Βήμα αλλαγής θερμοκρασίας σε στιγμιαίο πάτημα πλήκτρου"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Αλλαγή θερμοκ.",
-				"παρατεταμένο"
-			],
-			"desc": "Βήμα αλλαγής θερμοκρασίας σε παρατεταμένο πάτημα πλήκτρου"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Παλμός",
-				"ενέργειας"
-			],
-			"desc": "Ένταση ενέργειας παλμού διατήρησης λειτουργίας (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Ευαισθ. αισθ. ",
-				"φαιν. Hall"
-			],
-			"desc": "Ευαισθησία του αισθητήρα φαινομένου Hall για εντοπισμό αδράνειας (0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Κλείδωμα",
-				"πλήκτρων"
-			],
-			"desc": "Κατά την κόλληση, κρατήστε και τα δύο πλήκτρα για κλείδωμα (A=απενεργοποίηση | B=μόνο λειτ. boost | Π=πλήρες κλείδωμα)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Ελάχιστη",
-				"τάση"
-			],
-			"desc": "Ελάχιστη επιτρεπτή τάση ανα κυψέλη (3 σε σειρά: 3 - 3.7V | 4-6 σε σειρά: 2.4 - 3.7V)"
+			"desc": "Ρυθμός κίνησης εικονιδίων στο μενού (0=off | Α=αργός | Μ=μέτριος | Γ=γρήγορος)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -290,34 +248,6 @@
 			],
 			"desc": "Επανάληψη κίνησης εικονιδίων στο αρχικό μενού"
 		},
-		"AnimSpeed": {
-			"text2": [
-				"Ταχύτητα",
-				"κιν. εικονιδ."
-			],
-			"desc": "Ρυθμός κίνησης εικονιδίων στο μενού (0=off | Α=αργός | Μ=μέτριος | Γ=γρήγορος"
-		},
-		"PowerPulseWait": {
-			"text2": [
-				"Καθυστέρηση",
-				"παλμού ενέργ."
-			],
-			"desc": "Καθυστέρηση πριν την ενεργοποίση παλμού διατήρησης λειτουργίας (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Διάρκεια",
-				"παλμού ενέργ."
-			],
-			"desc": "Διάρκεια παλμού διατήρησης ενέργειας (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Γλώσσα",
-				" GR     Ελληνικά"
-			],
-			"desc": "Τρέχουσα γλώσσα λογισμικού"
-		},
 		"Brightness": {
 			"text2": [
 				"Αντίθεση",
@@ -338,6 +268,76 @@
 				"duration"
 			],
 			"desc": "Sets the duration for the boot logo (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Λεπτομερής",
+				"οθ. αδράνειας"
+			],
+			"desc": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη αδράνειας"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Λεπτομερής",
+				"οθ. κόλλησης"
+			],
+			"desc": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη κόλλησης"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Ενεργειακό",
+				"όριο"
+			],
+			"desc": "Μέγιστη ενέργεια που μπορεί να χρησιμοποιεί το κολλητήρι (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Βαθμονόμηση",
+				"τάσης εισόδου;"
+			],
+			"desc": "Έναρξη βαθμονόμησης τάσης εισόδου (κράτημα για έξοδο)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Παλμός",
+				"ενέργειας"
+			],
+			"desc": "Ένταση ενέργειας παλμού διατήρησης λειτουργίας (W=watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Καθυστέρηση",
+				"παλμού ενέργ."
+			],
+			"desc": "Καθυστέρηση πριν την ενεργοποίση παλμού διατήρησης λειτουργίας (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Διάρκεια",
+				"παλμού ενέργ."
+			],
+			"desc": "Διάρκεια παλμού διατήρησης ενέργειας (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Επαναφορά",
+				"εργ. ρυθμίσεων;"
+			],
+			"desc": "Επαναφορά στις προεπιλεγμένες ρυθμίσεις"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Γλώσσα:",
+				" GR    Ελληνικά"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
index 3616a04b..40794ce4 100644
--- a/Translations/translation_EN.json
+++ b/Translations/translation_EN.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature before calibration!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Are you sure you want to restore default settings?",
 		"UVLOWarningString": "DC LOW",
 		"UndervoltageString": "Undervoltage",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Soldering",
 				"settings"
 			],
-			"desc": "Soldering settings"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Sleep",
 				"mode"
 			],
-			"desc": "Power saving settings"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"User",
 				"interface"
 			],
-			"desc": "User interface settings"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
 				"settings"
 			],
-			"desc": "Advanced settings"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Set cutoff voltage to prevent battery overdrainage (DC 10V) (S=3.3V per cell, disable PWR limit)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltage"
+			],
+			"desc": "Max QC voltage the iron should negotiate for"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Tip temperature used in \"boost mode\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Start-up",
+				"behavior"
+			],
+			"desc": "O=off | S=heat to soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Motion",
+				"sensitivity"
+			],
+			"desc": "0=off | 1=least sensitive | ... | 9=most sensitive"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Sleep",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Interval before the iron shuts down (m=minutes)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Motion",
+				"Hall sensor",
 				"sensitivity"
 			],
-			"desc": "0=off | 1=least sensitive | ... | 9=most sensitive"
+			"desc": "Sensitivity to magnets (0=off | 1=least sensitive | ... | 9=most sensitive)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=°Celsius | F=°Fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detailed",
-				"idle screen"
-			],
-			"desc": "Display detailed info in a smaller font on idle screen"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Display",
@@ -154,20 +210,6 @@
 			],
 			"desc": "R=right-handed | L=left-handed | A=automatic"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Tip temperature used in \"boost mode\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Start-up",
-				"behavior"
-			],
-			"desc": "O=off | S=heat to soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Cooldown",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Flash temp reading at idle while tip is hot"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibrate CJC",
-				"at next boot"
-			],
-			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Restore default",
-				"settings"
-			],
-			"desc": "Reset all settings to default"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibrate",
-				"input voltage"
-			],
-			"desc": "Start VIN calibration (long press to exit)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detailed",
-				"solder screen"
-			],
-			"desc": "Display detailed info in a smaller font on soldering screen"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Scrolling",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Speed info text scrolls past at (S=slow | F=fast)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"voltage"
-			],
-			"desc": "Max QC voltage the iron should negotiate for"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp change",
-				"short"
-			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity to magnets (0=off | 1=least sensitive | ... | 9=most sensitive)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"loop"
-			],
-			"desc": "Loop icon animations in main menu"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Anim.",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Power pulse",
-				"delay"
+				"Anim.",
+				"loop"
 			],
-			"desc": "Delay before keep-awake-pulse is triggered (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Power pulse",
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Language:",
-				" EN     English"
-			],
-			"desc": "Current firmware language"
+			"desc": "Loop icon animations in main menu"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,7 +264,77 @@
 				"Boot logo",
 				"duration"
 			],
-			"desc": "Set boot logo duration (off | s=seconds | infinity)"
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detailed",
+				"idle screen"
+			],
+			"desc": "Display detailed info in a smaller font on idle screen"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detailed",
+				"solder screen"
+			],
+			"desc": "Display detailed info in a smaller font on soldering screen"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibrate",
+				"input voltage"
+			],
+			"desc": "Start VIN calibration (long press to exit)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Power pulse",
+				"delay"
+			],
+			"desc": "Delay before keep-awake-pulse is triggered (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Power pulse",
+				"duration"
+			],
+			"desc": "Keep-awake-pulse duration (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Restore default",
+				"settings"
+			],
+			"desc": "Reset all settings to default"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Language:",
+				" EN     English"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
index bbed077c..aaebb5a1 100644
--- a/Translations/translation_ES.json
+++ b/Translations/translation_ES.json
@@ -7,7 +7,8 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente antes de empezar!",
+		"SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente al inicio",
+
 		"SettingsResetWarning": "¿Quieres restablecer los ajustes?",
 		"UVLOWarningString": "CC BAJA",
 		"UndervoltageString": "Voltaje bajo",
@@ -66,35 +67,35 @@
 				"Potencia",
 				"ajustes"
 			],
-			"desc": "Ajustes de potencia"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Soldadura",
 				"ajustes"
 			],
-			"desc": "Ajustes para soldar."
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Modos de",
 				"reposo"
 			],
-			"desc": "Ajustes de ahorro energético."
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interfaz",
 				"de usuario"
 			],
-			"desc": "Ajustes de interfaz de usuario."
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Ajustes",
 				"avanzados"
 			],
-			"desc": "Ajustes avanzados."
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +106,69 @@
 			],
 			"desc": "Elige el tipo de fuente para limitar el voltaje (DC 10V) (S 3,3V por pila, ilimitado)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Mínimo",
+				"voltaje"
+			],
+			"desc": "voltaje mínimo permitido por célula (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Potencia de",
+				"entrada"
+			],
+			"desc": "Potencia en vatios del adaptador de corriente utilizado."
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Ajustar la",
+				"temp. extra"
+			],
+			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
+		},
+		"AutoStart": {
+			"text2": [
+				"Calentar",
+				"al enchufar"
+			],
+			"desc": "Se calienta él solo al arrancar (N=no | S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Cambio temp.",
+				"puls. cortas"
+			],
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Cambio temp.",
+				"puls. largas"
+			],
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
+		},
+		"LockingMode": {
+			"text2": [
+				"Permitir botones",
+				"bloqueo"
+			],
+			"desc": "Al soldar, una pulsación larga en ambos botones los bloquea (D=desactivar | B=sólo potenciar | F=bloqueo total)."
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Detección de",
+				"movimiento"
+			],
+			"desc": "Tiempo de reacción al agarrar (0=no | 1=menos sensible | ... | 9=más sensible)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temperatura",
@@ -126,12 +190,12 @@
 			],
 			"desc": "Tiempo de inactividad para apagarse (en minutos)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Detección de",
-				"movimiento"
+				"Hall Eff",
+				"Sensibilidad"
 			],
-			"desc": "Tiempo de reacción al agarrar (0=no | 1=menos sensible | ... | 9=más sensible)"
+			"desc": "Sensibilidad del sensor de efecto Hall en la detección de reposo (0=no | 1=menos sensible | ... | 9=más sensible)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +204,6 @@
 			],
 			"desc": "Unidad de temperatura (C=centígrados | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Info extra en",
-				"modo reposo"
-			],
-			"desc": "Muestra información detallada en letra pequeña al reposar."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientación",
@@ -154,20 +211,6 @@
 			],
 			"desc": "Orientación de la pantalla (D=diestro | I=zurdo | A=automático)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Ajustar la",
-				"temp. extra"
-			],
-			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
-		},
-		"AutoStart": {
-			"text2": [
-				"Calentar",
-				"al enchufar"
-			],
-			"desc": "Se calienta él solo al arrancar (N=no | S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Parpadear",
@@ -175,34 +218,6 @@
 			],
 			"desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibrar temp.",
-				"de la punta"
-			],
-			"desc": "Calibra la desviación térmica de la punta."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Volver a ajustes",
-				"de fábrica"
-			],
-			"desc": "Restablece todos los ajustes a los valores originales."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibrar voltaje",
-				"de entrada"
-			],
-			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Info extra",
-				"al soldar"
-			],
-			"desc": "Muestra más datos por pantalla cuando se está soldando."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Velocidad",
@@ -210,27 +225,6 @@
 			],
 			"desc": "Velocidad de desplazamiento del texto (R=rápida | L=lenta)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Potencia de",
-				"entrada"
-			],
-			"desc": "Potencia en vatios del adaptador de corriente utilizado."
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Ajustar la",
-				"potenc. máx."
-			],
-			"desc": "Elige el límite de potencia máxima del soldador (en vatios)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Invertir",
@@ -238,55 +232,6 @@
 			],
 			"desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Cambio temp.",
-				"puls. cortas"
-			],
-			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Cambio temp.",
-				"puls. largas"
-			],
-			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Pulsos bat.",
-				"constantes"
-			],
-			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall Eff",
-				"Sensibilidad"
-			],
-			"desc": "Sensibilidad del sensor de efecto Hall en la detección de reposo (0=no | 1=menos sensible | ... | 9=más sensible)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Permitir botones",
-				"bloqueo"
-			],
-			"desc": "Al soldar, una pulsación larga en ambos botones los bloquea (D=desactivar | B=sólo potenciar | F=bloqueo total)."
-		},
-		"MinVolCell": {
-			"text2": [
-				"Mínimo",
-				"voltaje"
-			],
-			"desc": "voltaje mínimo permitido por célula (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"bucle"
-			],
-			"desc": "Animaciones de iconos en bucle en el menú raíz"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Anim.",
@@ -294,26 +239,12 @@
 			],
 			"desc": "Velocidad de las animaciones de los iconos en el menú (O=off | L=low | M=medium | R=high)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Impulso de potencia",
-				"tiempo de espera"
+				"Anim.",
+				"bucle"
 			],
-			"desc": "Tiempo de espera antes de disparar cada pulso de mantenimiento de la vigilia (x 2,5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Impulso de potencia",
-				"duración"
-			],
-			"desc": "Duración del impulso de mantenimiento de la vigilia (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Idioma:",
-				" ES     Castellano"
-			],
-			"desc": ""
+			"desc": "Animaciones de iconos en bucle en el menú raíz"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +266,79 @@
 				"duración"
 			],
 			"desc": "Duración de la animación del logo inicial (s=segundos)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Info extra en",
+				"modo reposo"
+			],
+			"desc": "Muestra información detallada en letra pequeña al reposar."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Info extra",
+				"al soldar"
+			],
+			"desc": "Muestra más datos por pantalla cuando se está soldando."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Ajustar la",
+				"potenc. máx."
+			],
+			"desc": "Elige el límite de potencia máxima del soldador (en vatios)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrar CJC",
+
+				"en el próximo inicio"
+
+			],
+			"desc": "Calibrar compensación de punta fría en el próximo inicio (no necesario si Delta T es < 5°C)"
+
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibrar voltaje",
+				"de entrada"
+			],
+			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Pulsos bat.",
+				"constantes"
+			],
+			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Impulso de potencia",
+				"tiempo de espera"
+			],
+			"desc": "Tiempo de espera antes de disparar cada pulso de mantenimiento de la vigilia (x 2,5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Impulso de potencia",
+				"duración"
+			],
+			"desc": "Duración del impulso de mantenimiento de la vigilia (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Volver a ajustes",
+				"de fábrica"
+			],
+			"desc": "Restablece todos los ajustes a los valores originales."
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Idioma:",
+				" ES  Castellano"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
index bc88e223..e2d00bf5 100644
--- a/Translations/translation_FI.json
+++ b/Translations/translation_FI.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Varmista että kärki on huoneenlämpöinen ennen jatkamista!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Haluatko varmasti palauttaa oletusarvot?",
 		"UVLOWarningString": "DC ALH.",
 		"UndervoltageString": "Alijännite",
@@ -66,35 +66,35 @@
 				"Virta-",
 				"asetukset"
 			],
-			"desc": "Virta-asetukset"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Juotos-",
 				"asetukset"
 			],
-			"desc": "Juotosasetukset"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Lepotilan",
 				"asetukset"
 			],
-			"desc": "Virransäästöasetukset"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Käyttö-",
 				"liittymä"
 			],
-			"desc": "Käyttöliittymän asetukset"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Lisä-",
 				"asetukset"
 			],
-			"desc": "Lisäasetukset"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Virtalähde. Asettaa katkaisujännitteen. (DC 10V) (S 3.3V per kenno, poistaa virtarajoitukset)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Pienin",
+				"jännite"
+			],
+			"desc": "Pienin sallittu jännite per kenno (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"jännite"
+			],
+			"desc": "Ensisijainen maksimi QC jännite"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Tehostus-",
+				"lämpötila"
+			],
+			"desc": "Tehostustilan lämpötila"
+		},
+		"AutoStart": {
+			"text2": [
+				"Autom.",
+				"käynnistys"
+			],
+			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. (E=Ei käytössä | J=juotostila | L=Lepotila | H=Lepotila huoneenlämpö)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Lämmön muutos",
+				"lyhyt painal."
+			],
+			"desc": "Lämpötilan muutos lyhyellä painalluksella"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Lämmön muutos",
+				"pitkä painal."
+			],
+			"desc": "Lämpötilan muutos pitkällä painalluksella"
+		},
+		"LockingMode": {
+			"text2": [
+				"Salli nappien",
+				"lukitus"
+			],
+			"desc": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Liikkeen",
+				"herkkyys"
+			],
+			"desc": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Lepotilan",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Automaattisen sammutuksen ajastus (m=minuuttia)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Liikkeen",
-				"herkkyys"
+				"Hall-",
+				"herk."
 			],
-			"desc": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"
+			"desc": "Hall-efektianturin herkkyys lepotilan tunnistuksessa (0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=celsius, F=fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Tiedot",
-				"lepotilassa"
-			],
-			"desc": "Näyttää yksityiskohtaisemmat pienemmällä fontilla tiedot lepotilassa."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Näytön",
@@ -154,20 +210,6 @@
 			],
 			"desc": "O=oikeakätinen | V=vasenkätinen | A=automaattinen"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Tehostus-",
-				"lämpötila"
-			],
-			"desc": "Tehostustilan lämpötila"
-		},
-		"AutoStart": {
-			"text2": [
-				"Autom.",
-				"käynnistys"
-			],
-			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. (E=Ei käytössä | J=juotostila | L=Lepotila | H=Lepotila huoneenlämpö)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Jäähdytyksen",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibroi",
-				"lämpötila?"
-			],
-			"desc": "Kalibroi kärjen lämpötilaeron"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Palauta",
-				"tehdasasetukset?"
-			],
-			"desc": "Palauta kaikki asetukset oletusarvoihin"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibroi",
-				"tulojännite?"
-			],
-			"desc": "Tulojännitten kalibrointi (VIN) (paina pitkään poistuaksesi)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Tarkempi",
-				"juotosnäyttö"
-			],
-			"desc": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla juotostilassa"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Selityksien",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Selityksien vieritysnopeus (H=hidas | N=nopea)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"jännite"
-			],
-			"desc": "Ensisijainen maksimi QC jännite"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Tehon-",
-				"rajoitus"
-			],
-			"desc": "Suurin sallittu teho (Watti)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Suunnanvaihto",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Lämpötilapainikkeiden suunnan vaihtaminen"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Lämmön muutos",
-				"lyhyt painal."
+				"Animaation",
+				"nopeus"
 			],
-			"desc": "Lämpötilan muutos lyhyellä painalluksella"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Lämmön muutos",
-				"pitkä painal."
-			],
-			"desc": "Lämpötilan muutos pitkällä painalluksella"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Herätyspulssin",
-				"voimakkuus"
-			],
-			"desc": "Herätyspulssin voimakkuus (watti)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall-",
-				"herk."
-			],
-			"desc": "Hall-efektianturin herkkyys lepotilan tunnistuksessa (0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Salli nappien",
-				"lukitus"
-			],
-			"desc": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Pienin",
-				"jännite"
-			],
-			"desc": "Pienin sallittu jännite per kenno (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Animaatioiden nopeus valikossa (P=pois | A=alhainen | K=keskiverto | S=suuri)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Toista animaatiot valikossa"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Animaation",
-				"nopeus"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Animaatioiden nopeus valikossa (P=pois | A=alhainen | K=keskiverto | S=suuri)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Tiedot",
+				"lepotilassa"
+			],
+			"desc": "Näyttää yksityiskohtaisemmat pienemmällä fontilla tiedot lepotilassa."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Tarkempi",
+				"juotosnäyttö"
+			],
+			"desc": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla juotostilassa"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Tehon-",
+				"rajoitus"
+			],
+			"desc": "Suurin sallittu teho (Watti)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibroi",
+				"tulojännite?"
+			],
+			"desc": "Tulojännitten kalibrointi (VIN) (paina pitkään poistuaksesi)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Herätyspulssin",
+				"voimakkuus"
+			],
+			"desc": "Herätyspulssin voimakkuus (Watti)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Herätyspulssin kesto (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Palauta",
+				"tehdasasetukset?"
+			],
+			"desc": "Palauta kaikki asetukset oletusarvoihin"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Kieli:",
-				" FI     Suomi"
+				" FI       Suomi"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
index f5c763b4..1e155590 100644
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Assurez-vous que la panne soit à température ambiante avant de continuer !",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?",
 		"UVLOWarningString": "DC FAIBL",
 		"UndervoltageString": "Sous-tension",
@@ -66,35 +66,35 @@
 				"Paramètres",
 				"d'alim."
 			],
-			"desc": "Paramètres d'alimentation"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Paramètres",
 				"de soudure"
 			],
-			"desc": "Paramètres de soudure"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Mode",
 				"veille"
 			],
-			"desc": "Paramètres d'économie d'énergie"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interface",
 				"utilisateur"
 			],
-			"desc": "Paramètres de l'interface utilisateur"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Options",
 				"avancées"
 			],
-			"desc": "Options avancées"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Source d'alimentation. Règle la tension de coupure (DC 10V) (S 3.3V par cellules, désactive la limite de puissance)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Tension",
+				"minimale"
+			],
+			"desc": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Tension",
+				"QC"
+			],
+			"desc": "Tension maximale désirée avec une alimentation QC"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Délai",
+				"expir. PD"
+			],
+			"desc": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Temp.",
+				"boost"
+			],
+			"desc": "Température utilisée en \"mode boost\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Chauffer au",
+				"démarrage"
+			],
+			"desc": "D=désactivé | A=activé | V=mode veille | O=mode veille à température ambiante"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Incrément",
+				"appui court"
+			],
+			"desc": "Incrément de changement de température sur appui court"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Incrément",
+				"appui long"
+			],
+			"desc": "Incrément de changement de température sur appui long"
+		},
+		"LockingMode": {
+			"text2": [
+				"Verrouiller",
+				"les boutons"
+			],
+			"desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Sensibilité",
+				"au mouvement"
+			],
+			"desc": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Délai avant l'arrêt du fer à souder (m=minutes)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
 				"Sensibilité",
-				"au mouvement"
+				"capteur effet hall"
 			],
-			"desc": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
+			"desc": "Sensibilité du capteur à effet Hall pour la mise en veille (0=désactivé | 1=peu sensible | ... | 9=très sensible)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=Celsius | F=Fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Écran veille",
-				"détaillé"
-			],
-			"desc": "Afficher les informations détaillées sur l'écran de veille"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientation",
@@ -154,20 +210,6 @@
 			],
 			"desc": "D=droitier | G=gaucher | A=automatique"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Temp.",
-				"boost"
-			],
-			"desc": "Température utilisée en \"mode boost\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Chauffer au",
-				"démarrage"
-			],
-			"desc": "D=désactivé | A=activé | V=mode veille | O=mode veille à température ambiante"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Refroidir en",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Étalonner",
-				"température"
-			],
-			"desc": "Étalonner température de la panne"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Réinitialisation",
-				"d'usine"
-			],
-			"desc": "Réinitialiser tous les réglages"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Étalonner",
-				"tension d'entrée"
-			],
-			"desc": "Étalonner tension d'entrée (appui long pour quitter)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Écran soudure",
-				"détaillé"
-			],
-			"desc": "Afficher les informations détaillées sur l'écran de soudure"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Vitesse de",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Vitesse de défilement du texte (R=rapide | L=lent)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Tension",
-				"QC"
-			],
-			"desc": "Tension maximale désirée avec une alimentation QC"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"Délai",
-				"expir. PD"
-			],
-			"desc": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Limite de",
-				"puissance"
-			],
-			"desc": "Puissance maximale utilisable (W=watts)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Inverser les",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Inverser les boutons d'ajustement de température"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Incrément",
-				"appui court"
-			],
-			"desc": "Incrément de changement de température sur appui court"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Incrément",
-				"appui long"
-			],
-			"desc": "Incrément de changement de température sur appui long"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Puissance",
-				"impulsions"
-			],
-			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries (watts)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Sensibilité",
-				"capteur effet hall"
-			],
-			"desc": "Sensibilité du capteur à effet Hall pour la mise en veille (0=désactivé | 1=peu sensible | ... | 9=très sensible)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Verrouiller",
-				"les boutons"
-			],
-			"desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Tension",
-				"minimale"
-			],
-			"desc": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Rejouer",
-				"anim. icônes"
-			],
-			"desc": "Rejouer en boucle les animations des icônes dans le menu principal"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Vitesse",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Vitesse des animations des icônes dans le menu (D=désactivé | L=lente | M=moyenne | R=rapide)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Délai entre",
-				"les impulsions"
+				"Rejouer",
+				"anim. icônes"
 			],
-			"desc": "Délai entre chaque impulsion pour empêcher la mise en veille (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Durée des",
-				"impulsions"
-			],
-			"desc": "Durée des impulsions pour empêcher la mise en veille (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Langue :",
-				" FR     Français"
-			],
-			"desc": "Langue du firmware"
+			"desc": "Rejouer en boucle les animations des icônes dans le menu principal"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"au démarrage"
 			],
 			"desc": "Définit la durée d'affichage du logo au démarrage (s=secondes)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Écran veille",
+				"détaillé"
+			],
+			"desc": "Afficher les informations détaillées sur l'écran de veille"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Écran soudure",
+				"détaillé"
+			],
+			"desc": "Afficher les informations détaillées sur l'écran de soudure"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Limite de",
+				"puissance"
+			],
+			"desc": "Puissance maximale utilisable (W=watts)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Étalonner",
+				"tension d'entrée"
+			],
+			"desc": "Étalonner tension d'entrée (appui long pour quitter)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Puissance",
+				"impulsions"
+			],
+			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries (watts)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Délai entre",
+				"les impulsions"
+			],
+			"desc": "Délai entre chaque impulsion pour empêcher la mise en veille (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Durée des",
+				"impulsions"
+			],
+			"desc": "Durée des impulsions pour empêcher la mise en veille (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Réinitialisation",
+				"d'usine"
+			],
+			"desc": "Réinitialiser tous les réglages"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Langue:",
+				" FR    Français"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
index fd687edd..1b80fe3c 100644
--- a/Translations/translation_HR.json
+++ b/Translations/translation_HR.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?",
 		"UVLOWarningString": "BATERIJA",
 		"UndervoltageString": "PRENIZAK NAPON",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Postavke",
 				"lemljenja"
 			],
-			"desc": "Postavke pri lemljenju"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Ušteda",
 				"energije"
 			],
-			"desc": "Postavke spavanja i štednje energije"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Korisničko",
 				"sučelje"
 			],
-			"desc": "Postavke korisničkog sučelja"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Napredne",
 				"opcije"
 			],
-			"desc": "Upravljanje naprednim opcijama"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Izvor napajanja. Postavlja napon isključivanja. (DC 10V) (S 3.3V po ćeliji)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Snaga",
+				"napajanja"
+			],
+			"desc": "Snaga modula za napajanje"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperatura u pojačanom (Boost) načinu."
+		},
+		"AutoStart": {
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (I=isključeno | L=lemljenje | R=rezervni | S=rezervni sobna temperatura)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Osjetljivost",
+				"pokreta"
+			],
+			"desc": "Osjetljivost prepoznavanja pokreta. (0=Ugašeno | 1=Najmanje osjetljivo | ... | 9=Najosjetljivije)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. (Minute)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Osjetljivost",
-				"pokreta"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Osjetljivost prepoznavanja pokreta. (0=Ugašeno | 1=Najmanje osjetljivo | ... | 9=Najosjetljivije)"
+			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Ugašeno | 1=Najmanje osjetljivo | ... | 9=Najosjetljivije)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Jedinica temperature. (C=Celzij | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detalji",
-				"pri čekanju"
-			],
-			"desc": "Prikazivanje detaljnih informacija tijekom čekanja."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Rotacija",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Orijentacija ekrana. (D=Desnoruki | L=Ljevoruki | A=Automatski)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatura u pojačanom (Boost) načinu."
-		},
-		"AutoStart": {
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (I=isključeno | L=lemljenje | R=rezervni | S=rezervni sobna temperatura)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Upozorenje",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibracija",
-				"temperature"
-			],
-			"desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Tvorničke",
-				"postavke"
-			],
-			"desc": "Vraćanje svih postavki na tvorničke vrijednosti."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibracija",
-				"napona napajanja"
-			],
-			"desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detalji",
-				"pri lemljenju"
-			],
-			"desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Brzina",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Brzina kretanja dugačkih poruka. (B=brzo | S=sporo)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Snaga",
-				"napajanja"
-			],
-			"desc": "Snaga modula za napajanje"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Ugašeno | 1=Najmanje osjetljivo | ... | 9=Najosjetljivije)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | B=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | B=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detalji",
+				"pri čekanju"
+			],
+			"desc": "Prikazivanje detaljnih informacija tijekom čekanja."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detalji",
+				"pri lemljenju"
+			],
+			"desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibracija",
+				"napona napajanja"
+			],
+			"desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Tvorničke",
+				"postavke"
+			],
+			"desc": "Vraćanje svih postavki na tvorničke vrijednosti."
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Jezik:",
-				" HR     Hrvatski"
+				" HR    Hrvatski"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
index 56f55987..926d9fd9 100644
--- a/Translations/translation_HU.json
+++ b/Translations/translation_HU.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Folytatás előtt győződjön meg róla, hogy a forrasztó hegy szobahőmérsékletű!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Biztos visszaállítja a beállításokat alapértékekre?",
 		"UVLOWarningString": "DC TÚL KEVÉS",
 		"UndervoltageString": "Alulfeszültség",
@@ -66,35 +66,35 @@
 				"Táp",
 				"beállítások"
 			],
-			"desc": "Táp beállítások"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Forrasztási",
 				"beállítások"
 			],
-			"desc": "Forrasztási beállítások"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Alvási",
 				"módok"
 			],
-			"desc": "Energiatakarékossági beállítások"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Felhasználói",
 				"felület"
 			],
-			"desc": "Felhasználói felület beállításai"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Haladó",
 				"beállítások"
 			],
-			"desc": "Haladó beállítások"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Kikapcsolási feszültség beállítása (DC:10V | S:3.3V/LiPo cella | ki)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"feszültség"
+			],
+			"desc": "Minimális engedélyezett cellafeszültség (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Max. USB",
+				"feszültség"
+			],
+			"desc": "Maximális USB feszültség (QuickCharge)"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"időtúllépés"
+			],
+			"desc": "PD egyeztetés időkerete (kompatibilitás QC töltőkkel) (x 100ms)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"hőmérséklet"
+			],
+			"desc": "Hőmérséklet \"boost\" módban"
+		},
+		"AutoStart": {
+			"text2": [
+				"Automatikus",
+				"indítás"
+			],
+			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba (K=ki | F=forrasztás | A=alvó mód | Sz=szobahőmérséklet)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Hőm. állítás",
+				"rövid"
+			],
+			"desc": "Hőmérséklet állítás rövid gombnyomásra (C | F)"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Hőm. állítás",
+				"hosszú"
+			],
+			"desc": "Hőmérséklet állítás hosszú gombnyomásra (C | F)"
+		},
+		"LockingMode": {
+			"text2": [
+				"Lezárás",
+				"engedélyezés"
+			],
+			"desc": "Forrasztás közben mindkét gombot hosszan lenyomva lezárja a kezelést (K=ki | B=csak \"boost\" módban | T=teljes lezárás)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Mozgás",
+				"érzékenység"
+			],
+			"desc": "Mozgás érzékenység beállítása (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Alvási",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Kikapcsolási időzítő (perc)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Mozgás",
+				"Alvásérzékelő",
 				"érzékenység"
 			],
-			"desc": "Mozgás érzékenység beállítása (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
+			"desc": "Alvásérzékelő gyorsulásmérő érzékenysége (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Hőmérséklet mértékegysége (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Részletes",
-				"készenlét"
-			],
-			"desc": "Részletes információk megjelenítése kisebb betűméretben a készenléti képernyőn"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Kijelző",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Kijelző tájolása (J=jobbkezes | B=balkezes | A=automatikus)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"hőmérséklet"
-			],
-			"desc": "Hőmérséklet \"boost\" módban"
-		},
-		"AutoStart": {
-			"text2": [
-				"Automatikus",
-				"indítás"
-			],
-			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba (K=ki | F=forrasztás | A=alvó mód | Sz=szobahőmérséklet)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Villogás",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Villogjon a hőmérséklet kijelzése hűlés közben, amíg a forrasztó hegy forró"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Hőmérséklet",
-				"kalibrálása?"
-			],
-			"desc": "Forrasztó hegy hőmérséklet-érzékelőjének kalibrálása"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Gyári",
-				"beállítások?"
-			],
-			"desc": "Beállítások alaphelyzetbe állítása"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Bemeneti fesz.",
-				"kalibrálása?"
-			],
-			"desc": "Bemeneti feszültség kalibrálása (hosszan nyomva kilép)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Részletes",
-				"forrasztás infó"
-			],
-			"desc": "Részletes információk megjelenítése forrasztás közben"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Görgetés",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Szöveggörgetés sebessége"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Max. USB",
-				"feszültség"
-			],
-			"desc": "Maximális USB feszültség (QuickCharge)"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"időtúllépés"
-			],
-			"desc": "PD egyeztetés időkerete (kompatibilitás QC töltőkkel) (x 100ms)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Teljesítmény",
-				"maximum"
-			],
-			"desc": "Maximális felvett teljesitmény beállitása"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"+/- gomb",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Forrasztó hegy hőmérsékletállító gombok felcserélése"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Hőm. állítás",
-				"rövid"
-			],
-			"desc": "Hőmérséklet állítás rövid gombnyomásra (C | F)"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Hőm. állítás",
-				"hosszú"
-			],
-			"desc": "Hőmérséklet állítás hosszú gombnyomásra (C | F)"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Ébr. pulzus",
-				"nagysága"
-			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok nagysága (W)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Alvásérzékelő",
-				"érzékenység"
-			],
-			"desc": "Alvásérzékelő gyorsulásmérő érzékenysége (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Lezárás",
-				"engedélyezés"
-			],
-			"desc": "Forrasztás közben mindkét gombot hosszan lenyomva lezárja a kezelést (K=ki | B=csak \"boost\" módban | T=teljes lezárás)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"feszültség"
-			],
-			"desc": "Minimális engedélyezett cellafeszültség (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Folytonos",
-				"animáció"
-			],
-			"desc": "Főmenü ikonjainak folytonos animációja"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Animáció",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Menüikonok animációjának sebessége (0=ki | L=lassú | K=közepes | Gy=gyors)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Ébr. pulzus",
-				"időköze"
+				"Folytonos",
+				"animáció"
 			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időköze (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Ébr. pulzus",
-				"időtartama"
-			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időtartama (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Nyelv:",
-				" HU     Magyar"
-			],
-			"desc": "Firmware nyelve"
+			"desc": "Főmenü ikonjainak folytonos animációja"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,7 +264,77 @@
 				"Boot logo",
 				"duration"
 			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Részletes",
+				"készenlét"
+			],
+			"desc": "Részletes információk megjelenítése kisebb betűméretben a készenléti képernyőn"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Részletes",
+				"forrasztás infó"
+			],
+			"desc": "Részletes információk megjelenítése forrasztás közben"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Teljesítmény",
+				"maximum"
+			],
+			"desc": "Maximális felvett teljesitmény beállitása"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Bemeneti fesz.",
+				"kalibrálása?"
+			],
+			"desc": "Bemeneti feszültség kalibrálása (hosszan nyomva kilép)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Ébr. pulzus",
+				"nagysága"
+			],
+			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok nagysága (W)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Ébr. pulzus",
+				"időköze"
+			],
+			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időköze (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Ébr. pulzus",
+				"időtartama"
+			],
+			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időtartama (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Gyári",
+				"beállítások?"
+			],
+			"desc": "Beállítások alaphelyzetbe állítása"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Nyelv:",
+				" HU      Magyar"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
index 83d89b21..0e63f30c 100644
--- a/Translations/translation_IT.json
+++ b/Translations/translation_IT.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Assicurarsi che la punta si trovi a temperatura ambiente prima di continuare!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ripristinare le impostazioni iniziali?",
 		"UVLOWarningString": "DC BASSA",
 		"UndervoltageString": "DC INSUFFICIENTE",
@@ -66,35 +66,35 @@
 				"Opzioni",
 				"alimentaz"
 			],
-			"desc": "Menù d'impostazioni per l'alimentazione"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Opzioni",
 				"saldatura"
 			],
-			"desc": "Menù d'impostazioni della modalità Saldatura"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Risparmio",
 				"energetico"
 			],
-			"desc": "Menù d'impostazioni per il risparmio energetico"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interfaccia",
 				"utente"
 			],
-			"desc": "Menù d'impostazioni dell'interfaccia utente"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Opzioni",
 				"avanzate"
 			],
-			"desc": "Menù d'impostazioni avanzate"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Imposta una tensione minima di alimentazione attraverso la selezione di una sorgente [DC: 10 V; 3S/4S/5S/6S: 3,3 V per cella]"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Tensione",
+				"min celle"
+			],
+			"desc": "Modifica la tensione di minima carica delle celle di una batteria Li-Po [3S: 3,0-3,7 V; 4S/5S/6S: 2,4-3,7 V]"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Voltaggio",
+				"QC"
+			],
+			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge [volt]"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Abilitazione",
+				"USB PD"
+			],
+			"desc": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Temp",
+				"Turbo"
+			],
+			"desc": "Imposta la temperatura della funzione Turbo [°C/°F]"
+		},
+		"AutoStart": {
+			"text2": [
+				"Avvio",
+				"automatico"
+			],
+			"desc": "Attiva automaticamente il saldatore quando viene alimentato [D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente]"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp passo",
+				"breve"
+			],
+			"desc": "Imposta il passo dei valori di temperatura per una breve pressione dei tasti"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp passo",
+				"lungo"
+			],
+			"desc": "Imposta il passo dei valori di temperatura per una lunga pressione dei tasti"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blocco",
+				"tasti"
+			],
+			"desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Sensibilità",
+				"al movimento"
+			],
+			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo [0: nessuna; 1: minima; 9: massima]"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Imposta il timer per lo spegnimento [minuti]"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Sensibilità",
-				"al movimento"
+				"Sensore",
+				"Hall"
 			],
-			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo [0: nessuna; 1: minima; 9: massima]"
+			"desc": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità Riposo [0: nessuna; 1: minima; 9: massima]"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Scegli l'unità di misura per la temperatura [C: grado Celsius; F: grado Farenheit]"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Interfaccia",
-				"testuale"
-			],
-			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientamento",
@@ -154,54 +210,13 @@
 			],
 			"desc": "Imposta l'orientamento dello schermo [D: mano destra; S: mano sinistra; A: automatico]"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Temp",
-				"Turbo"
-			],
-			"desc": "Imposta la temperatura della funzione Turbo [°C/°F]"
-		},
-		"AutoStart": {
-			"text2": [
-				"Avvio",
-				"automatico"
-			],
-			"desc": "Attiva automaticamente il saldatore quando viene alimentato [D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente]"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Avviso",
-				"punta calda"],
+				"punta calda"
+			],
 			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibrazione",
-				"temperatura"
-			],
-			"desc": "Calibra le rilevazioni di temperatura"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Ripristino",
-				"impostazioni"
-			],
-			"desc": "Ripristina le impostazioni allo stato iniziale"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibrazione",
-				"tensione"
-			],
-			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Dettagli",
-				"saldatura"
-			],
-			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Velocità",
@@ -209,27 +224,6 @@
 			],
 			"desc": "Imposta la velocità di scorrimento del testo [L: lenta; V: veloce]"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Voltaggio",
-				"QC"
-			],
-			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge [volt]"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"Abilitazione",
-				"USB PD"
-			],
-			"desc": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Limite",
-				"potenza"
-			],
-			"desc": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Inversione",
@@ -237,55 +231,6 @@
 			],
 			"desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp passo",
-				"breve"
-			],
-			"desc": "Imposta il passo dei valori di temperatura per una breve pressione dei tasti"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp passo",
-				"lungo"
-			],
-			"desc": "Imposta il passo dei valori di temperatura per una lunga pressione dei tasti"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Potenza",
-				"impulso"
-			],
-			"desc": "Regola la potenza di un \"impulso sveglia\" atto a prevenire lo standby eventuale dell'alimentatore [watt]"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Sensore",
-				"Hall"
-			],
-			"desc": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità Riposo [0: nessuna; 1: minima; 9: massima]"
-		},
-		"LockingMode": {
-			"text2": [
-				"Blocco",
-				"tasti"
-			],
-			"desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Tensione",
-				"min celle"
-			],
-			"desc": "Modifica la tensione di minima carica delle celle di una batteria Li-Po [3S: 3,0-3,7 V; 4S/5S/6S: 2,4-3,7 V]"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Ciclo",
-				"animazioni"
-			],
-			"desc": "Abilita la riproduzione ciclica delle animazioni del menù principale"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Velocità",
@@ -293,26 +238,12 @@
 			],
 			"desc": "Imposta la velocità di riproduzione delle animazioni del menù principale [O: OFF; L: lenta; M: media; V: veloce]"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Distanza",
-				"impulsi"
+				"Ciclo",
+				"animazioni"
 			],
-			"desc": "Imposta il tempo che deve intercorrere tra due \"impulsi sveglia\" [multipli di 2,5 s]"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Durata",
-				"impulso"
-			],
-			"desc": "Regola la durata dell'«impulso sveglia» [multipli di 250 ms]"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Lingua:",
-				" IT     Italiano"
-			],
-			"desc": "Imposta la lingua del dispositivo"
+			"desc": "Abilita la riproduzione ciclica delle animazioni del menù principale"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,6 +265,76 @@
 				"logo"
 			],
 			"desc": "Imposta la permanenza sullo schermo del logo iniziale [secondi]"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Interfaccia",
+				"testuale"
+			],
+			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Dettagli",
+				"saldatura"
+			],
+			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Limite",
+				"potenza"
+			],
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibrazione",
+				"tensione"
+			],
+			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Potenza",
+				"impulso"
+			],
+			"desc": "Regola la potenza di un \"impulso sveglia\" atto a prevenire lo standby eventuale dell'alimentatore [watt]"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Distanza",
+				"impulsi"
+			],
+			"desc": "Imposta il tempo che deve intercorrere tra due \"impulsi sveglia\" [multipli di 2,5 s]"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Durata",
+				"impulso"
+			],
+			"desc": "Regola la durata dell'«impulso sveglia» [multipli di 250 ms]"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Ripristino",
+				"impostazioni"
+			],
+			"desc": "Ripristina le impostazioni allo stato iniziale"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Lingua:",
+				" IT    Italiano"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
index 8e61670f..6e435695 100755
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "続行する前に、コテ先が室温と同じになっていることを確認してください",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "設定をリセットしますか？",
 		"UVLOWarningString": "電圧が低すぎます",
 		"UndervoltageString": "Undervoltage",
@@ -51,23 +51,23 @@
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": "電源設定",
-			"desc": "電源設定"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": "半田付け設定",
-			"desc": "半田付け設定"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": "待機設定",
-			"desc": "待機設定"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": "UI設定",
-			"desc": "ユーザーインターフェイスの設定"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": "高度な設定",
-			"desc": "高度な設定"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -75,6 +75,42 @@
 			"text2": "下限電圧",
 			"desc": "下限電圧を指定する <DC=10V | S=セルあたり3.3V、電力制限を無効化>"
 		},
+		"MinVolCell": {
+			"text2": "最低電圧",
+			"desc": "セルあたりの最低電圧 <ボルト> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+		},
+		"QCMaxVoltage": {
+			"text2": "QC電圧",
+			"desc": "QC電源使用時に要求する目標電圧"
+		},
+		"PDNegTimeout": {
+			"text2": "PD timeout",
+			"desc": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
+		},
+		"BoostTemperature": {
+			"text2": "ブースト温度",
+			"desc": "ブーストモードで使用される温度"
+		},
+		"AutoStart": {
+			"text2": "自動加熱",
+			"desc": "電源投入時に自動的に加熱する <×=オフ | 熱=半田付けモード | 待=スタンバイモード | 室=室温スタンバイモード>"
+		},
+		"TempChangeShortStep": {
+			"text2": "温度変化 短",
+			"desc": "ボタンを短く押した時の温度変化値"
+		},
+		"TempChangeLongStep": {
+			"text2": "温度変化 長",
+			"desc": "ボタンを長押しした時の温度変化値"
+		},
+		"LockingMode": {
+			"text2": "ボタンロック",
+			"desc": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <×=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
+		},
+		"MotionSensitivity": {
+			"text2": "動きの感度",
+			"desc": "0=オフ | 1=最低感度 | ... | 9=最高感度"
+		},
 		"SleepTemperature": {
 			"text2": "待機温度",
 			"desc": "スタンバイ時のコテ先温度"
@@ -87,116 +123,37 @@
 			"text2": "自動オフ",
 			"desc": "自動電源オフまでの待機時間 <m=分>"
 		},
-		"MotionSensitivity": {
-			"text2": "動きの感度",
-			"desc": "0=オフ | 1=最低感度 | ... | 9=最高感度"
+		"HallEffSensitivity": {
+			"text2": "磁界感度",
+			"desc": "スタンバイモードに入るのに使用される磁場センサーの感度 <0=オフ | 1=最低感度 | ... | 9=最高感度>"
 		},
 		"TemperatureUnit": {
 			"text2": "温度単位",
 			"desc": "C=摂氏 | F=華氏"
 		},
-		"AdvancedIdle": {
-			"text2": "詳細な待受画面",
-			"desc": "待ち受け画面に詳細情報を表示する"
-		},
 		"DisplayRotation": {
 			"text2": "画面の向き",
 			"desc": "右=右利き | 左=左利き | 自=自動"
 		},
-		"BoostTemperature": {
-			"text2": "ブースト温度",
-			"desc": "ブーストモードで使用される温度"
-		},
-		"AutoStart": {
-			"text2": "自動加熱",
-			"desc": "電源投入時に自動的に加熱する <×=オフ | 熱=半田付けモード | 待=スタンバイモード | 室=室温スタンバイモード>"
-		},
 		"CooldownBlink": {
 			"text2": "冷却中に点滅",
 			"desc": "加熱の停止後、コテ先が熱い間は温度表示を点滅する"
 		},
-		"CalibrateCJC": {
-			"text2": "温度校正",
-			"desc": "コテ先の温度校正を開始する"
-		},
-		"SettingsReset": {
-			"text2": "設定をリセット",
-			"desc": "すべての設定を初期化する"
-		},
-		"VoltageCalibration": {
-			"text2": "電圧校正",
-			"desc": "入力電圧(VIN)の校正を開始する <長押しで終了>"
-		},
-		"AdvancedSoldering": {
-			"text2": "詳細な作業画面",
-			"desc": "半田付け画面に詳細情報を表示する"
-		},
 		"ScrollingSpeed": {
 			"text2": "スクロール速度",
 			"desc": "テキストをスクロールする速さ <遅=遅い | 速=速い>"
 		},
-		"QCMaxVoltage": {
-			"text2": "QC電圧",
-			"desc": "QC電源使用時に要求する目標電圧"
-		},
-		"PDNegTimeout": {
-			"text2": [
-			"PD",
-			"timeout"
-		],
-			"desc": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
-		},
-		"PowerLimit": {
-			"text2": "電力制限",
-			"desc": "最大電力を制限する <W=ワット>"
-		},
 		"ReverseButtonTempChange": {
 			"text2": "キー入れ替え",
 			"desc": "温度設定時に+ボタンと-ボタンを入れ替える"
 		},
-		"TempChangeShortStep": {
-			"text2": "温度変化 短",
-			"desc": "ボタンを短く押した時の温度変化値"
-		},
-		"TempChangeLongStep": {
-			"text2": "温度変化 長",
-			"desc": "ボタンを長押しした時の温度変化値"
-		},
-		"PowerPulsePower": {
-			"text2": "電力パルス",
-			"desc": "電源をオンに保つための電力パルス <ワット>"
-		},
-		"HallEffSensitivity": {
-			"text2": "磁界感度",
-			"desc": "スタンバイモードに入るのに使用される磁場センサーの感度 <0=オフ | 1=最低感度 | ... | 9=最高感度>"
-		},
-		"LockingMode": {
-			"text2": "ボタンロック",
-			"desc": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <×=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
-		},
-		"MinVolCell": {
-			"text2": "最低電圧",
-			"desc": "セルあたりの最低電圧 <ボルト> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": "動画をループ",
-			"desc": "メニューアイコンのアニメーションをループする"
-		},
 		"AnimSpeed": {
 			"text2": "動画の速度",
 			"desc": "メニューアイコンのアニメーションの速さ <×=再生しない | 遅=低速 | 中=中速 | 速=高速>"
 		},
-		"PowerPulseWait": {
-			"text2": "パルス間隔",
-			"desc": "電源をオンに保つための電力パルスの時間間隔 <x2.5s（秒）>"
-		},
-		"PowerPulseDuration": {
-			"text2": "パルス時間長",
-			"desc": "電源をオンに保つための電力パルスの時間長 <x250ms（ミリ秒）>"
-		},
-		"LanguageSwitch": {
-			"text2": "言語： 日本語",
-			"desc": ""
+		"AnimLoop": {
+			"text2": "動画をループ",
+			"desc": "メニューアイコンのアニメーションをループする"
 		},
 		"Brightness": {
 			"text2": "画面輝度",
@@ -207,11 +164,48 @@
 			"desc": "画面の色を反転する"
 		},
 		"LOGOTime": {
-			"text2": [
-			"Boot logo",
-			"duration"
-		],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"text2": "Boot logo duration",
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": "詳細な待受画面",
+			"desc": "待ち受け画面に詳細情報を表示する"
+		},
+		"AdvancedSoldering": {
+			"text2": "詳細な作業画面",
+			"desc": "半田付け画面に詳細情報を表示する"
+		},
+		"PowerLimit": {
+			"text2": "電力制限",
+			"desc": "最大電力を制限する <W=ワット>"
+		},
+		"CalibrateCJC": {
+			"text2": "Calibrate CJC",
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": "電圧校正",
+			"desc": "入力電圧(VIN)の校正を開始する <長押しで終了>"
+		},
+		"PowerPulsePower": {
+			"text2": "電力パルス",
+			"desc": "電源をオンに保つための電力パルス <ワット>"
+		},
+		"PowerPulseWait": {
+			"text2": "パルス間隔",
+			"desc": "電源をオンに保つための電力パルスの時間間隔 <x2.5s（秒）>"
+		},
+		"PowerPulseDuration": {
+			"text2": "パルス時間長",
+			"desc": "電源をオンに保つための電力パルスの時間長 <x250ms（ミリ秒）>"
+		},
+		"SettingsReset": {
+			"text2": "設定をリセット",
+			"desc": "すべての設定を初期化する"
+		},
+		"LanguageSwitch": {
+			"text2": "言語： 日本語",
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
index 7a590b39..81a8a403 100644
--- a/Translations/translation_LT.json
+++ b/Translations/translation_LT.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ar norite atstatyti nustatymus į numatytas reikšmes?",
 		"UVLOWarningString": "MAŽ VOLT",
 		"UndervoltageString": "Žema įtampa",
@@ -66,35 +66,35 @@
 				"Maitinimo",
 				"nustatymai"
 			],
-			"desc": "Su maitinblokiu susiję nustatymai"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Litavimo",
 				"nustatymai"
 			],
-			"desc": "Litavimo nustatymai"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Miego",
 				"režimai"
 			],
-			"desc": "Energijos tausojimo nustatymai"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Naudotojo",
 				"sąsaja"
 			],
-			"desc": "Naudotojo sąsajos nustatymai"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Išplėsti.",
 				"nustatymai"
 			],
-			"desc": "Išplėstiniai nustatymai"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Išjungimo įtampa. (DC 10V) (arba celių [S] kiekis [3.3V per celę])"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimalus",
+				"voltažas"
+			],
+			"desc": "Minimalus voltažas, kuris yra leidžiamas kiekvienam baterijos elementui (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC mait.",
+				"įtampa"
+			],
+			"desc": "Maksimali QC maitinimo bloko įtampa"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"laikas"
+			],
+			"desc": "PD suderinimo laikas žingsniais po 100ms suderinamumui su kai kuriais QC įkrovikliais"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Turbo",
+				"temperat."
+			],
+			"desc": "Temperatūra turbo režimu"
+		},
+		"AutoStart": {
+			"text2": [
+				"Automatinis",
+				"paleidimas"
+			],
+			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį (N=Ne | T=Taip | M=Miegas | K=Miegoti kambario temperatūroje)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp.keitim.",
+				"trump.spust."
+			],
+			"desc": "Temperatūros keitimo žingsnis trumpai spustėlėjus mygtuką"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp.keitim.",
+				"ilgas pasp."
+			],
+			"desc": "Temperatūros keitimo žingsnis ilgai paspaudus mygtuką"
+		},
+		"LockingMode": {
+			"text2": [
+				"Mygtukų",
+				"užraktas"
+			],
+			"desc": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte (I=Išjungta | T=leidžiamas tik Turbo režimas | V=Visiškas užrakinimas)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Judesio",
+				"jautrumas"
+			],
+			"desc": "Judesio jautrumas (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Miego",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Išjungimo laikas (minutės)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Judesio",
-				"jautrumas"
+				"Holo",
+				"jutiklis"
 			],
-			"desc": "Judesio jautrumas (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
+			"desc": "Holo jutiklio jautrumas nustatant miegą (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperatūros vienetai (C=Celsijus | F=Farenheitas)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detalus lau-",
-				"kimo ekranas"
-			],
-			"desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Ekrano",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Ekrano orientacija (D=Dešiniarankiams | K=Kairiarankiams | A=Automatinė)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Turbo",
-				"temperat."
-			],
-			"desc": "Temperatūra turbo režimu"
-		},
-		"AutoStart": {
-			"text2": [
-				"Automatinis",
-				"paleidimas"
-			],
-			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį (N=Ne | T=Taip | M=Miegas | K=Miegoti kambario temperatūroje)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Atvėsimo",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas?"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibruoti",
-				"temperatūrą?"
-			],
-			"desc": "Antgalio temperatūros kalibravimas"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Atstatyti",
-				"nustatymus?"
-			],
-			"desc": "Nustato nustatymus į numatytuosius"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibruoti",
-				"įvesties įtampą?"
-			],
-			"desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detalus lita-",
-				"vimo ekranas"
-			],
-			"desc": "Ar rodyti išsamią informaciją lituojant"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Aprašymo",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Greitis, kuriuo šis tekstas slenka"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC mait.",
-				"įtampa"
-			],
-			"desc": "Maksimali QC maitinimo bloko įtampa"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"laikas"
-			],
-			"desc": "PD suderinimo laikas žingsniais po 100ms suderinamumui su kai kuriais QC įkrovikliais"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Galios",
-				"riba"
-			],
-			"desc": "Didžiausia galia, kurią gali naudoti lituoklis (Vatai)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Sukeisti + -",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Sukeisti + - temperatūros keitimo mygtukus vietomis"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp.keitim.",
-				"trump.spust."
-			],
-			"desc": "Temperatūros keitimo žingsnis trumpai spustėlėjus mygtuką"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp.keitim.",
-				"ilgas pasp."
-			],
-			"desc": "Temperatūros keitimo žingsnis ilgai paspaudus mygtuką"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Galios",
-				"pulso W"
-			],
-			"desc": "Periodinis galios pulso intensyvumas maitinblokiui, neleidžiantis jam užmigti."
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Holo",
-				"jutiklis"
-			],
-			"desc": "Holo jutiklio jautrumas nustatant miegą (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Mygtukų",
-				"užraktas"
-			],
-			"desc": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte (I=Išjungta | T=leidžiamas tik Turbo režimas | V=Visiškas užrakinimas)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimalus",
-				"voltažas"
-			],
-			"desc": "Minimalus voltažas, kuris yra leidžiamas kiekvienam baterijos elementui (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Animacijų",
-				"pakartojimas"
-			],
-			"desc": "Leidžia kartoti animacijas be sustojimo pagrindiniame meniu"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Animacijų",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Paveiksliukų animacijų greitis meniu punktuose (I=Išjungtas | L=Lėtas | V=Vidutinis | G=Greitas)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Galios pulso",
-				"dažnumas"
+				"Animacijų",
+				"pakartojimas"
 			],
-			"desc": "Pasikartojantis laiko intervalas (x 2.5s), ties kuriuo kartojamas galios pulsas maitinblokiui, neleidžiantis jam užmigti"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Galios pulso",
-				"trukmė"
-			],
-			"desc": "Galios pulso aktyvioji trukmė (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Kalba:",
-				" LT     Lietuvių"
-			],
-			"desc": "Dabartinė programinės įrangos kalba"
+			"desc": "Leidžia kartoti animacijas be sustojimo pagrindiniame meniu"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,7 +264,77 @@
 				"Boot logo",
 				"duration"
 			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detalus lau-",
+				"kimo ekranas"
+			],
+			"desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detalus lita-",
+				"vimo ekranas"
+			],
+			"desc": "Ar rodyti išsamią informaciją lituojant"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Galios",
+				"riba"
+			],
+			"desc": "Didžiausia galia, kurią gali naudoti lituoklis (Vatai)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibruoti",
+				"įvesties įtampą?"
+			],
+			"desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Galios",
+				"pulso W"
+			],
+			"desc": "Periodinis galios pulso intensyvumas maitinblokiui, neleidžiantis jam užmigti."
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Galios pulso",
+				"dažnumas"
+			],
+			"desc": "Pasikartojantis laiko intervalas (x 2.5s), ties kuriuo kartojamas galios pulsas maitinblokiui, neleidžiantis jam užmigti"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Galios pulso",
+				"trukmė"
+			],
+			"desc": "Galios pulso aktyvioji trukmė (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Atstatyti",
+				"nustatymus?"
+			],
+			"desc": "Nustato nustatymus į numatytuosius"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Kalba:",
+				" LT    Lietuvių"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
index 8165ebb9..02f0c8ee 100644
--- a/Translations/translation_NL.json
+++ b/Translations/translation_NL.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Zorg ervoor dat de punt op kamertemperatuur is voor je verder gaat!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wilt zetten?",
 		"UVLOWarningString": "DC Laag",
 		"UndervoltageString": "Onderspanning",
@@ -66,35 +66,35 @@
 				"Voeding",
 				"instellingen"
 			],
-			"desc": "Voeding instellingen"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Soldeer",
 				"instellingen"
 			],
-			"desc": "Soldeer instellingen"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Slaap",
 				"Modes"
 			],
-			"desc": "Stroom besparings instellingen"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Weergave",
 				"instellingen"
 			],
-			"desc": "Weergave instellingen"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Geavanceerde",
 				"instellingen"
 			],
-			"desc": "Geavanceerde instellingen"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Spanningsbron. Stelt drempelspanning in. (DC 10V) (S 3.3V per cel)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum toegestaan voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"Voltage"
+			],
+			"desc": "Maximaal QC voltage dat gevraagd mag worden"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Punt temperatuur in boostmode"
+		},
+		"AutoStart": {
+			"text2": [
+				"Opstart",
+				"gedrag"
+			],
+			"desc": "Gedrag bij opstarten (U=Uit | G=Gebruiks-temperatuur | S=Slaapstand-temperatuur tot beweging | B=Uit tot beweging)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp veranderen",
+				"kort"
+			],
+			"desc": "Temperatuur verandering bij kort drukken"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp veranderen",
+				"lang"
+			],
+			"desc": "Temperatuur verandering bij lang drukken"
+		},
+		"LockingMode": {
+			"text2": [
+				"Knopblokkering",
+				"inschakelen"
+			],
+			"desc": "Tijdens solderen lang op beide knoppen drukken blokkeert de knoppen (U=Uit | B=Alleen boost mode | V=Volledig blokkeren)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Bewegings-",
+				"gevoeligheid"
+			],
+			"desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Slaap",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Tijd voordat soldeerbout automatisch uitschakelt (M=minuten)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Bewegings-",
+				"Hall sensor",
 				"gevoeligheid"
 			],
-			"desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+			"desc": "Gevoeligheid van de Hall effect sensor om naar slaapmodus te gaan (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperatuureenheid (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Gedetailleerd",
-				"startscherm"
-			],
-			"desc": "Gedetailleerde informatie weergeven in een kleine letters op het startscherm."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Scherm-",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Schermoriëntatie (R=Rechtshandig | L=Linkshandig | A=Automatisch)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Punt temperatuur in boostmode"
-		},
-		"AutoStart": {
-			"text2": [
-				"Opstart",
-				"gedrag"
-			],
-			"desc": "Gedrag bij opstarten (U=Uit | G=Gebruiks-temperatuur | S=Slaapstand-temperatuur tot beweging | B=Uit tot beweging)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Afkoel",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Temperatuur laten flitsen in het hoofdmenu zo lang de punt nog warm is"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibreer",
-				"temperatuur?"
-			],
-			"desc": "Start punt temperatuur-kalibratie"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Instellingen",
-				"resetten?"
-			],
-			"desc": "Alle instellingen terugzetten naar fabrieksinstellingen"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibreer",
-				"input-voltage?"
-			],
-			"desc": "Start VIN Kalibratie (druk lang om te sluiten)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Gedetailleerd",
-				"soldeerscherm"
-			],
-			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Scroll",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Snelheid waarmee de tekst scrolt (S=Snel | L=Langzaam)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"Voltage"
-			],
-			"desc": "Maximaal QC voltage dat gevraagd mag worden"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Vermogen",
-				"limiet"
-			],
-			"desc": "Maximaal vermogen (W=Watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Draai",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Keer de +- knoppen van de temperatuurregeling om"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp veranderen",
-				"kort"
-			],
-			"desc": "Temperatuur verandering bij kort drukken"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp veranderen",
-				"lang"
-			],
-			"desc": "Temperatuur verandering bij lang drukken"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Stroom",
-				"Puls"
-			],
-			"desc": "Intensiteit van stroompuls om voeding aan te houden (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"gevoeligheid"
-			],
-			"desc": "Gevoeligheid van de Hall effect sensor om naar slaapmodus te gaan (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Knopblokkering",
-				"inschakelen"
-			],
-			"desc": "Tijdens solderen lang op beide knoppen drukken blokkeert de knoppen (U=Uit | B=Alleen boost mode | V=Volledig blokkeren)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum toegestaan voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Animatie",
-				"herhaling"
-			],
-			"desc": "Herhaal icoon animaties in hoofdmenu"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Animatie",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Tempo van de icoon animaties in het hoofdmenu (U=uit | L=langzaam | G=gemiddeld | S=snel)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Stroompuls",
-				"interval"
+				"Animatie",
+				"herhaling"
 			],
-			"desc": "Tijdsduur tussen voeding wakker-blijf-pulsen (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Power pulse",
-				"duur"
-			],
-			"desc": "Duur van voeding-wakker-blijf-pulsen (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Taal:",
-				" NL     Nederlands"
-			],
-			"desc": "Huidige firmware taal"
+			"desc": "Herhaal icoon animaties in hoofdmenu"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"duur"
 			],
 			"desc": "Stelt de weergaveduur van het opstartlogo in (s=seconden)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Gedetailleerd",
+				"startscherm"
+			],
+			"desc": "Gedetailleerde informatie weergeven in een kleine letters op het startscherm."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Gedetailleerd",
+				"soldeerscherm"
+			],
+			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Vermogen",
+				"limiet"
+			],
+			"desc": "Maximaal vermogen (W=Watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibreer",
+				"input-voltage?"
+			],
+			"desc": "Start VIN Kalibratie (druk lang om te sluiten)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Stroom",
+				"Puls"
+			],
+			"desc": "Intensiteit van stroompuls om voeding aan te houden (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Stroompuls",
+				"interval"
+			],
+			"desc": "Tijdsduur tussen voeding wakker-blijf-pulsen (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Power pulse",
+				"duur"
+			],
+			"desc": "Duur van voeding-wakker-blijf-pulsen (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Instellingen",
+				"resetten?"
+			],
+			"desc": "Alle instellingen terugzetten naar fabrieksinstellingen"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Taal:",
+				" NL  Nederlands"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
index 2b03b7ee..44f6349a 100644
--- a/Translations/translation_NL_BE.json
+++ b/Translations/translation_NL_BE.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Zorg vooraf dat de punt op kamertemperatuur is!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ben je zeker dat je alle standaardwaarden wil resetten?",
 		"UVLOWarningString": "Voedingsspanning LAAG",
 		"UndervoltageString": "Onderspanning",
@@ -21,8 +21,8 @@
 	"messagesWarn": {
 		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
-			"Settings were",
-			"reset!"
+			"Certain settings",
+			"were changed!"
 		],
 		"NoAccelerometerMessage": [
 			"No accelerometer",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Soldeer",
 				"Instellingen"
 			],
-			"desc": "Soldeerinstellingen"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Slaap",
 				"standen"
 			],
-			"desc": "Batterijspaarstanden"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Gebruikers-",
 				"Interface"
 			],
-			"desc": "Gebruikersinterface Instellingen"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Gevorderde",
 				"Instellingen"
 			],
-			"desc": "Gevorderde Instellingen"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Spanningsbron. Stelt minimumspanning in. (DC 10V) (S 3.3V per cel)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Vermogen",
+				"Watt"
+			],
+			"desc": "Vermogen van de adapter"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Verhogings",
+				"temp"
+			],
+			"desc": "Verhogingstemperatuur"
+		},
+		"AutoStart": {
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. (F=Uit | T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Bewegings-",
+				"gevoeligheid"
+			],
+			"desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Slaap",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Automatisch afsluiten time-out (Minuten)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Bewegings-",
-				"gevoeligheid"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+			"desc": "Sensitivity to magnets (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperatuurschaal (°C=Celsius | °F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Gedetailleerd",
-				"slaapscherm"
-			],
-			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Scherm-",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Schermoriëntatie (R=Rechtshandig | L=Linkshandig | A=Automatisch)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Verhogings",
-				"temp"
-			],
-			"desc": "Verhogingstemperatuur"
-		},
-		"AutoStart": {
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. (F=Uit | T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Afkoel",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibreer",
-				"temperatuur?"
-			],
-			"desc": "Temperatuur van de punt calibreren."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Instellingen",
-				"resetten?"
-			],
-			"desc": "Alle instellingen resetten."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibreer",
-				"voedingsspanning?"
-			],
-			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Gedetailleerd",
-				"soldeerscherm"
-			],
-			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Scrol",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Scrolsnelheid van de tekst."
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Vermogen",
-				"Watt"
-			],
-			"desc": "Vermogen van de adapter"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | T=slow | M=medium | S=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | T=slow | M=medium | S=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Gedetailleerd",
+				"slaapscherm"
+			],
+			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Gedetailleerd",
+				"soldeerscherm"
+			],
+			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibreer",
+				"voedingsspanning?"
+			],
+			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Instellingen",
+				"resetten?"
+			],
+			"desc": "Alle instellingen resetten."
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Spraak:",
-				" NL_BE  Vlaams"
+				" NL_BE   Vlaams"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_NO.json b/Translations/translation_NO.json
index e80bb6d2..ade1435f 100644
--- a/Translations/translation_NO.json
+++ b/Translations/translation_NO.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Sørg for at loddespissen har romtemperatur før du fortsetter!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Er du sikker på at du vil tilbakestille til standardinnstillinger?",
 		"UVLOWarningString": "Lavspenn",
 		"UndervoltageString": "Underspenning",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Lodde-",
 				"innst."
 			],
-			"desc": "Loddeinnstillinger"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Dvale-",
 				"innst."
 			],
-			"desc": "Dvaleinnstillinger"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Bruker-",
 				"grensesn."
 			],
-			"desc": "Brukergrensesnitt-innstillinger"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Avanserte",
 				"valg"
 			],
-			"desc": "Avanserte valg"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. (DC 10V) (S 3.3V per celle)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltage"
+			],
+			"desc": "Max QC voltage the iron should negotiate for"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"KTmp",
+				""
+			],
+			"desc": "Temperatur i \"kraft-modus\""
+		},
+		"AutoStart": {
+			"text2": [
+				"AStart",
+				""
+			],
+			"desc": "Start automatisk med lodding når strøm kobles til. (I=Inaktiv | L=Lodding | D=Dvale | R=Dvale romtemperatur)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"BSensr",
+				""
+			],
+			"desc": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"DTmp",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Tid før automatisk nedstenging (Minutter)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"BSensr",
-				""
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
+			"desc": "Sensitivity to magnets (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperaturskala (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"AvDvSk",
-				""
-			],
-			"desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"SkRetn",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Skjermretning (H=Høyrehendt | V=Venstrehendt | A=Automatisk)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"KTmp",
-				""
-			],
-			"desc": "Temperatur i \"kraft\"-modus"
-		},
-		"AutoStart": {
-			"text2": [
-				"AStart",
-				""
-			],
-			"desc": "Start automatisk med lodding når strøm kobles til. (I=Inaktiv | L=Lodding | D=Dvale | R=Dvale romtemperatur)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"KjBlnk",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Blink temperaturen på skjermen mens spissen fortsatt er varm."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"TempKal?",
-				""
-			],
-			"desc": "Kalibrer spiss-temperatur."
-		},
-		"SettingsReset": {
-			"text2": [
-				"TilbStl?",
-				""
-			],
-			"desc": "Tilbakestill alle innstillinger"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"KalSpIn?",
-				""
-			],
-			"desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"AvLdSk",
-				""
-			],
-			"desc": "Vis detaljert informasjon ved lodding"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"RullHa",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Hastigheten på rulletekst"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"voltage"
-			],
-			"desc": "Max QC voltage the iron should negotiate for"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"AvDvSk",
+				""
+			],
+			"desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"AvLdSk",
+				""
+			],
+			"desc": "Vis detaljert informasjon ved lodding"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"KalSpIn?",
+				""
+			],
+			"desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"TilbStl?",
+				""
+			],
+			"desc": "Tilbakestill alle innstillinger"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Språk:",
-				" NO     Norsk"
+				" NO       Norsk"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
index 01039994..c50d556d 100644
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnęła temperaturę pokojową!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?",
 		"UVLOWarningString": "NIS. NAP",
 		"UndervoltageString": "Zbyt niskie nap.",
@@ -66,35 +66,35 @@
 				"Ustawienia",
 				"zasilania"
 			],
-			"desc": "Zasilanie i minimalne napięcie na komórkę"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Lutowanie",
 				""
 			],
-			"desc": "Ustawienia trybu lutowania"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Oszcz.",
 				"energii"
 			],
-			"desc": "Ustawienia oszczędzania energii"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interfejs",
 				"użytkownika"
 			],
-			"desc": "Ustawienia interfejsu użytkownika"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Ustawienia",
 				"zaawans."
 			],
-			"desc": "Ustawienia zaawansowane"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. (DC 10V) (S 3.3V dla ogniw Li, wyłącz limit mocy)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimalne",
+				"napięcie"
+			],
+			"desc": "Minimalne dozwolone napięcie na komórkę (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"napięcie"
+			],
+			"desc": "Maksymalne napięcie, które lutownica będzie próbowała wynegocjować z ładowarką Quick Charge (V)"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Limit czasu",
+				"PD"
+			],
+			"desc": "Limit czasu negocjacji PD w krokach co 100 ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Temp.",
+				"boost"
+			],
+			"desc": "Temperatura w trybie \"boost\" "
+		},
+		"AutoStart": {
+			"text2": [
+				"Aut. uruch.",
+				"tr. lutowania"
+			],
+			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. (B: wyłączone | T: lutowanie | Z: uśpienie | O: uśpienie w temp. pokojowej)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Zm. temp.",
+				"kr. przyc."
+			],
+			"desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu (°C)"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Zm. temp.",
+				"dł. przyc."
+			],
+			"desc": "Wartość zmiany temperatury, po długim przyciśnięciu (°C)"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blokada",
+				"przycisków"
+			],
+			"desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Czułość",
+				"wykr. ruchu"
+			],
+			"desc": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Czas do wyłączenia (minuty)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
 				"Czułość",
-				"wykr. ruchu"
+				"cz. Halla"
 			],
-			"desc": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
+			"desc": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Jednostka temperatury (C: Celciusz | F: Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Szeczegółowy",
-				"ekran bezczy."
-			],
-			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Obrót",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Obrót ekranu (P: dla praworęcznych | L: dla leworęcznych | A: automatycznie)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Temp.",
-				"boost"
-			],
-			"desc": "Temperatura w trybie \"boost\" "
-		},
-		"AutoStart": {
-			"text2": [
-				"Aut. uruch.",
-				"tr. lutowania"
-			],
-			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. (B: wyłączone | T: lutowanie | Z: uśpienie | O: uśpienie w temp. pokojowej)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Mig. podczas",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Temperatura miga podczas wychładzania, gdy grot jest wciąż gorący"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibracja",
-				"temp. grotu"
-			],
-			"desc": "Kalibracja temperatury grotu lutownicy"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Ustawienia",
-				"fabryczne"
-			],
-			"desc": "Resetuje wszystkie ustawienia"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibracja",
-				"napięcia"
-			],
-			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Sz. inf. w",
-				"tr. lutowania"
-			],
-			"desc": "Wyświetl szczegółowe informacje w trybie lutowania"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Sz. przew.",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Szybkość przewijania tekstu"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"napięcie"
-			],
-			"desc": "Maksymalne napięcie, które lutownica będzie próbowała wynegocjować z ładowarką Quick Charge (V)"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"Limit czasu",
-				"PD"
-			],
-			"desc": "Limit czasu negocjacji PD w krokach co 100 ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Ogr.",
-				"mocy"
-			],
-			"desc": "Maksymalna moc (W), jakiej może użyć lutownica"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Zamień przyc.",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Zamienia działanie przycisków zmiany temperatury grotu"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Zm. temp.",
-				"kr. przyc."
-			],
-			"desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu (°C)"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Zm. temp.",
-				"dł. przyc."
-			],
-			"desc": "Wartość zmiany temperatury, po długim przyciśnięciu (°C)"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Moc",
-				"impulsu"
-			],
-			"desc": "W przypadku używania powerbanku, utrzymuj moc na poziomie (W) aby nie uśpić powerbanku"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Czułość",
-				"cz. Halla"
-			],
-			"desc": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Blokada",
-				"przycisków"
-			],
-			"desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimalne",
-				"napięcie"
-			],
-			"desc": "Minimalne dozwolone napięcie na komórkę (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Zapętlona",
-				"animacja"
-			],
-			"desc": "Zapętla animację ikon w menu głównym"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Prędkosć",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Prędkość animacji ikon w menu (O: wył. | W: mała | M: średnia | S: duża)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Czas między",
-				"imp. mocy"
+				"Zapętlona",
+				"animacja"
 			],
-			"desc": "Czas między kolejnymi impulsami mocy zapobiegającymi usypianiu powerbanku (x2,5 s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Długość",
-				"impulsu mocy"
-			],
-			"desc": "Długość impulsu mocy zapobiegającego usypianiu powerbanku (x250 ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Język :",
-				" PL     Polski"
-			],
-			"desc": ""
+			"desc": "Zapętla animację ikon w menu głównym"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"loga"
 			],
 			"desc": "Ustawia czas wyświetlania loga podczas uruchamiania (s=sekund)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Szeczegółowy",
+				"ekran bezczy."
+			],
+			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Sz. inf. w",
+				"tr. lutowania"
+			],
+			"desc": "Wyświetl szczegółowe informacje w trybie lutowania"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Ogr.",
+				"mocy"
+			],
+			"desc": "Maksymalna moc (W), jakiej może użyć lutownica"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibracja",
+				"napięcia"
+			],
+			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Moc",
+				"impulsu"
+			],
+			"desc": "W przypadku używania powerbanku, utrzymuj moc na poziomie (W) aby nie uśpić powerbanku"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Czas między",
+				"imp. mocy"
+			],
+			"desc": "Czas między kolejnymi impulsami mocy zapobiegającymi usypianiu powerbanku (x2,5 s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Długość",
+				"impulsu mocy"
+			],
+			"desc": "Długość impulsu mocy zapobiegającego usypianiu powerbanku (x250 ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Ustawienia",
+				"fabryczne"
+			],
+			"desc": "Resetuje wszystkie ustawienia"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Język:",
+				" PL      Polski"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
index 4a88e4e4..29f806a4 100644
--- a/Translations/translation_PT.json
+++ b/Translations/translation_PT.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Definições de fábrica?",
 		"UVLOWarningString": "DC BAIXO",
 		"UndervoltageString": "Subtensão",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Configurações",
 				"Solda"
 			],
-			"desc": "Configurações de soldagem"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Modos",
 				"Repouso"
 			],
-			"desc": "Configurações de economia de energia"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interface",
 				"Utilizador"
 			],
-			"desc": "Configurações do interface do utilizador"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Menu",
 				"Avançado"
 			],
-			"desc": "Opções avançadas"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Fonte de alimentação. Define a tensão de corte. (DC=10V) (S=3.3V/célula)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Potência",
+				"Fonte"
+			],
+			"desc": "Potência da fonte usada (Watt)"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Modo turbo",
+				"temperat."
+			],
+			"desc": "Ajuste de temperatura do \"modo turbo\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Partida",
+				"automática"
+			],
+			"desc": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Sensibilidade",
+				"movimento"
+			],
+			"desc": "Sensibilidade ao movimento (0=Desligado | 1=Menor | ... | 9=Maior)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temperat.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Tempo para desligamento (Minutos)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Sensibilidade",
-				"movimento"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Sensibilidade ao movimento (0=Desligado | 1=Menor | ... | 9=Maior)"
+			"desc": "Sensitivity to magnets (0=Desligado | 1=Menor | ... | 9=Maior)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Unidade de temperatura (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Tela repouso",
-				"avançada"
-			],
-			"desc": "Exibe informações avançadas quando em espera"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientação",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Orientação da tela (D=estro | C=anhoto | A=utomática)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Modo turbo",
-				"temperat."
-			],
-			"desc": "Ajuste de temperatura do modo \"turbo\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Partida",
-				"automática"
-			],
-			"desc": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Piscar ao",
@@ -175,26 +217,61 @@
 			],
 			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
-		"CalibrateCJC": {
+		"ScrollingSpeed": {
 			"text2": [
-				"Calibrar",
-				"temperatura"
+				"Velocidade",
+				"texto ajuda"
 			],
-			"desc": "Calibra a temperatura"
+			"desc": "Velocidade a que o texto é exibido"
 		},
-		"SettingsReset": {
+		"ReverseButtonTempChange": {
 			"text2": [
-				"Reset de",
-				"fábrica?"
+				"Swap",
+				"+ - keys"
 			],
-			"desc": "Reverte todos ajustes"
+			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"VoltageCalibration": {
+		"AnimSpeed": {
 			"text2": [
-				"Calibrar",
-				"tensão"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+		},
+		"AnimLoop": {
+			"text2": [
+				"Anim.",
+				"loop"
+			],
+			"desc": "Loop icon animations in main menu"
+		},
+		"Brightness": {
+			"text2": [
+				"Screen",
+				"brightness"
+			],
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Tela repouso",
+				"avançada"
+			],
+			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"AdvancedSoldering": {
 			"text2": [
@@ -203,96 +280,33 @@
 			],
 			"desc": "Exibe informações avançadas durante o uso"
 		},
-		"ScrollingSpeed": {
-			"text2": [
-				"Velocidade",
-				"texto ajuda"
-			],
-			"desc": "Velocidade a que o texto é exibido"
-		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Potência",
-				"Fonte"
-			],
-			"desc": "Potência da fonte usada (Watt)"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
 		"PowerLimit": {
 			"text2": [
 				"Power",
 				"limit"
 			],
-			"desc": "Maximum power the iron can use (Watts)"
+			"desc": "Maximum power the iron can use (W=watt)"
 		},
-		"ReverseButtonTempChange": {
+		"CalibrateCJC": {
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Calibrate CJC",
+				"at next boot"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
 		},
-		"TempChangeShortStep": {
+		"VoltageCalibration": {
 			"text2": [
-				"Temp change",
-				"short?"
+				"Calibrar",
+				"tensão"
 			],
-			"desc": "Temperature change steps on short button press!"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long?"
-			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"PowerPulsePower": {
 			"text2": [
 				"Power",
-				"Pulse W"
+				"pulse"
 			],
-			"desc": "Keep awake pulse power intensity"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall Eff",
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep (0=Desligado | 1=Menor | ... | 9=Maior)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow buttons",
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"loop"
-			],
-			"desc": "Loop icon animations in root menu"
-		},
-		"AnimSpeed": {
-			"text2": [
-				"Anim.",
-				"speed"
-			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Reset de",
+				"fábrica?"
+			],
+			"desc": "Reverte todos ajustes"
+		},
 		"LanguageSwitch": {
 			"text2": [
-				"Idioma :",
-				" PT     Português"
+				"Idioma:",
+				" PT   Português"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json
index a622a934..4ca993a0 100644
--- a/Translations/translation_RO.json
+++ b/Translations/translation_RO.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Vă rugăm să vă asigurati că vârful este la temperatura camerei, înainte de a continua!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Sigur doriti să restaurati la setările implicite?",
 		"UVLOWarningString": "DC LOW",
 		"UndervoltageString": "Sub tensiune",
@@ -66,35 +66,35 @@
 				"Setări de",
 				"alimentare"
 			],
-			"desc": "Setări de alimentare"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Setări de",
 				"lipire"
 			],
-			"desc": "Setări de lipire"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Modul",
 				"repaus"
 			],
-			"desc": "Setări de economisire a energiei"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Interfată",
 				"utilizator"
 			],
-			"desc": "Setări interfată utilizator"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Optiuni",
 				"avansate"
 			],
-			"desc": "Optiuni avansate"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Sursa de alimentare. Setează tensiunea de întrerupere. (DC 10V) (S 3.3V per celulă, dezactivati limita de alimentare)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Voltaj",
+				"minim"
+			],
+			"desc": "Tensiunea minimă admisă pe celulă (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltaj"
+			],
+			"desc": "Tensiunea maximă QC dorită pentru care negociază letconul"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "Timp limita de negociere pentru tranzactia PD, in pasi de 100ms, pentru compatibilitate cu alimentatoarele QC"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperatura utilizată în \"modul boost\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Start letcon în modul de lipire la pornire (O=oprit | S=lipire | Z=repaus | R=repaus la temperatura camerei)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Schimbare temp.",
+				"apăsare scută"
+			],
+			"desc": "Schimbarea temperaturii la apăsarea scurtă a butonului"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Schimbare temp.",
+				"apăsare lungă"
+			],
+			"desc": "Schimbarea temperaturii la apăsarea lungă a butonului"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blocare",
+				"butoane"
+			],
+			"desc": "Când lipiti, apăsati lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Sensibilitate",
+				"la mişcare"
+			],
+			"desc": "0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Interval înainte ca letconul să se oprească (m=minute)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
 				"Sensibilitate",
-				"la mişcare"
+				"senzor Hall"
 			],
-			"desc": "0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil"
+			"desc": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C=Celsius | F=Fahrenheit"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detalii,",
-				"ecran inactiv"
-			],
-			"desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de repaus"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientare",
@@ -154,20 +210,6 @@
 			],
 			"desc": "R=dreptaci | L=stângaci | A=auto"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatura utilizată în \"modul boost\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Start letcon în modul de lipire la pornire (O=oprit | S=lipire | Z=repaus | R=repaus la temperatura camerei)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Clipeste",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Clipeste temperatura după oprirea încălzirii, în timp ce vârful este încă fierbinte"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Calibrare",
-				"temperatură?"
-			],
-			"desc": "Începeti calibrarea compensării de temperatură a vârfului"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Setări",
-				"din fabrică"
-			],
-			"desc": "Reveniti la setările din fabrică"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Calibrare tens.",
-				"de intrare?"
-			],
-			"desc": "Porniti calibrarea VIN (apăsati lung pentru a iesi)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detalii",
-				"ecran lipire"
-			],
-			"desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de lipire"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Viteză",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Viteză derulare text cu informatii la (S=lent | F=rapid)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"voltaj"
-			],
-			"desc": "Tensiunea maximă QC dorită pentru care negociază letconul"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "Timp limita de negociere pentru tranzactia PD, in pasi de 100ms, pentru compatibilitate cu alimentatoarele QC"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Putere",
-				"limită"
-			],
-			"desc": "Puterea maximă pe care letconul o poate folosi (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Inversare",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Inversarea butoanelor de reglare a temperaturii"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Schimbare temp.",
-				"apăsare scută"
-			],
-			"desc": "Schimbarea temperaturii la apăsarea scurtă a butonului"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Schimbare temp.",
-				"apăsare lungă"
-			],
-			"desc": "Schimbarea temperaturii la apăsarea lungă a butonului"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Putere",
-				"puls"
-			],
-			"desc": "Puterea pulsului de mentinere activa a blocului de alimentare (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Sensibilitate",
-				"senzor Hall"
-			],
-			"desc": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Blocare",
-				"butoane"
-			],
-			"desc": "Când lipiti, apăsati lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Voltaj",
-				"minim"
-			],
-			"desc": "Tensiunea minimă admisă pe celulă (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Animatii",
-				"buclă"
-			],
-			"desc": "Animatii de pictograme în meniul principal"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Animatii",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Ritmul animatiilor pictogramei din meniu (O=oprit | Î=încet | M=mediu | R=rapid)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Întârziere",
-				"puls putere"
+				"Animatii",
+				"buclă"
 			],
-			"desc": "Perioada pulsului de mentinere (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Durată",
-				"puls putere"
-			],
-			"desc": "Durata pulsului de mentinere (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Limbă:",
-				" RO     Română"
-			],
-			"desc": "Limba curenta"
+			"desc": "Animatii de pictograme în meniul principal"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,7 +264,77 @@
 				"Boot logo",
 				"duration"
 			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detalii,",
+				"ecran inactiv"
+			],
+			"desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de repaus"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detalii",
+				"ecran lipire"
+			],
+			"desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de lipire"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Putere",
+				"limită"
+			],
+			"desc": "Puterea maximă pe care letconul o poate folosi (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibrare tens.",
+				"de intrare?"
+			],
+			"desc": "Porniti calibrarea VIN (apăsati lung pentru a iesi)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Putere",
+				"puls"
+			],
+			"desc": "Puterea pulsului de mentinere activa a blocului de alimentare (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Întârziere",
+				"puls putere"
+			],
+			"desc": "Perioada pulsului de mentinere (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Durată",
+				"puls putere"
+			],
+			"desc": "Durata pulsului de mentinere (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Setări",
+				"din fabrică"
+			],
+			"desc": "Reveniti la setările din fabrică"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Limbă:",
+				" RO      Română"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index ed364a77..b77f8744 100644
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -8,7 +8,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Перед калибровкой убедитесь, что жала и ручка имеют комнатную температуру!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?",
 		"UVLOWarningString": "НАПРЯЖ--",
 		"UndervoltageString": "Низ. напряжение",
@@ -67,35 +67,35 @@
 				"Параметры",
 				"питания"
 			],
-			"desc": "Источник питания и минимальное напряжение на ячейку"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Параметры",
 				"пайки"
 			],
-			"desc": "Параметры пайки"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Режимы",
 				"сна"
 			],
-			"desc": "Настройки режима ожидания"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Параметры",
 				"интерфейса"
 			],
-			"desc": "Настройки пользовательского интерфейса"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дополнител.",
 				"настройки"
 			],
-			"desc": "Дополнительные настройки"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -106,6 +106,69 @@
 			],
 			"desc": "Источник питания. Устанавливает напряжение отсечки. (DC 10В) (S 3,3В на ячейку, без лимита мощности)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Мин.",
+				"напр."
+			],
+			"desc": "Минимальное разрешенное напряжение на ячейку (3S: 3 - 3,7V | 4S-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Ограничение",
+				"напряжения QC"
+			],
+			"desc": "Максимальное напряжение для согласования с QC источником питания"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"тайм-аут"
+			],
+			"desc": "Power Delivery тайм-аут согласования с шагом 100 мс для совместимости с некоторыми быстрыми зарядными QC (0: отключено)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"t° турбо",
+				"режима"
+			],
+			"desc": "Температура жала в турбо-режиме"
+		},
+		"AutoStart": {
+			"text2": [
+				"Авто",
+				"старт"
+			],
+			"desc": "Режим, в котором запускается паяльник при подаче питания (В=Выкл. | П=Пайка | О=Ожидание | К=Ожидание при комн. темп.)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Шаг темп.",
+				"кор. наж."
+			],
+			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Шаг темп.",
+				"длин. наж."
+			],
+			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
+		},
+		"LockingMode": {
+			"text2": [
+				"Разрешить",
+				"блок. кнопок"
+			],
+			"desc": "При работе длинное нажатие обеих кнопок блокирует их (О=Отключено | Т=Только турбо | П=Полная блокировка)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Чувствительн.",
+				"акселерометра"
+			],
+			"desc": "Чувствительность акселерометра (0=Выкл. | 1=Мин. | ... | 9=Макс.)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Темп.",
@@ -127,12 +190,12 @@
 			],
 			"desc": "Время до отключения паяльника (Минуты)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Чувствительн.",
-				"акселерометра"
+				"Датчик",
+				"Холла"
 			],
-			"desc": "Чувствительность акселерометра (0=Выкл. | 1=Мин. | ... | 9=Макс.)"
+			"desc": "Чувствительность датчика Холла к переходу в спящий режим (0=Выкл. | 1=Мин. | ... | 9=Макс.)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -141,13 +204,6 @@
 			],
 			"desc": "Единицы измерения температуры (C=Цельcия | F=Фаренгейта)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Подробный",
-				"реж. ожидания"
-			],
-			"desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Ориентация",
@@ -155,20 +211,6 @@
 			],
 			"desc": "Ориентация экрана (П=Правая рука | Л=Левая рука | А=Авто)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"t° турбо",
-				"режима"
-			],
-			"desc": "Температура жала в турбо-режиме"
-		},
-		"AutoStart": {
-			"text2": [
-				"Авто",
-				"старт"
-			],
-			"desc": "Режим, в котором запускается паяльник при подаче питания (В=Выкл. | П=Пайка | О=Ожидание | К=Ожидание при комн. темп.)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Мигание t°",
@@ -176,34 +218,6 @@
 			],
 			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Калибровка",
-				"температуры"
-			],
-			"desc": "Калибровка компенсации холодного спая жала при следующей загрузке (не требуется, если Delta T < 5°C)"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Сброс",
-				"Настроек"
-			],
-			"desc": "Сброс настроек к значеням по умолчанию"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Калибровка",
-				"напряжения"
-			],
-			"desc": "Калибровка входного напряжения (долгое нажатие для выхода)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Подробный",
-				"экран пайки"
-			],
-			"desc": "Показывать детальную информацию на экране пайки"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Скорость",
@@ -211,27 +225,6 @@
 			],
 			"desc": "Скорость прокрутки текста (М=медленно | Б=быстро)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Ограничение",
-				"напряжения QC"
-			],
-			"desc": "Максимальное напряжение для согласования с QC источником питания"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"тайм-аут"
-			],
-			"desc": "Power Delivery тайм-аут согласования с шагом 100 мс для совместимости с некоторыми быстрыми зарядными QC (0: отключено)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Предел",
-				"мощности"
-			],
-			"desc": "Максимальная мощность, которую может использовать паяльник (Ватт)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Инвертировать",
@@ -239,55 +232,6 @@
 			],
 			"desc": "Инвертировать кнопки изменения температуры"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Шаг темп.",
-				"кор. наж."
-			],
-			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Шаг темп.",
-				"длин. наж."
-			],
-			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Сила имп.",
-				"питания Вт"
-			],
-			"desc": "Сила импульса удерживающего от сна повербанк или другой источник питания"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Датчик",
-				"Холла"
-			],
-			"desc": "Чувствительность датчика Холла к переходу в спящий режим (0=Выкл. | 1=Мин. | ... | 9=Макс.)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Разрешить",
-				"блок. кнопок"
-			],
-			"desc": "При работе длинное нажатие обеих кнопок блокирует их (О=Отключено | Т=Только турбо | П=Полная блокировка)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Мин.",
-				"напр."
-			],
-			"desc": "Минимальное разрешенное напряжение на ячейку (3S: 3 - 3,7V | 4S-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Зацикленная",
-				"анимация"
-			],
-			"desc": "Зацикленная анимация иконок в главном меню"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Скорость",
@@ -295,26 +239,12 @@
 			],
 			"desc": "Скорость анимации иконок в главном меню (Милисекунды) (О=Отключено | Н=Низкий | С=Средний | В=Высокий)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Пауза имп.",
-				"питания с"
+				"Зацикленная",
+				"анимация"
 			],
-			"desc": "Пауза между импульсами удерживающими источник питания от сна (x 2,5с)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Длина имп.",
-				"питания мс"
-			],
-			"desc": "Длина импульса удерживающего от сна источник питания (x 250мс)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Язык:",
-				" RU     Русский"
-			],
-			"desc": "Язык прошивки"
+			"desc": "Зацикленная анимация иконок в главном меню"
 		},
 		"Brightness": {
 			"text2": [
@@ -336,6 +266,76 @@
 				"показа логотипа"
 			],
 			"desc": "Длительность отображения логотипа (в секундах)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Подробный",
+				"реж. ожидания"
+			],
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Подробный",
+				"экран пайки"
+			],
+			"desc": "Показывать детальную информацию на экране пайки"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Предел",
+				"мощности"
+			],
+			"desc": "Максимальная мощность, которую может использовать паяльник (Ватт)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Калибровка",
+				"температуры"
+			],
+			"desc": "Калибровка компенсации холодного спая жала при следующей загрузке (не требуется, если Delta T < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Калибровка",
+				"напряжения"
+			],
+			"desc": "Калибровка входного напряжения (долгое нажатие для выхода)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Сила имп.",
+				"питания Вт"
+			],
+			"desc": "Сила импульса удерживающего от сна повербанк или другой источник питания"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Пауза имп.",
+				"питания с"
+			],
+			"desc": "Пауза между импульсами удерживающими источник питания от сна (x 2,5с)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Длина имп.",
+				"питания мс"
+			],
+			"desc": "Длина импульса удерживающего от сна источник питания (x 250мс)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Сброс",
+				"Настроек"
+			],
+			"desc": "Сброс настроек к значеням по умолчанию"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Язык:",
+				" RU     Русский"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
index c2ad7401..894be258 100644
--- a/Translations/translation_SK.json
+++ b/Translations/translation_SK.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Najprv sa prosím uistite, že hrot má izbovú teplotu!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Naozaj chcete obnoviť továrenské nastavenia?",
 		"UVLOWarningString": "Nízke U!",
 		"UndervoltageString": "Nízke napätie",
@@ -66,35 +66,35 @@
 				"Nastavenie",
 				"výkonu"
 			],
-			"desc": "Nastavenie výkonu"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Nastavenie",
 				"spájkovania"
 			],
-			"desc": "Nastavenie spájkovania"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Úsporný",
 				"režim"
 			],
-			"desc": "Nastavenia režimov úspory energie"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Nastavenie",
 				"zobrazenia"
 			],
-			"desc": "Nastavenie zobrazenia"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Pokročilé",
 				"nastavenia"
 			],
-			"desc": "Pokročilé nastavenia"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  (DC=10V | nS=n*3.3V pre LiIon články)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimálne",
+				"napätie"
+			],
+			"desc": "Minimálne napätie povolené na jeden článok (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Obmedzenie QC",
+				"napätia"
+			],
+			"desc": "Maximálne QC napätie ktoré si má systém vyžiadať"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Čas vypršania",
+				"Power Delivery"
+			],
+			"desc": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"teplota"
+			],
+			"desc": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
+		},
+		"AutoStart": {
+			"text2": [
+				"Automatické",
+				"spustenie"
+			],
+			"desc": "Pri štarte spustiť režim spájkovania (V=Vyp | Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Malý krok",
+				"teploty"
+			],
+			"desc": "Zmena teploty pri krátkom stlačení tlačidla"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Veľký krok",
+				"teploty"
+			],
+			"desc": "Zmena teploty pri držaní tlačidla"
+		},
+		"LockingMode": {
+			"text2": [
+				"Povoliť zámok",
+				"tlačidiel"
+			],
+			"desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Citlivosť",
+				"pohybu"
+			],
+			"desc": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Pokojová",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Čas na vypnutie (minúty)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Citlivosť",
-				"pohybu"
+				"Citliv.",
+				"Hall"
 			],
-			"desc": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
+			"desc": "Citlivosť Hallovho senzora pre detekciu spánku (0=Vyp | 1=Min | ... | 9=Max)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Jednotky merania teploty (C=stupne Celzia | F=stupne Fahrenheita)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detaily v",
-				"pokoj. režime"
-			],
-			"desc": "Zobraziť detailné informácie v pokojovom režime (T=Zap | F=Vyp)"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientácia",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Orientácia displeja (P=Pravák | L=Ľavák | A=Auto)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Boost",
-				"teplota"
-			],
-			"desc": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
-		},
-		"AutoStart": {
-			"text2": [
-				"Automatické",
-				"spustenie"
-			],
-			"desc": "Pri štarte spustiť režim spájkovania (V=Vyp | Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Blikanie pri",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Blikanie ukazovateľa teploty počas chladnutia hrotu"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibrácia",
-				"teploty"
-			],
-			"desc": "Kalibrácia posunu teploty hrotu"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Obnovenie",
-				"nastavení"
-			],
-			"desc": "Obnovenie nastavení na pôvodné hodnoty"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibrácia",
-				"nap. napätia"
-			],
-			"desc": "Kalibrácia napájacieho napätia. Krátke stlačenie mení nastavenie, dlhé stlačenie pre návrat"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detaily počas",
-				"spájkovania"
-			],
-			"desc": "Zobrazenie detailov počas spájkovania"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Rýchlosť",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Rýchlosť pohybu tohto textu"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Obmedzenie QC",
-				"napätia"
-			],
-			"desc": "Maximálne QC napätie ktoré si má systém vyžiadať"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"Čas vypršania",
-				"Power Delivery"
-			],
-			"desc": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Obmedzenie",
-				"výkonu"
-			],
-			"desc": "Obmedzenie výkonu podľa použitého zdroja (watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Otočenie",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Prehodenie tlačidiel na nastavovanie teploty"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Malý krok",
-				"teploty"
-			],
-			"desc": "Zmena teploty pri krátkom stlačení tlačidla"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Veľký krok",
-				"teploty"
-			],
-			"desc": "Zmena teploty pri držaní tlačidla"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Intenzita",
-				"impulzu"
-			],
-			"desc": "Impulz udržujúci napájací zdroj zapnutý (power banky) (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Citliv.",
-				"Hall"
-			],
-			"desc": "Citlivosť Hallovho senzora pre detekciu spánku (0=Vyp | 1=Min | ... | 9=Max)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Povoliť zámok",
-				"tlačidiel"
-			],
-			"desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimálne",
-				"napätie"
-			],
-			"desc": "Minimálne napätie povolené na jeden článok (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Opakovanie",
-				"animácií"
-			],
-			"desc": "Opakovanie animácií ikoniek v hlavnom menu"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Rýchlosť",
@@ -294,26 +238,12 @@
 			],
 			"desc": "Rýchlosť animácií ikoniek v menu (O=off | P=pomaly | S=stredne | R=rýchlo)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Interval",
-				"impulzu"
+				"Opakovanie",
+				"animácií"
 			],
-			"desc": "Interval medzi impulzami udržujúcimi napájací zdroj zapnutý (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Dĺžka impulzu",
-				""
-			],
-			"desc": "Dĺžka impulzu udržujúci napájací zdroj zapnutý (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Jazyk:",
-				" SK  Slovenčina"
-			],
-			"desc": "Aktuálny jazyk"
+			"desc": "Opakovanie animácií ikoniek v hlavnom menu"
 		},
 		"Brightness": {
 			"text2": [
@@ -335,6 +265,76 @@
 				"boot loga"
 			],
 			"desc": "Doba trvania boot loga (s=sekundy)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detaily v",
+				"pokoj. režime"
+			],
+			"desc": "Zobraziť detailné informácie v pokojovom režime (T=Zap | F=Vyp)"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detaily počas",
+				"spájkovania"
+			],
+			"desc": "Zobrazenie detailov počas spájkovania"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Obmedzenie",
+				"výkonu"
+			],
+			"desc": "Obmedzenie výkonu podľa použitého zdroja (watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibrácia",
+				"nap. napätia"
+			],
+			"desc": "Kalibrácia napájacieho napätia. Krátke stlačenie mení nastavenie, dlhé stlačenie pre návrat"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Intenzita",
+				"impulzu"
+			],
+			"desc": "Impulz udržujúci napájací zdroj zapnutý (power banky) (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Interval",
+				"impulzu"
+			],
+			"desc": "Interval medzi impulzami udržujúcimi napájací zdroj zapnutý (x 2.5s)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Dĺžka impulzu",
+				""
+			],
+			"desc": "Dĺžka impulzu udržujúci napájací zdroj zapnutý (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Obnovenie",
+				"nastavení"
+			],
+			"desc": "Obnovenie nastavení na pôvodné hodnoty"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Jazyk:",
+				" SK  Slovenčina"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
index 9c4e45f9..cd398186 100644
--- a/Translations/translation_SL.json
+++ b/Translations/translation_SL.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Pred nadaljevanjem mora biti konica segreta na sobno temperaturo!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Res želite ponastaviti na privzete nastavitve?",
 		"UVLOWarningString": "NIZKA U",
 		"UndervoltageString": "Nizka napetost",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Nastavitve",
 				"spajkanja"
 			],
-			"desc": "Nastavitve spajkanja"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Način",
 				"spanja"
 			],
-			"desc": "Nastavitve varčevanja z energijo"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Uporabniški",
 				"vmesnik"
 			],
-			"desc": "Nastavitve uporabniškega vmesnika"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Napredne",
 				"možnosti"
 			],
-			"desc": "Napredne možnosti"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Vir napajanja. Nastavi napetost izklopa. (DC 10V) (S 3.3V na celico)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"napetost"
+			],
+			"desc": "Moč napajalnega vira v vatih [W]"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Pospešena",
+				"temp."
+			],
+			"desc": "Temperatura v pospešenem načinu"
+		},
+		"AutoStart": {
+			"text2": [
+				"Samodejni",
+				"zagon"
+			],
+			"desc": "Samodejno gretje konice ob vklopu (U=ugasnjeno | S=spajkanje | Z=spanje | V=spanje na sobni temperaturi)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Kratka sprememba",
+				"temperature?"
+			],
+			"desc": "Temperatura se spremeni ob kratkem pritisku na gumb."
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Dolga sprememba",
+				"temperature?"
+			],
+			"desc": "Temperatura se spremeni ob dolgem pritisku na gumb."
+		},
+		"LockingMode": {
+			"text2": [
+				"Omogoči",
+				"zaklep gumbov"
+			],
+			"desc": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Občutljivost",
+				"premikanja"
+			],
+			"desc": "0=izklopljeno | 1=najmanjša | ... | 9=največja"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp. med",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Čas do izklopa (m=minute)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Občutljivost",
-				"premikanja"
+				"Občut.",
+				"Hall son"
 			],
-			"desc": "0=izklopljeno | 1=najmanjša | ... | 9=največja"
+			"desc": "Občutljivost Hallove sonde za zaznavanje spanja (0=izklopljeno | 1=najmanjša | ... | 9=največja)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Enota za temperaturo (C=celzij | F=fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Več info. na",
-				"mir. zaslonu"
-			],
-			"desc": "Prikaži več informacij z manjšo pisavo na mirovalnem zaslonu."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientacija",
@@ -154,20 +210,6 @@
 			],
 			"desc": "D=desničar | L=levičar | S=samodejno"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Pospešena",
-				"temp."
-			],
-			"desc": "Temperatura v pospešenem načinu"
-		},
-		"AutoStart": {
-			"text2": [
-				"Samodejni",
-				"zagon"
-			],
-			"desc": "Samodejno gretje konice ob vklopu (U=ugasnjeno | S=spajkanje | Z=spanje | V=spanje na sobni temperaturi)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Utripanje med",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Ko je konica še vroča, utripaj prikaz temperature med hlajenjem."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibriram",
-				"temperaturo?"
-			],
-			"desc": "Kalibracija temperature na konici."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Tovarniške",
-				"nastavitve?"
-			],
-			"desc": "Ponastavitev vseh nastavitev"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibriram",
-				"vhodno napetost?"
-			],
-			"desc": "Kalibracija VIN (nastavitve z gumbi, dolg pritisk za izhod)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Več info na",
-				"zaslonu spaj."
-			],
-			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Hitrost",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Hitrost, s katero se prikazuje besedilo (P=počasi | H=hitro)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"napetost"
-			],
-			"desc": "Moč napajalnega vira v vatih [W]"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Meja",
-				"moči"
-			],
-			"desc": "Največja dovoljena moč v vatih [W]"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Obrni",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Zamenjaj funkciji gumbov."
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Kratka sprememba",
-				"temperature?"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperatura se spremeni ob kratkem pritisku na gumb."
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Dolga sprememba",
-				"temperature?"
-			],
-			"desc": "Temperatura se spremeni ob dolgem pritisku na gumb."
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Pulz",
-				"moči"
-			],
-			"desc": "Velikost moči za vzdrževanje budnosti."
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Občut.",
-				"Hall son"
-			],
-			"desc": "Občutljivost Hallove sonde za zaznavanje spanja (0=izklopljeno | 1=najmanjša | ... | 9=največja)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Omogoči",
-				"zaklep gumbov"
-			],
-			"desc": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | P=slow | M=medium | H=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | P=slow | M=medium | H=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Več info. na",
+				"mir. zaslonu"
+			],
+			"desc": "Prikaži več informacij z manjšo pisavo na mirovalnem zaslonu."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Več info na",
+				"zaslonu spaj."
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Meja",
+				"moči"
+			],
+			"desc": "Največja dovoljena moč v vatih [W]"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibriram",
+				"vhodno napetost?"
+			],
+			"desc": "Kalibracija VIN (nastavitve z gumbi, dolg pritisk za izhod)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Pulz",
+				"moči"
+			],
+			"desc": "Velikost moči za vzdrževanje budnosti."
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Tovarniške",
+				"nastavitve?"
+			],
+			"desc": "Ponastavitev vseh nastavitev"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Jezik:",
-				" SL     Slovenščina"
+				" SL Slovenščina"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
index 3ac6cd2d..ee2b472b 100644
--- a/Translations/translation_SR_CYRL.json
+++ b/Translations/translation_SR_CYRL.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Проверите да ли је врх охлађен на собну температуру пре него што наставите",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Да ли заиста желите да вратите поставке на фабричке вредности?",
 		"UVLOWarningString": "НИЗ.НАП.",
 		"UndervoltageString": "ПРЕНИЗАК НАПОН",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Поставке",
 				"лемљења"
 			],
-			"desc": "Поставке режима лемљења."
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Уштеда",
 				"енергије"
 			],
-			"desc": "Поставке режима мировања."
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Корисничко",
 				"сучеље"
 			],
-			"desc": "Поставке корисничког сучеља."
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Напредне",
 				"поставке"
 			],
-			"desc": "Напредне поставке."
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Тип напајања; одређује најнижи радни напон. (DC=адаптер [10V] | S=батерија [3,3V по ћелији])"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Улазна",
+				"снага"
+			],
+			"desc": "Снага напајања у ватима."
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Темп.",
+				"појачања"
+			],
+			"desc": "Температура врха лемилице у току појачања."
+		},
+		"AutoStart": {
+			"text2": [
+				"Врући",
+				"старт"
+			],
+			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се. (И=искључити | Л=лемљење | С=спавати | X=спавати собна температура)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Осетљивост",
+				"на покрет"
+			],
+			"desc": "Осетљивост сензора покрета. (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Темп.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Време мировања након кога се лемилица гаси. (m=минути)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Осетљивост",
-				"на покрет"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Осетљивост сензора покрета. (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
+			"desc": "Sensitivity to magnets (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Јединице у којима се приказује температура. (C=целзијус | F=фаренхајт)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Детаљи током",
-				"мировања"
-			],
-			"desc": "Приказивање детаљних информација на екрану током мировања."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Оријентација",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Како је окренут екран. (Д=за десноруке | Л=за леворуке | А=аутоматски)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Темп.",
-				"појачања"
-			],
-			"desc": "Температура врха лемилице у току појачања."
-		},
-		"AutoStart": {
-			"text2": [
-				"Врући",
-				"старт"
-			],
-			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се. (И=искључити | Л=лемљење | С=спавати | X=спавати собна температура)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Упозорење",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Калибрација",
-				"температуре"
-			],
-			"desc": "Калибрисање одступања температуре врха у односу на дршку."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Фабричке",
-				"поставке"
-			],
-			"desc": "Враћање свих поставки на фабричке вредности."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Калибрација",
-				"улазног напона"
-			],
-			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Детаљи током",
-				"лемљења"
-			],
-			"desc": "Приказивање детаљних информација на екрану током лемљења."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Брзина",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Брзина кретања описних порука попут ове. (С=споро | Б=брзо)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Улазна",
-				"снага"
-			],
-			"desc": "Снага напајања у ватима."
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | С=slow | M=medium | Б=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | С=slow | M=medium | Б=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Детаљи током",
+				"мировања"
+			],
+			"desc": "Приказивање детаљних информација на екрану током мировања."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Детаљи током",
+				"лемљења"
+			],
+			"desc": "Приказивање детаљних информација на екрану током лемљења."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Калибрација",
+				"улазног напона"
+			],
+			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250мс)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Фабричке",
+				"поставке"
+			],
+			"desc": "Враћање свих поставки на фабричке вредности."
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Jезик:",
-				" SR     Српски"
+				" SR      Српски"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
index b0a8f6ce..59437fe8 100644
--- a/Translations/translation_SR_LATN.json
+++ b/Translations/translation_SR_LATN.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Proverite da li je vrh ohlađen na sobnu temperaturu pre nego što nastavite",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Da li zaista želite da vratite postavke na fabričke vrednosti?",
 		"UVLOWarningString": "NIZ.NAP.",
 		"UndervoltageString": "PRENIZAK NAPON",
@@ -66,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Postavke",
 				"lemljenja"
 			],
-			"desc": "Postavke režima lemljenja."
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Ušteda",
 				"energije"
 			],
-			"desc": "Postavke režima mirovanja."
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Korisničko",
 				"sučelje"
 			],
-			"desc": "Postavke korisničkog sučelja."
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Napredne",
 				"postavke"
 			],
-			"desc": "Napredne postavke."
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Tip napajanja; određuje najniži radni napon. (DC=adapter [10V], S=baterija [3,3V po ćeliji])"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Ulazna",
+				"snaga"
+			],
+			"desc": "Snaga napajanja u vatima."
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Temp.",
+				"pojačanja"
+			],
+			"desc": "Temperatura vrha lemilice u toku pojačanja."
+		},
+		"AutoStart": {
+			"text2": [
+				"Vrući",
+				"start"
+			],
+			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se. (I=isključiti | L=lemljenje | S=spavati | X=spavati sobna temperatura)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature-change-increment on short button press"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature-change-increment on long button press"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Osetljivost",
+				"na pokret"
+			],
+			"desc": "Osetljivost senzora pokreta. (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Temp.",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Vreme mirovanja nakon koga se lemilica gasi. (m=minuti)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Osetljivost",
-				"na pokret"
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Osetljivost senzora pokreta. (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
+			"desc": "Sensitivity to magnets (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Jedinice u kojima se prikazuje temperatura. (C=celzijus | F=farenhajt)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detalji tokom",
-				"mirovanja"
-			],
-			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Orijentacija",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Kako je okrenut ekran. (D=za desnoruke | L=za levoruke | A=automatski)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Temp.",
-				"pojačanja"
-			],
-			"desc": "Temperatura vrha lemilice u toku pojačanja."
-		},
-		"AutoStart": {
-			"text2": [
-				"Vrući",
-				"start"
-			],
-			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se. (I=isključiti | L=lemljenje | S=spavati | X=spavati sobna temperatura)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Upozorenje",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibracija",
-				"temperature"
-			],
-			"desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Fabričke",
-				"postavke"
-			],
-			"desc": "Vraćanje svih postavki na fabričke vrednosti."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibracija",
-				"ulaznog napona"
-			],
-			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detalji tokom",
-				"lemljenja"
-			],
-			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Brzina",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Brzina kretanja opisnih poruka poput ove. (S=sporo | B=brzo)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Ulazna",
-				"snaga"
-			],
-			"desc": "Snaga napajanja u vatima."
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Maximum power the iron can use (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Reverse assignment of buttons for temperature adjustment"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Temperature-change-increment on short button press"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Temperature-change-increment on long button press"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"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 (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | B=fast)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | B=fast)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detalji tokom",
+				"mirovanja"
+			],
+			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detalji tokom",
+				"lemljenja"
+			],
+			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibracija",
+				"ulaznog napona"
+			],
+			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Fabričke",
+				"postavke"
+			],
+			"desc": "Vraćanje svih postavki na fabričke vrednosti."
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Jezik:",
-				" SR     Srpski"
+				" SR      Srpski"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
index 1d3e0d9d..20ca5bb0 100644
--- a/Translations/translation_SV.json
+++ b/Translations/translation_SV.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Se till att spetsen är rumstemererad innan du fortsätter!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Är du säker på att du vill återställa inställningarna?",
 		"UVLOWarningString": "DC LÅG",
 		"UndervoltageString": "Underspänning",
@@ -66,35 +66,35 @@
 				"Effekt-",
 				"inställning"
 			],
-			"desc": "Effektinställningar"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Lödnings-",
 				"inställning"
 			],
-			"desc": "Lödningsinställningar"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Vilo-",
 				"läge"
 			],
-			"desc": "Viloläges-inställningar"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Användar-",
 				"gränssnitt"
 			],
-			"desc": "Användargränssnitts-inställningar"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Avancerade",
 				"alternativ"
 			],
-			"desc": "Avancerade alternativ"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Strömkälla. Anger lägsta spänning. (DC 10V) (S 3.3V per cell)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimim-",
+				"spänning"
+			],
+			"desc": "Minimumspänning per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"spänning"
+			],
+			"desc": "Maximal QC-spänning enheten skall efterfråga"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Turbo-",
+				"temp"
+			],
+			"desc": "Temperatur i \"turbo-läge\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Startar automatiskt lödpennan vid uppstart. (A=Av | L=Lödning | V=Viloläge | R=Viloläge Rumstemperatur)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp.just",
+				"korttryck"
+			],
+			"desc": "Temperaturjustering vid kort knapptryckning"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp.just",
+				"långtryck"
+			],
+			"desc": "Temperaturjustering vid lång knapptryckning"
+		},
+		"LockingMode": {
+			"text2": [
+				"Tillåt lås",
+				"via knappar"
+			],
+			"desc": "Vid lödning, håll nere bägge knappar för att slå på lås (A=Av | T=Bara turbo | F=Fullt lås)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Rörelse-",
+				"känslighet"
+			],
+			"desc": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Vilo-",
@@ -126,12 +189,12 @@
 			],
 			"desc": "Avstängnings-timeout (Minuter)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Rörelse-",
-				"känslighet"
+				"Sensor-",
+				"känslght"
 			],
-			"desc": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"
+			"desc": "Känslighet för halleffekt-sensorn för viloläges-detektering (0=Av | 1=minst känslig | ... | 9=mest känslig)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "Temperaturenhet (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Detaljerad",
-				"vid inaktiv"
-			],
-			"desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Visnings",
@@ -154,20 +210,6 @@
 			],
 			"desc": "Visningsläge (H=Högerhänt | V=Vänsterhänt | A=Automatisk)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Turbo-",
-				"temp"
-			],
-			"desc": "Temperatur i \"turbo\"-läge"
-		},
-		"AutoStart": {
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Startar automatiskt lödpennan vid uppstart. (A=Av | L=Lödning | V=Viloläge | R=Viloläge Rumstemperatur)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Nedkylnings-",
@@ -175,34 +217,6 @@
 			],
 			"desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Kalibrera",
-				"temperatur?"
-			],
-			"desc": "Kalibrera spets-kompensation."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Fabriks-",
-				"inställ?"
-			],
-			"desc": "Återställ alla inställningar"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Kalibrera",
-				"inspänning?"
-			],
-			"desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Detaljerad",
-				"lödng.skärm"
-			],
-			"desc": "Visa detaljerad information vid lödning"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Beskrivning",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Hastighet som den här texten rullar i"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"spänning"
-			],
-			"desc": "Maximal QC-spänning enheten skall efterfråga"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Max-",
-				"effekt"
-			],
-			"desc": "Maximal effekt som enheten kan använda (Watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Omvända",
@@ -238,47 +231,12 @@
 			],
 			"desc": "Omvänd ordning för temperaturjustering via plus/minus knapparna"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp.just",
-				"korttryck"
+				"Anim.-",
+				"hastighet"
 			],
-			"desc": "Temperaturjustering vid kort knapptryckning"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp.just",
-				"långtryck"
-			],
-			"desc": "Temperaturjustering vid lång knapptryckning"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"Pulse W"
-			],
-			"desc": "Keep awake pulse power intensity"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Sensor-",
-				"känslght"
-			],
-			"desc": "Känslighet för halleffekt-sensorn för viloläges-detektering (0=Av | 1=minst känslig | ... | 9=mest känslig)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Tillåt lås",
-				"via knappar"
-			],
-			"desc": "Vid lödning, håll nere bägge knappar för att slå på lås (A=Av | T=Bara turbo | F=Fullt lås)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimim-",
-				"spänning"
-			],
-			"desc": "Minimumspänning per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Animationshastighet för ikoner i menyer (A=av | L=långsam | M=medel | S=snabb)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -287,12 +245,68 @@
 			],
 			"desc": "Loopa animationer i huvudmeny"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.-",
-				"hastighet"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Animationshastighet för ikoner i menyer (A=av | L=långsam | M=medel | S=snabb)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Detaljerad",
+				"vid inaktiv"
+			],
+			"desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Detaljerad",
+				"lödng.skärm"
+			],
+			"desc": "Visa detaljerad information vid lödning"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Max-",
+				"effekt"
+			],
+			"desc": "Maximal effekt som enheten kan använda (Watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Kalibrera",
+				"inspänning?"
+			],
+			"desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Intensity of power of keep-awake-pulse (W=watt)"
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -308,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"Fabriks-",
+				"inställ?"
+			],
+			"desc": "Återställ alla inställningar"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Språk:",
 				" SV     Svenska"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
index 0762b3ed..f0b34bee 100644
--- a/Translations/translation_TR.json
+++ b/Translations/translation_TR.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?",
 		"UVLOWarningString": "Güç Az",
 		"UndervoltageString": "Düşük Voltaj",
@@ -19,10 +19,7 @@
 		"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
 	},
 	"messagesWarn": {
-		"ResetOKMessage": [
-			"Sıfırlama Tamam",
-			""
-		],
+		"ResetOKMessage": "Sıfırlama Tamam",
 		"SettingsResetMessage": [
 			"Ayarlar",
 			"Sıfırlandı"
@@ -32,16 +29,16 @@
 			"detected!"
 		],
 		"NoPowerDeliveryMessage": [
-				"No USB-PD IC",
+			"No USB-PD IC",
 			"detected!"
 		],
 		"LockingKeysString": "LOCKED",
 		"UnlockingKeysString": "UNLOCKED",
 		"WarningKeysLockedString": "!LOCKED!",
 		"WarningThermalRunaway": [
-				"Thermal",
+			"Thermal",
 			"Runaway"
-			]
+		]
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -69,35 +66,35 @@
 				"Power",
 				"settings"
 			],
-			"desc": "Power settings"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Lehimleme",
 				"Ayarları"
 			],
-			"desc": "Lehimleme Ayarları"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Uyku",
 				"Modları"
 			],
-			"desc": "Güç Tasarrufu Ayarları"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Kullanıcı",
 				"Arayüzü"
 			],
-			"desc": "Kullanıcı Arayüzü Ayarları"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Gelişmiş",
 				"Ayarlar"
 			],
-			"desc": "Gelişmiş Ayarlar"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -108,6 +105,69 @@
 			],
 			"desc": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. (DC 10V) (S 3.3V hücre başına)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Minimum",
+				"voltage"
+			],
+			"desc": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltage"
+			],
+			"desc": "Max QC voltage the iron should negotiate for"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"timeout"
+			],
+			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"YKSC",
+				""
+			],
+			"desc": "Yüksek Performans Modu Sıcaklığı"
+		},
+		"AutoStart": {
+			"text2": [
+				"OTOBAŞ",
+				""
+			],
+			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (K=Kapalı | L=Lehimleme Modu | U=Uyku Modu | S=Uyku Modu Oda Sıcaklığı)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow locking",
+				"buttons"
+			],
+			"desc": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"HARHAS",
+				""
+			],
+			"desc": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"BKSC",
@@ -129,12 +189,12 @@
 			],
 			"desc": "Kapatma Zaman Aşımı (Dakika)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"HARHAS",
-				""
+				"Hall sensor",
+				"sensitivity"
 			],
-			"desc": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
+			"desc": "Sensitivity to magnets (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -143,13 +203,6 @@
 			],
 			"desc": "Sıcaklık Birimi (C=Celsius | F=Fahrenheit)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"AYRBİL",
-				""
-			],
-			"desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
-		},
 		"DisplayRotation": {
 			"text2": [
 				"GRNYÖN",
@@ -157,20 +210,6 @@
 			],
 			"desc": "Görüntü Yönlendirme (R=Sağlak | L=Solak | O=Otomatik)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"YKSC",
-				""
-			],
-			"desc": "Yüksek Performans Modu Sıcaklığı"
-		},
-		"AutoStart": {
-			"text2": [
-				"OTOBAŞ",
-				""
-			],
-			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (K=Kapalı | L=Lehimleme Modu | U=Uyku Modu | S=Uyku Modu Oda Sıcaklığı)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"SĞGÖST",
@@ -178,34 +217,6 @@
 			],
 			"desc": "Soğutma ekranında uç hala sıcakken derece gösterilsin."
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"SCK KAL?",
-				""
-			],
-			"desc": "Ucu kalibre et."
-		},
-		"SettingsReset": {
-			"text2": [
-				"SIFIRLA?",
-				""
-			],
-			"desc": "Bütün ayarları sıfırlar"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"VOL KAL?",
-				""
-			],
-			"desc": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"GELLHM",
-				""
-			],
-			"desc": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"YZKYHZ",
@@ -213,27 +224,6 @@
 			],
 			"desc": "Bu yazının kayma hızı (Y=Yavaş | H=Hızlı)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"voltage"
-			],
-			"desc": "Max QC voltage the iron should negotiate for"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"timeout"
-			],
-			"desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Power",
-				"limit"
-			],
-			"desc": "Havyanın kullanacağı en yüksek güç (Watts)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Swap",
@@ -241,47 +231,12 @@
 			],
 			"desc": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
 		},
-		"TempChangeShortStep": {
+		"AnimSpeed": {
 			"text2": [
-				"Temp change",
-				"short"
+				"Anim.",
+				"speed"
 			],
-			"desc": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Temp change",
-				"long"
-			],
-			"desc": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Power",
-				"pulse"
-			],
-			"desc": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall sensor",
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow locking",
-				"buttons"
-			],
-			"desc": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+			"desc": "Pace of icon animations in menu (K=Kapalı | Y=Yavaş | O=Orta | H=Hızlı)"
 		},
 		"AnimLoop": {
 			"text2": [
@@ -290,12 +245,68 @@
 			],
 			"desc": "Loop icon animations in main menu"
 		},
-		"AnimSpeed": {
+		"Brightness": {
 			"text2": [
-				"Anim.",
-				"speed"
+				"Screen",
+				"brightness"
 			],
-			"desc": "Pace of icon animations in menu (K=Kapalı | Y=Yavaş | O=Orta | H=Hızlı)"
+			"desc": "Adjust the OLED screen brightness"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invert",
+				"screen"
+			],
+			"desc": "Invert the OLED screen colors"
+		},
+		"LOGOTime": {
+			"text2": [
+				"Boot logo",
+				"duration"
+			],
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"AYRBİL",
+				""
+			],
+			"desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"GELLHM",
+				""
+			],
+			"desc": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Havyanın kullanacağı en yüksek güç (W=Watts)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"VOL KAL?",
+				""
+			],
+			"desc": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"pulse"
+			],
+			"desc": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
 		},
 		"PowerPulseWait": {
 			"text2": [
@@ -311,33 +322,19 @@
 			],
 			"desc": "Keep-awake-pulse duration (x 250ms)"
 		},
+		"SettingsReset": {
+			"text2": [
+				"SIFIRLA?",
+				""
+			],
+			"desc": "Bütün ayarları sıfırlar"
+		},
 		"LanguageSwitch": {
 			"text2": [
 				"Dil:",
-				" TR     Türkçe"
+				" TR      Türkçe"
 			],
 			"desc": ""
-		},
-		"Brightness": {
-			"text2": [
-				"Screen",
-				"brightness"
-			],
-			"desc": "Adjust the brightness of the OLED screen"
-		},
-		"ColourInversion": {
-			"text2": [
-				"Invert",
-				"screen"
-			],
-			"desc": "Invert the colours of the OLED screen"
-		},
-		"LOGOTime": {
-			"text2": [
-				"Boot logo",
-				"duration"
-			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
 		}
 	}
 }
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index b954cb1c..8eee2d8e 100644
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -8,7 +8,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)",
 		"UVLOWarningString": "АККУМ--",
 		"UndervoltageString": "Низька напруга",
@@ -67,35 +67,35 @@
 				"Параметри",
 				"живлення"
 			],
-			"desc": "Джерело живлення, та мінамільна напруга на комірку"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Параметри",
 				"пайки"
 			],
-			"desc": "Налаштування для режиму пайки. Діють при увімкненому жалі."
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Режим",
 				"сну"
 			],
-			"desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Параметри",
 				"інтерфейсу"
 			],
-			"desc": "Параметри користувальницького інтерфейсу."
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Додаткові",
 				"параметри"
 			],
-			"desc": "Розширені налаштування. Додаткові зручності."
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -106,6 +106,69 @@
 			],
 			"desc": "Встановлює напругу відсічки. (DC - 10V) (3S - 9.9V | 4S - 13.2V | 5S - 16.5V | 6S - 19.8V)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Мін.",
+				"напруга"
+			],
+			"desc": "Мінімальна дозволена напруга на комірку (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Потужність",
+				"дж. живлення"
+			],
+			"desc": "Потужність джерела живлення в Ватах"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"затримка"
+			],
+			"desc": "Затримка у 100мс інкрементах для PD для сумісності з деякими QC зарядними пристроями (0: вимкнено)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Темпер.",
+				"Турбо"
+			],
+			"desc": "Температура в \"Турбо\" режимі"
+		},
+		"AutoStart": {
+			"text2": [
+				"Гарячий",
+				"старт"
+			],
+			"desc": "Режим в якому запускається паяльник при ввімкненні (В=Вимк. | П=Пайка | О=Очікування | К=Очікування при кімн. темп.)"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Зміна темп.",
+				"коротко?"
+			],
+			"desc": "Змінювати температуру при короткому натисканні!"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Зміна темп.",
+				"довго?"
+			],
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"LockingMode": {
+			"text2": [
+				"Дозволити",
+				"блок. кнопок"
+			],
+			"desc": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Чутливість",
+				"сенсору руху"
+			],
+			"desc": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Темпер.",
@@ -127,12 +190,12 @@
 			],
 			"desc": "Час до вимкнення (Хвилини)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
 				"Чутливість",
-				"сенсору руху"
+				"Ефекту Холла"
 			],
-			"desc": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
+			"desc": "Чутливість датчика ефекту Холла при виявленні сну (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -141,13 +204,6 @@
 			],
 			"desc": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Детальний ре-",
-				"жим очікуван."
-			],
-			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Автоповорот",
@@ -155,20 +211,6 @@
 			],
 			"desc": "Орієнтація дисплея (П=Правша | Л=Лівша | A=Автоповорот)"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Темпер.",
-				"Турбо"
-			],
-			"desc": "Температура в \"Турбо\" режимі"
-		},
-		"AutoStart": {
-			"text2": [
-				"Гарячий",
-				"старт"
-			],
-			"desc": "Режим в якому запускається паяльник при ввімкненні (В=Вимк. | П=Пайка | О=Очікування | К=Очікування при кімн. темп.)"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Показ t° при",
@@ -176,34 +218,6 @@
 			],
 			"desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Калібрування",
-				"температури"
-			],
-			"desc": "Калібрування температурного датчика."
-		},
-		"SettingsReset": {
-			"text2": [
-				"Скинути всі",
-				"налаштування?"
-			],
-			"desc": "Скидання всіх параметрів до стандартних значень."
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Калібрування",
-				"напруги"
-			],
-			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Детальний",
-				"режим пайки"
-			],
-			"desc": "Показувати детальну інформацію при пайці."
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Швидкість",
@@ -211,27 +225,6 @@
 			],
 			"desc": "Швидкість прокрутки тексту (П=повільно | Ш=швидко)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Потужність",
-				"дж. живлення"
-			],
-			"desc": "Потужність джерела живлення в Ватах"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"затримка"
-			],
-			"desc": "Затримка у 100мс інкрементах для PD для сумісності з деякими QC зарядними пристроями (0: вимкнено)"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Макс.",
-				"потуж."
-			],
-			"desc": "Макс. потужність, яку може використовувати паяльник (Ват)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Інвертувати",
@@ -239,55 +232,6 @@
 			],
 			"desc": "Інвертувати кнопки зміни температури."
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Зміна темп.",
-				"коротко?"
-			],
-			"desc": "Змінювати температуру при короткому натисканні!"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Зміна темп.",
-				"довго?"
-			],
-			"desc": "Змінювати температуру при довгому натисканні!"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Пульс.",
-				"Навантаж."
-			],
-			"desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Чутливість",
-				"Ефекту Холла"
-			],
-			"desc": "Чутливість датчика ефекту Холла при виявленні сну (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Дозволити",
-				"блок. кнопок"
-			],
-			"desc": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Мін.",
-				"напруга"
-			],
-			"desc": "Мінімальна дозволена напруга на комірку (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Циклічна",
-				"анімація"
-			],
-			"desc": "Циклічна анімація іконок в головному меню"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Швидкість",
@@ -295,26 +239,12 @@
 			],
 			"desc": "Швидкість анімації іконок у головному меню (Мілісекунди) (В=Вимк | Н=Низькa | С=Середня | М=Макс)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Час між імп.",
-				"напруги"
+				"Циклічна",
+				"анімація"
 			],
-			"desc": "Час між імпульсами напруги яка не дає PowerBank-у заснути (x 2.5с)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Тривалість",
-				"імп. напруги"
-			],
-			"desc": "Тривалість імпульсу напруги яка не дає PowerBank-у заснути (x 250мс)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Мова:",
-				" UK     Українська"
-			],
-			"desc": ""
+			"desc": "Циклічна анімація іконок в головному меню"
 		},
 		"Brightness": {
 			"text2": [
@@ -336,6 +266,76 @@
 				"логотипу завантаження"
 			],
 			"desc": "Встановити тривалість показу лого при завантаженні (с=секунд)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Детальний ре-",
+				"жим очікуван."
+			],
+			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Детальний",
+				"режим пайки"
+			],
+			"desc": "Показувати детальну інформацію при пайці."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Макс.",
+				"потуж."
+			],
+			"desc": "Макс. потужність, яку може використовувати паяльник (Ват)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Калібрування",
+				"напруги"
+			],
+			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Пульс.",
+				"Навантаж."
+			],
+			"desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Час між імп.",
+				"напруги"
+			],
+			"desc": "Час між імпульсами напруги яка не дає PowerBank-у заснути (x 2.5с)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Тривалість",
+				"імп. напруги"
+			],
+			"desc": "Тривалість імпульсу напруги яка не дає PowerBank-у заснути (x 250мс)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Скинути всі",
+				"налаштування?"
+			],
+			"desc": "Скидання всіх параметрів до стандартних значень."
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Мова:",
+				" UK  Українська"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json
index b03b422c..52a04b4f 100644
--- a/Translations/translation_VI.json
+++ b/Translations/translation_VI.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": false,
 	"messages": {
-		"SettingsCalibrationWarning": "Chac chan mui hàn o nhiet đo phòng truoc khi tiep tuc!",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "Ban chac chan muon khôi phuc tat ca cài đat ve mac đinh?",
 		"UVLOWarningString": "DC thap",
 		"UndervoltageString": "Đien áp thap",
@@ -66,35 +66,35 @@
 				"Cài đat",
 				"nguon đien"
 			],
-			"desc": "Cài đat nguon đien"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": [
 				"Cài đat",
 				"tay hàn"
 			],
-			"desc": "Cài đat tay hàn"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Che đo",
 				"ngu"
 			],
-			"desc": "Cài đat che đo tiet kiem đien"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": [
 				"Giao dien",
 				"nguoi dùng"
 			],
-			"desc": "Cài đat giao dien nguoi dùng"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Cài đat",
 				"nâng cao"
 			],
-			"desc": "Cài đat nâng cao"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -105,6 +105,69 @@
 			],
 			"desc": "Nguon đien, đat đien áp giam. (DC 10V) (S 3.3V moi cell, tat gioi han công suat)"
 		},
+		"MinVolCell": {
+			"text2": [
+				"Voltage",
+				"toi thieu"
+			],
+			"desc": "Đien áp toi thieu cho phép trên moi cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"voltage"
+			],
+			"desc": "Đien áp QC toi đa mà tay hàn yêu cau"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"PD",
+				"sau"
+			],
+			"desc": "Thoi gian cho đàm phán PD trong các buoc 100ms đe tuong thích voi mot so bo sac QC"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Tăng",
+				"nhiet đo"
+			],
+			"desc": "Nhiet đo dùng trong che đo \"tăng cuong\""
+		},
+		"AutoStart": {
+			"text2": [
+				"Nhiet đo",
+				"đang tăng"
+			],
+			"desc": "- O=tat | S=nhiet đo hàn | Z=cho o nhiet đo ngu đen khi cu đong | R=cho mà không gia nhiet đen khi cu đong"
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Thay đoi n.đo",
+				"an nút nhanh"
+			],
+			"desc": "Biên đo tăng/giam nhiet đo khi an nút nhanh"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Thay đoi n.đo",
+				"an nút lâu"
+			],
+			"desc": "Biên đo tăng/giam nhiet đo khi an nút lâu"
+		},
+		"LockingMode": {
+			"text2": [
+				"Cho phép khóa",
+				"các nút"
+			],
+			"desc": "Trong khi hàn, giu ca 2 nút đe khóa(D=tat | B=chi che đo tăng cuong | F=khóa hoàn toàn)"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Cam bien",
+				"cu đong"
+			],
+			"desc": "- 0=tat | 1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"
+		},
 		"SleepTemperature": {
 			"text2": [
 				"Nhiet đo",
@@ -126,12 +189,12 @@
 			],
 			"desc": "- khoang thoi gian truoc khi tay hàn tat (m=phút)"
 		},
-		"MotionSensitivity": {
+		"HallEffSensitivity": {
 			"text2": [
-				"Cam bien",
-				"cu đong"
+				"Hall",
+				"đo nhay"
 			],
-			"desc": "- 0=tat | 1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"
+			"desc": "Đo nhay cam bien Hall đe phát hien che đo ngu (0=tat | 1=ít nhay nhat |...| 9=nhay nhat)"
 		},
 		"TemperatureUnit": {
 			"text2": [
@@ -140,13 +203,6 @@
 			],
 			"desc": "C= Đo C | F= Đo F"
 		},
-		"AdvancedIdle": {
-			"text2": [
-				"Chi tiet",
-				"màn hình cho"
-			],
-			"desc": "- hien thi thông tin chi tiet bang phông chu nho hon trên màn hình cho"
-		},
 		"DisplayRotation": {
 			"text2": [
 				"Huong",
@@ -154,20 +210,6 @@
 			],
 			"desc": "- R=huong tay phai | L=huong tay trái | A=tu đong"
 		},
-		"BoostTemperature": {
-			"text2": [
-				"Tăng",
-				"nhiet đo"
-			],
-			"desc": "Nhiet đo dùng trong che đo \"tăng cuong\""
-		},
-		"AutoStart": {
-			"text2": [
-				"Nhiet đo",
-				"đang tăng"
-			],
-			"desc": "- O=tat | S=nhiet đo hàn | Z=cho o nhiet đo ngu đen khi cu đong | R=cho mà không gia nhiet đen khi cu đong"
-		},
 		"CooldownBlink": {
 			"text2": [
 				"Nguoi đi",
@@ -175,34 +217,6 @@
 			],
 			"desc": "-Nhap nháy nhiet đo sau khi viec gia nhiet tam dung trong khi mui hàn van nóng"
 		},
-		"CalibrateCJC": {
-			"text2": [
-				"Hieu chuan",
-				"nhiet đo?"
-			],
-			"desc": "-Bat đau hieu chuan bù nhiet cho mui hàn"
-		},
-		"SettingsReset": {
-			"text2": [
-				"Khôi phuc",
-				"cài đat goc?"
-			],
-			"desc": "-đat lai tat ca cài đat ve mac đinh"
-		},
-		"VoltageCalibration": {
-			"text2": [
-				"Hieu chinh",
-				"đien áp đau vào?"
-			],
-			"desc": "-bat đau hieu chuan VIN (nhan và giu đe thoát)"
-		},
-		"AdvancedSoldering": {
-			"text2": [
-				"Chi tiet",
-				"màn hình hàn"
-			],
-			"desc": "-Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
-		},
 		"ScrollingSpeed": {
 			"text2": [
 				"Toc đo",
@@ -210,27 +224,6 @@
 			],
 			"desc": "Toc đo cuon văn ban(S=cham | F=nhanh)"
 		},
-		"QCMaxVoltage": {
-			"text2": [
-				"QC",
-				"Voltage"
-			],
-			"desc": "Đien áp QC toi đa mà tay hàn yêu cau"
-		},
-		"PDNegTimeout": {
-			"text2": [
-				"PD",
-				"sau"
-			],
-			"desc": "Thoi gian cho đàm phán PD trong các buoc 100ms đe tuong thích voi mot so bo sac QC"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Công suat",
-				"gioi han"
-			],
-			"desc": "-Công suat toi đa mà tay hàn có the su dung (W=watt)"
-		},
 		"ReverseButtonTempChange": {
 			"text2": [
 				"Đao nguoc",
@@ -238,55 +231,6 @@
 			],
 			"desc": "Đao nguoc chuc năng các nút đieu chinh nhiet đo"
 		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Thay đoi n.đo",
-				"an nút nhanh"
-			],
-			"desc": "Biên đo tăng/giam nhiet đo khi an nút nhanh"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Thay đoi n.đo",
-				"an nút lâu"
-			],
-			"desc": "Biên đo tăng/giam nhiet đo khi an nút lâu"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Công suat",
-				"kích nguon"
-			],
-			"desc": "-Cuong đo công suat kích nguon (watt)"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall",
-				"đo nhay"
-			],
-			"desc": "Đo nhay cam bien Hall đe phát hien che đo ngu (0=tat | 1=ít nhay nhat |...| 9=nhay nhat)"
-		},
-		"LockingMode": {
-			"text2": [
-				"Cho phép khóa",
-				"các nút"
-			],
-			"desc": "Trong khi hàn, giu ca 2 nút đe khóa(D=tat | B=chi che đo tăng cuong | F=khóa hoàn toàn)"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Voltage",
-				"toi thieu"
-			],
-			"desc": "Đien áp toi thieu cho phép trên moi cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Hoat anh",
-				"lap lai"
-			],
-			"desc": "Lap lai các hoat anh trong màn hình chính"
-		},
 		"AnimSpeed": {
 			"text2": [
 				"Toc đo",
@@ -294,26 +238,12 @@
 			],
 			"desc": "-Toc đo cua hoat anh menu (O=tat | S=cham | M=trung bình | F=nhanh)"
 		},
-		"PowerPulseWait": {
+		"AnimLoop": {
 			"text2": [
-				"Trì hoãn",
-				"đien áp kích"
+				"Hoat anh",
+				"lap lai"
 			],
-			"desc": "Trì hoãn truoc khi kích hoat kích nguon(x 2,5 giây)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Thoi luong",
-				"kích nguon"
-			],
-			"desc": "-thoi luong kích nguon (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Ngôn ngu:",
-				"VI     Tieng Viet"
-			],
-			"desc": "-Ngôn ngu firmware hien tai"
+			"desc": "Lap lai các hoat anh trong màn hình chính"
 		},
 		"Brightness": {
 			"text2": [
@@ -334,7 +264,77 @@
 				"Boot logo",
 				"duration"
 			],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Chi tiet",
+				"màn hình cho"
+			],
+			"desc": "- hien thi thông tin chi tiet bang phông chu nho hon trên màn hình cho"
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Chi tiet",
+				"màn hình hàn"
+			],
+			"desc": "-Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Công suat",
+				"gioi han"
+			],
+			"desc": "-Công suat toi đa mà tay hàn có the su dung (W=watt)"
+		},
+		"CalibrateCJC": {
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Hieu chinh",
+				"đien áp đau vào?"
+			],
+			"desc": "-bat đau hieu chuan VIN (nhan và giu đe thoát)"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Công suat",
+				"kích nguon"
+			],
+			"desc": "-Cuong đo công suat kích nguon (watt)"
+		},
+		"PowerPulseWait": {
+			"text2": [
+				"Trì hoãn",
+				"đien áp kích"
+			],
+			"desc": "Trì hoãn truoc khi kích hoat kích nguon(x 2,5 giây)"
+		},
+		"PowerPulseDuration": {
+			"text2": [
+				"Thoi luong",
+				"kích nguon"
+			],
+			"desc": "-thoi luong kích nguon (x 250ms)"
+		},
+		"SettingsReset": {
+			"text2": [
+				"Khôi phuc",
+				"cài đat goc?"
+			],
+			"desc": "-đat lai tat ca cài đat ve mac đinh"
+		},
+		"LanguageSwitch": {
+			"text2": [
+				"Ngôn ngu:",
+				" VI  Tieng Viet"
+			],
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json
index 28a0afd9..4ef412d4 100644
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "開始温度校正之前，請先確定焫雞咀係處於室温！",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？",
 		"UVLOWarningString": "電壓過低",
 		"UndervoltageString": "Undervoltage",
@@ -51,23 +51,23 @@
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": "電源設定",
-			"desc": "電源設定"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": "焊接設定",
-			"desc": "焊接設定"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": "待機設定",
-			"desc": "自動待機慳電設定"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": "使用者介面",
-			"desc": "使用者介面設定"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": "進階設定",
-			"desc": "進階設定"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -75,6 +75,42 @@
 			"text2": "電源",
 			"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每粒3.3V計算；依個設定會停用功率限制>"
 		},
+		"MinVolCell": {
+			"text2": "最低電壓",
+			"desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+		},
+		"QCMaxVoltage": {
+			"text2": "QC電壓",
+			"desc": "使用QC電源時請求嘅最高目標電壓"
+		},
+		"PDNegTimeout": {
+			"text2": "PD逾時",
+			"desc": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
+		},
+		"BoostTemperature": {
+			"text2": "增熱温度",
+			"desc": "喺增熱模式時使用嘅温度"
+		},
+		"AutoStart": {
+			"text2": "自動啓用",
+			"desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
+		},
+		"TempChangeShortStep": {
+			"text2": "温度調整 短",
+			"desc": "調校温度時短撳一下嘅温度變幅"
+		},
+		"TempChangeLongStep": {
+			"text2": "温度調整 長",
+			"desc": "調校温度時長撳嘅温度變幅"
+		},
+		"LockingMode": {
+			"text2": "撳掣鎖定",
+			"desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
+		},
+		"MotionSensitivity": {
+			"text2": "動作敏感度",
+			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+		},
 		"SleepTemperature": {
 			"text2": "待機温度",
 			"desc": "喺待機模式時嘅焫雞咀温度"
@@ -87,113 +123,37 @@
 			"text2": "自動熄機",
 			"desc": "自動熄機前嘅閒置等候時間 <m=分鐘>"
 		},
-		"MotionSensitivity": {
-			"text2": "動作敏感度",
-			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+		"HallEffSensitivity": {
+			"text2": "磁場敏感度",
+			"desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
 		},
 		"TemperatureUnit": {
 			"text2": "温度單位",
 			"desc": "C=攝氏 | F=華氏"
 		},
-		"AdvancedIdle": {
-			"text2": "詳細閒置畫面",
-			"desc": "喺閒置畫面以英文細字顯示詳細嘅資料"
-		},
 		"DisplayRotation": {
 			"text2": "畫面方向",
 			"desc": "右=使用右手 | 左=使用左手 | 自=自動"
 		},
-		"BoostTemperature": {
-			"text2": "增熱温度",
-			"desc": "喺增熱模式時使用嘅温度"
-		},
-		"AutoStart": {
-			"text2": "自動啓用",
-			"desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
-		},
 		"CooldownBlink": {
 			"text2": "降温時閃爍",
 			"desc": "停止加熱之後，當焫雞咀仲係熱嗰陣閃爍畫面"
 		},
-		"CalibrateCJC": {
-			"text2": "温度校正？",
-			"desc": "開始校正焫雞咀温度位移"
-		},
-		"SettingsReset": {
-			"text2": "全部重設？",
-			"desc": "將所有設定重設到預設值"
-		},
-		"VoltageCalibration": {
-			"text2": "輸入電壓校正？",
-			"desc": "開始校正VIN輸入電壓 <長撳以退出>"
-		},
-		"AdvancedSoldering": {
-			"text2": "詳細焊接畫面",
-			"desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
-		},
 		"ScrollingSpeed": {
 			"text2": "捲動速度",
 			"desc": "解說文字嘅捲動速度"
 		},
-		"QCMaxVoltage": {
-			"text2": "QC電壓",
-			"desc": "使用QC電源時請求嘅最高目標電壓"
-		},
-		"PDNegTimeout": {
-			"text2": "PD逾時",
-			"desc": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
-		},
-		"PowerLimit": {
-			"text2": "功率限制",
-			"desc": "限制焫雞可用嘅最大功率 <W=watt（火）>"
-		},
 		"ReverseButtonTempChange": {
 			"text2": "反轉加減掣",
 			"desc": "反轉調校温度時加減掣嘅方向"
 		},
-		"TempChangeShortStep": {
-			"text2": "温度調整 短",
-			"desc": "調校温度時短撳一下嘅温度變幅"
-		},
-		"TempChangeLongStep": {
-			"text2": "温度調整 長",
-			"desc": "調校温度時長撳嘅温度變幅"
-		},
-		"PowerPulsePower": {
-			"text2": "電源脈衝",
-			"desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>"
-		},
-		"HallEffSensitivity": {
-			"text2": "磁場敏感度",
-			"desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
-		},
-		"LockingMode": {
-			"text2": "撳掣鎖定",
-			"desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
-		},
-		"MinVolCell": {
-			"text2": "最低電壓",
-			"desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": "動畫循環",
-			"desc": "循環顯示功能表圖示動畫"
-		},
 		"AnimSpeed": {
 			"text2": "動畫速度",
 			"desc": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
 		},
-		"PowerPulseWait": {
-			"text2": "電源脈衝間隔",
-			"desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>"
-		},
-		"PowerPulseDuration": {
-			"text2": "電源脈衝時長",
-			"desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>"
-		},
-		"LanguageSwitch": {
-			"text2": "語言： 廣東話",
-			"desc": ""
+		"AnimLoop": {
+			"text2": "動畫循環",
+			"desc": "循環顯示功能表圖示動畫"
 		},
 		"Brightness": {
 			"text2": "熒幕亮度",
@@ -204,11 +164,48 @@
 			"desc": "反轉OLED熒幕嘅黑白色"
 		},
 		"LOGOTime": {
-			"text2": [
-			"Boot logo",
-			"duration"
-		],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"text2": "Boot logo duration",
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": "詳細閒置畫面",
+			"desc": "喺閒置畫面以英文細字顯示詳細嘅資料"
+		},
+		"AdvancedSoldering": {
+			"text2": "詳細焊接畫面",
+			"desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
+		},
+		"PowerLimit": {
+			"text2": "功率限制",
+			"desc": "限制焫雞可用嘅最大功率 <W=watt（火）>"
+		},
+		"CalibrateCJC": {
+			"text2": "Calibrate CJC",
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": "輸入電壓校正？",
+			"desc": "開始校正VIN輸入電壓 <長撳以退出>"
+		},
+		"PowerPulsePower": {
+			"text2": "電源脈衝",
+			"desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>"
+		},
+		"PowerPulseWait": {
+			"text2": "電源脈衝間隔",
+			"desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>"
+		},
+		"PowerPulseDuration": {
+			"text2": "電源脈衝時長",
+			"desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>"
+		},
+		"SettingsReset": {
+			"text2": "全部重設？",
+			"desc": "將所有設定重設到預設值"
+		},
+		"LanguageSwitch": {
+			"text2": "語言： 廣東話",
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json
index 43c54085..056bc259 100644
--- a/Translations/translation_ZH_CN.json
+++ b/Translations/translation_ZH_CN.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "开始温度校正前，请先确定烙铁头正处于室温！",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "你是否确定要将全部设定重置为默认值？",
 		"UVLOWarningString": "电压过低",
 		"UndervoltageString": "Undervoltage",
@@ -51,23 +51,23 @@
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": "电源设置",
-			"desc": "电源设置"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": "焊接设置",
-			"desc": "焊接设置"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": "待机设置",
-			"desc": "自动待机省电设置"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": "用户界面",
-			"desc": "用户界面设置"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": "高级设置",
-			"desc": "高级设置"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -75,6 +75,42 @@
 			"text2": "下限电压",
 			"desc": "设置自动停机电压 <DC=10V | S=（串）每节锂电池3.3V；此设置会禁用功率限制>"
 		},
+		"MinVolCell": {
+			"text2": "最低电压",
+			"desc": "每节电池的最低允许电压 <V（伏特）> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+		},
+		"QCMaxVoltage": {
+			"text2": "QC电压",
+			"desc": "使用QC电源时请求的最高目标电压"
+		},
+		"PDNegTimeout": {
+			"text2": "PD超时",
+			"desc": "设定USB-PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
+		},
+		"BoostTemperature": {
+			"text2": "增热温度",
+			"desc": "增热模式时使用的温度"
+		},
+		"AutoStart": {
+			"text2": "自动启动",
+			"desc": "开机时自动启动 <无=禁用 | 焊=焊接模式 | 待=待机模式 | 室=室温待机>"
+		},
+		"TempChangeShortStep": {
+			"text2": "短按温度调整",
+			"desc": "调校温度时短按按键的温度变幅"
+		},
+		"TempChangeLongStep": {
+			"text2": "长按温度调整",
+			"desc": "调校温度时长按按键的温度变幅"
+		},
+		"LockingMode": {
+			"text2": "按键锁定",
+			"desc": "焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=完全锁定>"
+		},
+		"MotionSensitivity": {
+			"text2": "动作灵敏度",
+			"desc": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
+		},
 		"SleepTemperature": {
 			"text2": "待机温度",
 			"desc": "待机模式时的烙铁头温度"
@@ -87,113 +123,37 @@
 			"text2": "自动关机",
 			"desc": "自动关机前的等候时间 <m=分钟>"
 		},
-		"MotionSensitivity": {
-			"text2": "动作灵敏度",
-			"desc": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
+		"HallEffSensitivity": {
+			"text2": "磁场灵敏度",
+			"desc": "霍尔效应传感器用作启动待机模式的灵敏度 <0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度>"
 		},
 		"TemperatureUnit": {
 			"text2": "温度单位",
 			"desc": "C=摄氏 | F=华氏"
 		},
-		"AdvancedIdle": {
-			"text2": "闲置画面详情",
-			"desc": "闲置画面以英语小字体显示详情"
-		},
 		"DisplayRotation": {
 			"text2": "显示方向",
 			"desc": "右=右手 | 左=左手 | 自=自动"
 		},
-		"BoostTemperature": {
-			"text2": "增热温度",
-			"desc": "增热模式时使用的温度"
-		},
-		"AutoStart": {
-			"text2": "自动启动",
-			"desc": "开机时自动启动 <无=禁用 | 焊=焊接模式 | 待=待机模式 | 室=室温待机>"
-		},
 		"CooldownBlink": {
 			"text2": "降温时闪显",
 			"desc": "停止加热之后，闪动温度显示提醒烙铁头仍处于高温状态"
 		},
-		"CalibrateCJC": {
-			"text2": "温度校正？",
-			"desc": "开始校正烙铁头温度偏移"
-		},
-		"SettingsReset": {
-			"text2": "全部重置？",
-			"desc": "将所有设定重置为默认值"
-		},
-		"VoltageCalibration": {
-			"text2": "输入电压校正？",
-			"desc": "开始校正输入电压（VIN）<长按以退出>"
-		},
-		"AdvancedSoldering": {
-			"text2": "焊接画面详情",
-			"desc": "焊接模式画面以英语小字体显示详请"
-		},
 		"ScrollingSpeed": {
 			"text2": "滚动速度",
 			"desc": "解说文字的滚动速度"
 		},
-		"QCMaxVoltage": {
-			"text2": "QC电压",
-			"desc": "使用QC电源时请求的最高目标电压"
-		},
-		"PDNegTimeout": {
-			"text2": "PD超时",
-			"desc": "设定USB-PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
-		},
-		"PowerLimit": {
-			"text2": "功率限制",
-			"desc": "限制烙铁可用的最大功率 <W=瓦特>"
-		},
 		"ReverseButtonTempChange": {
 			"text2": "调换加减键",
 			"desc": "调校温度时更换加减键的方向"
 		},
-		"TempChangeShortStep": {
-			"text2": "短按温度调整",
-			"desc": "调校温度时短按按键的温度变幅"
-		},
-		"TempChangeLongStep": {
-			"text2": "长按温度调整",
-			"desc": "调校温度时长按按键的温度变幅"
-		},
-		"PowerPulsePower": {
-			"text2": "电源脉冲",
-			"desc": "为保持电源处于唤醒状态所用的功率 <Watt（瓦特）>"
-		},
-		"HallEffSensitivity": {
-			"text2": "磁场灵敏度",
-			"desc": "霍尔效应传感器用作启动待机模式的灵敏度 <0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度>"
-		},
-		"LockingMode": {
-			"text2": "按键锁定",
-			"desc": "焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=完全锁定>"
-		},
-		"MinVolCell": {
-			"text2": "最低电压",
-			"desc": "每节电池的最低允许电压 <V（伏特）> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": "动画循环",
-			"desc": "主菜单中循环播放功能图标动画"
-		},
 		"AnimSpeed": {
 			"text2": "动画速度",
 			"desc": "主菜单中功能图标动画的播放速度 <关=不显示动画 | 慢=慢速 | 中=中速 | 快=快速>"
 		},
-		"PowerPulseWait": {
-			"text2": "电源脉冲间隔",
-			"desc": "为保持电源处于唤醒状态，每次通电之间的间隔时间 <x2.5s（秒）>"
-		},
-		"PowerPulseDuration": {
-			"text2": "电源脉冲时长",
-			"desc": "为保持电源处于唤醒状态，每次通电脉冲的时间长度 <x250ms（亳秒）>"
-		},
-		"LanguageSwitch": {
-			"text2": "语言：简体中文",
-			"desc": ""
+		"AnimLoop": {
+			"text2": "动画循环",
+			"desc": "主菜单中循环播放功能图标动画"
 		},
 		"Brightness": {
 			"text2": "屏幕亮度",
@@ -204,11 +164,48 @@
 			"desc": "反转OLED黑/白屏幕"
 		},
 		"LOGOTime": {
-			"text2": [
-			"Boot logo",
-			"duration"
-		],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"text2": "Boot logo duration",
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": "闲置画面详情",
+			"desc": "闲置画面以英语小字体显示详情"
+		},
+		"AdvancedSoldering": {
+			"text2": "焊接画面详情",
+			"desc": "焊接模式画面以英语小字体显示详请"
+		},
+		"PowerLimit": {
+			"text2": "功率限制",
+			"desc": "限制烙铁可用的最大功率 <W=瓦特>"
+		},
+		"CalibrateCJC": {
+			"text2": "Calibrate CJC",
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": "输入电压校正？",
+			"desc": "开始校正输入电压（VIN）<长按以退出>"
+		},
+		"PowerPulsePower": {
+			"text2": "电源脉冲",
+			"desc": "为保持电源处于唤醒状态所用的功率 <Watt（瓦特）>"
+		},
+		"PowerPulseWait": {
+			"text2": "电源脉冲间隔",
+			"desc": "为保持电源处于唤醒状态，每次通电之间的间隔时间 <x2.5s（秒）>"
+		},
+		"PowerPulseDuration": {
+			"text2": "电源脉冲时长",
+			"desc": "为保持电源处于唤醒状态，每次通电脉冲的时间长度 <x250ms（亳秒）>"
+		},
+		"SettingsReset": {
+			"text2": "全部重置？",
+			"desc": "将所有设定重置为默认值"
+		},
+		"LanguageSwitch": {
+			"text2": "语言：简体中文",
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json
index de9611bd..e32ad573 100644
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "開始溫度校正前，請先確定烙鐵頭正處於室溫！",
+		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
 		"SettingsResetWarning": "你是否確定要將全部設定重設到預設值？",
 		"UVLOWarningString": "電壓過低",
 		"UndervoltageString": "Undervoltage",
@@ -51,23 +51,23 @@
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": "電源設定",
-			"desc": "電源設定"
+			"desc": ""
 		},
 		"SolderingMenu": {
 			"text2": "焊接設定",
-			"desc": "焊接設定"
+			"desc": ""
 		},
 		"PowerSavingMenu": {
 			"text2": "待機設定",
-			"desc": "自動待機省電設定"
+			"desc": ""
 		},
 		"UIMenu": {
 			"text2": "使用者介面",
-			"desc": "使用者介面設定"
+			"desc": ""
 		},
 		"AdvancedMenu": {
 			"text2": "進階設定",
-			"desc": "進階設定"
+			"desc": ""
 		}
 	},
 	"menuOptions": {
@@ -75,6 +75,42 @@
 			"text2": "電源",
 			"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每顆3.3V計算；此設定會停用功率限制>"
 		},
+		"MinVolCell": {
+			"text2": "最低電壓",
+			"desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+		},
+		"QCMaxVoltage": {
+			"text2": "QC電壓",
+			"desc": "使用QC電源時請求的最高目標電壓"
+		},
+		"PDNegTimeout": {
+			"text2": "PD逾時",
+			"desc": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
+		},
+		"BoostTemperature": {
+			"text2": "增熱溫度",
+			"desc": "於增熱模式時使用的溫度"
+		},
+		"AutoStart": {
+			"text2": "自動啟用",
+			"desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
+		},
+		"TempChangeShortStep": {
+			"text2": "溫度調整 短",
+			"desc": "調校溫度時短按一下的溫度變幅"
+		},
+		"TempChangeLongStep": {
+			"text2": "溫度調整 長",
+			"desc": "調校溫度時長按按鍵的溫度變幅"
+		},
+		"LockingMode": {
+			"text2": "按鍵鎖定",
+			"desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
+		},
+		"MotionSensitivity": {
+			"text2": "動作敏感度",
+			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+		},
 		"SleepTemperature": {
 			"text2": "待機溫度",
 			"desc": "於待機模式時的烙鐵頭溫度"
@@ -87,113 +123,37 @@
 			"text2": "自動關機",
 			"desc": "自動關機前的閒置等候時間 <m=分鐘>"
 		},
-		"MotionSensitivity": {
-			"text2": "動作敏感度",
-			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+		"HallEffSensitivity": {
+			"text2": "磁場敏感度",
+			"desc": "磁場感應器用作啟動待機模式的敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
 		},
 		"TemperatureUnit": {
 			"text2": "溫標",
 			"desc": "C=攝氏 | F=華氏"
 		},
-		"AdvancedIdle": {
-			"text2": "詳細閒置畫面",
-			"desc": "於閒置畫面以英文小字型顯示詳細資料"
-		},
 		"DisplayRotation": {
 			"text2": "畫面方向",
 			"desc": "右=使用右手 | 左=使用左手 | 自=自動"
 		},
-		"BoostTemperature": {
-			"text2": "增熱溫度",
-			"desc": "於增熱模式時使用的溫度"
-		},
-		"AutoStart": {
-			"text2": "自動啟用",
-			"desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
-		},
 		"CooldownBlink": {
 			"text2": "降溫時閃爍",
 			"desc": "停止加熱之後，當烙鐵頭仍處於高溫時閃爍畫面"
 		},
-		"CalibrateCJC": {
-			"text2": "溫度校正？",
-			"desc": "開始校正烙鐵頭溫度位移"
-		},
-		"SettingsReset": {
-			"text2": "全部重設？",
-			"desc": "將所有設定重設到預設值"
-		},
-		"VoltageCalibration": {
-			"text2": "輸入電壓校正？",
-			"desc": "開始校正VIN輸入電壓 <長按以退出>"
-		},
-		"AdvancedSoldering": {
-			"text2": "詳細焊接畫面",
-			"desc": "於焊接模式畫面以英文小字型顯示詳細資料"
-		},
 		"ScrollingSpeed": {
 			"text2": "捲動速度",
 			"desc": "解說文字的捲動速度"
 		},
-		"QCMaxVoltage": {
-			"text2": "QC電壓",
-			"desc": "使用QC電源時請求的最高目標電壓"
-		},
-		"PDNegTimeout": {
-			"text2": "PD逾時",
-			"desc": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
-		},
-		"PowerLimit": {
-			"text2": "功率限制",
-			"desc": "限制烙鐵可用的最大功率 <W=watt（瓦特）>"
-		},
 		"ReverseButtonTempChange": {
 			"text2": "調換加減鍵",
 			"desc": "調校溫度時調換加減鍵的方向"
 		},
-		"TempChangeShortStep": {
-			"text2": "溫度調整 短",
-			"desc": "調校溫度時短按一下的溫度變幅"
-		},
-		"TempChangeLongStep": {
-			"text2": "溫度調整 長",
-			"desc": "調校溫度時長按按鍵的溫度變幅"
-		},
-		"PowerPulsePower": {
-			"text2": "電源脈衝",
-			"desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>"
-		},
-		"HallEffSensitivity": {
-			"text2": "磁場敏感度",
-			"desc": "磁場感應器用作啟動待機模式的敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
-		},
-		"LockingMode": {
-			"text2": "按鍵鎖定",
-			"desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
-		},
-		"MinVolCell": {
-			"text2": "最低電壓",
-			"desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": "動畫循環",
-			"desc": "循環顯示功能表圖示動畫"
-		},
 		"AnimSpeed": {
 			"text2": "動畫速度",
 			"desc": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
 		},
-		"PowerPulseWait": {
-			"text2": "電源脈衝間隔",
-			"desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>"
-		},
-		"PowerPulseDuration": {
-			"text2": "電源脈衝時長",
-			"desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>"
-		},
-		"LanguageSwitch": {
-			"text2": "語言：正體中文",
-			"desc": ""
+		"AnimLoop": {
+			"text2": "動畫循環",
+			"desc": "循環顯示功能表圖示動畫"
 		},
 		"Brightness": {
 			"text2": "螢幕亮度",
@@ -204,11 +164,48 @@
 			"desc": "反轉OLED螢幕的黑白色彩"
 		},
 		"LOGOTime": {
-			"text2": [
-			"Boot logo",
-			"duration"
-		],
-			"desc": "Sets the duration for the boot logo (s=seconds)"
+			"text2": "Boot logo duration",
+			"desc": "Set boot logo duration (s=seconds)"
+		},
+		"AdvancedIdle": {
+			"text2": "詳細閒置畫面",
+			"desc": "於閒置畫面以英文小字型顯示詳細資料"
+		},
+		"AdvancedSoldering": {
+			"text2": "詳細焊接畫面",
+			"desc": "於焊接模式畫面以英文小字型顯示詳細資料"
+		},
+		"PowerLimit": {
+			"text2": "功率限制",
+			"desc": "限制烙鐵可用的最大功率 <W=watt（瓦特）>"
+		},
+		"CalibrateCJC": {
+			"text2": "Calibrate CJC",
+			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+		},
+		"VoltageCalibration": {
+			"text2": "輸入電壓校正？",
+			"desc": "開始校正VIN輸入電壓 <長按以退出>"
+		},
+		"PowerPulsePower": {
+			"text2": "電源脈衝",
+			"desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>"
+		},
+		"PowerPulseWait": {
+			"text2": "電源脈衝間隔",
+			"desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>"
+		},
+		"PowerPulseDuration": {
+			"text2": "電源脈衝時長",
+			"desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>"
+		},
+		"SettingsReset": {
+			"text2": "全部重設？",
+			"desc": "將所有設定重設到預設值"
+		},
+		"LanguageSwitch": {
+			"text2": "語言：正體中文",
+			"desc": ""
 		}
 	}
 }
diff --git a/Translations/translations_def.js b/Translations/translations_def.js
index d0e35a04..16f35951 100644
--- a/Translations/translations_def.js
+++ b/Translations/translations_def.js
@@ -23,7 +23,6 @@ var def = ///
                 "maxLen": 11,
                 "note": "Preferably end with a space",
                 "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading."
-
             },
             {
                 "id": "SleepingSimpleString",
@@ -124,13 +123,11 @@ var def = ///
                 "id": "SettingStartSleepChar",
                 "len": 1,
                 "description": "Shown when the auto start mode is set to start in sleep mode."
-
             },
             {
                 "id": "SettingStartSleepOffChar",
                 "len": 1,
                 "description": "Shown when the auto start state is set to go to an off state, but on movement wake into soldering mode."
-
             },
             {
                 "id": "SettingStartNoneChar",
@@ -141,7 +138,6 @@ var def = ///
                 "id": "SettingSensitivityOff",
                 "len": 1,
                 "description": "Shown when a sensitivity (hall effect sensor) is disabled. Turning off the sensor."
-
             },
             {
                 "id": "SettingSensitivityLow",
@@ -163,7 +159,6 @@ var def = ///
                 "len": 1,
                 "default": "D",
                 "description": "Shown when locking mode is turned off."
-
             },
             {
                 "id": "SettingLockBoostChar",
@@ -201,7 +196,6 @@ var def = ///
                 "maxLen": 5,
                 "maxLen2": 11,
                 "description": "User interface related settings, such as units."
-
             },
             {
                 "id": "AdvancedMenu",
@@ -217,102 +211,10 @@ var def = ///
                 "description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery."
             },
             {
-                "id": "SleepTemperature",
+                "id": "MinVolCell",
                 "maxLen": 4,
                 "maxLen2": 9,
-                "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
-            },
-            {
-                "id": "SleepTimeout",
-                "maxLen": 4,
-                "maxLen2": 9,
-                "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
-
-            },
-            {
-                "id": "ShutdownTimeout",
-                "maxLen": 5,
-                "maxLen2": 11,
-                "description": "How long of a period without movement / button-pressing is required before the device turns off the tip heater completely and returns to the main idle screen."
-
-            },
-            {
-                "id": "MotionSensitivity",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "Scale of how sensitive the device is to movement. Higher numbers == more sensitive. 0 == motion detection turned off."
-            },
-            {
-                "id": "TemperatureUnit",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "If the device shows temperatures in °C or °F."
-
-            },
-            {
-                "id": "AdvancedIdle",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "Should the device show an 'advanced' view on the idle screen. The advanced view uses text to show more details than the typical icons."
-            },
-            {
-                "id": "DisplayRotation",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
-
-            },
-            {
-                "id": "BoostTemperature",
-                "maxLen": 4,
-                "maxLen2": 9,
-                "description": "When the unit is in soldering mode. You can hold down the button at the front of the device to temporarily override the soldering temperature to this value. This SETS the temperature, it does not ADD to it."
-            },
-            {
-                "id": "AutoStart",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "When the device powers up, should it enter into a special mode. These settings set it to either start into soldering mode, sleeping mode or auto mode (Enters into soldering mode on the first movement)."
-
-            },
-            {
-                "id": "CooldownBlink",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "If the idle screen should blink the tip temperature for attention while the tip is over 50°C. Intended as a 'tip is still hot' warning."
-
-            },
-            {
-                "id": "CalibrateCJC",
-                "maxLen": 8,
-                "maxLen2": 15,
-                "description": "Used to calibrate the ADC+Op-amp offsets for the tip. This calibration must be performed when the tip temperature and the handle temperature are equal. Generally not required unless your device is reading more than 5°C off target."
-
-            },
-            {
-                "id": "SettingsReset",
-                "maxLen": 8,
-                "maxLen2": 15,
-                "description": "Resets all settings and calibrations to factory defaults. Does NOT erase custom user boot up logo's."
-            },
-            {
-                "id": "VoltageCalibration",
-                "maxLen": 8,
-                "maxLen2": 15,
-                "description": "Enters an adjustment mode where you can gradually adjust the measured voltage to compensate for any unit-to-unit variance in the voltage sense resistors."
-            },
-            {
-                "id": "AdvancedSoldering",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "Should the device show an 'advanced' soldering view. This is a text-based view that shows more information at the cost of no nice graphics."
-            },
-            {
-                "id": "ScrollingSpeed",
-                "maxLen": 6,
-                "maxLen2": 11,
-                "description": "How fast the description text scrolls when hovering on a menu. Faster speeds may induce tearing, but allow reading the whole description faster."
-
+                "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
             },
             {
                 "id": "QCMaxVoltage",
@@ -325,49 +227,30 @@ var def = ///
                 "maxLen": 8,
                 "maxLen2": 15,
                 "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
-
-            },
-
-            {
-                "id": "PowerLimit",
-                "maxLen": 5,
-                "maxLen2": 11,
-                "description": "Allows setting a custom wattage for the device to aim to keep the AVERAGE power below. The unit can't control its peak power no matter how you set this. (Except for MHP30 which will regulate nicely to this). If USB-PD is in use, the limit will be set to the lower of this and the supplies advertised wattage."
-
             },
             {
-                "id": "ReverseButtonTempChange",
+                "id": "BoostTemperature",
+                "maxLen": 4,
+                "maxLen2": 9,
+                "description": "When the unit is in soldering mode. You can hold down the button at the front of the device to temporarily override the soldering temperature to this value. This SETS the temperature, it does not ADD to it."
+            },
+            {
+                "id": "AutoStart",
                 "maxLen": 6,
-                "maxLen2": 15,
-                "description": "Swaps which button increments and decrements on temperature change screens."
+                "maxLen2": 13,
+                "description": "When the device powers up, should it enter into a special mode. These settings set it to either start into soldering mode, sleeping mode or auto mode (Enters into soldering mode on the first movement)."
             },
             {
                 "id": "TempChangeShortStep",
                 "maxLen": 8,
                 "maxLen2": 15,
                 "description": "Factor by which the temperature is changed with a quick press of the buttons."
-
             },
             {
                 "id": "TempChangeLongStep",
                 "maxLen": 6,
                 "maxLen2": 15,
                 "description": "Factor by which the temperature is changed with a hold of the buttons."
-
-            },
-            {
-                "id": "PowerPulsePower",
-                "maxLen": 6,
-                "maxLen2": 15,
-                "description": "Enables and sets the wattage of the power pulse. Power pulse causes the device to briefly turn on the heater to draw power to avoid power banks going to sleep."
-
-            },
-            {
-                "id": "HallEffSensitivity",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
-
             },
             {
                 "id": "LockingMode",
@@ -376,16 +259,64 @@ var def = ///
                 "description": "If locking the buttons against accidental presses is enabled."
             },
             {
-                "id": "MinVolCell",
-                "maxLen": 4,
-                "maxLen2": 9,
-                "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
-            },
-            {
-                "id": "AnimLoop",
+                "id": "MotionSensitivity",
                 "maxLen": 6,
                 "maxLen2": 13,
-                "description": "Should the menu animations loop. Only visible if the animation speed is not set to \"Off\""
+                "description": "Scale of how sensitive the device is to movement. Higher numbers == more sensitive. 0 == motion detection turned off."
+            },
+            {
+                "id": "SleepTemperature",
+                "maxLen": 4,
+                "maxLen2": 9,
+                "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
+            },
+            {
+                "id": "SleepTimeout",
+                "maxLen": 4,
+                "maxLen2": 9,
+                "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
+            },
+            {
+                "id": "ShutdownTimeout",
+                "maxLen": 5,
+                "maxLen2": 11,
+                "description": "How long of a period without movement / button-pressing is required before the device turns off the tip heater completely and returns to the main idle screen."
+            },
+            {
+                "id": "HallEffSensitivity",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
+            },
+            {
+                "id": "TemperatureUnit",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "If the device shows temperatures in °C or °F."
+            },
+            {
+                "id": "DisplayRotation",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
+            },
+            {
+                "id": "CooldownBlink",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "If the idle screen should blink the tip temperature for attention while the tip is over 50°C. Intended as a 'tip is still hot' warning."
+            },
+            {
+                "id": "ScrollingSpeed",
+                "maxLen": 6,
+                "maxLen2": 11,
+                "description": "How fast the description text scrolls when hovering on a menu. Faster speeds may induce tearing, but allow reading the whole description faster."
+            },
+            {
+                "id": "ReverseButtonTempChange",
+                "maxLen": 6,
+                "maxLen2": 15,
+                "description": "Swaps which button increments and decrements on temperature change screens."
             },
             {
                 "id": "AnimSpeed",
@@ -394,22 +325,10 @@ var def = ///
                 "description": "How fast should the menu animations loop, or if they should not loop at all."
             },
             {
-                "id": "PowerPulseWait",
+                "id": "AnimLoop",
                 "maxLen": 6,
                 "maxLen2": 13,
-                "description": "Adjusts the time interval between power pulses. Longer gaps reduce undesired heating of the tip, but needs to be fast enough to keep your power bank awake."
-            },
-            {
-                "id": "PowerPulseDuration",
-                "maxLen": 6,
-                "maxLen2": 13,
-                "description": "How long should the power pulse go for. Some power banks require seeing the power draw be sustained for a certain duration to keep awake. Should be kept as short as possible to avoid wasting power / undesired heating of the tip."
-            },
-            {
-                "id": "LanguageSwitch",
-                "maxLen": 7,
-                "maxLen2": 15,
-                "description": "Changes the device language on multi-lingual builds."
+                "description": "Should the menu animations loop. Only visible if the animation speed is not set to \"Off\""
             },
             {
                 "id": "Brightness",
@@ -428,6 +347,66 @@ var def = ///
                 "maxLen": 7,
                 "maxLen2": 15,
                 "description": "Sets the duration for the boot logo (s=seconds)."
+            },
+            {
+                "id": "AdvancedIdle",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "Should the device show an 'advanced' view on the idle screen. The advanced view uses text to show more details than the typical icons."
+            },
+            {
+                "id": "AdvancedSoldering",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "Should the device show an 'advanced' soldering view. This is a text-based view that shows more information at the cost of no nice graphics."
+            },
+            {
+                "id": "PowerLimit",
+                "maxLen": 5,
+                "maxLen2": 11,
+                "description": "Allows setting a custom wattage for the device to aim to keep the AVERAGE power below. The unit can't control its peak power no matter how you set this. (Except for MHP30 which will regulate nicely to this). If USB-PD is in use, the limit will be set to the lower of this and the supplies advertised wattage."
+            },
+            {
+                "id": "CalibrateCJC",
+                "maxLen": 8,
+                "maxLen2": 15,
+                "description": "Used to calibrate the ADC+Op-amp offsets for the tip. This calibration must be performed when the tip temperature and the handle temperature are equal. Generally not required unless your device is reading more than 5°C off target."
+            },
+            {
+                "id": "VoltageCalibration",
+                "maxLen": 8,
+                "maxLen2": 15,
+                "description": "Enters an adjustment mode where you can gradually adjust the measured voltage to compensate for any unit-to-unit variance in the voltage sense resistors."
+            },
+            {
+                "id": "PowerPulsePower",
+                "maxLen": 6,
+                "maxLen2": 15,
+                "description": "Enables and sets the wattage of the power pulse. Power pulse causes the device to briefly turn on the heater to draw power to avoid power banks going to sleep."
+            },
+            {
+                "id": "PowerPulseWait",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "Adjusts the time interval between power pulses. Longer gaps reduce undesired heating of the tip, but needs to be fast enough to keep your power bank awake."
+            },
+            {
+                "id": "PowerPulseDuration",
+                "maxLen": 6,
+                "maxLen2": 13,
+                "description": "How long should the power pulse go for. Some power banks require seeing the power draw be sustained for a certain duration to keep awake. Should be kept as short as possible to avoid wasting power / undesired heating of the tip."
+            },
+            {
+                "id": "SettingsReset",
+                "maxLen": 8,
+                "maxLen2": 15,
+                "description": "Resets all settings and calibrations to factory defaults. Does NOT erase custom user boot up logo's."
+            },
+            {
+                "id": "LanguageSwitch",
+                "maxLen": 7,
+                "maxLen2": 15,
+                "description": "Changes the device language on multi-lingual builds."
             }
         ]
-    }
\ No newline at end of file
+    }
diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h
index b4545503..329a2218 100644
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -36,39 +36,39 @@ extern const char *PowerSourceNames[];
 
 enum class SettingsItemIndex : uint8_t {
   DCInCutoff,
+  MinVolCell,
+  QCMaxVoltage,
+  PDNegTimeout,
+  BoostTemperature,
+  AutoStart,
+  TempChangeShortStep,
+  TempChangeLongStep,
+  LockingMode,
+  MotionSensitivity,
   SleepTemperature,
   SleepTimeout,
   ShutdownTimeout,
-  MotionSensitivity,
-  TemperatureUnit,
-  AdvancedIdle,
-  DisplayRotation,
-  BoostTemperature,
-  AutoStart,
-  CooldownBlink,
-  CalibrateCJC,
-  SettingsReset,
-  VoltageCalibration,
-  AdvancedSoldering,
-  ScrollingSpeed,
-  QCMaxVoltage,
-  PDNegTimeout,
-  PowerLimit,
-  ReverseButtonTempChange,
-  TempChangeShortStep,
-  TempChangeLongStep,
-  PowerPulsePower,
   HallEffSensitivity,
-  LockingMode,
-  MinVolCell,
-  AnimLoop,
+  TemperatureUnit,
+  DisplayRotation,
+  CooldownBlink,
+  ScrollingSpeed,
+  ReverseButtonTempChange,
   AnimSpeed,
-  PowerPulseWait,
-  PowerPulseDuration,
-  LanguageSwitch,
+  AnimLoop,
   Brightness,
   ColourInversion,
   LOGOTime,
+  AdvancedIdle,
+  AdvancedSoldering,
+  PowerLimit,
+  CalibrateCJC,
+  VoltageCalibration,
+  PowerPulsePower,
+  PowerPulseWait,
+  PowerPulseDuration,
+  SettingsReset,
+  LanguageSwitch,
   NUM_ITEMS,
 };