From 4d66df5b1508dbfc791dea1230078ccc2c98553d Mon Sep 17 00:00:00 2001 From: Julius Vitkauskas Date: Fri, 19 Oct 2018 05:48:46 +0300 Subject: [PATCH 01/55] Fix translations (#379) * Fix translations * Update Italian translation --- Translation Editor/translation_bg.json | 8 + Translation Editor/translation_cs_cz.json | 8 + Translation Editor/translation_de.json | 8 + Translation Editor/translation_dk.json | 8 + Translation Editor/translation_en.json | 4 +- 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_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_sr.json | 8 + Translation Editor/translation_sv.json | 8 + Translation Editor/translation_tr.json | 8 + Translation Editor/translation_ua.json | 8 + workspace/TS100/src/Translation.cpp | 395 +++++++++++++++------- 23 files changed, 452 insertions(+), 115 deletions(-) diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index 0dcc2885..e50b9102 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "български" diff --git a/Translation Editor/translation_cs_cz.json b/Translation Editor/translation_cs_cz.json index b3cc982e..5e985e5f 100644 --- a/Translation Editor/translation_cs_cz.json +++ b/Translation Editor/translation_cs_cz.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Český" diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 5cfaab4a..65e9563f 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Deutsch" diff --git a/Translation Editor/translation_dk.json b/Translation Editor/translation_dk.json index 1d210919..22bdfa34 100644 --- a/Translation Editor/translation_dk.json +++ b/Translation Editor/translation_dk.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Dansk" diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index 68b95585..6863340d 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -219,7 +219,7 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" - } + }, "PowerInput": { "text": "PWRW", "text2": [ @@ -227,6 +227,6 @@ "Wattage" ], "desc": "Power Wattage of the power adapter used" - }, + } } } \ No newline at end of file diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 5a0d2f10..637304d2 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Español" diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index 0e882768..1215d8a4 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index b7b32408..eafa57be 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Français" diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index 13e05bce..7b5f8d75 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 15c000c0..20ea75a3 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Magyar" diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index 90eb6026..afcdea9c 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -218,6 +218,14 @@ "avanzata" ], "desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Potenza", + "alimentaz" + ], + "desc": "Imposta la potenza dell'alimentatore in uso" } }, "languageLocalName": "Italiano" diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index 2e239a7b..3f146bb5 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -219,6 +219,14 @@ "kalibracija" ], "desc": "Išplėstinė kalibracija naudojant termoelementą" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Galia", + "vatais" + ], + "desc": "Maitinimo bloko galia vatais" } } } \ No newline at end of file diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 10ccfa81..110a9d4d 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 7b988189..a56d32e0 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json index 8fbda0c9..5dd3ccd9 100644 --- a/Translation Editor/translation_pl.json +++ b/Translation Editor/translation_pl.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Polski" diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index e3dea0e8..42ee396c 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Portugues" diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 46cf63ae..2a9d8583 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Русский" diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index 4d762ac8..95f2b3c1 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_sr.json b/Translation Editor/translation_sr.json index 6ec25887..8f388fe7 100644 --- a/Translation Editor/translation_sr.json +++ b/Translation Editor/translation_sr.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index 5c404594..cdb9fbf1 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } \ No newline at end of file diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index 0a008116..75f160bc 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -218,6 +218,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } }, "languageLocalName": "Türk" diff --git a/Translation Editor/translation_ua.json b/Translation Editor/translation_ua.json index 482aa236..870c98d6 100644 --- a/Translation Editor/translation_ua.json +++ b/Translation Editor/translation_ua.json @@ -219,6 +219,14 @@ "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" + }, + "PowerInput": { + "text": "PWRW", + "text2": [ + "Power", + "Wattage" + ], + "desc": "Power Wattage of the power adapter used" } } } diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index f39785b8..1459baf9 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -1,5 +1,4 @@ -// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT -// EDIT. +// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT. #include "Translation.h" #ifndef LANG @@ -30,7 +29,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", - /* Power Input */ "The power rating of the power adapter", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -80,13 +79,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldering\nSettings", - /* PowerSavingMenu */ "Sleep\nModes", - /* UIMenu */ "User\nInterface", - /* AdvancedMenu */ "Advanced\nOptions", + /* SolderingMenu */ "Soldering\nSettings", + /* PowerSavingMenu */ "Sleep\nModes", + /* UIMenu */ "User\nInterface", + /* AdvancedMenu */ "Advanced\nOptions", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Soldering settings", + /* PowerSavingMenu */ "Power saving settings", + /* UIMenu */ "User interface settings", + /* AdvancedMenu */ "Advanced options", }; #endif @@ -115,6 +122,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -164,20 +172,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Поялник\nНастройки", - /* PowerSavingMenu */ "Режими\nНастройки", - /* UIMenu */ "Интерфейс\nНастройки", - /* AdvancedMenu */ "Разширени\nНастройки", + /* SolderingMenu */ "Поялник\nНастройки", + /* PowerSavingMenu */ "Режими\nНастройки", + /* UIMenu */ "Интерфейс\nНастройки", + /* AdvancedMenu */ "Разширени\nНастройки", }; const char* SettingsMenuEntriesDescriptions[4] = { - /* SolderingMenu */ "Настройки на поялника", - /* PowerSavingMenu */ "Настройки енергоспестяване", - /* UIMenu */ "Настройки на интерфейса", - /* AdvancedMenu */ "Допълнителни настройки", + /* SolderingMenu */ "Настройки на поялника", + /* PowerSavingMenu */ "Настройки енергоспестяване", + /* UIMenu */ "Настройки на интерфейса", + /* AdvancedMenu */ "Допълнителни настройки", }; #endif @@ -206,6 +215,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -255,13 +265,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Pájecí\nnastavení", - /* PowerSavingMenu */ "Režim\nspánku", - /* UIMenu */ "Uživatelské\nrozhraní", - /* AdvancedMenu */ "Pokročilé\nvolby", + /* SolderingMenu */ "Pájecí\nnastavení", + /* PowerSavingMenu */ "Režim\nspánku", + /* UIMenu */ "Uživatelské\nrozhraní", + /* AdvancedMenu */ "Pokročilé\nvolby", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Nastavení pájení (boost, auto start...)", + /* PowerSavingMenu */ "Nastavení režimu spánku, automatického vypnutí...", + /* UIMenu */ "Nastavení uživatelského rozhraní.", + /* AdvancedMenu */ "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)", }; #endif @@ -290,6 +308,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -339,20 +358,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Löt-\neinstellungen", - /* PowerSavingMenu */ "Schlaf-\nmodus", - /* UIMenu */ "Menü-\neinstellungen", - /* AdvancedMenu */ "Erweiterte\nEinstellungen", + /* SolderingMenu */ "Löt-\neinstellungen", + /* PowerSavingMenu */ "Schlaf-\nmodus", + /* UIMenu */ "Menü-\neinstellungen", + /* AdvancedMenu */ "Erweiterte\nEinstellungen", }; const char* SettingsMenuEntriesDescriptions[4] = { - /* SolderingMenu */ "Löteinstellungen", - /* PowerSavingMenu */ "Energiespareinstellungen", - /* UIMenu */ "Menüeinstellungen", - /* AdvancedMenu */ "Erweiterte Einstellungen", + /* SolderingMenu */ "Löteinstellungen", + /* PowerSavingMenu */ "Energiespareinstellungen", + /* UIMenu */ "Menüeinstellungen", + /* AdvancedMenu */ "Erweiterte Einstellungen", }; #endif @@ -381,6 +401,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -430,20 +451,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldering\nSettings", - /* PowerSavingMenu */ "Sleep\nModes", - /* UIMenu */ "User\nInterface", - /* AdvancedMenu */ "Advanced\nOptions", + /* SolderingMenu */ "Soldering\nSettings", + /* PowerSavingMenu */ "Sleep\nModes", + /* UIMenu */ "User\nInterface", + /* AdvancedMenu */ "Advanced\nOptions", }; const char* SettingsMenuEntriesDescriptions[4] = { - /* SolderingMenu */ "Soldering settings", - /* PowerSavingMenu */ "Power Saving Settings", - /* UIMenu */ "User Interface settings", - /* AdvancedMenu */ "Advanced options", + /* SolderingMenu */ "Soldering settings", + /* PowerSavingMenu */ "Power Saving Settings", + /* UIMenu */ "User Interface settings", + /* AdvancedMenu */ "Advanced options", }; #endif @@ -472,6 +494,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -521,13 +544,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Opciones de\nSoldadura", - /* PowerSavingMenu */ "Modos de\nReposo", - /* UIMenu */ "Interfaz\nde Usuario", - /* AdvancedMenu */ "Opciones\nAvanzadas", + /* SolderingMenu */ "Opciones de\nSoldadura", + /* PowerSavingMenu */ "Modos de\nReposo", + /* UIMenu */ "Interfaz\nde Usuario", + /* AdvancedMenu */ "Opciones\nAvanzadas", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Opciones de Soldadura", + /* PowerSavingMenu */ "Opciones de ahorro energético", + /* UIMenu */ "Opciones de interfaz de usuario", + /* AdvancedMenu */ "Opciones avanzadas", }; #endif @@ -556,6 +587,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -605,13 +637,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Juotos-\nasetukset", - /* PowerSavingMenu */ "Lepotilan\nasetukset", - /* UIMenu */ "Käyttö-\nliittymä", - /* AdvancedMenu */ "Lisä-\nasetukset", + /* SolderingMenu */ "Juotos-\nasetukset", + /* PowerSavingMenu */ "Lepotilan\nasetukset", + /* UIMenu */ "Käyttö-\nliittymä", + /* AdvancedMenu */ "Lisä-\nasetukset", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Juotosasetukset", + /* PowerSavingMenu */ "Virransäästöasetukset", + /* UIMenu */ "Käyttöliittymän asetukset", + /* AdvancedMenu */ "Lisäasetukset", }; #endif @@ -640,6 +680,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -689,13 +730,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soudure\nParamètres", - /* PowerSavingMenu */ "Mode\nVeille", - /* UIMenu */ "Interface\nUtilisateur", - /* AdvancedMenu */ "Options\nAdvanced", + /* SolderingMenu */ "Soudure\nParamètres", + /* PowerSavingMenu */ "Mode\nVeille", + /* UIMenu */ "Interface\nUtilisateur", + /* AdvancedMenu */ "Options\nAdvanced", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Paramètres de soudage", + /* PowerSavingMenu */ "Paramètres d'économie d'énergie", + /* UIMenu */ "Paramètres de l'interface utilisateur", + /* AdvancedMenu */ "Options avancées", }; #endif @@ -724,6 +773,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -773,13 +823,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Postavke\nlemljenja", - /* PowerSavingMenu */ "Ušteda\nenergije", - /* UIMenu */ "Korisničko\nsučelje", - /* AdvancedMenu */ "Napredne\nopcije", + /* SolderingMenu */ "Postavke\nlemljenja", + /* PowerSavingMenu */ "Ušteda\nenergije", + /* UIMenu */ "Korisničko\nsučelje", + /* AdvancedMenu */ "Napredne\nopcije", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Postavke pri lemljenju", + /* PowerSavingMenu */ "Postavke spavanja i štednje energije", + /* UIMenu */ "Postavke korisničkog sučelja", + /* AdvancedMenu */ "Upravljanje naprednim opcijama", }; #endif @@ -808,6 +866,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -857,13 +916,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Forrasztás\nBeállítások", - /* PowerSavingMenu */ "Alvás\nMódok", - /* UIMenu */ "Felhasználó\nfelület", - /* AdvancedMenu */ "Speciális\nbeállítások", + /* SolderingMenu */ "Forrasztás\nBeállítások", + /* PowerSavingMenu */ "Alvás\nMódok", + /* UIMenu */ "Felhasználó\nfelület", + /* AdvancedMenu */ "Speciális\nbeállítások", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Forrasztási beállítások", + /* PowerSavingMenu */ "Energiatakarékossági beállítások", + /* UIMenu */ "Felhasználói felület beállításai", + /* AdvancedMenu */ "Speciális beállítások", }; #endif @@ -889,12 +956,13 @@ const char* SettingsDescriptions[] = { /* 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 ", - /* TipModel */ "Tip Model selection", - /* SimpleCalibrationMode */ "Simple Calibration using Hot water", - /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* TipModel */ "Seleziona il modello della punta in uso", + /* SimpleCalibrationMode */ "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda", + /* AdvancedCalibrationMode */ "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta", + /* PowerInput */ "Power Wattage of the power adapter used", }; -const char* SettingsCalibrationDone = "Calibration done!"; +const char* SettingsCalibrationDone = "Calibrazione effettuata"; 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"; @@ -938,9 +1006,10 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Calibrazione", "tensione" }, /* AdvancedSoldering */ { "Dettagli", "saldatura" }, /* ScrollingSpeed */ { "Velocità", "testo" }, - /* TipModel */ { "Tip", "Model" }, - /* SimpleCalibrationMode */ { "Simple", "Calibration" }, - /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* TipModel */ { "Modello", "della punta" }, + /* SimpleCalibrationMode */ { "Calibrazione", "semplice" }, + /* AdvancedCalibrationMode */ { "Calibrazione", "avanzata" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { @@ -983,6 +1052,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Antgalio modelio pasirinkimas", /* SimpleCalibrationMode */ "Paprasta kalibracija naudojant karštą vandienį", /* AdvancedCalibrationMode */ "Išplėstinė kalibracija naudojant termoelementą", + /* PowerInput */ "Maitinimo bloko galia vatais", }; const char* SettingsCalibrationDone = "Kalibracija atlikta!"; @@ -1032,13 +1102,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Antgalio", "modelis" }, /* SimpleCalibrationMode */ { "Paprasta", "kalibracija" }, /* AdvancedCalibrationMode */ { "Išplėstinė", "kalibracija" }, + /* PowerInput */ { "Galia", "vatais" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Litavimo\nnustatymai", - /* PowerSavingMenu */ "Miego\nrežimai", - /* UIMenu */ "Naudotojo\nsąsaja", - /* AdvancedMenu */ "Išplėstin.\nnustatymai", + /* SolderingMenu */ "Litavimo\nnustatymai", + /* PowerSavingMenu */ "Miego\nrežimai", + /* UIMenu */ "Naudotojo\nsąsaja", + /* AdvancedMenu */ "Išplėstin.\nnustatymai", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Litavimo nustatymai", + /* PowerSavingMenu */ "Energijos vartojimo nustatymai", + /* UIMenu */ "Naudotojo sąsajos nustatymai", + /* AdvancedMenu */ "Išplėstiniai nustatymai", }; #endif @@ -1067,6 +1145,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1116,13 +1195,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldeer\nInstellingen", - /* PowerSavingMenu */ "Slaap\nModes", - /* UIMenu */ "Gebruikers-\nInterface", - /* AdvancedMenu */ "geavanceerde\nInstellingen", + /* SolderingMenu */ "Soldeer\nInstellingen", + /* PowerSavingMenu */ "Slaap\nModes", + /* UIMenu */ "Gebruikers-\nInterface", + /* AdvancedMenu */ "geavanceerde\nInstellingen", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Soldeerinstellingen", + /* PowerSavingMenu */ "Batterijbesparingsinstellingen", + /* UIMenu */ "Gebruikersinterface Instellingen", + /* AdvancedMenu */ "geavanceerde Instellingen", }; #endif @@ -1151,6 +1238,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1200,13 +1288,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Lodde-\ninnst.", - /* PowerSavingMenu */ "Dvale-\ninnst.", - /* UIMenu */ "Bruker-\ngrensesn.", - /* AdvancedMenu */ "Avanserte\nvalg", + /* SolderingMenu */ "Lodde-\ninnst.", + /* PowerSavingMenu */ "Dvale-\ninnst.", + /* UIMenu */ "Bruker-\ngrensesn.", + /* AdvancedMenu */ "Avanserte\nvalg", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Loddeinnstillinger", + /* PowerSavingMenu */ "Dvaleinnstillinger", + /* UIMenu */ "Brukergrensesnitt-innstillinger", + /* AdvancedMenu */ "Avanserte valg", }; #endif @@ -1235,6 +1331,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1284,13 +1381,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldering\nSettings", - /* PowerSavingMenu */ "Sleep\nModes", - /* UIMenu */ "User\nInterface", - /* AdvancedMenu */ "Advanced\nOptions", + /* SolderingMenu */ "Soldering\nSettings", + /* PowerSavingMenu */ "Sleep\nModes", + /* UIMenu */ "User\nInterface", + /* AdvancedMenu */ "Advanced\nOptions", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Soldering settings", + /* PowerSavingMenu */ "Power Saving Settings", + /* UIMenu */ "User Interface settings", + /* AdvancedMenu */ "Advanced options", }; #endif @@ -1319,6 +1424,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1368,13 +1474,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Configurações\nSolda", - /* PowerSavingMenu */ "Modos\nRepouso", - /* UIMenu */ "Interface\nUsuário", - /* AdvancedMenu */ "Menu\nAvançado", + /* SolderingMenu */ "Configurações\nSolda", + /* PowerSavingMenu */ "Modos\nRepouso", + /* UIMenu */ "Interface\nUsuário", + /* AdvancedMenu */ "Menu\nAvançado", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Configurações de soldagem", + /* PowerSavingMenu */ "Configurações de economia de energia", + /* UIMenu */ "Configurações da interface do usuário", + /* AdvancedMenu */ "Opções avançadas", }; #endif @@ -1400,12 +1514,13 @@ const char* SettingsDescriptions[] = { /* VoltageCalibration */ "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить.", /* AdvancedSoldering */ "Показывать детальную информацию при пайке.", /* ScrollingSpeed */ "Скорость прокрутки текста", - /* TipModel */ "Tip Model selection", - /* SimpleCalibrationMode */ "Simple Calibration using Hot water", - /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* TipModel */ "Выбор модели жало", + /* SimpleCalibrationMode */ "Простая калибровка с использованием горячей воды", + /* AdvancedCalibrationMode */ "Калибровка с помощью термопары", + /* PowerInput */ "Power Wattage of the power adapter used", }; -const char* SettingsCalibrationDone = "Calibration done!"; +const char* SettingsCalibrationDone = "Калибровка выполнена!"; const char* SettingsCalibrationWarning = "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!"; const char* SettingsResetWarning = "Вы действительно хотите сбросить настройки до значений по умолчанию?"; const char* UVLOWarningString = "АККУМ--"; @@ -1449,16 +1564,24 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Калибровка", "напряжения" }, /* AdvancedSoldering */ { "Подробный ре-", "жим пайки" }, /* ScrollingSpeed */ { "Скорость", "текста" }, - /* TipModel */ { "Tip", "Model" }, - /* SimpleCalibrationMode */ { "Simple", "Calibration" }, - /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* TipModel */ { "Модель", "жало" }, + /* SimpleCalibrationMode */ { "Простая", "калибровка" }, + /* AdvancedCalibrationMode */ { "Подробная", "калибровка" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Параметры\nпайки", - /* PowerSavingMenu */ "Режим\nсна", - /* UIMenu */ "Пользовател\nинтерфейс", - /* AdvancedMenu */ "Дополнител.\nпараметры", + /* SolderingMenu */ "Параметры\nпайки", + /* PowerSavingMenu */ "Режим\nсна", + /* UIMenu */ "Пользовател\nинтерфейс", + /* AdvancedMenu */ "Дополнител.\nпараметры", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Параметры пайки", + /* PowerSavingMenu */ "Параметры экономии энергии", + /* UIMenu */ "Параметры пользовательского интерфейса", + /* AdvancedMenu */ "Дополнительные параметры", }; #endif @@ -1487,6 +1610,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1536,13 +1660,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldering\nSettings", - /* PowerSavingMenu */ "Sleep\nModes", - /* UIMenu */ "User\nInterface", - /* AdvancedMenu */ "Advanced\nOptions", + /* SolderingMenu */ "Soldering\nSettings", + /* PowerSavingMenu */ "Sleep\nModes", + /* UIMenu */ "User\nInterface", + /* AdvancedMenu */ "Advanced\nOptions", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Soldering settings", + /* PowerSavingMenu */ "Power Saving Settings", + /* UIMenu */ "User Interface settings", + /* AdvancedMenu */ "Advanced options", }; #endif @@ -1571,6 +1703,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1620,13 +1753,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Postavke\nlemljenja", - /* PowerSavingMenu */ "Ušteda\nenergije", - /* UIMenu */ "Korisničke\nopcije", - /* AdvancedMenu */ "Napredne\nopcije", + /* SolderingMenu */ "Postavke\nlemljenja", + /* PowerSavingMenu */ "Ušteda\nenergije", + /* UIMenu */ "Korisničke\nopcije", + /* AdvancedMenu */ "Napredne\nopcije", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Postavke pri lemljenju", + /* PowerSavingMenu */ "Postavke spavanja i štednje energije", + /* UIMenu */ "Postavke korisničkih opcija", + /* AdvancedMenu */ "Upravljanje naprednim opcijama", }; #endif @@ -1655,6 +1796,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1704,13 +1846,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Lödnings-\ninställningar", - /* PowerSavingMenu */ "Vilo-\nlägen", - /* UIMenu */ "Användar-\ngränssnitt", - /* AdvancedMenu */ "Avancerade\nalternativ", + /* SolderingMenu */ "Lödnings-\ninställningar", + /* PowerSavingMenu */ "Vilo-\nlägen", + /* UIMenu */ "Användar-\ngränssnitt", + /* AdvancedMenu */ "Avancerade\nalternativ", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Lödningsinställningar", + /* PowerSavingMenu */ "Viloläges-inställningar", + /* UIMenu */ "Användargränssnitts-inställningar", + /* AdvancedMenu */ "Avancerade alternativ", }; #endif @@ -1739,6 +1889,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1788,13 +1939,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "TIPMO" }, /* SimpleCalibrationMode */ { "SMPCAL" }, /* AdvancedCalibrationMode */ { "ADVCAL" }, + /* PowerInput */ { "PWRW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Soldering\nSettings", - /* PowerSavingMenu */ "Sleep\nModes", - /* UIMenu */ "User\nInterface", - /* AdvancedMenu */ "Advanced\nOptions", + /* SolderingMenu */ "Soldering\nSettings", + /* PowerSavingMenu */ "Sleep\nModes", + /* UIMenu */ "User\nInterface", + /* AdvancedMenu */ "Advanced\nOptions", +}; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Soldering settings", + /* PowerSavingMenu */ "Power Saving Settings", + /* UIMenu */ "User Interface settings", + /* AdvancedMenu */ "Advanced options", }; #endif @@ -1823,6 +1982,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Tip Model selection", /* SimpleCalibrationMode */ "Simple Calibration using Hot water", /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", + /* PowerInput */ "Power Wattage of the power adapter used", }; const char* SettingsCalibrationDone = "Calibration done!"; @@ -1872,12 +2032,21 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Tip", "Model" }, /* SimpleCalibrationMode */ { "Simple", "Calibration" }, /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, + /* PowerInput */ { "Power", "Wattage" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Пайка\n", - /* PowerSavingMenu */ "Сон\n", - /* UIMenu */ "Інтерфейс\n", - /* AdvancedMenu */ "Інші\n", + /* SolderingMenu */ "Пайка\n", + /* PowerSavingMenu */ "Сон\n", + /* UIMenu */ "Інтерфейс\n", + /* AdvancedMenu */ "Інші\n", }; + +const char* SettingsMenuEntriesDescriptions[4] = { + /* SolderingMenu */ "Налаштування для режиму пайки. Діють при включеному жалі.", + /* PowerSavingMenu */ "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло.", + /* UIMenu */ "Користувальницький інтерфейс.", + /* AdvancedMenu */ "Розширені налаштування. Додаткові зручності.", +}; + #endif From 0165e6be51cabd885e2fb5502d90374f56e80a91 Mon Sep 17 00:00:00 2001 From: "Marcus \"Chaosblog" Date: Tue, 23 Oct 2018 08:16:48 +0200 Subject: [PATCH 02/55] updated german translation (#380) --- Translation Editor/translation_de.json | 30 +++++++++++++------------- workspace/TS100/src/Translation.cpp | 22 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index 65e9563f..bd41a0d4 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -1,9 +1,9 @@ { "languageCode": "DE", "messages": { - "SettingsCalibrationDone": "Calibration done!", + "SettingsCalibrationDone": "Kalibrierung abgeschlossen!", "SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!", - "SettingsResetWarning": "Sind Sie sicher, dass Sie alle Werte Zurücksetzen wollen?", + "SettingsResetWarning": "Sind Sie sicher, dass Sie alle Werte zurücksetzen wollen?", "UVLOWarningString": "V niedr.", "UndervoltageString": "Unterspannung", "InputVoltageString": "V Eingang: ", @@ -18,7 +18,7 @@ "IdleSetString": " Soll:", "TipDisconnectedString": "Spitze fehlt", "SolderingAdvancedPowerPrompt": "Leistung: ", - "OffString": "Off" + "OffString": "Aus" }, "characters": { "SettingRightChar": "R", @@ -198,34 +198,34 @@ "TipModel": { "text": "TIPMO", "text2": [ - "Tip", - "Model" + "Löt-", + "spitze" ], - "desc": "Tip Model selection" + "desc": "Auswahl der Lötspitze" }, "SimpleCalibrationMode": { "text": "SMPCAL", "text2": [ - "Simple", - "Calibration" + "Einfache", + "Kalibrierung" ], - "desc": "Simple Calibration using Hot water" + "desc": "Einfache Kalibrierung mittels heißem Wasser" }, "AdvancedCalibrationMode": { "text": "ADVCAL", "text2": [ - "Advanced", - "Calibration" + "Erweiterte", + "Kalibrierung" ], - "desc": "Advanced calibration using thermocouple on the tip" + "desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze" }, "PowerInput": { "text": "PWRW", "text2": [ - "Power", - "Wattage" + "Leistungs-", + "aufnahme" ], - "desc": "Power Wattage of the power adapter used" + "desc": "Leistungsaufnahme der verwendeten Spannungsversorgung" } }, "languageLocalName": "Deutsch" diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index 1459baf9..f9bfe69a 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -305,15 +305,15 @@ 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", - /* TipModel */ "Tip Model selection", - /* SimpleCalibrationMode */ "Simple Calibration using Hot water", - /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", - /* PowerInput */ "Power Wattage of the power adapter used", + /* TipModel */ "Auswahl der Lötspitze", + /* SimpleCalibrationMode */ "Einfache Kalibrierung mittels heißem Wasser", + /* AdvancedCalibrationMode */ "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze", + /* PowerInput */ "Leistungsaufnahme der verwendeten Spannungsversorgung", }; -const char* SettingsCalibrationDone = "Calibration done!"; +const char* SettingsCalibrationDone = "Kalibrierung abgeschlossen!"; 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* SettingsResetWarning = "Sind Sie sicher, dass Sie alle Werte zurücksetzen wollen?"; const char* UVLOWarningString = "V niedr."; const char* UndervoltageString = "Unterspannung"; const char* InputVoltageString = "V Eingang: "; @@ -328,7 +328,7 @@ const char* IdleTipString = "Ist:"; const char* IdleSetString = " Soll:"; const char* TipDisconnectedString = "Spitze fehlt"; const char* SolderingAdvancedPowerPrompt = "Leistung: "; -const char* OffString = "Off"; +const char* OffString = "Aus"; const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -355,10 +355,10 @@ const char* SettingsShortNames[][2] = { /* VoltageCalibration */ { "Eingangsspannung", "kalibrieren?" }, /* AdvancedSoldering */ { "Detaillierte", "Lötansicht" }, /* ScrollingSpeed */ { "Scroll-", "geschw." }, - /* TipModel */ { "Tip", "Model" }, - /* SimpleCalibrationMode */ { "Simple", "Calibration" }, - /* AdvancedCalibrationMode */ { "Advanced", "Calibration" }, - /* PowerInput */ { "Power", "Wattage" }, + /* TipModel */ { "Löt-", "spitze" }, + /* SimpleCalibrationMode */ { "Einfache", "Kalibrierung" }, + /* AdvancedCalibrationMode */ { "Erweiterte", "Kalibrierung" }, + /* PowerInput */ { "Leistungs-", "aufnahme" }, }; const char* SettingsMenuEntries[4] = { From d0368a3de6e165044bb130e3a91cb161f9797bae Mon Sep 17 00:00:00 2001 From: David Hilton Date: Wed, 24 Oct 2018 21:47:10 -0600 Subject: [PATCH 03/55] basic instructions on using the html Translation Editor (#389) --- Translation.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Translation.md b/Translation.md index dde8740e..6a63a2c8 100644 --- a/Translation.md +++ b/Translation.md @@ -1,5 +1,6 @@ # Translation -If you would like to contribute a translation, look at the file `translation.c` in the source code. -Currently translations are compiled in at compile time with #defines (nothing complex). -So all you need to do is add another section formatted like the english one that is there and either create a pull request or a github issue for inclusion. -If the glyphs required already exist in the fonts then support should be quick. Otherwise it may take longer for the fonts to be created. \ No newline at end of file +If you would like to contribute a translation, use the [Translation Editor](http://htmlpreview.github.io/?https://github.com/Ralim/ts100/blob/master/Translation%20Editor/TranslationEditor.html). + +[Open a reference language file and optionally a target language file](https://github.com/Ralim/ts100/tree/master/Translation%20Editor). + +You can create an issue with your updated json translation, or make your own pull request. If you make a pull request, also run `python3 make_translation.py` to regenerate the source file. From 8d66a07a42c2a1bfffbc434cf02a05eefbfa1407 Mon Sep 17 00:00:00 2001 From: Balazs Keresztury Date: Fri, 26 Oct 2018 00:50:04 +0200 Subject: [PATCH 04/55] Added new Hungarian strings and fixed some old ones (#387) * Updated Hungarian translation json * Fixed Hungarian translation name * Ran make_translation.py to update Hungarian strings * Reverted changes in other languages in translation.cpp --- Translation Editor/translation_hu.json | 200 ++++++++++++------------- workspace/TS100/src/Translation.cpp | 110 +++++++------- 2 files changed, 155 insertions(+), 155 deletions(-) diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 20ea75a3..c2a761be 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -1,45 +1,45 @@ { "languageCode": "HU", "messages": { - "SettingsCalibrationDone": "Calibration done!", - "SettingsCalibrationWarning": "Folytatás előtt győződj meg róla, hogy a hegy szobahőmérsékletű!", + "SettingsCalibrationDone": "Kalibráció befejezve!", + "SettingsCalibrationWarning": "Folytatás előtt győződjön meg róla, hogy a hegy szobahőmérsékletű!", "SettingsResetWarning": "Biztosan visszaállítja a beállításokat az alapértelmezett értékekre?", - "UVLOWarningString": "DC LOW", - "UndervoltageString": "Undervoltage", - "InputVoltageString": "Input V: ", - "WarningTipTempString": "Tip Temp: ", - "BadTipString": "HEGY", + "UVLOWarningString": "DC KEVÉS", + "UndervoltageString": "Alulfeszültség", + "InputVoltageString": "Bemenet V: ", + "WarningTipTempString": "Hegy hő: ", + "BadTipString": "HEGY HIB", "SleepingSimpleString": "Zzzz", "SleepingAdvancedString": "Alvás...", - "WarningSimpleString": "HOT!", + "WarningSimpleString": "FORR", "WarningAdvancedString": "!! FORRÓ HEGY !!", - "SleepingTipAdvancedString": "Tip:", - "IdleTipString": "Tip:", - "IdleSetString": " Set:", - "TipDisconnectedString": "TIP DISCONNECTED", - "SolderingAdvancedPowerPrompt": "Power: ", - "OffString": "Off" + "SleepingTipAdvancedString": "Hegy:", + "IdleTipString": "Hegy:", + "IdleSetString": " Cél:", + "TipDisconnectedString": "HEGY LEVÉVE", + "SolderingAdvancedPowerPrompt": "Telj: ", + "OffString": "Ki" }, "characters": { - "SettingRightChar": "R", - "SettingLeftChar": "L", + "SettingRightChar": "J", + "SettingLeftChar": "B", "SettingAutoChar": "A", - "SettingFastChar": "F", - "SettingSlowChar": "S" + "SettingFastChar": "G", + "SettingSlowChar": "L" }, "menuDouble": false, "menuGroups": { "SolderingMenu": { "text2": [ - "Forrasztás", - "Beállítások" + "Forrasztási", + "beállítások" ], "desc": "Forrasztási beállítások" }, "PowerSavingMenu": { "text2": [ - "Alvás", - "Módok" + "Alvási", + "módok" ], "desc": "Energiatakarékossági beállítások" }, @@ -52,181 +52,181 @@ }, "AdvancedMenu": { "text2": [ - "Speciális", + "Haladó", "beállítások" ], - "desc": "Speciális beállítások" + "desc": "Haladó beállítások" } }, "menuOptions": { "PowerSource": { - "text": "PWRSC", + "text": "ÁRAMF", "text2": [ - "", - "" + "Áram", + "forrás" ], "desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. " }, "SleepTemperature": { - "text": "STMP", + "text": "AHŐM", "text2": [ - "", - "" + "Alvási", + "hőfok" ], "desc": "Alvási hőmérséklet " }, "SleepTimeout": { - "text": "STME", + "text": "AIDŐ", "text2": [ - "", - "" + "Alvás", + "időzítő" ], - "desc": "Elalvási időzítő " + "desc": "Alvás időzítő " }, "ShutdownTimeout": { - "text": "SHTME", + "text": "KIIDŐ", "text2": [ - "", - "" + "Kikapcsolás", + "időzítő" ], - "desc": "Kikapcsolási időzítő " + "desc": "Kikapcsolási időzítő " }, "MotionSensitivity": { - "text": "MSENSE", + "text": "MOZGÉR", "text2": [ - "", - "" + "Mozgás", + "érzékenység" ], - "desc": "Mozgás érzékenység beállítása. <0.Ki 1.kevésbé érzékeny 9.legérzékenyebb>" + "desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>" }, "TemperatureUnit": { - "text": "TMPUNT", + "text": "HŐEGYS", "text2": [ - "", - "" + "Hőmérséklet", + "mértékegysége" ], - "desc": "Hőmérsékleti egység " + "desc": "Hőmérséklet mértékegysége " }, "AdvancedIdle": { - "text": "ADVIDL", + "text": "RÉSZLI", "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": "DSPROT", + "text": "KIJTÁJ", "text2": [ - "", - "" + "Kijelző", + "tájolása" ], - "desc": "Megjelenítési tájolás " + "desc": "Kijelző tájolása " }, "BoostEnabled": { "text": "BOOST", "text2": [ - "", - "" + "Boost", + "mód" ], - "desc": "Elülső gombbal lépjen boost módba, 450C forrasztás közben" + "desc": "Elülső gombbal boost módba (450C) lép forrasztás közben" }, "BoostTemperature": { - "text": "BTMP", + "text": "BHŐ", "text2": [ - "", - "" + "Boost", + "hőfok" ], "desc": "Hőmérséklet \"boost\" módban" }, "AutoStart": { "text": "ASTART", "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" + "desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki" }, "CooldownBlink": { - "text": "CLBLNK", + "text": "HŰLÉSV", "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": "TMP CAL?", + "text": "HŐM KAL?", "text2": [ - "", - "" + "Hőmérséklet", + "kalibrálása?" ], - "desc": "Hegy hőmérsékletének kalibrálása" + "desc": "Hegy hőmérséklet-különbségének kalibrálása." }, "SettingsReset": { "text": "RESET?", "text2": [ - "", - "" + "Gyári", + "beállítások?" ], "desc": "Beállítások alaphelyzetbe állítása" }, "VoltageCalibration": { - "text": "CAL VIN?", + "text": "VIN KAL?", "text2": [ - "", - "" + "Bemeneti fesz", + "kalibrálása?" ], - "desc": "A bemeneti feszültség kalibrálása. Röviden megnyomva állítsa be, hosszan nyomja meg a kilépéshez." + "desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés" }, "AdvancedSoldering": { - "text": "ADVSLD", + "text": "HALKÉP", "text2": [ - "", - "" + "Részletes", + "forr. kép." ], "desc": "Részletes információk megjelenítése forrasztás közben" }, "ScrollingSpeed": { - "text": "DESCSP", + "text": "GÖRGS", "text2": [ - "", - "" + "Görgetés", + "sebessége" ], - "desc": "Szöveg görgetésének gyorsítása" + "desc": "Szöveggörgetés sebessége" }, "TipModel": { - "text": "TIPMO", + "text": "HEGYMOD", "text2": [ - "Tip", - "Model" + "Forrasztóhegy", + "modell" ], - "desc": "Tip Model selection" + "desc": "Forrasztóhegy modell kiválasztása" }, "SimpleCalibrationMode": { - "text": "SMPCAL", + "text": "EGYSZKAL", "text2": [ - "Simple", - "Calibration" + "Egyszerű", + "kalibráció" ], - "desc": "Simple Calibration using Hot water" + "desc": "Egyszerű kalibrálás forró víz segítségével" }, "AdvancedCalibrationMode": { - "text": "ADVCAL", + "text": "HALKAL", "text2": [ - "Advanced", - "Calibration" + "Haladó", + "Kalibráció" ], - "desc": "Advanced calibration using thermocouple on the tip" + "desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével" }, "PowerInput": { - "text": "PWRW", + "text": "TELJW", "text2": [ - "Power", - "Wattage" + "Bemeneti", + "teljesítmény" ], - "desc": "Power Wattage of the power adapter used" + "desc": "A tápegység által leadott teljesítmény" } }, - "languageLocalName": "Magyar" -} + "languageLocalName": "magyar" +} \ No newline at end of file diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index f9bfe69a..ca9a8392 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -843,94 +843,94 @@ const char* SettingsMenuEntriesDescriptions[4] = { #endif #ifdef LANG_HU -// ---- Magyar ---- +// ---- magyar ---- const char* SettingsDescriptions[] = { /* PowerSource */ "Áramforrás. Beállítja a lekapcsolási feszültséget. ", /* SleepTemperature */ "Alvási hőmérséklet ", - /* SleepTimeout */ "Elalvási időzítő ", - /* ShutdownTimeout */ "Kikapcsolási időzítő ", - /* MotionSensitivity */ "Mozgás érzékenység beállítása. <0.Ki 1.kevésbé érzékeny 9.legérzékenyebb>", - /* TemperatureUnit */ "Hőmérsékleti egység ", + /* SleepTimeout */ "Alvás időzítő ", + /* ShutdownTimeout */ "Kikapcsolási időzítő ", + /* MotionSensitivity */ "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>", + /* TemperatureUnit */ "Hőmérséklet mértékegysége ", /* AdvancedIdle */ "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn.", - /* DisplayRotation */ "Megjelenítési tájolás ", - /* BoostEnabled */ "Elülső gombbal lépjen boost módba, 450C forrasztás közben", + /* DisplayRotation */ "Kijelző tájolása ", + /* BoostEnabled */ "Elülső gombbal boost módba (450C) lép forrasztás közben", /* BoostTemperature */ "Hőmérséklet \"boost\" módban", - /* AutoStart */ "Bekapcsolás után automatikusan lépjen forrasztás módba. T=Forrasztás, S=Alvó mód,F=Ki", + /* AutoStart */ "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki", /* CooldownBlink */ "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró.", - /* TemperatureCalibration */ "Hegy hőmérsékletének kalibrálása", + /* TemperatureCalibration */ "Hegy hőmérséklet-különbségének kalibrálása.", /* SettingsReset */ "Beállítások alaphelyzetbe állítása", - /* VoltageCalibration */ "A bemeneti feszültség kalibrálása. Röviden megnyomva állítsa be, hosszan nyomja meg a kilépéshez.", + /* VoltageCalibration */ "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés", /* AdvancedSoldering */ "Részletes információk megjelenítése forrasztás közben", - /* ScrollingSpeed */ "Szöveg görgetésének gyorsítása", - /* TipModel */ "Tip Model selection", - /* SimpleCalibrationMode */ "Simple Calibration using Hot water", - /* AdvancedCalibrationMode */ "Advanced calibration using thermocouple on the tip", - /* PowerInput */ "Power Wattage of the power adapter used", + /* ScrollingSpeed */ "Szöveggörgetés sebessége", + /* TipModel */ "Forrasztóhegy modell kiválasztása", + /* SimpleCalibrationMode */ "Egyszerű kalibrálás forró víz segítségével", + /* AdvancedCalibrationMode */ "Haladó kalibrálás hegyre helyezett hőelem segítségével", + /* PowerInput */ "A tápegység által leadott teljesítmény", }; -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* SettingsCalibrationDone = "Kalibráció befejezve!"; +const char* SettingsCalibrationWarning = "Folytatás előtt győződjön 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"; -const char* UndervoltageString = "Undervoltage"; -const char* InputVoltageString = "Input V: "; -const char* WarningTipTempString = "Tip Temp: "; -const char* BadTipString = "HEGY"; +const char* UVLOWarningString = "DC KEVÉS"; +const char* UndervoltageString = "Alulfeszültség"; +const char* InputVoltageString = "Bemenet V: "; +const char* WarningTipTempString = "Hegy hő: "; +const char* BadTipString = "HEGY HIB"; const char* SleepingSimpleString = "Zzzz"; const char* SleepingAdvancedString = "Alvás..."; -const char* WarningSimpleString = "HOT!"; +const char* WarningSimpleString = "FORR"; const char* WarningAdvancedString = "!! FORRÓ HEGY !!"; -const char* SleepingTipAdvancedString = "Tip:"; -const char* IdleTipString = "Tip:"; -const char* IdleSetString = " Set:"; -const char* TipDisconnectedString = "TIP DISCONNECTED"; -const char* SolderingAdvancedPowerPrompt = "Power: "; -const char* OffString = "Off"; +const char* SleepingTipAdvancedString = "Hegy:"; +const char* IdleTipString = "Hegy:"; +const char* IdleSetString = " Cél:"; +const char* TipDisconnectedString = "HEGY LEVÉVE"; +const char* SolderingAdvancedPowerPrompt = "Telj: "; +const char* OffString = "Ki"; -const char SettingRightChar = 'R'; -const char SettingLeftChar = 'L'; +const char SettingRightChar = 'J'; +const char SettingLeftChar = 'B'; const char SettingAutoChar = 'A'; -const char SettingFastChar = 'F'; -const char SettingSlowChar = 'S'; +const char SettingFastChar = 'G'; +const char SettingSlowChar = 'L'; const enum ShortNameType SettingsShortNameType = SHORT_NAME_SINGLE_LINE; const char* SettingsShortNames[][2] = { - /* PowerSource */ { "PWRSC" }, - /* SleepTemperature */ { "STMP" }, - /* SleepTimeout */ { "STME" }, - /* ShutdownTimeout */ { "SHTME" }, - /* MotionSensitivity */ { "MSENSE" }, - /* TemperatureUnit */ { "TMPUNT" }, - /* AdvancedIdle */ { "ADVIDL" }, - /* DisplayRotation */ { "DSPROT" }, + /* PowerSource */ { "ÁRAMF" }, + /* SleepTemperature */ { "AHŐM" }, + /* SleepTimeout */ { "AIDŐ" }, + /* ShutdownTimeout */ { "KIIDŐ" }, + /* MotionSensitivity */ { "MOZGÉR" }, + /* TemperatureUnit */ { "HŐEGYS" }, + /* AdvancedIdle */ { "RÉSZLI" }, + /* DisplayRotation */ { "KIJTÁJ" }, /* BoostEnabled */ { "BOOST" }, - /* BoostTemperature */ { "BTMP" }, + /* BoostTemperature */ { "BHŐ" }, /* AutoStart */ { "ASTART" }, - /* CooldownBlink */ { "CLBLNK" }, - /* TemperatureCalibration */ { "TMP CAL?" }, + /* CooldownBlink */ { "HŰLÉSV" }, + /* TemperatureCalibration */ { "HŐM KAL?" }, /* SettingsReset */ { "RESET?" }, - /* VoltageCalibration */ { "CAL VIN?" }, - /* AdvancedSoldering */ { "ADVSLD" }, - /* ScrollingSpeed */ { "DESCSP" }, - /* TipModel */ { "TIPMO" }, - /* SimpleCalibrationMode */ { "SMPCAL" }, - /* AdvancedCalibrationMode */ { "ADVCAL" }, - /* PowerInput */ { "PWRW" }, + /* VoltageCalibration */ { "VIN KAL?" }, + /* AdvancedSoldering */ { "HALKÉP" }, + /* ScrollingSpeed */ { "GÖRGS" }, + /* TipModel */ { "HEGYMOD" }, + /* SimpleCalibrationMode */ { "EGYSZKAL" }, + /* AdvancedCalibrationMode */ { "HALKAL" }, + /* PowerInput */ { "TELJW" }, }; const char* SettingsMenuEntries[4] = { - /* SolderingMenu */ "Forrasztás\nBeállítások", - /* PowerSavingMenu */ "Alvás\nMódok", + /* SolderingMenu */ "Forrasztási\nbeállítások", + /* PowerSavingMenu */ "Alvási\nmódok", /* UIMenu */ "Felhasználó\nfelület", - /* AdvancedMenu */ "Speciális\nbeállítások", + /* AdvancedMenu */ "Haladó\nbeállítások", }; const char* SettingsMenuEntriesDescriptions[4] = { /* SolderingMenu */ "Forrasztási beállítások", /* PowerSavingMenu */ "Energiatakarékossági beállítások", /* UIMenu */ "Felhasználói felület beállításai", - /* AdvancedMenu */ "Speciális beállítások", + /* AdvancedMenu */ "Haladó beállítások", }; #endif From 8f61a7429bd6a834c678258e57058752df7f271d Mon Sep 17 00:00:00 2001 From: David Hilton Date: Thu, 25 Oct 2018 16:50:20 -0600 Subject: [PATCH 05/55] #377 - update install instructions to mention teracopy (#388) --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4e6b3cb0..55a43c69 100644 --- a/README.md +++ b/README.md @@ -35,15 +35,16 @@ Please calibrate your irons voltage reading when you are using a lithium battery This is completely safe, if it goes wrong just put the .hex file from the official website onto the unit and your back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *ts100_EN.hex* unless you want the translations, they are ts100_*language short name*.hex. -Officially the bootloader on the iron only works under windows. However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware). +Officially the bootloader on the iron only works under Windows. However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware). -1. Hold the button closest to the tip, and plug in the USB to the computer. -2. The unit will appear as a USB drive. -3. Drag the .hex file onto the USB drive. -4. The unit will disconnect and reconnect. -5. The filename will have changed to end in .RDY or .ERR -6. If it ends with .RDY you're done! Otherwise something went wrong. -7. Disconnect the USB and power up the iron. You're good to go. +1. Disable Teracopy or other Explorer replacements. +2. Hold the button closest to the tip, and plug in the USB to the computer. +3. The unit will appear as a USB drive. +4. Drag the .hex file onto the USB drive. +5. The unit will disconnect and reconnect. +6. The filename will have changed to end in .RDY or .ERR +7. If it ends with .RDY you're done! Otherwise something went wrong, retry? +8. Disconnect the USB and power up the iron. You're good to go. For the more adventurerous out there, you can also load this firmware onto the device using a SWD programmer. On the bottom of the MCU riser pcb, there are 4 pads for programming. From 61d1ee5b82aa5d2c33c28a3e9011eb079e5ff75d Mon Sep 17 00:00:00 2001 From: "Marcus \"Chaosblog" Date: Fri, 26 Oct 2018 00:51:31 +0200 Subject: [PATCH 06/55] Keep Translation.cpp and json-files in sync (#385) The russish and the italian translations in the json files and the Translation.cpp were not in sync. --- Translation Editor/translation_ru.json | 22 +++++++++++----------- workspace/TS100/src/Translation.cpp | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 2a9d8583..049b28d7 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -1,7 +1,7 @@ { "languageCode": "RU", "messages": { - "SettingsCalibrationDone": "Calibration done!", + "SettingsCalibrationDone": "Калибровка выполнена!", "SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!", "SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?", "UVLOWarningString": "АККУМ--", @@ -198,26 +198,26 @@ "TipModel": { "text": "TIPMO", "text2": [ - "Tip", - "Model" + "Модель", + "жало" ], - "desc": "Tip Model selection" + "desc": "Выбор модели жало" }, "SimpleCalibrationMode": { "text": "SMPCAL", "text2": [ - "Simple", - "Calibration" + "Простая", + "калибровка" ], - "desc": "Simple Calibration using Hot water" + "desc": "Простая калибровка с использованием горячей воды" }, "AdvancedCalibrationMode": { "text": "ADVCAL", "text2": [ - "Advanced", - "Calibration" + "Подробная", + "калибровка" ], - "desc": "Advanced calibration using thermocouple on the tip" + "desc": "Калибровка с помощью термопары" }, "PowerInput": { "text": "PWRW", @@ -229,4 +229,4 @@ } }, "languageLocalName": "Русский" -} +} \ No newline at end of file diff --git a/workspace/TS100/src/Translation.cpp b/workspace/TS100/src/Translation.cpp index ca9a8392..e564004d 100644 --- a/workspace/TS100/src/Translation.cpp +++ b/workspace/TS100/src/Translation.cpp @@ -959,7 +959,7 @@ const char* SettingsDescriptions[] = { /* TipModel */ "Seleziona il modello della punta in uso", /* SimpleCalibrationMode */ "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda", /* AdvancedCalibrationMode */ "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta", - /* PowerInput */ "Power Wattage of the power adapter used", + /* PowerInput */ "Imposta la potenza dell'alimentatore in uso", }; const char* SettingsCalibrationDone = "Calibrazione effettuata"; @@ -1009,7 +1009,7 @@ const char* SettingsShortNames[][2] = { /* TipModel */ { "Modello", "della punta" }, /* SimpleCalibrationMode */ { "Calibrazione", "semplice" }, /* AdvancedCalibrationMode */ { "Calibrazione", "avanzata" }, - /* PowerInput */ { "Power", "Wattage" }, + /* PowerInput */ { "Potenza", "alimentaz" }, }; const char* SettingsMenuEntries[4] = { From 9b99bfcfaa0fce532a4f6604ff5e9f732d134729 Mon Sep 17 00:00:00 2001 From: David Hilton Date: Thu, 25 Oct 2018 16:51:43 -0600 Subject: [PATCH 07/55] update russian json file, re-build Translation.cpp (#390) From ffeacca74dcbfe589ae7afadf5c958bd2500437d Mon Sep 17 00:00:00 2001 From: David Hilton Date: Thu, 25 Oct 2018 18:09:27 -0600 Subject: [PATCH 08/55] update Translation.cpp before build (#391) --- workspace/TS100/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/workspace/TS100/build.sh b/workspace/TS100/build.sh index a7937652..5ed249ca 100755 --- a/workspace/TS100/build.sh +++ b/workspace/TS100/build.sh @@ -1,3 +1,4 @@ +python ../../Translation\ Editor/make_translation.py ../../Translation\ Editor make clean make -j16 lang=EN rm -rf Objects/src From ce671282a6b3854b1329d495017e39df33844d8e Mon Sep 17 00:00:00 2001 From: David P Hilton Date: Sun, 28 Oct 2018 10:14:23 -0600 Subject: [PATCH 09/55] remove hardcoded MODEL_TS80 --- workspace/TS100/inc/hardware.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workspace/TS100/inc/hardware.h b/workspace/TS100/inc/hardware.h index c3c416a4..dc215769 100644 --- a/workspace/TS100/inc/hardware.h +++ b/workspace/TS100/inc/hardware.h @@ -18,11 +18,11 @@ enum Orientation { ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3 }; -#define MODEL_TS80 -#ifndef MODEL_TS100 - #ifndef MODEL_TS80 -#error "Please Define the model you are building for! MODEL=TS100 or MODEL=TS80" - #endif + +#if defined(MODEL_TS100) && defined(MODEL_TS80) +#error "Multiple models defined!" +#elif !defined(MODEL_TS100) && !defined(MODEL_TS80) +#error "No model defined!" #endif #ifdef MODEL_TS100 From 3c94324811d66722489c216c4ffc89fcca7fdba5 Mon Sep 17 00:00:00 2001 From: David P Hilton Date: Sun, 28 Oct 2018 10:34:39 -0600 Subject: [PATCH 10/55] use sum of 'defined' instead of logic --- workspace/TS100/inc/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workspace/TS100/inc/hardware.h b/workspace/TS100/inc/hardware.h index dc215769..0b70f227 100644 --- a/workspace/TS100/inc/hardware.h +++ b/workspace/TS100/inc/hardware.h @@ -19,9 +19,9 @@ enum Orientation { ORIENTATION_FLAT = 3 }; -#if defined(MODEL_TS100) && defined(MODEL_TS80) +#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1 #error "Multiple models defined!" -#elif !defined(MODEL_TS100) && !defined(MODEL_TS80) +#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0 #error "No model defined!" #endif From 81e87c86d0dc51e81edfffd0b53d0b0dcadb13a6 Mon Sep 17 00:00:00 2001 From: David Hilton Date: Sun, 28 Oct 2018 15:48:04 -0600 Subject: [PATCH 11/55] remove hardcoded MODEL_TS80 (#393) * remove hardcoded MODEL_TS80 * #define MODEL_TS100 in sw4stm32/atollic config * whitespace fix * use sum of 'defined' instead of logic * only print handle temp, not PCBVersion * whitespace fix --- workspace/TS100/.cproject | 7 +++++-- workspace/TS100/inc/hardware.h | 10 +++++----- workspace/TS100/src/main.cpp | 5 +++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/workspace/TS100/.cproject b/workspace/TS100/.cproject index 1f09a218..f3845237 100644 --- a/workspace/TS100/.cproject +++ b/workspace/TS100/.cproject @@ -36,6 +36,7 @@