Skip to content

Commit b6aaf30

Browse files
RalimRalim
authored
Merge branch 'dev' into BLE
2 parents 686ffe5 + f031b31 commit b6aaf30

36 files changed

+232
-76
lines changed

‎Translations/translation_BE.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"tempUnitFahrenheit": false,
1010
"messages": {
1111
"SettingsCalibrationWarning": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!",
12+
"CJCCalibrating": "каліброўка",
1213
"SettingsResetWarning": "Вы ўпэннены, што жадаеце зкінуць налады да першапачатковых значэнняў?",
1314
"UVLOWarningString": "НАПРУГА--",
1415
"UndervoltageString": "Нізкая напруга",
@@ -20,6 +21,10 @@
2021
"DeviceFailedValidationWarning": "Ваша прылада, хутчэй за ўсё, падробка!"
2122
},
2223
"messagesWarn": {
24+
"CJCCalibrationDone": [
25+
"Calibration",
26+
"done!"
27+
],
2328
"ResetOKMessage": "Скід OK",
2429
"SettingsResetMessage": [
2530
"Налады",
@@ -293,7 +298,7 @@
293298
"Каліброўка тэмпературы",
294299
"пры наступнай загрузцы"
295300
],
296-
"desc": "Каліброўка датчыка тэмпературы джала пры наступнай загрузцы (не патрабуецца, калі розніца менш за 5°C"
301+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
297302
},
298303
"VoltageCalibration": {
299304
"text2": [

‎Translations/translation_BG.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
1213
"UVLOWarningString": "Ниско DC Напрежение",
1314
"UndervoltageString": "Ниско Напрежение",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Нулиране",
2328
"SettingsResetMessage": [
2429
"Настройките бяха",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_CS.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Opravdu chcete resetovat zařízení do továrního nastavení?",
1213
"UVLOWarningString": "Nízké DC",
1314
"UndervoltageString": "Nízké napětí",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Nějaká nastavení",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_DA.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden næste start!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Er du sikker du vil resette indstillingerne til standard?",
1213
"UVLOWarningString": "Lav Volt",
1314
"UndervoltageString": "Undervolt",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Din enhed er højst sandsyneligt en Kopivare!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Visse indstillinger",
@@ -292,7 +297,7 @@
292297
"kalibrere CJK",
293298
"under næste opstart"
294299
],
295-
"desc": "Kalibrer spids Cold Junction Kompensation ved næste opstart (ikke påkrævet, hvis Delta T er < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_DE.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Bitte sicherstellen, dass Lötspitze & Gerät beim nächsten Start Raumtemperatur haben!",
10+
"SettingsCalibrationWarning": "Vor dem Neustart bitte sicherstellen, dass Lötspitze & Gerät Raumtemperatur haben!",
11+
"CJCCalibrating": "kalibriere",
1112
"SettingsResetWarning": "Sicher, dass alle Werte zurückgesetzt werden sollen?",
1213
"UVLOWarningString": "V niedr.",
1314
"UndervoltageString": "Unterspannung",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Höchstwahrscheinlich ist das Gerät eine Fälschung!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Erfolgreich",
25+
"kalibriert!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Einstellungen",
@@ -292,7 +297,7 @@
292297
"Temperatur",
293298
"kalibrieren?"
294299
],
295-
"desc": "Kalibrierung der Kaltstellenkompensation beim nächsten Start (nicht nötig wenn Delta T < 5°C)"
300+
"desc": "Beim nächsten Start wird die Kaltstellenkompensation kalibriert (nicht nötig wenn Delta T < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_EL.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": true,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Σίγουρα θέλετε επαναφορά αρχικών ρυθμίσεων;",
1213
"UVLOWarningString": "Χαμηλ DC",
1314
"UndervoltageString": "Υπόταση",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Επαν. OK",
2328
"SettingsResetMessage": [
2429
"Κάποιες ρυθμ.",
@@ -295,7 +300,7 @@
295300
"Calibrate CJC",
296301
"at next boot"
297302
],
298-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
303+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
299304
},
300305
"VoltageCalibration": {
301306
"text2": [

‎Translations/translation_EN.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": true,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Are you sure you want to restore default settings?",
1213
"UVLOWarningString": "DC LOW",
1314
"UndervoltageString": "Undervoltage",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Certain settings",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_ES.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente al inicio",
11-
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1212
"SettingsResetWarning": "¿Quieres restablecer los ajustes?",
1313
"UVLOWarningString": "CC BAJA",
1414
"UndervoltageString": "Voltaje bajo",
@@ -20,6 +20,10 @@
2020
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2121
},
2222
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2327
"ResetOKMessage": "Hecho.",
2428
"SettingsResetMessage": [
2529
"Ajustes",
@@ -293,10 +297,8 @@
293297
"Calibrar CJC",
294298

295299
"en el próximo inicio"
296-
297300
],
298-
"desc": "Calibrar compensación de punta fría en el próximo inicio (no necesario si Delta T es < 5°C)"
299-
301+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
300302
},
301303
"VoltageCalibration": {
302304
"text2": [

‎Translations/translation_FI.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Haluatko varmasti palauttaa oletusarvot?",
1213
"UVLOWarningString": "DC ALH.",
1314
"UndervoltageString": "Alijännite",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Palautus",
2328
"SettingsResetMessage": [
2429
"Asetukset",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_FR.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?",
1213
"UVLOWarningString": "DC FAIBL",
1314
"UndervoltageString": "Sous-tension",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Votre appareil semble être une contrefaçon !"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Réglages",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_HR.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?",
1213
"UVLOWarningString": "BATERIJA",
1314
"UndervoltageString": "PRENIZAK NAPON",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Certain settings",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_HU.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Biztos visszaállítja a beállításokat alapértékekre?",
1213
"UVLOWarningString": "DC TÚL KEVÉS",
1314
"UndervoltageString": "Alulfeszültség",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Törlés OK",
2328
"SettingsResetMessage": [
2429
"Beállítások",
@@ -292,7 +297,7 @@
292297
"Calibrate CJC",
293298
"at next boot"
294299
],
295-
"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5°C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

‎Translations/translation_IT.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
],
88
"tempUnitFahrenheit": false,
99
"messages": {
10-
"SettingsCalibrationWarning": "Assicurarsi che la punta e il manico si trovino a temperatura ambiente prima di continuare!",
10+
"SettingsCalibrationWarning": "Before rebooting, make sure tip & handle are at room temperature!",
11+
"CJCCalibrating": "calibrating",
1112
"SettingsResetWarning": "Ripristinare le impostazioni iniziali?",
1213
"UVLOWarningString": "DC BASSA",
1314
"UndervoltageString": "DC INSUFFICIENTE",
@@ -19,6 +20,10 @@
1920
"DeviceFailedValidationWarning": "Il dispositivo in uso è molto probabilmente una contraffazione!"
2021
},
2122
"messagesWarn": {
23+
"CJCCalibrationDone": [
24+
"Calibration",
25+
"done!"
26+
],
2227
"ResetOKMessage": "Reset OK",
2328
"SettingsResetMessage": [
2429
"Impostazioni",
@@ -292,7 +297,7 @@
292297
"Calibra T",
293298
"all'avvio"
294299
],
295-
"desc": "Compensa l'errore delle rilevazioni della termocoppia al prossimo avvio (non necessario se l'errore su T è <5 °C)"
300+
"desc": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
296301
},
297302
"VoltageCalibration": {
298303
"text2": [

0 commit comments

Comments
 (0)