diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py old mode 100644 new mode 100755 index 40504c4f..ec289b4c --- a/Translation Editor/make_translation.py +++ b/Translation Editor/make_translation.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + from __future__ import print_function import json import os @@ -35,8 +37,13 @@ def readTranslations(jsonDir): # Read only translation_XX.json if lf.startswith("translation_") and lf.endswith(".json"): - lang = loadJson(fileWithPath, False) - + try: + lang = loadJson(fileWithPath, False) + except json.decoder.JSONDecodeError as e: + print("Failed to decode " + lf) + print(str(e)) + sys.exit(2) + # Extract lang code from file name langCode = fileName[12:-5].upper() # ...and the one specified in the JSON file... @@ -65,10 +72,10 @@ def writeStart(f): def escapeC(s): - return s.replace("\"", "\\\""); + return s.replace("\"", "\\\"") -def writeLanguage(languageCode): +def writeLanguage(languageCode, defs, f): print("Generating block for " + languageCode) lang = langDict[languageCode] @@ -167,52 +174,65 @@ def writeLanguage(languageCode): # ----- Block end f.write(to_unicode("#endif\n")) + +def read_opts(): + """ Reading input parameters + First parameter = json directory + Second parameter = target directory + """ + if len(sys.argv) > 1: + jsonDir = sys.argv[1] + else: + jsonDir = "." + + if len(sys.argv) > 2: + outFile = sys.argv[2] + else: + outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/") + outFile = os.path.join(outDir, TRANSLATION_CPP) + + if len(sys.argv) > 3: + raise Exception("Too many parameters!") + + return jsonDir, outFile + + +def orderOutput(langDict): + # These languages go first + mandatoryOrder = ['EN'] + + # Then add all others in alphabetical order + sortedKeys = sorted(langDict.keys()) + + # Add the rest as they come + for key in sortedKeys: + if key not in mandatoryOrder: + mandatoryOrder.append(key) + + return mandatoryOrder -''' Reading input parameters -First parameter = json directory -Second parameter = target directory -''' + +def writeTarget(outFile, defs, langCodes): + # Start writing the file + with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f: + writeStart(f) + + for langCode in langCodes: + writeLanguage(langCode, defs, f) -print("Making " + TRANSLATION_CPP + ":") +if __name__ == "__main__": + try: + jsonDir, outFile = read_opts() + except: + print("usage: make_translation.py {json dir} {cpp dir}") + sys.exit(1) -if len(sys.argv) > 1: - jsonDir = sys.argv[1] -else: - jsonDir = "." + print("Making " + outFile + " from " + jsonDir) -jsonDir = os.path.abspath(jsonDir) + langDict = readTranslations(jsonDir) + defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True) + langCodes = orderOutput(langDict) + writeTarget(outFile, defs, langCodes) -if len(sys.argv) > 2: - outDir = sys.argv[2] -else: - outDir = jsonDir + "/../workspace/TS100/src/" - -langDict = readTranslations(jsonDir) - -# Read definition (required for ordering) - -defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True) - -# These languages go first -mandatoryOrder = ['EN'] - -# Then add all others in alphabetical order -sortedKeys = sorted(langDict.keys()) - -for key in sortedKeys: - if key not in mandatoryOrder: - mandatoryOrder.append(key) - -# Add the rest as they come - -# Start writing the file -targetTranslationFile = os.path.join(outDir, TRANSLATION_CPP) - -with io.open(targetTranslationFile, 'w', encoding='utf-8', newline="\n") as f: - writeStart(f) - - for langCode in mandatoryOrder: - writeLanguage(langCode) - print("Done") diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index bddbdd93..0dcc2885 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -195,30 +195,30 @@ ], "desc": "Скорост на движение на този текст" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "български" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_cs_cz.json b/Translation Editor/translation_cs_cz.json index 91a051c6..b3cc982e 100644 --- a/Translation Editor/translation_cs_cz.json +++ b/Translation Editor/translation_cs_cz.json @@ -195,30 +195,30 @@ ], "desc": "Rychlost skrolování popisků podobných tomuto " }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Český" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 78309a03..5cfaab4a 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -195,30 +195,30 @@ ], "desc": "Scrollgeschwindigkeit der Texte" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Deutsch" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_dk.json b/Translation Editor/translation_dk.json index 5180d86a..1d210919 100644 --- a/Translation Editor/translation_dk.json +++ b/Translation Editor/translation_dk.json @@ -195,30 +195,30 @@ ], "desc": "Speed this text scrolls past at" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Dansk" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 449bf552..f84908cd 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -196,29 +196,29 @@ ], "desc": "Speed this text scrolls past at" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } } diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index be3912d4..5a0d2f10 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -150,7 +150,7 @@ "CooldownBlink": { "text": "CLBLNK", "text2": [ - "Temp. en el", + "Parpadea m.", "enfriamiento" ], "desc": "Parpadea la temperatura en el enfriamiento si la punta sigue caliente." @@ -183,7 +183,7 @@ "text": "ADVSLD", "text2": [ "Inf detallada", - "de soldadura" + "del soldadura" ], "desc": "Mostrar información detallada mientras suelda." }, @@ -195,30 +195,30 @@ ], "desc": "Velocidad de desplazamiento del texto." }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Español" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index 85827e04..0e882768 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -196,29 +196,29 @@ ], "desc": "Näiden selitetekstien vieritysnopeus." }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index 6fc3681c..b7b32408 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -195,30 +195,30 @@ ], "desc": "Vitesse de défilement de ce texte en " }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Français" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index a462e48f..13e05bce 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -196,29 +196,29 @@ ], "desc": "Brzina kretanja dugačkih poruka. " }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 86453a45..15c000c0 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -195,30 +195,30 @@ ], "desc": "Szöveg görgetésének gyorsítása" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Magyar" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index 7202ddd1..013b6e37 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -15,7 +15,7 @@ "WarningAdvancedString": "PUNTA CALDA!", "SleepingTipAdvancedString": "Punta:", "IdleTipString": "Punta:", - "IdleSetString": " Im:", + "IdleSetString": "/", "TipDisconnectedString": "PUNTA ASSENTE", "SolderingAdvancedPowerPrompt": "Potenza:", "OffString": "OFF" @@ -34,28 +34,28 @@ "Opzioni", "saldatura" ], - "desc": "Menù impostazioni saldatura" + "desc": "Menù d'impostazioni della modalità Saldatura" }, "PowerSavingMenu": { "text2": [ "Risparmio", "energetico" ], - "desc": "Menù risparmio energetico" + "desc": "Menù d'impostazioni per il risparmio energetico" }, "UIMenu": { "text2": [ "Interfaccia", "utente" ], - "desc": "Menù interfaccia utente" + "desc": "Menù d'impostazioni dell'interfaccia utente" }, "AdvancedMenu": { "text2": [ "Opzioni", "avanzate" ], - "desc": "Menù impostazioni avanzate" + "desc": "Menù d'impostazioni avanzate" } }, "menuOptions": { @@ -65,7 +65,7 @@ "Sorgente", "alimentaz" ], - "desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia " + "desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia " }, "SleepTemperature": { "text": "", @@ -127,7 +127,7 @@ "text": "", "text2": [ "Funzione", - "\"boost\"" + "«Turbo»" ], "desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura" }, @@ -135,7 +135,7 @@ "text": "", "text2": [ "Temp", - "\"boost\"" + "«Turbo»" ], "desc": "Imposta la temperatura della funzione «Turbo»" }, @@ -153,7 +153,7 @@ "Avviso", "punta calda" ], - "desc": "Mostra la temperatura durante il raffreddamento se la punta è ancora calda" + "desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda" }, "TemperatureCalibration": { "text": "", @@ -195,30 +195,30 @@ ], "desc": "Imposta la velocità di scorrimento del testo " }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Italiano" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index d82f1735..2e239a7b 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -2,7 +2,7 @@ "languageCode": "LT", "languageLocalName": "Lietuvių", "messages": { - "SettingsCalibrationDone": "Calibration done!", + "SettingsCalibrationDone": "Kalibracija atlikta!", "SettingsCalibrationWarning": "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!", "SettingsResetWarning": "Ar norite atstatyti nustatymus į numatytas reikšmes?", "UVLOWarningString": "MAŽ VOLT", @@ -196,29 +196,29 @@ ], "desc": "Greitis, kuriuo šis tekstas slenka" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Antgalio", + "modelis" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Antgalio modelio pasirinkimas" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Paprasta", + "kalibracija" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Paprasta kalibracija naudojant karštą vandienį" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Išplėstinė", + "kalibracija" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Išplėstinė kalibracija naudojant termoelementą" } } } \ No newline at end of file diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 80e72b6f..10ccfa81 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -196,29 +196,29 @@ ], "desc": "Snelheid waarmee de tekst scrolt." }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 68e8a585..7b988189 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -196,29 +196,29 @@ ], "desc": "Hastigheten på rulletekst" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json index 290e920e..8fbda0c9 100644 --- a/Translation Editor/translation_pl.json +++ b/Translation Editor/translation_pl.json @@ -195,30 +195,30 @@ ], "desc": "Speed this text scrolls past at" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Polski" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index 34312b56..e3dea0e8 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -195,30 +195,30 @@ ], "desc": "Velocidade que esse texto é exibido" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Portugues" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 458b0c12..46cf63ae 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -195,30 +195,30 @@ ], "desc": "Скорость прокрутки текста" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Русский" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index 647cb44b..4d762ac8 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -195,29 +195,29 @@ ], "desc": "Speed this text scrolls past at" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_sr.json b/Translation Editor/translation_sr.json index 742ef4e0..6ec25887 100644 --- a/Translation Editor/translation_sr.json +++ b/Translation Editor/translation_sr.json @@ -196,29 +196,29 @@ ], "desc": "Brzina kretanja dugačkih poruka " }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index cb157ad3..5c404594 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -138,7 +138,7 @@ "Turbo-", "temp" ], - "desc": "Temperatur i \\\"turbo\\\"-läge" + "desc": "Temperatur i \"turbo\"-läge" }, "AutoStart": { "text": "", @@ -196,29 +196,29 @@ ], "desc": "Hastighet som den här texten rullar i" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } } \ No newline at end of file diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index 2182b6cd..0a008116 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -195,30 +195,30 @@ ], "desc": "Speed this text scrolls past at" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } }, "languageLocalName": "Türk" -} \ No newline at end of file +} diff --git a/Translation Editor/translation_ua.json b/Translation Editor/translation_ua.json index e1fb7846..482aa236 100644 --- a/Translation Editor/translation_ua.json +++ b/Translation Editor/translation_ua.json @@ -196,29 +196,29 @@ ], "desc": "Швидкість прокрутки тексту" }, - "PidSettingsP": { - "text": "PIDP", + "TipModel": { + "text": "TIPMO", "text2": [ - "PID", - "P" + "Tip", + "Model" ], - "desc": "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Tip Model selection" }, - "PidSettingsI": { - "text": "PIDI", + "SimpleCalibrationMode": { + "text": "SMPCAL", "text2": [ - "PID", - "I" + "Simple", + "Calibration" ], - "desc": "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Simple Calibration using Hot water" }, - "PidSettingsD": { - "text": "PIDD", + "AdvancedCalibrationMode": { + "text": "ADVCAL", "text2": [ - "PID", - "D" + "Advanced", + "Calibration" ], - "desc": "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems" + "desc": "Advanced calibration using thermocouple on the tip" } } -} \ No newline at end of file +} diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js index c7889973..65dca0b9 100644 --- a/Translation Editor/translations_def.js +++ b/Translation Editor/translations_def.js @@ -1,6 +1,9 @@ var def = { "messages": [ + { + "id": "SettingsCalibrationDone" + }, { "id": "SettingsCalibrationWarning" }, @@ -206,22 +209,19 @@ var def = "maxLen2": 11 }, { - "id": "PidSettingsP", - "maxLen": 6, - "maxLen2": 11, - "feature": "PIDSETTINGS" + "id": "TipModel", + "maxLen": 8, + "maxLen2": 16 }, { - "id": "PidSettingsI", - "maxLen": 6, - "maxLen2": 11, - "feature": "PIDSETTINGS" + "id": "SimpleCalibrationMode", + "maxLen": 8, + "maxLen2": 16 }, { - "id": "PidSettingsD", - "maxLen": 6, - "maxLen2": 11, - "feature": "PIDSETTINGS" + "id": "AdvancedCalibrationMode", + "maxLen": 8, + "maxLen2": 16 } ] -} \ No newline at end of file +} diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index bd45a25f..ac18ed59 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -26,11 +26,11 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "VIN Calibration. Buttons adjust, long press to exit", /* AdvancedSoldering */ "Display detailed information while soldering", /* ScrollingSpeed */ "Speed this text scrolls past at", - /* Tip Model */"Tip Model selection ", - /* Simple Calibration Mode */"Simple Calibration using Hot water", - /* Advanced Calibration Mode */"Advanced calibration using thermocouple on the tip" - + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; + const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsResetWarning = "Are you sure you want to reset settings to default values?"; @@ -75,9 +75,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Calibrate", "input voltage?" }, /* AdvancedSoldering */ { "Detailed", "solder screen" }, /* ScrollingSpeed */ { "Scrolling", "Speed" }, - /* The Tip model being selected */{"Tip","Model"}, - /* Simple Calibration */{"Simple","Calibration"}, - /* Advanced Calibration */{"Advanced","Calibration"}, + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -117,17 +117,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Калибриране на входното напрежение (VIN). Задръжте бутонa за изход", /* AdvancedSoldering */ "Детайлна информация в работен режим при запояване", /* ScrollingSpeed */ "Скорост на движение на този текст", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Уверете се, че човката на поялника е със стайна температура преди да продължите!"; const char* SettingsResetWarning = "Сигурни ли сте, че искате да върнете фабричните настройки?"; const char* UVLOWarningString = "Ниско V!"; @@ -171,15 +166,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Калибриране", "напрежение?" }, /* AdvancedSoldering */ { "Детайлен", "работен екран" }, /* ScrollingSpeed */ { "Скорост", "на текста" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -219,17 +208,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď.", /* AdvancedSoldering */ "Zobrazit podrobnosti při pájení?", /* ScrollingSpeed */ "Rychlost skrolování popisků podobných tomuto ", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Ujistěte se, že hrot má pokojovou teplotu!"; const char* SettingsResetWarning = "Opravdu chcete resetovat zařízení do továrního nastavení?"; const char* UVLOWarningString = "DC LOW"; @@ -273,15 +257,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibrovat", "vstupní napětí?" }, /* AdvancedSoldering */ { "Podrobnosti", "při pájení" }, /* ScrollingSpeed */ { "Rychlost", "popisků" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -321,17 +299,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen.", /* AdvancedSoldering */ "Detaillierte Anzeige im Lötmodus ", /* ScrollingSpeed */ "Scrollgeschwindigkeit der Texte", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!"; const char* SettingsResetWarning = "Sind Sie sicher, dass Sie alle Werte Zurücksetzen wollen?"; const char* UVLOWarningString = "V niedr."; @@ -375,15 +348,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Eingangsspannung", "kalibrieren?" }, /* AdvancedSoldering */ { "Detaillierte", "Lötansicht" }, /* ScrollingSpeed */ { "Scroll-", "geschw." }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -423,17 +390,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud", /* AdvancedSoldering */ "Vis detialieret information mens der loddes", /* ScrollingSpeed */ "Speed this text scrolls past at", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Sørg for at loddespidsen er ved stuetemperatur, inden du fortsætter!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; const char* UVLOWarningString = "Lav Volt"; @@ -477,15 +439,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "CAL VIN?" }, /* AdvancedSoldering */ { "ADVSLD" }, /* ScrollingSpeed */ { "DESCSP" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -525,17 +481,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Calibración VIN (Voltaje de entrada). Ajuste con ambos botones, pulsación larga para salir.", /* AdvancedSoldering */ "Mostrar información detallada mientras suelda.", /* ScrollingSpeed */ "Velocidad de desplazamiento del texto.", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "¡Asegúrese que la punta esté a temperatura ambiente antes de proceder!"; const char* SettingsResetWarning = "¿Está seguro de volver a estado de fábrica?"; const char* UVLOWarningString = "DC BAJO"; @@ -573,21 +524,15 @@ const char* SettingsShortNames[][2] = { /* BoostEnabled */ { "Boost botón", "activado" }, /* BoostTemperature */ { "Temp en", "Boost" }, /* AutoStart */ { "Soldadura", "al enchufar" }, - /* CooldownBlink */ { "Temp. en el", "enfriamiento" }, + /* CooldownBlink */ { "Parpadea m.", "enfriamiento" }, /* TemperatureCalibration */ { "Calibrar temp", "de la punta" }, /* SettingsReset */ { "Estado de", "fábrica" }, /* VoltageCalibration */ { "Calibrar", "V entrada" }, - /* AdvancedSoldering */ { "Inf detallada", "de soldadura" }, + /* AdvancedSoldering */ { "Inf detallada", "del soldadura" }, /* ScrollingSpeed */ { "Velocidad", "del texto" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -627,17 +572,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan.", /* AdvancedSoldering */ "Näyttää yksityiskohtaisemmat tiedot juotostilassa.", /* ScrollingSpeed */ "Näiden selitetekstien vieritysnopeus.", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Varmista että kärki on huoneenlämpöinen ennen jatkamista!"; const char* SettingsResetWarning = "Haluatko varmasti palauttaa oletusarvot?"; const char* UVLOWarningString = "DC LOW"; @@ -681,15 +621,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibroi", "tulojännite?" }, /* AdvancedSoldering */ { "Tarkempi", "juotosnäyttö" }, /* ScrollingSpeed */ { "Tietojen", "näyttönopeus" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -729,17 +663,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Etalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter", /* AdvancedSoldering */ "Afficher des informations détaillées pendant la soudure", /* ScrollingSpeed */ "Vitesse de défilement de ce texte en ", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Assurez-vous que la panne soit à température ambiante avant de continuer!"; const char* SettingsResetWarning = "Voulez-vous vraiment réinitialiser les paramètres aux valeurs d'usine?"; const char* UVLOWarningString = "DC FAIBLE"; @@ -783,15 +712,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Etalonner", "tension d'entrée" }, /* AdvancedSoldering */ { "Ecran soudure", "détaillé" }, /* ScrollingSpeed */ { "Vitesse de", "défilement" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -831,17 +754,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj.", /* AdvancedSoldering */ "Prikazivanje detaljnih informacija tijekom lemljenja.", /* ScrollingSpeed */ "Brzina kretanja dugačkih poruka. ", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!"; const char* SettingsResetWarning = "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?"; const char* UVLOWarningString = "BATERIJA"; @@ -885,15 +803,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibracija", "napona napajanja" }, /* AdvancedSoldering */ { "Detalji", "pri lemljenju" }, /* ScrollingSpeed */ { "Brzina", "poruka" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -933,17 +845,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "A bemeneti feszültség kalibrálása. Röviden megnyomva állítsa be, hosszan nyomja meg a kilépéshez.", /* AdvancedSoldering */ "Részletes információk megjelenítése forrasztás közben", /* ScrollingSpeed */ "Szöveg görgetésének gyorsítása", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Folytatás előtt győződj meg róla, hogy a hegy szobahőmérsékletű!"; const char* SettingsResetWarning = "Biztosan visszaállítja a beállításokat az alapértelmezett értékekre?"; const char* UVLOWarningString = "DC LOW"; @@ -987,15 +894,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "CAL VIN?" }, /* AdvancedSoldering */ { "ADVSLD" }, /* ScrollingSpeed */ { "DESCSP" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -1018,7 +919,7 @@ const char* SettingsMenuEntriesDescriptions[4] = { // ---- Italiano ---- const char* SettingsDescriptions[] = { - /* PowerSource */ "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia ", + /* PowerSource */ "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia ", /* SleepTemperature */ "Imposta la temperatura da mantenere in modalità Standby <°C/°F>", /* SleepTimeout */ "Imposta il timer per entrare in modalità Standby ", /* ShutdownTimeout */ "Imposta il timer per lo spegnimento ", @@ -1029,23 +930,18 @@ const char* SettingsDescriptions[] = { /* BoostEnabled */ "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura", /* BoostTemperature */ "Imposta la temperatura della funzione «Turbo»", /* AutoStart */ "Attiva automaticamente il saldatore quando viene alimentato ", - /* CooldownBlink */ "Mostra la temperatura durante il raffreddamento se la punta è ancora calda", + /* CooldownBlink */ "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda", /* TemperatureCalibration */ "Calibra le rilevazioni di temperatura", /* SettingsReset */ "Ripristina tutte le impostazioni", /* VoltageCalibration */ "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire", /* AdvancedSoldering */ "Mostra informazioni dettagliate durante la modalità Saldatura", /* ScrollingSpeed */ "Imposta la velocità di scorrimento del testo ", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!"; const char* SettingsResetWarning = "Ripristinare le impostazioni iniziali?"; const char* UVLOWarningString = "DC BASSA"; @@ -1059,7 +955,7 @@ const char* WarningSimpleString = "HOT!"; const char* WarningAdvancedString = "PUNTA CALDA!"; const char* SleepingTipAdvancedString = "Punta:"; const char* IdleTipString = "Punta:"; -const char* IdleSetString = " Im:"; +const char* IdleSetString = "/"; const char* TipDisconnectedString = "PUNTA ASSENTE"; const char* SolderingAdvancedPowerPrompt = "Potenza:"; const char* OffString = "OFF"; @@ -1080,8 +976,8 @@ const char* SettingsShortNames[][2] = { /* TemperatureUnit */ { "Unità di", "temperatura" }, /* AdvancedIdle */ { "Mostra", "dettagli" }, /* DisplayRotation */ { "Orientamento", "display" }, - /* BoostEnabled */ { "Funzione", "\"boost\"" }, - /* BoostTemperature */ { "Temp", "\"boost\"" }, + /* BoostEnabled */ { "Funzione", "«Turbo»" }, + /* BoostTemperature */ { "Temp", "«Turbo»" }, /* AutoStart */ { "Avvio", "automatico" }, /* CooldownBlink */ { "Avviso", "punta calda" }, /* TemperatureCalibration */ { "Calibrazione", "temperatura" }, @@ -1089,15 +985,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Calibrazione", "tensione" }, /* AdvancedSoldering */ { "Dettagli", "saldatura" }, /* ScrollingSpeed */ { "Velocità", "testo" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -1108,10 +998,10 @@ const char* SettingsMenuEntries[4] = { }; const char* SettingsMenuEntriesDescriptions[4] = { - /* SolderingMenu */ "Menù impostazioni saldatura", - /* PowerSavingMenu */ "Menù risparmio energetico", - /* UIMenu */ "Menù interfaccia utente", - /* AdvancedMenu */ "Menù impostazioni avanzate", + /* SolderingMenu */ "Menù d'impostazioni della modalità Saldatura", + /* PowerSavingMenu */ "Menù d'impostazioni per il risparmio energetico", + /* UIMenu */ "Menù d'impostazioni dell'interfaccia utente", + /* AdvancedMenu */ "Menù d'impostazioni avanzate", }; #endif @@ -1137,17 +1027,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte", /* AdvancedSoldering */ "Ar rodyti išsamią informaciją lituojant", /* ScrollingSpeed */ "Greitis, kuriuo šis tekstas slenka", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Antgalio modelio pasirinkimas", + /* SimpleCalibrationMode */ "Paprasta kalibracija naudojant karštą vandienį", + /* AdvancedCalibrationMode */ "Išplėstinė kalibracija naudojant termoelementą", }; +const char* SettingsCalibrationDone = "Kalibracija atlikta!"; const char* SettingsCalibrationWarning = "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!"; const char* SettingsResetWarning = "Ar norite atstatyti nustatymus į numatytas reikšmes?"; const char* UVLOWarningString = "MAŽ VOLT"; @@ -1191,15 +1076,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibruoti", "įvesties įtampą?" }, /* AdvancedSoldering */ { "Detalus lita-", "vimo ekranas" }, /* ScrollingSpeed */ { "Greitas apr", "ašym. slink" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Antgalio", "modelis" }, + /* SimpleCalibrationMode */ { "Paprasta", "kalibracija" }, + /* AdvancedCalibrationMode */ { "Išplėstinė", "kalibracija" }, }; const char* SettingsMenuEntries[4] = { @@ -1239,17 +1118,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen.", /* AdvancedSoldering */ "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm.", /* ScrollingSpeed */ "Snelheid waarmee de tekst scrolt.", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!"; const char* SettingsResetWarning = "Ben je zeker dat je alle instellingen naar de standaardwaardes wilt terugzetten?"; const char* UVLOWarningString = "DC LAAG"; @@ -1293,15 +1167,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Calibreer", "input-voltage?" }, /* AdvancedSoldering */ { "Gedetailleerd", "soldeerscherm" }, /* ScrollingSpeed */ { "Scroll", "snelheid" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -1341,17 +1209,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut", /* AdvancedSoldering */ "Vis detaljert informasjon ved lodding", /* ScrollingSpeed */ "Hastigheten på rulletekst", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Sørg for at loddespissen har romtemperatur før du fortsetter!"; const char* SettingsResetWarning = "Er du sikker på at du vil tilbakestille til standardinnstillinger?"; const char* UVLOWarningString = "Lavspenn"; @@ -1395,15 +1258,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "KalSpIn?" }, /* AdvancedSoldering */ { "AvLdSk" }, /* ScrollingSpeed */ { "RullHa" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -1443,17 +1300,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść.", /* AdvancedSoldering */ "Wyświetl szczegółowe informacje podczas lutowania ", /* ScrollingSpeed */ "Speed this text scrolls past at", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Przed kontynuowaniem upewnij się, że końcówka osiągnela temperature pokojowa!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; const char* UVLOWarningString = "DC LOW"; @@ -1497,15 +1349,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "CAL VIN?" }, /* AdvancedSoldering */ { "ADVSLD" }, /* ScrollingSpeed */ { "DESCSP" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -1545,17 +1391,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha presionado para sair", /* AdvancedSoldering */ "Exibe informações avançadas durante o uso", /* ScrollingSpeed */ "Velocidade que esse texto é exibido", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "A ponta deve estar em temperatura ambiente antes de continuar!"; const char* SettingsResetWarning = "Resetar para ajustes de fábrica?"; const char* UVLOWarningString = "DC BAIXO"; @@ -1599,15 +1440,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Calibrar", "tensão" }, /* AdvancedSoldering */ { "Tela trabalho", "avançada" }, /* ScrollingSpeed */ { "Velocidade", "texto ajuda" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -1647,17 +1482,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить.", /* AdvancedSoldering */ "Показывать детальную информацию при пайке.", /* ScrollingSpeed */ "Скорость прокрутки текста", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!"; const char* SettingsResetWarning = "Вы действительно хотите сбросить настройки до значений по умолчанию?"; const char* UVLOWarningString = "АККУМ--"; @@ -1701,15 +1531,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Калибровка", "напряжения" }, /* AdvancedSoldering */ { "Подробный ре-", "жим пайки" }, /* ScrollingSpeed */ { "Скорость", "текста" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -1749,17 +1573,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibracia VIN. Kratke stlacenie meni nastavenie, dlhe stlacenie pre navrat", /* AdvancedSoldering */ "Zobrazenie detailov pocas spajkovania ", /* ScrollingSpeed */ "Speed this text scrolls past at", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Najprv sa prosim uistite, ze hrot ma izbovu teplotu!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; const char* UVLOWarningString = "DC LOW"; @@ -1803,15 +1622,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "CAL VIN?" }, /* AdvancedSoldering */ { "ADVSLD" }, /* ScrollingSpeed */ { "DESCSP" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -1851,17 +1664,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Kalibracija ulaznog napona. Podešavanje tastera, dugački pritisak za kraj.", /* AdvancedSoldering */ "Prikazivanje detaljnih informacija tokom lemljenja.", /* ScrollingSpeed */ "Brzina kretanja dugačkih poruka ", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Proverite da li je vrh ohlađen na sobnu temperaturu pre nego što nastavite!"; const char* SettingsResetWarning = "Jeste li sigurni da želite da vratite sva podešavanja na fabričke vrednosti?"; const char* UVLOWarningString = "BATERIJA"; @@ -1905,15 +1713,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibracija", "napona napajanja" }, /* AdvancedSoldering */ { "Detalji", "pri lemljenju" }, /* ScrollingSpeed */ { "Brzina", "poruka" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -1945,7 +1747,7 @@ const char* SettingsDescriptions[] = { /* AdvancedIdle */ "Visa detaljerad information i mindre typsnitt när inaktiv.", /* DisplayRotation */ "Visningsläge ", /* BoostEnabled */ "Aktivera främre knappen för turboläge (temperaturhöjning) vid lödning", - /* BoostTemperature */ "Temperatur i \\"turbo\\"-läge", + /* BoostTemperature */ "Temperatur i \"turbo\"-läge", /* AutoStart */ "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av", /* CooldownBlink */ "Blinka temperaturen medan spetsen kyls av och fortfarande är varm.", /* TemperatureCalibration */ "Kalibrera spets-kompensation.", @@ -1953,17 +1755,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Inspänningskalibrering. Knapparna justerar, håll inne för avslut", /* AdvancedSoldering */ "Visa detaljerad information vid lödning", /* ScrollingSpeed */ "Hastighet som den här texten rullar i", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsResetWarning = "Are you sure you want to reset settings to default values?"; const char* UVLOWarningString = "DC LÅG"; @@ -2007,15 +1804,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Kalibrera", "inspänning?" }, /* AdvancedSoldering */ { "Detaljerad", "lödng.skärm" }, /* ScrollingSpeed */ { "Beskrivning", "rullhast." }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = { @@ -2055,17 +1846,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "VIN Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas.", /* AdvancedSoldering */ "Lehimleme yaparken detaylı bilgi göster", /* ScrollingSpeed */ "Speed this text scrolls past at", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; const char* UVLOWarningString = "DC LOW"; @@ -2109,15 +1895,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "CAL VIN?" }, /* AdvancedSoldering */ { "ADVSLD" }, /* ScrollingSpeed */ { "DESCSP" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PIDP" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PIDI" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PIDD" }, -#endif + /* TipModel */ { "TIPMO" }, + /* SimpleCalibrationMode */ { "SMPCAL" }, + /* AdvancedCalibrationMode */ { "ADVCAL" }, }; const char* SettingsMenuEntries[4] = { @@ -2157,17 +1937,12 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити.", /* AdvancedSoldering */ "Показувати детальну інформацію при пайці.", /* ScrollingSpeed */ "Швидкість прокрутки тексту", -#ifdef PIDSETTINGS - /* PidSettingsP */ "PID P term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ "PID I term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ "PID D term. Inverse values! This acts as a divisor. So Larger numbers == typically smaller in other systems", -#endif + /* TipModel */ "Tip Model selection", + /* SimpleCalibrationMode */ "Simple Calibration using Hot water", + /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", }; +const char* SettingsCalibrationDone = "Calibration done!"; const char* SettingsCalibrationWarning = "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!"; const char* SettingsResetWarning = "Ви дійсно хочете скинути налаштування до значень за замовчуванням?"; const char* UVLOWarningString = "АККУМ--"; @@ -2211,15 +1986,9 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Калібровка", "напруга" }, /* AdvancedSoldering */ { "Детальний ре-", "жим пайки" }, /* ScrollingSpeed */ { "Швидкість", "тексту" }, -#ifdef PIDSETTINGS - /* PidSettingsP */ { "PID", "P" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsI */ { "PID", "I" }, -#endif -#ifdef PIDSETTINGS - /* PidSettingsD */ { "PID", "D" }, -#endif + /* TipModel */ { "Tip", "Model" }, + /* SimpleCalibrationMode */ { "Simple", "Calibration" }, + /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, }; const char* SettingsMenuEntries[4] = {