From feec35be7a92c664734dc7c4b0aeed515ac87048 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 15:31:23 +1000 Subject: [PATCH 1/5] Collapse power limiter into one menu option Work for #642 --- .gitignore | 1 + Translation Editor/make_translation.py | 45 ++----------- Translation Editor/translation_bg.json | 8 --- Translation Editor/translation_cs.json | 8 --- Translation Editor/translation_da.json | 8 --- Translation Editor/translation_de.json | 8 --- Translation Editor/translation_en.json | 8 --- Translation Editor/translation_es.json | 8 --- Translation Editor/translation_fi.json | 8 --- Translation Editor/translation_fr.json | 8 --- Translation Editor/translation_hr.json | 8 --- Translation Editor/translation_hu.json | 8 --- Translation Editor/translation_it.json | 8 --- Translation Editor/translation_lt.json | 8 --- Translation Editor/translation_nl.json | 8 --- Translation Editor/translation_nl_be.json | 8 --- Translation Editor/translation_no.json | 8 --- Translation Editor/translation_pl.json | 8 --- Translation Editor/translation_pt.json | 8 --- Translation Editor/translation_ru.json | 8 --- Translation Editor/translation_sk.json | 8 --- Translation Editor/translation_sl.json | 8 --- Translation Editor/translation_sr_cyrl.json | 8 --- Translation Editor/translation_sr_latn.json | 8 --- Translation Editor/translation_sv.json | 8 --- Translation Editor/translation_tr.json | 8 --- Translation Editor/translation_uk.json | 8 --- Translation Editor/translations_def.js | 5 -- workspace/TS100/Core/Inc/Settings.h | 1 - workspace/TS100/Core/Src/Settings.cpp | 1 - workspace/TS100/Core/Src/gui.cpp | 72 +++++++++------------ workspace/TS100/Core/Threads/PIDThread.cpp | 2 +- workspace/TS100/configuration.h | 1 - 33 files changed, 37 insertions(+), 291 deletions(-) diff --git a/.gitignore b/.gitignore index 96c9ab2c..11f60f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,4 @@ fabric.properties .idea/httpRequests CoreCompileInputs.cache +.vscode/settings.json diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py index c777cb63..7757b29e 100755 --- a/Translation Editor/make_translation.py +++ b/Translation Editor/make_translation.py @@ -125,27 +125,6 @@ def getConstants(): return consants -def getTipModelEnumTS80(): - constants = [] - constants.append("B02") - constants.append("D25") - constants.append("TS80") # end of miniware - constants.append("User") # User - return constants - - -def getTipModelEnumTS100(): - constants = [] - constants.append("B02") - constants.append("D24") - constants.append("BC2") - constants.append(" C1") - constants.append("TS100") # end of miniware - constants.append("BC2") - constants.append("Hakko") # end of hakko - constants.append("User") - return constants - def getDebugMenu(): constants = [] @@ -207,8 +186,6 @@ def getLetterCounts(defs, lang): constants = getConstants() for x in constants: textList.append(x[1]) - textList.extend(getTipModelEnumTS100()) - textList.extend(getTipModelEnumTS80()) textList.extend(getDebugMenu()) # collapse all strings down into the composite letters and store totals for these @@ -329,17 +306,19 @@ def writeLanguage(languageCode, defs, f): f.write(to_unicode("const char* SettingsDescriptions[] = {\n")) maxLen = 25 + index =0 for mod in defs['menuOptions']: eid = mod['id'] if 'feature' in mod: f.write(to_unicode("#ifdef " + mod['feature'] + "\n")) - f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ ")) + f.write(to_unicode(" /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ ")) f.write( to_unicode("\"" + convStr(symbolConversionTable, (obj[eid]['desc'])) + "\"," + "//{} \n".format(obj[eid]['desc']))) if 'feature' in mod: f.write(to_unicode("#endif\n")) + index=index+1 f.write(to_unicode("};\n\n")) @@ -381,20 +360,6 @@ def writeLanguage(languageCode, defs, f): convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1]))) f.write(to_unicode("\n")) - # Write out tip model strings - - f.write(to_unicode("const char* TipModelStrings[] = {\n")) - f.write(to_unicode("#ifdef MODEL_TS100\n")) - for c in getTipModelEnumTS100(): - f.write(to_unicode("\t \"" + convStr(symbolConversionTable, - c) + "\"," + "//{} \n".format(c))) - f.write(to_unicode("#else\n")) - for c in getTipModelEnumTS80(): - f.write(to_unicode("\t \"" + convStr(symbolConversionTable, - c) + "\"," + "//{} \n".format(c))) - f.write(to_unicode("#endif\n")) - - f.write(to_unicode("};\n\n")) # Debug Menu f.write(to_unicode("const char* DebugMenu[] = {\n")) @@ -417,11 +382,12 @@ def writeLanguage(languageCode, defs, f): f.write(to_unicode("const char* SettingsShortNames[][2] = {\n")) maxLen = 25 + index = 0 for mod in defs['menuOptions']: eid = mod['id'] if 'feature' in mod: f.write(to_unicode("#ifdef " + mod['feature'] + "\n")) - f.write(to_unicode(" /* " + eid.ljust(maxLen)[:maxLen] + " */ ")) + f.write(to_unicode(" /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ ")) if lang['menuDouble']: f.write( to_unicode( @@ -437,6 +403,7 @@ def writeLanguage(languageCode, defs, f): "\" }," + "//{} \n".format(obj[eid]['text']))) if 'feature' in mod: f.write(to_unicode("#endif\n")) + index = index + 1 f.write(to_unicode("};\n\n")) diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index 061f2748..643c13b5 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -236,14 +236,6 @@ ], "desc": "Мощност на избраното захранване" }, - "PowerLimitEnable": { - "text": "", - "text2": [ - "Вкл. лимит", - "на мощност?" - ], - "desc": "Включване на лимит на мощност" - }, "PowerLimit": { "text": "", "text2": [ diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json index 1cef0ce8..c1d66a24 100755 --- a/Translation Editor/translation_cs.json +++ b/Translation Editor/translation_cs.json @@ -236,14 +236,6 @@ ], "desc": "Výkon použítého napájecího adaptéru ve wattech." }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Omez. výk.", - "Aktivovat" - ], - "desc": "Aktivovat omezení výkonu" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json index 6271ef61..8cefa35d 100644 --- a/Translation Editor/translation_da.json +++ b/Translation Editor/translation_da.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index a93c4a93..1a755d5d 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -237,14 +237,6 @@ ], "desc": "Leistungsaufnahme der verwendeten Spannungsversorgung" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Leistungs-", - "Limit An" - ], - "desc": "Leistungslimit aktivieren" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 4b206c7c..66f58642 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -237,14 +237,6 @@ ], "desc": "Power wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Enable power", - "limit" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 66a31e79..8de00bd7 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -236,14 +236,6 @@ ], "desc": "Potencia en vatios del adaptador de corriente utilizado." }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Limitar la", - "potenc. máx." - ], - "desc": "Activa el límite de potencia máxima." - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index 451359fd..f179c530 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index c2cbb387..f55d9ce8 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -234,14 +234,6 @@ ], "desc": "Puissance de l'alimentation utilisée" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Activer?" - ], - "desc": "Activer la limite de puissance" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index 6b91354d..cec60dba 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -234,14 +234,6 @@ ], "desc": "Snaga modula za napajanje" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index ae4310eb..1b583503 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -234,14 +234,6 @@ ], "desc": "A tápegység által leadott teljesítmény" }, - "PowerLimitEnable": { - "text": "TELJH", - "text2": [ - "Telj H", - "Bekapcsolva" - ], - "desc": "Bemeneti teljesitmény korlátozása" - }, "PowerLimit": { "text": "TELJM", "text2": [ diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index 01c748a6..069ca63f 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -236,14 +236,6 @@ ], "desc": "Imposta la potenza massima erogabile dall'alimentatore in uso" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Limitatore", - "di potenza" - ], - "desc": "Abilita un limitatore per la potenza massima erogabile al saldatore" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index 9e886301..ae489e19 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -234,14 +234,6 @@ ], "desc": "Maitinimo bloko galia vatais" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 67d73f8d..7b20ed69 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json index 510721fc..e636024f 100644 --- a/Translation Editor/translation_nl_be.json +++ b/Translation Editor/translation_nl_be.json @@ -234,14 +234,6 @@ ], "desc": "Vermogen van de adapter" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 887285af..673a7176 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json index cc7f6f17..1ed67998 100644 --- a/Translation Editor/translation_pl.json +++ b/Translation Editor/translation_pl.json @@ -237,14 +237,6 @@ ], "desc": "Moc używanego zasilacza w Wattach" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Włącz limit", - "mocy" - ], - "desc": "Włącza limit mocy" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index 6a213ca2..defb47b6 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -234,14 +234,6 @@ ], "desc": "Potência da fonte usada (Watt)" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index d2dff2cc..4923001c 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -236,14 +236,6 @@ ], "desc": "Мощность используемого источника питания" }, - "PowerLimitEnable": { - "text": "ВклЛимW", - "text2": [ - "Ограничение", - "мощности" - ], - "desc": "Включить лимит потребляемой мощности" - }, "PowerLimit": { "text": "ЗначЛимW", "text2": [ diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index ea19f6e0..c38bb7e9 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json index f6793c47..91c85fd6 100644 --- a/Translation Editor/translation_sl.json +++ b/Translation Editor/translation_sl.json @@ -235,14 +235,6 @@ ], "desc": "Moč v W napajalnega vira" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json index 29ba5456..b96b1762 100644 --- a/Translation Editor/translation_sr_cyrl.json +++ b/Translation Editor/translation_sr_cyrl.json @@ -234,14 +234,6 @@ ], "desc": "Снага напајања у ватима." }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json index 30e71cfd..8a97e6ac 100644 --- a/Translation Editor/translation_sr_latn.json +++ b/Translation Editor/translation_sr_latn.json @@ -234,14 +234,6 @@ ], "desc": "Snaga napajanja u vatima." }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index b5b40339..1d3d208f 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -234,14 +234,6 @@ ], "desc": "Power Wattage of the power adapter used" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index 748ad723..a5e1ed24 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -234,14 +234,6 @@ ], "desc": "Kullanılan adaptörün güç miktarı" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "P Limit", - "Enable" - ], - "desc": "Enable power limit" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json index 76b7d4fc..787e3e16 100644 --- a/Translation Editor/translation_uk.json +++ b/Translation Editor/translation_uk.json @@ -236,14 +236,6 @@ ], "desc": "Потужність джерела живлення в Ватах" }, - "PowerLimitEnable": { - "text": "PLIMEN", - "text2": [ - "Ліміт", - "потужності" - ], - "desc": "Вмикає обмеження потужності споживання" - }, "PowerLimit": { "text": "PLIM", "text2": [ diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js index 2e6d4a2f..9a9cb454 100644 --- a/Translation Editor/translations_def.js +++ b/Translation Editor/translations_def.js @@ -258,11 +258,6 @@ var def = "maxLen": 8, "maxLen2": 16 }, - { - "id": "PowerLimitEnable", - "maxLen": 6, - "maxLen2": 13 - }, { "id": "PowerLimit", "maxLen": 5, diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index 21d4b35d..05e43395 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -49,7 +49,6 @@ typedef struct { uint16_t CalibrationOffset; // This stores the temperature offset for this tip // in the iron. - uint8_t powerLimitEnable; // Allow toggling of power limit without changing value uint8_t powerLimit; // Maximum power iron allowed to output uint16_t TipGain; // uV/C * 10, it can be used to convert tip thermocouple voltage to temperateture TipV/TipGain = TipTemp diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp index 3fe8a2ad..fcd8255b 100644 --- a/workspace/TS100/Core/Src/Settings.cpp +++ b/workspace/TS100/Core/Src/Settings.cpp @@ -71,7 +71,6 @@ void resetSettings() { systemSettings.temperatureInF = TEMPERATURE_INF; // default to 0 #endif systemSettings.descriptionScrollSpeed = DESCRIPTION_SCROLL_SPEED; // default to slow - systemSettings.powerLimitEnable = POWER_LIMIT_ENABLE; // Default to no power limit systemSettings.CalibrationOffset = CALIBRATION_OFFSET; // the adc offset in uV systemSettings.powerLimit = POWER_LIMIT; // 30 watts default limit systemSettings.ReverseButtonTempChangeEnabled = REVERSE_BUTTON_TEMP_CHANGE; // diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index ccfe0466..7062532b 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -42,8 +42,6 @@ static bool settings_setAdvancedIDLEScreens(void); static void settings_displayAdvancedIDLEScreens(void); static bool settings_setScrollSpeed(void); static void settings_displayScrollSpeed(void); -static bool settings_setPowerLimitEnable(void); -static void settings_displayPowerLimitEnable(void); static bool settings_setPowerLimit(void); static void settings_displayPowerLimit(void); static bool settings_setDisplayRotation(void); @@ -137,13 +135,11 @@ const menuitem rootSettingsMenu[] { #endif { (const char*) NULL, settings_enterSolderingMenu, settings_displaySolderingMenu }, /*Soldering*/ - { (const char*) NULL, settings_enterPowerMenu, - settings_displayPowerMenu }, /*Sleep Options Menu*/ - { (const char*) NULL, settings_enterUIMenu, - settings_displayUIMenu }, /*UI Menu*/ + { (const char*) NULL, settings_enterPowerMenu, settings_displayPowerMenu }, /*Sleep Options Menu*/ + { (const char*) NULL, settings_enterUIMenu, settings_displayUIMenu }, /*UI Menu*/ { (const char*) NULL, settings_enterAdvancedMenu, settings_displayAdvancedMenu }, /*Advanced Menu*/ - { NULL, NULL , NULL } // end of menu marker. DO NOT REMOVE + { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; const menuitem solderingMenu[] = { @@ -160,9 +156,9 @@ const menuitem solderingMenu[] = { settings_displayBoostTemp }, /*Boost Temp*/ { (const char*) SettingsDescriptions[10], settings_setAutomaticStartMode, settings_displayAutomaticStartMode }, /*Auto start*/ -{ (const char*) SettingsDescriptions[24], settings_setTempChangeShortStep, +{ (const char*) SettingsDescriptions[23], settings_setTempChangeShortStep, settings_displayTempChangeShortStep }, /*Temp change short step*/ -{ (const char*) SettingsDescriptions[25], settings_setTempChangeLongStep, +{ (const char*) SettingsDescriptions[24], settings_setTempChangeLongStep, settings_displayTempChangeLongStep }, /*Temp change long step*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -179,15 +175,14 @@ const menuitem UIMenu[] = { { (const char*) SettingsDescriptions[5], settings_setTempF, settings_displayTempF }, /* Temperature units*/ #endif - { (const char*) SettingsDescriptions[7], - settings_setDisplayRotation, - settings_displayDisplayRotation }, /*Display Rotation*/ + { (const char*) SettingsDescriptions[7], settings_setDisplayRotation, + settings_displayDisplayRotation }, /*Display Rotation*/ { (const char*) SettingsDescriptions[11], settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled }, /*Cooling blink warning*/ { (const char*) SettingsDescriptions[16], settings_setScrollSpeed, settings_displayScrollSpeed }, /*Scroll Speed for descriptions*/ - { (const char*) SettingsDescriptions[23], + { (const char*) SettingsDescriptions[22], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled }, /* Reverse Temp change buttons + - */ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE @@ -212,7 +207,6 @@ const menuitem PowerMenu[] = { const menuitem advancedMenu[] = { /* - * Power limit enable * Power limit * Detailed IDLE * Detailed Soldering @@ -221,24 +215,21 @@ const menuitem advancedMenu[] = { * Reset Settings * Power Pulse */ -{ (const char*) SettingsDescriptions[21], settings_setPowerLimitEnable, - settings_displayPowerLimitEnable }, /*Power limit enable*/ -{ (const char*) SettingsDescriptions[22], settings_setPowerLimit, +{ (const char*) SettingsDescriptions[21], settings_setPowerLimit, settings_displayPowerLimit }, /*Power limit*/ { (const char*) SettingsDescriptions[6], settings_setAdvancedIDLEScreens, settings_displayAdvancedIDLEScreens }, /* Advanced idle screen*/ -{ (const char*) SettingsDescriptions[15], - settings_setAdvancedSolderingScreens, - settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/ +{ (const char*) SettingsDescriptions[15], settings_setAdvancedSolderingScreens, + settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/ { (const char*) SettingsDescriptions[13], settings_setResetSettings, settings_displayResetSettings }, /*Resets settings*/ { (const char*) SettingsDescriptions[12], settings_setCalibrate, settings_displayCalibrate }, /*Calibrate tip*/ { (const char*) SettingsDescriptions[14], settings_setCalibrateVIN, settings_displayCalibrateVIN }, /*Voltage input cal*/ -{ (const char*) SettingsDescriptions[26], settings_setPowerPulse, +{ (const char*) SettingsDescriptions[25], settings_setPowerPulse, settings_displayPowerPulse }, /*Power Pulse adjustment */ -{ (const char*) SettingsDescriptions[27], settings_setTipGain, +{ (const char*) SettingsDescriptions[26], settings_setTipGain, settings_displayTipGain }, /*TipGain*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -332,7 +323,7 @@ static int userConfirmation(const char *message) { static bool settings_setInputVRange(void) { systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 5; if (systemSettings.cutoutSetting) - systemSettings.powerLimitEnable = 0; // disable power limit if switching to a lipo power source + systemSettings.powerLimit = 0; // disable power limit if switching to a lipo power source return systemSettings.cutoutSetting == 4; } @@ -506,27 +497,21 @@ static void settings_displayAdvancedIDLEScreens(void) { OLED::drawCheckbox(systemSettings.detailedIDLE); } -static bool settings_setPowerLimitEnable(void) { - systemSettings.powerLimitEnable = !systemSettings.powerLimitEnable; - return false; -} - -static void settings_displayPowerLimitEnable(void) { - printShortDescription(21, 7); - OLED::drawCheckbox(systemSettings.powerLimitEnable); -} - static bool settings_setPowerLimit(void) { systemSettings.powerLimit += POWER_LIMIT_STEPS; if (systemSettings.powerLimit > MAX_POWER_LIMIT) - systemSettings.powerLimit = POWER_LIMIT_STEPS; + systemSettings.powerLimit = 0; return systemSettings.powerLimit + POWER_LIMIT_STEPS > MAX_POWER_LIMIT; } static void settings_displayPowerLimit(void) { - printShortDescription(22, 5); - OLED::printNumber(systemSettings.powerLimit, 2); - OLED::print(SymbolWatts); + printShortDescription(21, 5); + if (systemSettings.powerLimit == 0) { + OLED::print(OffString); + } else { + OLED::printNumber(systemSettings.powerLimit, 2); + OLED::print(SymbolWatts); + } } static bool settings_setScrollSpeed(void) { @@ -824,7 +809,7 @@ static bool settings_setTipGain(void) { } static void settings_displayTipGain(void) { - printShortDescription(27, 5); + printShortDescription(26, 5); } static bool settings_setReverseButtonTempChangeEnabled(void) { @@ -834,7 +819,7 @@ static bool settings_setReverseButtonTempChangeEnabled(void) { } static void settings_displayReverseButtonTempChangeEnabled(void) { - printShortDescription(23, 7); + printShortDescription(22, 7); OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled); } @@ -847,7 +832,7 @@ static bool settings_setTempChangeShortStep(void) { } static void settings_displayTempChangeShortStep(void) { - printShortDescription(24, 6); + printShortDescription(23, 6); OLED::printNumber(systemSettings.TempChangeShortStep, 2); } @@ -860,7 +845,7 @@ static bool settings_setTempChangeLongStep(void) { } static void settings_displayTempChangeLongStep(void) { - printShortDescription(25, 6); + printShortDescription(24, 6); OLED::printNumber(systemSettings.TempChangeLongStep, 2); } @@ -871,7 +856,7 @@ static bool settings_setPowerPulse(void) { return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1; } static void settings_displayPowerPulse(void) { - printShortDescription(26, 5); + printShortDescription(25, 5); if (systemSettings.KeepAwakePulse) { OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1); OLED::print(SymbolDot); @@ -1042,7 +1027,8 @@ void gui_Menu(const menuitem *menu) { descriptionStart = 0; break; case BUTTON_F_LONG: - if ((int)(xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) > + if ((int) (xTaskGetTickCount() - autoRepeatTimer + + autoRepeatAcceleration) > PRESS_ACCEL_INTERVAL_MAX) { if ((lastValue = menu[currentScreen].incrementHandler())) autoRepeatTimer = 1000; diff --git a/workspace/TS100/Core/Threads/PIDThread.cpp b/workspace/TS100/Core/Threads/PIDThread.cpp index b0e523dc..be94032e 100644 --- a/workspace/TS100/Core/Threads/PIDThread.cpp +++ b/workspace/TS100/Core/Threads/PIDThread.cpp @@ -112,7 +112,7 @@ void startPIDTask(void const *argument __unused) { if (getTipRawTemp(0) > (0x7FFF - 150)) { x10WattsOut = 0; } - if (systemSettings.powerLimitEnable + if (systemSettings.powerLimit && x10WattsOut > (systemSettings.powerLimit * 10)) { setTipX10Watts(systemSettings.powerLimit * 10); } else { diff --git a/workspace/TS100/configuration.h b/workspace/TS100/configuration.h index 25e9ab7a..623a87cd 100644 --- a/workspace/TS100/configuration.h +++ b/workspace/TS100/configuration.h @@ -80,7 +80,6 @@ #define CUT_OUT_SETTING 0 // default to no cut-off voltage (or 18W for TS80) #define TEMPERATURE_INF 0 // default to 0 #define DESCRIPTION_SCROLL_SPEED 0 // 0: Slow 1: Fast - default to slow -#define POWER_LIMIT_ENABLE 0 // 0: Disable 1: Enable - Default disabled power limit #define TIP_GAIN 210 // 21 uV/C * 10, uV per deg C constant of the tip, Tip uV * 10 / coeff = tip temp From 99ba13525a7f64309e68861c5245c6e2b25776f7 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 16:04:41 +1000 Subject: [PATCH 2/5] Collapse Boost temp enable into setting Work for #642 --- Translation Editor/translation_bg.json | 8 -- Translation Editor/translation_cs.json | 8 -- Translation Editor/translation_da.json | 8 -- Translation Editor/translation_de.json | 8 -- Translation Editor/translation_en.json | 8 -- Translation Editor/translation_es.json | 8 -- Translation Editor/translation_fi.json | 8 -- Translation Editor/translation_fr.json | 8 -- Translation Editor/translation_hr.json | 8 -- Translation Editor/translation_hu.json | 8 -- Translation Editor/translation_it.json | 8 -- Translation Editor/translation_lt.json | 8 -- Translation Editor/translation_nl.json | 8 -- Translation Editor/translation_nl_be.json | 8 -- Translation Editor/translation_no.json | 8 -- Translation Editor/translation_pl.json | 8 -- Translation Editor/translation_pt.json | 8 -- Translation Editor/translation_ru.json | 8 -- Translation Editor/translation_sk.json | 8 -- Translation Editor/translation_sl.json | 8 -- Translation Editor/translation_sr_cyrl.json | 8 -- Translation Editor/translation_sr_latn.json | 8 -- Translation Editor/translation_sv.json | 8 -- Translation Editor/translation_tr.json | 8 -- Translation Editor/translation_uk.json | 8 -- Translation Editor/translations_def.js | 5 - workspace/TS100/Core/Inc/Settings.h | 3 +- workspace/TS100/Core/Src/Settings.cpp | 1 - workspace/TS100/Core/Src/gui.cpp | 102 ++++++++++---------- workspace/TS100/Core/Threads/GUIThread.cpp | 2 +- 30 files changed, 53 insertions(+), 260 deletions(-) diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index 643c13b5..3033bbb3 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -132,14 +132,6 @@ ], "desc": "Ориентация на дисплея " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Турбо режим", - "пуснат" - ], - "desc": "Ползвай предния бутон за \"турбо\" режим с температура до 450C при запояване" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json index c1d66a24..de2faf02 100755 --- a/Translation Editor/translation_cs.json +++ b/Translation Editor/translation_cs.json @@ -132,14 +132,6 @@ ], "desc": "Orientace obrazovky ." }, - "BoostEnabled": { - "text": "", - "text2": [ - "Povolit", - "boost" - ], - "desc": "Povolit boost podržením předního tlačítka při pájení?" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json index 8cefa35d..d1434060 100644 --- a/Translation Editor/translation_da.json +++ b/Translation Editor/translation_da.json @@ -130,14 +130,6 @@ ], "desc": "Skærm Orientering " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boosttaste", - "aktiv?" - ], - "desc": "Vordere Taste lange drücken für Temperatur-Boostmodus beim Löten" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 66f58642..c267dadf 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -133,14 +133,6 @@ ], "desc": "Display orientation " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "mode" - ], - "desc": "Enable front key long press \"boost mode\" when soldering" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 8de00bd7..8f54ba27 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -132,14 +132,6 @@ ], "desc": "Orientación de la pantalla " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Con botón de", - "temp. extra" - ], - "desc": "Permite mantener pulsado el primer botón (A) al soldar y calentar momentáneamente un poco más." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index f179c530..7209aba7 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -130,14 +130,6 @@ ], "desc": "Näytön kierto. " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Tehostus", - "käytössä" - ], - "desc": "Etupainikeella siirrytään juotettaessa tehostustilaan." - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index f55d9ce8..ee36eb11 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -130,14 +130,6 @@ ], "desc": "Orientation de l'affichage " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Activation du", - "mode Boost" - ], - "desc": "Activer le mode \"Boost\" en maintenant le bouton de devant pendant la soudure" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index cec60dba..d4c5de90 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -130,14 +130,6 @@ ], "desc": "Orijentacija ekrana. " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "način" - ], - "desc": "Držanjem prednjeg gumba prilikom lemljenja aktivira se pojačani (Boost) način." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 1b583503..d4a6cbed 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -130,14 +130,6 @@ ], "desc": "Kijelző tájolása " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Boost", - "mód" - ], - "desc": "Elülső gombbal boost módba (450C) lép forrasztás közben" - }, "BoostTemperature": { "text": "BHŐ", "text2": [ diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index 069ca63f..a3f2b112 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -132,14 +132,6 @@ ], "desc": "Imposta l'orientamento del display " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Funzione", - "«Turbo»" - ], - "desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index ae489e19..fd7aeabf 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -130,14 +130,6 @@ ], "desc": "Ekrano orientacija " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Turbo režimas", - "įjungtas" - ], - "desc": "Ar lituojant viršutinis mygtukas įjungia turbo režimą" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 7b20ed69..6c64f6a6 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -130,14 +130,6 @@ ], "desc": "Schermoriëntatie " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Boostmodes", - "ingeschakeld?" - ], - "desc": "Soldeerbout gaat naar een hogere boost-temperatuur wanneer de voorste knop ingedrukt is." - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json index e636024f..2a8f928f 100644 --- a/Translation Editor/translation_nl_be.json +++ b/Translation Editor/translation_nl_be.json @@ -130,14 +130,6 @@ ], "desc": "Schermoriëntatie " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Temperatuurverhoging", - "ingeschakeld?" - ], - "desc": "Temperatuur verhoogt als voorste knop is ingedrukt" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 673a7176..38af2491 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -130,14 +130,6 @@ ], "desc": "Skjermretning " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Tryb", - "boost" - ], - "desc": "Przytrzymaj przedni przycisk podczas lutowania w celu zwiększenia temperatury" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index defb47b6..87cd2755 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -130,14 +130,6 @@ ], "desc": "Orientação da tela " }, - "BoostEnabled": { - "text": "TURBO", - "text2": [ - "Modo turbo", - "activado" - ], - "desc": "Tecla frontal activa modo \"turbo\"" - }, "BoostTemperature": { "text": "TTMP", "text2": [ diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 4923001c..068e9ffb 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -132,14 +132,6 @@ ], "desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>" }, - "BoostEnabled": { - "text": "Турб", - "text2": [ - "Турбо", - "режим" - ], - "desc": "Включить активацию турбо-режима удержанием ближней к жалу кнопки во время пайки" - }, "BoostTemperature": { "text": "ТемпТурб", "text2": [ diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index c38bb7e9..9a88f76e 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -130,14 +130,6 @@ ], "desc": "Orientacia displeja " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "", - "" - ], - "desc": "Povolit tlacidlo pre prudky nahrev " - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json index 91c85fd6..3ce10328 100644 --- a/Translation Editor/translation_sl.json +++ b/Translation Editor/translation_sl.json @@ -131,14 +131,6 @@ ], "desc": "Orientacija zaslona " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "Omogoči", - "boost mode" - ], - "desc": "Omogoči, da tipka za naprej zagreje konico na 450C." - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json index b96b1762..8f4f1765 100644 --- a/Translation Editor/translation_sr_cyrl.json +++ b/Translation Editor/translation_sr_cyrl.json @@ -130,14 +130,6 @@ ], "desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>" }, - "BoostEnabled": { - "text": "Пјчње", - "text2": [ - "Појачање", - "омогућено" - ], - "desc": "Држање предњег тастера током лемљења додатно појачава температуру врха." - }, "BoostTemperature": { "text": "ТПјч", "text2": [ diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json index 8a97e6ac..a4b055e0 100644 --- a/Translation Editor/translation_sr_latn.json +++ b/Translation Editor/translation_sr_latn.json @@ -130,14 +130,6 @@ ], "desc": "Kako je okrenut ekran. " }, - "BoostEnabled": { - "text": "Pjčnj", - "text2": [ - "Pojačanje", - "omogućeno" - ], - "desc": "Držanje prednjeg tastera tokom lemljenja dodatno pojačava temperaturu vrha." - }, "BoostTemperature": { "text": "TPjč", "text2": [ diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index 1d3d208f..1aae53a1 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -130,14 +130,6 @@ ], "desc": "Visningsläge " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Turboläge", - "aktiverat" - ], - "desc": "Aktivera främre knappen för turboläge (temperaturhöjning) vid lödning" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index a5e1ed24..99e3ca5b 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -130,14 +130,6 @@ ], "desc": "Görüntü Yönlendirme " }, - "BoostEnabled": { - "text": "BOOST", - "text2": [ - "", - "" - ], - "desc": "Lehimleme yaparken ön tuşa basmak Boost moduna sokar(450C)" - }, "BoostTemperature": { "text": "BTMP", "text2": [ diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json index 787e3e16..81d9e01c 100644 --- a/Translation Editor/translation_uk.json +++ b/Translation Editor/translation_uk.json @@ -132,14 +132,6 @@ ], "desc": "Орієнтація дисплея " }, - "BoostEnabled": { - "text": "", - "text2": [ - "Режим", - "Турбо" - ], - "desc": "Турбо-режим при утриманні кнопки А при пайці" - }, "BoostTemperature": { "text": "", "text2": [ diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js index 9a9cb454..df9a3df3 100644 --- a/Translation Editor/translations_def.js +++ b/Translation Editor/translations_def.js @@ -193,11 +193,6 @@ var def = "maxLen": 6, "maxLen2": 13 }, - { - "id": "BoostEnabled", - "maxLen": 6, - "maxLen2": 13 - }, { "id": "BoostTemperature", "maxLen": 4, diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index 05e43395..092a92cc 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -32,8 +32,7 @@ typedef struct { uint8_t autoStartMode :2; // Should the unit automatically jump straight // into soldering mode when power is applied uint8_t ShutdownTime; // Time until unit shuts down if left alone - uint8_t boostModeEnabled :1; // Boost mode swaps BUT_A in soldering mode to - // temporary soldering temp over-ride + uint8_t coolingTempBlink :1; // Should the temperature blink on the cool // down screen until its <50C uint8_t detailedIDLE :1; // Detailed idle screen diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp index fcd8255b..77cc341f 100644 --- a/workspace/TS100/Core/Src/Settings.cpp +++ b/workspace/TS100/Core/Src/Settings.cpp @@ -63,7 +63,6 @@ void resetSettings() { systemSettings.sensitivity = SENSITIVITY; // Default high sensitivity systemSettings.voltageDiv = VOLTAGE_DIV; // Default divider from schematic systemSettings.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off - systemSettings.boostModeEnabled = BOOST_MODE_ENABLED; // Default to having boost mode on as most people prefer it systemSettings.BoostTemp = BOOST_TEMP; // default to 400C systemSettings.autoStartMode = AUTO_START_MODE; // Auto start off for safety systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index 7062532b..033e5b31 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -46,8 +46,6 @@ static bool settings_setPowerLimit(void); static void settings_displayPowerLimit(void); static bool settings_setDisplayRotation(void); static void settings_displayDisplayRotation(void); -static bool settings_setBoostModeEnabled(void); -static void settings_displayBoostModeEnabled(void); static bool settings_setBoostTemp(void); static void settings_displayBoostTemp(void); static bool settings_setAutomaticStartMode(void); @@ -130,7 +128,7 @@ const menuitem rootSettingsMenu[] { { (const char*) SettingsDescriptions[0], settings_setInputVRange, settings_displayInputVRange }, /*Voltage input*/ #else - { (const char*) SettingsDescriptions[20], settings_setInputPRange, + { (const char*) SettingsDescriptions[19], settings_setInputPRange, settings_displayInputPRange }, /*Voltage input*/ #endif { (const char*) NULL, settings_enterSolderingMenu, @@ -150,15 +148,13 @@ const menuitem solderingMenu[] = { * Temp change short step * Temp change long step */ -{ (const char*) SettingsDescriptions[8], settings_setBoostModeEnabled, - settings_displayBoostModeEnabled }, /*Enable Boost*/ -{ (const char*) SettingsDescriptions[9], settings_setBoostTemp, +{ (const char*) SettingsDescriptions[8], settings_setBoostTemp, settings_displayBoostTemp }, /*Boost Temp*/ -{ (const char*) SettingsDescriptions[10], settings_setAutomaticStartMode, +{ (const char*) SettingsDescriptions[9], settings_setAutomaticStartMode, settings_displayAutomaticStartMode }, /*Auto start*/ -{ (const char*) SettingsDescriptions[23], settings_setTempChangeShortStep, +{ (const char*) SettingsDescriptions[22], settings_setTempChangeShortStep, settings_displayTempChangeShortStep }, /*Temp change short step*/ -{ (const char*) SettingsDescriptions[24], settings_setTempChangeLongStep, +{ (const char*) SettingsDescriptions[23], settings_setTempChangeLongStep, settings_displayTempChangeLongStep }, /*Temp change long step*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -177,12 +173,12 @@ const menuitem UIMenu[] = { #endif { (const char*) SettingsDescriptions[7], settings_setDisplayRotation, settings_displayDisplayRotation }, /*Display Rotation*/ - { (const char*) SettingsDescriptions[11], + { (const char*) SettingsDescriptions[10], settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled }, /*Cooling blink warning*/ - { (const char*) SettingsDescriptions[16], settings_setScrollSpeed, + { (const char*) SettingsDescriptions[15], settings_setScrollSpeed, settings_displayScrollSpeed }, /*Scroll Speed for descriptions*/ - { (const char*) SettingsDescriptions[22], + { (const char*) SettingsDescriptions[21], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled }, /* Reverse Temp change buttons + - */ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE @@ -215,21 +211,21 @@ const menuitem advancedMenu[] = { * Reset Settings * Power Pulse */ -{ (const char*) SettingsDescriptions[21], settings_setPowerLimit, +{ (const char*) SettingsDescriptions[20], settings_setPowerLimit, settings_displayPowerLimit }, /*Power limit*/ { (const char*) SettingsDescriptions[6], settings_setAdvancedIDLEScreens, settings_displayAdvancedIDLEScreens }, /* Advanced idle screen*/ -{ (const char*) SettingsDescriptions[15], settings_setAdvancedSolderingScreens, +{ (const char*) SettingsDescriptions[14], settings_setAdvancedSolderingScreens, settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/ -{ (const char*) SettingsDescriptions[13], settings_setResetSettings, +{ (const char*) SettingsDescriptions[12], settings_setResetSettings, settings_displayResetSettings }, /*Resets settings*/ -{ (const char*) SettingsDescriptions[12], settings_setCalibrate, +{ (const char*) SettingsDescriptions[11], settings_setCalibrate, settings_displayCalibrate }, /*Calibrate tip*/ -{ (const char*) SettingsDescriptions[14], settings_setCalibrateVIN, +{ (const char*) SettingsDescriptions[13], settings_setCalibrateVIN, settings_displayCalibrateVIN }, /*Voltage input cal*/ -{ (const char*) SettingsDescriptions[25], settings_setPowerPulse, +{ (const char*) SettingsDescriptions[24], settings_setPowerPulse, settings_displayPowerPulse }, /*Power Pulse adjustment */ -{ (const char*) SettingsDescriptions[26], settings_setTipGain, +{ (const char*) SettingsDescriptions[25], settings_setTipGain, settings_displayTipGain }, /*TipGain*/ { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; @@ -346,7 +342,7 @@ static bool settings_setInputPRange(void) { static void settings_displayInputPRange(void) { printShortDescription(0, 5); //0 = 9V, 1=12V (Fixed Voltages, these imply 1.5A limits) - /// TODO TS80P + // These are only used in QC3.0 modes switch (systemSettings.cutoutSetting) { case 0: OLED::printNumber(9, 2); @@ -481,7 +477,7 @@ static bool settings_setAdvancedSolderingScreens(void) { } static void settings_displayAdvancedSolderingScreens(void) { - printShortDescription(15, 7); + printShortDescription(14, 7); OLED::drawCheckbox(systemSettings.detailedSoldering); } @@ -505,7 +501,7 @@ static bool settings_setPowerLimit(void) { } static void settings_displayPowerLimit(void) { - printShortDescription(21, 5); + printShortDescription(20, 5); if (systemSettings.powerLimit == 0) { OLED::print(OffString); } else { @@ -523,7 +519,7 @@ static bool settings_setScrollSpeed(void) { } static void settings_displayScrollSpeed(void) { - printShortDescription(16, 7); + printShortDescription(15, 7); OLED::print( (systemSettings.descriptionScrollSpeed) ? SettingFastChar : SettingSlowChar); @@ -567,39 +563,43 @@ static void settings_displayDisplayRotation(void) { } } -static bool settings_setBoostModeEnabled(void) { - systemSettings.boostModeEnabled = !systemSettings.boostModeEnabled; - return false; -} - -static void settings_displayBoostModeEnabled(void) { - printShortDescription(8, 7); - - OLED::drawCheckbox(systemSettings.boostModeEnabled); -} - static bool settings_setBoostTemp(void) { #ifdef ENABLED_FAHRENHEIT_SUPPORT if (systemSettings.temperatureInF) { - systemSettings.BoostTemp += 20; // Go up 20F at a time + if (systemSettings.BoostTemp == 0) { + systemSettings.BoostTemp = 480; // loop back at 480 + } else { + systemSettings.BoostTemp += 20; // Go up 20F at a time + } + if (systemSettings.BoostTemp > 850) { - systemSettings.BoostTemp = 480; + systemSettings.BoostTemp = 0; // jump to off } return systemSettings.BoostTemp == 840; } else #endif { - systemSettings.BoostTemp += 10; // Go up 10C at a time - if (systemSettings.BoostTemp > 450) { + if (systemSettings.BoostTemp == 0) { systemSettings.BoostTemp = 250; // loop back at 250 + + } else { + systemSettings.BoostTemp += 10; // Go up 10C at a time + } + if (systemSettings.BoostTemp > 450) { + systemSettings.BoostTemp = 0; //Go to off state + } return systemSettings.BoostTemp == 450; } } static void settings_displayBoostTemp(void) { - printShortDescription(9, 5); - OLED::printNumber(systemSettings.BoostTemp, 3); + printShortDescription(8, 5); + if (systemSettings.BoostTemp) { + OLED::printNumber(systemSettings.BoostTemp, 3); + } else { + OLED::print(OffString); + } } static bool settings_setAutomaticStartMode(void) { @@ -609,7 +609,7 @@ static bool settings_setAutomaticStartMode(void) { } static void settings_displayAutomaticStartMode(void) { - printShortDescription(10, 7); + printShortDescription(9, 7); switch (systemSettings.autoStartMode) { case 0: @@ -636,7 +636,7 @@ static bool settings_setCoolingBlinkEnabled(void) { } static void settings_displayCoolingBlinkEnabled(void) { - printShortDescription(11, 7); + printShortDescription(10, 7); OLED::drawCheckbox(systemSettings.coolingTempBlink); } @@ -656,7 +656,7 @@ static bool settings_setResetSettings(void) { } static void settings_displayResetSettings(void) { - printShortDescription(13, 7); + printShortDescription(12, 7); } static void setTipOffset() { @@ -702,7 +702,7 @@ static bool settings_setCalibrate(void) { } static void settings_displayCalibrate(void) { - printShortDescription(12, 5); + printShortDescription(11, 5); } static bool settings_setCalibrateVIN(void) { @@ -809,7 +809,7 @@ static bool settings_setTipGain(void) { } static void settings_displayTipGain(void) { - printShortDescription(26, 5); + printShortDescription(25, 5); } static bool settings_setReverseButtonTempChangeEnabled(void) { @@ -819,7 +819,7 @@ static bool settings_setReverseButtonTempChangeEnabled(void) { } static void settings_displayReverseButtonTempChangeEnabled(void) { - printShortDescription(22, 7); + printShortDescription(21, 7); OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled); } @@ -832,7 +832,7 @@ static bool settings_setTempChangeShortStep(void) { } static void settings_displayTempChangeShortStep(void) { - printShortDescription(23, 6); + printShortDescription(22, 6); OLED::printNumber(systemSettings.TempChangeShortStep, 2); } @@ -845,7 +845,7 @@ static bool settings_setTempChangeLongStep(void) { } static void settings_displayTempChangeLongStep(void) { - printShortDescription(24, 6); + printShortDescription(23, 6); OLED::printNumber(systemSettings.TempChangeLongStep, 2); } @@ -856,13 +856,13 @@ static bool settings_setPowerPulse(void) { return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1; } static void settings_displayPowerPulse(void) { - printShortDescription(25, 5); + printShortDescription(24, 5); if (systemSettings.KeepAwakePulse) { OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1); OLED::print(SymbolDot); OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1); } else { - OLED::drawCheckbox(false); + OLED::print(OffString); } } @@ -880,7 +880,7 @@ static void displayMenu(size_t index) { } static void settings_displayCalibrateVIN(void) { - printShortDescription(14, 5); + printShortDescription(13, 5); } static void settings_displaySolderingMenu(void) { displayMenu(0); diff --git a/workspace/TS100/Core/Threads/GUIThread.cpp b/workspace/TS100/Core/Threads/GUIThread.cpp index 77a22f9d..280655b6 100644 --- a/workspace/TS100/Core/Threads/GUIThread.cpp +++ b/workspace/TS100/Core/Threads/GUIThread.cpp @@ -439,7 +439,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) { break; case BUTTON_F_LONG: // if boost mode is enabled turn it on - if (systemSettings.boostModeEnabled) + if (systemSettings.BoostTemp) boostModeOn = true; break; case BUTTON_F_SHORT: From c7bde079cd30aa309038913699e56fe54940536f Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 16:11:53 +1000 Subject: [PATCH 3/5] Update Settings.h --- workspace/TS100/Core/Inc/Settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index 092a92cc..b5822dba 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -12,7 +12,7 @@ #include #include "stm32f1xx_hal.h" #include "unit.h" -#define SETTINGSVERSION ( 0x20 ) +#define SETTINGSVERSION ( 0x21 ) /*Change this if you change the struct below to prevent people getting \ out of sync*/ From aa78ca25946511cc4e3a4c7496e31d72e35c74b0 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 16:44:19 +1000 Subject: [PATCH 4/5] Dropping single line menu support --- Translation Editor/TranslationEditor.html | 680 ++++++++++----------- Translation Editor/TranslationsParser.html | 645 ++++++++++--------- Translation Editor/make_translation.py | 36 +- workspace/TS100/Core/Inc/Translation.h | 4 - workspace/TS100/Core/Src/gui.cpp | 12 +- 5 files changed, 660 insertions(+), 717 deletions(-) diff --git a/Translation Editor/TranslationEditor.html b/Translation Editor/TranslationEditor.html index 5b8507c0..d6c7cf8d 100644 --- a/Translation Editor/TranslationEditor.html +++ b/Translation Editor/TranslationEditor.html @@ -1,353 +1,329 @@ - - - - - - TS100 Translation Editor - - - - - - - - - -
-

TS100 Translation Editor - {{ current.languageLocalName }} [{{current.languageCode}}]

- - - - - - - - - - - - - - - - - - - - - -
Referent Language - - {{ referent.languageLocalName }} [{{referent.languageCode}}] -
Current Language - - {{ current.languageLocalName }} [{{current.languageCode}}] -
Local Language Code
Local Language Name
Font table to use - -
- -
- -
- - -
- -
-

Obsolete

- - - - - -
{{entry.id}}
{{entry.value}}
-
- -

Messages and Strings

- - - - - -
{{message.id}}
 -
{{constraintString(message)}}
-
{{referent.messages[message.id]}}
-
{{message.note}}
-
-
- -

Characters

- - - - - -
{{char.id}}
 -
{{constraintString(char)}}
-
{{referent.characters[char.id]}}
-
-
- -

Menu Groups

- - - - - -
{{menu.id}}
 -
Menu Name
-
{{constraintString(menu)}}
-
{{referent.menuGroups[menu.id].text2}}
-
-
Description
-
{{referent.menuGroups[menu.id].desc}}
-
-
- -

Menu Options

- - - - - - - - - -
Menu Type - -
{{menu.id}}
 -
-
Menu Name (Single-Line)
-
{{constraintString(menu, current.menuDouble)}}
-
{{referent.menuOptions[menu.id].text}}
-
-
-
-
Menu Name (Double-Line)
-
{{constraintString(menu, current.menuDouble)}}
-
{{referent.menuOptions[menu.id].text2}}
-
-
-
Description
-
{{referent.menuOptions[menu.id].desc}}
-
-
- -
- - -
-
-
- + + + + + + TS100 Translation Editor + + + + + + + + + +
+

TS100 Translation Editor - {{ current.languageLocalName }} [{{current.languageCode}}]

+ + + + + + + + + + + + + + + + + + + + + +
Referent Language + + {{ referent.languageLocalName }} [{{referent.languageCode}}] +
Current Language + + {{ current.languageLocalName }} [{{current.languageCode}}] +
Local Language Code
Local Language Name
Font table to use + +
+ +
+ +
+ + +
+ +
+

Obsolete

+ + + + + +
{{entry.id}}
{{entry.value}}
+
+ +

Messages and Strings

+ + + + + +
{{message.id}}
 +
{{constraintString(message)}}
+
{{referent.messages[message.id]}}
+
{{message.note}}
+
+
+ +

Characters

+ + + + + +
{{char.id}}
 +
{{constraintString(char)}}
+
{{referent.characters[char.id]}}
+
+
+ +

Menu Groups

+ + + + + +
{{menu.id}}
 +
Menu Name
+
{{constraintString(menu)}}
+
{{referent.menuGroups[menu.id].text2}}
+
+
Description
+
{{referent.menuGroups[menu.id].desc}}
+
+
+ +

Menu Options

+ + + + + +
{{menu.id}}
 +
+
Menu Name (Double-Line)
+
{{constraintString(menu)}}
+
{{referent.menuOptions[menu.id].text2}}
+
+
+
Description
+
{{referent.menuOptions[menu.id].desc}}
+
+
+ +
+ + +
+
+
+ \ No newline at end of file diff --git a/Translation Editor/TranslationsParser.html b/Translation Editor/TranslationsParser.html index 22991740..d47e5218 100644 --- a/Translation Editor/TranslationsParser.html +++ b/Translation Editor/TranslationsParser.html @@ -1,325 +1,322 @@ - - - - - - TS100 Translation Parser - - - - - - - - - -
-

TS100 Translation Parser

- - - - - -
Translation.cpp - -
- -
-
- - -
-
- -
- + + + + + + TS100 Translation Parser + + + + + + + + + +
+

TS100 Translation Parser

+ + + + + +
Translation.cpp + +
+ +
+
+ + +
+
+ +
+ \ No newline at end of file diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py index 7757b29e..1bebe57c 100755 --- a/Translation Editor/make_translation.py +++ b/Translation Editor/make_translation.py @@ -167,11 +167,8 @@ def getLetterCounts(defs, lang): obj = lang['menuOptions'] for mod in defs['menuOptions']: eid = mod['id'] - if lang['menuDouble']: - textList.append(obj[eid]['text2'][0]) - textList.append(obj[eid]['text2'][1]) - else: - textList.append(obj[eid]['text']) + textList.append(obj[eid]['text2'][0]) + textList.append(obj[eid]['text2'][1]) obj = lang['menuGroups'] for mod in defs['menuGroups']: @@ -369,14 +366,6 @@ def writeLanguage(languageCode, defs, f): c) + "\"," + "//{} \n".format(c))) f.write(to_unicode("};\n\n")) - # ----- Menu Options - - # Menu type - f.write( - to_unicode( - "const enum ShortNameType SettingsShortNameType = SHORT_NAME_" + - ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n")) - # ----- Writing SettingsDescriptions obj = lang['menuOptions'] f.write(to_unicode("const char* SettingsShortNames[][2] = {\n")) @@ -388,19 +377,14 @@ def writeLanguage(languageCode, defs, f): if 'feature' in mod: f.write(to_unicode("#ifdef " + mod['feature'] + "\n")) f.write(to_unicode(" /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ ")) - if lang['menuDouble']: - f.write( - to_unicode( - "{ \"" + - convStr(symbolConversionTable, (obj[eid]['text2'][0])) + - "\", \"" + - convStr(symbolConversionTable, (obj[eid]['text2'][1])) + - "\" }," + "//{} \n".format(obj[eid]['text2']))) - else: - f.write( - to_unicode("{ \"" + - convStr(symbolConversionTable, (obj[eid]['text'])) + - "\" }," + "//{} \n".format(obj[eid]['text']))) + f.write( + to_unicode( + "{ \"" + + convStr(symbolConversionTable, (obj[eid]['text2'][0])) + + "\", \"" + + convStr(symbolConversionTable, (obj[eid]['text2'][1])) + + "\" }," + "//{} \n".format(obj[eid]['text2']))) + if 'feature' in mod: f.write(to_unicode("#endif\n")) index = index + 1 diff --git a/workspace/TS100/Core/Inc/Translation.h b/workspace/TS100/Core/Inc/Translation.h index 614ea12f..b0ef244b 100644 --- a/workspace/TS100/Core/Inc/Translation.h +++ b/workspace/TS100/Core/Inc/Translation.h @@ -9,16 +9,12 @@ #define TRANSLATION_H_ #include "unit.h" #include "stdint.h" -enum ShortNameType { - SHORT_NAME_SINGLE_LINE = 1, SHORT_NAME_DOUBLE_LINE = 2, -}; extern const uint8_t USER_FONT_12[]; extern const uint8_t USER_FONT_6x8[]; /* * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined */ -extern const enum ShortNameType SettingsShortNameType; extern const char *SettingsShortNames[28][2]; extern const char *SettingsDescriptions[28]; extern const char *SettingsMenuEntries[4]; diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index 033e5b31..2431a7a9 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -230,12 +230,6 @@ const menuitem advancedMenu[] = { { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE }; -static void printShortDescriptionSingleLine(uint32_t shortDescIndex) { - OLED::setFont(0); - OLED::setCharCursor(0, 0); - OLED::print(SettingsShortNames[shortDescIndex][0]); -} - static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) { OLED::setFont(1); OLED::setCharCursor(0, 0); @@ -254,11 +248,7 @@ static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) { static void printShortDescription(uint32_t shortDescIndex, uint16_t cursorCharPosition) { // print short description (default single line, explicit double line) - if (SettingsShortNameType == SHORT_NAME_DOUBLE_LINE) { - printShortDescriptionDoubleLine(shortDescIndex); - } else { - printShortDescriptionSingleLine(shortDescIndex); - } + printShortDescriptionDoubleLine(shortDescIndex); // prepare cursor for value OLED::setFont(0); From d50a7332507c0d27738bdc8f4cdbb7f86198a198 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 6 Sep 2020 16:44:31 +1000 Subject: [PATCH 5/5] Cull single line menu options from json languages --- Translation Editor/translation_bg.json | 79 +++++--------- Translation Editor/translation_cs.json | 59 +++-------- Translation Editor/translation_da.json | 93 ++++++---------- Translation Editor/translation_de.json | 79 +++++--------- Translation Editor/translation_en.json | 79 +++++--------- Translation Editor/translation_es.json | 79 +++++--------- Translation Editor/translation_fi.json | 79 +++++--------- Translation Editor/translation_fr.json | 79 +++++--------- Translation Editor/translation_hr.json | 79 +++++--------- Translation Editor/translation_hu.json | 79 +++++--------- Translation Editor/translation_it.json | 79 +++++--------- Translation Editor/translation_lt.json | 79 +++++--------- Translation Editor/translation_nl.json | 79 +++++--------- Translation Editor/translation_nl_be.json | 79 +++++--------- Translation Editor/translation_no.json | 111 ++++++++------------ Translation Editor/translation_pl.json | 79 +++++--------- Translation Editor/translation_pt.json | 79 +++++--------- Translation Editor/translation_ru.json | 79 +++++--------- Translation Editor/translation_sk.json | 111 ++++++++------------ Translation Editor/translation_sl.json | 79 +++++--------- Translation Editor/translation_sr_cyrl.json | 79 +++++--------- Translation Editor/translation_sr_latn.json | 79 +++++--------- Translation Editor/translation_sv.json | 79 +++++--------- Translation Editor/translation_tr.json | 111 ++++++++------------ Translation Editor/translation_uk.json | 79 +++++--------- 25 files changed, 695 insertions(+), 1370 deletions(-) diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index 3033bbb3..b5b477a7 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,208 +68,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Източник", "захранване" ], "desc": "Източник на захранване. Минимално напрежение. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Темп.", "сън" ], "desc": "Температура при режим \"сън\" " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Време", "сън" ], "desc": "Включване в режим \"сън\" след: <Минути/Секунди>" }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Време", "изкл." ], "desc": "Изключване след <Минути>" }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Усещане", "за движение" ], "desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Единици за", "температура" ], "desc": "Единици за температура " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Детайлен", "екран в покой" ], "desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Ориентация", "на дисплея" ], "desc": "Ориентация на дисплея " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Турбо", "темп." ], "desc": "Температура за \"турбо\" режим" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Автоматичен", "работен режим" ], "desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Мигай при", "топъл поялник" ], "desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла" }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Калибриране", "температура?" ], "desc": "Калибриране на температурата" }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Фабрични", "настройки?" ], "desc": "Връщане на фабрични настройки" }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Калибриране", "напрежение?" ], "desc": "Калибриране на входното напрежение. Задръжте бутонa за изход" }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Детайлен", "работен екран" ], "desc": "Детайлна информация в работен режим при запояване" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Скорост", "на текста" ], "desc": "Скорост на движение на този текст" }, "TipModel": { - "text": "", - "text2": [ + "text2": [ "Модел", "на връх" ], "desc": "Избор на модел на връх" }, "SimpleCalibrationMode": { - "text": "", - "text2": [ + "text2": [ "Бърза", "калибрация" ], "desc": "Бърза калибрация с използване на гореща вода" }, "AdvancedCalibrationMode": { - "text": "", - "text2": [ + "text2": [ "Прецизна", "калибрация" ], "desc": "Прецизна калибрация с използване на термо-двойка на върха на поялника" }, "PowerInput": { - "text": "", - "text2": [ + "text2": [ "Мощност на", "захранване" ], "desc": "Мощност на избраното захранване" }, "PowerLimit": { - "text": "", - "text2": [ + "text2": [ "Лимит на", "мощност" ], "desc": "Максимална мощност на поялника " }, "ReverseButtonTempChange": { - "text": "", - "text2": [ + "text2": [ "Размяна", "бутони +-?" ], "desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника" }, "TempChangeShortStep": { - "text": "", - "text2": [ + "text2": [ "Промяна T", "бързо?" ], "desc": "Промяна на температура при бързо натискане на бутон!" }, "TempChangeLongStep": { - "text": "", - "text2": [ + "text2": [ "Промяна Т", "задържане?" ], "desc": "Промяна на температура при задържане на бутон!" }, "PowerPulsePower":{ - "text": "", - "text2": [ + "text2": [ "Захранващ", "импулс" ], "desc": "Поддържане на интензивност на захранващия импулс" }, "TipGain": { - "text": "", - "text2": [ + "text2": [ "Промяна", "сила връх" ], diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json index de2faf02..05195a17 100755 --- a/Translation Editor/translation_cs.json +++ b/Translation Editor/translation_cs.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,135 +68,118 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Zdroj", "napájení" ], "desc": "Při nižším napětí ukončí pájení ." }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Teplota v", "r. spánku" ], "desc": "Teplota v režimu spánku." }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Čas do", "r. spánku" ], "desc": "Čas do režimu spánku ." }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Čas do", "vypnutí" ], "desc": "Čas do automatického vypnutí ." }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Citlivost", "det. pohybu" ], "desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>." }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Jednotky", "teploty" ], "desc": "Jednotky měření teploty ." }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Podrobnosti", "na vých. obr." ], "desc": "Zobrazit podrobnosti na výchozí obrazovce?" }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Orientace", "obrazovky" ], "desc": "Orientace obrazovky ." }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Teplota v", "r. boost" ], "desc": "Teplota v režimu boost." }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Automatický", "start" ], "desc": "Při startu ihned nahřát hrot?" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Blikáni při", "chladnutí" ], "desc": "Blikání teploty při chladnutí, dokud je hrot horký?" }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibrovat", "teplotu?" ], "desc": "Kalibrace měření teploty." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Tovární", "nastavení?" ], "desc": "Obnovení továrního nastavení." }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibrovat", "vstupní napětí?" ], "desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď." }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Podrobnosti", "při pájení" ], "desc": "Zobrazit podrobnosti při pájení?" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Rychlost", "popisků" ], "desc": "Rychlost posuvu popisků podobných tomuto " }, "TipModel": { - "text": "TIPMO", "text2": [ "Model", "hrotu" @@ -205,7 +187,6 @@ "desc": "Výběr modelu hrotu." }, "SimpleCalibrationMode": { - "text": "SMPCAL", "text2": [ "Jednoduchá", "kalibrace" @@ -213,7 +194,6 @@ "desc": "Jednoduchá kalibrace pomocí horké vody." }, "AdvancedCalibrationMode": { - "text": "ADVCAL", "text2": [ "Pokročilá", "kalibrace" @@ -221,7 +201,6 @@ "desc": "Pokročilá kalibrace pomocí termočlánku na hrotu." }, "PowerInput": { - "text": "PWRW", "text2": [ "Výkon", "ve wattech" @@ -229,7 +208,6 @@ "desc": "Výkon použítého napájecího adaptéru ve wattech." }, "PowerLimit": { - "text": "PLIM", "text2": [ "Omezení", "Výkonu" @@ -237,7 +215,6 @@ "desc": "Maximální příkon " }, "ReverseButtonTempChange": { - "text": "RVTCHG", "text2": [ "Prohodit", "tl. +-?" @@ -245,7 +222,6 @@ "desc": "Prohodí tlačítka plus a minus pro změnu teploty hrotu." }, "TempChangeShortStep": { - "text": "TCHGST", "text2": [ "Krok teploty", "krátký?" @@ -253,7 +229,6 @@ "desc": "Velikost skoku při změně teploty krátkým stiskem tlačítka!" }, "TempChangeLongStep": { - "text": "TCHGLT", "text2": [ "Krok teploty", "dlouhý?" @@ -261,7 +236,6 @@ "desc": "Velikost skoku při změně teploty dlouhým stiskem tlačítka!" }, "PowerPulsePower": { - "text": "POWPLS", "text2": [ "Intenzita", "Výkon. pulsu" @@ -269,7 +243,6 @@ "desc": "Puls pro udržení zařízení v chodu (kvůli power bankám)." }, "TipGain": { - "text": "TG", "text2": [ "Změnit", "zisk hr." diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json index d1434060..1b5033ca 100644 --- a/Translation Editor/translation_da.json +++ b/Translation Editor/translation_da.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "S" }, - "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,135 +66,118 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", "text2": [ - "", - "" + "Power", + "source" ], "desc": "Strømforsyning. Indstil Cutoff Spændingen. " }, "SleepTimeout": { - "text": "STME", "text2": [ - "", - "" + "Sleep", + "timeout" ], "desc": "Dvale Timeout " }, "ReverseButtonTempChange": { - "text": "RVTCHG", "text2": [ "Key +-", "reverse?" @@ -243,7 +220,6 @@ "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", "text2": [ "Temp change", "short?" @@ -251,7 +227,6 @@ "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", "text2": [ "Temp change", "long?" @@ -259,7 +234,6 @@ "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", "text2": [ "Power", "Pulse W" @@ -267,7 +241,6 @@ "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", "text2": [ "Modify", "tip gain" diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 378dc3ef..7603b9bb 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -37,7 +37,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -70,184 +69,161 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Spannungs-", "quelle" ], "desc": "Spannungsquelle (Abschaltspannung) " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Ruhetemp-", "eratur" ], "desc": "Ruhetemperatur" }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Ruhever-", "zögerung" ], "desc": "Ruhemodus nach " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Abschalt-", "zeit" ], "desc": "Abschalten nach " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Bewegungs-", "empfindlichk." ], "desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Temperatur-", "einheit" ], "desc": "Temperatureinheit " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Detaillierte", "Ruheansicht" ], "desc": "Detaillierte Anzeige im Ruhemodus" }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Anzeige-", "ausrichtung" ], "desc": "Ausrichtung der Anzeige " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Boosttemp-", "eratur" ], "desc": "Temperatur im Boostmodus (In der eingestellten Einheit)" }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Start im", "Lötmodus?" ], "desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. " }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ + "text2": [ "Abkühl-", "blinken?" ], "desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist." }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ + "text2": [ "Temperatur", "kalibrieren?" ], "desc": "Kalibrierung der Lötspitzentemperatur" }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Einstellungen", "zurücksetzen?" ], "desc": "Einstellungen auf werkseinstellungen zurück setzen" }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ + "text2": [ "Eingangsspannung", "kalibrieren?" ], "desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen." }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ + "text2": [ "Detaillierte", "Lötansicht" ], "desc": "Detaillierte Anzeige im Lötmodus" }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Scroll-", "geschw." ], "desc": "Scrollgeschwindigkeit der Texte " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Löt-", "spitze" ], "desc": "Auswahl der Lötspitze" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Einfache", "Kalibrierung" ], "desc": "Einfache Kalibrierung mittels heißem Wasser" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Erweiterte", "Kalibrierung" ], "desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Leistungs-", "Aufnahme" ], "desc": "Leistungsaufnahme der verwendeten Spannungsversorgung" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Leistungs-", "Limit" ], "desc": "Maximale aufnahme der Lötspitze " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Taste +-", "Umkehren?" ], "desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?" }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "T. Schritt", "Taste kurz?" ], @@ -255,24 +231,21 @@ } , "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "T. Schritt", "Taste Lang?" ], "desc": "Temperaturwechselschritte bei langem Tastendruck!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index c267dadf..1a039077 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -37,7 +37,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -70,208 +69,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Power", "source" ], "desc": "Power source. Sets cutoff voltage. " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Sleep", "temp" ], "desc": "Sleep temperature" }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Sleep", "timeout" ], "desc": "Sleep timeout " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Shutdown", "timeout" ], "desc": "Shutdown timeout " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Motion", "sensitivity" ], "desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Temperature", "unit" ], "desc": "Temperature unit " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Detailed", "idle screen" ], "desc": "Display detailed information in a smaller font on the idle screen" }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Display", "orientation" ], "desc": "Display orientation " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Boost", "temp" ], "desc": "Temperature when in \"boost mode\"" }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Automatically starts the iron into soldering on power up " }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ + "text2": [ "Cooldown", "blink" ], "desc": "Blink the temperature on the cooling screen while the tip is still hot" }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ + "text2": [ "Calibrate", "temperature?" ], "desc": "Calibrate tip offset?" }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Factory", "Reset?" ], "desc": "Reset all settings!" }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ + "text2": [ "Calibrate", "input voltage?" ], "desc": "VIN Calibration " }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ + "text2": [ "Detailed", "solder screen" ], "desc": "Display detailed information while soldering" }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Scrolling", "speed" ], "desc": "Speed this text scrolls past at " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Tip", "model" ], "desc": "Tip model selection" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Simple", "calibration" ], "desc": "Simple calibration using hot water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Advanced", "calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Power", "wattage" ], "desc": "Power wattage of the power adapter used" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Reverse", "+ - keys" ], "desc": "Reverse assignment of temperature adjustment buttons" }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short" ], "desc": "Temperature change steps on short button press" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long" ], "desc": "Temperature change steps on long button press" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 8f54ba27..7357d144 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "F", "SettingStartNoneChar": "N" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,208 +68,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Fuente", "de energía" ], "desc": "Elige el tipo de fuente para limitar el voltaje " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Temperatura", "en reposo" ], "desc": "Temperatura de la punta en reposo." }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Entrar", "en reposo" ], "desc": "Tiempo de inactividad para entrar en reposo " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Tiempo de", "apagado" ], "desc": "Tiempo de inactividad para apagarse " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Detección de", "movimiento" ], "desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Unidad de", "temperatura" ], "desc": "Unidad de temperatura " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Info extra en", "modo reposo" ], "desc": "Muestra información detallada en letra pequeña al reposar." }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Orientación", "de pantalla" ], "desc": "Orientación de la pantalla " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Ajustar la", "temp. extra" ], "desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra." }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Calentar", "al enchufar" ], "desc": "Se calienta él solo al arrancar " }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ + "text2": [ "Parpadear", "al enfriar" ], "desc": "La temperatura en pantalla parpadea mientras la punta siga caliente." }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ + "text2": [ "Calibrar temp.", "de la punta" ], "desc": "Calibra la desviación térmica de la punta." }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Volver a ajustes", "de fábrica" ], "desc": "Restablece todos los ajustes a los valores originales." }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ + "text2": [ "Calibrar voltaje", "de entrada" ], "desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir." }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ + "text2": [ "Info extra", "al soldar" ], "desc": "Muestra más datos por pantalla cuando se está soldando." }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Velocidad", "del texto" ], "desc": "Velocidad de desplazamiento del texto " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Modelo de", "punta" ], "desc": "Elegir el modelo de punta actual." }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Calibración", "simple" ], "desc": "Calibración simple con agua caliente." }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Calibración", "avanzada" ], "desc": "Calibrar con un termopar en la punta; más difícil." }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Potencia de", "entrada" ], "desc": "Potencia en vatios del adaptador de corriente utilizado." }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Ajustar la", "potenc. máx." ], "desc": "Elige el límite de potencia máxima del soldador " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Invertir", "botones +/-" ], "desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Cambio temp.", "puls. cortas" ], "desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-." }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Cambio temp.", "puls. largas" ], "desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-." }, "PowerPulsePower": { - "text": "POWPLS", - "text2": [ + "text2": [ "Pulsos bat.", "constantes" ], "desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios." }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Ajustar ganancia", "de punta" ], diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index 7209aba7..eac2bff9 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Virtalähde", "DC" ], "desc": "Käytettävä virtalähde. Asettaa katkaisujänniteen. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Lepotilan", "lämpötila" ], "desc": "Lepotilan lämpötila. " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Lepotilan", "viive" ], "desc": "Lepotilan viive. " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Sammutus", "viive" ], "desc": "Automaattisen sammutuksen aikaviive. " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Liikkeen", "herkkyys" ], "desc": "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Lämpötilan", "yksikkö" ], "desc": "Lämpötilan yksikkö. " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Tiedot", "lepotilassa" ], "desc": "Näyttää yksityiskohtaisemmat tiedot lepotilassa." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Näytön", "kierto" ], "desc": "Näytön kierto. " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Tehostus-", "lämpötila" ], "desc": "Tehostustilan lämpötila" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Autom.", "käynnistys" ], "desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Jäähdytyksen", "vilkutus" ], "desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma." }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibroi", "lämpötila?" ], "desc": "Kalibroi kärjen lämpötilaeron." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Palauta", "tehdasasetukset?" ], "desc": "Palauta kaikki asetukset oletusarvoihin." }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibroi", "tulojännite?" ], "desc": "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan." }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Tarkempi", "juotosnäyttö" ], "desc": "Näyttää yksityiskohtaisemmat tiedot juotostilassa." }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Tietojen", "näyttönopeus" ], "desc": "Näiden selitetekstien vieritysnopeus." }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index ee36eb11..0ee8ec52 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "D" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Source", "d'alim" ], "desc": "Source d'alimentation. Règle la tension de coupure " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Temp.", "veille" ], "desc": "Température en veille " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Délai", "veille" ], "desc": "Délai avant mise en veille " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Délai", "extinction" ], "desc": "Délai avant extinction " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Sensibilité", "au mouvement" ], "desc": "Sensibilité du capteur de mouvement <0=Inactif 1=Peu sensible 9=Tres sensible>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Unité de", "température" ], "desc": "Unité de température " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Écran veille", "détaillé" ], "desc": "Afficher des informations détaillées lors de la veille." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Orientation", "de l'écran" ], "desc": "Orientation de l'affichage " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Temp.", "Boost" ], "desc": "Température du mode \"Boost\"" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Démarrage", "automatique" ], "desc": "Démarrer automatiquement la soudure a l'allumage " }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Refroidir en", "clignotant" ], "desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude." }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Étalonner", "température" ], "desc": "Étalonner température de la panne." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Réinitialisation", "d'usine" ], "desc": "Réinitialiser tous les réglages" }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Étalonner", "tension d'entrée" ], "desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter" }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Écran soudure", "détaillé" ], "desc": "Afficher des informations détaillées pendant la soudure" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Vitesse de", "défilement" ], "desc": "Vitesse de défilement de ce texte en " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Panne", "Modèle" ], "desc": "Sélection du modèle de la panne" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Calibration", "simple" ], "desc": "Calibration simple à l'aide d'eau chaude" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Calibration", "avancées" ], "desc": "Calibration avancées à l'aide d'un thermocouple sur la panne" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Puissance de", "l'alimentation" ], "desc": "Puissance de l'alimentation utilisée" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Puissance", "Limite" ], "desc": "Puissance maximale utilisable " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "Inverser?" ], "desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "Court?" ], "desc": "Incrément de changement de température sur appui court." }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "Long?" ], "desc": "Incrément de changement de température sur appui long." }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index d4c5de90..f1d5708d 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Izvor", "napajanja" ], "desc": "Izvor napajanja. Postavlja napon isključivanja. " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Temp", "spavanja" ], "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. " }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Vrijeme", "spavanja" ], "desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Vrijeme", "gašenja" ], "desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Osjetljivost", "pokreta" ], "desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Jedinica", "temperature" ], "desc": "Jedinica temperature. " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Detalji", "pri čekanju" ], "desc": "Prikazivanje detaljnih informacija tijekom čekanja." }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Rotacija", "ekrana" ], "desc": "Orijentacija ekrana. " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Boost", "temp" ], "desc": "Temperatura u pojačanom (Boost) načinu." }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati." }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ + "text2": [ "Upozorenje", "pri hlađenju" ], "desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća." }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ + "text2": [ "Kalibracija", "temperature" ], "desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna." }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Tvorničke", "postavke" ], "desc": "Vraćanje svih postavki na tvorničke vrijednosti." }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ + "text2": [ "Kalibracija", "napona napajanja" ], "desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj." }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ + "text2": [ "Detalji", "pri lemljenju" ], "desc": "Prikazivanje detaljnih informacija tijekom lemljenja." }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Brzina", "poruka" ], "desc": "Brzina kretanja dugačkih poruka. " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Model", "Vrha" ], "desc": "Odabir modela lemnog vrha" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Jednostavna", "kalibracija" ], "desc": "Kalibracija kipućom vodom" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Kalibracija korištenjem termo-elementa" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Snaga", "napajanja" ], "desc": "Snaga modula za napajanje" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index d4a6cbed..42928cbc 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "ÁRAMF", - "text2": [ + "text2": [ "Áram", "forrás" ], "desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. " }, "SleepTemperature": { - "text": "AHŐM", - "text2": [ + "text2": [ "Alvási", "hőfok" ], "desc": "Alvási hőmérséklet " }, "SleepTimeout": { - "text": "AIDŐ", - "text2": [ + "text2": [ "Alvás", "időzítő" ], "desc": "Alvás időzítő " }, "ShutdownTimeout": { - "text": "KIIDŐ", - "text2": [ + "text2": [ "Kikapcsolás", "időzítő" ], "desc": "Kikapcsolási időzítő " }, "MotionSensitivity": { - "text": "MOZGÉR", - "text2": [ + "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>" }, "TemperatureUnit": { - "text": "HŐEGYS", - "text2": [ + "text2": [ "Hőmérséklet", "mértékegysége" ], "desc": "Hőmérséklet mértékegysége " }, "AdvancedIdle": { - "text": "RÉSZLI", - "text2": [ + "text2": [ "Részletes", "készenlét" ], "desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn." }, "DisplayRotation": { - "text": "KIJTÁJ", - "text2": [ + "text2": [ "Kijelző", "tájolása" ], "desc": "Kijelző tájolása " }, "BoostTemperature": { - "text": "BHŐ", - "text2": [ + "text2": [ "Boost", "hőfok" ], "desc": "Hőmérséklet \"boost\" módban" }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Automatikus", "indítás" ], "desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki" }, "CooldownBlink": { - "text": "HŰLÉSV", - "text2": [ + "text2": [ "Villogás", "hűléskor" ], "desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró." }, "TemperatureCalibration": { - "text": "HŐM KAL?", - "text2": [ + "text2": [ "Hőmérséklet", "kalibrálása?" ], "desc": "Hegy hőmérséklet-különbségének kalibrálása." }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Gyári", "beállítások?" ], "desc": "Beállítások alaphelyzetbe állítása" }, "VoltageCalibration": { - "text": "VIN KAL?", - "text2": [ + "text2": [ "Bemeneti fesz", "kalibrálása?" ], "desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés" }, "AdvancedSoldering": { - "text": "HALKÉP", - "text2": [ + "text2": [ "Részletes", "forr. kép." ], "desc": "Részletes információk megjelenítése forrasztás közben" }, "ScrollingSpeed": { - "text": "GÖRGS", - "text2": [ + "text2": [ "Görgetés", "sebessége" ], "desc": "Szöveggörgetés sebessége" }, "TipModel": { - "text": "HEGYMOD", - "text2": [ + "text2": [ "Forrasztóhegy", "modell" ], "desc": "Forrasztóhegy modell kiválasztása" }, "SimpleCalibrationMode": { - "text": "EGYSZKAL", - "text2": [ + "text2": [ "Egyszerű", "kalibráció" ], "desc": "Egyszerű kalibrálás forró víz segítségével" }, "AdvancedCalibrationMode": { - "text": "HALKAL", - "text2": [ + "text2": [ "Haladó", "Kalibráció" ], "desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével" }, "PowerInput": { - "text": "TELJW", - "text2": [ + "text2": [ "Bemeneti", "teljesítmény" ], "desc": "A tápegység által leadott teljesítmény" }, "PowerLimit": { - "text": "TELJM", - "text2": [ + "text2": [ "Telj", "maximum" ], "desc": "Maximális teljesitmény beállitása " }, "ReverseButtonTempChange": { - "text": "HÖVÁLT", - "text2": [ + "text2": [ "GOMB +-", "Felcseréled?" ], "desc": "A páka hömérséklet növelés csökkentési gombok felcserélése." }, "TempChangeShortStep": { - "text": "HÖRÖV", - "text2": [ + "text2": [ "Hömérséklet", "váltás rövid?" ], "desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!" }, "TempChangeLongStep": { - "text": "HÖHOS", - "text2": [ + "text2": [ "Hömérséklet", "váltás hosszú?" ], "desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!" }, "PowerPulsePower":{ - "text": "TELJP", - "text2": [ + "text2": [ "Telj power", "bank üzem W" ], "desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. " }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index a3f2b112..6a0e45a7 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "D" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,208 +68,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Sorgente", "alimentaz" ], "desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Temp", "standby" ], "desc": "Imposta la temperatura da mantenere in modalità Standby <°C/°F>" }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Timer", "standby" ], "desc": "Imposta il timer per entrare in modalità Standby " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Timer", "spegnimento" ], "desc": "Imposta il timer per lo spegnimento " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Sensibilità", "al movimento" ], "desc": "Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Unità di", "temperatura" ], "desc": "Scegli l'unità di misura per la temperatura " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Interfaccia", "testuale" ], "desc": "Mostra informazioni dettagliate all'interno della schermata principale" }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Orientamento", "display" ], "desc": "Imposta l'orientamento del display " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Temp", "«Turbo»" ], "desc": "Imposta la temperatura della funzione «Turbo»" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Avvio", "automatico" ], "desc": "Attiva automaticamente il saldatore quando viene alimentato " }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Avviso", "punta calda" ], "desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda" }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibrazione", "temperatura" ], "desc": "Calibra le rilevazioni di temperatura" }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Ripristino", "impostazioni" ], "desc": "Ripristina tutte le impostazioni" }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibrazione", "tensione" ], "desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire" }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Dettagli", "saldatura" ], "desc": "Mostra informazioni dettagliate durante la modalità Saldatura" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Velocità", "testo" ], "desc": "Imposta la velocità di scorrimento del testo " }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Modello", "punta" ], "desc": "Seleziona il modello della punta in uso" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Calibrazione", "semplice" ], "desc": "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Calibrazione", "avanzata" ], "desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Potenza", "alimentaz" ], "desc": "Imposta la potenza massima erogabile dall'alimentatore in uso" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Limite", "di potenza" ], "desc": "Imposta il valore di potenza massima erogabile al saldatore " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Inversione", "tasti" ], "desc": "Inverti i tasti per impostare la temperatura della punta " }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Cambio temp", "pressione breve" ], "desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Cambio temp", "pressione lunga" ], "desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti" }, "PowerPulsePower": { - "text": "POWPLS", - "text2": [ + "text2": [ "Potenza impulso", "«Keep-Alive»" ], "desc": "Regola la potenza d'impulso in ingresso al saldatore per prevenire lo standby eventuale dell'alimentatore " }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Guadagno", "punta" ], diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index fd7aeabf..2af028e4 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Maitinimo", "šaltinis" ], "desc": "Išjungimo įtampa. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Miego", "temperat." ], "desc": "Miego temperatūra " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Miego", "laikas" ], "desc": "Miego laikas " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Išjungimo", "laikas" ], "desc": "Išjungimo laikas " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Jautrumas", "judesiui" ], "desc": "Jautrumas judesiui <0 - išjungta, 1 - mažiausias, 9 - didžiausias>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Temperatūros", "vienetai" ], "desc": "Temperatūros vienetai " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Detalus lauki", "mo ekranas" ], "desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane" }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Ekrano", "orientacija" ], "desc": "Ekrano orientacija " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Turbo", "temperat." ], "desc": "Temperatūra turbo režimu" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Auto", "paleidimas" ], "desc": "Ar pradėti kaitininti iš karto įjungus lituoklį" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Atvėsimo", "mirksėjimas" ], "desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas" }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibruoti", "temperatūrą?" ], "desc": "Antgalio temperatūros kalibravimas" }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Atstatyti", "nustatymus?" ], "desc": "Nustatyti nustatymus iš naujo" }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibruoti", "įvesties įtampą?" ], "desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte" }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Detalus lita-", "vimo ekranas" ], "desc": "Ar rodyti išsamią informaciją lituojant" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Greitas apr", "ašym. slink" ], "desc": "Greitis, kuriuo šis tekstas slenka" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Antgalio", "modelis" ], "desc": "Antgalio modelio pasirinkimas" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Paprasta", "kalibracija" ], "desc": "Paprasta kalibracija naudojant karštą vandienį" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Išplėstinė", "kalibracija" ], "desc": "Išplėstinė kalibracija naudojant termoelementą" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Galia", "vatais" ], "desc": "Maitinimo bloko galia vatais" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 6c64f6a6..b592d6b3 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Spannings-", "bron" ], "desc": "Spanningsbron. Stelt drempelspanning in. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Slaap", "temp" ], "desc": "Temperatuur in slaapstand " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Slaap", "time-out" ], "desc": "Slaapstand time-out " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Uitschakel", "time-out" ], "desc": "Automatisch afsluiten time-out " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Bewegings-", "gevoeligheid" ], "desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Temperatuur", "eenheid" ], "desc": "Temperatuureenheid " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Gedetailleerd", "slaapscherm" ], "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Scherm-", "oriëntatie" ], "desc": "Schermoriëntatie " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Boost", "temp" ], "desc": "Temperatuur in boostmodes" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Afkoel", "flikker" ], "desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is." }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibreer", "temperatuur?" ], "desc": "Temperatuursafwijking van de soldeerpunt calibreren." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Instellingen", "resetten?" ], "desc": "Alle instellingen terugzetten." }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibreer", "input-voltage?" ], "desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen." }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Gedetailleerd", "soldeerscherm" ], "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm." }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Scroll", "snelheid" ], "desc": "Snelheid waarmee de tekst scrolt." }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json index 2a8f928f..9404c78a 100644 --- a/Translation Editor/translation_nl_be.json +++ b/Translation Editor/translation_nl_be.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Spannings-", "bron" ], "desc": "Spanningsbron. Stelt minimumspanning in. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Slaap", "temp" ], "desc": "Temperatuur in slaapstand <°C>" }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Slaap", "time-out" ], "desc": "Slaapstand time-out " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Uitschakel", "time-out" ], "desc": "Automatisch afsluiten time-out " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Bewegings-", "gevoeligheid" ], "desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Temperatuur", "schaal" ], "desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>" }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Gedetailleerd", "slaapscherm" ], "desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Scherm-", "oriëntatie" ], "desc": "Schermoriëntatie " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Verhogings", "temp" ], "desc": "Verhogingstemperatuur" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Afkoel", "knipper" ], "desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling." }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibreer", "temperatuur?" ], "desc": "Temperatuur van de punt calibreren." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Instellingen", "resetten?" ], "desc": "Alle instellingen resetten." }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Calibreer", "voedingsspanning?" ], "desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken." }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Gedetailleerd", "soldeerscherm" ], "desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm." }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Scrol", "snelheid" ], "desc": "Scrolsnelheid van de tekst." }, "TipModel": { - "text": "PUNTMO", - "text2": [ + "text2": [ "Punt", "Model" ], "desc": "Gekozen punt" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Eenvoudige", "Calibrering" ], "desc": "Calibrering met heet water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Gevorderde", "Calibrering" ], "desc": "Calibrering met thermokoppel" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Vermogen", "Watt" ], "desc": "Vermogen van de adapter" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 38af2491..ddecb065 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "I" }, - "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "Kilde", - "text2": [ - "", + "text2": [ + "Kilde", "" ], "desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. " }, "SleepTimeout": { - "text": "DTid", - "text2": [ + "text2": [ "", "" ], "desc": "Tid før dvale " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json index b8fdfa19..e158629c 100644 --- a/Translation Editor/translation_pl.json +++ b/Translation Editor/translation_pl.json @@ -37,7 +37,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "B" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -70,208 +69,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Źródło", "zasilania" ], "desc": "Źródło zasilania. Ustaw napięcie odcięcia. " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Temperatura", "uśpienia" ], "desc": "Temperatura uśpienia <°C>" }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Czas", "uśpienia" ], "desc": "Czas uśpienia " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Czas", "wyłączenia" ], "desc": "Czas wyłączenia " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Czułość", "ruchu" ], "desc": "Czułość ruchu <0.Wyłączona 1.Minimalna 9.Maksymalna>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Jednostka", "temperatury" ], "desc": "Jednostka temperatury " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Mniejsza", "czcionka" ], "desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności" }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Orientacja", "wyświetlacza" ], "desc": "Orientacja wyświetlacza " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Temperatura", "w trybie boost" ], "desc": "Temperatura w trybie \"boost\" " }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Automatyczne", "uruchamianie" ], "desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. " }, "SleepTemperature": { - "text": "TMPE", - "text2": [ + "text2": [ "Temperat.", "repouso" ], "desc": "Temperatura de repouso " }, "SleepTimeout": { - "text": "TMPO", - "text2": [ + "text2": [ "Tempo", "repouso" ], "desc": "Tempo para repouso " }, "ShutdownTimeout": { - "text": "DESLI", - "text2": [ + "text2": [ "Tempo", "desligam." ], "desc": "Tempo para desligamento " }, "MotionSensitivity": { - "text": "MOVIME", - "text2": [ + "text2": [ "Sensibilidade", "movimento" ], "desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>" }, "TemperatureUnit": { - "text": "UNIDAD", - "text2": [ + "text2": [ "Unidade", "temperatura" ], "desc": "Unidade de temperatura " }, "AdvancedIdle": { - "text": "EM ESPERA", - "text2": [ + "text2": [ "Tela repouso", "avançada" ], "desc": "Exibe informações avançadas quando em espera" }, "DisplayRotation": { - "text": "ORIENT", - "text2": [ + "text2": [ "Orientação", "tela" ], "desc": "Orientação da tela " }, "BoostTemperature": { - "text": "TTMP", - "text2": [ + "text2": [ "Modo turbo", "temperat." ], "desc": "Ajuste de temperatura do modo \"turbo\"" }, "AutoStart": { - "text": "MODOAT", - "text2": [ + "text2": [ "Partida", "automática" ], "desc": "Aquece a ponta automaticamente ao ligar" }, "CooldownBlink": { - "text": "RESFRI", - "text2": [ + "text2": [ "Piscar ao", "arrefecer" ], "desc": "Faz o valor da temperatura piscar durante o arrefecimento" }, "TemperatureCalibration": { - "text": "CAL.TEMP", - "text2": [ + "text2": [ "Calibrar", "temperatura" ], "desc": "Calibra a temperatura" }, "SettingsReset": { - "text": "RESET", - "text2": [ + "text2": [ "Reset de", "fábrica?" ], "desc": "Reverte todos ajustes" }, "VoltageCalibration": { - "text": "CAL.VOLT", - "text2": [ + "text2": [ "Calibrar", "tensão" ], "desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair" }, "AdvancedSoldering": { - "text": "AVNCAD", - "text2": [ + "text2": [ "Tela trabalho", "avançada" ], "desc": "Exibe informações avançadas durante o uso" }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Velocidade", "texto ajuda" ], "desc": "Velocidade a que o texto é exibido" }, "TipModel": { - "text": "MODPNT", - "text2": [ + "text2": [ "Ponta", "Modelo" ], "desc": "Selecção de modelo de ponta" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Calibração", "Simples" ], "desc": "Calibração simples com água quente" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Calibração", "Avançada" ], "desc": "Calibração avançada com um termopar na ponta" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Potência", "Fonte" ], "desc": "Potência da fonte usada (Watt)" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 068e9ffb..9723c112 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "К", "SettingStartNoneChar": "В" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,208 +68,182 @@ }, "menuOptions": { "PowerSource": { - "text": "ИстчнПит", - "text2": [ + "text2": [ "Источник", "питания" ], "desc": "Источник питания. Устанавливает напряжение отсечки. " }, "SleepTemperature": { - "text": "ТмпОжд", - "text2": [ + "text2": [ "Темп.", "ожидания" ], "desc": "Температура режима ожидания" }, "SleepTimeout": { - "text": "ВрмОжид", - "text2": [ + "text2": [ "Таймаут", "ожидания" ], "desc": "Время до перехода в режим ожидания <Минуты/Секунды>" }, "ShutdownTimeout": { - "text": "ВрмОткл", - "text2": [ + "text2": [ "Таймаут", "выключения" ], "desc": "Время до отключения паяльника <Минуты>" }, "MotionSensitivity": { - "text": "ЧувсАксл", - "text2": [ + "text2": [ "Чувствительн.", "акселерометра" ], "desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>" }, "TemperatureUnit": { - "text": "ЕдТемп", - "text2": [ + "text2": [ "Единицы", "температуры" ], "desc": "Единицы измерения температуры " }, "AdvancedIdle": { - "text": "ИнфОжд", - "text2": [ + "text2": [ "Подробный", "реж. ожидания" ], "desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания" }, "DisplayRotation": { - "text": "ПовЭкр", - "text2": [ + "text2": [ "Ориентация", "экрана" ], "desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>" }, "BoostTemperature": { - "text": "ТемпТурб", - "text2": [ + "text2": [ "t° турбо", "режима" ], "desc": "Температура жала в турбо-режиме" }, "AutoStart": { - "text": "АвтоРеж", - "text2": [ + "text2": [ "Авто", "старт" ], "desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>" }, "CooldownBlink": { - "text": "МигТемп", - "text2": [ + "text2": [ "Мигание t°", "при остывании" ], "desc": "Мигать температурой на экране охлаждения, пока жало еще горячее" }, "TemperatureCalibration": { - "text": "КалТемп?", - "text2": [ + "text2": [ "Калибровка", "температуры" ], "desc": "Калибровка термодатчика жала" }, "SettingsReset": { - "text": "Сброс?", - "text2": [ + "text2": [ "Сброс", "Настроек" ], "desc": "Сброс настроек к значеням по умолчанию" }, "VoltageCalibration": { - "text": "КалНапр", - "text2": [ + "text2": [ "Калибровка", "напряжения" ], "desc": "Калибровка входного напряжения <длинное нажатие для выхода>" }, "AdvancedSoldering": { - "text": "ИнфПайк", - "text2": [ + "text2": [ "Подробный", "экран пайки" ], "desc": "Показывать детальную информацию на экране пайки" }, "ScrollingSpeed": { - "text": "СкорТекс", - "text2": [ + "text2": [ "Скорость", "текста" ], "desc": "Скорость прокрутки текста <М=медленно, Б=быстро>" }, "TipModel": { - "text": "МодЖала", - "text2": [ + "text2": [ "Модель", "жала" ], "desc": "Выбор модели жала" }, "SimpleCalibrationMode": { - "text": "УпрКал", - "text2": [ + "text2": [ "Упрощенная", "калибровка" ], "desc": "Упрощенная калибровка с использованием горячей воды" }, "AdvancedCalibrationMode": { - "text": "УлучшКал", - "text2": [ + "text2": [ "Улучшенная", "калибровка" ], "desc": "Улучшенная калибровка с импользованием термопары жала" }, "PowerInput": { - "text": "МощнИст", - "text2": [ + "text2": [ "Мощность", "питания" ], "desc": "Мощность используемого источника питания" }, "PowerLimit": { - "text": "ЗначЛимW", - "text2": [ + "text2": [ "Максимальная", "мощность" ], "desc": "Максимальная мощность, которую может использовать паяльник <Ватт>" }, "ReverseButtonTempChange": { - "text": "ИнвКноп", - "text2": [ + "text2": [ "Инвертировать", "кнопки" ], "desc": "Инвертировать кнопки изменения температуры" }, "TempChangeShortStep": { - "text": "ШагКорт", - "text2": [ + "text2": [ "Шаг темп.", "кор. наж." ], "desc": "Шаг изменения температуры при коротком нажатии кнопок" }, "TempChangeLongStep": { - "text": "ШагДлин", - "text2": [ + "text2": [ "Шаг темп.", "длин. наж." ], "desc": "Шаг изменения температуры при длинном нажатии кнопок" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index 9a88f76e..92deef72 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ - "", + "text2": [ + "PWRSC", "" ], "desc": "Zdroj napatia. Nastavit napatie pre vypnutie (cutoff) " }, "SleepTemperature": { - "text": "STMP", - "text2": [ - "", + "text2": [ + "STMP", "" ], "desc": "Kludova teplota (v nastavenych jednotkach)" }, "SleepTimeout": { - "text": "STME", - "text2": [ - "", + "text2": [ + "STME", "" ], "desc": "Kludovy rezim po " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ - "", + "text2": [ + "SHTME", "" ], "desc": "Cas na vypnutie " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ - "", + "text2": [ + "MSENSE", "" ], "desc": "Citlivost detekcie pohybu <0=Vyp, 1=Min ... 9=Max>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ - "", + "text2": [ + "TMPUNT", "" ], "desc": "Jednotky merania teploty " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ - "", + "text2": [ + "ADVIDL", "" ], "desc": "Zobrazit detailne informacie v kludovom rezime " }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ - "", + "text2": [ + "DSPROT", "" ], "desc": "Orientacia displeja " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ - "", + "text2": [ + "BTMP", "" ], "desc": "Cielova teplota pre prudky nahrev (v nastavenych jednotkach)" }, "AutoStart": { - "text": "ASTART", - "text2": [ - "", + "text2": [ + "ASTART", "" ], "desc": "Pri starte spustit rezim spajkovania " }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ - "", + "text2": [ + "CLBLNK", "" ], "desc": "Blikanie ukazovatela teploty pocas chladnutia hrotu " }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ - "", + "text2": [ + "TMP CAL?", "" ], "desc": "Kalibracia posunu hrotu" }, "SettingsReset": { - "text": "RESET?", - "text2": [ - "", + "text2": [ + "RESET?", "" ], "desc": "Tovarenske nastavenia" }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ - "", + "text2": [ + "CAL VIN?", "" ], "desc": "Kalibracia VIN. Kratke stlacenie meni nastavenie, dlhe stlacenie pre navrat" }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ - "", + "text2": [ + "ADVSLD", "" ], "desc": "Zobrazenie detailov pocas spajkovania " }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ - "", + "text2": [ + "DESCSP", "" ], "desc": "Speed this text scrolls past at" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json index 3ce10328..53e6654d 100644 --- a/Translation Editor/translation_sl.json +++ b/Translation Editor/translation_sl.json @@ -35,7 +35,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -68,208 +67,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ + "text2": [ "Vir", "napajanja" ], "desc": "Vir napajanja. Nastavi napetost izklopa. " }, "SleepTemperature": { - "text": "STMP", - "text2": [ + "text2": [ "Temp. med", "spanjem" ], "desc": "Temperatura med spanjem " }, "SleepTimeout": { - "text": "STME", - "text2": [ + "text2": [ "Čas do", "spanja" ], "desc": "Čas pred spanjem " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ + "text2": [ "Čas do", "izklopa" ], "desc": "Čas pred izklopom " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ + "text2": [ "Občutljivost", "premikanja" ], "desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ + "text2": [ "Enota za", "temperaturo" ], "desc": "Enota za temperaturo " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ + "text2": [ "Več info na", "zaslonu v mir" ], "desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem." }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ + "text2": [ "Orientacija", "zaslona" ], "desc": "Orientacija zaslona " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ + "text2": [ "Temperat.", "v boost" ], "desc": "Temperatura v \"boost\" načinu" }, "AutoStart": { - "text": "ASTART", - "text2": [ + "text2": [ "Samodejni", "zagon" ], "desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop" }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ + "text2": [ "Utripanje med", "hlajenjem" ], "desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča." }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ + "text2": [ "Kalibriram", "temperaturo?" ], "desc": "Kalibracija temperature na konici." }, "SettingsReset": { - "text": "RESET?", - "text2": [ + "text2": [ "Tovarniške", "nastavitve?" ], "desc": "Ponastavitev vseh nastavitev" }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ + "text2": [ "Kalibriram", "vhodno napetost?" ], "desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod." }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ + "text2": [ "Več info na", "zaslonu spaj." ], "desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem." }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ + "text2": [ "Hitrost", "besedila" ], "desc": "Hitrost, s katero se prikazuje besedilo" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Model", "konice" ], "desc": "Izbira tipa konice" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Preprosta", "kalibracija" ], "desc": "Preprosta kalibracija z vročo vodo." }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Napredna kalibracija s termočlenom na konici" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Moč napajalnega", "vira" ], "desc": "Moč v W napajalnega vira" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json index 8f4f1765..13447f5a 100644 --- a/Translation Editor/translation_sr_cyrl.json +++ b/Translation Editor/translation_sr_cyrl.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "Нпјње", - "text2": [ + "text2": [ "Врста", "напајања" ], "desc": "Тип напајања; одређује најнижи радни напон. " }, "SleepTemperature": { - "text": "ТСпв", - "text2": [ + "text2": [ "Темп.", "спавања" ], "desc": "Температура на коју се спушта лемилица након одређеног времена мировања. " }, "SleepTimeout": { - "text": "ВСпв", - "text2": [ + "text2": [ "Време до", "спавања" ], "desc": "Време мировања након кога лемилица спушта температуру. " }, "ShutdownTimeout": { - "text": "ВГшњ", - "text2": [ + "text2": [ "Време до", "гашења" ], "desc": "Време мировања након кога се лемилица гаси. " }, "MotionSensitivity": { - "text": "ОстПкр", - "text2": [ + "text2": [ "Осетљивост", "на покрет" ], "desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>" }, "TemperatureUnit": { - "text": "ЈедТмп", - "text2": [ + "text2": [ "Јединица", "температуре" ], "desc": "Јединице у којима се приказује температура. " }, "AdvancedIdle": { - "text": "ДтљМир", - "text2": [ + "text2": [ "Детаљи током", "мировања" ], "desc": "Приказивање детаљних информација на екрану током мировања." }, "DisplayRotation": { - "text": "ОрјЕкр", - "text2": [ + "text2": [ "Оријентација", "екрана" ], "desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>" }, "BoostTemperature": { - "text": "ТПјч", - "text2": [ + "text2": [ "Темп.", "појачања" ], "desc": "Температура врха лемилице у току појачања." }, "AutoStart": { - "text": "ВрћСта", - "text2": [ + "text2": [ "Врући", "старт" ], "desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се." }, "CooldownBlink": { - "text": "УпзХла", - "text2": [ + "text2": [ "Упозорење", "при хлађењу" ], "desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ." }, "TemperatureCalibration": { - "text": "КалбрТмп", - "text2": [ + "text2": [ "Калибрација", "температуре" ], "desc": "Калибрисање одступања температуре врха у односу на дршку." }, "SettingsReset": { - "text": "ФабрПост", - "text2": [ + "text2": [ "Фабричке", "поставке" ], "desc": "Враћање свих поставки на фабричке вредности." }, "VoltageCalibration": { - "text": "КалбрНап", - "text2": [ + "text2": [ "Калибрација", "улазног напона" ], "desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај." }, "AdvancedSoldering": { - "text": "ДтљЛем", - "text2": [ + "text2": [ "Детаљи током", "лемљења" ], "desc": "Приказивање детаљних информација на екрану током лемљења." }, "ScrollingSpeed": { - "text": "БрзПор", - "text2": [ + "text2": [ "Брзина", "порука" ], "desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>" }, "TipModel": { - "text": "МоделВрх", - "text2": [ + "text2": [ "Модел", "врха" ], "desc": "Одабир модела лемног врха." }, "SimpleCalibrationMode": { - "text": "ЈедКалбр", - "text2": [ + "text2": [ "Једноставна", "калибрација" ], "desc": "Једноставна калибрација кипућом водом." }, "AdvancedCalibrationMode": { - "text": "НапКалбр", - "text2": [ + "text2": [ "Напредна", "калибрација" ], "desc": "Напредна калибрација помоћу термопара." }, "PowerInput": { - "text": "УлазСнаг", - "text2": [ + "text2": [ "Улазна", "снага" ], "desc": "Снага напајања у ватима." }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json index a4b055e0..f4c2cd32 100644 --- a/Translation Editor/translation_sr_latn.json +++ b/Translation Editor/translation_sr_latn.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "Npjnj", - "text2": [ + "text2": [ "Vrsta", "napajanja" ], "desc": "Tip napajanja; određuje najniži radni napon. " }, "SleepTemperature": { - "text": "TSpv", - "text2": [ + "text2": [ "Temp.", "spavanja" ], "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. " }, "SleepTimeout": { - "text": "VSpv", - "text2": [ + "text2": [ "Vreme do", "spavanja" ], "desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. " }, "ShutdownTimeout": { - "text": "VGšnj", - "text2": [ + "text2": [ "Vreme do", "gašenja" ], "desc": "Vreme mirovanja nakon koga se lemilica gasi. " }, "MotionSensitivity": { - "text": "OstPkr", - "text2": [ + "text2": [ "Osetljivost", "na pokret" ], "desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>" }, "TemperatureUnit": { - "text": "JedTmp", - "text2": [ + "text2": [ "Jedinica", "temperature" ], "desc": "Jedinice u kojima se prikazuje temperatura. " }, "AdvancedIdle": { - "text": "DtlMir", - "text2": [ + "text2": [ "Detalji tokom", "mirovanja" ], "desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja." }, "DisplayRotation": { - "text": "OrjEkr", - "text2": [ + "text2": [ "Orijentacija", "ekrana" ], "desc": "Kako je okrenut ekran. " }, "BoostTemperature": { - "text": "TPjč", - "text2": [ + "text2": [ "Temp.", "pojačanja" ], "desc": "Temperatura vrha lemilice u toku pojačanja." }, "AutoStart": { - "text": "VrćSta", - "text2": [ + "text2": [ "Vrući", "start" ], "desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se." }, "CooldownBlink": { - "text": "UpzHla", - "text2": [ + "text2": [ "Upozorenje", "pri hlađenju" ], "desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć." }, "TemperatureCalibration": { - "text": "KalbrTmp", - "text2": [ + "text2": [ "Kalibracija", "temperature" ], "desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku." }, "SettingsReset": { - "text": "FabrPost", - "text2": [ + "text2": [ "Fabričke", "postavke" ], "desc": "Vraćanje svih postavki na fabričke vrednosti." }, "VoltageCalibration": { - "text": "KalbrNap", - "text2": [ + "text2": [ "Kalibracija", "ulaznog napona" ], "desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj." }, "AdvancedSoldering": { - "text": "DtlLem", - "text2": [ + "text2": [ "Detalji tokom", "lemljenja" ], "desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja." }, "ScrollingSpeed": { - "text": "BrzPor", - "text2": [ + "text2": [ "Brzina", "poruka" ], "desc": "Brzina kretanja opisnih poruka poput ove. " }, "TipModel": { - "text": "ModelVrh", - "text2": [ + "text2": [ "Model", "vrha" ], "desc": "Odabir modela lemnog vrha." }, "SimpleCalibrationMode": { - "text": "JedKalbr", - "text2": [ + "text2": [ "Jednostavna", "kalibracija" ], "desc": "Jednostavna kalibracija kipućom vodom." }, "AdvancedCalibrationMode": { - "text": "NapKalbr", - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Napredna kalibracija pomoću termopara." }, "PowerInput": { - "text": "UlazSnag", - "text2": [ + "text2": [ "Ulazna", "snaga" ], "desc": "Snaga napajanja u vatima." }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index 1aae53a1..eb6a37d5 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "", - "text2": [ + "text2": [ "Ström-", "källa" ], "desc": "Strömkälla. Anger lägsta spänning. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Vilo-", "temp" ], "desc": "Vilotemperatur " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Vilo-", "timeout" ], "desc": "Vilo-timeout " }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Avstängn.", "timeout" ], "desc": "Avstängnings-timeout " }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Rörelse-", "känslighet" ], "desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Temperatur-", "enheter" ], "desc": "Temperaturenhet " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Detaljerad", "vid inaktiv" ], "desc": "Visa detaljerad information i mindre typsnitt när inaktiv." }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Visnings", "läge" ], "desc": "Visningsläge " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Turbo-", "temp" ], "desc": "Temperatur i \"turbo\"-läge" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Nedkylnings-", "blink" ], "desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm." }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibrera", "temperatur?" ], "desc": "Kalibrera spets-kompensation." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Fabriks-", "inställ?" ], "desc": "Återställ alla inställningar" }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Kalibrera", "inspänning?" ], "desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut" }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Detaljerad", "lödng.skärm" ], "desc": "Visa detaljerad information vid lödning" }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Beskrivning", "rullhast." ], "desc": "Hastighet som den här texten rullar i" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index 99e3ca5b..a97ae469 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -34,7 +34,6 @@ "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F" }, - "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ @@ -67,208 +66,182 @@ }, "menuOptions": { "PowerSource": { - "text": "PWRSC", - "text2": [ - "", + "text2": [ + "PWRSC", "" ], "desc": "Güç Kaynağı. kesim geriliminı ayarlar. " }, "SleepTemperature": { - "text": "STMP", - "text2": [ - "", + "text2": [ + "STMP", "" ], "desc": "Uyku Sıcaklığı " }, "SleepTimeout": { - "text": "STME", - "text2": [ - "", + "text2": [ + "STME", "" ], "desc": "Uyku Zaman Aşımı " }, "ShutdownTimeout": { - "text": "SHTME", - "text2": [ - "", + "text2": [ + "SHTME", "" ], "desc": "Kapatma Zaman Aşımı " }, "MotionSensitivity": { - "text": "MSENSE", - "text2": [ - "", + "text2": [ + "MSENSE", "" ], "desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>" }, "TemperatureUnit": { - "text": "TMPUNT", - "text2": [ - "", + "text2": [ + "TMPUNT", "" ], "desc": "Sıcaklık Ünitesi " }, "AdvancedIdle": { - "text": "ADVIDL", - "text2": [ - "", + "text2": [ + "ADVIDL", "" ], "desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster." }, "DisplayRotation": { - "text": "DSPROT", - "text2": [ - "", + "text2": [ + "DSPROT", "" ], "desc": "Görüntü Yönlendirme " }, "BoostTemperature": { - "text": "BTMP", - "text2": [ - "", + "text2": [ + "BTMP", "" ], "desc": "\"boost\" Modu Derecesi" }, "AutoStart": { - "text": "ASTART", - "text2": [ - "", + "text2": [ + "ASTART", "" ], "desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı" }, "CooldownBlink": { - "text": "CLBLNK", - "text2": [ - "", + "text2": [ + "CLBLNK", "" ], "desc": "Soğutma ekranında uç hala sıcakken derece yanıp sönsün." }, "TemperatureCalibration": { - "text": "TMP CAL?", - "text2": [ - "", + "text2": [ + "TMP CAL?", "" ], "desc": "Ucu kalibre et." }, "SettingsReset": { - "text": "RESET?", - "text2": [ - "", + "text2": [ + "RESET?", "" ], "desc": "Bütün ayarları sıfırla" }, "VoltageCalibration": { - "text": "CAL VIN?", - "text2": [ - "", + "text2": [ + "CAL VIN?", "" ], "desc": "VIN Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas." }, "AdvancedSoldering": { - "text": "ADVSLD", - "text2": [ - "", + "text2": [ + "ADVSLD", "" ], "desc": "Lehimleme yaparken detaylı bilgi göster" }, "ScrollingSpeed": { - "text": "DESCSP", - "text2": [ - "", + "text2": [ + "DESCSP", "" ], "desc": "Speed this text scrolls past at" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Uç", "Modeli" ], "desc": "Uç Modeli seçimi" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Basit", "Kalibrasyon" ], "desc": "Sıcak su kullanarak basit kalibrasyon" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Gelişmiş", "Kalibrasyon" ], "desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Güç", "Miktarı(W)" ], "desc": "Kullanılan adaptörün güç miktarı" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ], diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json index 81d9e01c..b689ef20 100644 --- a/Translation Editor/translation_uk.json +++ b/Translation Editor/translation_uk.json @@ -36,7 +36,6 @@ "SettingStartSleepOffChar": "К", "SettingStartNoneChar": "В" }, - "menuDouble": true, "menuGroups": { "SolderingMenu": { "text2": [ @@ -69,208 +68,182 @@ }, "menuOptions": { "PowerSource": { - "text": "ДжЖив", - "text2": [ + "text2": [ "Джерело", "живлення" ], "desc": "Встановлення напруги відключення. " }, "SleepTemperature": { - "text": "", - "text2": [ + "text2": [ "Темпер.", "сну" ], "desc": "Температура режиму очікування " }, "SleepTimeout": { - "text": "", - "text2": [ + "text2": [ "Тайм-аут", "сну" ], "desc": "Час до переходу в режим очікування <Хвилини/Секунди>" }, "ShutdownTimeout": { - "text": "", - "text2": [ + "text2": [ "Часу до", "вимкнення" ], "desc": "Час до відключення <Хвилини>" }, "MotionSensitivity": { - "text": "", - "text2": [ + "text2": [ "Чутл. сенсо-", "ру руху" ], "desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>" }, "TemperatureUnit": { - "text": "", - "text2": [ + "text2": [ "Формат темпе-", "ратури(C°/F°)" ], "desc": "Одиниця виміру температури " }, "AdvancedIdle": { - "text": "", - "text2": [ + "text2": [ "Детальний ре-", "жим очікуван." ], "desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані" }, "DisplayRotation": { - "text": "", - "text2": [ + "text2": [ "Автоповорот", "екрану" ], "desc": "Орієнтація дисплея " }, "BoostTemperature": { - "text": "", - "text2": [ + "text2": [ "Темпер.", "Турбо" ], "desc": "Температура в Турбо-режимі" }, "AutoStart": { - "text": "", - "text2": [ + "text2": [ "Гарячий", "старт" ], "desc": "Режим з яким запускається паяльник при подачі живлення <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>" }, "CooldownBlink": { - "text": "", - "text2": [ + "text2": [ "Показ t° при", "охолодж." ], "desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає" }, "TemperatureCalibration": { - "text": "", - "text2": [ + "text2": [ "Калібровка", "температури" ], "desc": "Калібрування температурного датчика." }, "SettingsReset": { - "text": "", - "text2": [ + "text2": [ "Скинути всі", "налаштування?" ], "desc": "Скидання всіх параметрів до стандартних значень." }, "VoltageCalibration": { - "text": "", - "text2": [ + "text2": [ "Калібрування", "напруги" ], "desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити." }, "AdvancedSoldering": { - "text": "", - "text2": [ + "text2": [ "Детальний ре-", "жим пайки" ], "desc": "Показувати детальну інформацію при пайці." }, "ScrollingSpeed": { - "text": "", - "text2": [ + "text2": [ "Швидкість", "тексту" ], "desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>" }, "TipModel": { - "text": "TIPMO", - "text2": [ + "text2": [ "Модель", "Жало" ], "desc": "Вибір моделі жала" }, "SimpleCalibrationMode": { - "text": "SMPCAL", - "text2": [ + "text2": [ "Просте", "Калібрування" ], "desc": "Просте калібрування з використанням гарячої води" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", - "text2": [ + "text2": [ "Детальне", "Калібрування" ], "desc": "Калібрування за допомогою термопари" }, "PowerInput": { - "text": "PWRW", - "text2": [ + "text2": [ "Потужність", "дж. живл." ], "desc": "Потужність джерела живлення в Ватах" }, "PowerLimit": { - "text": "PLIM", - "text2": [ + "text2": [ "Макс.", "потуж." ], "desc": "Макс. потужність, яку може використовувати паяльник <Ват>" }, "ReverseButtonTempChange": { - "text": "RVTCHG", - "text2": [ + "text2": [ "Інвертувати", "кнопки +-?" ], "desc": "Інвертувати кнопки зміни температури." }, "TempChangeShortStep": { - "text": "TCHGST", - "text2": [ + "text2": [ "Зм. темп.", "коротко?" ], "desc": "Змінювати температуру при короткому натисканні!" }, "TempChangeLongStep": { - "text": "TCHGLT", - "text2": [ + "text2": [ "Зм. темп.", "довго?" ], "desc": "Змінювати температуру при довгому натисканні!" }, "PowerPulsePower":{ - "text": "POWPLS", - "text2": [ + "text2": [ "Пульс.", "Навантаж." ], "desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії (це потрібно щоб паяльник не вимкнувся з часом)" }, "TipGain": { - "text": "TG", - "text2": [ + "text2": [ "Modify", "tip gain" ],