From 11907f60fd7eefb954bcabbed51fd546514fd005 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 29 Apr 2024 11:20:05 +1000 Subject: [PATCH 1/6] Tidy up Radio Setup menu on B&W radios. --- radio/src/gui/128x64/model_setup.cpp | 4 ++-- radio/src/gui/128x64/radio_setup.cpp | 8 ++++---- radio/src/gui/212x64/model_setup.cpp | 6 +++--- radio/src/gui/212x64/radio_setup.cpp | 6 +++--- radio/src/translations.cpp | 1 + radio/src/translations.h | 5 +++-- radio/src/translations/cn.h | 1 + radio/src/translations/cz.h | 1 + radio/src/translations/da.h | 1 + radio/src/translations/de.h | 1 + radio/src/translations/en.h | 1 + radio/src/translations/es.h | 1 + radio/src/translations/fi.h | 1 + radio/src/translations/fr.h | 1 + radio/src/translations/he.h | 1 + radio/src/translations/it.h | 1 + radio/src/translations/jp.h | 1 + radio/src/translations/nl.h | 1 + radio/src/translations/pl.h | 1 + radio/src/translations/pt.h | 1 + radio/src/translations/ru.h | 1 + radio/src/translations/se.h | 1 + radio/src/translations/tw.h | 1 + radio/src/translations/ua.h | 1 + 24 files changed, 34 insertions(+), 14 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 2e4da576e7c..fa700ceb6a8 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1154,7 +1154,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: #endif - lcdDrawTextAlignedLeft(y, INDENT TR_MODE); + lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); lcdDrawTextAtIndex( MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, @@ -1449,7 +1449,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawTextAlignedLeft(y, INDENT TR_MODE); + lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, TRAINER_MODE_MIN(), TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 9ca7cc7a86f..2e56a4898f0 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -87,8 +87,8 @@ enum { CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_MODE) CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_DELAY) CASE_BACKLIGHT(ITEM_RADIO_SETUP_BRIGHTNESS) - CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP) CASE_CONTRAST(ITEM_RADIO_SETUP_CONTRAST) + CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP) CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) ITEM_RADIO_SETUP_START_SOUND, CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED) @@ -185,8 +185,8 @@ void menuRadioSetup(event_t event) CASE_BACKLIGHT(0) CASE_BACKLIGHT(0) CASE_BACKLIGHT(0) - CASE_BACKLIGHT(0) CASE_CONTRAST(0) + CASE_BACKLIGHT(0) CASE_SPLASH_PARAM(0) 0, CASE_PWR_BUTTON_PRESS(0) @@ -418,7 +418,7 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_HAPTIC_MODE: - g_eeGeneral.hapticMode = editChoice(LCD_W-2, y, INDENT TR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr|RIGHT, event); + g_eeGeneral.hapticMode = editChoice(LCD_W-2, y, STR_MODE_INDENT, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr|RIGHT, event); break; case ITEM_RADIO_SETUP_HAPTIC_LENGTH: @@ -470,7 +470,7 @@ void menuRadioSetup(event_t event) #if !defined(OLED_SCREEN) case ITEM_RADIO_SETUP_CONTRAST: - lcdDrawTextAlignedLeft(y, STR_CONTRAST); + lcdDrawText(INDENT_WIDTH, y, STR_CONTRAST); lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT); if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX); diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index e6258a54d10..325d5597211 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1055,7 +1055,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_TYPE: { - lcdDrawTextAlignedLeft(y, INDENT TR_MODE); + lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, @@ -1110,7 +1110,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: - lcdDrawTextAlignedLeft(y, INDENT TR_MODE); + lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, reusableBuffer.moduleSetup.newType, menuHorizontalPosition==0 ? attr : 0); if (isModuleXJT(EXTERNAL_MODULE)) lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0); @@ -1349,7 +1349,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawTextAlignedLeft(y, INDENT TR_MODE); + lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, 0, TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index dc32976dfef..39378616c36 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -64,7 +64,6 @@ enum MenuRadioSetupItems { CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_MODE) CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_LENGTH) CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_STRENGTH) - ITEM_RADIO_SETUP_CONTRAST, ITEM_RADIO_SETUP_ALARMS_LABEL, ITEM_RADIO_SETUP_BATTERY_WARNING, ITEM_RADIO_SETUP_INACTIVITY_ALARM, @@ -76,6 +75,7 @@ enum MenuRadioSetupItems { ITEM_RADIO_SETUP_BACKLIGHT_MODE, ITEM_RADIO_SETUP_BACKLIGHT_DELAY, ITEM_RADIO_SETUP_BRIGHTNESS, + ITEM_RADIO_SETUP_CONTRAST, CASE_PCBX9E_PCBX9DP(ITEM_RADIO_SETUP_BACKLIGHT_COLOR) ITEM_RADIO_SETUP_FLASH_BEEP, CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) @@ -176,7 +176,6 @@ void menuRadioSetup(event_t event) CASE_HAPTIC(0) // haptic mode CASE_HAPTIC(0) // haptic length CASE_HAPTIC(0) // haptic strength - 0, // contrast LABEL(ALARMS), 0, // battery warning 0, // inactivity warning @@ -188,6 +187,7 @@ void menuRadioSetup(event_t event) 0, // backlight mode 0, // backlight delay 0, // brightness + 0, // contrast CASE_PCBX9E_PCBX9DP(0) // backlight color 0, // flash beep CASE_SPLASH_PARAM(0) // disable splash @@ -435,7 +435,7 @@ void menuRadioSetup(event_t event) #endif case ITEM_RADIO_SETUP_CONTRAST: - lcdDrawTextAlignedLeft(y, STR_CONTRAST); + lcdDrawText(INDENT_WIDTH, y, STR_CONTRAST); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 1e849d3287e..35a27f9850a 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -200,6 +200,7 @@ const char STR_FADEOUT[] = TR_FADEOUT; const char STR_DEFAULT[] = TR_DEFAULT; const char STR_CHECKTRIMS[] = TR_CHECKTRIMS; const char STR_MODE[] = TR_MODE; +const char STR_MODE_INDENT[] = TR_MODE_INDENT; const char STR_NOFREEEXPO[] = TR_NOFREEEXPO; const char STR_NOFREEMIXER[] = TR_NOFREEMIXER; const char STR_SOURCE[] = TR_SOURCE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 5dd86315a2d..c8213bc70a0 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -347,13 +347,14 @@ extern const char STR_AILERON[]; extern const char STR_ELEVATOR[]; extern const char STR_SWASHRING[]; extern const char STR_MODE[]; +extern const char STR_MODE_INDENT[]; #if defined(AUDIO) && defined(BUZZER) extern const char STR_SPEAKER[]; extern const char STR_BUZZER[]; #else -#define STR_SPEAKER STR_MODE -#define STR_BUZZER STR_MODE +#define STR_SPEAKER STR_MODE_INDENT +#define STR_BUZZER STR_MODE_INDENT #endif extern const char STR_NOFREEEXPO[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index a833016ab1b..46ed0cac49f 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -297,6 +297,7 @@ #define TR_ELEVATOR TR("俯仰源", "俯仰混控源") #define TR_SWASHRING "斜盘行程" #define TR_MODE "模式" +#define TR_MODE_INDENT INDENT "模式" #if LCD_W > LCD_H #define TR_LEFT_STICK "左摇杆" #else diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 50f2ed830c4..aec435e5cb0 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -312,6 +312,7 @@ #define TR_ELEVATOR TR3("Podélná cykl.", "Podélná cykl.", "Podélná cyklika") #define TR_SWASHRING "Cyklika" #define TR_MODE "Mód" +#define TR_MODE_INDENT INDENT "Mód" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vlevo" #else diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index ebaf438f099..ebcff1dacf1 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -305,6 +305,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. kilde") #define TR_SWASHRING "Swash ring" #define TR_MODE TR("Tils.","Tilstand") +#define TR_MODE_INDENT TR(INDENT "Tils.",INDENT "Tilstand") #if LCD_W > LCD_H #define TR_LEFT_STICK "Venstre" #else diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index b96e60f479b..6a6644f9705 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -303,6 +303,7 @@ #define TR_ELEVATOR "Nick Quelle" #define TR_SWASHRING TR("Ring Begrenz", "Ring Begrenzung") #define TR_MODE "Modus" +#define TR_MODE_INDENT INDENT "Modus" #if LCD_W > LCD_H #define TR_LEFT_STICK "Links" #else diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index ed67afebba9..220c165519f 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -302,6 +302,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" +#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Left" #else diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 2e010cf60d4..0cfaf086071 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -300,6 +300,7 @@ #define TR_ELEVATOR TR("Col. long. ", "Fuente col. longitudinal") #define TR_SWASHRING "Ciclico" #define TR_MODE "Modo" +#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Izquierdo" #else diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index a2b0b6577f3..b36755e5810 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -314,6 +314,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" +#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vasemmalle" #else diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 8ac102cac8e..ddc0d0e1341 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -309,6 +309,7 @@ #define TR_ELEVATOR "Source cyc. lon." #define TR_SWASHRING TR("Limite Cycl.", "Limite du cyclique") #define TR_MODE "Mode" +#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Gauche" #else diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 7a2bdaec261..9625ee34e17 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -306,6 +306,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" +#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Left" #else diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index d5375e50d1e..ca8d5afe1ec 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -302,6 +302,7 @@ #define TR_ELEVATOR TR("Cic. long.", "Sorg. cic. long.") #define TR_SWASHRING "Anello Ciclico" #define TR_MODE "Modo" +#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Sinistro" #else diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index afb6083a922..c860970dac3 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -301,6 +301,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. ソース") #define TR_SWASHRING "スワッシュリング" #define TR_MODE "モード" +#define TR_MODE_INDENT INDENT "モード" #if LCD_W > LCD_H #define TR_LEFT_STICK "左スティック" #else diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 8a07ad42458..8714508bad7 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -299,6 +299,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" +#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Linkerkant" #else diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 71abc5d9c02..f294ffe988f 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -299,6 +299,7 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Tarcza " #define TR_MODE "Tryb" +#define TR_MODE_INDENT INDENT "Tryb" #if LCD_W > LCD_H #define TR_LEFT_STICK "Lewy" #else diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 23881ed1e74..9762b1103e7 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -305,6 +305,7 @@ #define TR_ELEVATOR TR("Arfagem", "Org. cíclico Arfagem") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Modo" +#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Esq" #else diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index 3540ed58d59..ac5b074bbba 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -304,6 +304,7 @@ #define TR_ELEVATOR TR("Тангаж", "Тангаж") #define TR_SWASHRING "Поворот" #define TR_MODE "Режим" +#define TR_MODE_INDENT INDENT "Режим" #if LCD_W > LCD_H #define TR_LEFT_STICK "Лев" #else diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 018e3a65da1..730e0f43966 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -315,6 +315,7 @@ #define TR_ELEVATOR "Höjdroderkälla" #define TR_SWASHRING "Swashring" #define TR_MODE "Typ" +#define TR_MODE_INDENT INDENT "Typ" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vänster" #else diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 27b08bb88e3..dfb535c31ee 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -302,6 +302,7 @@ #define TR_ELEVATOR TR("俯仰源", "俯仰混控源") #define TR_SWASHRING "斜盤行程" #define TR_MODE "模式" +#define TR_MODE_INDENT INDENT "模式" #if LCD_W > LCD_H #define TR_LEFT_STICK "左搖桿" #else diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 4e77d86121e..f9ba499890f 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -304,6 +304,7 @@ #define TR_ELEVATOR TR("Тангаж", "Тангаж") #define TR_SWASHRING "Поворот" #define TR_MODE "Режим" +#define TR_MODE_INDENT INDENT "Режим" #if LCD_W > LCD_H #define TR_LEFT_STICK "Ліво" #else From 41741301e1f80598b53c46192d16e54cd97b5964 Mon Sep 17 00:00:00 2001 From: philmoz Date: Thu, 2 May 2024 17:36:18 +1000 Subject: [PATCH 2/6] Cleanup usage of INDENT macro in the code. --- radio/src/gui/128x64/gui.h | 11 ++++-- radio/src/gui/128x64/menu_model.cpp | 4 +- radio/src/gui/128x64/model_setup.cpp | 30 +++++++-------- .../gui/128x64/model_special_functions.cpp | 12 ++---- radio/src/gui/128x64/model_telemetry.cpp | 2 +- radio/src/gui/128x64/radio_setup.cpp | 8 ++-- radio/src/gui/128x64/widgets.cpp | 22 +++++------ radio/src/gui/212x64/gui.h | 11 ++++-- radio/src/gui/212x64/menu_model.cpp | 4 +- radio/src/gui/212x64/model_setup.cpp | 38 +++++++++---------- radio/src/gui/212x64/model_telemetry.cpp | 2 +- radio/src/gui/212x64/radio_setup.cpp | 2 +- radio/src/gui/212x64/widgets.cpp | 13 +++++-- radio/src/gui/common/stdlcd/CMakeLists.txt | 2 - .../src/gui/common/stdlcd/radio_hardware.cpp | 4 +- radio/src/translations.cpp | 1 - radio/src/translations.h | 5 +-- radio/src/translations/cn.h | 5 +-- radio/src/translations/cz.h | 5 +-- radio/src/translations/da.h | 5 +-- radio/src/translations/de.h | 5 +-- radio/src/translations/en.h | 5 +-- radio/src/translations/es.h | 5 +-- radio/src/translations/fi.h | 5 +-- radio/src/translations/fr.h | 5 +-- radio/src/translations/he.h | 5 +-- radio/src/translations/it.h | 5 +-- radio/src/translations/jp.h | 5 +-- radio/src/translations/nl.h | 5 +-- radio/src/translations/pl.h | 5 +-- radio/src/translations/pt.h | 5 +-- radio/src/translations/ru.h | 5 +-- radio/src/translations/se.h | 5 +-- radio/src/translations/tw.h | 5 +-- radio/src/translations/ua.h | 5 +-- 35 files changed, 120 insertions(+), 141 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 8666ddc2303..53957597be8 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -65,11 +65,14 @@ typedef int choice_t; choice_t editChoice(coord_t x, coord_t y, const char *label, const char *const *values, choice_t value, choice_t min, - choice_t max, LcdFlags attr, event_t event, - IsValueAvailable isValueAvailable = nullptr); + choice_t max, LcdFlags attr, event_t event, coord_t lblX = 0); +choice_t editChoice(coord_t x, coord_t y, const char *label, + const char *const *values, choice_t value, choice_t min, + choice_t max, LcdFlags attr, event_t event, coord_t lblX, + IsValueAvailable isValueAvailable); uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, - LcdFlags attr, event_t event); + LcdFlags attr, event_t event, coord_t lblX = 0); swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event); @@ -111,7 +114,7 @@ void editName(coord_t x, coord_t y, char *name, uint8_t size, event_t event, void editSingleName(coord_t x, coord_t y, const char *label, char *name, uint8_t size, event_t event, uint8_t active, - uint8_t old_editMode); + uint8_t old_editMode, coord_t lblX = 0); uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay, uint8_t prec); diff --git a/radio/src/gui/128x64/menu_model.cpp b/radio/src/gui/128x64/menu_model.cpp index 7dd3fadfd3e..3ba11ced276 100644 --- a/radio/src/gui/128x64/menu_model.cpp +++ b/radio/src/gui/128x64/menu_model.cpp @@ -62,9 +62,9 @@ uint8_t editNameCursorPos = 0; void editSingleName(coord_t x, coord_t y, const char* label, char* name, uint8_t size, event_t event, uint8_t active, - uint8_t old_editMode) + uint8_t old_editMode, coord_t lblX) { - lcdDrawTextAlignedLeft(y, label); + lcdDrawText(lblX, y, label); editName(x, y, name, size, event, active, 0, old_editMode); } diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index fa700ceb6a8..793d8270ff6 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -758,8 +758,8 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_NAME: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_SETUP_TIMER3 ? 2 : (k>=ITEM_MODEL_SETUP_TIMER2 ? 1 : 0)]; - editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, timer->name, - sizeof(timer->name), event, attr, old_editMode); + editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_NAME, timer->name, + sizeof(timer->name), event, attr, old_editMode, INDENT_WIDTH); break; } @@ -768,7 +768,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_SETUP_TIMER3 ? 2 : (k>=ITEM_MODEL_SETUP_TIMER2 ? 1 : 0)]; - timer->minuteBeep = editCheckBox(timer->minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); + timer->minuteBeep = editCheckBox(timer->minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event, INDENT_WIDTH); break; } @@ -839,7 +839,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_FS_STARTUP: { const char* s; - lcdDrawText(0, y, INDENT "Start", menuHorizontalPosition < 0 ? attr : 0); + lcdDrawText(INDENT_WIDTH, y, STR_START, menuHorizontalPosition < 0 ? attr : 0); for (uint8_t i = 0; i < NUM_FUNCTIONS_SWITCHES; i++) { uint8_t startPos = (g_model.functionSwitchStartConfig >> 2 * i) & 0x03; s = _fct_sw_start[(g_model.functionSwitchStartConfig >> 2 * i) & 0x03]; @@ -1154,7 +1154,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: #endif - lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); + lcdDrawText(INDENT_WIDTH, y, STR_MODE); lcdDrawTextAtIndex( MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, @@ -1449,7 +1449,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); + lcdDrawText(INDENT_WIDTH, y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, TRAINER_MODE_MIN(), TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); @@ -1631,7 +1631,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE: #endif { - lcdDrawTextAlignedLeft(y, INDENT TR_MODULE); + lcdDrawText(INDENT_WIDTH, y, STR_MODULE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0)); lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { @@ -1894,9 +1894,9 @@ void menuModelSetup(event_t event) #if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA) case ITEM_MODEL_SETUP_INTERNAL_MODULE_ANTENNA: - reusableBuffer.moduleSetup.antennaMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_ANTENNA, STR_ANTENNA_MODES, + reusableBuffer.moduleSetup.antennaMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_ANTENNA, STR_ANTENNA_MODES, reusableBuffer.moduleSetup.antennaMode == ANTENNA_MODE_PER_MODEL ? ANTENNA_MODE_INTERNAL : reusableBuffer.moduleSetup.antennaMode, - ANTENNA_MODE_INTERNAL, ANTENNA_MODE_EXTERNAL, attr, event, + ANTENNA_MODE_INTERNAL, ANTENNA_MODE_EXTERNAL, attr, event, INDENT_WIDTH, [](int value) { return value != ANTENNA_MODE_PER_MODEL; }); if (event && !s_editMode && reusableBuffer.moduleSetup.antennaMode != g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode) { if (reusableBuffer.moduleSetup.antennaMode == ANTENNA_MODE_EXTERNAL && !isExternalAntennaEnabled()) { @@ -1988,7 +1988,7 @@ void menuModelSetup(event_t event) } else if (isModuleGhost(moduleIdx)) { auto & module = g_model.moduleData[moduleIdx]; - module.ghost.raw12bits = editCheckBox(module.ghost.raw12bits , MODEL_SETUP_2ND_COLUMN, y, INDENT "Raw 12 bits", attr, event); + module.ghost.raw12bits = editCheckBox(module.ghost.raw12bits , MODEL_SETUP_2ND_COLUMN, y, "Raw 12 bits", attr, event, INDENT_WIDTH); } break; } @@ -2108,7 +2108,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_DISABLE_TELEM: case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DISABLE_TELEM: - g_model.moduleData[moduleIdx].multi.disableTelemetry = editCheckBox(g_model.moduleData[moduleIdx].multi.disableTelemetry, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_DISABLE_TELEM, attr, event); + g_model.moduleData[moduleIdx].multi.disableTelemetry = editCheckBox(g_model.moduleData[moduleIdx].multi.disableTelemetry, MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_TELEM, attr, event, INDENT_WIDTH); break; #endif @@ -2118,7 +2118,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DISABLE_MAPPING: #endif - g_model.moduleData[moduleIdx].multi.disableMapping = editCheckBox(g_model.moduleData[moduleIdx].multi.disableMapping, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_DISABLE_CH_MAP, attr, event); + g_model.moduleData[moduleIdx].multi.disableMapping = editCheckBox(g_model.moduleData[moduleIdx].multi.disableMapping, MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_CH_MAP, attr, event, INDENT_WIDTH); break; #endif @@ -2278,15 +2278,15 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_USBJOYSTICK_MODE: - g_model.usbJoystickExtMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_EXTMODE, STR_VUSBJOYSTICK_EXTMODE, g_model.usbJoystickExtMode, 0, 1, attr, event); + g_model.usbJoystickExtMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_EXTMODE, STR_VUSBJOYSTICK_EXTMODE, g_model.usbJoystickExtMode, 0, 1, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_IF_MODE: - g_model.usbJoystickIfMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_IF_MODE, STR_VUSBJOYSTICK_IF_MODE, g_model.usbJoystickIfMode, 0, USBJOYS_LAST, attr, event); + g_model.usbJoystickIfMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_IF_MODE, STR_VUSBJOYSTICK_IF_MODE, g_model.usbJoystickIfMode, 0, USBJOYS_LAST, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_CIRC_CUTOUT: - g_model.usbJoystickCircularCut = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_CIRC_COUTOUT, STR_VUSBJOYSTICK_CIRC_COUTOUT, g_model.usbJoystickCircularCut, 0, 2, attr, event); + g_model.usbJoystickCircularCut = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_CIRC_COUTOUT, STR_VUSBJOYSTICK_CIRC_COUTOUT, g_model.usbJoystickCircularCut, 0, 2, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON: diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index dfc97ec2666..ee5b01e83e7 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -24,15 +24,9 @@ #define MODEL_SPECIAL_FUNC_1ST_COLUMN (0) #define MODEL_SPECIAL_FUNC_2ND_COLUMN (4*FW-1) #define MODEL_SPECIAL_FUNC_3RD_COLUMN (15*FW-3) -#if defined(GRAPHICS) - #define MODEL_SPECIAL_FUNC_4TH_COLUMN (19 * FW - 3) - #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (19 * FW - 3) - #define MODEL_SPECIAL_FUNC_5TH_COLUMN_ONOFF (20 * FW + 1) -#else - #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (17 * FW) - #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (17 * FW) - #define MODEL_SPECIAL_FUNC_5TH_COLUMN_ONOFF (18 * FW + 3) -#endif +#define MODEL_SPECIAL_FUNC_4TH_COLUMN (19 * FW - 3) +#define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (19 * FW - 3) +#define MODEL_SPECIAL_FUNC_5TH_COLUMN_ONOFF (20 * FW + 1) #if defined(SDCARD) #define SD_LOGS_PERIOD_MIN 1 // 0.1s fastest period diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 2913b5b53d3..5d310a6a32e 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -265,7 +265,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_SOURCE: - lcdDrawTextAlignedLeft(y, INDENT TR_SOURCE); + lcdDrawText(INDENT_WIDTH, y, STR_SOURCE); drawSource(TELEM_COL2, y, g_model.varioData.source ? MIXSRC_FIRST_TELEM+3*(g_model.varioData.source-1) : 0, attr); if (attr) { g_model.varioData.source = checkIncDec(event, g_model.varioData.source, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVarioSensorAvailable); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 2e56a4898f0..dfc67861772 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -315,17 +315,17 @@ void menuRadioSetup(event_t event) #if defined(AUDIO) case ITEM_RADIO_SETUP_BEEP_MODE: - g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event); + g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH); break; #if defined(BUZZER) // AUDIO + BUZZER case ITEM_RADIO_SETUP_BUZZER_MODE: - g_eeGeneral.buzzerMode = editChoice(LCD_W-2, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr|RIGHT, event); + g_eeGeneral.buzzerMode = editChoice(LCD_W-2, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH); break; #endif #elif defined(BUZZER) // BUZZER only case ITEM_RADIO_SETUP_BUZZER_MODE: - g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event); + g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH); break; #endif @@ -418,7 +418,7 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_HAPTIC_MODE: - g_eeGeneral.hapticMode = editChoice(LCD_W-2, y, STR_MODE_INDENT, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr|RIGHT, event); + g_eeGeneral.hapticMode = editChoice(LCD_W-2, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_HAPTIC_LENGTH: diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 7259d17f747..3d651a4b28e 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -63,17 +63,12 @@ void drawStick(coord_t centrex, int16_t xval, int16_t yval) void drawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr) { -#if defined(GRAPHICS) if (value) lcdDrawChar(x+1, y, '#'); if (attr) lcdDrawSolidFilledRect(x, y, 7, 7); else lcdDrawSquare(x, y, 7); -#else - /* ON / OFF version */ - lcdDrawTextAtIndex(x, y, STR_OFFON, value, attr ? INVERS:0) ; -#endif } void drawScreenIndex(uint8_t index, uint8_t count, uint8_t attr) @@ -114,24 +109,25 @@ void title(const char * s) lcdDrawText(0, 0, s, INVERS); } -choice_t editChoice(coord_t x, coord_t y, const char * label, const char *const *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, IsValueAvailable isValueAvailable) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *const *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, coord_t lblX, IsValueAvailable isValueAvailable) { if (label) { - drawFieldLabel(x, y, label); + lcdDrawText(lblX, y, label); } if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr); if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (isModelMenuDisplayed()) ? EE_MODEL : EE_GENERAL, isValueAvailable); return value; } -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event ) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *const *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, coord_t lblX) +{ + return editChoice(x, y, label, values, value, min, max, attr, event, lblX, nullptr); +} + +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event, coord_t lblX) { -#if defined(GRAPHICS) drawCheckBox(x, y, value, attr); - return editChoice(x, y, label, nullptr, value, 0, 1, attr, event); -#else - return editChoice(x, y, label, STR_OFFON, value, 0, 1, attr, event); -#endif + return editChoice(x, y, label, nullptr, value, 0, 1, attr, event, lblX); } swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event) diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index 0bdfba10cc6..2c956b59789 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -84,11 +84,14 @@ typedef int choice_t; choice_t editChoice(coord_t x, coord_t y, const char *label, const char *const *values, choice_t value, choice_t min, - choice_t max, LcdFlags attr, event_t event, - IsValueAvailable isValueAvailable = nullptr); + choice_t max, LcdFlags attr, event_t event, coord_t lblX = 0); +choice_t editChoice(coord_t x, coord_t y, const char *label, + const char *const *values, choice_t value, choice_t min, + choice_t max, LcdFlags attr, event_t event, coord_t lblX, + IsValueAvailable isValueAvailable); uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, - LcdFlags attr, event_t event); + LcdFlags attr, event_t event, coord_t lblX = 0); swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event); @@ -130,7 +133,7 @@ void editName(coord_t x, coord_t y, char *name, uint8_t size, event_t event, void editSingleName(coord_t x, coord_t y, const char *label, char *name, uint8_t size, event_t event, uint8_t active, - uint8_t old_editMode); + uint8_t old_editMode, coord_t lblX = 0); uint8_t editDelay(coord_t y, event_t event, uint8_t attr, const char * str, uint8_t delay, uint8_t prec); diff --git a/radio/src/gui/212x64/menu_model.cpp b/radio/src/gui/212x64/menu_model.cpp index fd2d120f402..b1bdb6c6fb5 100644 --- a/radio/src/gui/212x64/menu_model.cpp +++ b/radio/src/gui/212x64/menu_model.cpp @@ -65,9 +65,9 @@ uint8_t s_copySrcCh; uint8_t editNameCursorPos = 0; -void editSingleName(coord_t x, coord_t y, const char * label, char *name, uint8_t size, event_t event, uint8_t active, uint8_t old_editMode) +void editSingleName(coord_t x, coord_t y, const char * label, char *name, uint8_t size, event_t event, uint8_t active, uint8_t old_editMode, coord_t lblX) { - lcdDrawTextAlignedLeft(y, label); + lcdDrawText(lblX, y, label); TRACE("EDIT SINGLE NAME %s", name); editName(x, y, name, size, event, active, 0, old_editMode); } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 325d5597211..07f58b389a6 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -660,9 +660,9 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER1_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, + editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_NAME, g_model.timers[0].name, LEN_TIMER_NAME, event, attr, - old_editMode); + old_editMode, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER1_START: @@ -672,7 +672,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER1_MINUTE_BEEP: g_model.timers[0].minuteBeep = editCheckBox( g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, - INDENT TR_MINUTEBEEP, attr, event); + STR_MINUTEBEEP, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER1_COUNTDOWN_BEEP: @@ -692,9 +692,9 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER2_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, + editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_NAME, g_model.timers[1].name, LEN_TIMER_NAME, event, attr, - old_editMode); + old_editMode, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER2_START: @@ -702,7 +702,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER2_MINUTE_BEEP: - g_model.timers[1].minuteBeep = editCheckBox(g_model.timers[1].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); + g_model.timers[1].minuteBeep = editCheckBox(g_model.timers[1].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER2_COUNTDOWN_BEEP: @@ -720,9 +720,9 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER3_NAME: - editSingleName(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_NAME, + editSingleName(MODEL_SETUP_2ND_COLUMN, y, STR_NAME, g_model.timers[2].name, LEN_TIMER_NAME, event, attr, - old_editMode); + old_editMode, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER3_START: @@ -732,7 +732,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP: g_model.timers[2].minuteBeep = editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN, - y, INDENT TR_MINUTEBEEP, attr, event); + y, STR_MINUTEBEEP, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_TIMER3_COUNTDOWN_BEEP: @@ -1055,7 +1055,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_TYPE: { - lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); + lcdDrawText(INDENT_WIDTH, y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, @@ -1110,7 +1110,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: - lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); + lcdDrawText(INDENT_WIDTH, y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, reusableBuffer.moduleSetup.newType, menuHorizontalPosition==0 ? attr : 0); if (isModuleXJT(EXTERNAL_MODULE)) lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0); @@ -1349,7 +1349,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawTextAlignedLeft(y, STR_MODE_INDENT); + lcdDrawText(INDENT_WIDTH, y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, 0, TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); @@ -1753,7 +1753,7 @@ void menuModelSetup(event_t event) } else if (isModuleGhost(moduleIdx)) { auto & module = g_model.moduleData[moduleIdx]; - module.ghost.raw12bits = editCheckBox(module.ghost.raw12bits , MODEL_SETUP_2ND_COLUMN, y, INDENT "Raw 12 bits", attr, event); + module.ghost.raw12bits = editCheckBox(module.ghost.raw12bits , MODEL_SETUP_2ND_COLUMN, y, "Raw 12 bits", attr, event, INDENT_WIDTH); } } break; @@ -1815,11 +1815,11 @@ void menuModelSetup(event_t event) break; #if defined(MANUFACTURER_FRSKY) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DISABLE_TELEM: - g_model.moduleData[EXTERNAL_MODULE].multi.disableTelemetry = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.disableTelemetry, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_DISABLE_TELEM, attr, event); + g_model.moduleData[EXTERNAL_MODULE].multi.disableTelemetry = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.disableTelemetry, MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_TELEM, attr, event, INDENT_WIDTH); break; #endif case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DISABLE_MAPPING: - g_model.moduleData[EXTERNAL_MODULE].multi.disableMapping = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.disableMapping, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_DISABLE_CH_MAP, attr, event); + g_model.moduleData[EXTERNAL_MODULE].multi.disableMapping = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.disableMapping, MODEL_SETUP_2ND_COLUMN, y, STR_DISABLE_CH_MAP, attr, event, INDENT_WIDTH); break; #endif @@ -1906,7 +1906,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE: { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); - lcdDrawTextAlignedLeft(y, INDENT TR_MODULE); + lcdDrawText(INDENT_WIDTH, y, STR_MODULE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0)); lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { @@ -2003,15 +2003,15 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_USBJOYSTICK_MODE: - g_model.usbJoystickExtMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_EXTMODE, STR_VUSBJOYSTICK_EXTMODE, g_model.usbJoystickExtMode, 0, 1, attr, event); + g_model.usbJoystickExtMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_EXTMODE, STR_VUSBJOYSTICK_EXTMODE, g_model.usbJoystickExtMode, 0, 1, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_IF_MODE: - g_model.usbJoystickIfMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_IF_MODE, STR_VUSBJOYSTICK_IF_MODE, g_model.usbJoystickIfMode, 0, USBJOYS_LAST, attr, event); + g_model.usbJoystickIfMode = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_IF_MODE, STR_VUSBJOYSTICK_IF_MODE, g_model.usbJoystickIfMode, 0, USBJOYS_LAST, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_CIRC_CUTOUT: - g_model.usbJoystickCircularCut = editChoice(MODEL_SETUP_2ND_COLUMN, y, INDENT TR_USBJOYSTICK_CIRC_COUTOUT, STR_VUSBJOYSTICK_CIRC_COUTOUT, g_model.usbJoystickCircularCut, 0, 2, attr, event); + g_model.usbJoystickCircularCut = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_USBJOYSTICK_CIRC_COUTOUT, STR_VUSBJOYSTICK_CIRC_COUTOUT, g_model.usbJoystickCircularCut, 0, 2, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON: diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index 642c65f1518..e93f0cc51f5 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -250,7 +250,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_SOURCE: - lcdDrawTextAlignedLeft(y, INDENT TR_SOURCE); + lcdDrawText(INDENT_WIDTH, y, STR_SOURCE); drawSource(TELEM_COL2, y, g_model.varioData.source ? MIXSRC_FIRST_TELEM+3*(g_model.varioData.source-1) : 0, attr); if (attr) { g_model.varioData.source = checkIncDec(event, g_model.varioData.source, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVarioSensorAvailable); diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 39378616c36..33f145d80b3 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -334,7 +334,7 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_BEEP_MODE: - g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); + g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_GENERAL_VOLUME: diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 7ef61fc54f5..3a877023f71 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/radio/src/gui/212x64/widgets.cpp @@ -82,20 +82,25 @@ void title(const char * s) lcdDrawText(0, 0, s, INVERS); } -choice_t editChoice(coord_t x, coord_t y, const char * label, const char* const* values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, IsValueAvailable isValueAvailable) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char* const* values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, coord_t lblX, IsValueAvailable isValueAvailable) { if (label) { - drawFieldLabel(x, y, label); + lcdDrawText(lblX, y, label); } if (values) lcdDrawTextAtIndex(x, y, values, value-min, attr); if (attr & (~RIGHT)) value = checkIncDec(event, value, min, max, (isModelMenuDisplayed()) ? EE_MODEL : EE_GENERAL, isValueAvailable); return value; } -uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event ) +choice_t editChoice(coord_t x, coord_t y, const char * label, const char* const* values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, coord_t lblX) +{ + return editChoice(x, y, label, values, value, min, max, attr, event, lblX, nullptr); +} + +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event, coord_t lblX) { drawCheckBox(x, y, value, attr); - return editChoice(x, y, label, nullptr, value, 0, 1, attr, event); + return editChoice(x, y, label, nullptr, value, 0, 1, attr, event, lblX); } swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event) diff --git a/radio/src/gui/common/stdlcd/CMakeLists.txt b/radio/src/gui/common/stdlcd/CMakeLists.txt index d88c3da4bdf..17f8d753aef 100644 --- a/radio/src/gui/common/stdlcd/CMakeLists.txt +++ b/radio/src/gui/common/stdlcd/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions(-DGRAPHICS) - set(GUI_SRC ${GUI_SRC} ../common/stdlcd/menus.cpp diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp index cedb263ce43..95b3f433942 100644 --- a/radio/src/gui/common/stdlcd/radio_hardware.cpp +++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp @@ -304,7 +304,7 @@ void menuRadioHardware(event_t event) editChoice(HW_SETTINGS_COLUMN2, y, STR_TYPE, STR_MODULE_PROTOCOLS, g_eeGeneral.internalModule, MODULE_TYPE_NONE, - MODULE_TYPE_MAX, attr, event, isInternalModuleSupported); + MODULE_TYPE_MAX, attr, event, 0, isInternalModuleSupported); if (g_model.moduleData[INTERNAL_MODULE].type != g_eeGeneral.internalModule) { memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData)); @@ -582,7 +582,7 @@ void menuRadioHardware(event_t event) auto mode = serialGetMode(port_nr); mode = editChoice(HW_SETTINGS_COLUMN2, y, nullptr, STR_AUX_SERIAL_MODES, mode, 0, UART_MODE_MAX, attr, - event, _isSerialModeAvailable[port_nr]); + event, 0, _isSerialModeAvailable[port_nr]); if (attr && checkIncDec_Ret) { serialSetMode(port_nr, mode); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 35a27f9850a..1e849d3287e 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -200,7 +200,6 @@ const char STR_FADEOUT[] = TR_FADEOUT; const char STR_DEFAULT[] = TR_DEFAULT; const char STR_CHECKTRIMS[] = TR_CHECKTRIMS; const char STR_MODE[] = TR_MODE; -const char STR_MODE_INDENT[] = TR_MODE_INDENT; const char STR_NOFREEEXPO[] = TR_NOFREEEXPO; const char STR_NOFREEMIXER[] = TR_NOFREEMIXER; const char STR_SOURCE[] = TR_SOURCE; diff --git a/radio/src/translations.h b/radio/src/translations.h index c8213bc70a0..5dd86315a2d 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -347,14 +347,13 @@ extern const char STR_AILERON[]; extern const char STR_ELEVATOR[]; extern const char STR_SWASHRING[]; extern const char STR_MODE[]; -extern const char STR_MODE_INDENT[]; #if defined(AUDIO) && defined(BUZZER) extern const char STR_SPEAKER[]; extern const char STR_BUZZER[]; #else -#define STR_SPEAKER STR_MODE_INDENT -#define STR_BUZZER STR_MODE_INDENT +#define STR_SPEAKER STR_MODE +#define STR_BUZZER STR_MODE #endif extern const char STR_NOFREEEXPO[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 46ed0cac49f..def20e82bf7 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -297,7 +297,6 @@ #define TR_ELEVATOR TR("俯仰源", "俯仰混控源") #define TR_SWASHRING "斜盘行程" #define TR_MODE "模式" -#define TR_MODE_INDENT INDENT "模式" #if LCD_W > LCD_H #define TR_LEFT_STICK "左摇杆" #else @@ -854,8 +853,8 @@ #define TR_ANADIAGS_UNFILTRAW "未经过滤的原始模拟量" #define TR_ANADIAGS_MINMAX "最低值、最高值、行程量" #define TR_ANADIAGS_MOVE "移动模拟量全行程以查看结果!" -#define TR_SPEAKER INDENT "扬声器" -#define TR_BUZZER INDENT "蜂鸣器" +#define TR_SPEAKER "扬声器" +#define TR_BUZZER "蜂鸣器" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("对频", "对频")) #define TR_POWERMETER_ATTN_NEEDED "需要串联衰减器" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index aec435e5cb0..1f3b4915162 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -312,7 +312,6 @@ #define TR_ELEVATOR TR3("Podélná cykl.", "Podélná cykl.", "Podélná cyklika") #define TR_SWASHRING "Cyklika" #define TR_MODE "Mód" -#define TR_MODE_INDENT INDENT "Mód" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vlevo" #else @@ -865,8 +864,8 @@ #define TR_ANADIAGS_UNFILTRAW "Nefiltrované surové hodnoty analogů" #define TR_ANADIAGS_MINMAX "Min., max. a rozsah" #define TR_ANADIAGS_MOVE "Posuňte analogy do jejich maximálních poloh!" -#define TR_SPEAKER INDENT"Repro" -#define TR_BUZZER INDENT"Pípák" +#define TR_SPEAKER "Repro" +#define TR_BUZZER "Pípák" #define TR_BYTES "[B]" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Útlumový člen nutný!" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index ebcff1dacf1..f62067d4c24 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -305,7 +305,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. kilde") #define TR_SWASHRING "Swash ring" #define TR_MODE TR("Tils.","Tilstand") -#define TR_MODE_INDENT TR(INDENT "Tils.",INDENT "Tilstand") #if LCD_W > LCD_H #define TR_LEFT_STICK "Venstre" #else @@ -859,8 +858,8 @@ #define TR_ANADIAGS_UNFILTRAW "Ufilteret rå analog" #define TR_ANADIAGS_MINMAX "Min., max. og interval" #define TR_ANADIAGS_MOVE "Flyt analoge til deres yderpunkter!" -#define TR_SPEAKER INDENT "Højttaler" -#define TR_BUZZER INDENT "Biper" +#define TR_SPEAKER "Højttaler" +#define TR_BUZZER "Biper" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Tils", "Tilslut")) #define TR_POWERMETER_ATTN_NEEDED "Attestering nødvendig" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 6a6644f9705..0a4fa8095bc 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -303,7 +303,6 @@ #define TR_ELEVATOR "Nick Quelle" #define TR_SWASHRING TR("Ring Begrenz", "Ring Begrenzung") #define TR_MODE "Modus" -#define TR_MODE_INDENT INDENT "Modus" #if LCD_W > LCD_H #define TR_LEFT_STICK "Links" #else @@ -858,8 +857,8 @@ #define TR_ANADIAGS_UNFILTRAW "analoge Geber ungefiltert und unbearbeitet" #define TR_ANADIAGS_MINMAX "Min., Max. und Bereich" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT "Lautspr" -#define TR_BUZZER INDENT "Summer" +#define TR_SPEAKER "Lautspr" +#define TR_BUZZER "Summer" #define TR_BYTES "Bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd","Binden")) //9XR-Pro #define TR_POWERMETER_ATTN_NEEDED "Dämpfungsgl. nötig" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 220c165519f..211f768e83b 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -302,7 +302,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" -#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Left" #else @@ -859,8 +858,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT "Speaker" -#define TR_BUZZER INDENT "Buzzer" +#define TR_SPEAKER "Speaker" +#define TR_BUZZER "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Attenuator needed" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 0cfaf086071..2931601c8da 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -300,7 +300,6 @@ #define TR_ELEVATOR TR("Col. long. ", "Fuente col. longitudinal") #define TR_SWASHRING "Ciclico" #define TR_MODE "Modo" -#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Izquierdo" #else @@ -849,8 +848,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT"Altavoz" -#define TR_BUZZER INDENT"Zumbador" +#define TR_SPEAKER "Altavoz" +#define TR_BUZZER "Zumbador" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Enl.]" #define TR_POWERMETER_ATTN_NEEDED "Necesita atenuador" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index b36755e5810..002d713b91d 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -314,7 +314,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" -#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vasemmalle" #else @@ -864,8 +863,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT"Speaker" -#define TR_BUZZER INDENT"Buzzer" +#define TR_SPEAKER "Speaker" +#define TR_BUZZER "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_POWERMETER_ATTN_NEEDED "Tarvitaan vaimennin" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index ddc0d0e1341..3319f0f1e19 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -309,7 +309,6 @@ #define TR_ELEVATOR "Source cyc. lon." #define TR_SWASHRING TR("Limite Cycl.", "Limite du cyclique") #define TR_MODE "Mode" -#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Gauche" #else @@ -857,8 +856,8 @@ #define TR_ANADIAGS_UNFILTRAW "Analog. bruts non filtrés" #define TR_ANADIAGS_MINMAX "Min., max. et courses" #define TR_ANADIAGS_MOVE "Déplacer les analogiques à leurs extrêmes!" -#define TR_SPEAKER INDENT "HP." -#define TR_BUZZER INDENT "Bipeur" +#define TR_SPEAKER "HP." +#define TR_BUZZER "Bipeur" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Atténuateur requis" diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 9625ee34e17..e2b5aefbea3 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -306,7 +306,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" -#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Left" #else @@ -858,8 +857,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT "רמקול" -#define TR_BUZZER INDENT "זמזם" +#define TR_SPEAKER "רמקול" +#define TR_BUZZER "זמזם" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "צימוד")) #define TR_POWERMETER_ATTN_NEEDED "Attenuator needed" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index ca8d5afe1ec..8c476a7afe3 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -302,7 +302,6 @@ #define TR_ELEVATOR TR("Cic. long.", "Sorg. cic. long.") #define TR_SWASHRING "Anello Ciclico" #define TR_MODE "Modo" -#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Sinistro" #else @@ -853,8 +852,8 @@ #define TR_ANADIAGS_UNFILTRAW "Analogici RAW non filtrati" #define TR_ANADIAGS_MINMAX "Min., max. e range" #define TR_ANADIAGS_MOVE "Muovi analogici ai loro estremi!" -#define TR_SPEAKER INDENT "Speaker" -#define TR_BUZZER INDENT "Buzzer" +#define TR_SPEAKER "Speaker" +#define TR_BUZZER "Buzzer" #define TR_BYTES "Bytes" #define TR_MODULE_BIND TR("[Bnd]","[Bind]") #define TR_POWERMETER_ATTN_NEEDED "Attenuatore necessario" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index c860970dac3..6c81094888a 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -301,7 +301,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. ソース") #define TR_SWASHRING "スワッシュリング" #define TR_MODE "モード" -#define TR_MODE_INDENT INDENT "モード" #if LCD_W > LCD_H #define TR_LEFT_STICK "左スティック" #else @@ -858,8 +857,8 @@ #define TR_ANADIAGS_UNFILTRAW "素の状態のアナログ信号をフィルターしない値で表示" #define TR_ANADIAGS_MINMAX "最低値、最高値、範囲を表示" #define TR_ANADIAGS_MOVE "アナログ信号を末端まで動かした値を表示" -#define TR_SPEAKER INDENT "スピーカー" -#define TR_BUZZER INDENT "ブザー" +#define TR_SPEAKER "スピーカー" +#define TR_BUZZER "ブザー" #define TR_BYTES "バイト" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "減衰器が必要です" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 8714508bad7..27e1b33a45e 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -299,7 +299,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Mode" -#define TR_MODE_INDENT INDENT "Mode" #if LCD_W > LCD_H #define TR_LEFT_STICK "Linkerkant" #else @@ -850,8 +849,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT "Speaker" -#define TR_BUZZER INDENT "Zoemer" +#define TR_SPEAKER "Speaker" +#define TR_BUZZER "Zoemer" #define TR_BYTES "bytes" #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_POWERMETER_ATTN_NEEDED "Attenuator needed" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index f294ffe988f..8c150e671e3 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -299,7 +299,6 @@ #define TR_ELEVATOR TR("Long. cyc.", "Long. cyc. source") #define TR_SWASHRING "Tarcza " #define TR_MODE "Tryb" -#define TR_MODE_INDENT INDENT "Tryb" #if LCD_W > LCD_H #define TR_LEFT_STICK "Lewy" #else @@ -851,8 +850,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT"Głośnik" -#define TR_BUZZER INDENT"Brzęczyk" +#define TR_SPEAKER "Głośnik" +#define TR_BUZZER "Brzęczyk" #define TR_BYTES "bajty" #define TR_MODULE_BIND TR("[BND]","[Bind]") #define TR_POWERMETER_ATTN_NEEDED "Attenuator needed" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 9762b1103e7..143eb31f8d4 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -305,7 +305,6 @@ #define TR_ELEVATOR TR("Arfagem", "Org. cíclico Arfagem") #define TR_SWASHRING "Swash Ring" #define TR_MODE "Modo" -#define TR_MODE_INDENT INDENT "Modo" #if LCD_W > LCD_H #define TR_LEFT_STICK "Esq" #else @@ -862,8 +861,8 @@ #define TR_ANADIAGS_UNFILTRAW "Unfiltered raw analogs" #define TR_ANADIAGS_MINMAX "Min., max. and range" #define TR_ANADIAGS_MOVE "Move analogs to their extremes!" -#define TR_SPEAKER INDENT "Speaker" -#define TR_BUZZER INDENT "Buzzer" +#define TR_SPEAKER "Speaker" +#define TR_BUZZER "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Attenuator needed" diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index ac5b074bbba..010c8bddb60 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -304,7 +304,6 @@ #define TR_ELEVATOR TR("Тангаж", "Тангаж") #define TR_SWASHRING "Поворот" #define TR_MODE "Режим" -#define TR_MODE_INDENT INDENT "Режим" #if LCD_W > LCD_H #define TR_LEFT_STICK "Лев" #else @@ -861,8 +860,8 @@ #define TR_ANADIAGS_UNFILTRAW "Неотфильтр необработ аналог сигн" #define TR_ANADIAGS_MINMAX "Мин., Макс. и Диапазон" #define TR_ANADIAGS_MOVE "Двигайте аналоговые датчики!" -#define TR_SPEAKER INDENT "Динамик" -#define TR_BUZZER INDENT "Звук сигнал" +#define TR_SPEAKER "Динамик" +#define TR_BUZZER "Звук сигнал" #define TR_BYTES "Байты" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Требуется аттенюатор" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 730e0f43966..2384e040ebc 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -315,7 +315,6 @@ #define TR_ELEVATOR "Höjdroderkälla" #define TR_SWASHRING "Swashring" #define TR_MODE "Typ" -#define TR_MODE_INDENT INDENT "Typ" #if LCD_W > LCD_H #define TR_LEFT_STICK "Vänster" #else @@ -873,8 +872,8 @@ #define TR_ANADIAGS_UNFILTRAW "Ofiltrerade råa analoga" #define TR_ANADIAGS_MINMAX "Min., max. och omfång" #define TR_ANADIAGS_MOVE "Rör analoga till sina ytterlägen!" -#define TR_SPEAKER INDENT "Högtalare" -#define TR_BUZZER INDENT "Summer" +#define TR_SPEAKER "Högtalare" +#define TR_BUZZER "Summer" #define TR_BYTES "byte" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_POWERMETER_ATTN_NEEDED "Attenuator behövs" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index dfb535c31ee..bd64ff3f4ce 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -302,7 +302,6 @@ #define TR_ELEVATOR TR("俯仰源", "俯仰混控源") #define TR_SWASHRING "斜盤行程" #define TR_MODE "模式" -#define TR_MODE_INDENT INDENT "模式" #if LCD_W > LCD_H #define TR_LEFT_STICK "左搖桿" #else @@ -859,8 +858,8 @@ #define TR_ANADIAGS_UNFILTRAW "未經過濾的原始類比量" #define TR_ANADIAGS_MINMAX "最低值、最高值、行程量" #define TR_ANADIAGS_MOVE "移動類比量全行程以查看結果" -#define TR_SPEAKER INDENT "揚聲器" -#define TR_BUZZER INDENT "蜂鳴器" +#define TR_SPEAKER "揚聲器" +#define TR_BUZZER "蜂鳴器" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("對頻", "對頻")) #define TR_POWERMETER_ATTN_NEEDED "需要串聯衰減器" diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index f9ba499890f..5600fcba454 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -304,7 +304,6 @@ #define TR_ELEVATOR TR("Тангаж", "Тангаж") #define TR_SWASHRING "Поворот" #define TR_MODE "Режим" -#define TR_MODE_INDENT INDENT "Режим" #if LCD_W > LCD_H #define TR_LEFT_STICK "Ліво" #else @@ -861,8 +860,8 @@ #define TR_ANADIAGS_UNFILTRAW "Неформатовані сирі аналоги" #define TR_ANADIAGS_MINMAX "Min., max. і діапазон" #define TR_ANADIAGS_MOVE "Перемістити аналоги до екстремумів!" -#define TR_SPEAKER INDENT "Гучномовець" -#define TR_BUZZER INDENT "Дзвоник" +#define TR_SPEAKER "Гучномовець" +#define TR_BUZZER "Дзвоник" #define TR_BYTES "байти" #define TR_MODULE_BIND BUTTON(TR("Прив.", "Прив'язати")) #define TR_POWERMETER_ATTN_NEEDED "Потрібен атенюатор" From a2d9e5905fe717733543f889522c4c1713ee27de Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Thu, 2 May 2024 07:46:36 +0000 Subject: [PATCH 3/6] chore: remove last reference to GRAPHICS define --- radio/util/fwoptions.py | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index 1eacbf20a4a..a7a57dea06a 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -22,46 +22,6 @@ "pt" } - -options_sky9x = { - "heli": ("HELI", "YES", "NO"), - "gvars": ("GVARS", "YES", "NO"), - "potscroll": ("NAVIGATION", "POTS", "NO"), - "autosource": ("AUTOSOURCE", "YES", "NO"), - "autoswitch": ("AUTOSWITCH", "YES", "NO"), - "dblkeys": ("DBLKEYS", "YES", "NO"), - "nographics": ("GRAPHICS", "NO", "YES"), - "battgraph": ("BATTGRAPH", "YES", "NO"), - "nobold": ("BOLD", "NO", "YES"), - "sqt5font": ("FONT", "SQT5", None), - "imperial": ("UNITS", "IMPERIAL", "METRIC"), - "bluetooth": ("BLUETOOTH", "YES", "NO"), - "faimode": ("FAI", "YES", None), - "faichoice": ("FAI", "CHOICE", None), - "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) -} - -options_ar9x = { - "heli": ("HELI", "YES", "NO"), - "gvars": ("GVARS", "YES", "NO"), - "potscroll": ("NAVIGATION", "POTS", "NO"), - "autosource": ("AUTOSOURCE", "YES", "NO"), - "autoswitch": ("AUTOSWITCH", "YES", "NO"), - "dblkeys": ("DBLKEYS", "YES", "NO"), - "nographics": ("GRAPHICS", "NO", "YES"), - "battgraph": ("BATTGRAPH", "YES", "NO"), - "nobold": ("BOLD", "NO", "YES"), - "sqt5font": ("FONT", "SQT5", None), - "imperial": ("UNITS", "IMPERIAL", "METRIC"), - "bluetooth": ("BLUETOOTH", "YES", "NO"), - "faimode": ("FAI", "YES", None), - "faichoice": ("FAI", "CHOICE", None), - "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), - # "rtc": ("RTCLOCK", "YES", "NO"), - "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None) -} - options_taranis_x9d = { "noheli": ("HELI", "NO", "YES"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), @@ -215,7 +175,6 @@ "flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None), } - options_jumper_t12 = { "noheli": ("HELI", "NO", "YES"), "lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"), From 5e8f3e544de994459d2323cfc132ecf59a18193f Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 8 May 2024 16:42:34 +1000 Subject: [PATCH 4/6] Remove more cases where INDENT is added to strings. Fix inconsistencies in translation strings. --- radio/src/gui/128x64/radio_setup.cpp | 25 +++++++++++++++---------- radio/src/gui/212x64/model_setup.cpp | 8 ++++---- radio/src/gui/212x64/radio_setup.cpp | 6 +++--- radio/src/translations.cpp | 6 +++--- radio/src/translations/cn.h | 8 ++++---- radio/src/translations/cz.h | 18 +++++++++--------- radio/src/translations/da.h | 8 ++++---- radio/src/translations/de.h | 14 +++++++------- radio/src/translations/en.h | 8 ++++---- radio/src/translations/es.h | 18 +++++++++--------- radio/src/translations/fi.h | 16 ++++++++-------- radio/src/translations/fr.h | 8 ++++---- radio/src/translations/he.h | 8 ++++---- radio/src/translations/it.h | 22 +++++++++++----------- radio/src/translations/jp.h | 8 ++++---- radio/src/translations/nl.h | 8 ++++---- radio/src/translations/pl.h | 8 ++++---- radio/src/translations/pt.h | 8 ++++---- radio/src/translations/ru.h | 8 ++++---- radio/src/translations/se.h | 8 ++++---- radio/src/translations/tw.h | 8 ++++---- radio/src/translations/ua.h | 8 ++++---- 22 files changed, 121 insertions(+), 116 deletions(-) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index dfc67861772..7798eb6ec3d 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -94,8 +94,9 @@ enum { CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED) CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_OFF_SPEED) CASE_PXX2(ITEM_RADIO_SETUP_OWNER_ID) + CASE_GPS(ITEM_RADIO_SETUP_LABEL_GPS) CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE) - ITEM_RADIO_SETUP_ADJUST_RTC, + CASE_GPS(ITEM_RADIO_SETUP_ADJUST_RTC) CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT) CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE) ITEM_RADIO_SETUP_LANGUAGE, @@ -194,7 +195,9 @@ void menuRadioSetup(event_t event) CASE_PXX2(0) /* owner registration ID */ CASE_GPS(0) - 0, CASE_GPS(0) + CASE_GPS(0) + CASE_GPS(0) + CASE_GPS(0) CASE_PXX1(0) 0, 0, 0, IF_FAI_CHOICE(0) 0, @@ -346,17 +349,17 @@ void menuRadioSetup(event_t event) #endif case ITEM_RADIO_SETUP_BEEP_VOLUME: - lcdDrawTextAlignedLeft(y, STR_BEEP_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_BEEP_VOLUME); SLIDER_5POS(y, g_eeGeneral.beepVolume, event, attr); break; case ITEM_RADIO_SETUP_WAV_VOLUME: - lcdDrawTextAlignedLeft(y, STR_WAV_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_WAV_VOLUME); SLIDER_5POS(y, g_eeGeneral.wavVolume, event, attr); break; case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: - lcdDrawTextAlignedLeft(y, STR_BG_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_BG_VOLUME); SLIDER_5POS(y, g_eeGeneral.backgroundVolume, event, attr); break; @@ -621,9 +624,13 @@ void menuRadioSetup(event_t event) #endif #if defined(GPS) + case ITEM_RADIO_SETUP_LABEL_GPS: + lcdDrawTextAlignedLeft(y, STR_GPS); + break; + case ITEM_RADIO_SETUP_TIMEZONE: { - lcdDrawTextAlignedLeft(y, STR_TIMEZONE); + lcdDrawText(INDENT_WIDTH, y, STR_TIMEZONE); int tzIndex = timezoneIndex(g_eeGeneral.timezone, g_eeGeneral.timezoneMinutes); lcdDrawText(LCD_W-2, y, timezoneDisplay(tzIndex).c_str(), attr|RIGHT); if (attr) { @@ -637,13 +644,11 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_ADJUST_RTC: - lcdDrawTextAlignedLeft(y, STR_ADJUST_RTC); - g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, LCD_W-9, y, nullptr, attr, event); + g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, LCD_W-9, y, STR_ADJUST_RTC, attr, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_GPSFORMAT: - lcdDrawTextAlignedLeft(y, STR_GPS_COORDS_FORMAT); - g_eeGeneral.gpsFormat = editChoice(LCD_W-2, y, nullptr, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr|RIGHT, event); + g_eeGeneral.gpsFormat = editChoice(LCD_W-2, y, STR_GPS_COORDS_FORMAT, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr|RIGHT, event, INDENT_WIDTH); break; #endif diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 07f58b389a6..886b43fe140 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -789,12 +789,12 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_THROTTLE_REVERSED: - g_model.throttleReversed = editCheckBox(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event ); + g_model.throttleReversed = editCheckBox(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_TRACE: { - lcdDrawTextAlignedLeft(y, STR_TTRACE); + lcdDrawText(INDENT_WIDTH, y, STR_TTRACE); if (attr) CHECK_INCDEC_MODELVAR_ZERO_CHECK( event, g_model.thrTraceSrc, @@ -807,11 +807,11 @@ void menuModelSetup(event_t event) } case ITEM_MODEL_SETUP_THROTTLE_TRIM: - g_model.thrTrim = editCheckBox(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN, y, STR_TTRIM, attr, event); + g_model.thrTrim = editCheckBox(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN, y, STR_TTRIM, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_TRIM_SWITCH: - lcdDrawTextAlignedLeft(y, STR_TTRIM_SW); + lcdDrawText(INDENT_WIDTH, y, STR_TTRIM_SW); if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.thrTrimSw, keysGetMaxTrims() - 1); drawSource(MODEL_SETUP_2ND_COLUMN, y, g_model.getThrottleStickTrimSource(), attr); diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 33f145d80b3..22cd679469d 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -352,17 +352,17 @@ void menuRadioSetup(event_t event) } case ITEM_RADIO_SETUP_BEEP_VOLUME: - lcdDrawTextAlignedLeft(y, STR_BEEP_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_BEEP_VOLUME); SLIDER_5POS(y, g_eeGeneral.beepVolume, event, attr); break; case ITEM_RADIO_SETUP_WAV_VOLUME: - lcdDrawTextAlignedLeft(y, STR_WAV_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_WAV_VOLUME); SLIDER_5POS(y, g_eeGeneral.wavVolume, event, attr); break; case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: - lcdDrawTextAlignedLeft(y, STR_BG_VOLUME); + lcdDrawText(INDENT_WIDTH, y, STR_BG_VOLUME); SLIDER_5POS(y, g_eeGeneral.backgroundVolume, event, attr); break; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 1e849d3287e..505d111559b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -393,9 +393,9 @@ const char STR_UNITS_PPM[] = TR_UNITS_PPM; const char STR_VOICE_LANGUAGE[] = TR_VOICE_LANGUAGE; const char STR_MODELIDUSED[] = TR_MODELIDUSED; const char STR_MODELIDUNIQUE[] = TR_MODELIDUNIQUE; -const char STR_BEEP_VOLUME[] = INDENT TR_BEEP_VOLUME; -const char STR_WAV_VOLUME[] = INDENT TR_WAV_VOLUME; -const char STR_BG_VOLUME[] = INDENT TR_BG_VOLUME; +const char STR_BEEP_VOLUME[] = TR_BEEP_VOLUME; +const char STR_WAV_VOLUME[] = TR_WAV_VOLUME; +const char STR_BG_VOLUME[] = TR_BG_VOLUME; const char STR_SELECT_MODEL[] = TR_SELECT_MODEL; const char STR_MODELS[] = TR_MODELS; const char STR_SELECT_MODE[] = TR_SELECT_MODE; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index def20e82bf7..a7401bf6236 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -268,9 +268,9 @@ #define TR_ETRIMS TR("扩展微调", "扩展微调量") #define TR_TRIMINC "微调步幅" #define TR_DISPLAY_TRIMS TR("微调显示", "微调显示") -#define TR_TTRACE TR("输入源", INDENT "输入源") -#define TR_TTRIM TR("油门微调仅怠速", INDENT "油门微调只调整怠速") -#define TR_TTRIM_SW TR("微调选择", INDENT "微调选择") +#define TR_TTRACE TR("输入源", "输入源") +#define TR_TTRIM TR("油门微调仅怠速", "油门微调只调整怠速") +#define TR_TTRIM_SW TR("微调选择", "微调选择") #define TR_BEEPCTR TR("中点提示音", "中点蜂鸣提示音") #define TR_USE_GLOBAL_FUNCS TR("全局功能", "全局功能可介入") #define TR_PPMFRAME INDENT "PPM帧" @@ -363,7 +363,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "按ENTER键确认" #define TR_THROTTLE_LABEL "油门" #define TR_THROTTLE_START "油门开始" -#define TR_THROTTLEREVERSE TR("油门反向", INDENT "油门反向") +#define TR_THROTTLEREVERSE TR("油门反向", "油门反向") #define TR_MINUTEBEEP TR("分", "分钟播报") #define TR_BEEPCOUNTDOWN INDENT "倒数" #define TR_PERSISTENT TR(INDENT "关机保持", INDENT "关机保持") diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 1f3b4915162..0bd212b765c 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -282,9 +282,9 @@ #define TR_ETRIMS TR("širší Trim", "Široký trim") #define TR_TRIMINC TR("Krok Trimu", "Krok trimu") #define TR_DISPLAY_TRIMS TR3("Číslo v Trm", "Zobr.hodnotu trimu", "Číslo v liště trimu") -#define TR_TTRACE TR("StopaPlynu", INDENT "Stopa plynu") -#define TR_TTRIM TR3("TrimVolnob.", INDENT "Trim jen volnoběh", "Trim jen pro volnoběh") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim spínač") +#define TR_TTRACE TR("StopaPlynu", "Stopa plynu") +#define TR_TTRIM TR3("TrimVolnob.", "Trim jen volnoběh", "Trim jen pro volnoběh") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim spínač") #define TR_BEEPCTR TR("Pípat střed", "Pípnutí při středové poloze") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funkce", "Použít globální funkce") #define TR_PROTOCOL "Protokol" @@ -379,7 +379,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Zmáčkni ENTER pro potvrzení" #define TR_THROTTLE_LABEL "Plyn" #define TR_THROTTLE_START "Plyn Start" -#define TR_THROTTLEREVERSE TR("ReverzPlyn", INDENT"Reverz plynu") +#define TR_THROTTLEREVERSE TR("ReverzPlyn", "Reverz plynu") #define TR_MINUTEBEEP TR("Minuta", "Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" @@ -395,13 +395,13 @@ #define TR_PLAY_HELLO "Zvuk při spuštění" #define TR_PWR_ON_DELAY "Zpoždění zapnutí" #define TR_PWR_OFF_DELAY "Zpoždění vypnutí" -#define TR_THROTTLE_WARNING TR("* Plyn", INDENT "Kontrola plynu") +#define TR_THROTTLE_WARNING TR(INDENT "* Plyn", INDENT "Kontrola plynu") #define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Vlas-Poz", INDENT INDENT INDENT INDENT "Vlastní pozice?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Poz. %", "Pozice %") -#define TR_SWITCHWARNING TR("* Spínače", INDENT "Polohy spínačů") -#define TR_POTWARNINGSTATE TR("* Pot&Slid.", INDENT "Kontrola Pot&Slid.") -#define TR_SLIDERWARNING TR("* Slidery", INDENT "Pozice sliderů") -#define TR_POTWARNING TR("* Potenc.", INDENT "Potenciometry") +#define TR_SWITCHWARNING TR(INDENT "* Spínače", INDENT "Polohy spínačů") +#define TR_POTWARNINGSTATE TR(INDENT "* Pot&Slid.", INDENT "Kontrola Pot&Slid.") +#define TR_SLIDERWARNING TR(INDENT "* Slidery", INDENT "Pozice sliderů") +#define TR_POTWARNING TR(INDENT "* Potenc.", INDENT "Potenciometry") #define TR_TIMEZONE "Časové pásmo" #define TR_ADJUST_RTC TR3("Čas z GPS", "Použít čas z GPS", "Použít čas z GPS") #define TR_GPS "GPS" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index f62067d4c24..fae52782de1 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -275,9 +275,9 @@ #define TR_ETRIMS TR("Udv.Trim", "Udvidet trim") #define TR_TRIMINC "Trim øge" #define TR_DISPLAY_TRIMS TR("Vis trim", "Vis trim") -#define TR_TTRACE TR("T-kilde", INDENT "kilde") -#define TR_TTRIM TR("T-trim-tomg", INDENT "Trim tomgang alene") -#define TR_TTRIM_SW TR("T-trim-ko", INDENT "Trim kontakt") +#define TR_TTRACE TR("T-kilde", "kilde") +#define TR_TTRIM TR("T-trim-tomg", "Trim tomgang alene") +#define TR_TTRIM_SW TR("T-trim-ko", "Trim kontakt") #define TR_BEEPCTR TR("Bip ctr pos", "Bip ved center position") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funk.", "Brug global funk.") #define TR_PROTOCOL TR("Proto", "Protokol") @@ -373,7 +373,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Tryk enter for bekræft" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLE_START "Gas Start" -#define TR_THROTTLEREVERSE TR("T-omvendt", INDENT "Omvendt") +#define TR_THROTTLEREVERSE TR("T-omvendt", "Omvendt") #define TR_MINUTEBEEP TR("Minut", "Minut kald") #define TR_BEEPCOUNTDOWN INDENT "Nedtælling" #define TR_PERSISTENT TR(INDENT "Varig", INDENT "Varig") diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 0a4fa8095bc..9853f321414 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -273,9 +273,9 @@ #define TR_ETRIMS TR("Erw. Trims", "Erw. Trim auf 100%") #define TR_TRIMINC TR("Trimschritt", "Trimmschritte") #define TR_DISPLAY_TRIMS TR("Trimmanzeige", "Trimmwerte anzeigen") -#define TR_TTRACE TR("Gasquelle", INDENT "Gas-Timerquelle") -#define TR_TTRIM TR("Gastrim", INDENT "Gas-Leerlauftrim") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("Gasquelle", "Gas-Timerquelle") +#define TR_TTRIM TR("Gastrim", "Gas-Leerlauftrim") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("MittePieps", "Pieps in Mittelstellung") #define TR_USE_GLOBAL_FUNCS TR("Glob. Funkt.", "Globale Funkt verw.") #define TR_PROTOCOL TR("Protok.", "Protokoll") @@ -370,7 +370,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Drücke [ENTER] zum Bestätigen" #define TR_THROTTLE_LABEL "Gas-Kontrolle" #define TR_THROTTLE_START "Gas Start" -#define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis +#define TR_THROTTLEREVERSE TR("Gas invers", "Vollgas hinten?") //Änderung wg TH9x, Taranis #define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Permanent", INDENT "Permanent") @@ -386,13 +386,13 @@ #define TR_PLAY_HELLO "Startton abspielen" #define TR_PWR_ON_DELAY "PWR EIN Verzög." #define TR_PWR_OFF_DELAY "PWR AUS Verzög." -#define TR_THROTTLE_WARNING TR("Gasalarm", INDENT "Gas Alarm") +#define TR_THROTTLE_WARNING TR(INDENT "Gasalarm", INDENT "Gas Alarm") #define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter-Alarm") +#define TR_SWITCHWARNING TR(INDENT "Sch. Alarm", INDENT "Schalter-Alarm") #define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") #define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR("Potiwarnung", INDENT "Poti-Warnung") +#define TR_POTWARNING TR(INDENT "Potiwarnung", INDENT "Poti-Warnung") #define TR_TIMEZONE TR("Zeitzone", "GPS-Zeitzone +/-Std") #define TR_ADJUST_RTC TR("GPSzeit setzen", "Uhrzeit per GPS setzen") #define TR_GPS "GPS" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 211f768e83b..0fc859394cd 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -272,9 +272,9 @@ #define TR_ETRIMS TR("E.Trims", "Extended trims") #define TR_TRIMINC "Trim Step" #define TR_DISPLAY_TRIMS TR("Show Trims", "Display trims") -#define TR_TTRACE TR("T-Source", INDENT "Source") -#define TR_TTRIM TR("T-Trim-Idle", INDENT "Trim idle only") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("T-Source", "Source") +#define TR_TTRIM TR("T-Trim-Idle", "Trim idle only") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Ctr Beep", "Beep when centered") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "Use global funcs") #define TR_PROTOCOL TR("Proto", "Protocol") @@ -368,7 +368,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLE_START "Throttle Start" -#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") +#define TR_THROTTLEREVERSE TR("T-Reverse", "Reverse") #define TR_MINUTEBEEP TR("Minute", "Minute call") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 2931601c8da..a0058f947cf 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -270,9 +270,9 @@ #define TR_ETRIMS TR("E.Trims", "Ampliar trims") #define TR_TRIMINC "Paso trim" #define TR_DISPLAY_TRIMS "Ver trims" -#define TR_TTRACE TR("Fuente-A", INDENT "Fuente acelerador") -#define TR_TTRIM TR("Trim-A", INDENT "Trim acelerador") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("Fuente-A", "Fuente acelerador") +#define TR_TTRIM TR("Trim-A", "Trim acelerador") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Beep ctr", "Beep centro") #define TR_USE_GLOBAL_FUNCS TR("Funcs. glob.", "Usar func. globales") #define TR_PROTOCOL TR("Proto", "Protocolo") @@ -366,7 +366,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Enter para confirmar" #define TR_THROTTLE_LABEL "Potencia" #define TR_THROTTLE_START "Potencia Start" -#define TR_THROTTLEREVERSE TR("Invert acel", INDENT "Invertir acel.") +#define TR_THROTTLEREVERSE TR("Invert acel", "Invertir acel.") #define TR_MINUTEBEEP TR("Minuto", "Cada minuto") #define TR_BEEPCOUNTDOWN TR(INDENT"Cta. atrás", INDENT"Cuenta atrás") #define TR_PERSISTENT TR(INDENT"Persisten.", INDENT"Persistente") @@ -382,14 +382,14 @@ #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY TR("Atraso On", "Atraso encendido") #define TR_PWR_OFF_DELAY TR("Atraso Off", "Atraso apagado") -#define TR_THROTTLE_WARNING TR("Aviso-A", INDENT "Aviso acelerador") +#define TR_THROTTLE_WARNING TR(INDENT "Aviso-A", INDENT "Aviso acelerador") #define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso interruptor") +#define TR_SWITCHWARNING TR(INDENT "Aviso-I", INDENT "Aviso interruptor") #define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") #define TR_SLIDERWARNING TR(INDENT "Pos. slid.", INDENT "Posiciones slider") -#define TR_POTWARNING TR("Aviso pot", INDENT "Aviso pot") -#define TR_TIMEZONE TR("Zona horaria", INDENT "Zona horaria") +#define TR_POTWARNING TR(INDENT "Aviso pot", INDENT "Aviso pot") +#define TR_TIMEZONE "Zona horaria" #define TR_ADJUST_RTC TR("Ajustar RTC", "Ajustar RTC") #define TR_GPS "GPS" #define TR_DEF_CHAN_ORD TR("Rx Orden canal", "Orden habitual canales") @@ -555,7 +555,7 @@ #define TR_MULTI_MAX_THROW TR("Máx. Throw", "Activar máx. throw") #define TR_MULTI_RFCHAN TR("Canal RF", "Selecciona canal RF") #define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling") -#define TR_GPS_COORDS_FORMAT TR("Coords GPS", INDENT "Formato coordenadas") +#define TR_GPS_COORDS_FORMAT TR("Coords GPS", "Formato coordenadas") #define TR_VARIO TR("Vario", "Variómetro") #define TR_PITCH_AT_ZERO INDENT "Pitch en cero" #define TR_PITCH_AT_MAX INDENT "Pitch en máx" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 002d713b91d..00f08d5cd5c 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -284,13 +284,13 @@ #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" #define TR_DISPLAY_TRIMS "Display Trims" -#define TR_TTRACE TR("T-Source", INDENT "Throttle Source") -#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("T-Source", "Throttle Source") +#define TR_TTRIM TR("T-Trim", "Throttle Trim") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_USE_GLOBAL_FUNCS "Use Global Funcs" #define TR_PROTOCOL TR("Proto", "Protocol") -#define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") +#define TR_PPMFRAME INDENT "PPM frame" #define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") #define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Warning: output level is VBAT: ") #define TR_WARN_5VOLTS "Warning: output level is 5 volts" @@ -380,7 +380,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLE_START "Throttle Start" -#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse") +#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") #define TR_MINUTEBEEP TR("Minute", "Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistent") @@ -396,13 +396,13 @@ #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" #define TR_PWR_OFF_DELAY "Pwr Off delay" -#define TR_THROTTLE_WARNING TR("T-Warning", INDENT "Throttle Warning") +#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "Throttle Warning") #define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning") +#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch Warning") #define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") #define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") +#define TR_POTWARNING TR(INDENT "Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_ADJUST_RTC TR("Adjust RTC", "Adjust RTC") #define TR_GPS "GPS" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 3319f0f1e19..5825d2a3347 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -279,9 +279,9 @@ #define TR_ETRIMS TR("Trims ét.", "Trims étendus") #define TR_TRIMINC TR("Pas Trim", "Pas du trim") #define TR_DISPLAY_TRIMS TR("Aff. trims", "Affichage trims") -#define TR_TTRACE TR("Source gaz", INDENT "Source") -#define TR_TTRIM TR("Trim gaz", INDENT "Trim ralenti uniq.") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("Source gaz", "Source") +#define TR_TTRIM TR("Trim gaz", "Trim ralenti uniq.") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Ctr Beep", "Bip quand centré") #define TR_USE_GLOBAL_FUNCS TR("Fonc. glob.", "Fonct. Globales") #define TR_PROTOCOL TR("Proto.", "Protocole") @@ -376,7 +376,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Appui [Enter] pour confirmer" #define TR_THROTTLE_LABEL "Gaz" #define TR_THROTTLE_START "Gaz Start" -#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz", "Inversion gaz") #define TR_MINUTEBEEP TR("Bip min.", "Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin", INDENT "Compte à rebours") #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistant") diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index e2b5aefbea3..8800b9c6c6e 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -276,9 +276,9 @@ #define TR_ETRIMS TR("E.Trims", "הרחב תצוגות") #define TR_TRIMINC "רגישות קיזוז" #define TR_DISPLAY_TRIMS TR("Show Trims", "הצג קיזוזים") -#define TR_TTRACE TR("T-Source", INDENT "מקור") -#define TR_TTRIM TR("T-Trim-Idle", INDENT "Trim idle only") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "מתג קיזוז") +#define TR_TTRACE TR("T-Source", "מקור") +#define TR_TTRIM TR("T-Trim-Idle", "Trim idle only") +#define TR_TTRIM_SW TR("T-Trim-Sw", "מתג קיזוז") #define TR_BEEPCTR TR("Ctr Beep", "ציפצוף במרכז") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "שימוש בפונקציות גלובליות") #define TR_PROTOCOL TR("Proto", "Protocol") @@ -372,7 +372,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "לחץ אנטר לאישור" #define TR_THROTTLE_LABEL "מצערת" #define TR_THROTTLE_START "מצערת מתחילה" -#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "היפוך") +#define TR_THROTTLEREVERSE TR("T-Reverse", "היפוך") #define TR_MINUTEBEEP TR("דקה", "הקראת דקות") #define TR_BEEPCOUNTDOWN INDENT "ספירה לאחור" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 8c476a7afe3..ae0d5e70924 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -272,9 +272,9 @@ #define TR_ETRIMS TR("Trim Est.", "Trim Estesi") #define TR_TRIMINC "Passo Trim" #define TR_DISPLAY_TRIMS TR("Mos.Trims", "Mostra Trims") -#define TR_TTRACE TR("Sor. Mot.", INDENT "Sorgente Motore") -#define TR_TTRIM TR("Trim Mot.", INDENT "Trim Motore") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("Sor. Mot.", "Sorgente Motore") +#define TR_TTRIM TR("Trim Mot.", "Trim Motore") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Beep Ctr", "Beep quando centrato") #define TR_USE_GLOBAL_FUNCS TR("Funz. Glob.", "Usa Funz. Globali") #define TR_PROTOCOL TR("Protoc.", "Protocollo") @@ -368,7 +368,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Premi [ENT] per confermare" #define TR_THROTTLE_LABEL "Motore" #define TR_THROTTLE_START "Partenza motore" -#define TR_THROTTLEREVERSE TR("T-Invertito", INDENT "Invertito") +#define TR_THROTTLEREVERSE TR("T-Invertito", "Invertito") #define TR_MINUTEBEEP TR("Minuto", "Minuto call") #define TR_BEEPCOUNTDOWN TR(INDENT "Conto rov", INDENT "Conto rovescia") #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistente") @@ -392,7 +392,7 @@ #define TR_SLIDERWARNING TR(INDENT "Pos. slid.", INDENT "Posizione slider") #define TR_POTWARNING TR(INDENT "Avv. Pot.", INDENT "Avviso Pot.") #define TR_TIMEZONE "Ora locale" -#define TR_ADJUST_RTC TR(INDENT "Agg. RTC", "Aggiusta RTC") +#define TR_ADJUST_RTC TR("Agg. RTC", "Aggiusta RTC") #define TR_GPS "GPS" #define TR_DEF_CHAN_ORD TR("Ord. can. pred.", "Ordine canali predefinito") #define TR_STICKS "Sticks" @@ -766,12 +766,12 @@ #define TR_FLASH_BOOTLOADER TR("Prog. bootloader", "Programma bootloader") #define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Prog. disp. est.", "Programma dispositivo esterno") -#define TR_FLASH_RECEIVER_OTA TR("Prog. RX OTA", INDENT "Programma RX OTA") -#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA TR("Flash RX da OTA est.", INDENT "Flash RX da OTA esterno") -#define TR_FLASH_RECEIVER_BY_INTERNAL_MODULE_OTA TR("Flash RX da OTA int.", INDENT "Flash RX da OTA interno") -#define TR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA TR("Flash FC da OTA est.", INDENT "Flash FC da OTA esterno") -#define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA TR("Flash FC da OTA int.", INDENT "Flash FC da OTA interno") -#define TR_FLASH_BLUETOOTH_MODULE TR("Flash mod. BT", INDENT "Flash modulo Bluetooth") +#define TR_FLASH_RECEIVER_OTA TR("Prog. RX OTA", "Programma RX OTA") +#define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA TR("Flash RX da OTA est.", "Flash RX da OTA esterno") +#define TR_FLASH_RECEIVER_BY_INTERNAL_MODULE_OTA TR("Flash RX da OTA int.", "Flash RX da OTA interno") +#define TR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA TR("Flash FC da OTA est.", "Flash FC da OTA esterno") +#define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA TR("Flash FC da OTA int.", "Flash FC da OTA interno") +#define TR_FLASH_BLUETOOTH_MODULE TR("Flash mod. BT", "Flash modulo Bluetooth") #define TR_FLASH_POWER_MANAGEMENT_UNIT TR("Flash PMU", "Programma PMU") #define TR_DEVICE_NO_RESPONSE TR("Device non risponde", "Device non risponde") #define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 6c81094888a..134c97e35e6 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -271,9 +271,9 @@ #define TR_ETRIMS TR("E.Trims", "トリム拡張") #define TR_TRIMINC "トリムステップ" #define TR_DISPLAY_TRIMS TR("Show Trims", "トリム表示") -#define TR_TTRACE TR("T-Source", INDENT "ソース") -#define TR_TTRIM TR("T-Trim-Idle", INDENT "アイドル時トリム") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "トリムスイッチ") +#define TR_TTRACE TR("T-Source", "ソース") +#define TR_TTRIM TR("T-Trim-Idle", "アイドル時トリム") +#define TR_TTRIM_SW TR("T-Trim-Sw", "トリムスイッチ") #define TR_BEEPCTR TR("Ctr Beep", "中央値でビープ") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "グローバルFuncs利用") #define TR_PROTOCOL TR("Proto", "プロトコル") @@ -367,7 +367,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Enterを押して確認してください" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLE_START "Throttle アップ" -#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "リバース") +#define TR_THROTTLEREVERSE TR("T-Reverse", "リバース") #define TR_MINUTEBEEP TR("Minute", "分単位コール") #define TR_BEEPCOUNTDOWN INDENT "カウントダウン" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "持続設定") diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 27e1b33a45e..5eec5186d26 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -269,9 +269,9 @@ #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" #define TR_DISPLAY_TRIMS "Toon Trims" -#define TR_TTRACE TR("T-Source", INDENT "Source") -#define TR_TTRIM TR("T-Trim", INDENT "Trim Idle Only") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("T-Source", "Source") +#define TR_TTRIM TR("T-Trim", "Trim Idle Only") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "Globale Functies") #define TR_PROTOCOL TR("Proto", "Protocol") @@ -366,7 +366,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLE_START "Gas Start" -#define TR_THROTTLEREVERSE TR("Reverse", INDENT "Omgekeerd") +#define TR_THROTTLEREVERSE TR("Reverse", "Omgekeerd") #define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Vasth.", INDENT "Vasthouden") diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 8c150e671e3..5eecf9ebf9b 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -269,9 +269,9 @@ #define TR_ETRIMS TR("E.Trym ", "Poszer Trymery") #define TR_TRIMINC "Krok Trym" #define TR_DISPLAY_TRIMS TR("Pok.Trym.","Pokaż Trymery") -#define TR_TTRACE TR("Źród gaz", INDENT "Źródło gazu ") -#define TR_TTRIM TR("TryGaz", INDENT "TrymWolnObrotó") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("Źród gaz", "Źródło gazu ") +#define TR_TTRIM TR("TryGaz", "TrymWolnObrotó") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Dźwięk środ.", "Dźwięk środ. położenia") #define TR_USE_GLOBAL_FUNCS TR("Funk.Glb.","Użyj Funkcji Glb") #define TR_PROTOCOL TR("Proto", "Protokół") @@ -365,7 +365,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_THROTTLE_LABEL "Gaz" #define TR_THROTTLE_START "Gaz Start" -#define TR_THROTTLEREVERSE TR("OdwrGaz", INDENT "OdwrGaz") +#define TR_THROTTLEREVERSE TR("OdwrGaz", "OdwrGaz") #define TR_MINUTEBEEP TR("Minuta", "PikCoMinutę") #define TR_BEEPCOUNTDOWN INDENT "Odliczanie" #define TR_PERSISTENT TR(INDENT "Dokł.", INDENT "Dokładny") diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 143eb31f8d4..d0d216f1608 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -275,9 +275,9 @@ #define TR_ETRIMS TR("E.Trims", "Trims extend.") #define TR_TRIMINC "PassoTrim" #define TR_DISPLAY_TRIMS TR("Exb Trims", "Exibir trims") -#define TR_TTRACE TR("T-Source", INDENT "Source") -#define TR_TTRIM TR("T-Trim-Idle", INDENT "Trim idle only") -#define TR_TTRIM_SW TR("T-Trim-Sw", INDENT "Trim switch") +#define TR_TTRACE TR("T-Source", "Source") +#define TR_TTRIM TR("T-Trim-Idle", "Trim idle only") +#define TR_TTRIM_SW TR("T-Trim-Sw", "Trim switch") #define TR_BEEPCTR TR("Bip Cntr", "Bipe quando centralizado") #define TR_USE_GLOBAL_FUNCS TR("Funcs.Glob", "Usar func.global") #define TR_PROTOCOL TR("Proto", "Protocolo") @@ -371,7 +371,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Press enter p/ confirmar" #define TR_THROTTLE_LABEL "Motor" #define TR_THROTTLE_START "Iniciar Motor" -#define TR_THROTTLEREVERSE TR("T-Reverso", INDENT "Reverso") +#define TR_THROTTLEREVERSE TR("T-Reverso", "Reverso") #define TR_MINUTEBEEP TR("Minuto", "Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT "ContagemRegr" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistente") diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index 010c8bddb60..ebd6449f7c4 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -274,9 +274,9 @@ #define TR_ETRIMS TR("Расш трим", "Расш тримы") #define TR_TRIMINC "Шаг трима" #define TR_DISPLAY_TRIMS TR("Пок. тримы", "Показ тримы") -#define TR_TTRACE TR("Т-источник", INDENT "Источник") -#define TR_TTRIM TR("Т-трим-ХХ", INDENT "Только трим хх") -#define TR_TTRIM_SW TR("Т-трим-перек", INDENT "Трим перек") +#define TR_TTRACE TR("Т-источник", "Источник") +#define TR_TTRIM TR("Т-трим-ХХ", "Только трим хх") +#define TR_TTRIM_SW TR("Т-трим-перек", "Трим перек") #define TR_BEEPCTR TR("Звук на цен", "Звук на центре") #define TR_USE_GLOBAL_FUNCS TR("Глоб. функц", "Глоб функц") #define TR_PROTOCOL TR("Проток", "Протокол") @@ -370,7 +370,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Нажмите [Enter] для подтв" #define TR_THROTTLE_LABEL "Газ" #define TR_THROTTLE_START "Газ cтарт" -#define TR_THROTTLEREVERSE TR("Г-Реверс", INDENT "Реверс") +#define TR_THROTTLEREVERSE TR("Г-Реверс", "Реверс") #define TR_MINUTEBEEP TR("Минут", "Минут") #define TR_BEEPCOUNTDOWN INDENT "Обр отс" #define TR_PERSISTENT TR(INDENT "Пост", INDENT "Пост") diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 2384e040ebc..15794b3a3dc 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -285,9 +285,9 @@ #define TR_ETRIMS TR("Trimmar++","Utökade trimmar") #define TR_TRIMINC TR("Trimning","Trimmökning") #define TR_DISPLAY_TRIMS TR("Visa trimm", "Visa trimmar") -#define TR_TTRACE TR("Källa", INDENT "Källa") -#define TR_TTRIM TR("Gastrimm", INDENT "Trimma endast tomgång") -#define TR_TTRIM_SW TR("Trimmknp", INDENT "Trimmknapp") +#define TR_TTRACE TR("Källa", "Källa") +#define TR_TTRIM TR("Gastrimm", "Trimma endast tomgång") +#define TR_TTRIM_SW TR("Trimmknp", "Trimmknapp") #define TR_BEEPCTR TR("Cntr. pip", "Pip när centrerad") #define TR_USE_GLOBAL_FUNCS TR("Glob.funk.", "Anv. globala funk.") #define TR_PROTOCOL TR("Proto.", "Protokoll") @@ -383,7 +383,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Tryck [ENTER] för att bekräfta" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLE_START "Gas Start" -#define TR_THROTTLEREVERSE TR("Omv. gas", INDENT "Omvänd gas") +#define TR_THROTTLEREVERSE TR("Omv. gas", "Omvänd gas") #define TR_MINUTEBEEP "Minutpip" #define TR_BEEPCOUNTDOWN INDENT "Nedräkning" #define TR_PERSISTENT INDENT "Beständig" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index bd64ff3f4ce..196c83b6405 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -273,9 +273,9 @@ #define TR_ETRIMS TR("擴展微調", "擴展微調量") #define TR_TRIMINC "微調步幅" #define TR_DISPLAY_TRIMS TR("微調顯示", "微調顯示") -#define TR_TTRACE TR("輸入源", INDENT "輸入源") -#define TR_TTRIM TR("油門微調僅怠速", INDENT "油門微調只調整怠速") -#define TR_TTRIM_SW TR("微調選擇", INDENT "微調選擇") +#define TR_TTRACE TR("輸入源", "輸入源") +#define TR_TTRIM TR("油門微調僅怠速", "油門微調只調整怠速") +#define TR_TTRIM_SW TR("微調選擇", "微調選擇") #define TR_BEEPCTR TR("中點提示音", "中點蜂鳴提示音") #define TR_USE_GLOBAL_FUNCS TR("全局功能", "全局功能可介入") #define TR_PPMFRAME INDENT "PPM幀" @@ -368,7 +368,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "按ENTER鍵確認" #define TR_THROTTLE_LABEL "油門" #define TR_THROTTLE_START "油門開始" -#define TR_THROTTLEREVERSE TR("油門反向", INDENT "油門反向") +#define TR_THROTTLEREVERSE TR("油門反向", "油門反向") #define TR_MINUTEBEEP TR("分", "分鐘播報") #define TR_BEEPCOUNTDOWN INDENT "倒數" #define TR_PERSISTENT TR(INDENT "關機保持", INDENT "關機保持") diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 5600fcba454..94bbd533e86 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -274,9 +274,9 @@ #define TR_ETRIMS TR("Розш.Трим.", "Розширене Обрізання") /* ned to be clarified by context */ #define TR_TRIMINC "Крок Тримув." #define TR_DISPLAY_TRIMS TR("Показ. трим.", "Показати трими") -#define TR_TTRACE TR("T-Джерело", INDENT "Джерело") -#define TR_TTRIM TR("T-Трим-Порожн.", INDENT "Тримувати тількти порожнє") -#define TR_TTRIM_SW TR("T-Трим-Перем.", INDENT "Перемикач тримування") +#define TR_TTRACE TR("T-Джерело", "Джерело") +#define TR_TTRIM TR("T-Трим-Порожн.", "Тримувати тількти порожнє") +#define TR_TTRIM_SW TR("T-Трим-Перем.", "Перемикач тримування") #define TR_BEEPCTR TR("Сигн. в центр", "Сигнал в центрі") #define TR_USE_GLOBAL_FUNCS TR("Глоб.функц.", "Викор. глобальні функції") #define TR_PROTOCOL TR("Проток.", "Протокол") @@ -370,7 +370,7 @@ #define TR_PRESS_ENTER_TO_CONFIRM "Тисни enter для підтвердження" #define TR_THROTTLE_LABEL "Газ" #define TR_THROTTLE_START "Газ на старт" -#define TR_THROTTLEREVERSE TR("Газ-реверс", INDENT "Реверс") +#define TR_THROTTLEREVERSE TR("Газ-реверс", "Реверс") #define TR_MINUTEBEEP TR("Хв.", "Хв. сигнал") #define TR_BEEPCOUNTDOWN INDENT "Відлік" #define TR_PERSISTENT TR(INDENT "Присутн.", INDENT "Присутній") From 7a4b0e9940555693dcfc8f6ca2a2fbea76f25621 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 8 May 2024 20:24:14 +1000 Subject: [PATCH 5/6] Remove INDENT & CENTER from translation strings. Cleanup code. --- radio/src/gui/128x64/gui.h | 11 +- radio/src/gui/128x64/lcd.cpp | 5 + radio/src/gui/128x64/lcd.h | 4 +- radio/src/gui/128x64/model_curve_edit.cpp | 2 +- radio/src/gui/128x64/model_flightmodes.cpp | 2 +- radio/src/gui/128x64/model_mix_edit.cpp | 2 +- radio/src/gui/128x64/model_setup.cpp | 101 +++++++-------- radio/src/gui/128x64/model_telemetry.cpp | 14 +- .../src/gui/128x64/model_telemetry_sensor.cpp | 4 +- radio/src/gui/128x64/radio_diagkeys.cpp | 2 +- radio/src/gui/128x64/radio_setup.cpp | 73 +++++------ radio/src/gui/128x64/view_telemetry.cpp | 2 +- radio/src/gui/128x64/widgets.cpp | 12 +- radio/src/gui/212x64/gui.h | 5 - radio/src/gui/212x64/lcd.cpp | 5 + radio/src/gui/212x64/lcd.h | 4 +- radio/src/gui/212x64/model_curve_edit.cpp | 2 +- radio/src/gui/212x64/model_display.cpp | 4 +- radio/src/gui/212x64/model_flightmodes.cpp | 2 +- radio/src/gui/212x64/model_input_edit.cpp | 2 +- radio/src/gui/212x64/model_mix_edit.cpp | 4 +- radio/src/gui/212x64/model_setup.cpp | 103 +++++++-------- .../gui/212x64/model_special_functions.cpp | 3 +- radio/src/gui/212x64/model_telemetry.cpp | 14 +- .../src/gui/212x64/model_telemetry_sensor.cpp | 4 +- radio/src/gui/212x64/radio_setup.cpp | 82 +++++------- radio/src/gui/212x64/view_telemetry.cpp | 2 +- radio/src/gui/212x64/widgets.cpp | 2 +- radio/src/gui/common/stdlcd/calibration.cpp | 10 +- .../src/gui/common/stdlcd/draw_functions.cpp | 2 +- radio/src/gui/common/stdlcd/model_heli.cpp | 6 +- .../src/gui/common/stdlcd/radio_hardware.cpp | 14 +- radio/src/gui/common/stdlcd/radio_version.cpp | 4 +- radio/src/translations.cpp | 15 --- radio/src/translations.h | 39 +----- radio/src/translations/cn.h | 98 +++++++------- radio/src/translations/cz.h | 108 +++++++--------- radio/src/translations/da.h | 102 +++++++-------- radio/src/translations/de.h | 121 ++++++++---------- radio/src/translations/en.h | 104 +++++++-------- radio/src/translations/es.h | 110 +++++++--------- radio/src/translations/fi.h | 98 +++++++------- radio/src/translations/fr.h | 104 +++++++-------- radio/src/translations/he.h | 100 +++++++-------- radio/src/translations/it.h | 116 ++++++++--------- radio/src/translations/jp.h | 104 +++++++-------- radio/src/translations/nl.h | 101 +++++++-------- radio/src/translations/pl.h | 102 +++++++-------- radio/src/translations/pt.h | 104 +++++++-------- radio/src/translations/ru.h | 102 +++++++-------- radio/src/translations/se.h | 100 +++++++-------- radio/src/translations/tw.h | 96 ++++++-------- radio/src/translations/ua.h | 104 +++++++-------- 53 files changed, 1084 insertions(+), 1352 deletions(-) diff --git a/radio/src/gui/128x64/gui.h b/radio/src/gui/128x64/gui.h index 53957597be8..41b3f52a769 100644 --- a/radio/src/gui/128x64/gui.h +++ b/radio/src/gui/128x64/gui.h @@ -39,8 +39,6 @@ #define HEADER_LINE_COLUMNS 0, #endif -#define drawFieldLabel(x, y, str) lcdDrawTextAlignedLeft(y, str) - #define NUM_BODY_LINES (LCD_LINES-1) #define TEXT_VIEWER_LINES NUM_BODY_LINES #define MENU_HEADER_HEIGHT FH @@ -65,14 +63,19 @@ typedef int choice_t; choice_t editChoice(coord_t x, coord_t y, const char *label, const char *const *values, choice_t value, choice_t min, - choice_t max, LcdFlags attr, event_t event, coord_t lblX = 0); + choice_t max, LcdFlags attr, event_t event); +choice_t editChoice(coord_t x, coord_t y, const char *label, + const char *const *values, choice_t value, choice_t min, + choice_t max, LcdFlags attr, event_t event, coord_t lblX); choice_t editChoice(coord_t x, coord_t y, const char *label, const char *const *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event, coord_t lblX, IsValueAvailable isValueAvailable); uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, - LcdFlags attr, event_t event, coord_t lblX = 0); + LcdFlags attr, event_t event); +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, + LcdFlags attr, event_t event, coord_t lblX); swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event); diff --git a/radio/src/gui/128x64/lcd.cpp b/radio/src/gui/128x64/lcd.cpp index bcc4b4457a0..fa45f1a2f07 100644 --- a/radio/src/gui/128x64/lcd.cpp +++ b/radio/src/gui/128x64/lcd.cpp @@ -371,6 +371,11 @@ void lcdDrawTextAlignedLeft(coord_t y, const char * s) lcdDrawText(0, y, s); } +void lcdDrawTextIndented(coord_t y, const char * s) +{ + lcdDrawText(INDENT_WIDTH, y, s); +} + #if !defined(BOOT) void lcdDrawTextAtIndex(coord_t x, coord_t y, const char *const *s,uint8_t idx, LcdFlags flags) { diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h index 97cda967256..452d7215de1 100644 --- a/radio/src/gui/128x64/lcd.h +++ b/radio/src/gui/128x64/lcd.h @@ -27,8 +27,9 @@ #include "board.h" #define BOX_WIDTH 23 -#define CENTER #define CENTER_OFS 0 +#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) +#define INDENT_WIDTH (FW/2) #define FW 6 #define FWNUM 5 @@ -102,6 +103,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len, L void lcdDrawText(coord_t x, coord_t y, const char * s); void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len); void lcdDrawTextAlignedLeft(coord_t y, const char * s); +void lcdDrawTextIndented(coord_t y, const char * s); void drawTimerWithMode(coord_t x, coord_t y, uint8_t index, LcdFlags att); void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0); diff --git a/radio/src/gui/128x64/model_curve_edit.cpp b/radio/src/gui/128x64/model_curve_edit.cpp index 8291fd3e5ef..60448069909 100644 --- a/radio/src/gui/128x64/model_curve_edit.cpp +++ b/radio/src/gui/128x64/model_curve_edit.cpp @@ -99,7 +99,7 @@ void menuModelCurveOne(event_t event) menuVerticalPosition == 0, 0, old_editMode); // Curve type - lcdDrawTextAlignedLeft(3 * FH + 1, NO_INDENT(STR_TYPE)); + lcdDrawTextAlignedLeft(3 * FH + 1, STR_TYPE); LcdFlags attr = (menuVerticalPosition == 1 ? (s_editMode > 0 ? INVERS | BLINK : INVERS) : 0); lcdDrawTextAtIndex(INDENT_WIDTH, 4 * FH + 1, STR_CURVE_TYPES, crv.type, attr); if (attr) { diff --git a/radio/src/gui/128x64/model_flightmodes.cpp b/radio/src/gui/128x64/model_flightmodes.cpp index d9b688e62c1..8b4ebf33a0d 100644 --- a/radio/src/gui/128x64/model_flightmodes.cpp +++ b/radio/src/gui/128x64/model_flightmodes.cpp @@ -263,7 +263,7 @@ void menuModelFlightModesAll(event_t event) if (menuVerticalOffset != MAX_FLIGHT_MODES-(LCD_LINES-2)) return; - lcdDrawTextAlignedLeft((LCD_LINES-1)*FH+1, STR_CHECKTRIMS); + lcdDrawText(CENTER_OFS, (LCD_LINES-1)*FH+1, STR_CHECKTRIMS); drawFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, mixerCurrentFlightMode+1); if (sub==MAX_FLIGHT_MODES && !trimsCheckTimer) { lcdInvertLastLine(); diff --git a/radio/src/gui/128x64/model_mix_edit.cpp b/radio/src/gui/128x64/model_mix_edit.cpp index ea6ddc5a2d6..1bd2793e590 100644 --- a/radio/src/gui/128x64/model_mix_edit.cpp +++ b/radio/src/gui/128x64/model_mix_edit.cpp @@ -182,7 +182,7 @@ void menuModelMixOne(event_t event) break; case MIX_FIELD_WARNING: - drawFieldLabel(MIXES_2ND_COLUMN, y, STR_MIXWARNING); + lcdDrawTextAlignedLeft(y, STR_MIXWARNING); if (md2->mixWarn) lcdDrawNumber(MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT); else diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 793d8270ff6..0e73bde318e 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -433,7 +433,7 @@ void onBluetoothConnectMenu(const char * result) void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event) { TimerData & timer = g_model.timers[timerIdx]; - lcdDrawTextAlignedLeft(y, STR_BEEPCOUNTDOWN); + lcdDrawTextIndented(y, STR_BEEPCOUNTDOWN); int value = timer.countdownBeep; if (timer.extraHaptic) value += (COUNTDOWN_VOICE + 1); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VBEEPCOUNTDOWN, value, (menuHorizontalPosition == 0 ? attr : 0)); @@ -710,7 +710,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER2_START: case ITEM_MODEL_SETUP_TIMER3_START: { - lcdDrawText(INDENT_WIDTH, y, STR_START); + lcdDrawTextIndented(y, STR_START); TimerData *timer = &g_model.timers[k >= ITEM_MODEL_SETUP_TIMER3 @@ -785,7 +785,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_PERSISTENT: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_SETUP_TIMER3 ? 2 : (k>=ITEM_MODEL_SETUP_TIMER2 ? 1 : 0)]; - timer->persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, timer->persistent, 0, 2, attr, event); + timer->persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, timer->persistent, 0, 2, attr, event, INDENT_WIDTH); break; } #if defined(FUNCTION_SWITCHES) @@ -890,13 +890,12 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_THROTTLE_REVERSED: - lcdDrawText(INDENT_WIDTH, y, STR_THROTTLEREVERSE); - g_model.throttleReversed = editCheckBox(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN+20, y, nullptr, attr, event ); + g_model.throttleReversed = editCheckBox(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN+20, y, STR_THROTTLEREVERSE, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_TRACE: { - lcdDrawText(INDENT_WIDTH, y, STR_TTRACE); + lcdDrawTextIndented(y, STR_TTRACE); if (attr) CHECK_INCDEC_MODELVAR_ZERO_CHECK( event, g_model.thrTraceSrc, @@ -909,12 +908,11 @@ void menuModelSetup(event_t event) } case ITEM_MODEL_SETUP_THROTTLE_TRIM: - lcdDrawText(INDENT_WIDTH, y, STR_TTRIM); - g_model.thrTrim = editCheckBox(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN+20, y, nullptr, attr, event); + g_model.thrTrim = editCheckBox(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN+20, y, STR_TTRIM, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_TRIM_SWITCH: - lcdDrawText(INDENT_WIDTH, y, STR_TTRIM_SW); + lcdDrawTextIndented(y, STR_TTRIM_SW); if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.thrTrimSw, keysGetMaxTrims() - 1); drawSource(MODEL_SETUP_2ND_COLUMN+20, y, g_model.getThrottleStickTrimSource(), attr); @@ -925,19 +923,19 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_CHECKLIST_DISPLAY: - g_model.displayChecklist = editCheckBox(g_model.displayChecklist, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event); + g_model.displayChecklist = editCheckBox(g_model.displayChecklist, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_CHECKLIST_INTERACTIVE: - g_model.checklistInteractive = editCheckBox(g_model.checklistInteractive, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST_INTERACTIVE, attr, event); + g_model.checklistInteractive = editCheckBox(g_model.checklistInteractive, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST_INTERACTIVE, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_WARNING: - g_model.disableThrottleWarning = !editCheckBox(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLE_WARNING, attr, event); + g_model.disableThrottleWarning = !editCheckBox(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLE_WARNING, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_CUSTOM_THROTTLE_WARNING: - g_model.enableCustomThrottleWarning = editCheckBox(g_model.enableCustomThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_CUSTOM_THROTTLE_WARNING, attr, event); + g_model.enableCustomThrottleWarning = editCheckBox(g_model.enableCustomThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_CUSTOM_THROTTLE_WARNING, attr, event, INDENT_WIDTH*4); break; case ITEM_MODEL_SETUP_CUSTOM_THROTTLE_WARNING_VALUE: @@ -977,7 +975,7 @@ void menuModelSetup(event_t event) swarnstate_t states = g_model.switchWarning; - lcdDrawTextAlignedLeft(y, STR_SWITCHWARNING); + lcdDrawTextIndented(y, STR_SWITCHWARNING); #if defined(PCBXLITE) lcdDrawText(LCD_W, y, "<]", RIGHT); if (attr) { @@ -1053,7 +1051,7 @@ void menuModelSetup(event_t event) } case ITEM_MODEL_SETUP_POTS_WARNING: - lcdDrawTextAlignedLeft(y, STR_POTWARNING); + lcdDrawTextIndented(y, STR_POTWARNING); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_PREFLIGHT_POTSLIDER_CHECK, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); if (attr && (menuHorizontalPosition == 0)) { CHECK_INCDEC_MODELVAR(event, g_model.potsWarnMode, POTS_WARN_OFF, POTS_WARN_AUTO); @@ -1154,7 +1152,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: #endif - lcdDrawText(INDENT_WIDTH, y, STR_MODE); + lcdDrawTextIndented(y, STR_MODE); lcdDrawTextAtIndex( MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, @@ -1310,7 +1308,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) && (defined(CROSSFIRE) || defined(GHOST)) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: { ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE); + lcdDrawTextIndented(y, STR_BAUDRATE); if (isModuleCrossfire(EXTERNAL_MODULE)) { lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),attr | LEFT); if (attr) { @@ -1341,7 +1339,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SERIALSTATUS: #endif - lcdDrawText(INDENT_WIDTH, y, STR_STATUS); + lcdDrawTextIndented(y, STR_STATUS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 1000000 / getMixerSchedulerPeriod(), LEFT | attr); lcdDrawText(lcdNextPos, y, "Hz ", attr); // lcdDrawNumber(lcdNextPos, y, telemetryErrors, attr); @@ -1366,7 +1364,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL: #endif { - lcdDrawTextAlignedLeft(y, TR_TYPE); + lcdDrawTextIndented(y, STR_TYPE); int multi_rfProto = g_model.moduleData[moduleIdx].multi.rfProtocol; lcdDrawMultiProtocolString(MODEL_SETUP_2ND_COLUMN, y, moduleIdx, multi_rfProto, attr); if (attr) { @@ -1400,7 +1398,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SUBTYPE: #endif { - lcdDrawTextAlignedLeft(y, STR_SUBTYPE); + lcdDrawTextIndented(y, STR_SUBTYPE); lcdDrawMultiSubProtocolString(MODEL_SETUP_2ND_COLUMN, y, moduleIdx, g_model.moduleData[moduleIdx].subType, menuHorizontalPosition == 0 ? attr : 0); int8_t optionValue = (g_model.moduleData[moduleIdx].multi.optionValue & 0x04) >> 2; if (isMultiProtocolDSMCloneAvailable(moduleIdx)) { @@ -1430,14 +1428,14 @@ void menuModelSetup(event_t event) #if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS_PROTOCOL: - lcdDrawText(INDENT_WIDTH, y, STR_PROTOCOL); + lcdDrawTextIndented(y, STR_PROTOCOL); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, attr); if (attr && s_editMode > 0 && menuHorizontalPosition == 0) { CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].subType, AFHDS_SUBTYPE_FIRST, AFHDS_SUBTYPE_LAST); } break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_MODE: - lcdDrawText(INDENT_WIDTH, y, TR_TELEMETRY_TYPE); + lcdDrawTextIndented(y, TR_TELEMETRY_TYPE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.telemetry ? STR_AFHDS3_ONE_TO_ONE_TELEMETRY : TR_AFHDS3_ONE_TO_MANY); break; @@ -1449,7 +1447,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); + lcdDrawTextIndented(y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, TRAINER_MODE_MIN(), TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); @@ -1478,7 +1476,7 @@ void menuModelSetup(event_t event) } } else { - lcdDrawText(INDENT_WIDTH, y, "---"); + lcdDrawTextIndented(y, "---"); if (bluetooth.state < BLUETOOTH_STATE_IDLE) lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr); else @@ -1507,7 +1505,7 @@ void menuModelSetup(event_t event) if (bluetooth.distantAddr[0]) lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE); else - lcdDrawText(INDENT_WIDTH, y, "---"); + lcdDrawTextIndented(y, "---"); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, bluetooth.state == BLUETOOTH_STATE_CONNECTED ? STR_CONNECTED : STR_NOT_CONNECTED); } break; @@ -1515,7 +1513,7 @@ void menuModelSetup(event_t event) #if defined(PCBTARANIS) case ITEM_MODEL_SETUP_TRAINER_CHANNELS: - lcdDrawTextAlignedLeft(y, STR_CHANNELRANGE); + lcdDrawTextIndented(y, STR_CHANNELRANGE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, menuHorizontalPosition==0 ? attr : 0); lcdDrawNumber(lcdLastRightPos, y, g_model.trainerData.channelsStart+1, LEFT | (menuHorizontalPosition==0 ? attr : 0)); lcdDrawChar(lcdLastRightPos, y, '-'); @@ -1543,7 +1541,7 @@ void menuModelSetup(event_t event) #endif { ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawTextAlignedLeft(y, STR_CHANNELRANGE); + lcdDrawTextIndented(y, STR_CHANNELRANGE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, menuHorizontalPosition==0 ? attr : 0); lcdDrawNumber(lcdLastRightPos, y, moduleData.channelsStart+1, LEFT | (menuHorizontalPosition==0 ? attr : 0)); lcdDrawChar(lcdLastRightPos, y, '-'); @@ -1571,15 +1569,14 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_RACING_MODE: { ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawText(INDENT_WIDTH, y, STR_RACING_MODE); - moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event); + moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, STR_RACING_MODE, attr, event, INDENT_WIDTH); break; } #endif #if defined(PCBX7) || defined(PCBX9LITE) || defined(PCBXLITE) case ITEM_MODEL_SETUP_TRAINER_PPM_PARAMS: - lcdDrawTextAlignedLeft(y, STR_PPMFRAME); + lcdDrawTextIndented(y, STR_PPMFRAME); lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.trainerData.frameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u'); @@ -1615,7 +1612,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_MODEL_NUM: #endif { - lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM); + lcdDrawTextIndented(y, STR_RECEIVER_NUM); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], attr | LEADING0 | LEFT, 2); if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], getMaxRxNum(moduleIdx)); @@ -1631,7 +1628,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE: #endif { - lcdDrawText(INDENT_WIDTH, y, STR_MODULE); + lcdDrawTextIndented(y, STR_MODULE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0)); lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { @@ -1658,7 +1655,7 @@ void menuModelSetup(event_t event) #if defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_OPTIONS: #endif - lcdDrawText(INDENT_WIDTH, y, STR_OPTIONS); + lcdDrawTextIndented(y, STR_OPTIONS); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_SET, attr); if (event == EVT_KEY_BREAK(KEY_ENTER) && attr) { g_moduleIdx = CURRENT_MODULE_EDITED(k); @@ -1687,7 +1684,7 @@ void menuModelSetup(event_t event) { ModuleData & moduleData = g_model.moduleData[moduleIdx]; if (isModulePPM(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_PPMFRAME); + lcdDrawTextIndented(y, STR_PPMFRAME); lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppm.frameLength*PPM_STEP_SIZE + PPM_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u'); @@ -1708,7 +1705,7 @@ void menuModelSetup(event_t event) } } else if (isModuleSBUS(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_REFRESHRATE); + lcdDrawTextIndented(y, STR_REFRESHRATE); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.sbus.refreshRate * SBUS_STEPSIZE + SBUS_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS); lcdDrawText(MODEL_SETUP_2ND_COLUMN+5*FW+2, y, moduleData.sbus.noninverted ? STR_NOT_INVERTED : STR_NORMAL, (CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0); @@ -1724,7 +1721,7 @@ void menuModelSetup(event_t event) } } else { - lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER); + lcdDrawTextIndented(y, STR_RECEIVER); horzpos_t l_posHorz = menuHorizontalPosition; coord_t bindButtonPos = MODEL_SETUP_2ND_COLUMN; if (isModuleRxNumAvailable(moduleIdx)) { @@ -1856,7 +1853,7 @@ void menuModelSetup(event_t event) #endif { ModuleData &moduleData = g_model.moduleData[moduleIdx]; - lcdDrawTextAlignedLeft(y, STR_FAILSAFE); + lcdDrawTextIndented(y, STR_FAILSAFE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VFAILSAFE, moduleData.failsafeMode, menuHorizontalPosition == 0 ? attr : 0); if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcdDrawText(MODEL_SETUP_2ND_COLUMN + MODEL_SETUP_SET_FAILSAFE_OFS, y, STR_SET, menuHorizontalPosition == 1 ? attr : 0); @@ -1922,7 +1919,7 @@ void menuModelSetup(event_t event) const char * title = getMultiOptionTitle(moduleIdx); if (!title) break; - lcdDrawText(INDENT_WIDTH, y, title); + lcdDrawTextIndented(y, title); if (title == STR_MULTI_RFTUNE) { lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, getRxStatLabels()->label, LEFT); lcdDrawText(lcdLastRightPos, y, "(", LEFT); @@ -1975,7 +1972,7 @@ void menuModelSetup(event_t event) } #endif if (isModuleR9MNonAccess(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawTextIndented(y, STR_MODULE_TELEMETRY); if (modulePortIsPortUsedByModule(moduleIdx, ETX_MOD_PORT_SPORT)) { lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_TELEM_ON); } else { @@ -1983,7 +1980,7 @@ void menuModelSetup(event_t event) } } else if (isModuleSBUS(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_WARN_BATTVOLTAGE); + lcdDrawTextIndented(y, STR_WARN_BATTVOLTAGE); putsVolts(lcdLastRightPos, y, getBatteryVoltage(), attr | PREC2 | LEFT); } else if (isModuleGhost(moduleIdx)) { @@ -2003,7 +2000,7 @@ void menuModelSetup(event_t event) auto & module = g_model.moduleData[moduleIdx]; // Lite FCC / Lite FLEX / Lite Pro Flex if (isModuleTypeR9MNonAccess(module.type)) { - lcdDrawText(INDENT_WIDTH, y, STR_RF_POWER); + lcdDrawTextIndented(y, STR_RF_POWER); if (isModuleR9M_FCC_VARIANT(moduleIdx)) { // FCC and FLEX modes ... if (isModuleTypeR9MLiteNonPro(module.type)) { // R9M lite FCC has only one power value, so displayed for info only @@ -2064,12 +2061,12 @@ void menuModelSetup(event_t event) } #if defined(MULTIMODULE) else if (isModuleMultimodule(moduleIdx)) { - module.multi.lowPowerMode = editCheckBox(module.multi.lowPowerMode, MODEL_SETUP_2ND_COLUMN, y, IS_RX_MULTI(moduleIdx) ? STR_MULTI_LNA_DISABLE : STR_MULTI_LOWPOWER, attr, event); + module.multi.lowPowerMode = editCheckBox(module.multi.lowPowerMode, MODEL_SETUP_2ND_COLUMN, y, IS_RX_MULTI(moduleIdx) ? STR_MULTI_LNA_DISABLE : STR_MULTI_LOWPOWER, attr, event, INDENT_WIDTH); } #endif #if defined(AFHDS3) else if (isModuleAFHDS3(EXTERNAL_MODULE)) { - lcdDrawText(INDENT_WIDTH, y, STR_RF_POWER); + lcdDrawTextIndented(y, STR_RF_POWER); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_POWERS, g_model.moduleData[EXTERNAL_MODULE].afhds3.runPower, LEFT | attr); if (attr) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].afhds3.runPower, afhds3::RUN_POWER::RUN_POWER_FIRST, afhds3::RUN_POWER::RUN_POWER_LAST); @@ -2088,7 +2085,7 @@ void menuModelSetup(event_t event) #endif if (g_model.moduleData[moduleIdx].multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2) { int8_t value = (g_model.moduleData[moduleIdx].multi.optionValue & 0x02) >> 1; - lcdDrawText(INDENT_WIDTH, y, STR_MULTI_SERVOFREQ); + lcdDrawTextIndented(y, STR_MULTI_SERVOFREQ); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, value ? 11 : 22, attr); lcdDrawText(lcdNextPos, y, "ms", attr); if (attr) { @@ -2100,7 +2097,7 @@ void menuModelSetup(event_t event) } else { g_model.moduleData[moduleIdx].multi.autoBindMode = editCheckBox(g_model.moduleData[moduleIdx].multi.autoBindMode, MODEL_SETUP_2ND_COLUMN, y, - STR_MULTI_AUTOBIND, attr, event); + STR_MULTI_AUTOBIND, attr, event, INDENT_WIDTH); } break; @@ -2124,7 +2121,7 @@ void menuModelSetup(event_t event) #if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_RX_FREQ: - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_RX_FREQ); + lcdDrawTextIndented(y, STR_AFHDS3_RX_FREQ); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(), attr | LEFT); if (attr) { uint16_t rxFreq = g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(); @@ -2134,7 +2131,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_ACTUAL_POWER: - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_ACTUAL_POWER); + lcdDrawTextIndented(y, STR_AFHDS3_ACTUAL_POWER); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_POWERS, actualAfhdsRunPower(EXTERNAL_MODULE), LEFT); break; #endif @@ -2147,7 +2144,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: #endif { - lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); + lcdDrawTextIndented(y, STR_MODULE_STATUS); getModuleStatusString(moduleIdx, reusableBuffer.moduleSetup.msg); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; @@ -2159,7 +2156,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS: #endif { - lcdDrawTextAlignedLeft(y, STR_MODULE_SYNC); + lcdDrawTextIndented(y, STR_MODULE_SYNC); getModuleSyncStatusString(moduleIdx, reusableBuffer.moduleSetup.msg); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; @@ -2168,7 +2165,7 @@ void menuModelSetup(event_t event) #if defined(AFHDS3) && defined(HARDWARE_EXTERNAL_MODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS: { - lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); + lcdDrawTextIndented(y, STR_MODULE_STATUS); char statusText[64]; getModuleStatusString(moduleIdx, statusText); @@ -2176,7 +2173,7 @@ void menuModelSetup(event_t event) break; } case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS: { - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_POWER_SOURCE); + lcdDrawTextIndented(y, STR_AFHDS3_POWER_SOURCE); char statusText[64]; getModuleSyncStatusString(moduleIdx, statusText); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); @@ -2207,7 +2204,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_PPM2_PARAMS: - lcdDrawTextAlignedLeft(y, STR_PPMFRAME); + lcdDrawTextIndented(y, STR_PPMFRAME); lcdDrawText(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.moduleData[1].ppmFrameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1 | LEFT); lcdDrawChar(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u'); diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 5d310a6a32e..87d948841d4 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -206,7 +206,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_NEW_SENSOR: - lcdDrawText(0, y, STR_TELEMETRY_NEWSENSOR, attr); + lcdDrawText(INDENT_WIDTH, y, STR_TELEMETRY_NEWSENSOR, attr); if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) { s_editMode = 0; int res = availableTelemetryIndex(); @@ -233,7 +233,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE: - g_model.ignoreSensorIds = editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event); + g_model.ignoreSensorIds = editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event, INDENT_WIDTH); break; case ITEM_TELEMETRY_RSSI_LABEL: @@ -244,7 +244,7 @@ void menuModelTelemetry(event_t event) case ITEM_TELEMETRY_RSSI_ALARM2: { bool warning = (k==ITEM_TELEMETRY_RSSI_ALARM1); - lcdDrawTextAlignedLeft(y, (warning ? STR_LOWALARM : STR_CRITICALALARM)); + lcdDrawTextIndented(y, (warning ? STR_LOWALARM : STR_CRITICALALARM)); lcdDrawNumber(TELEM_COL3, y, warning? g_model.rfAlarms.warning : g_model.rfAlarms.critical, attr, 3); if (attr && s_editMode>0) { if (warning) @@ -256,7 +256,7 @@ void menuModelTelemetry(event_t event) } case ITEM_TELEMETRY_DISABLE_ALARMS: - g_model.disableTelemetryWarning = editCheckBox(g_model.disableTelemetryWarning, TELEM_COL3, y, STR_DISABLE_ALARM, attr, event); + g_model.disableTelemetryWarning = editCheckBox(g_model.disableTelemetryWarning, TELEM_COL3, y, STR_DISABLE_ALARM, attr, event, INDENT_WIDTH); break; #if defined(VARIO) @@ -265,7 +265,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_SOURCE: - lcdDrawText(INDENT_WIDTH, y, STR_SOURCE); + lcdDrawTextIndented(y, STR_SOURCE); drawSource(TELEM_COL2, y, g_model.varioData.source ? MIXSRC_FIRST_TELEM+3*(g_model.varioData.source-1) : 0, attr); if (attr) { g_model.varioData.source = checkIncDec(event, g_model.varioData.source, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVarioSensorAvailable); @@ -273,7 +273,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_RANGE: - lcdDrawTextAlignedLeft(y, STR_RANGE); + lcdDrawTextIndented(y, STR_RANGE); if (attr && CURSOR_ON_LINE()) { lcdDrawSolidFilledRect(TELEM_COL2-1, y-1, LCD_W-TELEM_COL2+1, FH+1); } @@ -292,7 +292,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_CENTER: - lcdDrawTextAlignedLeft(y, STR_CENTER); + lcdDrawTextIndented(y, STR_CENTER); lcdDrawNumber(TELEM_COL2, y, -5+g_model.varioData.centerMin, ((CURSOR_ON_LINE() || menuHorizontalPosition==0) ? attr : 0)|PREC1|LEFT); lcdDrawNumber(TELEM_COL2+4*FW, y, 5+g_model.varioData.centerMax, ((CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0)|PREC1|LEFT); lcdDrawTextAtIndex(TELEM_COL2+8*FW, y, STR_VVARIOCENTER, g_model.varioData.centerSilent, (menuHorizontalPosition==2 ? attr : 0)); diff --git a/radio/src/gui/128x64/model_telemetry_sensor.cpp b/radio/src/gui/128x64/model_telemetry_sensor.cpp index 7e56c7f7cb9..d98d964586e 100644 --- a/radio/src/gui/128x64/model_telemetry_sensor.cpp +++ b/radio/src/gui/128x64/model_telemetry_sensor.cpp @@ -93,7 +93,7 @@ void menuModelSensor(event_t event) break; case SENSOR_FIELD_TYPE: - sensor->type = editChoice(SENSOR_2ND_COLUMN, y, NO_INDENT(STR_TYPE), STR_VSENSORTYPES, sensor->type, 0, 1, attr, event); + sensor->type = editChoice(SENSOR_2ND_COLUMN, y, STR_TYPE, STR_VSENSORTYPES, sensor->type, 0, 1, attr, event); if (attr && checkIncDec_Ret) { sensor->instance = 0; if (sensor->type == TELEM_TYPE_CALCULATED) { @@ -292,7 +292,7 @@ void menuModelSensor(event_t event) break; case SENSOR_FIELD_PERSISTENT: - sensor->persistent = editCheckBox(sensor->persistent, SENSOR_2ND_COLUMN, y, NO_INDENT(STR_PERSISTENT), attr, event); + sensor->persistent = editCheckBox(sensor->persistent, SENSOR_2ND_COLUMN, y, STR_PERSISTENT, attr, event, INDENT_WIDTH); if (checkIncDec_Ret && !sensor->persistent) { sensor->persistentValue = 0; } diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 5abc2e453a0..91cf9a6b9d4 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -64,7 +64,7 @@ void menuRadioDiagFS(event_t event) for(uint8_t i=0; i < NUM_FUNCTIONS_SWITCHES; i++) { coord_t y = 2*FH + i*FH; - lcdDrawText(INDENT_WIDTH, y, STR_CHAR_SWITCH, 0); + lcdDrawTextIndented(y, STR_CHAR_SWITCH); lcdDrawText(lcdNextPos, y, switchGetName(i+switchGetMaxSwitches()), 0); lcdDrawNumber(FS_1ST_COLUMN + 2, y, getFSPhysicalState(i)); lcdDrawNumber(FS_2ND_COLUMN + 5, y, getFSLogicalState(i)); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 7798eb6ec3d..e9000b4e85a 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -33,10 +33,10 @@ const unsigned char sticks[] = { #define RADIO_SETUP_2ND_COLUMN 79 -#define SLIDER_5POS(y, value, event, attr) { \ - int8_t tmp = value; \ - drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, 2+tmp, 4, attr); \ - value = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, nullptr, tmp, -2, +2, attr, event); \ +int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const char* title) +{ + drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, 2+value, 4, attr); + return editChoice(RADIO_SETUP_2ND_COLUMN, y, title, nullptr, value, -2, +2, attr, event, INDENT_WIDTH); } #if defined(BATTGRAPH) @@ -127,12 +127,11 @@ enum { uint8_t viewOptCheckBox(coord_t y, const char* title, uint8_t value, uint8_t attr, event_t event, uint8_t modelOption) { - lcdDrawText(INDENT_WIDTH, y, title); if (modelOption != OVERRIDE_GLOBAL) { std::string s(STR_ADCFILTERVALUES[modelOption]); lcdDrawText(LCD_W-3*FW, y, s.c_str()); } - return !editCheckBox(!value, LCD_W-4*FW-3, y, nullptr, attr, event ) ; + return !editCheckBox(!value, LCD_W-4*FW-3, y, title, attr, event, INDENT_WIDTH) ; } void menuRadioSetup(event_t event) @@ -335,7 +334,7 @@ void menuRadioSetup(event_t event) #if defined(VOICE) case ITEM_RADIO_SETUP_SPEAKER_VOLUME: { - lcdDrawText(INDENT_WIDTH, y, STR_VOLUME); + lcdDrawTextIndented(y, STR_VOLUME); uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, b, VOLUME_LEVEL_MAX, attr); if (attr) { @@ -349,29 +348,25 @@ void menuRadioSetup(event_t event) #endif case ITEM_RADIO_SETUP_BEEP_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_VOLUME); - SLIDER_5POS(y, g_eeGeneral.beepVolume, event, attr); + g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME); break; case ITEM_RADIO_SETUP_WAV_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_WAV_VOLUME); - SLIDER_5POS(y, g_eeGeneral.wavVolume, event, attr); + g_eeGeneral.wavVolume = slider_5pos(y, g_eeGeneral.wavVolume, event, attr, STR_WAV_VOLUME); break; case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_BG_VOLUME); - SLIDER_5POS(y, g_eeGeneral.backgroundVolume, event, attr); + g_eeGeneral.backgroundVolume = slider_5pos(y, g_eeGeneral.backgroundVolume, event, attr, STR_BG_VOLUME); break; case ITEM_RADIO_SETUP_BEEP_LENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_LENGTH); - SLIDER_5POS(y, g_eeGeneral.beepLength, event, attr); + g_eeGeneral.beepLength = slider_5pos(y, g_eeGeneral.beepLength, event, attr, STR_BEEP_LENGTH); break; #if defined(AUDIO) case ITEM_RADIO_SETUP_SPEAKER_PITCH: { - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_PITCH); + lcdDrawTextIndented(y, STR_BEEP_PITCH); lcdDrawNumber(LCD_W-14, y, g_eeGeneral.speakerPitch*15, attr|RIGHT); coord_t lp = lcdLastLeftPos - FW; lcdDrawText(lcdLastRightPos, y, "Hz", attr); @@ -389,26 +384,25 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_VARIO_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_VOLUME); - SLIDER_5POS(y, g_eeGeneral.varioVolume, event, attr); + g_eeGeneral.varioVolume = slider_5pos(y, g_eeGeneral.varioVolume, event, attr, STR_VOLUME); break; case ITEM_RADIO_SETUP_VARIO_PITCH: - lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_ZERO); + lcdDrawTextIndented(y, STR_PITCH_AT_ZERO); lcdDrawNumber(LCD_W-14, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|RIGHT); lcdDrawText(lcdLastRightPos, y, "Hz", attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40); break; case ITEM_RADIO_SETUP_VARIO_RANGE: - lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_MAX); + lcdDrawTextIndented(y, STR_PITCH_AT_MAX); lcdDrawNumber(LCD_W-14, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|RIGHT); lcdDrawText(lcdLastRightPos, y, "Hz", attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80); break; case ITEM_RADIO_SETUP_VARIO_REPEAT: - lcdDrawText(INDENT_WIDTH, y, STR_REPEAT_AT_ZERO); + lcdDrawTextIndented(y, STR_REPEAT_AT_ZERO); lcdDrawNumber(LCD_W-14, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|RIGHT); lcdDrawText(lcdLastRightPos, y, STR_MS, attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50); @@ -425,13 +419,11 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_HAPTIC_LENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_LENGTH); - SLIDER_5POS(y, g_eeGeneral.hapticLength, event, attr); + g_eeGeneral.hapticLength = slider_5pos(y, g_eeGeneral.hapticLength, event, attr, STR_LENGTH); break; case ITEM_RADIO_SETUP_HAPTIC_STRENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_STRENGTH); - SLIDER_5POS(y, g_eeGeneral.hapticStrength, event, attr); + g_eeGeneral.hapticStrength = slider_5pos(y, g_eeGeneral.hapticStrength, event, attr, STR_STRENGTH); break; #endif @@ -442,7 +434,7 @@ void menuRadioSetup(event_t event) case ITEM_RADIO_SETUP_IMU_MAX: { - lcdDrawText(INDENT_WIDTH, y, STR_IMU_MAX); + lcdDrawTextIndented(y, STR_IMU_MAX); lcdDrawNumber(LCD_W-7, y, IMU_MAX_DEFAULT + g_eeGeneral.imuMax, attr|RIGHT); coord_t lp = lcdLastLeftPos - 2; lcdDrawChar(lcdLastRightPos, y, STR_CHAR_BW_DEGREE, attr); @@ -457,7 +449,7 @@ void menuRadioSetup(event_t event) case ITEM_RADIO_SETUP_IMU_OFFSET: { - lcdDrawText(INDENT_WIDTH, y, STR_IMU_OFFSET); + lcdDrawTextIndented(y, STR_IMU_OFFSET); lcdDrawNumber(LCD_W-7, y, g_eeGeneral.imuOffset, attr|RIGHT); coord_t lp = lcdLastLeftPos - 2; lcdDrawChar(lcdLastRightPos, y, STR_CHAR_BW_DEGREE, attr); @@ -473,7 +465,7 @@ void menuRadioSetup(event_t event) #if !defined(OLED_SCREEN) case ITEM_RADIO_SETUP_CONTRAST: - lcdDrawText(INDENT_WIDTH, y, STR_CONTRAST); + lcdDrawTextIndented(y, STR_CONTRAST); lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT); if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX); @@ -487,32 +479,29 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_BATTERY_WARNING: - lcdDrawText(INDENT_WIDTH, y, STR_BATTERYWARNING); + lcdDrawTextIndented(y, STR_BATTERYWARNING); putsVolts(LCD_W-7, y, g_eeGeneral.vBatWarn, attr|RIGHT); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 30, 120); //3-12V break; case ITEM_RADIO_SETUP_MEMORY_WARNING: { - lcdDrawText(INDENT_WIDTH, y, STR_MEMORYWARNING); uint8_t b = 1 - g_eeGeneral.disableMemoryWarning; - g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, LCD_W-9, y, nullptr, attr, event); + g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, LCD_W-9, y, STR_MEMORYWARNING, attr, event, INDENT_WIDTH); break; } case ITEM_RADIO_SETUP_ALARM_WARNING: { - lcdDrawText(INDENT_WIDTH, y, STR_ALARMWARNING); uint8_t b = 1 - g_eeGeneral.disableAlarmWarning; - g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, LCD_W-9, y, nullptr, attr, event); + g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, LCD_W-9, y, STR_ALARMWARNING, attr, event, INDENT_WIDTH); break; } case ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM: { - lcdDrawText(INDENT_WIDTH, y, STR_RSSI_SHUTDOWN_ALARM); uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm; - g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, LCD_W-9, y, nullptr, attr, event); + g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, LCD_W-9, y, STR_RSSI_SHUTDOWN_ALARM, attr, event, INDENT_WIDTH); break; } @@ -525,7 +514,7 @@ void menuRadioSetup(event_t event) } case ITEM_RADIO_SETUP_INACTIVITY_ALARM: - lcdDrawText(INDENT_WIDTH, y, STR_INACTIVITYALARM); + lcdDrawTextIndented(y, STR_INACTIVITYALARM); lcdDrawNumber(LCD_W-7, y, g_eeGeneral.inactivityTimer, attr|RIGHT); lcdDrawChar(lcdLastRightPos, y, 'm'); if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes @@ -541,24 +530,22 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_BACKLIGHT_MODE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); - g_eeGeneral.backlightMode = editChoice(LCD_W-2, y, nullptr, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr|RIGHT, event); + g_eeGeneral.backlightMode = editChoice(LCD_W-2, y, STR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr|RIGHT, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_FLASH_BEEP: - lcdDrawText(INDENT_WIDTH, y, STR_ALARM); - g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, LCD_W-9, y, nullptr, attr, event ) ; + g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, LCD_W-9, y, STR_ALARM, attr, event, INDENT_WIDTH) ; break; case ITEM_RADIO_SETUP_BACKLIGHT_DELAY: - lcdDrawText(INDENT_WIDTH, y, STR_DURATION); + lcdDrawTextIndented(y, STR_DURATION); lcdDrawNumber(LCD_W-7, y, g_eeGeneral.lightAutoOff*5, attr|RIGHT); lcdDrawChar(lcdLastRightPos, y, 's'); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5); break; case ITEM_RADIO_SETUP_BRIGHTNESS: - lcdDrawText(INDENT_WIDTH, y, STR_BRIGHTNESS); + lcdDrawTextIndented(y, STR_BRIGHTNESS); #if defined(OLED_SCREEN) lcdDrawNumber(LCD_W-2, y, g_eeGeneral.contrast, attr|RIGHT); if (attr) { @@ -630,7 +617,7 @@ void menuRadioSetup(event_t event) case ITEM_RADIO_SETUP_TIMEZONE: { - lcdDrawText(INDENT_WIDTH, y, STR_TIMEZONE); + lcdDrawTextIndented(y, STR_TIMEZONE); int tzIndex = timezoneIndex(g_eeGeneral.timezone, g_eeGeneral.timezoneMinutes); lcdDrawText(LCD_W-2, y, timezoneDisplay(tzIndex).c_str(), attr|RIGHT); if (attr) { diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index 5147578de71..5a1708a5f47 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -41,7 +41,7 @@ void displayRssiLine() lcdDrawFilledRect(66+36-v, 58, v, 5, (rssi < g_model.rfAlarms.warning) ? DOTTED : SOLID); } else { - lcdDrawText(7*FW, STATUS_BAR_Y, STR_NODATA, BLINK); + lcdDrawText(LCD_W/2, STATUS_BAR_Y, STR_NODATA, BLINK|CENTERED); lcdInvertLastLine(); } } diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp index 3d651a4b28e..dd05ec2a285 100644 --- a/radio/src/gui/128x64/widgets.cpp +++ b/radio/src/gui/128x64/widgets.cpp @@ -124,15 +124,25 @@ choice_t editChoice(coord_t x, coord_t y, const char * label, const char *const return editChoice(x, y, label, values, value, min, max, attr, event, lblX, nullptr); } +choice_t editChoice(coord_t x, coord_t y, const char * label, const char *const *values, choice_t value, choice_t min, choice_t max, LcdFlags attr, event_t event) +{ + return editChoice(x, y, label, values, value, min, max, attr, event, 0, nullptr); +} + uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event, coord_t lblX) { drawCheckBox(x, y, value, attr); return editChoice(x, y, label, nullptr, value, 0, 1, attr, event, lblX); } +uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, LcdFlags attr, event_t event) +{ + return editCheckBox(value, x, y, label, attr, event, 0); +} + swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event) { - drawFieldLabel(x, y, STR_SWITCH); + lcdDrawTextAlignedLeft(y, STR_SWITCH); drawSwitch(x, y, value, attr); if (attr & (~RIGHT)) CHECK_INCDEC_MODELSWITCH(event, value, SWSRC_FIRST_IN_MIXES, SWSRC_LAST_IN_MIXES, isSwitchAvailableInMixes); return value; diff --git a/radio/src/gui/212x64/gui.h b/radio/src/gui/212x64/gui.h index 2c956b59789..b64c1e088d4 100644 --- a/radio/src/gui/212x64/gui.h +++ b/radio/src/gui/212x64/gui.h @@ -51,11 +51,6 @@ #define MENUS_SCROLLBAR_WIDTH 2 -inline void drawFieldLabel(coord_t x, coord_t y, const char * str) -{ - lcdDrawText(0, y, str); -} - extern uint8_t modelBitmap[MODEL_BITMAP_SIZE]; bool loadModelBitmap(char * name, uint8_t * bitmap); diff --git a/radio/src/gui/212x64/lcd.cpp b/radio/src/gui/212x64/lcd.cpp index c44960afd77..4aa65ef5b6b 100644 --- a/radio/src/gui/212x64/lcd.cpp +++ b/radio/src/gui/212x64/lcd.cpp @@ -390,6 +390,11 @@ void lcdDrawTextAlignedLeft(coord_t y, const char * s) lcdDrawText(0, y, s); } +void lcdDrawTextIndented(coord_t y, const char * s) +{ + lcdDrawText(INDENT_WIDTH, y, s); +} + #if !defined(BOOT) void lcdDrawTextAtIndex(coord_t x, coord_t y, const char *const *s,uint8_t idx, LcdFlags flags) { diff --git a/radio/src/gui/212x64/lcd.h b/radio/src/gui/212x64/lcd.h index c7d6a3fa27f..e045056b3b0 100644 --- a/radio/src/gui/212x64/lcd.h +++ b/radio/src/gui/212x64/lcd.h @@ -27,8 +27,9 @@ #include "board.h" #define BOX_WIDTH 31 -#define CENTER "\015" #define CENTER_OFS (7*FW-FW/2) +#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) +#define INDENT_WIDTH (FW/2) #define FW 6 #define FWNUM 5 @@ -104,6 +105,7 @@ void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len, L void lcdDrawText(coord_t x, coord_t y, const char * s); void lcdDrawSizedText(coord_t x, coord_t y, const char * s, unsigned char len); void lcdDrawTextAlignedLeft(coord_t y, const char * s); +void lcdDrawTextIndented(coord_t y, const char * s); void lcdDrawHexNumber(coord_t x, coord_t y, uint32_t val, LcdFlags mode=0); void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags mode, uint8_t len); diff --git a/radio/src/gui/212x64/model_curve_edit.cpp b/radio/src/gui/212x64/model_curve_edit.cpp index 10b12ffc050..d0c78faca0c 100644 --- a/radio/src/gui/212x64/model_curve_edit.cpp +++ b/radio/src/gui/212x64/model_curve_edit.cpp @@ -105,7 +105,7 @@ void menuModelCurveOne(event_t event) menuVerticalPosition == 0, 0, old_editMode); // Curve type - lcdDrawTextAlignedLeft(3 * FH + 1, NO_INDENT(STR_TYPE)); + lcdDrawTextAlignedLeft(3 * FH + 1, STR_TYPE); LcdFlags attr = (menuVerticalPosition == 1 ? (s_editMode > 0 ? INVERS | BLINK : INVERS) : 0); lcdDrawTextAtIndex(INDENT_WIDTH, 4 * FH + 1, STR_CURVE_TYPES, crv.type, attr); if (attr) { diff --git a/radio/src/gui/212x64/model_display.cpp b/radio/src/gui/212x64/model_display.cpp index d9115e29c39..a98f8e6cc9d 100644 --- a/radio/src/gui/212x64/model_display.cpp +++ b/radio/src/gui/212x64/model_display.cpp @@ -126,7 +126,7 @@ void menuModelDisplay(event_t event) break; case ITEM_DISPLAY_TOP_BAR_VOLTAGE: - lcdDrawTextAlignedLeft(y, STR_VOLTAGE); + lcdDrawTextIndented(y, STR_VOLTAGE); drawSource(DISPLAY_COL2, y, g_model.voltsSource ? MIXSRC_FIRST_TELEM+3*(g_model.voltsSource-1) : 0, attr); if (attr) { g_model.voltsSource = checkIncDec(event, g_model.voltsSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVoltsSensor); @@ -134,7 +134,7 @@ void menuModelDisplay(event_t event) break; case ITEM_DISPLAY_TOP_BAR_ALTITUDE: - lcdDrawTextAlignedLeft(y, STR_ALTITUDE); + lcdDrawTextIndented(y, STR_ALTITUDE); drawSource(DISPLAY_COL2, y, g_model.altitudeSource ? MIXSRC_FIRST_TELEM+3*(g_model.altitudeSource-1) : 0, attr); if (attr) { g_model.altitudeSource = checkIncDec(event, g_model.altitudeSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isAltSensor); diff --git a/radio/src/gui/212x64/model_flightmodes.cpp b/radio/src/gui/212x64/model_flightmodes.cpp index acce5bd2084..63932c43e6f 100644 --- a/radio/src/gui/212x64/model_flightmodes.cpp +++ b/radio/src/gui/212x64/model_flightmodes.cpp @@ -72,7 +72,7 @@ void menuModelFlightModesAll(event_t event) if (k == MAX_FLIGHT_MODES) { // last line available - add the "check trims" line - lcdDrawTextAlignedLeft((LCD_LINES-1)*FH+1, STR_CHECKTRIMS); + lcdDrawText(CENTER_OFS, (LCD_LINES-1)*FH+1, STR_CHECKTRIMS); drawFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, mixerCurrentFlightMode+1); if (sub == MAX_FLIGHT_MODES) { if (!trimsCheckTimer) { diff --git a/radio/src/gui/212x64/model_input_edit.cpp b/radio/src/gui/212x64/model_input_edit.cpp index fbaff30917d..4860c54d24d 100644 --- a/radio/src/gui/212x64/model_input_edit.cpp +++ b/radio/src/gui/212x64/model_input_edit.cpp @@ -136,7 +136,7 @@ void menuModelExpoOne(event_t event) #if defined(FLIGHT_MODES) case EXPO_FIELD_FLIGHT_MODES: - drawFieldLabel(EXPO_ONE_2ND_COLUMN, y, STR_FLMODE); + lcdDrawTextAlignedLeft(y, STR_FLMODE); ed->flightModes = editFlightModes(EXPO_ONE_2ND_COLUMN, y, event, ed->flightModes, attr); break; #endif diff --git a/radio/src/gui/212x64/model_mix_edit.cpp b/radio/src/gui/212x64/model_mix_edit.cpp index bbd2cd76a4a..c74c50be70b 100644 --- a/radio/src/gui/212x64/model_mix_edit.cpp +++ b/radio/src/gui/212x64/model_mix_edit.cpp @@ -162,7 +162,7 @@ void menuModelMixOne(event_t event) #if defined(FLIGHT_MODES) case MIX_FIELD_FLIGHT_MODE: - drawFieldLabel(MIXES_2ND_COLUMN, y, STR_FLMODE); + lcdDrawTextAlignedLeft(y, STR_FLMODE); md2->flightModes = editFlightModes(MIXES_2ND_COLUMN, y, event, md2->flightModes, attr); break; #endif @@ -172,7 +172,7 @@ void menuModelMixOne(event_t event) break; case MIX_FIELD_WARNING: - drawFieldLabel(MIXES_2ND_COLUMN, y, STR_MIXWARNING); + lcdDrawTextAlignedLeft(y, STR_MIXWARNING); if (md2->mixWarn) lcdDrawNumber(MIXES_2ND_COLUMN, y, md2->mixWarn, attr|LEFT); else diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 886b43fe140..ca1da41e71b 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -285,7 +285,7 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, event_t event) void editTimerStart(int timerIdx, coord_t y, LcdFlags attr, event_t event) { - lcdDrawText(INDENT_WIDTH, y, STR_START); + lcdDrawTextIndented(y, STR_START); TimerData* timer = &(g_model.timers[timerIdx]); @@ -329,13 +329,13 @@ void editTimerStart(int timerIdx, coord_t y, LcdFlags attr, event_t event) void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event) { TimerData & timer = g_model.timers[timerIdx]; - lcdDrawTextAlignedLeft(y, STR_BEEPCOUNTDOWN); + lcdDrawTextIndented(y, STR_BEEPCOUNTDOWN); int value = timer.countdownBeep; if (timer.extraHaptic) value += (COUNTDOWN_NON_HAPTIC_LAST + 1); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VBEEPCOUNTDOWN, value, (menuHorizontalPosition == 0 ? attr : 0)); if (timer.countdownBeep != COUNTDOWN_SILENT) { - lcdDrawNumber(MODEL_SETUP_3RD_COLUMN, y, TIMER_COUNTDOWN_START(timerIdx), (menuHorizontalPosition == 1 ? attr : 0) | LEFT); + lcdDrawNumber(MODEL_SETUP_3RD_COLUMN + 8 * FW, y, TIMER_COUNTDOWN_START(timerIdx), (menuHorizontalPosition == 1 ? attr : 0) | LEFT); lcdDrawChar(lcdLastRightPos, y, 's'); } if (attr && s_editMode>0) { @@ -682,7 +682,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER1_PERSISTENT: g_model.timers[0].persistent = editChoice( MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, - g_model.timers[0].persistent, 0, 2, attr, event); + g_model.timers[0].persistent, 0, 2, attr, event, INDENT_WIDTH); break; @@ -710,7 +710,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER2_PERSISTENT: - g_model.timers[1].persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, g_model.timers[1].persistent, 0, 2, attr, event); + g_model.timers[1].persistent = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, g_model.timers[1].persistent, 0, 2, attr, event, INDENT_WIDTH); break; #endif @@ -742,7 +742,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_PERSISTENT: g_model.timers[2].persistent = editChoice( MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, STR_VPERSISTENT, - g_model.timers[2].persistent, 0, 2, attr, event); + g_model.timers[2].persistent, 0, 2, attr, event, INDENT_WIDTH); break; #endif @@ -794,7 +794,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_THROTTLE_TRACE: { - lcdDrawText(INDENT_WIDTH, y, STR_TTRACE); + lcdDrawTextIndented(y, STR_TTRACE); if (attr) CHECK_INCDEC_MODELVAR_ZERO_CHECK( event, g_model.thrTraceSrc, @@ -811,7 +811,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_THROTTLE_TRIM_SWITCH: - lcdDrawText(INDENT_WIDTH, y, STR_TTRIM_SW); + lcdDrawTextIndented(y, STR_TTRIM_SW); if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.thrTrimSw, keysGetMaxTrims() - 1); drawSource(MODEL_SETUP_2ND_COLUMN, y, g_model.getThrottleStickTrimSource(), attr); @@ -822,19 +822,19 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_CHECKLIST_DISPLAY: - g_model.displayChecklist = editCheckBox(g_model.displayChecklist, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event); + g_model.displayChecklist = editCheckBox(g_model.displayChecklist, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_CHECKLIST_INTERACTIVE: - g_model.checklistInteractive = editCheckBox(g_model.checklistInteractive, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST_INTERACTIVE, attr, event); + g_model.checklistInteractive = editCheckBox(g_model.checklistInteractive, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST_INTERACTIVE, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_THROTTLE_WARNING: - g_model.disableThrottleWarning = !editCheckBox(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLE_WARNING, attr, event); + g_model.disableThrottleWarning = !editCheckBox(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLE_WARNING, attr, event, INDENT_WIDTH); break; case ITEM_MODEL_SETUP_CUSTOM_THROTTLE_WARNING: - g_model.enableCustomThrottleWarning = editCheckBox(g_model.enableCustomThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_CUSTOM_THROTTLE_WARNING, attr, event); + g_model.enableCustomThrottleWarning = editCheckBox(g_model.enableCustomThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_CUSTOM_THROTTLE_WARNING, attr, event, INDENT_WIDTH*4); break; case ITEM_MODEL_SETUP_CUSTOM_THROTTLE_WARNING_VALUE: @@ -871,7 +871,7 @@ void menuModelSetup(event_t event) break; } #endif - lcdDrawTextAlignedLeft(y, STR_SWITCHWARNING); + lcdDrawTextIndented(y, STR_SWITCHWARNING); swarnstate_t states = g_model.switchWarning; if (attr) { @@ -949,7 +949,7 @@ void menuModelSetup(event_t event) } #endif - lcdDrawTextAlignedLeft(y, STR_POTWARNING); + lcdDrawTextIndented(y, STR_POTWARNING); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_PREFLIGHT_POTSLIDER_CHECK, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); if (attr && (menuHorizontalPosition == 0)) { CHECK_INCDEC_MODELVAR(event, g_model.potsWarnMode, POTS_WARN_OFF, POTS_WARN_AUTO); @@ -1055,7 +1055,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_TYPE: { - lcdDrawText(INDENT_WIDTH, y, STR_MODE); + lcdDrawTextIndented(y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, @@ -1110,7 +1110,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_TYPE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); + lcdDrawTextIndented(y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_PROTOCOLS, reusableBuffer.moduleSetup.newType, menuHorizontalPosition==0 ? attr : 0); if (isModuleXJT(EXTERNAL_MODULE)) lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0); @@ -1239,7 +1239,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_DSM_CLONED: { int8_t optionValue = (g_model.moduleData[EXTERNAL_MODULE].multi.optionValue & 0x04) >> 2; - lcdDrawText(INDENT_WIDTH / 2, y, STR_SUBTYPE); + lcdDrawTextIndented(y, STR_SUBTYPE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_DSM_CLONE, optionValue, attr | LEFT); if (attr && s_editMode > 0) { @@ -1255,7 +1255,7 @@ void menuModelSetup(event_t event) #if defined(CROSSFIRE) || defined(GHOST) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: { ModuleData &moduleData = g_model.moduleData[EXTERNAL_MODULE]; - lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE); + lcdDrawTextIndented(y, STR_BAUDRATE); if (isModuleCrossfire(EXTERNAL_MODULE)) { lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),attr | LEFT); if (attr) { @@ -1281,7 +1281,7 @@ void menuModelSetup(event_t event) } case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SERIALSTATUS: - lcdDrawText(INDENT_WIDTH, y, STR_STATUS); + lcdDrawTextIndented(y, STR_STATUS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, 1000000 / getMixerSchedulerPeriod(), LEFT | attr); lcdDrawText(lcdNextPos, y, "Hz ", attr); // lcdDrawNumber(lcdNextPos, y, telemetryErrors, attr); @@ -1301,7 +1301,7 @@ void menuModelSetup(event_t event) #if defined(MULTIMODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL: { - lcdDrawTextAlignedLeft(y, TR_TYPE); + lcdDrawTextIndented(y, STR_TYPE); uint8_t multi_rfProto = g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol; lcdDrawMultiProtocolString(MODEL_SETUP_2ND_COLUMN, y, EXTERNAL_MODULE, multi_rfProto, menuHorizontalPosition == 0 ? attr : 0); @@ -1349,7 +1349,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TRAINER_MODE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); + lcdDrawTextIndented(y, STR_MODE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VTRAINERMODES, g_model.trainerData.mode, attr); if (attr) { g_model.trainerData.mode = checkIncDec(event, g_model.trainerData.mode, 0, TRAINER_MODE_MAX(), EE_MODEL, isTrainerModeAvailable); @@ -1377,7 +1377,7 @@ void menuModelSetup(event_t event) } } else { - lcdDrawText(INDENT_WIDTH, y, "---"); + lcdDrawTextIndented(y, "---"); if (bluetooth.state < BLUETOOTH_STATE_IDLE) lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr); else @@ -1406,14 +1406,14 @@ void menuModelSetup(event_t event) if (bluetooth.distantAddr[0]) lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE); else - lcdDrawText(INDENT_WIDTH, y, "---"); + lcdDrawTextIndented(y, "---"); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, bluetooth.state == BLUETOOTH_STATE_CONNECTED ? STR_CONNECTED : STR_NOT_CONNECTED); } break; #endif case ITEM_MODEL_SETUP_TRAINER_CHANNELS: - lcdDrawTextAlignedLeft(y, STR_CHANNELRANGE); + lcdDrawTextIndented(y, STR_CHANNELRANGE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, menuHorizontalPosition==0 ? attr : 0); lcdDrawNumber(lcdLastRightPos, y, g_model.trainerData.channelsStart+1, LEFT | (menuHorizontalPosition==0 ? attr : 0)); lcdDrawChar(lcdLastRightPos, y, '-'); @@ -1437,7 +1437,7 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawTextAlignedLeft(y, STR_CHANNELRANGE); + lcdDrawTextIndented(y, STR_CHANNELRANGE); if ((int8_t)MODULE_CHANNELS_ROWS(moduleIdx) >= 0) { lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CH, menuHorizontalPosition==0 ? attr : 0); lcdDrawNumber(lcdLastRightPos, y, moduleData.channelsStart+1, LEFT | (menuHorizontalPosition==0 ? attr : 0)); @@ -1467,13 +1467,13 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawText(INDENT_WIDTH, y, STR_RACING_MODE); + lcdDrawTextIndented(y, STR_RACING_MODE); moduleData.pxx2.racingMode = editCheckBox(moduleData.pxx2.racingMode, MODEL_SETUP_2ND_COLUMN, y, "", attr, event); break; } case ITEM_MODEL_SETUP_TRAINER_PPM_PARAMS: - lcdDrawTextAlignedLeft(y, STR_PPMFRAME); + lcdDrawTextIndented(y, STR_PPMFRAME); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.trainerData.frameLength*5 + 225, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+6*FW, y, (g_model.trainerData.delay*50)+300, (CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0); @@ -1500,7 +1500,7 @@ void menuModelSetup(event_t event) uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); ModuleData & moduleData = g_model.moduleData[moduleIdx]; if (isModulePPM(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_PPMFRAME); + lcdDrawTextIndented(y, STR_PPMFRAME); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.ppm.frameLength*PPM_STEP_SIZE + PPM_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN+6*FW, y, (moduleData.ppm.delay*50)+300, (CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0); @@ -1521,7 +1521,7 @@ void menuModelSetup(event_t event) } } else if (isModuleSBUS(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_REFRESHRATE); + lcdDrawTextIndented(y, STR_REFRESHRATE); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, (int16_t)moduleData.sbus.refreshRate * SBUS_STEPSIZE + SBUS_DEF_PERIOD, (menuHorizontalPosition<=0 ? attr : 0) | PREC1|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS); lcdDrawText(MODEL_SETUP_3RD_COLUMN, y, moduleData.sbus.noninverted ? STR_NOT_INVERTED : STR_NORMAL, (CURSOR_ON_LINE() || menuHorizontalPosition==1) ? attr : 0); @@ -1537,7 +1537,7 @@ void menuModelSetup(event_t event) } } else { - lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER); + lcdDrawTextIndented(y, STR_RECEIVER); horzpos_t l_posHorz = menuHorizontalPosition; coord_t bindButtonPos = MODEL_SETUP_2ND_COLUMN; if (isModuleRxNumAvailable(moduleIdx)) { @@ -1643,7 +1643,7 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); ModuleData & moduleData = g_model.moduleData[moduleIdx]; - lcdDrawTextAlignedLeft(y, STR_FAILSAFE); + lcdDrawTextIndented(y, STR_FAILSAFE); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_VFAILSAFE, moduleData.failsafeMode, menuHorizontalPosition==0 ? attr : 0); if (moduleData.failsafeMode == FAILSAFE_CUSTOM) lcdDrawText(MODEL_SETUP_2ND_COLUMN + MODEL_SETUP_SET_FAILSAFE_OFS, y, STR_SET, menuHorizontalPosition==1 ? attr : 0); if (attr) { @@ -1688,7 +1688,7 @@ void menuModelSetup(event_t event) const char * title = getMultiOptionTitle(moduleIdx); if (!title) break; - lcdDrawText(INDENT_WIDTH, y, title); + lcdDrawTextIndented(y, title); if (title == STR_MULTI_RFTUNE) { lcdDrawText(MODEL_SETUP_2ND_COLUMN + 23, y, getRxStatLabels()->label, LEFT); lcdDrawText(lcdLastRightPos, y, "(", LEFT); @@ -1739,7 +1739,7 @@ void menuModelSetup(event_t event) } #endif if (isModuleR9MNonAccess(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_MODULE_TELEMETRY); + lcdDrawTextIndented(y, STR_MODULE_TELEMETRY); if (modulePortIsPortUsedByModule(moduleIdx, ETX_MOD_PORT_SPORT)) { lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_TELEM_ON); } @@ -1748,7 +1748,7 @@ void menuModelSetup(event_t event) } } else if (isModuleSBUS(moduleIdx)) { - lcdDrawTextAlignedLeft(y, STR_WARN_BATTVOLTAGE); + lcdDrawTextIndented(y, STR_WARN_BATTVOLTAGE); putsVolts(lcdLastRightPos, y, getBatteryVoltage(), attr | PREC2 | LEFT); } else if (isModuleGhost(moduleIdx)) { @@ -1762,7 +1762,7 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); if (isModuleR9MNonAccess(moduleIdx)) { - lcdDrawText(INDENT_WIDTH, y, STR_RF_POWER); + lcdDrawTextIndented(y, STR_RF_POWER); if (isModuleR9M_FCC_VARIANT(moduleIdx)) { lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); if (attr) @@ -1781,12 +1781,13 @@ void menuModelSetup(event_t event) } #if defined (MULTIMODULE) else if (isModuleMultimodule(moduleIdx)) { - g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode, MODEL_SETUP_2ND_COLUMN, y, IS_RX_MULTI(moduleIdx) ? STR_MULTI_LNA_DISABLE : STR_MULTI_LOWPOWER, attr, event); + g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode, + MODEL_SETUP_2ND_COLUMN, y, IS_RX_MULTI(moduleIdx) ? STR_MULTI_LNA_DISABLE : STR_MULTI_LOWPOWER, attr, event, INDENT_WIDTH); } #endif #if defined(AFHDS3) else if (isModuleAFHDS3(EXTERNAL_MODULE)) { - lcdDrawText(INDENT_WIDTH, y, STR_RF_POWER); + lcdDrawTextIndented(y, STR_RF_POWER); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_POWERS, g_model.moduleData[EXTERNAL_MODULE].afhds3.runPower, LEFT | attr); if (attr) CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].afhds3.runPower, afhds3::RUN_POWER::RUN_POWER_FIRST, afhds3::RUN_POWER::RUN_POWER_LAST); @@ -1799,7 +1800,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AUTOBIND: if (g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2) { int8_t value = (g_model.moduleData[EXTERNAL_MODULE].multi.optionValue & 0x02) >> 1; - lcdDrawText(INDENT_WIDTH, y, STR_MULTI_SERVOFREQ); + lcdDrawTextIndented(y, STR_MULTI_SERVOFREQ); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, value ? 11 : 22, attr); lcdDrawText(lcdNextPos, y, "ms", attr); if (attr) { @@ -1810,7 +1811,7 @@ void menuModelSetup(event_t event) } } else { - g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode, MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_AUTOBIND, attr, event); + g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode = editCheckBox(g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode, MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_AUTOBIND, attr, event, INDENT_WIDTH); } break; #if defined(MANUFACTURER_FRSKY) @@ -1825,7 +1826,7 @@ void menuModelSetup(event_t event) #if defined(AFHDS3) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_RX_FREQ: - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_RX_FREQ); + lcdDrawTextIndented(y, STR_AFHDS3_RX_FREQ); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(), attr | LEFT); if (attr) { uint16_t rxFreq = g_model.moduleData[EXTERNAL_MODULE].afhds3.rxFreq(); @@ -1834,20 +1835,20 @@ void menuModelSetup(event_t event) } break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_ACTUAL_POWER: - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_ACTUAL_POWER); + lcdDrawTextIndented(y, STR_AFHDS3_ACTUAL_POWER); lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_AFHDS3_POWERS, actualAfhdsRunPower(EXTERNAL_MODULE), LEFT); break; #endif #if defined (MULTIMODULE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS: - lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS); + lcdDrawTextIndented(y, STR_MODULE_STATUS); getModuleStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS: - lcdDrawText(INDENT_WIDTH, y, STR_MODULE_SYNC); + lcdDrawTextIndented(y, STR_MODULE_SYNC); getModuleSyncStatusString(EXTERNAL_MODULE, reusableBuffer.moduleSetup.msg); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, reusableBuffer.moduleSetup.msg); break; @@ -1855,13 +1856,13 @@ void menuModelSetup(event_t event) #if defined (AFHDS3) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_MODE: - lcdDrawTextAlignedLeft(y, STR_TYPE); + lcdDrawTextIndented(y, STR_TYPE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[EXTERNAL_MODULE].afhds3.telemetry ? STR_AFHDS3_ONE_TO_ONE_TELEMETRY : TR_AFHDS3_ONE_TO_MANY); break; case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_STATUS: { - lcdDrawTextAlignedLeft(y, TR_MODULE_STATUS); + lcdDrawTextIndented(y, TR_MODULE_STATUS); char statusText[64]; getModuleStatusString(EXTERNAL_MODULE, statusText); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); @@ -1869,7 +1870,7 @@ void menuModelSetup(event_t event) } case ITEM_MODEL_SETUP_EXTERNAL_MODULE_AFHDS3_POWER_STATUS: { - lcdDrawText(INDENT_WIDTH, y, STR_AFHDS3_POWER_SOURCE); + lcdDrawTextIndented(y, STR_AFHDS3_POWER_SOURCE); char statusText[64]; getModuleSyncStatusString(EXTERNAL_MODULE, statusText); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText); @@ -1891,7 +1892,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_MODEL_NUM: { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); - lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER_NUM); + lcdDrawTextIndented(y, STR_RECEIVER_NUM); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], attr | LEADING0 | LEFT, 2); if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], getMaxRxNum(moduleIdx)); @@ -1906,7 +1907,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_REGISTER_RANGE: { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); - lcdDrawText(INDENT_WIDTH, y, STR_MODULE); + lcdDrawTextIndented(y, STR_MODULE); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0)); lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { @@ -1931,7 +1932,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_INTERNAL_MODULE_PXX2_OPTIONS: case ITEM_MODEL_SETUP_EXTERNAL_MODULE_PXX2_OPTIONS: - lcdDrawText(INDENT_WIDTH, y, STR_OPTIONS); + lcdDrawTextIndented(y, STR_OPTIONS); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_SET, attr); if (event == EVT_KEY_BREAK(KEY_ENTER) && attr) { g_moduleIdx = CURRENT_MODULE_EDITED(k); @@ -1953,7 +1954,7 @@ void menuModelSetup(event_t event) expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event); break; case ITEM_VIEW_OPTIONS_RADIO_TAB: - lcdDrawText(INDENT_WIDTH, y, TR_RADIO_MENU_TABS); + lcdDrawTextIndented(y, TR_RADIO_MENU_TABS); break; case ITEM_VIEW_OPTIONS_GF: g_model.radioGFDisabled = viewOptChoice(y, STR_MENUSPECIALFUNCS, g_model.radioGFDisabled, attr, event, g_eeGeneral.radioGFDisabled); @@ -1962,7 +1963,7 @@ void menuModelSetup(event_t event) g_model.radioTrainerDisabled = viewOptChoice(y, STR_MENUTRAINER, g_model.radioTrainerDisabled, attr, event, g_eeGeneral.radioTrainerDisabled); break; case ITEM_VIEW_OPTIONS_MODEL_TAB: - lcdDrawText(INDENT_WIDTH, y, TR_MODEL_MENU_TABS); + lcdDrawTextIndented(y, TR_MODEL_MENU_TABS); break; #if defined(HELI) case ITEM_VIEW_OPTIONS_HELI: diff --git a/radio/src/gui/212x64/model_special_functions.cpp b/radio/src/gui/212x64/model_special_functions.cpp index 229d995e028..6b71368eb82 100644 --- a/radio/src/gui/212x64/model_special_functions.cpp +++ b/radio/src/gui/212x64/model_special_functions.cpp @@ -441,11 +441,12 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF case ITEM_CUSTOM_FUNCTIONS_ENABLE: drawCheckBox(MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF, y, CFN_ACTIVE(cfn), attr); - if (active) + if (active) { CFN_ACTIVE(cfn) = checkIncDec(event, CFN_ACTIVE(cfn), 0, 1, eeFlags); if (checkIncDec_Ret && (func == FUNC_PLAY_SCRIPT)) { LUA_LOAD_MODEL_SCRIPTS(); } + } break; } } diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index e93f0cc51f5..85b4e412a04 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -191,7 +191,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_NEW_SENSOR: - lcdDrawText(0, y, STR_TELEMETRY_NEWSENSOR, attr); + lcdDrawText(INDENT_WIDTH, y, STR_TELEMETRY_NEWSENSOR, attr); if (attr && event==EVT_KEY_BREAK(KEY_ENTER)) { s_editMode = 0; int res = availableTelemetryIndex(); @@ -218,7 +218,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_IGNORE_SENSOR_INSTANCE: - g_model.ignoreSensorIds = editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event); + g_model.ignoreSensorIds = editCheckBox(g_model.ignoreSensorIds, TELEM_COL2, y, STR_IGNORE_INSTANCE, attr, event, INDENT_WIDTH); break; case ITEM_TELEMETRY_RSSI_LABEL: @@ -229,7 +229,7 @@ void menuModelTelemetry(event_t event) case ITEM_TELEMETRY_RSSI_ALARM2: { bool warning = (k==ITEM_TELEMETRY_RSSI_ALARM1); - lcdDrawTextAlignedLeft(y, (warning ? STR_LOWALARM : STR_CRITICALALARM)); + lcdDrawTextIndented(y, (warning ? STR_LOWALARM : STR_CRITICALALARM)); lcdDrawNumber(TELEM_COL2, y, warning? g_model.rfAlarms.warning : g_model.rfAlarms.critical, LEFT|attr, 3); if (attr && s_editMode>0) { if (warning) @@ -241,7 +241,7 @@ void menuModelTelemetry(event_t event) } case ITEM_TELEMETRY_DISABLE_ALARMS: - g_model.disableTelemetryWarning = editCheckBox(g_model.disableTelemetryWarning, TELEM_COL3, y, STR_DISABLE_ALARM, attr, event); + g_model.disableTelemetryWarning = editCheckBox(g_model.disableTelemetryWarning, TELEM_COL3, y, STR_DISABLE_ALARM, attr, event, INDENT_WIDTH); break; #if defined(VARIO) @@ -250,7 +250,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_SOURCE: - lcdDrawText(INDENT_WIDTH, y, STR_SOURCE); + lcdDrawTextIndented(y, STR_SOURCE); drawSource(TELEM_COL2, y, g_model.varioData.source ? MIXSRC_FIRST_TELEM+3*(g_model.varioData.source-1) : 0, attr); if (attr) { g_model.varioData.source = checkIncDec(event, g_model.varioData.source, 0, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVarioSensorAvailable); @@ -258,7 +258,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_RANGE: - lcdDrawTextAlignedLeft(y, STR_RANGE); + lcdDrawTextIndented(y, STR_RANGE); lcdDrawNumber(TELEM_COL2, y, -10+g_model.varioData.min, (menuHorizontalPosition==0 ? attr : 0)|LEFT); lcdDrawNumber(TELEM_COL2+7*FW, y, 10+g_model.varioData.max, (menuHorizontalPosition==1 ? attr : 0)|LEFT); if (attr && s_editMode>0) { @@ -274,7 +274,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_VARIO_CENTER: - lcdDrawTextAlignedLeft(y, STR_CENTER); + lcdDrawTextIndented(y, STR_CENTER); lcdDrawNumber(TELEM_COL2, y, -5+g_model.varioData.centerMin, (menuHorizontalPosition==0 ? attr : 0)|PREC1|LEFT); lcdDrawNumber(TELEM_COL2+7*FW, y, 5+g_model.varioData.centerMax, (menuHorizontalPosition==1 ? attr : 0)|PREC1|LEFT); lcdDrawTextAtIndex(TELEM_COL3, y, STR_VVARIOCENTER, g_model.varioData.centerSilent, (menuHorizontalPosition==2 ? attr : 0)); diff --git a/radio/src/gui/212x64/model_telemetry_sensor.cpp b/radio/src/gui/212x64/model_telemetry_sensor.cpp index a2f5ab32c87..12e22d9134a 100644 --- a/radio/src/gui/212x64/model_telemetry_sensor.cpp +++ b/radio/src/gui/212x64/model_telemetry_sensor.cpp @@ -103,7 +103,7 @@ void menuModelSensor(event_t event) TELEM_LABEL_LEN, event, attr, old_editMode); break; case SENSOR_FIELD_TYPE: - sensor->type = editChoice(SENSOR_2ND_COLUMN, y, NO_INDENT(STR_TYPE), STR_VSENSORTYPES, sensor->type, 0, 1, attr, event); + sensor->type = editChoice(SENSOR_2ND_COLUMN, y, STR_TYPE, STR_VSENSORTYPES, sensor->type, 0, 1, attr, event); if (attr && checkIncDec_Ret) { sensor->instance = 0; if (sensor->type == TELEM_TYPE_CALCULATED) { @@ -306,7 +306,7 @@ void menuModelSensor(event_t event) break; case SENSOR_FIELD_PERSISTENT: - sensor->persistent = editCheckBox(sensor->persistent, SENSOR_2ND_COLUMN, y, NO_INDENT(STR_PERSISTENT), attr, event); + sensor->persistent = editCheckBox(sensor->persistent, SENSOR_2ND_COLUMN, y, STR_PERSISTENT, attr, event, INDENT_WIDTH); if (checkIncDec_Ret && !sensor->persistent) { sensor->persistentValue = 0; } diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 22cd679469d..19774cf8a89 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -36,10 +36,10 @@ const unsigned char sticks[] = { #define RADIO_SETUP_DATE_COLUMN RADIO_SETUP_2ND_COLUMN + 4*FWNUM #define RADIO_SETUP_TIME_COLUMN RADIO_SETUP_2ND_COLUMN + 2*FWNUM -#define SLIDER_5POS(y, value, event, attr) { \ - int8_t tmp = value; \ - drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \ - value = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, nullptr, tmp, -2, +2, attr, event); \ +int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const char* title) +{ + drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+value, 4, attr); \ + return editChoice(RADIO_SETUP_2ND_COLUMN, y, title, nullptr, value, -2, +2, attr, event, INDENT_WIDTH); } enum MenuRadioSetupItems { @@ -339,7 +339,7 @@ void menuRadioSetup(event_t event) case ITEM_RADIO_SETUP_GENERAL_VOLUME: { - lcdDrawText(INDENT_WIDTH, y, STR_VOLUME); + lcdDrawTextIndented(y, STR_VOLUME); uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; drawSlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr); if (attr) { @@ -352,27 +352,23 @@ void menuRadioSetup(event_t event) } case ITEM_RADIO_SETUP_BEEP_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_VOLUME); - SLIDER_5POS(y, g_eeGeneral.beepVolume, event, attr); + g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME); break; case ITEM_RADIO_SETUP_WAV_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_WAV_VOLUME); - SLIDER_5POS(y, g_eeGeneral.wavVolume, event, attr); + g_eeGeneral.wavVolume = slider_5pos(y, g_eeGeneral.wavVolume, event, attr, STR_WAV_VOLUME); break; case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_BG_VOLUME); - SLIDER_5POS(y, g_eeGeneral.backgroundVolume, event, attr); + g_eeGeneral.backgroundVolume = slider_5pos(y, g_eeGeneral.backgroundVolume, event, attr, STR_BG_VOLUME); break; case ITEM_RADIO_SETUP_BEEP_LENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_LENGTH); - SLIDER_5POS(y, g_eeGeneral.beepLength, event, attr); + g_eeGeneral.beepLength = slider_5pos(y, g_eeGeneral.beepLength, event, attr, STR_BEEP_LENGTH); break; case ITEM_RADIO_SETUP_SPEAKER_PITCH: - lcdDrawText(INDENT_WIDTH, y, STR_BEEP_PITCH); + lcdDrawTextIndented(y, STR_BEEP_PITCH); lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); lcdDrawText(lcdLastRightPos, y, "Hz", attr); @@ -387,26 +383,25 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_VARIO_VOLUME: - lcdDrawText(INDENT_WIDTH, y, STR_VOLUME); - SLIDER_5POS(y, g_eeGeneral.varioVolume, event, attr); + g_eeGeneral.varioVolume = slider_5pos(y, g_eeGeneral.varioVolume, event, attr, STR_VOLUME); break; case ITEM_RADIO_SETUP_VARIO_PITCH: - lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_ZERO); + lcdDrawTextIndented(y, STR_PITCH_AT_ZERO); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT); lcdDrawText(lcdLastRightPos, y, "Hz", attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40); break; case ITEM_RADIO_SETUP_VARIO_RANGE: - lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_MAX); + lcdDrawTextIndented(y, STR_PITCH_AT_MAX); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT); lcdDrawText(lcdLastRightPos, y, "Hz", attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80); break; case ITEM_RADIO_SETUP_VARIO_REPEAT: - lcdDrawText(INDENT_WIDTH, y, STR_REPEAT_AT_ZERO); + lcdDrawTextIndented(y, STR_REPEAT_AT_ZERO); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS, attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50); @@ -419,23 +414,20 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_HAPTIC_MODE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); - g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event); + g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_HAPTIC_LENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_LENGTH); - SLIDER_5POS(y, g_eeGeneral.hapticLength, event, attr); + g_eeGeneral.hapticLength = slider_5pos(y, g_eeGeneral.hapticLength, event, attr, STR_LENGTH); break; case ITEM_RADIO_SETUP_HAPTIC_STRENGTH: - lcdDrawText(INDENT_WIDTH, y, STR_STRENGTH); - SLIDER_5POS(y, g_eeGeneral.hapticStrength, event, attr); + g_eeGeneral.hapticStrength = slider_5pos(y, g_eeGeneral.hapticStrength, event, attr, STR_STRENGTH); break; #endif case ITEM_RADIO_SETUP_CONTRAST: - lcdDrawText(INDENT_WIDTH, y, STR_CONTRAST); + lcdDrawTextIndented(y, STR_CONTRAST); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX); @@ -448,32 +440,29 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_BATTERY_WARNING: - lcdDrawText(INDENT_WIDTH, y, STR_BATTERYWARNING); + lcdDrawTextIndented(y, STR_BATTERYWARNING); putsVolts(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.vBatWarn, attr|LEFT); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 40, 120); // 4-12V break; case ITEM_RADIO_SETUP_MEMORY_WARNING: { - lcdDrawText(INDENT_WIDTH, y, STR_MEMORYWARNING); uint8_t b = 1 - g_eeGeneral.disableMemoryWarning; - g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event); + g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event, INDENT_WIDTH); break; } case ITEM_RADIO_SETUP_ALARM_WARNING: { - lcdDrawText(INDENT_WIDTH, y, STR_ALARMWARNING); uint8_t b = 1 - g_eeGeneral.disableAlarmWarning; - g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event); + g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event, INDENT_WIDTH); break; } case ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM: { - lcdDrawText(INDENT_WIDTH, y, STR_RSSI_SHUTDOWN_ALARM); uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm; - g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event); + g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_RSSI_SHUTDOWN_ALARM, attr, event, INDENT_WIDTH); break; } @@ -486,7 +475,7 @@ void menuRadioSetup(event_t event) } case ITEM_RADIO_SETUP_INACTIVITY_ALARM: - lcdDrawText(INDENT_WIDTH, y, STR_INACTIVITYALARM); + lcdDrawTextIndented(y, STR_INACTIVITYALARM); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT); lcdDrawChar(lcdLastRightPos, y, 'm'); if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes @@ -497,13 +486,12 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_BACKLIGHT_MODE: - lcdDrawText(INDENT_WIDTH, y, STR_MODE); - g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); + g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_FLASH_BEEP: - lcdDrawText(INDENT_WIDTH, y, STR_ALARM); - g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event ) ; + lcdDrawTextIndented(y, STR_ALARM); + g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event, INDENT_WIDTH) ; break; #if defined(PXX2) @@ -516,14 +504,14 @@ void menuRadioSetup(event_t event) #endif case ITEM_RADIO_SETUP_BACKLIGHT_DELAY: - lcdDrawText(INDENT_WIDTH, y, STR_DURATION); + lcdDrawTextIndented(y, STR_DURATION); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT); lcdDrawChar(lcdLastRightPos, y, 's'); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5); break; case ITEM_RADIO_SETUP_BRIGHTNESS: - lcdDrawText(INDENT_WIDTH, y, STR_BRIGHTNESS); + lcdDrawTextIndented(y, STR_BRIGHTNESS); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; if (attr) { uint8_t b = 100 - g_eeGeneral.backlightBright; @@ -534,7 +522,7 @@ void menuRadioSetup(event_t event) #if defined(PCBX9DP) || defined(PCBX9E) case ITEM_RADIO_SETUP_BACKLIGHT_COLOR: - lcdDrawText(INDENT_WIDTH, y, STR_BLCOLOR); + lcdDrawTextIndented(y, STR_BLCOLOR); drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightColor, 20, attr); if (attr) g_eeGeneral.backlightColor = checkIncDec(event, g_eeGeneral.backlightColor, 0, 20, EE_GENERAL | NO_INCDEC_MARKS); break; @@ -580,7 +568,7 @@ void menuRadioSetup(event_t event) case ITEM_RADIO_SETUP_TIMEZONE: { - lcdDrawText(INDENT_WIDTH, y, STR_TIMEZONE); + lcdDrawTextIndented(y, STR_TIMEZONE); int tzIndex = timezoneIndex(g_eeGeneral.timezone, g_eeGeneral.timezoneMinutes); lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, timezoneDisplay(tzIndex).c_str(), attr); if (attr) { @@ -594,13 +582,11 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_ADJUST_RTC: - lcdDrawText(INDENT_WIDTH, y, STR_ADJUST_RTC); - g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event); + g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, STR_ADJUST_RTC, attr, event, INDENT_WIDTH); break; case ITEM_RADIO_SETUP_GPSFORMAT: - lcdDrawText(INDENT_WIDTH, y, STR_GPS_COORDS_FORMAT); - g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event); + g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_GPS_COORDS_FORMAT, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event, INDENT_WIDTH); break; #endif @@ -718,7 +704,7 @@ void menuRadioSetup(event_t event) lcdDrawTextAlignedLeft(y, STR_ENABLED_FEATURES); break; case ITEM_VIEW_OPTIONS_RADIO_TAB: - lcdDrawText(INDENT_WIDTH, y, TR_RADIO_MENU_TABS); + lcdDrawTextIndented(y, TR_RADIO_MENU_TABS); break; case ITEM_VIEW_OPTIONS_GF: g_eeGeneral.radioGFDisabled = viewOptCheckBox(y, STR_MENUSPECIALFUNCS, g_eeGeneral.radioGFDisabled, attr, event, g_model.radioGFDisabled); @@ -727,7 +713,7 @@ void menuRadioSetup(event_t event) g_eeGeneral.radioTrainerDisabled = viewOptCheckBox(y, STR_MENUTRAINER, g_eeGeneral.radioTrainerDisabled, attr, event, g_model.radioTrainerDisabled); break; case ITEM_VIEW_OPTIONS_MODEL_TAB: - lcdDrawText(INDENT_WIDTH, y, TR_MODEL_MENU_TABS); + lcdDrawTextIndented(y, TR_MODEL_MENU_TABS); break; #if defined(HELI) case ITEM_VIEW_OPTIONS_HELI: diff --git a/radio/src/gui/212x64/view_telemetry.cpp b/radio/src/gui/212x64/view_telemetry.cpp index 1310ce8d3ac..d2dae9760c0 100644 --- a/radio/src/gui/212x64/view_telemetry.cpp +++ b/radio/src/gui/212x64/view_telemetry.cpp @@ -39,7 +39,7 @@ void displayRssiLine() lcdDrawFilledRect(BAR_LEFT+1, 58, 19*rssi/25, 5, (rssi < g_model.rfAlarms.warning) ? DOTTED : SOLID); } else { - lcdDrawText(7*FW, STATUS_BAR_Y, STR_NODATA, BLINK); + lcdDrawText(LCD_W/2, STATUS_BAR_Y, STR_NODATA, BLINK|CENTERED); lcdInvertLastLine(); } } diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp index 3a877023f71..223192363de 100644 --- a/radio/src/gui/212x64/widgets.cpp +++ b/radio/src/gui/212x64/widgets.cpp @@ -105,7 +105,7 @@ uint8_t editCheckBox(uint8_t value, coord_t x, coord_t y, const char *label, Lcd swsrc_t editSwitch(coord_t x, coord_t y, swsrc_t value, LcdFlags attr, event_t event) { - drawFieldLabel(x, y, STR_SWITCH); + lcdDrawTextAlignedLeft(y, STR_SWITCH); drawSwitch(x, y, value, attr); if (attr & (~RIGHT)) CHECK_INCDEC_MODELSWITCH(event, value, SWSRC_FIRST_IN_MIXES, SWSRC_LAST_IN_MIXES, isSwitchAvailableInMixes); return value; diff --git a/radio/src/gui/common/stdlcd/calibration.cpp b/radio/src/gui/common/stdlcd/calibration.cpp index e2be5ba8340..4c9dbae9604 100644 --- a/radio/src/gui/common/stdlcd/calibration.cpp +++ b/radio/src/gui/common/stdlcd/calibration.cpp @@ -44,21 +44,21 @@ void menuCommonCalib(event_t event) case CALIB_START: // START CALIBRATION if (!READ_ONLY()) { - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART); + lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART, CENTERED); } break; case CALIB_SET_MIDPOINT: // SET MIDPOINT - lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS); - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE); + lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS|CENTERED); + lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE, CENTERED); adcCalibSetMidPoint(); break; case CALIB_MOVE_STICKS: // MOVE STICKS/POTS - lcdDrawText(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS); - lcdDrawTextAlignedLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE); + lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS|CENTERED); + lcdDrawText(LCD_W/2, MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE, CENTERED); adcCalibSetMinMax(); break; diff --git a/radio/src/gui/common/stdlcd/draw_functions.cpp b/radio/src/gui/common/stdlcd/draw_functions.cpp index 913954effb5..fc52ac8c3d2 100644 --- a/radio/src/gui/common/stdlcd/draw_functions.cpp +++ b/radio/src/gui/common/stdlcd/draw_functions.cpp @@ -312,7 +312,7 @@ void drawGVarName(coord_t x, coord_t y, int8_t idx, LcdFlags flags) void editStickHardwareSettings(coord_t x, coord_t y, int idx, event_t event, LcdFlags flags, uint8_t old_editMode) { - lcdDrawText(INDENT_WIDTH, y, STR_CHAR_STICK, 0); + lcdDrawTextIndented(y, STR_CHAR_STICK); lcdDrawText(lcdNextPos, y, analogGetCanonicalName(ADC_INPUT_MAIN, idx), 0); if (analogHasCustomLabel(ADC_INPUT_MAIN, idx) || (flags && s_editMode > 0)) diff --git a/radio/src/gui/common/stdlcd/model_heli.cpp b/radio/src/gui/common/stdlcd/model_heli.cpp index ce5c90447f1..b1617fdb649 100644 --- a/radio/src/gui/common/stdlcd/model_heli.cpp +++ b/radio/src/gui/common/stdlcd/model_heli.cpp @@ -69,7 +69,7 @@ void menuModelHeli(event_t event) break; case ITEM_HELI_ELE_WEIGHT: - lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT); + lcdDrawTextIndented(y, STR_WEIGHT); lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.elevatorWeight, LEFT|attr); if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.elevatorWeight, -100, 100); break; @@ -81,7 +81,7 @@ void menuModelHeli(event_t event) break; case ITEM_HELI_AIL_WEIGHT: - lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT); + lcdDrawTextIndented(y, STR_WEIGHT); lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.aileronWeight, LEFT|attr); if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.aileronWeight, -100, 100); break; @@ -93,7 +93,7 @@ void menuModelHeli(event_t event) break; case ITEM_HELI_COL_WEIGHT: - lcdDrawText(INDENT_WIDTH, y, STR_WEIGHT); + lcdDrawTextIndented(y, STR_WEIGHT); lcdDrawNumber(MODEL_HELI_2ND_COLUMN, y, g_model.swashR.collectiveWeight, LEFT|attr); if (attr) CHECK_INCDEC_MODELVAR(event, g_model.swashR.collectiveWeight, -100, 100); break; diff --git a/radio/src/gui/common/stdlcd/radio_hardware.cpp b/radio/src/gui/common/stdlcd/radio_hardware.cpp index 95b3f433942..7d6a72c3aac 100644 --- a/radio/src/gui/common/stdlcd/radio_hardware.cpp +++ b/radio/src/gui/common/stdlcd/radio_hardware.cpp @@ -304,7 +304,7 @@ void menuRadioHardware(event_t event) editChoice(HW_SETTINGS_COLUMN2, y, STR_TYPE, STR_MODULE_PROTOCOLS, g_eeGeneral.internalModule, MODULE_TYPE_NONE, - MODULE_TYPE_MAX, attr, event, 0, isInternalModuleSupported); + MODULE_TYPE_MAX, attr, event, INDENT_WIDTH, isInternalModuleSupported); if (g_model.moduleData[INTERNAL_MODULE].type != g_eeGeneral.internalModule) { memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData)); @@ -325,7 +325,7 @@ void menuRadioHardware(event_t event) #endif case ITEM_RADIO_HARDWARE_INTERNAL_MODULE_BAUDRATE: - lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE); + lcdDrawTextIndented(y, STR_BAUDRATE); lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_CRSF_BAUDRATE, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate),attr | LEFT); if (attr) { g_eeGeneral.internalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate), 0, CROSSFIRE_MAX_INTERNAL_BAUDRATE)); @@ -352,22 +352,22 @@ void menuRadioHardware(event_t event) break; case ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE: - lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH_PIN_CODE); + lcdDrawTextIndented(y, STR_BLUETOOTH_PIN_CODE); lcdDrawText(HW_SETTINGS_COLUMN2, y, "000000"); break; case ITEM_RADIO_HARDWARE_BLUETOOTH_LOCAL_ADDR: - lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH_LOCAL_ADDR); + lcdDrawTextIndented(y, STR_BLUETOOTH_LOCAL_ADDR); lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetooth.localAddr[0] == '\0' ? "---" : bluetooth.localAddr); break; case ITEM_RADIO_HARDWARE_BLUETOOTH_DISTANT_ADDR: - lcdDrawText(INDENT_WIDTH, y, STR_BLUETOOTH_DIST_ADDR); + lcdDrawTextIndented(y, STR_BLUETOOTH_DIST_ADDR); lcdDrawText(HW_SETTINGS_COLUMN2, y, bluetooth.distantAddr[0] == '\0' ? "---" : bluetooth.distantAddr); break; case ITEM_RADIO_HARDWARE_BLUETOOTH_NAME: - lcdDrawText(INDENT_WIDTH, y, STR_NAME); + lcdDrawTextIndented(y, STR_NAME); editName(HW_SETTINGS_COLUMN2, y, g_eeGeneral.bluetoothName, LEN_BLUETOOTH_NAME, event, (attr != 0), attr, old_editMode); break; @@ -577,7 +577,7 @@ void menuRadioHardware(event_t event) auto port_nr = k - ITEM_RADIO_HARDWARE_SERIAL_PORT; auto port = serialGetPort(port_nr); if (port && port->name) { - lcdDrawText(INDENT_WIDTH, y, port->name); + lcdDrawTextIndented(y, port->name); auto mode = serialGetMode(port_nr); mode = editChoice(HW_SETTINGS_COLUMN2, y, nullptr, diff --git a/radio/src/gui/common/stdlcd/radio_version.cpp b/radio/src/gui/common/stdlcd/radio_version.cpp index 63dafee50f3..31d8a49111e 100644 --- a/radio/src/gui/common/stdlcd/radio_version.cpp +++ b/radio/src/gui/common/stdlcd/radio_version.cpp @@ -135,7 +135,7 @@ void menuRadioModulesVersion(event_t event) // Module model if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) { - lcdDrawText(INDENT_WIDTH, y, STR_MODULE); + lcdDrawTextIndented(y, STR_MODULE); bool module_off = true; #if defined(HARDWARE_INTERNAL_MODULE) if (module == INTERNAL_MODULE && modulePortPowered(INTERNAL_MODULE)) @@ -197,7 +197,7 @@ void menuRadioModulesVersion(event_t event) if (reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].information.modelID && reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].timestamp < get_tmr10ms() + 2000) { // Receiver model if (y >= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) { - lcdDrawText(INDENT_WIDTH, y, STR_RECEIVER); + lcdDrawTextIndented(y, STR_RECEIVER); lcdDrawNumber(lcdLastRightPos + 2, y, receiver + 1); uint8_t modelId = reusableBuffer.hardwareAndSettings.modules[module].receivers[receiver].information.modelID; lcdDrawText(COLUMN2_X, y, getPXX2ReceiverName(modelId)); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 505d111559b..ba6ccdaa819 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -21,10 +21,6 @@ #include "opentx.h" -#if defined(COLORLCD) - #define CENTER -#endif - #define ISTR(x) const char* const STR_##x[] = { TR_##x } #if defined(COLORLCD) @@ -254,7 +250,6 @@ const char STR_PERSISTENT[] = TR_PERSISTENT; const char STR_BACKLIGHT_LABEL[] = TR_BACKLIGHT_LABEL; const char STR_GHOST_MENU_LABEL[] = TR_GHOST_MENU_LABEL; const char STR_STATUS[] = TR_STATUS; -const char STR_BLDELAY[] = TR_BLDELAY; const char STR_DEF_CHAN_ORD[] = TR_DEF_CHAN_ORD; const char STR_STICKS[] = TR_STICKS; const char STR_POTS[] = TR_POTS; @@ -336,7 +331,6 @@ const char STR_THROTTLE_UPPERCASE[] = TR_THROTTLE_UPPERCASE; const char STR_SWITCHWARNING[] = TR_SWITCHWARNING; const char STR_POTWARNINGSTATE[] = TR_POTWARNINGSTATE; const char STR_POTWARNING[] = TR_POTWARNING; -const char STR_SLIDERWARNING[] = TR_SLIDERWARNING; const char STR_MENUSTAT[] = TR_MENUSTAT; const char STR_MENUDEBUG[] = TR_MENUDEBUG; const char *const STR_MONITOR_CHANNELS[] = {TR_MONITOR_CHANNELS1, TR_MONITOR_CHANNELS2, TR_MONITOR_CHANNELS3, TR_MONITOR_CHANNELS4}; @@ -493,7 +487,6 @@ const char STR_BRIGHTNESS[] = TR_BRIGHTNESS; const char STR_CPU_TEMP[] = TR_CPU_TEMP; const char STR_COPROC[] = TR_COPROC; const char STR_COPROC_TEMP[] = TR_COPROC_TEMP; -const char STR_TEMPWARNING[] = TR_TEMPWARNING; const char STR_TTL_WARNING[] = TR_TTL_WARNING; const char STR_FUNC[] = TR_FUNC; const char STR_V1[] = TR_V1; @@ -527,7 +520,6 @@ const char STR_MAXBAUDRATE[] = TR_MAXBAUDRATE; const char STR_BAUDRATE[] = TR_BAUDRATE; const char STR_SAMPLE_MODE[] = TR_SAMPLE_MODE; const char STR_SD_INFO_TITLE[] = TR_SD_INFO_TITLE; -const char STR_SD_TYPE[] = TR_SD_TYPE; const char STR_SD_SPEED[] = TR_SD_SPEED; const char STR_SD_SECTORS[] = TR_SD_SECTORS; const char STR_SD_SIZE[] = TR_SD_SIZE; @@ -651,7 +643,6 @@ const char STR_AUTOOFFSET[] = TR_AUTOOFFSET; const char STR_ONLYPOSITIVE[] = TR_ONLYPOSITIVE; const char STR_FILTER[] = TR_FILTER; const char STR_TELEMETRYFULL[] = TR_TELEMETRYFULL; -const char STR_INVERTED_SERIAL[] = TR_INVERTED_SERIAL; const char STR_IGNORE_INSTANCE[] = TR_IGNORE_INSTANCE; const char STR_SHOW_INSTANCE_ID[] = TR_SHOW_INSTANCE_ID; const char STR_DISCOVER_SENSORS[] = TR_DISCOVER_SENSORS; @@ -669,12 +660,7 @@ const char STR_THEME[] = TR_THEME; const char STR_SETUP[] = TR_SETUP; const char STR_LAYOUT[] = TR_LAYOUT; const char STR_ADD_MAIN_VIEW[] = TR_ADD_MAIN_VIEW; -const char STR_BACKGROUND_COLOR[] = TR_BACKGROUND_COLOR; -const char STR_MAIN_COLOR[] = TR_MAIN_COLOR; -const char STR_BAR2_COLOR[] = TR_BAR2_COLOR; -const char STR_BAR1_COLOR[] = TR_BAR1_COLOR; const char STR_TEXT_COLOR[] = TR_TEXT_COLOR; -const char STR_TEXT_VIEWER[] = TR_TEXT_VIEWER; const char STR_RF_POWER[] = TR_RF_POWER; const char STR_BYTES[] = TR_BYTES; const char STR_ANTENNAPROBLEM[] = TR_ANTENNAPROBLEM; @@ -893,7 +879,6 @@ const char STR_MULTI_FIXEDID[] = TR_MULTI_FIXEDID; const char STR_MULTI_AUTOBIND[] = TR_MULTI_AUTOBIND; const char STR_DISABLE_CH_MAP[] = TR_DISABLE_CH_MAP; const char STR_DISABLE_TELEM[] = TR_DISABLE_TELEM; -const char STR_MULTI_DSM_AUTODTECT[] = TR_MULTI_DSM_AUTODTECT; const char STR_MULTI_LOWPOWER[] = TR_MULTI_LOWPOWER; const char STR_MULTI_LNA_DISABLE[] = TR_MULTI_LNA_DISABLE; const char STR_MODULE_NO_SERIAL_MODE[] = TR_MODULE_NO_SERIAL_MODE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 5dd86315a2d..7f444d1792b 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -92,40 +92,28 @@ #if LCD_W < LCD_H // Portrait mode #define TR3(x, y, z) z - #define TR2(x, y) y + #define TR(x, y) y #elif LCD_W >= 480 #define TR3(x, y, z) z - #define TR2(x, y) y + #define TR(x, y) y #elif LCD_W >= 212 #define TR3(x, y, z) y - #define TR2(x, y) y + #define TR(x, y) y #else #define TR3(x, y, z) x - #define TR2(x, y) x -#endif - -#define TR(x, y) TR2(x, y) // for compatibility - -#if LCD_W <= 212 && !defined(COLORLCD) - #define TR2_2(x, y) x -#else - #define TR2_2(x, y) TR2(x, y) + #define TR(x, y) x #endif #if defined(COLORLCD) #define BUTTON(x) x - #define INDENT #else #define BUTTON(x) "[" x "]" - #define INDENT "\001" - #define LEN_INDENT 1 - #define INDENT_WIDTH (FW/2) #endif -#if (LCD_W == 212) - #define LCDW_128_480_LINEBREAK "" +#if (LCD_W == 212) || defined(COLORLCD) + #define LCDW_128_LINEBREAK #else - #define LCDW_128_480_LINEBREAK "\036" + #define LCDW_128_LINEBREAK "\036" #endif constexpr int g_max_plural2 = TR_MAX_PLURAL2; @@ -259,8 +247,6 @@ extern const char STR_BLUETOOTH_NODEVICES[]; extern const char STR_BLUETOOTH_SCANNING[]; extern const char* const STR_BLUETOOTH_MODES[]; -#define NO_INDENT(x) (x) + LEN_INDENT - extern const char STR_STICK_NAMES0[]; extern const char STR_STICK_NAMES1[]; extern const char STR_STICK_NAMES2[]; @@ -416,7 +402,6 @@ extern const char STR_PERSISTENT[]; extern const char STR_BACKLIGHT_LABEL[]; extern const char STR_GHOST_MENU_LABEL[]; extern const char STR_STATUS[]; -extern const char STR_BLDELAY[]; #if defined(COLORLCD) extern const char STR_BLONBRIGHTNESS[]; @@ -440,7 +425,6 @@ extern const char STR_CUSTOM_THROTTLE_WARNING_VAL[]; extern const char STR_SWITCHWARNING[]; extern const char STR_POTWARNINGSTATE[]; extern const char STR_POTWARNING[]; -extern const char STR_SLIDERWARNING[]; extern const char STR_TIMEZONE[]; extern const char STR_ADJUST_RTC[]; extern const char STR_GPS[]; @@ -561,7 +545,6 @@ extern const char STR_MULTI_TELEMETRY[]; extern const char STR_MULTI_AUTOBIND[]; extern const char STR_DISABLE_CH_MAP[]; extern const char STR_DISABLE_TELEM[]; -extern const char STR_MULTI_DSM_AUTODTECT[]; extern const char STR_MULTI_LOWPOWER[]; extern const char STR_MULTI_LNA_DISABLE[]; extern const char STR_MODULE_NO_SERIAL_MODE[]; @@ -756,7 +739,6 @@ extern const char STR_BRIGHTNESS[]; extern const char STR_CPU_TEMP[]; extern const char STR_COPROC[]; extern const char STR_COPROC_TEMP[]; -extern const char STR_TEMPWARNING[]; extern const char STR_TTL_WARNING[]; extern const char STR_FUNC[]; extern const char STR_V1[]; @@ -839,7 +821,6 @@ extern const char STR_SAMPLE_MODE[]; extern const char* const STR_SAMPLE_MODES[]; extern const char STR_BLUETOOTH_BAUDRATE[]; extern const char STR_SD_INFO_TITLE[]; -extern const char STR_SD_TYPE[]; extern const char STR_SD_SPEED[]; extern const char STR_SD_SECTORS[]; extern const char STR_SD_SIZE[]; @@ -1066,7 +1047,6 @@ extern const char STR_AUTOOFFSET[]; extern const char STR_ONLYPOSITIVE[]; extern const char STR_FILTER[]; extern const char STR_TELEMETRYFULL[]; -extern const char STR_INVERTED_SERIAL[]; extern const char STR_IGNORE_INSTANCE[]; extern const char STR_SHOW_INSTANCE_ID[]; extern const char STR_DISCOVER_SENSORS[]; @@ -1084,12 +1064,7 @@ extern const char STR_THEME[]; extern const char STR_SETUP[]; extern const char STR_LAYOUT[]; extern const char STR_ADD_MAIN_VIEW[]; -extern const char STR_BACKGROUND_COLOR[]; -extern const char STR_MAIN_COLOR[]; -extern const char STR_BAR2_COLOR[]; -extern const char STR_BAR1_COLOR[]; extern const char STR_TEXT_COLOR[]; -extern const char STR_TEXT_VIEWER[]; extern const char STR_RF_POWER[]; extern const char STR_BYTES[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index a7401bf6236..e24ac1a551b 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -61,7 +61,7 @@ #define TR_MULTI_CUSTOM "自定义" #define TR_VTRIMINC "指数","很小","较小","中等","较大" #define TR_VDISPLAYTRIMS "不显示","改变时","始终显示" -#define TR_VBEEPCOUNTDOWN "静音","蜂鸣","语音","震动",TR2_2("B & H","Beeps & Haptic"),TR2_2("V & H","Voice & Haptic") +#define TR_VBEEPCOUNTDOWN "静音","蜂鸣","语音","震动",TR("B & H","Beeps & Haptic"),TR("V & H","Voice & Haptic") #define TR_COUNTDOWNVALUES "5秒","10秒","20秒","30秒" #define TR_VVARIOCENTER "音调","静音" #define TR_CURVE_TYPES "标准","自定义" @@ -273,9 +273,9 @@ #define TR_TTRIM_SW TR("微调选择", "微调选择") #define TR_BEEPCTR TR("中点提示音", "中点蜂鸣提示音") #define TR_USE_GLOBAL_FUNCS TR("全局功能", "全局功能可介入") -#define TR_PPMFRAME INDENT "PPM帧" -#define TR_REFRESHRATE TR(INDENT "刷新率", INDENT "刷新速率") -#define STR_WARN_BATTVOLTAGE TR(INDENT "输出为电池电压: ", INDENT "注意输出电平为电池电压") +#define TR_PPMFRAME "PPM帧" +#define TR_REFRESHRATE TR("刷新率", "刷新速率") +#define STR_WARN_BATTVOLTAGE TR("输出为电池电压: ", "注意输出电平为电池电压") #define TR_WARN_5VOLTS "注意输出电平为5V" #define TR_MS "ms" #define TR_SWITCH "开关" @@ -290,7 +290,6 @@ #else #define TR_CHECKTRIMS "\006检查\012微调" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "斜盘类型" #define TR_COLLECTIVE TR("螺距源", "螺距混控源") #define TR_AILERON TR("横滚源", "横滚混控源") @@ -302,7 +301,7 @@ #else #define TR_LEFT_STICK "左摇杆" #endif -#define TR_SUBTYPE INDENT "子类型" +#define TR_SUBTYPE "子类型" #define TR_NOFREEEXPO "指数曲线已满!" #define TR_NOFREEMIXER "混控数量已满!" #define TR_SOURCE "输入源" @@ -330,8 +329,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "范围" -#define TR_CENTER INDENT "中点" +#define TR_RANGE "范围" +#define TR_CENTER "中点" #define TR_ALARM "报警" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "屏幕\001" @@ -365,12 +364,11 @@ #define TR_THROTTLE_START "油门开始" #define TR_THROTTLEREVERSE TR("油门反向", "油门反向") #define TR_MINUTEBEEP TR("分", "分钟播报") -#define TR_BEEPCOUNTDOWN INDENT "倒数" -#define TR_PERSISTENT TR(INDENT "关机保持", INDENT "关机保持") +#define TR_BEEPCOUNTDOWN "倒数" +#define TR_PERSISTENT TR("关机保持", "关机保持") #define TR_BACKLIGHT_LABEL "背光" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "状态" -#define TR_BLDELAY INDENT "持续时间" #define TR_BLONBRIGHTNESS "背光开" #define TR_BLOFFBRIGHTNESS "背光关" #define TR_KEYS_BACKLIGHT "按键背光" @@ -379,13 +377,12 @@ #define TR_PLAY_HELLO "开机语音" #define TR_PWR_ON_DELAY "开机延迟" #define TR_PWR_OFF_DELAY "关机延迟" -#define TR_THROTTLE_WARNING TR(INDENT "油门状态", INDENT "油门状态") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "自定位置", INDENT INDENT INDENT INDENT "自定油门位置?") +#define TR_THROTTLE_WARNING TR("油门状态", "油门状态") +#define TR_CUSTOM_THROTTLE_WARNING TR("自定位置", "自定油门位置?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("位置 %", "油门位置 %") -#define TR_SWITCHWARNING TR(INDENT "开关位置", INDENT "开关位置") -#define TR_POTWARNINGSTATE TR(INDENT "旋钮滑块", INDENT "旋钮和滑块") -#define TR_SLIDERWARNING TR(INDENT "滑块位置", INDENT "滑块位置") -#define TR_POTWARNING TR(INDENT "旋钮位置", INDENT "旋钮位置") +#define TR_SWITCHWARNING TR("开关位置", "开关位置") +#define TR_POTWARNINGSTATE "旋钮和滑块" +#define TR_POTWARNING TR("旋钮位置", "旋钮位置") #define TR_TIMEZONE "时区" #define TR_ADJUST_RTC "时钟设置" #define TR_GPS "GPS" @@ -394,7 +391,7 @@ #define TR_POTS "电位器" #define TR_SWITCHES "开关" #define TR_SWITCHES_DELAY TR("开关经过延时", "延时播放(开关经过)") -#define TR_SLAVE CENTER "从机" +#define TR_SLAVE "从机" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "倍率" #define TR_CAL "校准" @@ -410,19 +407,19 @@ #define TR_SETMIDPOINT "校准中点，按[Enter]保存" #define TR_MOVESTICKSPOTS "校准边界，按[Enter]保存并完成" #else - #define TR_MENUTOSTART CENTER "\010按" TR_ENTER " 开始" + #define TR_MENUTOSTART "按" TR_ENTER " 开始" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006校准中点" - #define TR_MOVESTICKSPOTS CENTER "\002校准边界" + #define TR_SETMIDPOINT "校准中点" + #define TR_MOVESTICKSPOTS "校准边界" #else - #define TR_SETMIDPOINT TR(CENTER "\006校准中点", CENTER "\004校准中点") - #define TR_MOVESTICKSPOTS CENTER "\007校准边界" + #define TR_SETMIDPOINT TR("校准中点", "校准中点") + #define TR_MOVESTICKSPOTS "校准边界" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " 完成" + #define TR_MENUWHENDONE TR_ENTER " 完成" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -524,13 +521,12 @@ #define TR_RF_POWER "发射功率" #define TR_MULTI_FIXEDID TR("固定ID", "固定ID") #define TR_MULTI_OPTION TR("选项值", "选项值") -#define TR_MULTI_AUTOBIND TR(INDENT "对频通道", INDENT "通道控制对频") +#define TR_MULTI_AUTOBIND TR("对频通道", "通道控制对频") #define TR_DISABLE_CH_MAP TR("禁用通道映射", "禁用通道重映射") #define TR_DISABLE_TELEM TR("禁用回传", "禁用回传") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "自动格式", INDENT "自动识别格式") -#define TR_MULTI_LOWPOWER TR(INDENT "低功率", INDENT "低功率模式") -#define TR_MULTI_LNA_DISABLE INDENT "禁用接收放大器" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("低功率", "低功率模式") +#define TR_MULTI_LNA_DISABLE "禁用接收放大器" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("开", "启用") #define TR_DISABLE_INTERNAL TR("禁用内置发射", "禁用内置发射") #define TR_MODULE_NO_SERIAL_MODE TR("非串口模式", "未开启串口模式") @@ -548,8 +544,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 开启回传" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 关闭回传" #define TR_PROTOCOL_INVALID TR("无效协议", "无效协议") -#define TR_MODULE_STATUS TR(INDENT "状态", INDENT "多协议状态") -#define TR_MODULE_SYNC TR(INDENT "同步", INDENT "协议同步状态") +#define TR_MODULE_STATUS TR("状态", "多协议状态") +#define TR_MODULE_SYNC TR("同步", "协议同步状态") #define TR_MULTI_SERVOFREQ TR("舵机频率", "舵机更新频率") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("频道", "选择射频频道") @@ -566,7 +562,7 @@ #define TR_REPEAT_AT_ZERO "无变化报警" #define TR_BATT_CALIB TR("电池校准", "电池电压校准") #define TR_CURRENT_CALIB "电流校准" -#define TR_VOLTAGE TR(INDENT "电压源", INDENT "电压来源") +#define TR_VOLTAGE TR("电压源", "电压来源") #define TR_SELECT_MODEL "选择模型" #define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "个模型" @@ -637,7 +633,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\n日志和截屏功能将被禁用" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036日志和 " LCDW_128_480_LINEBREAK "截屏功能将被禁用" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036日志和 " LCDW_128_LINEBREAK "截屏功能将被禁用" #endif #define TR_NEEDS_FILE "需要文件名包含" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -669,7 +665,6 @@ #define TR_CPU_TEMP "CPU 温度" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "主板温度" -#define TR_TEMPWARNING INDENT "过热" #define TR_TTL_WARNING "警告: TX和RX引脚电平不能超过3.3V !" #define TR_FUNC "功能" #define TR_V1 "V1" @@ -746,11 +741,10 @@ #endif #define TR_SD_INFO_TITLE "存储卡详情" -#define TR_SD_TYPE "类型:" #define TR_SD_SPEED "速度:" #define TR_SD_SECTORS "扇区:" #define TR_SD_SIZE "容量:" -#define TR_TYPE INDENT "类型" +#define TR_TYPE "类型" #define TR_GLOBAL_VARS "全局变量" #define TR_GVARS "全局变量" #define TR_GLOBAL_VAR "全局变量" @@ -798,7 +792,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "更多可用选项" #define TR_NO_MODULE_INFORMATION "无模块信息" #define TR_EXTERNALRF "外置发射" -#define TR_FAILSAFE TR(INDENT "失控保护", INDENT "失控保护模式") +#define TR_FAILSAFE TR("失控保护", "失控保护模式") #define TR_FAILSAFESET "失控保护设置" #define TR_REG_ID "注册ID" #define TR_OWNER_ID "所有者ID" @@ -882,7 +876,7 @@ #define TR_SET BUTTON("设置") #define TR_TRAINER "教练" #define TR_CHANS "通道" -#define TR_ANTENNAPROBLEM CENTER "发射机天线故障!" +#define TR_ANTENNAPROBLEM "发射机天线故障!" #define TR_MODELIDUSED "ID已使用:" #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "模块" @@ -897,8 +891,8 @@ #define TR_DISABLE "禁用" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "单位" -#define TR_TELEMETRY_NEWSENSOR INDENT "添加新传感器..." -#define TR_CHANNELRANGE TR(INDENT "通道范围", INDENT "通道范围") +#define TR_TELEMETRY_NEWSENSOR "添加新传感器..." +#define TR_CHANNELRANGE TR("通道范围", "通道范围") #define TR_ANTENNACONFIRM1 "外置天线" #if defined(PCBX12S) #define TR_ANTENNA_MODES "内置天线","询问","基于模型","外置天线" @@ -912,9 +906,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "请使用FCC版本" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "请使用EU版本" #define TR_MODULE_PROTOCOL_WARN_LINE2 "经认证的固件" -#define TR_LOWALARM INDENT "信号弱报警" -#define TR_CRITICALALARM INDENT "信号极弱报警" -#define TR_DISABLE_ALARM TR(INDENT "禁止回传报警", INDENT "禁止回传报警") +#define TR_LOWALARM "信号弱报警" +#define TR_CRITICALALARM "信号极弱报警" +#define TR_DISABLE_ALARM TR("禁止回传报警", "禁止回传报警") #define TR_POPUP "弹窗提示" #define TR_MIN "最小" #define TR_MAX "最大" @@ -937,8 +931,8 @@ #define TR_CONSTANT "固定值" #define TR_PREFLIGHT_POTSLIDER_CHECK "关闭","开启","自动" #define TR_PREFLIGHT "初始检查" -#define TR_CHECKLIST TR(INDENT "显示列表", INDENT "显示列表") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "检查列表", INDENT "自定义检查列表", INDENT "自定义检查列表") +#define TR_CHECKLIST TR("显示列表", "显示列表") +#define TR_CHECKLIST_INTERACTIVE TR3("检查列表", "自定义检查列表", "自定义检查列表") #define TR_AUX_SERIAL_MODE "串口" #define TR_AUX2_SERIAL_MODE "串口 2" #define TR_AUX_SERIAL_PORT_POWER "串口供电" @@ -1090,7 +1084,7 @@ #define TR_UNSUPPORTED_RX "不支持此接收机" #define TR_OTA_UPDATE_ERROR "OTA 更新失败" #define TR_DEVICE_RESET "正在复位设备..." -#define TR_ALTITUDE INDENT "高度" +#define TR_ALTITUDE "高度" #define TR_SCALE "比例" #define TR_VIEW_CHANNELS "查看通道" #define TR_VIEW_NOTES "View Notes" @@ -1112,13 +1106,12 @@ #define TR_ONLYPOSITIVE "正向" #define TR_FILTER "滤波器" #define TR_TELEMETRYFULL TR("项目已满!", "回传项目已满!") -#define TR_INVERTED_SERIAL INDENT "反向" -#define TR_IGNORE_INSTANCE TR(INDENT "忽略ID", INDENT "忽略ID鉴别") +#define TR_IGNORE_INSTANCE TR("忽略ID", "忽略ID鉴别") #define TR_SHOW_INSTANCE_ID "显示实例ID" #define TR_DISCOVER_SENSORS "扫描新的回传项目" #define TR_STOP_DISCOVER_SENSORS "停止扫描" #define TR_DELETE_ALL_SENSORS "删除所有回传项目" -#define TR_CONFIRMDELETE "真的 " LCDW_128_480_LINEBREAK "要删除全部吗 ?" +#define TR_CONFIRMDELETE "真的 " LCDW_128_LINEBREAK "要删除全部吗 ?" #define TR_SELECT_WIDGET "选择小部件" #define TR_WIDGET_FULLSCREEN "全屏" #define TR_REMOVE_WIDGET "移除小部件" @@ -1130,12 +1123,7 @@ #define TR_SETUP "设置" #define TR_LAYOUT "布局" #define TR_ADD_MAIN_VIEW "添加主视图" -#define TR_BACKGROUND_COLOR "背景颜色" -#define TR_MAIN_COLOR "主颜色" -#define TR_BAR2_COLOR "二级条形图颜色" -#define TR_BAR1_COLOR "主条形图颜色" #define TR_TEXT_COLOR "文本颜色" -#define TR_TEXT_VIEWER "文本视图" #define TR_MENU_INPUTS STR_CHAR_INPUT "输入" #define TR_MENU_LUA STR_CHAR_LUA "LUA脚本" #define TR_MENU_STICKS STR_CHAR_STICK "摇杆(轴)" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 0bd212b765c..6078562dd42 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -64,7 +64,7 @@ #define TR_MULTI_CUSTOM "Vlastní" #define TR_VTRIMINC "Expo","ExJemný","Jemný","Střední","Hrubý" #define TR_VDISPLAYTRIMS "Ne","Změna","Ano" -#define TR_VBEEPCOUNTDOWN "Ne", "Zvuk", "Hlas", "Vibrace", TR2_2("Zv & Vib","Zvuk & Vibrace"),TR2_2("Hl & Vib", "Hlas & Vibrace") +#define TR_VBEEPCOUNTDOWN "Ne", "Zvuk", "Hlas", "Vibrace", TR("Zv & Vib","Zvuk & Vibrace"),TR("Hl & Vib", "Hlas & Vibrace") #define TR_VVARIOCENTER "Tón","Ticho" #define TR_CURVE_TYPES "Rastr-X","Volná-XY" @@ -259,7 +259,7 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #endif -#define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ" +#define TR_MENUWHENDONE TR_ENTER " > DALŠÍ" #define TR_FREE TR("volné:", "volných") #define TR_YES "Ano" #define TR_NO "Ne" @@ -288,9 +288,9 @@ #define TR_BEEPCTR TR("Pípat střed", "Pípnutí při středové poloze") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funkce", "Použít globální funkce") #define TR_PROTOCOL "Protokol" -#define TR_PPMFRAME INDENT "PPM modulace" -#define TR_REFRESHRATE TR(INDENT "Obnovit", INDENT "Obn. frekv.") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Výstup VBAT: ", INDENT "Varování: výstupní hodnota VBAT: ") +#define TR_PPMFRAME "PPM modulace" +#define TR_REFRESHRATE TR("Obnovit", "Obn. frekv.") +#define STR_WARN_BATTVOLTAGE TR("Výstup VBAT: ", "Varování: výstupní hodnota VBAT: ") #define TR_WARN_5VOLTS "Varování: výstupní úroveň je 5 voltů" #define TR_MS "ms" #define TR_SWITCH "Spínač" @@ -305,7 +305,6 @@ #else #define TR_CHECKTRIMS "\006Kont.\012Trimy" #endif -#define OFS_CHECKTRIMS (9*FW) #define TR_SWASHTYPE "Typ cykliky" #define TR_COLLECTIVE "Kolektiv" #define TR_AILERON "Boční cyklika" @@ -317,7 +316,7 @@ #else #define TR_LEFT_STICK "Vlevo" #endif -#define TR_SUBTYPE INDENT "Subtyp" +#define TR_SUBTYPE "Subtyp" #define TR_NOFREEEXPO "Není volné expo!" #define TR_NOFREEMIXER "Není volný mix!" #define TR_SOURCE "Zdroj" @@ -345,8 +344,8 @@ #else #define TR_GV TR("G", "GP") #endif -#define TR_RANGE INDENT"Rozsah" -#define TR_CENTER INDENT "Střed" +#define TR_RANGE "Rozsah" +#define TR_CENTER "Střed" #define TR_ALARM "Alarm" #define TR_BLADES TR("ListyVrt", "Listy vrtule") #define TR_SCREEN "Panel " @@ -381,27 +380,25 @@ #define TR_THROTTLE_START "Plyn Start" #define TR_THROTTLEREVERSE TR("ReverzPlyn", "Reverz plynu") #define TR_MINUTEBEEP TR("Minuta", "Oznamovat minuty") -#define TR_BEEPCOUNTDOWN INDENT"Odpočet" -#define TR_PERSISTENT INDENT"Trvalé" +#define TR_BEEPCOUNTDOWN "Odpočet" +#define TR_PERSISTENT "Trvalé" #define TR_BACKLIGHT_LABEL "Podsvětlení" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Stav" -#define TR_BLDELAY INDENT"Zhasnout po" -#define TR_BLONBRIGHTNESS TR3(INDENT"Jas Zap.", INDENT"Jas Zap.", INDENT"Jas zapnutého LCD") -#define TR_BLOFFBRIGHTNESS TR3(INDENT"Jas Vyp.", INDENT"Jas Vyp.", INDENT"Jas vypnutého LCD") +#define TR_BLONBRIGHTNESS "Jas zapnutého LCD" +#define TR_BLOFFBRIGHTNESS "Jas vypnutého LCD" #define TR_KEYS_BACKLIGHT "Podsvětlení kláves" #define TR_BLCOLOR "Barva" #define TR_SPLASHSCREEN TR("úvodní logo", "Zobrazit úvodní logo") #define TR_PLAY_HELLO "Zvuk při spuštění" #define TR_PWR_ON_DELAY "Zpoždění zapnutí" #define TR_PWR_OFF_DELAY "Zpoždění vypnutí" -#define TR_THROTTLE_WARNING TR(INDENT "* Plyn", INDENT "Kontrola plynu") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Vlas-Poz", INDENT INDENT INDENT INDENT "Vlastní pozice?") +#define TR_THROTTLE_WARNING TR("* Plyn", "Kontrola plynu") +#define TR_CUSTOM_THROTTLE_WARNING TR("Vlas-Poz", "Vlastní pozice?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Poz. %", "Pozice %") -#define TR_SWITCHWARNING TR(INDENT "* Spínače", INDENT "Polohy spínačů") -#define TR_POTWARNINGSTATE TR(INDENT "* Pot&Slid.", INDENT "Kontrola Pot&Slid.") -#define TR_SLIDERWARNING TR(INDENT "* Slidery", INDENT "Pozice sliderů") -#define TR_POTWARNING TR(INDENT "* Potenc.", INDENT "Potenciometry") +#define TR_SWITCHWARNING TR("* Spínače", "Polohy spínačů") +#define TR_POTWARNINGSTATE "Kontrola Pot&Slid." +#define TR_POTWARNING TR("* Potenc.", "Potenciometry") #define TR_TIMEZONE "Časové pásmo" #define TR_ADJUST_RTC TR3("Čas z GPS", "Použít čas z GPS", "Použít čas z GPS") #define TR_GPS "GPS" @@ -426,18 +423,18 @@ #define TR_SETMIDPOINT "VYCENTROVAT OSY/SLIDERY" #define TR_MOVESTICKSPOTS "HÝBAT OSY/POTY" #else - #define TR_MENUTOSTART CENTER "\011" TR_ENTER " = START" + #define TR_MENUTOSTART TR_ENTER " = START" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006NASTAVIT STŘED POTU" - #define TR_MOVESTICKSPOTS CENTER "\002HÝBAT TOČIT/PLYN/POTY/OSY" + #define TR_SETMIDPOINT "NASTAVIT STŘED POTU" + #define TR_MOVESTICKSPOTS "HÝBAT TOČIT/PLYN/POTY/OSY" #else - #define TR_SETMIDPOINT TR(CENTER "\006NASTAVIT STŘED OSY", CENTER "\004STŘED OSY/SLIDERU") - #define TR_MOVESTICKSPOTS CENTER "\007HÝBAT OSY/POTY" + #define TR_SETMIDPOINT TR("NASTAVIT STŘED OSY", "STŘED OSY/SLIDERU") + #define TR_MOVESTICKSPOTS "HÝBAT OSY/POTY" #endif #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "ŽÁDNÁ DATA" +#define TR_NODATA "ŽÁDNÁ DATA" #define TR_US "us" #define TR_HZ "Hz" @@ -534,21 +531,20 @@ #define TR_MONITOR_MIXER_DESC "Mixy" #define TR_RECEIVER_NUM TR("RX číslo", "Číslo přijímače") #define TR_RECEIVER "Přijímač" -#define TR_MULTI_RFTUNE TR(INDENT "Ladění frek", INDENT "Jemné ladění frek. RF") +#define TR_MULTI_RFTUNE TR("Ladění frek", "Jemné ladění frek. RF") #define TR_MULTI_RFPOWER "RF výkon" #define TR_MULTI_WBUS "Výstup" #define TR_MULTI_TELEMETRY "Telemetrie" -#define TR_MULTI_VIDFREQ TR(INDENT "Freq. videa", INDENT "Frekvence videa") -#define TR_RF_POWER INDENT "Výkon RF" +#define TR_MULTI_VIDFREQ TR("Freq. videa", "Frekvence videa") +#define TR_RF_POWER "Výkon RF" #define TR_MULTI_FIXEDID TR("PevnéID", "Pevné ID") -#define TR_MULTI_OPTION TR(INDENT "Možnosti", INDENT "Hodnota") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.",INDENT "Bind při zapnutí") +#define TR_MULTI_OPTION TR("Možnosti", "Hodnota") +#define TR_MULTI_AUTOBIND TR("Bind Ch.","Bind při zapnutí") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Vypnout mapování kanálů") #define TR_DISABLE_TELEM TR("No Telem", "Vypnout telemetrii") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetekce", INDENT "Formát autodetekce") -#define TR_MULTI_LOWPOWER TR(INDENT "Nízký výkon", INDENT "Režim nízkého výkonu") -#define TR_MULTI_LNA_DISABLE INDENT "LNA vypnuto" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Nízký výkon", "Režim nízkého výkonu") +#define TR_MULTI_LNA_DISABLE "LNA vypnuto" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("Zap", "Zapnuto") #define TR_DISABLE_INTERNAL TR("Vypnout int.", "Vypnout interní RF") #define TR_MODULE_NO_SERIAL_MODE TR("Nesériový", "Není v sériovém režimu") @@ -566,9 +562,9 @@ #define TR_BINDING_CH9_16_TELEM_ON "k9-16 telem ZAP" #define TR_BINDING_CH9_16_TELEM_OFF "k9-16 telem VYP" #define TR_PROTOCOL_INVALID TR("Špat. protokol", "Špatný protokol") -#define TR_MODULE_STATUS TR(INDENT "Stav", INDENT "Stav modulu") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync stav") -#define TR_MULTI_SERVOFREQ TR(INDENT "Frekv. serva", INDENT "Obnovovací frekvence serva") +#define TR_MODULE_STATUS TR("Stav", "Stav modulu") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync stav") +#define TR_MULTI_SERVOFREQ TR("Frekv. serva", "Obnovovací frekvence serva") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Povolit max. throw") #define TR_MULTI_RFCHAN TR("RF Kanál", "Vybrat RF kanál") #define TR_GPS_COORDS_FORMAT "GPS souřadnice" @@ -578,7 +574,7 @@ #define TR_REPEAT_AT_ZERO TR("Opak. na nule", "Opakování na nule") #define TR_BATT_CALIB "Kalib. bat." #define TR_CURRENT_CALIB "+=\006Proud" -#define TR_VOLTAGE INDENT"Napětí" +#define TR_VOLTAGE "Napětí" #define TR_SELECT_MODEL "Vyber model" #define TR_MANAGE_MODELS "NASTAVENÍ MODELU" #define TR_MODELS "Modely" @@ -649,7 +645,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogování dat a snímky obrazovky vypnuty" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logy a " LCDW_128_480_LINEBREAK " Snímky obrazovky vypnuty" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logy a " LCDW_128_LINEBREAK " Snímky obrazovky vypnuty" #endif #define TR_NEEDS_FILE "Vyžadován soubor" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -681,7 +677,6 @@ #define TR_CPU_TEMP "Tepl. CPU\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "Tepl. MB \016>" -#define TR_TEMPWARNING INDENT "Přehřátí" #define TR_TTL_WARNING "Varování: Nepřekračovat napětí 3.3V u pinů pro TX/RX!" #define TR_FUNC "Funkce" #define TR_V1 "V1" @@ -757,11 +752,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetrie","Trenér " #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Rychlost:" #define TR_SD_SECTORS "Sektorů :" #define TR_SD_SIZE "Velikost:" -#define TR_TYPE INDENT TR_SD_TYPE +#define TR_TYPE "Typ" #define TR_GLOBAL_VARS "Globální proměnné" #define TR_GVARS "GLOB.PROM." #define TR_GLOBAL_VAR "Globální proměnná" @@ -893,7 +887,7 @@ #define TR_SET BUTTON("Nast") #define TR_TRAINER "Trenér" #define TR_CHANS "Kanály" -#define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!" +#define TR_ANTENNAPROBLEM "Problém s TX anténou!" #define TR_MODELIDUSED TR("ID již použito","ID modelu je již použito") #define TR_MODELIDUNIQUE "ID je unikátní" #define TR_MODULE "Modul" @@ -908,8 +902,8 @@ #define TR_DISABLE "Zakazano" #define TR_TOPLCDTIMER "Stopky horního LCD" #define TR_UNIT "Jednotky" -#define TR_TELEMETRY_NEWSENSOR INDENT "Přidat senzor ručně" -#define TR_CHANNELRANGE TR(INDENT "Kanály", INDENT "Rozsah kanálů") +#define TR_TELEMETRY_NEWSENSOR "Přidat senzor ručně" +#define TR_CHANNELRANGE TR("Kanály", "Rozsah kanálů") #define TR_AFHDS3_RX_FREQ TR("RX frek.", "RX frekvence") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetrie") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -928,9 +922,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Vyžaduje FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Vyžaduje EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "firmware." -#define TR_LOWALARM INDENT "Nízký Alarm" -#define TR_CRITICALALARM INDENT "Kritický Alarm" -#define TR_DISABLE_ALARM TR(INDENT "Vypnout alarmy", INDENT "Vypnout alarmy telemetrie") +#define TR_LOWALARM "Nízký Alarm" +#define TR_CRITICALALARM "Kritický Alarm" +#define TR_DISABLE_ALARM TR("Vypnout alarmy", "Vypnout alarmy telemetrie") #define TR_POPUP "Vyskočit" #define TR_MIN "Min" #define TR_MAX "Max" @@ -953,8 +947,8 @@ #define TR_CONSTANT "Konstanta" #define TR_PREFLIGHT_POTSLIDER_CHECK "Vyp","Zap","Auto" #define TR_PREFLIGHT "Předletová kontrola" -#define TR_CHECKLIST TR(INDENT "Poznámky", INDENT "Zobrazit poznámky") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "S-interkativni", INDENT "Interaktivní seznam", INDENT "Interaktivní seznam") +#define TR_CHECKLIST TR("Poznámky", "Zobrazit poznámky") +#define TR_CHECKLIST_INTERACTIVE TR3("S-interkativni", "Interaktivní seznam", "Interaktivní seznam") #define TR_AUX_SERIAL_MODE "Seriový port" #define TR_AUX2_SERIAL_MODE "Seriový port 2" #define TR_AUX_SERIAL_PORT_POWER "Výkon portu" @@ -1106,7 +1100,7 @@ #define TR_UNSUPPORTED_RX "Nepodporovaný RX" #define TR_OTA_UPDATE_ERROR "Chyba aktualizace" #define TR_DEVICE_RESET "Reset zařízení..." -#define TR_ALTITUDE INDENT "Výška" +#define TR_ALTITUDE "Výška" #define TR_SCALE "Měřítko" #define TR_VIEW_CHANNELS "Zobrazit kanály" #define TR_VIEW_NOTES "Zobrazit poznámky" @@ -1128,13 +1122,12 @@ #define TR_ONLYPOSITIVE "Jen kladné" #define TR_FILTER "Filtr" #define TR_TELEMETRYFULL "Všechny sloty jsou plné!" -#define TR_INVERTED_SERIAL INDENT "Invert" -#define TR_IGNORE_INSTANCE TR(INDENT "Chybné ID", INDENT "Ignoruj chyby ID") +#define TR_IGNORE_INSTANCE TR("Chybné ID", "Ignoruj chyby ID") #define TR_SHOW_INSTANCE_ID "Zobrazit ID instance" #define TR_DISCOVER_SENSORS "Detekovat nové senzory" #define TR_STOP_DISCOVER_SENSORS "Zastavit autodetekci" #define TR_DELETE_ALL_SENSORS "Odebrat všechny senzory" -#define TR_CONFIRMDELETE "Opravdu " LCDW_128_480_LINEBREAK "odstranit vše?" +#define TR_CONFIRMDELETE "Opravdu " LCDW_128_LINEBREAK "odstranit vše?" #define TR_SELECT_WIDGET "Zvolit widget" #define TR_WIDGET_FULLSCREEN "Celá obrazovka" #define TR_REMOVE_WIDGET "Odstranit widget" @@ -1146,12 +1139,7 @@ #define TR_SETUP "Nastavení" #define TR_LAYOUT "Rozložení" #define TR_ADD_MAIN_VIEW "Přidat hlavní panel" -#define TR_BACKGROUND_COLOR "Barva pozadí" -#define TR_MAIN_COLOR "Hlavní barva" -#define TR_BAR2_COLOR "Další barva lišty" -#define TR_BAR1_COLOR "Hlavní barva lišty" #define TR_TEXT_COLOR "Barva textu" -#define TR_TEXT_VIEWER "Prohlížeč textu" #define TR_MENU_INPUTS STR_CHAR_INPUT "Vstupy" #define TR_MENU_LUA STR_CHAR_LUA "Lua skripty" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index fae52782de1..87a9d773b55 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -67,7 +67,7 @@ #define TR_MULTI_CUSTOM "Tilpasset" #define TR_VTRIMINC TR("Expo","Exponentiel"),TR("ExFin","Ekstra fin"),"Fin","Medium","Grov" #define TR_VDISPLAYTRIMS "Nej","Ændre","Ja" -#define TR_VBEEPCOUNTDOWN "Stille","Bip","Stemme","Vibration",TR2_2("B & V","Bips & Vibration"),TR2_2("St & Vib","Stemme & Vibration") +#define TR_VBEEPCOUNTDOWN "Stille","Bip","Stemme","Vibration",TR("B & V","Bips & Vibration"),TR("St & Vib","Stemme & Vibration") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tone","Stille" #define TR_CURVE_TYPES "Standard","Tilpasset" @@ -281,9 +281,9 @@ #define TR_BEEPCTR TR("Bip ctr pos", "Bip ved center position") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funk.", "Brug global funk.") #define TR_PROTOCOL TR("Proto", "Protokol") -#define TR_PPMFRAME INDENT "PPM frame" -#define TR_REFRESHRATE TR(INDENT "Genfrisk", INDENT "Genfrisk rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Udgang er VBAT: ", INDENT "Advarsel: udgang niveau er VBAT: ") +#define TR_PPMFRAME "PPM frame" +#define TR_REFRESHRATE TR("Genfrisk", "Genfrisk rate") +#define STR_WARN_BATTVOLTAGE TR("Udgang er VBAT: ", "Advarsel: udgang niveau er VBAT: ") #define TR_WARN_5VOLTS "Advarsel: udgang niveau er 5 volts" #define TR_MS "ms" #define TR_SWITCH "Kontakt" @@ -296,9 +296,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Kontroller FT trim" #else - #define TR_CHECKTRIMS CENTER "\006Kontroller\012trim" + #define TR_CHECKTRIMS "\006Kontroller\012trim" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swash type" #define TR_COLLECTIVE TR("Collective", "Coll. pitch kilde") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. kilde") @@ -310,7 +309,7 @@ #else #define TR_LEFT_STICK "Ven" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "Ingen fri expo!" #define TR_NOFREEMIXER "Ingen fri mix!" #define TR_SOURCE "Kilde" @@ -339,8 +338,8 @@ #define TR_GV TR("G", "GV") #endif -#define TR_RANGE TR(INDENT "Max ned/op", INDENT "Max synke/stige") -#define TR_CENTER TR(INDENT "Min ned/op", INDENT "Min synke/stige") +#define TR_RANGE TR("Max ned/op", "Max synke/stige") +#define TR_CENTER TR("Min ned/op", "Min synke/stige") #define TR_ALARM "Alarm" #define TR_BLADES "Blade/Poler" @@ -375,27 +374,25 @@ #define TR_THROTTLE_START "Gas Start" #define TR_THROTTLEREVERSE TR("T-omvendt", "Omvendt") #define TR_MINUTEBEEP TR("Minut", "Minut kald") -#define TR_BEEPCOUNTDOWN INDENT "Nedtælling" -#define TR_PERSISTENT TR(INDENT "Varig", INDENT "Varig") +#define TR_BEEPCOUNTDOWN "Nedtælling" +#define TR_PERSISTENT TR("Varig", "Varig") #define TR_BACKLIGHT_LABEL "Baggrunds lys" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Varighed" -#define TR_BLONBRIGHTNESS INDENT "TIL klarhed" -#define TR_BLOFFBRIGHTNESS INDENT "FRA klarhed" +#define TR_BLONBRIGHTNESS "TIL klarhed" +#define TR_BLOFFBRIGHTNESS "FRA klarhed" #define TR_KEYS_BACKLIGHT "Taster klarhed" #define TR_BLCOLOR "Farve" #define TR_SPLASHSCREEN "Start skærm" #define TR_PLAY_HELLO "Startop lyd" #define TR_PWR_ON_DELAY "Forsinkelse ved tænd" #define TR_PWR_OFF_DELAY "Forsinkelse ved sluk" -#define TR_THROTTLE_WARNING TR(INDENT "Gas adv", INDENT "Gas advarsel") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Tilp-Pos", INDENT INDENT INDENT INDENT "Tilpasset position?") +#define TR_THROTTLE_WARNING TR("Gas adv", "Gas advarsel") +#define TR_CUSTOM_THROTTLE_WARNING TR("Tilp-Pos", "Tilpasset position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Kon. adv", INDENT "Kontakt position") -#define TR_POTWARNINGSTATE TR(INDENT "Drejk.&Skyd.", INDENT "Drejekontakt & skyder position") -#define TR_SLIDERWARNING TR(INDENT "Skyd. pos", INDENT "Skyder position") -#define TR_POTWARNING TR(INDENT "Drejk. adv", INDENT "Drejekontakt position") +#define TR_SWITCHWARNING TR("Kon. adv", "Kontakt position") +#define TR_POTWARNINGSTATE "Drejekontakt & skyder position" +#define TR_POTWARNING TR("Drejk. adv", "Drejekontakt position") #define TR_TIMEZONE "Tids zone" #define TR_ADJUST_RTC "Juster RTC" #define TR_GPS "GPS" @@ -404,7 +401,7 @@ #define TR_POTS "Drejekontakt" #define TR_SWITCHES "Kontakter" #define TR_SWITCHES_DELAY TR("Cen forsink", "Center forsinkelse") -#define TR_SLAVE CENTER "Slave" +#define TR_SLAVE "Slave" #define TR_MODESRC "Mode\006% Kilde" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Kal" @@ -420,14 +417,14 @@ #define TR_SETMIDPOINT "CENTRER PINDE/SKYDER" #define TR_MOVESTICKSPOTS "FLYT PINDE/DREJEKONTAKT" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " FOR START" - #define TR_SETMIDPOINT TR(CENTER "\004SÆT PINDE I MIDT", CENTER "\004CENTRER PINDE/SKYDERE") - #define TR_MOVESTICKSPOTS CENTER "\006FLYT PINDE/DREJEKONTAKTER" - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " NÅR FÆRDIG" + #define TR_MENUTOSTART TR_ENTER " FOR START" + #define TR_SETMIDPOINT TR("SÆT PINDE I MIDT", "CENTRER PINDE/SKYDERE") + #define TR_MOVESTICKSPOTS "FLYT PINDE/DREJEKONTAKTER" + #define TR_MENUWHENDONE TR_ENTER " NÅR FÆRDIG" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "INGEN DATA" +#define TR_NODATA "INGEN DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -529,13 +526,12 @@ #define TR_RF_POWER "RF Strøm" #define TR_MULTI_FIXEDID TR("LåstID", "Låst ID") #define TR_MULTI_OPTION TR("Tilvalg", "Tilvalg værdi") -#define TR_MULTI_AUTOBIND TR(INDENT "Tilslut ka.", INDENT "Tilslut kanal") +#define TR_MULTI_AUTOBIND TR("Tilslut ka.", "Tilslut kanal") #define TR_DISABLE_CH_MAP TR("% ka. kort", "Deaktiver kanal kort") #define TR_DISABLE_TELEM TR("% Telem.", "Deaktiver telemetri") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Automatisk", INDENT "Automatisk format") -#define TR_MULTI_LOWPOWER TR(INDENT "Lav strøm", INDENT "Lav strøm tilstand") -#define TR_MULTI_LNA_DISABLE INDENT "LNA deaktiver" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Lav strøm", "Lav strøm tilstand") +#define TR_MULTI_LNA_DISABLE "LNA deaktiver" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("TIL", "Aktiveret") #define TR_DISABLE_INTERNAL TR("Deaktiver int.", "Deaktiver intern RF") #define TR_MODULE_NO_SERIAL_MODE TR("!seriel tilstand", "Ikke i seriel tilstand") @@ -553,8 +549,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "KA9-16 Telem TIL" #define TR_BINDING_CH9_16_TELEM_OFF "KA9-16 Telem FRA" #define TR_PROTOCOL_INVALID TR("Prot. ugyldig", "Protocol ugyldig") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Modul status") -#define TR_MODULE_SYNC TR(INDENT "Synk", INDENT "Proto Synk status") +#define TR_MODULE_STATUS TR("Status", "Modul status") +#define TR_MODULE_SYNC TR("Synk", "Proto Synk status") #define TR_MULTI_SERVOFREQ TR("Servo hast", "Servo opdaterings hastighed") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF kanal", "Vælg RF kanal") @@ -571,7 +567,7 @@ #define TR_REPEAT_AT_ZERO "Gentag nul" #define TR_BATT_CALIB TR("Bat. kalib", "Batteri kalibering") #define TR_CURRENT_CALIB "Aktuel kalib" -#define TR_VOLTAGE TR(INDENT "Spænding", INDENT "Spænding kilde") +#define TR_VOLTAGE TR("Spænding", "Spænding kilde") #define TR_SELECT_MODEL "Vælg model" #define TR_MANAGE_MODELS "Vælg Model" #define TR_MODELS "Modeller" @@ -642,7 +638,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLog & skærmklip deaktiveret" #else - #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Log & skærmklip" LCDW_128_480_LINEBREAK "deaktiveret" + #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Log & skærmklip" LCDW_128_LINEBREAK "deaktiveret" #endif #define TR_NEEDS_FILE "MANGLER FIL" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -674,7 +670,6 @@ #define TR_CPU_TEMP "CPU temp." #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp." -#define TR_TEMPWARNING INDENT "For varm" #define TR_TTL_WARNING "Advarsel: Spænding på TX/RX poler må ikke overstige 3,3V!" #define TR_FUNC "Funktion" #define TR_V1 TR("V1", "Værdi 1") @@ -714,7 +709,7 @@ #define TR_SAVE_THEME "Gem tema?" #define TR_EDIT_COLOR "Rediger farve" #define TR_NO_THEME_IMAGE "Ingen billede for tema" -#define TR_BACKLIGHT_TIMER TR2("Inaktivitet", "Ved inaktivitet dæmp efter") +#define TR_BACKLIGHT_TIMER TR("Inaktivitet", "Ved inaktivitet dæmp efter") #if defined(COLORLCD) #define TR_MODEL_QUICK_SELECT "Hurtigvalg af model" @@ -751,11 +746,10 @@ #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Hastighed:" #define TR_SD_SECTORS "Sektorer:" #define TR_SD_SIZE "Størrelse:" -#define TR_TYPE INDENT "Type" +#define TR_TYPE "Type" #define TR_GLOBAL_VARS "Globale variable" #define TR_GVARS "GV" #define TR_GLOBAL_VAR "Globale variable" @@ -803,7 +797,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Flere tilvalg mulige" #define TR_NO_MODULE_INFORMATION "Ingen modul information" #define TR_EXTERNALRF "Ekstern RF" -#define TR_FAILSAFE TR(INDENT "Fejlsikring", INDENT "Fejlsikring tilst") +#define TR_FAILSAFE TR("Fejlsikring", "Fejlsikring tilst") #define TR_FAILSAFESET "FEJLSIKRING INDSTILLING" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Ejer ID" @@ -887,7 +881,7 @@ #define TR_SET BUTTON("Sæt") #define TR_TRAINER "Træner" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX antenne problem!" +#define TR_ANTENNAPROBLEM "TX antenne problem!" #define TR_MODELIDUSED "ID brugt i:" #define TR_MODELIDUNIQUE "ID er entydig" #define TR_MODULE "Modul" @@ -902,8 +896,8 @@ #define TR_DISABLE "Deaktiver" #define TR_TOPLCDTIMER "Top LCD ur" #define TR_UNIT "Enhed" -#define TR_TELEMETRY_NEWSENSOR INDENT "Tilføj ny" -#define TR_CHANNELRANGE TR(INDENT "Kan. rækkev", INDENT "Kanal rækkevidde") +#define TR_TELEMETRY_NEWSENSOR "Tilføj ny" +#define TR_CHANNELRANGE TR("Kan. rækkev", "Kanal rækkevidde") #define TR_ANTENNACONFIRM1 "EXT. ANTENNE" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Intern","Spørg","Per model","Intern + Ekstern" @@ -917,9 +911,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Kræver FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Kræver EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certificeret firmware" -#define TR_LOWALARM INDENT "Lav alarm" -#define TR_CRITICALALARM INDENT "Kritisk alarm" -#define TR_DISABLE_ALARM TR(INDENT "Afkobl alarmer", INDENT "Afkobl telemetri alarmer") +#define TR_LOWALARM "Lav alarm" +#define TR_CRITICALALARM "Kritisk alarm" +#define TR_DISABLE_ALARM TR("Afkobl alarmer", "Afkobl telemetri alarmer") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -942,8 +936,8 @@ #define TR_CONSTANT "Konstant" #define TR_PREFLIGHT_POTSLIDER_CHECK "Fra","Til","Auto" #define TR_PREFLIGHT "Fly checkliste" -#define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Vis checkliste") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("Checkliste", "Vis checkliste") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Seriel port" #define TR_AUX2_SERIAL_MODE "Seriel port 2" #define TR_AUX_SERIAL_PORT_POWER "Port strøm" @@ -1094,7 +1088,7 @@ #define TR_UNSUPPORTED_RX "Ikke understøttet RX" #define TR_OTA_UPDATE_ERROR "OTA opdaterings fejl" #define TR_DEVICE_RESET "Nulstil enhed..." -#define TR_ALTITUDE INDENT "Højde" +#define TR_ALTITUDE "Højde" #define TR_SCALE "Skala" #define TR_VIEW_CHANNELS "Vis kanaler" #define TR_VIEW_NOTES "Vis noter" @@ -1116,13 +1110,12 @@ #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL TR("Alle slots fulde!", "Alle telemetri slots fulde!") -#define TR_INVERTED_SERIAL INDENT "Invers" -#define TR_IGNORE_INSTANCE TR(INDENT "Ingen inst.", INDENT "Ignorer instans") +#define TR_IGNORE_INSTANCE TR("Ingen inst.", "Ignorer instans") #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Søg efter nye" #define TR_STOP_DISCOVER_SENSORS "Stop" #define TR_DELETE_ALL_SENSORS "Slet alle" -#define TR_CONFIRMDELETE "Virkeligt " LCDW_128_480_LINEBREAK "slet alle ?" +#define TR_CONFIRMDELETE "Virkeligt " LCDW_128_LINEBREAK "slet alle ?" #define TR_SELECT_WIDGET "Vælg widget" #define TR_WIDGET_FULLSCREEN "Fuld skærm" #define TR_REMOVE_WIDGET "Slet widget" @@ -1140,12 +1133,7 @@ #define TR_SETUP "Opsætning" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Tilføj hoved billede" -#define TR_BACKGROUND_COLOR "Baggrund farve" -#define TR_MAIN_COLOR "Hoved visning farve" -#define TR_BAR2_COLOR "Anden bjælke bar farve" -#define TR_BAR1_COLOR "Hoved bjælke farve" #define TR_TEXT_COLOR "Tekst farve" -#define TR_TEXT_VIEWER "Tekst visning" #define TR_MENU_INPUTS STR_CHAR_INPUT "Indgange" #define TR_MENU_LUA STR_CHAR_LUA "Lua script" #define TR_MENU_STICKS STR_CHAR_STICK "Pinde" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 9853f321414..50ed5d63620 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -64,7 +64,7 @@ #define TR_MULTI_CUSTOM "Benutzer" #define TR_VTRIMINC TR("Expo","Exponentiell"),TR("ExFein","Extrafein"),"Fein","Mittel","Grob" #define TR_VDISPLAYTRIMS "Nein","Kurz","Ja" // Trimmwerte Keine, kurze Anzeigen, Ja -#define TR_VBEEPCOUNTDOWN "Kein", "Pieps", "Stimme", "Haptik", TR2_2("P & H","Pieps & Haptik"), TR2_2("St & H","Stimme & Haptik") +#define TR_VBEEPCOUNTDOWN "Kein", "Pieps", "Stimme", "Haptik", TR("P & H","Pieps & Haptik"), TR("St & H","Stimme & Haptik") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Ton","Ruhe" #define TR_CURVE_TYPES "Nur Y","X und Y" // "Standard","Custom" @@ -279,9 +279,9 @@ #define TR_BEEPCTR TR("MittePieps", "Pieps in Mittelstellung") #define TR_USE_GLOBAL_FUNCS TR("Glob. Funkt.", "Globale Funkt verw.") #define TR_PROTOCOL TR("Protok.", "Protokoll") -#define TR_PPMFRAME INDENT "PPM-Frame" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh Rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Ausg. ist VBAT: ", INDENT "Warnung: Ausg.pegel ist VBAT: ") +#define TR_PPMFRAME "PPM-Frame" +#define TR_REFRESHRATE TR("Refresh", "Refresh Rate") +#define STR_WARN_BATTVOLTAGE TR("Ausg. ist VBAT: ", "Warnung: Ausg.pegel ist VBAT: ") #define TR_WARN_5VOLTS "Warnung: Ausgangspegel ist 5 Volt" #define TR_MS "ms" #define TR_SWITCH TR("Schalt.", "Schalter") @@ -294,9 +294,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Prüfe Flugphasen-Trimmung" #else - #define TR_CHECKTRIMS CENTER"\006Prüfe\012Trimmung" + #define TR_CHECKTRIMS "\006Prüfe\012Trimmung" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE TR("Typ Taumelsch", "Typ Taumelscheibe") #define TR_COLLECTIVE TR("Kollekt. Pitch", "Kollekt. Pitch Quelle") #define TR_AILERON "Roll Quelle" @@ -308,7 +307,7 @@ #else #define TR_LEFT_STICK "Li" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "Expos voll!" #define TR_NOFREEMIXER "Mischer voll!" #define TR_SOURCE "Quelle" @@ -336,8 +335,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE TR(INDENT "Bereich", INDENT "Variobereich m/s") -#define TR_CENTER TR(INDENT "Mitte", INDENT "Variomitte m/s") +#define TR_RANGE TR("Bereich", "Variobereich m/s") +#define TR_CENTER TR("Mitte", "Variomitte m/s") #define TR_ALARM "Alarme" #define TR_BLADES TR("Prop", "Prop-Blätter") #define TR_SCREEN "Seite: " @@ -372,27 +371,25 @@ #define TR_THROTTLE_START "Gas Start" #define TR_THROTTLEREVERSE TR("Gas invers", "Vollgas hinten?") //Änderung wg TH9x, Taranis #define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") -#define TR_BEEPCOUNTDOWN INDENT "Countdown" -#define TR_PERSISTENT TR(INDENT "Permanent", INDENT "Permanent") +#define TR_BEEPCOUNTDOWN "Countdown" +#define TR_PERSISTENT TR("Permanent", "Permanent") #define TR_BACKLIGHT_LABEL "Bildschirm" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Dauer" -#define TR_BLONBRIGHTNESS INDENT "An-Helligkeit" -#define TR_BLOFFBRIGHTNESS INDENT "Aus-Helligkeit" +#define TR_BLONBRIGHTNESS "An-Helligkeit" +#define TR_BLOFFBRIGHTNESS "Aus-Helligkeit" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Farbe" #define TR_SPLASHSCREEN TR("Startbild Ein", "Startbild Anzeigedauer") #define TR_PLAY_HELLO "Startton abspielen" #define TR_PWR_ON_DELAY "PWR EIN Verzög." #define TR_PWR_OFF_DELAY "PWR AUS Verzög." -#define TR_THROTTLE_WARNING TR(INDENT "Gasalarm", INDENT "Gas Alarm") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("Gasalarm", "Gas Alarm") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Sch. Alarm", INDENT "Schalter-Alarm") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Potiwarnung", INDENT "Poti-Warnung") +#define TR_SWITCHWARNING TR("Sch. Alarm", "Schalter-Alarm") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Potiwarnung", "Poti-Warnung") #define TR_TIMEZONE TR("Zeitzone", "GPS-Zeitzone +/-Std") #define TR_ADJUST_RTC TR("GPSzeit setzen", "Uhrzeit per GPS setzen") #define TR_GPS "GPS" @@ -417,19 +414,19 @@ #define TR_MOVESTICKSPOTS "Knüppel/Schieber bewegen" #define TR_MENUWHENDONE TR_ENTER " wenn fertig" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " Zum START" + #define TR_MENUTOSTART TR_ENTER " Zum START" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006SCHIEBER AUF MITTE" - #define TR_MOVESTICKSPOTS CENTER "\002BEWEGE LENK/GAS/POTI/KNÜPPEL" + #define TR_SETMIDPOINT "SCHIEBER AUF MITTE" + #define TR_MOVESTICKSPOTS "BEWEGE LENK/GAS/POTI/KNÜPPEL" #else - #define TR_SETMIDPOINT TR(CENTER "\006KNÜPPEL AUF MITTE", CENTER "\004ZENTRIERE KNÜPPEL/SCHIEBER") - #define TR_MOVESTICKSPOTS CENTER "\007BEWEGE KNÜPPEL/SCHIEBER" + #define TR_SETMIDPOINT TR("KNÜPPEL AUF MITTE", "ZENTRIERE KNÜPPEL/SCHIEBER") + #define TR_MOVESTICKSPOTS "BEWEGE KNÜPPEL/SCHIEBER" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " wenn fertig" + #define TR_MENUWHENDONE TR_ENTER " wenn fertig" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER"Keine Daten" +#define TR_NODATA "Keine Daten" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -466,13 +463,8 @@ #define TR_EEPROMLOWMEM "EEPROM voll" #define TR_THROTTLE_NOT_IDLE "Gas nicht Null!" #define TR_ALARMSDISABLED "Alarme ausgeschaltet" -#if defined(COLORLCD) - #define TR_PRESS_ANY_KEY_TO_SKIP "Taste drücken" - #define TR_PRESSANYKEY "Taste drücken" -#else - #define TR_PRESS_ANY_KEY_TO_SKIP TR("Taste drücken",CENTER"Taste drücken") - #define TR_PRESSANYKEY TR("Taste drücken",CENTER"Taste drücken") -#endif +#define TR_PRESS_ANY_KEY_TO_SKIP "Taste drücken" +#define TR_PRESSANYKEY "Taste drücken" #define TR_BADEEPROMDATA "EEPROM ungültig" #define TR_BAD_RADIO_DATA "Fehlende oder fehlerhafte Daten" #define TR_RADIO_DATA_RECOVERED TR3("Using backup radio data","Using backup radio settings","Radio settings recovered from backup") @@ -527,21 +519,20 @@ #define TR_MONITOR_MIXER_DESC "Mischer" #define TR_RECEIVER_NUM TR("Empf Nr.", "Empfänger Nummer") #define TR_RECEIVER "Empfänger" -#define TR_MULTI_RFTUNE TR(INDENT "RF Freq.", INDENT "RF Freq. Feintuning") +#define TR_MULTI_RFTUNE TR("RF Freq.", "RF Freq. Feintuning") #define TR_MULTI_RFPOWER "RF power" #define TR_MULTI_WBUS "Output" #define TR_MULTI_TELEMETRY "Telemetry" -#define TR_MULTI_VIDFREQ TR(INDENT "Vid. Freq.", INDENT "Video Frequenz") -#define TR_RF_POWER INDENT "RF Power" +#define TR_MULTI_VIDFREQ TR("Vid. Freq.", "Video Frequenz") +#define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("FesteID", "Feste ID") -#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Optionswert") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ka.",INDENT "Bindung an Kanal") +#define TR_MULTI_OPTION TR("Option", "Optionswert") +#define TR_MULTI_AUTOBIND TR("Bind Ka.","Bindung an Kanal") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Deaktiviere Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Deaktiviere Telem.") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "reduzierte Leistung") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "reduzierte Leistung") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("EIN", "Aktiviert") #define TR_DISABLE_INTERNAL TR("Deaktiv. int. RF", "Deaktiviere int. RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -559,9 +550,9 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem AN" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem AUS" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protokoll ungültig") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Modul Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") -#define TR_MULTI_SERVOFREQ TR(INDENT "Servo Rate", INDENT "Servo Update Rate") +#define TR_MODULE_STATUS TR("Status", "Modul Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") +#define TR_MULTI_SERVOFREQ TR("Servo Rate", "Servo Update Rate") #define TR_MULTI_MAX_THROW TR("Max. Weg", "Aktiviere Max. Weg") #define TR_MULTI_RFCHAN TR("RF Channel", "Wähle RF Kanal") #define TR_GPS_COORDS_FORMAT TR("GPS-Koord.", "GPS-Koordinaten-Format") @@ -571,7 +562,7 @@ #define TR_REPEAT_AT_ZERO "Wiederholrate" #define TR_BATT_CALIB TR("AkkuSpgwert", "Akku Kalibrierung") #define TR_CURRENT_CALIB "Strom abgl." -#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spannungsquelle") //9XR-Pro +#define TR_VOLTAGE TR("Spg", "Spannungsquelle") //9XR-Pro #define TR_SELECT_MODEL "Modell auswählen" #define TR_MANAGE_MODELS "MODELL MANAGER" #define TR_MODELS "Modelle" @@ -642,7 +633,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs und Screenshots deaktiviert" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs und " LCDW_128_480_LINEBREAK "Screenshots deaktiviert" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs und " LCDW_128_LINEBREAK "Screenshots deaktiviert" #endif #define TR_NEEDS_FILE "Datei benötigt" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -674,7 +665,6 @@ #define TR_CPU_TEMP "CPU-Temp.\016>" #define TR_COPROC "CoProz." #define TR_COPROC_TEMP "MB Temp. \016>" -#define TR_TEMPWARNING INDENT "Temp. größer" //wg 9XR-Pro #define TR_TTL_WARNING "Warnung: An den TX/RX Pins dürfen 3.3V nicht überschritten werden!" #define TR_FUNC "Funktion" #define TR_V1 "V1" @@ -750,11 +740,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetrie","Trainer" #endif #define TR_SD_INFO_TITLE "SD-INFO" -#define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Geschw:" #define TR_SD_SECTORS "Sektoren:" #define TR_SD_SIZE "Größe:" -#define TR_TYPE INDENT "Typ" +#define TR_TYPE "Typ" #define TR_GLOBAL_VARS "Globale Variablen" #define TR_GVARS "GLOBALE V." #define TR_GLOBAL_VAR "Globale Variable" @@ -802,7 +791,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "mehr Optionen verfügbar" #define TR_NO_MODULE_INFORMATION "keine Modul Info" #define TR_EXTERNALRF "Externes HF-Modul" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Mode") +#define TR_FAILSAFE TR("Failsafe", "Failsafe Mode") #define TR_FAILSAFESET "Failsafe setzen" #define TR_REG_ID TR("Reg. ID", "Registration ID") #define TR_OWNER_ID "Owner ID" @@ -887,7 +876,7 @@ #define TR_SET BUTTON("Set") #define TR_TRAINER "Lehrer/Schüler" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!" +#define TR_ANTENNAPROBLEM "TX-Antennenproblem!" #define TR_MODELIDUSED "ID benutzt in:" #define TR_MODELIDUNIQUE "ID ist eindeutig" #define TR_MODULE "Modul-Typ" @@ -902,8 +891,8 @@ #define TR_DISABLE "Deaktivieren" #define TR_TOPLCDTIMER "oberer LCD Timer" #define TR_UNIT "Einheit" -#define TR_TELEMETRY_NEWSENSOR INDENT "Sensor hinzufügen ..." -#define TR_CHANNELRANGE TR(INDENT "Kanäle", INDENT "Ausgangs Kanäle") //wg 9XR-Pro +#define TR_TELEMETRY_NEWSENSOR "Sensor hinzufügen ..." +#define TR_CHANNELRANGE TR("Kanäle", "Ausgangs Kanäle") //wg 9XR-Pro #define TR_AFHDS3_RX_FREQ TR("RX Freq.", "RX Frequenz") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetrie") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -922,9 +911,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Benötigt FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Benötigt EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "1.Warnschwelle" -#define TR_CRITICALALARM INDENT "Kritischer Alarm" -#define TR_DISABLE_ALARM TR(INDENT "Alarme AUS", INDENT "Telemetrie Alarme AUS") +#define TR_LOWALARM "1.Warnschwelle" +#define TR_CRITICALALARM "Kritischer Alarm" +#define TR_DISABLE_ALARM TR("Alarme AUS", "Telemetrie Alarme AUS") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -947,8 +936,8 @@ #define TR_CONSTANT "Konstant" #define TR_PREFLIGHT_POTSLIDER_CHECK "Aus","Ein","Auto" #define TR_PREFLIGHT "Vorflug-Checkliste" -#define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Checkliste anzeigen") //9XR-Pro -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interaktiv", INDENT "Interakt. Checkl.", INDENT "Interaktive Checkliste") +#define TR_CHECKLIST TR("Checkliste", "Checkliste anzeigen") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interaktiv", "Interakt. Checkl.", "Interaktive Checkliste") #define TR_AUX_SERIAL_MODE "Serieller Port" #define TR_AUX2_SERIAL_MODE "Serieller Port 2" #define TR_AUX_SERIAL_PORT_POWER "Versorgung" @@ -1102,7 +1091,7 @@ #define TR_UNSUPPORTED_RX "nicht unterstützter RX" #define TR_OTA_UPDATE_ERROR "OTA Update Fehler" #define TR_DEVICE_RESET "Gerät Reset..." -#define TR_ALTITUDE INDENT "Höhenanzeige" +#define TR_ALTITUDE "Höhenanzeige" #define TR_SCALE "Skalieren" #define TR_VIEW_CHANNELS "Zeige Kanäle" #define TR_VIEW_NOTES "Zeige Notizen" @@ -1124,13 +1113,12 @@ #define TR_ONLYPOSITIVE "Nur Positiv" #define TR_FILTER "Filter aktiv" #define TR_TELEMETRYFULL TR("Telem voll!", "Telemetriezeilen voll!") -#define TR_INVERTED_SERIAL INDENT "Invert." -#define TR_IGNORE_INSTANCE TR(INDENT "No Inst.", INDENT "Ignor. Instanzen") +#define TR_IGNORE_INSTANCE TR("No Inst.", "Ignor. Instanzen") #define TR_SHOW_INSTANCE_ID "zeige Instanz ID" #define TR_DISCOVER_SENSORS "Start Sensorsuche" #define TR_STOP_DISCOVER_SENSORS "Stop Sensorsuche" #define TR_DELETE_ALL_SENSORS "Lösche alle Sensoren" -#define TR_CONFIRMDELETE "Wirklich alle " LCDW_128_480_LINEBREAK "löschen ?" +#define TR_CONFIRMDELETE "Wirklich alle " LCDW_128_LINEBREAK "löschen ?" #define TR_SELECT_WIDGET "Widget auswählen" // grafisches Element #define TR_WIDGET_FULLSCREEN "Vollbild" #define TR_REMOVE_WIDGET "Widget löschen" @@ -1142,12 +1130,7 @@ #define TR_SETUP "Einrichten" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Ansicht hinzufügen" -#define TR_BACKGROUND_COLOR "Hintergrundfarbe" -#define TR_MAIN_COLOR "Hauptfarbe" -#define TR_BAR2_COLOR "Sekundärfarbe (Bar)" -#define TR_BAR1_COLOR "Hauptfarbe (Bar)" #define TR_TEXT_COLOR "Textfarbe" -#define TR_TEXT_VIEWER "Text Betrachter" // ----------------------------- Symbole für Auswahlliste---------- #define TR_MENU_INPUTS STR_CHAR_INPUT "Inputs" #define TR_MENU_LUA STR_CHAR_LUA "Lua Skripte" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 0fc859394cd..71c1df42f81 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -60,7 +60,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC TR("Expo","Exponential"),TR("ExFine","Extra Fine"),"Fine","Medium","Coarse" #define TR_VDISPLAYTRIMS "No","Change","Yes" -#define TR_VBEEPCOUNTDOWN "Silent","Beeps","Voice","Haptic",TR2_2("B & H","Beeps & Haptic"),TR2_2("V & H","Voice & Haptic") +#define TR_VBEEPCOUNTDOWN "Silent","Beeps","Voice","Haptic",TR("B & H","Beeps & Haptic"),TR("V & H","Voice & Haptic") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tone","Silent" #define TR_CURVE_TYPES "Standard","Custom" @@ -278,9 +278,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "Beep when centered") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "Use global funcs") #define TR_PROTOCOL TR("Proto", "Protocol") - #define TR_PPMFRAME INDENT "PPM frame" - #define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") - #define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Warning: output level is VBAT: ") + #define TR_PPMFRAME "PPM frame" + #define TR_REFRESHRATE TR("Refresh", "Refresh rate") + #define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "Warning: output level is VBAT: ") #define TR_WARN_5VOLTS "Warning: output level is 5 volts" #define TR_MS "ms" #define TR_SWITCH "Switch" @@ -293,9 +293,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012trims" + #define TR_CHECKTRIMS "\006Check\012trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swash Type" #define TR_COLLECTIVE TR("Collective", "Coll. pitch source") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. source") @@ -307,7 +306,7 @@ #else #define TR_LEFT_STICK "Left" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_SOURCE "Source" @@ -335,8 +334,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "Range" -#define TR_CENTER INDENT "Center" +#define TR_RANGE "Range" +#define TR_CENTER "Center" #define TR_ALARM "Alarm" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "Screen\001" @@ -370,27 +369,25 @@ #define TR_THROTTLE_START "Throttle Start" #define TR_THROTTLEREVERSE TR("T-Reverse", "Reverse") #define TR_MINUTEBEEP TR("Minute", "Minute call") -#define TR_BEEPCOUNTDOWN INDENT "Countdown" -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") +#define TR_BEEPCOUNTDOWN "Countdown" +#define TR_PERSISTENT TR("Persist.", "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Duration" -#define TR_BLONBRIGHTNESS INDENT "ON brightness" -#define TR_BLOFFBRIGHTNESS INDENT "OFF brightness" +#define TR_BLONBRIGHTNESS "ON brightness" +#define TR_BLOFFBRIGHTNESS "OFF brightness" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Color" #define TR_SPLASHSCREEN "Splash screen" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" #define TR_PWR_OFF_DELAY "Pwr Off delay" -#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "Throttle state") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("T-Warning", "Throttle state") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch positions") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Pot warn.", INDENT "Pot positions") +#define TR_SWITCHWARNING TR("S-Warning", "Switch positions") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Pot warn.", "Pot positions") #define TR_TIMEZONE "Time zone" #define TR_ADJUST_RTC "Adjust RTC" #define TR_GPS "GPS" @@ -399,7 +396,7 @@ #define TR_POTS "Pots" #define TR_SWITCHES "Switches" #define TR_SWITCHES_DELAY TR("Play delay", "Play delay (sw. mid pos)") -#define TR_SLAVE CENTER "Slave" +#define TR_SLAVE "Slave" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Cal" @@ -415,19 +412,19 @@ #define TR_SETMIDPOINT "CENTER AXIS/SLIDERS" #define TR_MOVESTICKSPOTS "MOVE AXIS/POTS" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" + #define TR_MENUTOSTART TR_ENTER " TO START" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006SET POTS MIDPOINT" - #define TR_MOVESTICKSPOTS CENTER "\002MOVE ST/TH/POTS/AXIS" + #define TR_SETMIDPOINT "SET POTS MIDPOINT" + #define TR_MOVESTICKSPOTS "MOVE ST/TH/POTS/AXIS" #else - #define TR_SETMIDPOINT TR(CENTER "\006SET AXIS MIDPOINT", CENTER "\004CENTER AXIS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\007MOVE AXIS/POTS" + #define TR_SETMIDPOINT TR("SET AXIS MIDPOINT", "CENTER AXIS/SLIDERS") + #define TR_MOVESTICKSPOTS "MOVE AXIS/POTS" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" + #define TR_MENUWHENDONE TR_ENTER " WHEN DONE" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -529,13 +526,12 @@ #define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") #define TR_MULTI_OPTION TR("Option", "Option value") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.", INDENT "Bind on channel") +#define TR_MULTI_AUTOBIND TR("Bind Ch.", "Bind on channel") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disable Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Disable Telemetry") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "Low power mode") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Disable int.", "Disable internal RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -553,8 +549,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "Module Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -571,7 +567,7 @@ #define TR_REPEAT_AT_ZERO "Repeat zero" #define TR_BATT_CALIB TR("Batt. calib", "Battery calibration") #define TR_CURRENT_CALIB "Current calib" -#define TR_VOLTAGE TR(INDENT "Voltage", INDENT "Voltage source") +#define TR_VOLTAGE TR("Voltage", "Voltage source") #define TR_SELECT_MODEL "Select model" #define TR_MANAGE_MODELS "MANAGE MODELS" #define TR_MODELS "Models" @@ -642,7 +638,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs and Screenshots disabled" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs & Screenshots" LCDW_128_480_LINEBREAK "disabled" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs & Screenshots" LCDW_128_LINEBREAK "disabled" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -674,7 +670,6 @@ #define TR_CPU_TEMP "CPU temp." #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp." -#define TR_TEMPWARNING INDENT "Overheat" #define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!" #define TR_FUNC "Function" #define TR_V1 "V1" @@ -751,11 +746,10 @@ #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Speed:" #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Size:" -#define TR_TYPE INDENT "Type" +#define TR_TYPE "Type" #define TR_GLOBAL_VARS "Global variables" #define TR_GVARS "GVARS" #define TR_GLOBAL_VAR "Global variable" @@ -803,7 +797,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "External RF" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe mode") +#define TR_FAILSAFE TR("Failsafe", "Failsafe mode") #define TR_FAILSAFESET "FAILSAFE SETTINGS" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" @@ -887,7 +881,7 @@ #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX antenna problem!" +#define TR_ANTENNAPROBLEM "TX antenna problem!" #define TR_MODELIDUSED "ID used in:" #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "Module" @@ -902,8 +896,8 @@ #define TR_DISABLE "Disable" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "Unit" -#define TR_TELEMETRY_NEWSENSOR INDENT "Add new" -#define TR_CHANNELRANGE TR(INDENT "Ch. Range", INDENT "Channel Range") +#define TR_TELEMETRY_NEWSENSOR "Add new" +#define TR_CHANNELRANGE TR("Ch. Range", "Channel Range") #define TR_ANTENNACONFIRM1 "EXT. ANTENNA" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Internal","Ask","Per model","Internal + External" @@ -917,9 +911,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requires FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requires EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "Low alarm" -#define TR_CRITICALALARM INDENT "Critical alarm" -#define TR_DISABLE_ALARM TR(INDENT "Disable alarms", INDENT "Disable telemetry alarms") +#define TR_LOWALARM "Low alarm" +#define TR_CRITICALALARM "Critical alarm" +#define TR_DISABLE_ALARM TR("Disable alarms", "Disable telemetry alarms") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -942,8 +936,8 @@ #define TR_CONSTANT "Constant" #define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","AUTO" #define TR_PREFLIGHT "Pre-start Checks" -#define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display checklist") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("Checklist", "Display checklist") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Serial port" #define TR_AUX2_SERIAL_MODE "Serial port 2" #define TR_AUX_SERIAL_PORT_POWER "Port power" @@ -1095,7 +1089,7 @@ #define TR_UNSUPPORTED_RX "Unsupported RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Altitude" +#define TR_ALTITUDE "Altitude" #define TR_SCALE "Scale" #define TR_VIEW_CHANNELS "View Channels" #define TR_VIEW_NOTES "View Notes" @@ -1117,13 +1111,12 @@ #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL TR("All slots full!", "All telemetry slots full!") -#define TR_INVERTED_SERIAL INDENT "Invert" -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignore instances") +#define TR_IGNORE_INSTANCE TR("No inst.", "Ignore instances") #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Discover new" #define TR_STOP_DISCOVER_SENSORS "Stop" #define TR_DELETE_ALL_SENSORS "Delete all" -#define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" +#define TR_CONFIRMDELETE "Really " LCDW_128_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_WIDGET_FULLSCREEN "Full screen" #define TR_REMOVE_WIDGET "Remove widget" @@ -1135,12 +1128,7 @@ #define TR_SETUP "Setup" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Add main view" -#define TR_BACKGROUND_COLOR "Background color" -#define TR_MAIN_COLOR "Main color" -#define TR_BAR2_COLOR "Secondary bar color" -#define TR_BAR1_COLOR "Main bar color" #define TR_TEXT_COLOR "Text color" -#define TR_TEXT_VIEWER "Text Viewer" #define TR_MENU_INPUTS STR_CHAR_INPUT "Inputs" #define TR_MENU_LUA STR_CHAR_LUA "Lua scripts" #define TR_MENU_STICKS STR_CHAR_STICK "Axis" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index a0058f947cf..84d11bc36df 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -62,7 +62,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC TR("Expo","Exponencial"),TR("ExFino","Extra fino")"Fino","Medio","Grueso" #define TR_VDISPLAYTRIMS "No","Cambiar","Si" -#define TR_VBEEPCOUNTDOWN "Silencio", "Beeps", "Voz", "Haptic", TR2_2("B & H","Beeps & Haptic"),TR2_2("V & H", "Voz & Haptic") +#define TR_VBEEPCOUNTDOWN "Silencio", "Beeps", "Voz", "Haptic", TR("B & H","Beeps & Haptic"),TR("V & H", "Voz & Haptic") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tono","Silencio" #define TR_CURVE_TYPES "Normal","Custom" @@ -247,7 +247,7 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #endif -#define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR " +#define TR_MENUWHENDONE TR_ENTER " AL ACABAR " #define TR_FREE "libre" #define TR_YES "Yes" #define TR_NO "No" @@ -276,9 +276,9 @@ #define TR_BEEPCTR TR("Beep ctr", "Beep centro") #define TR_USE_GLOBAL_FUNCS TR("Funcs. glob.", "Usar func. globales") #define TR_PROTOCOL TR("Proto", "Protocolo") -#define TR_PPMFRAME INDENT "Trama PPM" -#define TR_REFRESHRATE TR(INDENT "Refresco", INDENT "Velocidad refresco") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Salida es VBAT: ", INDENT "Aviso: señal salida es VBAT: ") +#define TR_PPMFRAME "Trama PPM" +#define TR_REFRESHRATE TR("Refresco", "Velocidad refresco") +#define STR_WARN_BATTVOLTAGE TR("Salida es VBAT: ", "Aviso: señal salida es VBAT: ") #define TR_WARN_5VOLTS "Aviso: nivel de salida 5 voltios" #define TR_MS "ms" #define TR_SWITCH TR("Interr.", "Interruptor") @@ -291,9 +291,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012trims" + #define TR_CHECKTRIMS "\006Check\012trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Tipo cíclico" #define TR_COLLECTIVE TR("Colectivo", "Fuente colectivo") #define TR_AILERON TR("Col. lateral", "Fuente col. lateral") @@ -305,7 +304,7 @@ #else #define TR_LEFT_STICK "Izq" #endif -#define TR_SUBTYPE INDENT "Subtipo" +#define TR_SUBTYPE "Subtipo" #define TR_NOFREEEXPO "No expo libre!" #define TR_NOFREEMIXER "No mezcla lib!" #define TR_SOURCE "Fuente" @@ -333,8 +332,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT"Alcance" -#define TR_CENTER INDENT "Centro" +#define TR_RANGE "Alcance" +#define TR_CENTER "Centro" #define TR_ALARM "Alarma" #define TR_BLADES "Palas" #define TR_SCREEN "Pant. " @@ -368,27 +367,25 @@ #define TR_THROTTLE_START "Potencia Start" #define TR_THROTTLEREVERSE TR("Invert acel", "Invertir acel.") #define TR_MINUTEBEEP TR("Minuto", "Cada minuto") -#define TR_BEEPCOUNTDOWN TR(INDENT"Cta. atrás", INDENT"Cuenta atrás") -#define TR_PERSISTENT TR(INDENT"Persisten.", INDENT"Persistente") +#define TR_BEEPCOUNTDOWN TR("Cta. atrás", "Cuenta atrás") +#define TR_PERSISTENT TR("Persisten.", "Persistente") #define TR_BACKLIGHT_LABEL "Luz fondo" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT"Duración" -#define TR_BLONBRIGHTNESS INDENT"MAS brillo" -#define TR_BLOFFBRIGHTNESS INDENT"MENOS brillo" +#define TR_BLONBRIGHTNESS "MAS brillo" +#define TR_BLOFFBRIGHTNESS "MENOS brillo" #define TR_KEYS_BACKLIGHT "Keys backlight" -#define TR_BLCOLOR INDENT "Color" +#define TR_BLCOLOR "Color" #define TR_SPLASHSCREEN "Pantalla inicio" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY TR("Atraso On", "Atraso encendido") #define TR_PWR_OFF_DELAY TR("Atraso Off", "Atraso apagado") -#define TR_THROTTLE_WARNING TR(INDENT "Aviso-A", INDENT "Aviso acelerador") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("Aviso-A", "Aviso acelerador") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Aviso-I", INDENT "Aviso interruptor") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Pos. slid.", INDENT "Posiciones slider") -#define TR_POTWARNING TR(INDENT "Aviso pot", INDENT "Aviso pot") +#define TR_SWITCHWARNING TR("Aviso-I", "Aviso interruptor") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Aviso pot", "Aviso pot") #define TR_TIMEZONE "Zona horaria" #define TR_ADJUST_RTC TR("Ajustar RTC", "Ajustar RTC") #define TR_GPS "GPS" @@ -408,13 +405,13 @@ #define TR_SETMIDPOINT "Centra sticks/pots/sliders y presiona [Enter]" #define TR_MOVESTICKSPOTS "Mueve sticks, pots and sliders y presiona [Enter]" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " EMPEZAR" - #define TR_SETMIDPOINT TR(CENTER "\007STICKS AL CENTRO",CENTER "\010STICKS AL CENTRO") - #define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS" + #define TR_MENUTOSTART TR_ENTER " EMPEZAR" + #define TR_SETMIDPOINT TR("STICKS AL CENTRO", "STICKS AL CENTRO") + #define TR_MOVESTICKSPOTS "MOVER STICKS/POTS" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "SIN DATOS" +#define TR_NODATA "SIN DATOS" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix máx" @@ -525,13 +522,12 @@ #define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("ID Fijo", "ID Fijo") #define TR_MULTI_OPTION TR("Opción", "Valor opción") -#define TR_MULTI_AUTOBIND TR(INDENT "Emp Cnl",INDENT "Emparejar en canal") +#define TR_MULTI_AUTOBIND TR("Emp Cnl","Emparejar en canal") #define TR_DISABLE_CH_MAP TR("No ch map", "Desactivar mapa cnl") #define TR_DISABLE_TELEM TR("No telem", "Desactivar telem.") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetectar formato") -#define TR_MULTI_LOWPOWER TR(INDENT "Baja poten.", INDENT "Modo de baja poten.") -#define TR_MULTI_LNA_DISABLE INDENT "LNA desact." -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Baja poten.", "Modo de baja poten.") +#define TR_MULTI_LNA_DISABLE "LNA desact." +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Activado") #define TR_DISABLE_INTERNAL TR("Desac.RF int", "Desact. mód. int. RF") #define TR_MODULE_NO_SERIAL_MODE TR("No modo serie", "No en modo serie") @@ -549,20 +545,20 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. inválido", "Protocolo inválido") -#define TR_MODULE_STATUS TR(INDENT "Estado", INDENT "Estado módulo") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Estado proto sync") +#define TR_MODULE_STATUS TR("Estado", "Estado módulo") +#define TR_MODULE_SYNC TR("Sync", "Estado proto sync") #define TR_MULTI_SERVOFREQ TR("V ref serv", "Vel. refr. servo") #define TR_MULTI_MAX_THROW TR("Máx. Throw", "Activar máx. throw") #define TR_MULTI_RFCHAN TR("Canal RF", "Selecciona canal RF") #define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling") #define TR_GPS_COORDS_FORMAT TR("Coords GPS", "Formato coordenadas") #define TR_VARIO TR("Vario", "Variómetro") -#define TR_PITCH_AT_ZERO INDENT "Pitch en cero" -#define TR_PITCH_AT_MAX INDENT "Pitch en máx" -#define TR_REPEAT_AT_ZERO TR(INDENT "Repet. en cero", INDENT "Repetir en cero") +#define TR_PITCH_AT_ZERO "Pitch en cero" +#define TR_PITCH_AT_MAX "Pitch en máx" +#define TR_REPEAT_AT_ZERO TR("Repet. en cero", "Repetir en cero") #define TR_BATT_CALIB TR("Calib.bat.", "Calibración batería") #define TR_CURRENT_CALIB "Calib. actual" -#define TR_VOLTAGE INDENT"Voltaje" +#define TR_VOLTAGE "Voltaje" #define TR_SELECT_MODEL TR("Selec. modelo", "Seleccionar modelo") #define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" @@ -633,7 +629,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs and Screenshots disabled" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_480_LINEBREAK "Screenshots disabled" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_LINEBREAK "Screenshots disabled" #endif #define TR_NEEDS_FILE "NECESITA ARCHIVO" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -665,7 +661,6 @@ #define TR_CPU_TEMP "CPU Temp.\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp. \016>" -#define TR_TEMPWARNING INDENT "Sobrecalent" #define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!" #define TR_FUNC "Función" #define TR_V1 "V1" @@ -741,11 +736,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetría","Entrenador" #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Tipo:" #define TR_SD_SPEED "Velocidad:" #define TR_SD_SECTORS "Sectores:" #define TR_SD_SIZE "Tamaño:" -#define TR_TYPE INDENT "Tipo" +#define TR_TYPE "Tipo" #define TR_GLOBAL_VARS "Variables globales" #define TR_GVARS "V. GLOBAL" #define TR_GLOBAL_VAR "Variable global" @@ -793,7 +787,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Más opciones disp." #define TR_NO_MODULE_INFORMATION "Sin información módulo" #define TR_EXTERNALRF "RF externa" -#define TR_FAILSAFE INDENT"Failsafe" +#define TR_FAILSAFE "Failsafe" #define TR_FAILSAFESET "AJUSTES FAILSAFE" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Pers. ID" @@ -878,7 +872,7 @@ #define TR_SET "[Ajuste]" #define TR_TRAINER "Entrenador" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "Problema antena TX!" +#define TR_ANTENNAPROBLEM "Problema antena TX!" #define TR_MODELIDUSED TR("ID en uso", "ID modelo en uso") #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "Módulo" @@ -893,8 +887,8 @@ #define TR_DISABLE "Disable" #define TR_TOPLCDTIMER "Timer LCD superior" #define TR_UNIT "Unidad" -#define TR_TELEMETRY_NEWSENSOR INDENT "Añadir sensor..." -#define TR_CHANNELRANGE INDENT "Canales" +#define TR_TELEMETRY_NEWSENSOR "Añadir sensor..." +#define TR_CHANNELRANGE "Canales" #define TR_AFHDS3_RX_FREQ TR("RX freq.", "RX frequencia") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetría") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -914,9 +908,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requiere FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requiere EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "firmware certificado" -#define TR_LOWALARM INDENT "Alarma baja" -#define TR_CRITICALALARM INDENT "Alarma crítica" -#define TR_DISABLE_ALARM TR(INDENT "Desact. alarmas", INDENT "Desact. alarmas telem.") +#define TR_LOWALARM "Alarma baja" +#define TR_CRITICALALARM "Alarma crítica" +#define TR_DISABLE_ALARM TR("Desact. alarmas", "Desact. alarmas telem.") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Máx" @@ -939,8 +933,8 @@ #define TR_CONSTANT "Constante" #define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Chequeos prevuelo" -#define TR_CHECKLIST TR(INDENT "Lista verif", INDENT "Lista verificación") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("Lista verif", "Lista verificación") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Puerto serie" #define TR_AUX2_SERIAL_MODE "Puerto serie 2" #define TR_AUX_SERIAL_PORT_POWER "Port power" @@ -949,7 +943,7 @@ #define TR_OUTPUTS "Salidas" #define STR_EEBACKUP "Copia seg. EEPROM" #define STR_FACTORYRESET "Rest. fabrica" -#define TR_CONFIRMRESET "Borrar TODOS los " LCDW_128_480_LINEBREAK "modelos y conf?" +#define TR_CONFIRMRESET "Borrar TODOS los " LCDW_128_LINEBREAK "modelos y conf?" #define TR_TOO_MANY_LUA_SCRIPTS "Demasiados Lua scripts!" #define TR_SPORT_UPDATE_POWER_MODE "SP Power" #define TR_SPORT_UPDATE_POWER_MODES "AUTO","ON" @@ -1092,7 +1086,7 @@ #define TR_UNSUPPORTED_RX "RX no soportado" #define TR_OTA_UPDATE_ERROR "Error actualización OTA" #define TR_DEVICE_RESET "Reset dispositivo..." -#define TR_ALTITUDE INDENT "Altitud" +#define TR_ALTITUDE "Altitud" #define TR_SCALE "Escala" #define TR_VIEW_CHANNELS "Ver Canales" #define TR_VIEW_NOTES "Ver Notas" @@ -1114,13 +1108,12 @@ #define TR_ONLYPOSITIVE "Positivo" #define TR_FILTER "Filtro" #define TR_TELEMETRYFULL TR("Telem. llena!", "Todas las entradas de telemetría llenas!") -#define TR_INVERTED_SERIAL INDENT "Invertir" -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignora instancias") +#define TR_IGNORE_INSTANCE TR("No inst.", "Ignora instancias") #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Buscar sensores" #define TR_STOP_DISCOVER_SENSORS "Parar busqueda" #define TR_DELETE_ALL_SENSORS "Borrar sensores" -#define TR_CONFIRMDELETE "Seguro " LCDW_128_480_LINEBREAK "borrar todo ?" +#define TR_CONFIRMDELETE "Seguro " LCDW_128_LINEBREAK "borrar todo ?" #define TR_SELECT_WIDGET "Seleccionar widget" #define TR_WIDGET_FULLSCREEN "Full screen" #define TR_REMOVE_WIDGET "Borrar widget" @@ -1132,12 +1125,7 @@ #define TR_SETUP "Configuración" #define TR_LAYOUT "Diseño" #define TR_ADD_MAIN_VIEW "Añadir vista pral." -#define TR_BACKGROUND_COLOR "Color de fondo" -#define TR_MAIN_COLOR "Color principal" -#define TR_BAR2_COLOR "Color barra secundaria" -#define TR_BAR1_COLOR "Color barra principal" #define TR_TEXT_COLOR "Color texto" -#define TR_TEXT_VIEWER "Visor de texto" #define TR_MENU_INPUTS STR_CHAR_INPUT "Entradas" #define TR_MENU_LUA STR_CHAR_LUA "Lua scripts" @@ -1160,7 +1148,7 @@ #define TR_JITTER_FILTER "Filtro ADC" #define TR_DEAD_ZONE "Dead zone" #define TR_RTC_CHECK TR("Check RTC", "Check RTC voltaje") -#define TR_AUTH_FAILURE "Fallo " LCDW_128_480_LINEBREAK "autentificación" +#define TR_AUTH_FAILURE "Fallo " LCDW_128_LINEBREAK "autentificación" #define TR_RACING_MODE "Racing mode" // The following content is Untranslated) diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 00f08d5cd5c..ca437831c40 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -64,7 +64,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC TR("Expo","Exponential"),TR("EriHie","Eri Hieno"),"Hieno","Keski","Karkea" #define TR_VDISPLAYTRIMS "No","Change","Yes" -#define TR_VBEEPCOUNTDOWN "Silent","Beeps","Voice","Haptic",TR2_2("B & H","Beeps & Haptic"),TR2_2("V & H","Voice & Haptic") +#define TR_VBEEPCOUNTDOWN "Silent","Beeps","Voice","Haptic",TR("B & H","Beeps & Haptic"),TR("V & H","Voice & Haptic") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tone","Silent" #define TR_CURVE_TYPES "Standard","Custom" @@ -257,7 +257,7 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #endif -#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" +#define TR_MENUWHENDONE TR_ENTER " WHEN DONE" #define TR_FREE "free" #define TR_YES "Yes" #define TR_NO "No" @@ -290,9 +290,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_USE_GLOBAL_FUNCS "Use Global Funcs" #define TR_PROTOCOL TR("Proto", "Protocol") -#define TR_PPMFRAME INDENT "PPM frame" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Warning: output level is VBAT: ") +#define TR_PPMFRAME "PPM frame" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "Warning: output level is VBAT: ") #define TR_WARN_5VOLTS "Warning: output level is 5 volts" #define TR_MS "ms" #define TR_SWITCH "Switch" @@ -305,9 +305,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012Trims" + #define TR_CHECKTRIMS "\006Check\012Trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swash Type" #define TR_COLLECTIVE TR("Collective", "Coll. pitch source") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. source") @@ -319,7 +318,7 @@ #else #define TR_LEFT_STICK "Va" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_SOURCE "Source" @@ -347,8 +346,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT"Range" -#define TR_CENTER INDENT "Center" +#define TR_RANGE "Range" +#define TR_CENTER "Center" #define TR_ALARM "Alarm" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "Screen" @@ -382,27 +381,25 @@ #define TR_THROTTLE_START "Throttle Start" #define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") #define TR_MINUTEBEEP TR("Minute", "Minute call") -#define TR_BEEPCOUNTDOWN INDENT"Countdown" -#define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistent") +#define TR_BEEPCOUNTDOWN "Countdown" +#define TR_PERSISTENT TR("Persist.", "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT"Duration" -#define TR_BLONBRIGHTNESS INDENT"ON Brightness" -#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" +#define TR_BLONBRIGHTNESS "ON Brightness" +#define TR_BLOFFBRIGHTNESS "OFF Brightness" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Color" #define TR_SPLASHSCREEN "Splash screen" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" #define TR_PWR_OFF_DELAY "Pwr Off delay" -#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "Throttle Warning") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("T-Warning", "Throttle Warning") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch Warning") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Pot Warn.", INDENT "Pot Warning") +#define TR_SWITCHWARNING TR("S-Warning", "Switch Warning") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Pot Warn.", "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_ADJUST_RTC TR("Adjust RTC", "Adjust RTC") #define TR_GPS "GPS" @@ -423,13 +420,13 @@ #define TR_SETMIDPOINT "Center sticks/pots/sliders and press [Enter]" #define TR_MOVESTICKSPOTS "Move sticks, pots and sliders and press [Enter]" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" - #define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" + #define TR_MENUTOSTART TR_ENTER " TO START" + #define TR_SETMIDPOINT TR("SET STICKS MIDPOINT", "CENTER STICKS/SLIDERS") + #define TR_MOVESTICKSPOTS "MOVE STICKS/POTS" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -540,13 +537,12 @@ #define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") #define TR_MULTI_OPTION TR("Option", "Option value") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.",INDENT "Bind on channel") +#define TR_MULTI_AUTOBIND TR("Bind Ch.","Bind on channel") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disable Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Disable Telemetry") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "Low power mode") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Disable int. RF", "Disable internal RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -564,8 +560,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "Module Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -577,7 +573,7 @@ #define TR_REPEAT_AT_ZERO "Repeat at Zero" #define TR_BATT_CALIB "Battery Calib" #define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE INDENT"Jännite" +#define TR_VOLTAGE "Jännite" #define TR_SELECT_MODEL "Select Model" #define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" @@ -648,7 +644,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs and Screenshots disabled" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_480_LINEBREAK "Screenshots disabled" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_LINEBREAK "Screenshots disabled" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -680,7 +676,6 @@ #define TR_CPU_TEMP "CPU:n lämpötila\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp. \016>" -#define TR_TEMPWARNING INDENT "Ylikuumentunut" #define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!" #define TR_FUNC "Func" #define TR_V1 "V1" @@ -756,11 +751,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetry","Trainer" #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Tyyppi:" #define TR_SD_SPEED "Nopeus:" #define TR_SD_SECTORS "Sectors:" #define TR_SD_SIZE "Koko:" -#define TR_TYPE INDENT "Tyyppi" +#define TR_TYPE "Tyyppi" #define TR_GLOBAL_VARS "Globaalit muuttujat" #define TR_GVARS "GLOBAALIT M." #define TR_GLOBAL_VAR "Globaali muuttuja" @@ -808,7 +802,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "External RF" -#define TR_FAILSAFE INDENT "Failsafe mode" +#define TR_FAILSAFE "Failsafe mode" #define TR_FAILSAFESET "FAILSAFE SETTINGS" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" @@ -892,7 +886,7 @@ #define TR_SET "[Set]" #define TR_TRAINER "Trainer" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "Lähettimen antenniongelma!" +#define TR_ANTENNAPROBLEM "Lähettimen antenniongelma!" #define TR_MODELIDUSED TR("ID used in:", "Receiver ID used in:") #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "Module" @@ -907,8 +901,8 @@ #define TR_DISABLE "Disable" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "Unit" -#define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..." -#define TR_CHANNELRANGE INDENT "Channel Range" +#define TR_TELEMETRY_NEWSENSOR "Add a new sensor..." +#define TR_CHANNELRANGE "Channel Range" #define TR_AFHDS3_RX_FREQ TR("RX freq.", "RX frequency") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetry") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -927,9 +921,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requires FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requires EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "Low Alarm" -#define TR_CRITICALALARM INDENT "Critical Alarm" -#define TR_DISABLE_ALARM TR(INDENT "Disable alarms", INDENT "Disable telemetry alarms") +#define TR_LOWALARM "Low Alarm" +#define TR_CRITICALALARM "Critical Alarm" +#define TR_DISABLE_ALARM TR("Disable alarms", "Disable telemetry alarms") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -952,8 +946,8 @@ #define TR_CONSTANT "Constant" #define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT "Display Checklist" -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST "Display Checklist" +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Sarjaportti" #define TR_AUX2_SERIAL_MODE "Sarjaportti 2" #define TR_AUX_SERIAL_PORT_POWER "Virta" @@ -1105,7 +1099,7 @@ #define TR_UNSUPPORTED_RX "Unsupported RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Korkeus" +#define TR_ALTITUDE "Korkeus" #define TR_SCALE "Scale" #define TR_VIEW_CHANNELS "View Channels" #define TR_VIEW_NOTES "View Notes" @@ -1127,13 +1121,12 @@ #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL TR("All slots full!", "All telemetry slots full!") -#define TR_INVERTED_SERIAL INDENT "Invert" -#define TR_IGNORE_INSTANCE INDENT "Ignore instance" +#define TR_IGNORE_INSTANCE "Ignore instance" #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Discover new sensors" #define TR_STOP_DISCOVER_SENSORS "Stop discovery" #define TR_DELETE_ALL_SENSORS "Delete all" -#define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" +#define TR_CONFIRMDELETE "Really " LCDW_128_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_WIDGET_FULLSCREEN "Full screen" #define TR_REMOVE_WIDGET "Remove widget" @@ -1145,12 +1138,7 @@ #define TR_SETUP "Setup" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Add main view" -#define TR_BACKGROUND_COLOR "Background color" -#define TR_MAIN_COLOR "Main color" -#define TR_BAR2_COLOR "Secondary bar color" -#define TR_BAR1_COLOR "Main bar color" #define TR_TEXT_COLOR "Text color" -#define TR_TEXT_VIEWER "Text Viewer" #define TR_MENU_INPUTS STR_CHAR_INPUT "Inputs" #define TR_MENU_LUA STR_CHAR_LUA "Lua scripts" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 5825d2a3347..326d07eff92 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -65,7 +65,7 @@ #define TR_MULTI_CUSTOM "Perso" #define TR_VTRIMINC TR("Expo","Exponentiel"),TR("ExFin","Extra Fin"),"Fin","Moyen",TR("Gros","Grossier") #define TR_VDISPLAYTRIMS "Non","Change","Oui" -#define TR_VBEEPCOUNTDOWN "Aucun","Bips","Voix","Vibreur",TR2_2("B & H","Bips & Vibreur"),TR2_2("V & H","Voix & Vibreur") +#define TR_VBEEPCOUNTDOWN "Aucun","Bips","Voix","Vibreur",TR("B & H","Bips & Vibreur"),TR("V & H","Voix & Vibreur") #define TR_VVARIOCENTER "Son","Silencieux" #define TR_CURVE_TYPES "Standard","Libre" @@ -256,7 +256,7 @@ #define TR_POPUPS_ENTER_EXIT TR_ENTER "\010" TR_EXIT #endif -#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " QUAND PRÊT" +#define TR_MENUWHENDONE TR_ENTER " QUAND PRÊT" #define TR_FREE "disp." #define TR_YES "Oui" #define TR_NO "Non" @@ -285,9 +285,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "Bip quand centré") #define TR_USE_GLOBAL_FUNCS TR("Fonc. glob.", "Fonct. Globales") #define TR_PROTOCOL TR("Proto.", "Protocole") -#define TR_PPMFRAME INDENT "Trame PPM" -#define TR_REFRESHRATE INDENT "Période" -#define STR_WARN_BATTVOLTAGE TR(INDENT "Signal is VBAT: ", INDENT "ATTENTION: niveau sortie est VBAT: ") +#define TR_PPMFRAME "Trame PPM" +#define TR_REFRESHRATE "Période" +#define STR_WARN_BATTVOLTAGE TR("Signal is VBAT: ", "ATTENTION: niveau sortie est VBAT: ") #define TR_WARN_5VOLTS "Attention: niveau de sortie 5 volts" #define TR_MS "ms" #define TR_SWITCH TR("Inter", "Interrupteur") @@ -302,7 +302,6 @@ #else #define TR_CHECKTRIMS "\006Vérif\012Trims" #endif -#define OFS_CHECKTRIMS (9*FW) #define TR_SWASHTYPE "Type de plateau" #define TR_COLLECTIVE TR("Collectif", "Source collectif") #define TR_AILERON "Source cyc. lat." @@ -314,7 +313,7 @@ #else #define TR_LEFT_STICK "Gauche" #endif -#define TR_SUBTYPE INDENT "Sous-type" +#define TR_SUBTYPE "Sous-type" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" #define TR_SOURCE "Source" @@ -342,8 +341,8 @@ #else #define TR_GV TR("G", "VG") #endif -#define TR_RANGE INDENT "Plage" -#define TR_CENTER INDENT "Centre" +#define TR_RANGE "Plage" +#define TR_CENTER "Centre" #define TR_ALARM "Alarme" #define TR_BLADES "Pales/Poles" #define TR_SCREEN "Écran " @@ -378,27 +377,25 @@ #define TR_THROTTLE_START "Gaz Start" #define TR_THROTTLEREVERSE TR("Inv. gaz", "Inversion gaz") #define TR_MINUTEBEEP TR("Bip min.", "Annonces minutes") -#define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin", INDENT "Compte à rebours") -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistant") +#define TR_BEEPCOUNTDOWN TR("Bip fin", "Compte à rebours") +#define TR_PERSISTENT TR( "Persist.", "Persistant") #define TR_BACKLIGHT_LABEL "Rétroéclairage" #define TR_GHOST_MENU_LABEL "MENU GHOST" #define TR_STATUS "Version" -#define TR_BLDELAY INDENT "Durée" -#define TR_BLONBRIGHTNESS INDENT "Luminosité ON" -#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" +#define TR_BLONBRIGHTNESS "Luminosité ON" +#define TR_BLOFFBRIGHTNESS "Luminosité OFF" #define TR_KEYS_BACKLIGHT "Rétroéclairage touches" #define TR_BLCOLOR "Couleur" #define TR_SPLASHSCREEN "Ecran d'accueil" #define TR_PLAY_HELLO "Son de démarrage" #define TR_PWR_ON_DELAY "Délai btn ON" #define TR_PWR_OFF_DELAY "Délai btn OFF" -#define TR_THROTTLE_WARNING TR(INDENT "Alerte gaz", INDENT "Alerte gaz") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Pos. Perso", INDENT INDENT INDENT INDENT "Position perso ?") +#define TR_THROTTLE_WARNING TR("Alerte gaz", "Alerte gaz") +#define TR_CUSTOM_THROTTLE_WARNING TR("Pos. Perso", "Position perso ?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Alerte int", INDENT "Pos. Interrupteurs") -#define TR_POTWARNINGSTATE TR(INDENT "Pots.&Slid.", INDENT "Pots & Curseurs") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Position Curseurs") -#define TR_POTWARNING TR(INDENT "Alerte pots", INDENT "Pos. Potentios") +#define TR_SWITCHWARNING TR("Alerte int", "Pos. Interrupteurs") +#define TR_POTWARNINGSTATE "Pots & Curseurs" +#define TR_POTWARNING TR("Alerte pots", "Pos. Potentios") #define TR_TIMEZONE "Fuseau horaire" #define TR_ADJUST_RTC TR("Ajust. RTC", "Ajust. heure auto") #define TR_GPS "GPS" @@ -423,13 +420,13 @@ #define TR_SETMIDPOINT "RÉGLER NEUTRES" #define TR_MOVESTICKSPOTS "BOUGER STICKS/POTS" #else - #define TR_MENUTOSTART CENTER"\006" TR_ENTER " POUR DÉBUT" - #define TR_SETMIDPOINT CENTER"\010REGLER NEUTRES" - #define TR_MOVESTICKSPOTS CENTER"\004BOUGER STICKS/POTS" + #define TR_MENUTOSTART TR_ENTER " POUR DÉBUT" + #define TR_SETMIDPOINT "REGLER NEUTRES" + #define TR_MOVESTICKSPOTS "BOUGER STICKS/POTS" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" @@ -526,21 +523,20 @@ #define TR_MONITOR_MIXER_DESC "Mixeurs" #define TR_RECEIVER_NUM TR("NumRx", "No. Récepteur") #define TR_RECEIVER "Récept." -#define TR_MULTI_RFTUNE TR(INDENT "Ajust.fréq", INDENT "Ajust. fin fréq.") +#define TR_MULTI_RFTUNE TR("Ajust.fréq", "Ajust. fin fréq.") #define TR_MULTI_RFPOWER "Puissance RF" #define TR_MULTI_WBUS "Sortie" #define TR_MULTI_TELEMETRY "Télémétrie" -#define TR_MULTI_VIDFREQ TR(INDENT "Fréq. vidéo", INDENT "Fréquence vidéo") +#define TR_MULTI_VIDFREQ TR("Fréq. vidéo", "Fréquence vidéo") #define TR_RF_POWER TR("Puiss. RF", "Puissance RF") #define TR_MULTI_FIXEDID "ID fixe" -#define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option perso") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind voie", INDENT "Bind sur voie") +#define TR_MULTI_OPTION TR("Option", "Option perso") +#define TR_MULTI_AUTOBIND TR("Bind voie", "Bind sur voie") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Désact. réorg. voies") #define TR_DISABLE_TELEM TR("Pas de Télém.", "Désact. Télémétrie") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodét.", INDENT "Autodétection") -#define TR_MULTI_LOWPOWER TR(INDENT "Basse puis.", INDENT "Mode basse puiss.") -#define TR_MULTI_LNA_DISABLE INDENT "LNA désactivé" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "Lien S.Port") +#define TR_MULTI_LOWPOWER TR("Basse puis.", "Mode basse puiss.") +#define TR_MULTI_LNA_DISABLE "LNA désactivé" +#define TR_MODULE_TELEMETRY TR("S.Port", "Lien S.Port") #define TR_MODULE_TELEM_ON TR("ON", "Actif") #define TR_DISABLE_INTERNAL TR("Désact intRF", "Désact. RF interne") #define TR_MODULE_NO_SERIAL_MODE TR("Mode série?", "Pas en mode série") @@ -558,9 +554,9 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Télem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Télem OFF" #define TR_PROTOCOL_INVALID TR("Sél. invalide", "Protocole invalide") -#define TR_MODULE_STATUS TR(INDENT "Etat", INDENT "État Module") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Statut Proto Sync.") -#define TR_MULTI_SERVOFREQ TR(INDENT "Fréq.servo", INDENT "Màj fréq. servos") +#define TR_MODULE_STATUS TR("Etat", "État Module") +#define TR_MODULE_SYNC TR("Sync", "Statut Proto Sync.") +#define TR_MULTI_SERVOFREQ TR("Fréq.servo", "Màj fréq. servos") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Activer max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Sélection canal RF") #define TR_GPS_COORDS_FORMAT TR("Coordonnées", "Coordonnées GPS") @@ -570,7 +566,7 @@ #define TR_REPEAT_AT_ZERO TR("Répét. zéro", "Répéter zéro") #define TR_BATT_CALIB TR("Calib. batt", "Calib. batterie") #define TR_CURRENT_CALIB "Calib. cour" -#define TR_VOLTAGE TR(INDENT "Tension",INDENT "Source tension") +#define TR_VOLTAGE TR("Tension","Source tension") #define TR_SELECT_MODEL "Sélection Modèle" #define TR_MANAGE_MODELS "GESTION MODÈLES" #define TR_MODELS "Modèles" @@ -641,7 +637,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nJournaux et Impr. écran désactivé" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Journaux et" LCDW_128_480_LINEBREAK "Impr. écran désactivé" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Journaux et" LCDW_128_LINEBREAK "Impr. écran désactivé" #endif #define TR_NEEDS_FILE "FICHIER EXIGE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -673,7 +669,6 @@ #define TR_CPU_TEMP "Temp. CPU\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "Temp. CM \016>" -#define TR_TEMPWARNING INDENT "Surchauffe" #define TR_TTL_WARNING "Attention: Ne pas excéder 3.3V aux pins TX/RX !" #define TR_FUNC "Fonction" #define TR_V1 "V1" @@ -749,11 +744,10 @@ #define TR_BLUETOOTH_MODES "---","Télémétrie","Écolage" #endif #define TR_SD_INFO_TITLE "INFO SD" -#define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Vitesse:" #define TR_SD_SECTORS "Secteurs:" #define TR_SD_SIZE "Taille:" -#define TR_TYPE INDENT "Type" +#define TR_TYPE "Type" #define TR_GLOBAL_VARS "Variables Globales" #define TR_GVARS "V. GLOBALES" #define TR_GLOBAL_VAR "Variable globale" @@ -801,7 +795,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Autres options disponibles" #define TR_NO_MODULE_INFORMATION "Pas d'info Module" #define TR_EXTERNALRF "HF externe" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Type failsafe") +#define TR_FAILSAFE TR("Failsafe", "Type failsafe") #define TR_FAILSAFESET "RÉGLAGES FAILSAFE" #define TR_REG_ID TR("ID Enr.", "ID Enregistr.") #define TR_OWNER_ID "ID Radio" @@ -885,7 +879,7 @@ #define TR_SET BUTTON("Déf") #define TR_TRAINER "Écolage" #define TR_CHANS "Aléat." -#define TR_ANTENNAPROBLEM CENTER "Antenne radio défect.!" +#define TR_ANTENNAPROBLEM "Antenne radio défect.!" #define TR_MODELIDUSED TR("ID affecté à :", "No de récepteur utilisé par :") #define TR_MODELIDUNIQUE "ID est unique" #define TR_MODULE "Module" @@ -900,8 +894,8 @@ #define TR_DISABLE "Désactiver" #define TR_TOPLCDTIMER "Chrono LCD haut" #define TR_UNIT "Unité" -#define TR_TELEMETRY_NEWSENSOR TR(INDENT"Nouveau capteur...", INDENT "Ajouter nouveau") -#define TR_CHANNELRANGE TR(INDENT "Canaux", INDENT "Plage de canaux") +#define TR_TELEMETRY_NEWSENSOR TR("Nouveau capteur...", "Ajouter nouveau") +#define TR_CHANNELRANGE TR("Canaux", "Plage de canaux") #define TR_AFHDS3_RX_FREQ TR("RX freq.", "Fréquence RX") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetrie") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -920,9 +914,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Nécessite FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Nécessite EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "R9M non certifié" -#define TR_LOWALARM INDENT "Alarme basse" -#define TR_CRITICALALARM INDENT "Alarme critique" -#define TR_DISABLE_ALARM TR(INDENT "Désact. alarme", INDENT "Désact. alarme télém.") +#define TR_LOWALARM "Alarme basse" +#define TR_CRITICALALARM "Alarme critique" +#define TR_DISABLE_ALARM TR("Désact. alarme", "Désact. alarme télém.") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -945,8 +939,8 @@ #define TR_CONSTANT "Constante" #define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Vérifs avant vol" -#define TR_CHECKLIST TR(INDENT "checklist", INDENT "Afficher checklist") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("checklist", "Afficher checklist") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Port série" #define TR_AUX2_SERIAL_MODE "Port série 2" #define TR_AUX_SERIAL_PORT_POWER "Port power" @@ -1106,7 +1100,7 @@ #define TR_UNSUPPORTED_RX "RX non supporté" #define TR_OTA_UPDATE_ERROR "Erreur màj OTA" #define TR_DEVICE_RESET "RAZ Périphérique..." -#define TR_ALTITUDE INDENT "Altitude" +#define TR_ALTITUDE "Altitude" #define TR_SCALE "Échelle" #define TR_VIEW_CHANNELS "Voir voies" #define TR_VIEW_NOTES "Voir notes" @@ -1128,13 +1122,12 @@ #define TR_ONLYPOSITIVE "Positif" #define TR_FILTER "Filtre" #define TR_TELEMETRYFULL "Plus de capteurs libres!" -#define TR_INVERTED_SERIAL INDENT "Inversé" -#define TR_IGNORE_INSTANCE TR(INDENT "Ign. inst", INDENT "Ignorer instance") +#define TR_IGNORE_INSTANCE TR("Ign. inst", "Ignorer instance") #define TR_SHOW_INSTANCE_ID "Voir instance ID" #define TR_DISCOVER_SENSORS "Découvrir capteurs" #define TR_STOP_DISCOVER_SENSORS "Terminer découverte" #define TR_DELETE_ALL_SENSORS TR("Suppr. tous capteurs", "Suppr. tous capteurs") -#define TR_CONFIRMDELETE TR("Tout effacer?", "Vraiment tout " LCDW_128_480_LINEBREAK "effacer ?") +#define TR_CONFIRMDELETE TR("Tout effacer?", "Vraiment tout " LCDW_128_LINEBREAK "effacer ?") #define TR_SELECT_WIDGET "Sélection widget" #define TR_WIDGET_FULLSCREEN "Plein Écran" #define TR_REMOVE_WIDGET "Supprimer widget" @@ -1146,12 +1139,7 @@ #define TR_SETUP "Configuration" #define TR_LAYOUT "Disposition" #define TR_ADD_MAIN_VIEW "Ajout. vue principale" -#define TR_BACKGROUND_COLOR "Couleur de fond" -#define TR_MAIN_COLOR "Couleur principale" -#define TR_BAR2_COLOR "Couleur barre second." -#define TR_BAR1_COLOR "Couleur barre principale" #define TR_TEXT_COLOR "Couleur Texte" -#define TR_TEXT_VIEWER "Visualisateur de texte" #define TR_MENU_INPUTS STR_CHAR_INPUT "Entrées" #define TR_MENU_LUA STR_CHAR_LUA "Scripts Lua" diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 8800b9c6c6e..bc9ef8cf349 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -63,7 +63,7 @@ #define TR_MULTI_CUSTOM "עיצוב מיוחד" #define TR_VTRIMINC TR("Expo","הולך ומתעצם"),TR("ExFine","זז ב-1"),"זז ב-2","זז ב-3","זז ב-6" #define TR_VDISPLAYTRIMS "אל תציג","הצג שינוי בלבד","הצג" -#define TR_VBEEPCOUNTDOWN "שקט","ציפצופים","שמע","לחן",TR2_2("B & H","Beeps & Haptic"),TR2_2("V & H","Voice & Haptic") +#define TR_VBEEPCOUNTDOWN "שקט","ציפצופים","שמע","לחן",TR("B & H","Beeps & Haptic"),TR("V & H","Voice & Haptic") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tone","Silent" #define TR_CURVE_TYPES "סטנדרטי","עיצוב מיוחד" @@ -282,9 +282,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "ציפצוף במרכז") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "שימוש בפונקציות גלובליות") #define TR_PROTOCOL TR("Proto", "Protocol") -#define TR_PPMFRAME INDENT "PPM frame" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Warning: output level is VBAT: ") +#define TR_PPMFRAME "PPM frame" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "Warning: output level is VBAT: ") #define TR_WARN_5VOLTS "Warning: output level is 5 volts" #define TR_MS "ms" #define TR_SWITCH "מתג" @@ -297,9 +297,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012trims" + #define TR_CHECKTRIMS "\006Check\012trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swash Type" #define TR_COLLECTIVE TR("Collective", "Coll. pitch source") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. source") @@ -311,7 +310,7 @@ #else #define TR_LEFT_STICK "Left" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_SOURCE "מקור" @@ -339,8 +338,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "טווח" -#define TR_CENTER INDENT "מרכז" +#define TR_RANGE "טווח" +#define TR_CENTER "מרכז" #define TR_ALARM "התראה" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "Screen\001" @@ -374,27 +373,25 @@ #define TR_THROTTLE_START "מצערת מתחילה" #define TR_THROTTLEREVERSE TR("T-Reverse", "היפוך") #define TR_MINUTEBEEP TR("דקה", "הקראת דקות") -#define TR_BEEPCOUNTDOWN INDENT "ספירה לאחור" -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") +#define TR_BEEPCOUNTDOWN "ספירה לאחור" +#define TR_PERSISTENT TR("Persist.", "Persistent") #define TR_BACKLIGHT_LABEL "תאורת רקע" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "סטטוס" -#define TR_BLDELAY INDENT "Duration" -#define TR_BLONBRIGHTNESS INDENT "בהירות פעילה" -#define TR_BLOFFBRIGHTNESS INDENT "בהירות כבויה" +#define TR_BLONBRIGHTNESS "בהירות פעילה" +#define TR_BLOFFBRIGHTNESS "בהירות כבויה" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "צבע" #define TR_SPLASHSCREEN "Splash screen" #define TR_PLAY_HELLO "צליל אתחול" #define TR_PWR_ON_DELAY "השהיית הפעלה פעיל" #define TR_PWR_OFF_DELAY "משך לחיצה לכיבוי השלט" -#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "התראת מצערת פתוחה") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "עריכת מיקום ידנית") +#define TR_THROTTLE_WARNING TR("T-Warning", "התראת מצערת פתוחה") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "עריכת מיקום ידנית") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "מיקום מתגים") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "סליידרים וגלגלות") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Pot warn.", INDENT "Pot positions") +#define TR_SWITCHWARNING TR("S-Warning", "מיקום מתגים") +#define TR_POTWARNINGSTATE "סליידרים וגלגלות" +#define TR_POTWARNING TR("Pot warn.", "Pot positions") #define TR_TIMEZONE "אזור זמן" #define TR_ADJUST_RTC "Adjust RTC" #define TR_GPS "GPS" @@ -403,7 +400,7 @@ #define TR_POTS "גלגלות" #define TR_SWITCHES "מתגים" #define TR_SWITCHES_DELAY TR("Play delay", "השהיית השמעת מתג") -#define TR_SLAVE CENTER "Slave" +#define TR_SLAVE "Slave" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Cal" @@ -419,14 +416,14 @@ #define TR_SETMIDPOINT "CENTER STICKS/SLIDERS" #define TR_MOVESTICKSPOTS "MOVE STICKS/POTS" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" - #define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT", CENTER "\004CENTER STICKS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" + #define TR_MENUTOSTART TR_ENTER " TO START" + #define TR_SETMIDPOINT TR("SET STICKS MIDPOINT", "CENTER STICKS/SLIDERS") + #define TR_MOVESTICKSPOTS "MOVE STICKS/POTS" + #define TR_MENUWHENDONE TR_ENTER " WHEN DONE" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -528,13 +525,12 @@ #define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") #define TR_MULTI_OPTION TR("Option", "Option value") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.", INDENT "צימוד על ערוץ") +#define TR_MULTI_AUTOBIND TR("Bind Ch.", "צימוד על ערוץ") #define TR_DISABLE_CH_MAP TR("No Ch. map", "השבתת מיפוי ערוצים") #define TR_DISABLE_TELEM TR("No Telem", "השבתת טלמטריה") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "מצב מתח נמוך") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "מצב מתח נמוך") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Disable int.", "Disable internal RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -552,8 +548,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "גרסאת מולטי פרוטוקול") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "גרסאת מולטי פרוטוקול") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -570,7 +566,7 @@ #define TR_REPEAT_AT_ZERO "השהיית התראה" #define TR_BATT_CALIB TR("Batt. calib", "כיול מתח סוללה ידני") #define TR_CURRENT_CALIB "Current calib" -#define TR_VOLTAGE TR(INDENT "Voltage", INDENT "Voltage source") +#define TR_VOLTAGE TR("Voltage", "Voltage source") #define TR_SELECT_MODEL "בחירת מודל" #define TR_MANAGE_MODELS "ניהול מודלים" #define TR_MODELS "מודלים" @@ -641,7 +637,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\לוגים ושמירת צילומי מסך מושבתים" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036לוגים" LCDW_128_480_LINEBREAK "ושמירת צילומי מסך מושבתים" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036לוגים" LCDW_128_LINEBREAK "ושמירת צילומי מסך מושבתים" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -673,7 +669,6 @@ #define TR_CPU_TEMP "CPU temp." #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp." -#define TR_TEMPWARNING INDENT "Overheat" #define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!" #define TR_FUNC "Function" #define TR_V1 "V1" @@ -750,11 +745,10 @@ #endif #define TR_SD_INFO_TITLE "מידע כרטיס" -#define TR_SD_TYPE ":סוג" #define TR_SD_SPEED ":מהירות" #define TR_SD_SECTORS ":סקטורים" #define TR_SD_SIZE ":גודל" -#define TR_TYPE INDENT "סוג" +#define TR_TYPE "סוג" #define TR_GLOBAL_VARS "משתנים גלובלים" #define TR_GVARS "GVARS" #define TR_GLOBAL_VAR "משתנה גלובלי" @@ -802,7 +796,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "מודול חיצוני" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "הגדרת כשל קליטה") +#define TR_FAILSAFE TR("Failsafe", "הגדרת כשל קליטה") #define TR_FAILSAFESET "הגדרת כשל קליטה" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" @@ -886,7 +880,7 @@ #define TR_SET BUTTON("הגדר") #define TR_TRAINER "טריינר" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX antenna problem!" +#define TR_ANTENNAPROBLEM "TX antenna problem!" #define TR_MODELIDUSED "מספר המקלט בשימוש במודל:" #define TR_MODELIDUNIQUE "מספר המקלט פנוי לשימוש" #define TR_MODULE "מודל" @@ -901,8 +895,8 @@ #define TR_DISABLE "אל תאפשר" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "יחידה" -#define TR_TELEMETRY_NEWSENSOR INDENT "הוסף חדש" -#define TR_CHANNELRANGE TR(INDENT "Ch. Range", INDENT "טווח ערוצים") +#define TR_TELEMETRY_NEWSENSOR "הוסף חדש" +#define TR_CHANNELRANGE TR("Ch. Range", "טווח ערוצים") #define TR_ANTENNACONFIRM1 "EXT. ANTENNA" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Internal","Ask","Per model","Internal + External" @@ -916,9 +910,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requires FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requires EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "התראה נמוכה" -#define TR_CRITICALALARM INDENT "התראה קריטית" -#define TR_DISABLE_ALARM TR(INDENT "ביטול התראות", INDENT "ביטול התראות טלמטריה") +#define TR_LOWALARM "התראה נמוכה" +#define TR_CRITICALALARM "התראה קריטית" +#define TR_DISABLE_ALARM TR("ביטול התראות", "ביטול התראות טלמטריה") #define TR_POPUP "התראות" #define TR_MIN "מינימום" #define TR_MAX "מקסימום" @@ -941,8 +935,8 @@ #define TR_CONSTANT "Constant" #define TR_PREFLIGHT_POTSLIDER_CHECK "כבוי","פועל","אוטומטי" #define TR_PREFLIGHT "מצב הביקורת לשלט" -#define TR_CHECKLIST TR(INDENT "Checklist", INDENT "הצג מצב מערכת") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("Checklist", "הצג מצב מערכת") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "חיבור פנימי נוסף" #define TR_AUX2_SERIAL_MODE "חיבור פנימי נוסף 2" #define TR_AUX_SERIAL_PORT_POWER "הפעלת מתח בחיבור" @@ -1094,7 +1088,7 @@ #define TR_UNSUPPORTED_RX "Unsupported RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Altitude" +#define TR_ALTITUDE "Altitude" #define TR_SCALE "מד" #define TR_VIEW_CHANNELS "הצג ערוצים" #define TR_VIEW_NOTES "הצג פתקים" @@ -1116,13 +1110,12 @@ #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL TR("All slots full!", "All telemetry slots full!") -#define TR_INVERTED_SERIAL INDENT "היפוך" -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignore instances") +#define TR_IGNORE_INSTANCE TR("No inst.", "Ignore instances") #define TR_SHOW_INSTANCE_ID "הצג מזהה" #define TR_DISCOVER_SENSORS "גלה הכל" #define TR_STOP_DISCOVER_SENSORS "עצור" #define TR_DELETE_ALL_SENSORS "מחק הכל" -#define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "? למחוק הכל" +#define TR_CONFIRMDELETE "Really " LCDW_128_LINEBREAK "? למחוק הכל" #define TR_SELECT_WIDGET "בחירת וידג'ט" #define TR_WIDGET_FULLSCREEN "מסך מלא" #define TR_REMOVE_WIDGET "הסרת וידג'ט" @@ -1134,12 +1127,7 @@ #define TR_SETUP "להגדיר" #define TR_LAYOUT "תצוגת מסך" #define TR_ADD_MAIN_VIEW "הוסף מסך תצוגה נוסף" -#define TR_BACKGROUND_COLOR "צבע רקע" -#define TR_MAIN_COLOR "צבע ראשי" -#define TR_BAR2_COLOR "צבע בר משני" -#define TR_BAR1_COLOR "צבע בר ראשי" #define TR_TEXT_COLOR "צבע טקסט" -#define TR_TEXT_VIEWER "טקסט הצגה" #define TR_MENU_INPUTS STR_CHAR_INPUT "כניסות" #define TR_MENU_LUA STR_CHAR_LUA "Lua סקריפטים" #define TR_MENU_STICKS STR_CHAR_STICK "סטיקים" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index ae0d5e70924..f566bffef64 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -65,7 +65,7 @@ #define TR_MULTI_CUSTOM "Person." #define TR_VTRIMINC TR("Expo","Esponenziale"),TR("ExFine","Extra Fine"),"Fine","Medio","Ampio" #define TR_VDISPLAYTRIMS "No","Cambio","Si" -#define TR_VBEEPCOUNTDOWN "Niente","Suoni","Voce","Vibra",TR2_2("S & V","Suoni & Vibra"),TR2_2("V & V","Voce & Vibra") +#define TR_VBEEPCOUNTDOWN "Niente","Suoni","Voce","Vibra",TR("S & V","Suoni & Vibra"),TR("V & V","Voce & Vibra") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tono","Silenz." #define TR_CURVE_TYPES "Standard","Personali" @@ -278,9 +278,9 @@ #define TR_BEEPCTR TR("Beep Ctr", "Beep quando centrato") #define TR_USE_GLOBAL_FUNCS TR("Funz. Glob.", "Usa Funz. Globali") #define TR_PROTOCOL TR("Protoc.", "Protocollo") -#define TR_PPMFRAME INDENT "Frame PPM" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Uscita VBAT: ", INDENT "Att.: livel. uscita VBAT: ") +#define TR_PPMFRAME "Frame PPM" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Uscita VBAT: ", "Att.: livel. uscita VBAT: ") #define TR_WARN_5VOLTS "Attenzione: il livello d'uscita è 5 Volts" #define TR_MS "ms" #define TR_SWITCH "Inter." @@ -293,9 +293,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Contr. Trims" #else - #define TR_CHECKTRIMS CENTER "\006Contr.\012Trims" + #define TR_CHECKTRIMS "\006Contr.\012Trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Tipo Ciclico" #define TR_COLLECTIVE TR("Collettivo", "Origine Collettivo") #define TR_AILERON TR("Cic. later.", "Sorg. cic. later.") @@ -307,7 +306,7 @@ #else #define TR_LEFT_STICK "Sx" #endif -#define TR_SUBTYPE INDENT "Sottotipo" +#define TR_SUBTYPE "Sottotipo" #define TR_NOFREEEXPO "Expo pieni!" #define TR_NOFREEMIXER "Mixer pieni!" #define TR_SOURCE "Sorg." @@ -335,8 +334,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE TR(INDENT "Inter.", INDENT "Intervallo") -#define TR_CENTER INDENT "Centro" +#define TR_RANGE TR("Inter.", "Intervallo") +#define TR_CENTER "Centro" #define TR_ALARM TR( "Allar.", "Allarme") #define TR_BLADES "Pale" #define TR_SCREEN "Schermo\001" @@ -355,9 +354,9 @@ #define TR_BATTERYCHARGING "Ricarica..." #define TR_BATTERYFULL "Bat. carica" #define TR_BATTERYNONE "Assente!" -#define TR_BATTERYWARNING TR(INDENT "Avv. Batt.", INDENT "Avviso Batteria") -#define TR_INACTIVITYALARM INDENT "Inattività" -#define TR_MEMORYWARNING TR(INDENT "Avv. Mem.", INDENT "Avviso Memoria") +#define TR_BATTERYWARNING TR("Avv. Batt.", "Avviso Batteria") +#define TR_INACTIVITYALARM "Inattività" +#define TR_MEMORYWARNING TR("Avv. Mem.", "Avviso Memoria") #define TR_ALARMWARNING "Suono spento" #define TR_RSSI_SHUTDOWN_ALARM TR("RSSI spento", "controlla RSSI spegnendo") #define TR_TRAINER_SHUTDOWN_ALARM TR("Spegnimento Trainer", "Controllo trainer allo spegnimento") @@ -370,27 +369,25 @@ #define TR_THROTTLE_START "Partenza motore" #define TR_THROTTLEREVERSE TR("T-Invertito", "Invertito") #define TR_MINUTEBEEP TR("Minuto", "Minuto call") -#define TR_BEEPCOUNTDOWN TR(INDENT "Conto rov", INDENT "Conto rovescia") -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistente") +#define TR_BEEPCOUNTDOWN TR("Conto rov", "Conto rovescia") +#define TR_PERSISTENT TR("Persist.", "Persistente") #define TR_BACKLIGHT_LABEL TR("Retroillu.", "Retroilluminazione") #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Stato" -#define TR_BLDELAY INDENT "Durata" -#define TR_BLONBRIGHTNESS TR(INDENT "Lumin. ON", INDENT "Luminosità ON") -#define TR_BLOFFBRIGHTNESS TR(INDENT "Lumin. OFF", INDENT "Luminosità OFF") +#define TR_BLONBRIGHTNESS "Luminosità ON" +#define TR_BLOFFBRIGHTNESS "Luminosità OFF" #define TR_KEYS_BACKLIGHT "Luce tasti" #define TR_BLCOLOR "Colore" #define TR_SPLASHSCREEN TR("Sch. avvio", "Schermata d'avvio") #define TR_PLAY_HELLO "Suono all'accensione" #define TR_PWR_ON_DELAY "Rit. accens." #define TR_PWR_OFF_DELAY "Rit. spegni." -#define TR_THROTTLE_WARNING TR(INDENT "All. Mot.", INDENT "Allarme Motore") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("All. Mot.", "Allarme Motore") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Avv. Int.", INDENT "Avviso Interr.") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Pos. slid.", INDENT "Posizione slider") -#define TR_POTWARNING TR(INDENT "Avv. Pot.", INDENT "Avviso Pot.") +#define TR_SWITCHWARNING TR("Avv. Int.", "Avviso Interr.") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Avv. Pot.", "Avviso Pot.") #define TR_TIMEZONE "Ora locale" #define TR_ADJUST_RTC TR("Agg. RTC", "Aggiusta RTC") #define TR_GPS "GPS" @@ -415,14 +412,14 @@ #define TR_SETMIDPOINT "CENTRA STICKS/SLIDERS" #define TR_MOVESTICKSPOTS "MUOVI STICKS/POTS" #else - #define TR_MENUTOSTART CENTER"\011" TR_ENTER "PER START" - #define TR_SETMIDPOINT TR(CENTER "\004CENTRA STICKS A META'", CENTER "\004CENTRA STICKS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER"\010MUOVI STICK/POT" - #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " PER FINIRE" + #define TR_MENUTOSTART TR_ENTER "PER START" + #define TR_SETMIDPOINT TR("CENTRA STICKS A META'", "CENTRA STICKS/SLIDERS") + #define TR_MOVESTICKSPOTS "MUOVI STICK/POT" + #define TR_MENUWHENDONE TR_ENTER " PER FINIRE" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER"DATI ASSENTI" +#define TR_NODATA "DATI ASSENTI" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -521,15 +518,14 @@ #define TR_MULTI_TELEMETRY "Telemetria" #define TR_MULTI_VIDFREQ TR("Freq. video", "Frequenza video") #define TR_RF_POWER "Potenza RF" -#define TR_MULTI_FIXEDID TR(INDENT"ID fisso", INDENT"ID Fisso") -#define TR_MULTI_OPTION TR(INDENT"Opzione", INDENT"Opzione valore") -#define TR_MULTI_AUTOBIND TR(INDENT "Ass. Ch.",INDENT "Associa al canale") +#define TR_MULTI_FIXEDID TR("ID fisso", "ID Fisso") +#define TR_MULTI_OPTION TR("Opzione", "Opzione valore") +#define TR_MULTI_AUTOBIND TR("Ass. Ch.","Associa al canale") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disab. mappa Ch.") #define TR_DISABLE_TELEM TR("No Telem", "Telem. disabil.") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Rileva", INDENT "Rileva il formato") -#define TR_MULTI_LOWPOWER TR(INDENT "Bassa pot.", INDENT "Modo bassa potenza") -#define TR_MULTI_LNA_DISABLE INDENT "Disabilita LNA" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "Link S.Port") +#define TR_MULTI_LOWPOWER TR("Bassa pot.", "Modo bassa potenza") +#define TR_MULTI_LNA_DISABLE "Disabilita LNA" +#define TR_MODULE_TELEMETRY TR("S.Port", "Link S.Port") #define TR_MODULE_TELEM_ON TR("ON", "Abilitato") #define TR_DISABLE_INTERNAL TR("Disatt. RF int.", "Disattiva RF interna") #define TR_MODULE_NO_SERIAL_MODE TR("!modo seriale", "Non in modo seriale") @@ -547,8 +543,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalido", "Protocollo invalido") -#define TR_MODULE_STATUS TR(INDENT "Stato", INDENT "Stato del modulo") -#define TR_MODULE_SYNC TR(INDENT "Sinc.", INDENT "Sinc. del modulo") +#define TR_MODULE_STATUS TR("Stato", "Stato del modulo") +#define TR_MODULE_SYNC TR("Sinc.", "Sinc. del modulo") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Aggiorna servo rate") #define TR_MULTI_MAX_THROW TR("Escurs. mass.", "Abilita escurs. mass.") #define TR_MULTI_RFCHAN TR("Canale RF", "Selez. canale RF") @@ -565,7 +561,7 @@ #define TR_REPEAT_AT_ZERO "Ripeti a Zero" #define TR_BATT_CALIB TR("Calibra batt.", "Calibra batteria") #define TR_CURRENT_CALIB "Calibrazione" -#define TR_VOLTAGE TR(INDENT "Voltagg.",INDENT "Voltaggio") +#define TR_VOLTAGE TR("Voltagg.","Voltaggio") #define TR_SELECT_MODEL "Scegli Modello" #define TR_MANAGE_MODELS "GESTIONE MODELLI" #define TR_MODELS "Modelli" @@ -636,7 +632,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs e Screenshots disattivati" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs e Screenshots" LCDW_128_480_LINEBREAK "disattivati" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs e Screenshots" LCDW_128_LINEBREAK "disattivati" #endif #define TR_NEEDS_FILE "RICHIEDE FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -668,7 +664,6 @@ #define TR_CPU_TEMP "Temp CPU \016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "Temp. MB \016>" -#define TR_TEMPWARNING INDENT "Temp. Alta" #define TR_TTL_WARNING "Attenzione: non superare 3.3V sui TX/RX pins!" #define TR_FUNC "Funzione" #define TR_V1 "V1" @@ -745,11 +740,10 @@ #endif #define TR_SD_INFO_TITLE "INFO SD" -#define TR_SD_TYPE "Tipo:" #define TR_SD_SPEED "Veloc.:" #define TR_SD_SECTORS "Settori:" #define TR_SD_SIZE "Dimens:" -#define TR_TYPE INDENT "Tipo" +#define TR_TYPE "Tipo" #define TR_GLOBAL_VARS "Variabili Globali" #define TR_GVARS "V.GLOBALI" #define TR_GLOBAL_VAR "Variabile globale" @@ -785,7 +779,7 @@ #define TR_FLASH_EXTERNAL_MODULE TR("Prog. modulo est.", "Programma modulo esterno") #define TR_FLASH_INTERNAL_MULTI TR("Prog. MULTI int.", "Programma MULTI interno") #define TR_FLASH_EXTERNAL_MULTI TR("Prog. MULTI est.", "Programma MULTI esterno") -#define TR_FIRMWARE_UPDATE_ERROR TR(INDENT "Errore agg. FW",INDENT "Errore aggiornamento firmware") +#define TR_FIRMWARE_UPDATE_ERROR TR( "Errore agg. FW","Errore aggiornamento firmware") #define TR_FIRMWARE_UPDATE_SUCCESS "Flash riuscito" #define TR_WRITING "Scrittura..." #define TR_CONFIRM_FORMAT "Confermi formattazione?" @@ -797,8 +791,8 @@ #define TR_MORE_OPTIONS_AVAILABLE "Altre opzioni assenti" #define TR_NO_MODULE_INFORMATION "Nessuna info del modulo" #define TR_EXTERNALRF "Modulo esterno" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Modo failsafe") -#define TR_FAILSAFESET TR(INDENT "FAILSAFE", INDENT "IMPOSTAZIONI FAILSAFE") +#define TR_FAILSAFE TR("Failsafe", "Modo failsafe") +#define TR_FAILSAFESET TR("FAILSAFE", "IMPOSTAZIONI FAILSAFE") #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" #define TR_HOLD "Hold" @@ -881,7 +875,7 @@ #define TR_SET BUTTON("Set") #define TR_TRAINER TR("Trainer", "Maestro/Allievo") #define TR_CHANS "Canali" -#define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!" +#define TR_ANTENNAPROBLEM "Problemi antenna TX!" #define TR_MODELIDUSED "ID usato su:" #define TR_MODELIDUNIQUE "ID è unico" #define TR_MODULE "Modulo" @@ -896,8 +890,8 @@ #define TR_DISABLE "Disabilita" #define TR_TOPLCDTIMER "Timer LCD Su" #define TR_UNIT "Unità" -#define TR_TELEMETRY_NEWSENSOR INDENT "Aggiungi sensore" -#define TR_CHANNELRANGE TR(INDENT "Num Canali", INDENT "Numero Canali") +#define TR_TELEMETRY_NEWSENSOR "Aggiungi sensore" +#define TR_CHANNELRANGE TR("Num Canali", "Numero Canali") #define TR_ANTENNACONFIRM1 "ANTENNA EST." #if defined(PCBX12S) #define TR_ANTENNA_MODES "Interna","Chiedi","Per modello","Intern + Esterno" @@ -911,9 +905,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Richiede FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Richiede EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "firmware certificato" -#define TR_LOWALARM INDENT "Allarme Basso" -#define TR_CRITICALALARM INDENT "Allarme Critico" -#define TR_DISABLE_ALARM TR(INDENT "Allarmi disab.", INDENT "Allarmi telemetrici disabilitati") +#define TR_LOWALARM "Allarme Basso" +#define TR_CRITICALALARM "Allarme Critico" +#define TR_DISABLE_ALARM TR("Allarmi disab.", "Allarmi telemetrici disabilitati") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -927,17 +921,17 @@ #define TR_PT "pt" #define TR_PTS "pti" #define TR_SMOOTH "Smussa" -#define TR_COPY_STICKS_TO_OFS TR(INDENT "Cp. stick->subtrim", INDENT "Copia Sticks su Subtrim") +#define TR_COPY_STICKS_TO_OFS TR("Cp. stick->subtrim", "Copia Sticks su Subtrim") #define TR_COPY_MIN_MAX_TO_OUTPUTS TR("Cp. min/max a tutti", "Copia min/max/centro a tutte le uscite") -#define TR_COPY_TRIMS_TO_OFS TR(INDENT "Cp. trim->subtrim", INDENT "Copia Trims su Subtrim") +#define TR_COPY_TRIMS_TO_OFS TR("Cp. trim->subtrim", "Copia Trims su Subtrim") #define TR_INCDEC "Inc/Decrementa" #define TR_GLOBALVAR "Var Globale" #define TR_MIXSOURCE "Sorgente Mixer" #define TR_CONSTANT "Constante" #define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Controlli Prevolo" -#define TR_CHECKLIST INDENT "Mostra Checklist" -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "Interatt-C", INDENT "Interact. checklist", INDENT "Checklist interattiva") +#define TR_CHECKLIST "Mostra Checklist" +#define TR_CHECKLIST_INTERACTIVE TR3("Interatt-C", "Interact. checklist", "Checklist interattiva") #define TR_AUX_SERIAL_MODE "Porta Seriale" #define TR_AUX2_SERIAL_MODE "Porta Seriale 2" #define TR_AUX_SERIAL_PORT_POWER "Potenza porta AUX" @@ -1089,7 +1083,7 @@ #define TR_UNSUPPORTED_RX "RX non compatibile" #define TR_OTA_UPDATE_ERROR "Errore agg. OTA" #define TR_DEVICE_RESET "Resetto dispositivo..." -#define TR_ALTITUDE INDENT "Altitudine" +#define TR_ALTITUDE "Altitudine" #define TR_SCALE "Scala" #define TR_VIEW_CHANNELS "Vedi Canali" #define TR_VIEW_NOTES "Vedi Note" @@ -1111,13 +1105,12 @@ #define TR_ONLYPOSITIVE "Positivo" #define TR_FILTER "Filtro" #define TR_TELEMETRYFULL "Tutti gli slot sono pieni!" -#define TR_INVERTED_SERIAL INDENT "Invert." -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignora instanza") +#define TR_IGNORE_INSTANCE TR("No inst.", "Ignora instanza") #define TR_SHOW_INSTANCE_ID "Mostra ID dell'istanza" #define TR_DISCOVER_SENSORS "Cerca nuovi sensori" #define TR_STOP_DISCOVER_SENSORS "Ferma ricerca" #define TR_DELETE_ALL_SENSORS "Elimina tutti i sensori" -#define TR_CONFIRMDELETE "Confermi " LCDW_128_480_LINEBREAK "eliminazione?" +#define TR_CONFIRMDELETE "Confermi " LCDW_128_LINEBREAK "eliminazione?" #define TR_SELECT_WIDGET "Seleziona widget" #define TR_WIDGET_FULLSCREEN "Schermo intero" #define TR_REMOVE_WIDGET "Rimuovi widget" @@ -1129,12 +1122,7 @@ #define TR_SETUP "Imposta" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Aggiungi vista princ." -#define TR_BACKGROUND_COLOR "Colore background" -#define TR_MAIN_COLOR "Colore principale" -#define TR_BAR2_COLOR "Barra colore secondaria" -#define TR_BAR1_COLOR "Barra colore primaria" #define TR_TEXT_COLOR "Colore testo" -#define TR_TEXT_VIEWER "Visualizzatore testi" #define TR_MENU_INPUTS STR_CHAR_INPUT "Ingressi" #define TR_MENU_LUA STR_CHAR_LUA "Lua scripts" #define TR_MENU_STICKS STR_CHAR_STICK "Sticks" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 134c97e35e6..7ddebe9d180 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -60,7 +60,7 @@ #define TR_MULTI_CUSTOM "カスタム" #define TR_VTRIMINC "ステップExpo","ステップ微小","ステップ小","ステップ中","ステップ大" #define TR_VDISPLAYTRIMS "非表示","変更時","常時表示" -#define TR_VBEEPCOUNTDOWN "消音","ビープ","音声","バイブレート",TR2_2("B & H","ビープ & バイブ"),TR("V & H","音声 & バイブ") +#define TR_VBEEPCOUNTDOWN "消音","ビープ","音声","バイブレート",TR("B & H","ビープ & バイブ"),TR("V & H","音声 & バイブ") #define TR_COUNTDOWNVALUES "5秒","10秒","20秒","30秒" #define TR_VVARIOCENTER "トーン","消音" #define TR_CURVE_TYPES "スタンダード","カスタム" @@ -277,9 +277,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "中央値でビープ") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "グローバルFuncs利用") #define TR_PROTOCOL TR("Proto", "プロトコル") -#define TR_PPMFRAME INDENT "PPMフレーム" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "リフレッシュレート") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "警告: 出力レベル VBAT: ") +#define TR_PPMFRAME "PPMフレーム" +#define TR_REFRESHRATE TR("Refresh", "リフレッシュレート") +#define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "警告: 出力レベル VBAT: ") #define TR_WARN_5VOLTS "警告: 出力レベル 5V" #define TR_MS "ms" #define TR_SWITCH "スイッチ" @@ -292,9 +292,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "現在の飛行モードのトリムをチェック" #else - #define TR_CHECKTRIMS CENTER "\006チェック\012トリム" + #define TR_CHECKTRIMS "\006チェック\012トリム" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "スワッシュタイプ" #define TR_COLLECTIVE TR("Collective", "Coll. pitch ソース") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. ソース") @@ -306,7 +305,7 @@ #else #define TR_LEFT_STICK "左スティック" #endif -#define TR_SUBTYPE INDENT "サブタイプ" +#define TR_SUBTYPE "サブタイプ" #define TR_NOFREEEXPO "Expoが未設定です!!" #define TR_NOFREEMIXER "ミキサーが未設定です!!" #define TR_SOURCE "ソース" @@ -334,8 +333,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "範囲" -#define TR_CENTER INDENT "中央値" +#define TR_RANGE "範囲" +#define TR_CENTER "中央値" #define TR_ALARM "アラーム" #define TR_BLADES "ブレード/ポール" #define TR_SCREEN "スクリーン\001" @@ -369,27 +368,25 @@ #define TR_THROTTLE_START "Throttle アップ" #define TR_THROTTLEREVERSE TR("T-Reverse", "リバース") #define TR_MINUTEBEEP TR("Minute", "分単位コール") -#define TR_BEEPCOUNTDOWN INDENT "カウントダウン" -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "持続設定") +#define TR_BEEPCOUNTDOWN "カウントダウン" +#define TR_PERSISTENT TR("Persist.", "持続設定") #define TR_BACKLIGHT_LABEL "バックライト" #define TR_GHOST_MENU_LABEL "GHOSTメニュー" #define TR_STATUS "ステータス" -#define TR_BLDELAY INDENT "持続時間" -#define TR_BLONBRIGHTNESS INDENT "バックライトON" -#define TR_BLOFFBRIGHTNESS INDENT "バックライトOFF" +#define TR_BLONBRIGHTNESS "バックライトON" +#define TR_BLOFFBRIGHTNESS "バックライトOFF" #define TR_KEYS_BACKLIGHT "キー バックライト" #define TR_BLCOLOR "カラー" #define TR_SPLASHSCREEN "起動イメージ" #define TR_PLAY_HELLO "起動時サウンド" #define TR_PWR_ON_DELAY "電源ON遅延" #define TR_PWR_OFF_DELAY "電源OFF遅延" -#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "Throttle状態") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "カスタム位置？") +#define TR_THROTTLE_WARNING TR("T-Warning", "Throttle状態") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "カスタム位置？") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "位置 %") -#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "スイッチ位置") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "ダイヤル&スライダー") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "スライダー位置") -#define TR_POTWARNING TR(INDENT "Pot warn.", INDENT "ダイヤル位置") +#define TR_SWITCHWARNING TR("S-Warning", "スイッチ位置") +#define TR_POTWARNINGSTATE "ダイヤル&スライダー" +#define TR_POTWARNING TR("Pot warn.", "ダイヤル位置") #define TR_TIMEZONE "タイムゾーン" #define TR_ADJUST_RTC "時計の修正" #define TR_GPS "GPS" @@ -398,7 +395,7 @@ #define TR_POTS "ダイヤル" #define TR_SWITCHES "スイッチ" #define TR_SWITCHES_DELAY TR("Play delay", "遅延(スイッチ位置)") -#define TR_SLAVE CENTER "スレーブ" +#define TR_SLAVE "スレーブ" #define TR_MODESRC "モード\006% ソース" #define TR_MULTIPLIER "倍率" #define TR_CAL "設定" @@ -414,19 +411,19 @@ #define TR_SETMIDPOINT "スティック/スライダーを中央に合わせます" #define TR_MOVESTICKSPOTS "スティック/スライダーを動かします" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START" + #define TR_MENUTOSTART TR_ENTER " TO START" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006SET POTS MIDPOINT" - #define TR_MOVESTICKSPOTS CENTER "\002MOVE ST/TH/POTS/AXIS" + #define TR_SETMIDPOINT "SET POTS MIDPOINT" + #define TR_MOVESTICKSPOTS "MOVE ST/TH/POTS/AXIS" #else - #define TR_SETMIDPOINT TR(CENTER "\006SET AXIS MIDPOINT", CENTER "\004CENTER AXIS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\007MOVE AXIS/POTS" + #define TR_SETMIDPOINT TR("SET AXIS MIDPOINT", "CENTER AXIS/SLIDERS") + #define TR_MOVESTICKSPOTS "MOVE AXIS/POTS" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" + #define TR_MENUWHENDONE TR_ENTER " WHEN DONE" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -528,13 +525,12 @@ #define TR_RF_POWER "送信出力" #define TR_MULTI_FIXEDID TR("FixedID", "固定ID") #define TR_MULTI_OPTION TR("Option", "オプション値") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.", INDENT "チャンネルバインド") +#define TR_MULTI_AUTOBIND TR("Bind Ch.", "チャンネルバインド") #define TR_DISABLE_CH_MAP TR("No Ch. map", "CHマップ無効") #define TR_DISABLE_TELEM TR("No Telem", "テレメトリー無効") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "自動検出") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "低出力モード") -#define TR_MULTI_LNA_DISABLE INDENT "LNA無効" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Portリンク") +#define TR_MULTI_LOWPOWER TR("Low power", "低出力モード") +#define TR_MULTI_LNA_DISABLE "LNA無効" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Portリンク") #define TR_MODULE_TELEM_ON TR("ON", "有効") #define TR_DISABLE_INTERNAL TR("Disable int.", "内部モジュール無効") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "非シリアルモード") @@ -552,8 +548,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telemetry ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telemetry OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "プロトコル無効") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "モジュールの状態") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "同期ステータス") +#define TR_MODULE_STATUS TR("Status", "モジュールの状態") +#define TR_MODULE_SYNC TR("Sync", "同期ステータス") #define TR_MULTI_SERVOFREQ TR("Servo rate", "サーボ レート") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Max. throw有効") #define TR_MULTI_RFCHAN TR("RF Channel", "送信チャンネル選択") @@ -570,7 +566,7 @@ #define TR_REPEAT_AT_ZERO "ゼロ リピート" #define TR_BATT_CALIB TR("Batt. calib", "バッテリー\nキャリブレーション") #define TR_CURRENT_CALIB "現在のキャリブレーション" -#define TR_VOLTAGE TR(INDENT "Voltage", INDENT "電圧ソース") +#define TR_VOLTAGE TR("Voltage", "電圧ソース") #define TR_SELECT_MODEL "モデル選択" #define TR_MANAGE_MODELS "モデル管理" #define TR_MODELS "モデル" @@ -641,7 +637,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nログとスクリーンショット保存が無効" #else - #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs & Screenshots" LCDW_128_480_LINEBREAK "disabled" + #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs & Screenshots" LCDW_128_LINEBREAK "disabled" #endif #define TR_NEEDS_FILE "を含むファイルが必要です" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -673,7 +669,6 @@ #define TR_CPU_TEMP "CPU温度" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB温度" -#define TR_TEMPWARNING INDENT "オーバーヒートです" #define TR_TTL_WARNING "警告: TX/RXピンは3.3Vを超えてはいけません！" #define TR_FUNC "ファンクション" #define TR_V1 "V1" @@ -750,11 +745,10 @@ #endif #define TR_SD_INFO_TITLE "SDカード詳細" -#define TR_SD_TYPE "タイプ:" #define TR_SD_SPEED "速度:" #define TR_SD_SECTORS "セクタ:" #define TR_SD_SIZE "サイズ:" -#define TR_TYPE INDENT "タイプ" +#define TR_TYPE "タイプ" #define TR_GLOBAL_VARS "グローバル変数" #define TR_GVARS "G変数" #define TR_GLOBAL_VAR "グローバル変数" @@ -802,7 +796,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "その他のオプション" #define TR_NO_MODULE_INFORMATION "モジュール情報なし" #define TR_EXTERNALRF "外部RFモジュール" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafeモード") +#define TR_FAILSAFE TR("Failsafe", "Failsafeモード") #define TR_FAILSAFESET "FAILSAFE設定" #define TR_REG_ID "登録ID" #define TR_OWNER_ID "オーナーID" @@ -886,7 +880,7 @@ #define TR_SET BUTTON("設定") #define TR_TRAINER "トレーナー" #define TR_CHANS "チャンネル" -#define TR_ANTENNAPROBLEM CENTER "送信アンテナに問題があります!!" +#define TR_ANTENNAPROBLEM "送信アンテナに問題があります!!" #define TR_MODELIDUSED "使用するID:" #define TR_MODELIDUNIQUE "IDはユニークです" #define TR_MODULE "モジュール" @@ -901,8 +895,8 @@ #define TR_DISABLE "無効" #define TR_TOPLCDTIMER "上部LCDタイマー" #define TR_UNIT "ユニット" -#define TR_TELEMETRY_NEWSENSOR INDENT "新規追加" -#define TR_CHANNELRANGE TR(INDENT "Ch. Range", INDENT "チャンネル範囲") +#define TR_TELEMETRY_NEWSENSOR "新規追加" +#define TR_CHANNELRANGE TR("Ch. Range", "チャンネル範囲") #define TR_ANTENNACONFIRM1 "外部アンテナ" #if defined(PCBX12S) #define TR_ANTENNA_MODES "内部","確認","モデル毎","内部＋外部" @@ -916,9 +910,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "FCC規格を利用" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "EU規格を利用" #define TR_MODULE_PROTOCOL_WARN_LINE2 "認証ファームウェア" -#define TR_LOWALARM INDENT "微弱時のアラーム" -#define TR_CRITICALALARM INDENT "極微弱警告アラーム" -#define TR_DISABLE_ALARM TR(INDENT "Disable alarms", INDENT "テレメトリーアラーム無効") +#define TR_LOWALARM "微弱時のアラーム" +#define TR_CRITICALALARM "極微弱警告アラーム" +#define TR_DISABLE_ALARM TR("Disable alarms", "テレメトリーアラーム無効") #define TR_POPUP "ポップアップ" #define TR_MIN "最小" #define TR_MAX "最大" @@ -941,8 +935,8 @@ #define TR_CONSTANT "変化なし" #define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","自動" #define TR_PREFLIGHT "飛行前チェック" -#define TR_CHECKLIST TR(INDENT "Checklist", INDENT "チェックリストの表示") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "インタラクティブ チェック") +#define TR_CHECKLIST TR("Checklist", "チェックリストの表示") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "インタラクティブ チェック") #define TR_AUX_SERIAL_MODE "シリアルポート" #define TR_AUX2_SERIAL_MODE "シリアルポート 2" #define TR_AUX_SERIAL_PORT_POWER "ポート出力" @@ -1094,7 +1088,7 @@ #define TR_UNSUPPORTED_RX "未サポート受信機" #define TR_OTA_UPDATE_ERROR "OTAアップデートエラー" #define TR_DEVICE_RESET "デバイスリセット..." -#define TR_ALTITUDE INDENT "高度" +#define TR_ALTITUDE "高度" #define TR_SCALE "スケール" #define TR_VIEW_CHANNELS "チャンネル表示" #define TR_VIEW_NOTES "備考表示" @@ -1116,13 +1110,12 @@ #define TR_ONLYPOSITIVE "ポジティブ" #define TR_FILTER "フィルター" #define TR_TELEMETRYFULL TR("All slots full!", "テレメトリー枠はすべて埋まりました!!") -#define TR_INVERTED_SERIAL INDENT "リバース" -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "ID識別を無視") +#define TR_IGNORE_INSTANCE TR("No inst.", "ID識別を無視") #define TR_SHOW_INSTANCE_ID "インスタンスIDの表示" #define TR_DISCOVER_SENSORS "新規検索" #define TR_STOP_DISCOVER_SENSORS "停止" #define TR_DELETE_ALL_SENSORS "すべて削除" -#define TR_CONFIRMDELETE "本当に " LCDW_128_480_LINEBREAK "すべて削除しますか？" +#define TR_CONFIRMDELETE "本当に " LCDW_128_LINEBREAK "すべて削除しますか？" #define TR_SELECT_WIDGET "ウィジェット選択" #define TR_WIDGET_FULLSCREEN "全画面表示" #define TR_REMOVE_WIDGET "ウィジェット削除" @@ -1134,12 +1127,7 @@ #define TR_SETUP "設定" #define TR_LAYOUT "レイアウト" #define TR_ADD_MAIN_VIEW "メインビュー追加" -#define TR_BACKGROUND_COLOR "背景色" -#define TR_MAIN_COLOR "メイン色" -#define TR_BAR2_COLOR "セカンダリバー色" -#define TR_BAR1_COLOR "メインバー色" #define TR_TEXT_COLOR "テキスト色" -#define TR_TEXT_VIEWER "テキストビューワ" #define TR_MENU_INPUTS STR_CHAR_INPUT "入力" #define TR_MENU_LUA STR_CHAR_LUA "LUAスクリプト" #define TR_MENU_STICKS STR_CHAR_STICK "スティック" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 5eec5186d26..cfb0991617b 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -63,7 +63,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC TR("Expo","Exponentieel"),TR("ExFijn","Extra Fijn"),"Fijn","Medium","Grof" #define TR_VDISPLAYTRIMS "Nee","Kort","Ja" -#define TR_VBEEPCOUNTDOWN "Stilte","Beeps","Spraak","Tril",TR2_2("B & T","Beeps & Tril"),TR2_2("Spr & Tr","Spraak & Tril") +#define TR_VBEEPCOUNTDOWN "Stilte","Beeps","Spraak","Tril",TR("B & T","Beeps & Tril"),TR("Spr & Tr","Spraak & Tril") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tonen","Stilte" #define TR_CURVE_TYPES "Standaard","Custom" @@ -275,9 +275,9 @@ #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "Globale Functies") #define TR_PROTOCOL TR("Proto", "Protocol") -#define TR_PPMFRAME INDENT "PPM frame" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Warning: output level is VBAT: ") +#define TR_PPMFRAME "PPM frame" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "Warning: output level is VBAT: ") #define TR_WARN_5VOLTS "Warning: output level is 5 volts" #define TR_MS "ms" #define TR_SWITCH TR("Schak.", "Schakelaar") @@ -290,9 +290,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012Trims" + #define TR_CHECKTRIMS "\006Check\012Trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swash Type" #define TR_COLLECTIVE TR("Collective", "Coll. pitch source") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. source") @@ -304,7 +303,7 @@ #else #define TR_LEFT_STICK "Li" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "Geen vrije expo!" #define TR_NOFREEMIXER "Geen vrije mixer!" #define TR_SOURCE "Source" @@ -332,8 +331,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "Bereik" -#define TR_CENTER INDENT "Centreer" +#define TR_RANGE "Bereik" +#define TR_CENTER "Centreer" #define TR_ALARM "Alarm" #define TR_BLADES "Bladen" @@ -368,27 +367,25 @@ #define TR_THROTTLE_START "Gas Start" #define TR_THROTTLEREVERSE TR("Reverse", "Omgekeerd") #define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") -#define TR_BEEPCOUNTDOWN INDENT "Countdown" -#define TR_PERSISTENT TR(INDENT "Vasth.", INDENT "Vasthouden") +#define TR_BEEPCOUNTDOWN "Countdown" +#define TR_PERSISTENT TR("Vasth.", "Vasthouden") #define TR_BACKLIGHT_LABEL "LCD-Verlichting" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Duur" -#define TR_BLONBRIGHTNESS INDENT "Aan-Helderheid" -#define TR_BLOFFBRIGHTNESS INDENT "Uit-Helderheid" +#define TR_BLONBRIGHTNESS "Aan-Helderheid" +#define TR_BLOFFBRIGHTNESS "Uit-Helderheid" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Kleur" #define TR_SPLASHSCREEN "Startscherm Aan" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" #define TR_PWR_OFF_DELAY "Pwr Off delay" -#define TR_THROTTLE_WARNING TR(INDENT "T-Warning", INDENT "Throttle Status") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("T-Warning", "Throttle Status") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch Posities") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Pot Warn.", INDENT "Pot Posities") +#define TR_SWITCHWARNING TR("S-Warning", "Switch Posities") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Pot Warn.", "Pot Posities") #define TR_TIMEZONE TR("Tijdzone", "GPS-Tijdzone +/-Std") #define TR_ADJUST_RTC TR("Klok instellen", "Klok middels GPS instellen") #define TR_GPS "GPS" @@ -397,7 +394,7 @@ #define TR_POTS "Pots" #define TR_SWITCHES TR("Switches","Schakelaars") #define TR_SWITCHES_DELAY "Vertraging" -#define TR_SLAVE CENTER "Leerling" +#define TR_SLAVE "Leerling" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Cal" @@ -412,16 +409,16 @@ #define TR_MENUTOSTART TR_ENTER " VOOR START" #define TR_SETMIDPOINT "CENTREER STICKS/SLIDERS" #define TR_MOVESTICKSPOTS "BEWEEG STICKS/POTS" - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " BIJ GEREED" + #define TR_MENUWHENDONE TR_ENTER " BIJ GEREED" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " VOOR START" - #define TR_SETMIDPOINT TR(CENTER "\004ZET STICKS NAAR HET MIDDEN", CENTER "\004CENTREER STICKS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\006BEWEEG STICKS/POTS" - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " BIJ GEREED" + #define TR_MENUTOSTART TR_ENTER " VOOR START" + #define TR_SETMIDPOINT TR("ZET STICKS NAAR HET MIDDEN", "CENTREER STICKS/SLIDERS") + #define TR_MOVESTICKSPOTS "BEWEEG STICKS/POTS" + #define TR_MENUWHENDONE TR_ENTER " BIJ GEREED" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER"Geen Data" +#define TR_NODATA "Geen Data" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -526,13 +523,12 @@ #define TR_RF_POWER "RF Power" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") #define TR_MULTI_OPTION TR("Option", "Option value") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.",INDENT "Bind on channel") +#define TR_MULTI_AUTOBIND TR("Bind Ch.","Bind on channel") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disable Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Disable Telemetry") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "Low power mode") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Disable int. RF", "Disable internal RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -550,8 +546,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem OFF" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "Module Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -563,7 +559,7 @@ #define TR_REPEAT_AT_ZERO "Herhalen bij 0" #define TR_BATT_CALIB "Accu Calib" #define TR_CURRENT_CALIB "Stroom Calib" -#define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spanningsbron") //9XR-Pro +#define TR_VOLTAGE TR("Spg", "Spanningsbron") //9XR-Pro #define TR_SELECT_MODEL "Kies Model" #define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" @@ -634,7 +630,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs and Screenshots disabled" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_480_LINEBREAK "Screenshots disabled" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs and " LCDW_128_LINEBREAK "Screenshots disabled" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -666,7 +662,6 @@ #define TR_CPU_TEMP "CPU-Temp.\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp. \016>" -#define TR_TEMPWARNING INDENT "Overhitting" //wg 9XR-Pro #define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!" #define TR_FUNC "Funktie" #define TR_V1 "V1" @@ -742,11 +737,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetry","Trainer" #endif #define TR_SD_INFO_TITLE "SD-INFO" -#define TR_SD_TYPE "Type:" #define TR_SD_SPEED "Snelheid:" #define TR_SD_SECTORS "Sectoren:" #define TR_SD_SIZE "Grootte:" -#define TR_TYPE INDENT "Type" +#define TR_TYPE "Type" #define TR_GLOBAL_VARS "Globale Variabelen" #define TR_GVARS "GLOBALE V." #define TR_GLOBAL_VAR "Globale Variabele" @@ -794,7 +788,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "Externe RF" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Modus") +#define TR_FAILSAFE TR("Failsafe", "Failsafe Modus") #define TR_FAILSAFESET "Failsafe instellen" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" @@ -878,7 +872,7 @@ #define TR_SET "[Set]" #define TR_TRAINER "Trainer Poort" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX-Antenneprobleem!" +#define TR_ANTENNAPROBLEM "TX-Antenneprobleem!" #define TR_MODELIDUSED TR("ID al gebruikt", "Model-ID al gebruikt") #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "Module-Type" @@ -893,8 +887,8 @@ #define TR_DISABLE "Disable" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "Eenheid" -#define TR_TELEMETRY_NEWSENSOR INDENT "Sensor toevoegen ..." -#define TR_CHANNELRANGE TR(INDENT "Kanalen", INDENT "Uitgangs Kanalen") //wg 9XR-Pro +#define TR_TELEMETRY_NEWSENSOR "Sensor toevoegen ..." +#define TR_CHANNELRANGE TR("Kanalen", "Uitgangs Kanalen") //wg 9XR-Pro #define TR_AFHDS3_RX_FREQ TR("RX freq.", "RX frequency") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetry") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -913,9 +907,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requires FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requires EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "Waarschuwing" -#define TR_CRITICALALARM INDENT "Kritiek Alarm" -#define TR_DISABLE_ALARM TR(INDENT "Disable alarms", INDENT "Disable telemetry alarms") +#define TR_LOWALARM "Waarschuwing" +#define TR_CRITICALALARM "Kritiek Alarm" +#define TR_DISABLE_ALARM TR("Disable alarms", "Disable telemetry alarms") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -938,8 +932,8 @@ #define TR_CONSTANT "Constant" #define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Toon Checklist") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interact", INDENT "Interact. checklist", INDENT "Interactive checklist") +#define TR_CHECKLIST TR("Checklist", "Toon Checklist") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interact", "Interact. checklist", "Interactive checklist") #define TR_AUX_SERIAL_MODE "Seriele poort" #define TR_AUX2_SERIAL_MODE "Seriele poort 2" #define TR_AUX_SERIAL_PORT_POWER "Port power" @@ -1097,7 +1091,7 @@ #define TR_UNSUPPORTED_RX "Unsupported RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Hoogte" +#define TR_ALTITUDE "Hoogte" #define TR_SCALE "Schaal" #define TR_VIEW_CHANNELS "Toon Kanalen" #define TR_VIEW_NOTES "Toon Notities" @@ -1120,8 +1114,7 @@ #define TR_FILTER "Filter aktief" #define TR_TELEMETRYFULL "Telemetrie slots vol!" //TODO: translation -#define TR_INVERTED_SERIAL INDENT "Invert" -#define TR_IGNORE_INSTANCE TR(INDENT "Neg. ID ","Negeer ID's") +#define TR_IGNORE_INSTANCE TR("Neg. ID ","Negeer ID's") #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Ontdek nieuwe sensors" #define TR_STOP_DISCOVER_SENSORS "Stop ontdekking" @@ -1138,13 +1131,7 @@ #define TR_SETUP "Setup" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Add main view" -#define TR_BACKGROUND_COLOR "Background color" -#define TR_MAIN_COLOR "Main color" -#define TR_BAR2_COLOR "Secondary bar color" -#define TR_BAR1_COLOR "Main bar color" #define TR_TEXT_COLOR "Text color" -#define TR_TEXT_VIEWER "Text Viewer" - #define TR_MENU_INPUTS STR_CHAR_INPUT "Inputs" #define TR_MENU_LUA STR_CHAR_LUA "Lua Scripts" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 5eecf9ebf9b..3b6f9bc52f4 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -62,7 +62,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC TR("Expo","Expotencja"),TR("B.Dokł","B.Dokładny"),TR("Dokł.","Dokładny"),"Średni",TR("Zgrubn","Zgrubny") #define TR_VDISPLAYTRIMS "Nie","Zmień","Tak" -#define TR_VBEEPCOUNTDOWN "Cichy","Pik","Dźwięk","Wibrac",TR2_2("P & W","Pik & Wibrac"),TR2_2("Dzw & Wbr","Dźwięk & Wibrac") +#define TR_VBEEPCOUNTDOWN "Cichy","Pik","Dźwięk","Wibrac",TR("P & W","Pik & Wibrac"),TR("Dzw & Wbr","Dźwięk & Wibrac") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Ton","Cicho" #define TR_CURVE_TYPES "Standard","Własny" @@ -275,9 +275,9 @@ #define TR_BEEPCTR TR("Dźwięk środ.", "Dźwięk środ. położenia") #define TR_USE_GLOBAL_FUNCS TR("Funk.Glb.","Użyj Funkcji Glb") #define TR_PROTOCOL TR("Proto", "Protokół") -#define TR_PPMFRAME INDENT "Ramka PPM" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Output is VBAT: ", INDENT "Uwaga: output level is VBAT: ") +#define TR_PPMFRAME "Ramka PPM" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Output is VBAT: ", "Uwaga: output level is VBAT: ") #define TR_WARN_5VOLTS "Uwaga: output level is 5 volts" #define TR_MS "ms" #define TR_SWITCH "Przełą" @@ -290,9 +290,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Sprawdź trymy" #else - #define TR_CHECKTRIMS CENTER "\006Spr \012Trymy" + #define TR_CHECKTRIMS "\006Spr \012Trymy" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Typ tarczy" #define TR_COLLECTIVE TR("Kolektyw", "Źródło Kolektywu") #define TR_AILERON TR("Lateral cyc.", "Lateral cyc. source") @@ -304,7 +303,7 @@ #else #define TR_LEFT_STICK "Lewy" #endif -#define TR_SUBTYPE INDENT "Podtyp" +#define TR_SUBTYPE "Podtyp" #define TR_NOFREEEXPO "BrakWoln.Expo!" #define TR_NOFREEMIXER "BrakWoln.Mixów!" #define TR_SOURCE "Źródło" @@ -332,8 +331,8 @@ #else #define TR_GV TR("G", "ZG") #endif -#define TR_RANGE INDENT "Zakres" -#define TR_CENTER INDENT "Środek" +#define TR_RANGE "Zakres" +#define TR_CENTER "Środek" #define TR_ALARM "Alarm" #define TR_BLADES "Łopaty śmigla" #define TR_SCREEN "Ekran " @@ -367,27 +366,25 @@ #define TR_THROTTLE_START "Gaz Start" #define TR_THROTTLEREVERSE TR("OdwrGaz", "OdwrGaz") #define TR_MINUTEBEEP TR("Minuta", "PikCoMinutę") -#define TR_BEEPCOUNTDOWN INDENT "Odliczanie" -#define TR_PERSISTENT TR(INDENT "Dokł.", INDENT "Dokładny") +#define TR_BEEPCOUNTDOWN "Odliczanie" +#define TR_PERSISTENT TR("Dokł.", "Dokładny") #define TR_BACKLIGHT_LABEL "Podświetl" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT"Czas trwania" -#define TR_BLONBRIGHTNESS INDENT"Jasnośc wł." -#define TR_BLOFFBRIGHTNESS INDENT"Jasność wył." +#define TR_BLONBRIGHTNESS "Jasnośc wł." +#define TR_BLOFFBRIGHTNESS "Jasność wył." #define TR_KEYS_BACKLIGHT "Podśw. przycisków" #define TR_BLCOLOR "Kolor" #define TR_SPLASHSCREEN "Logo ekranu" #define TR_PLAY_HELLO "Dźwięk uruchomienia" #define TR_PWR_ON_DELAY "Pwr On delay" #define TR_PWR_OFF_DELAY "Pwr Off delay" -#define TR_THROTTLE_WARNING TR(INDENT"OstrzGaz", INDENT "OstrzeżenieGaz") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "InnePoł", INDENT INDENT INDENT INDENT "Inne położenie?") +#define TR_THROTTLE_WARNING TR("OstrzGaz", "OstrzeżenieGaz") +#define TR_CUSTOM_THROTTLE_WARNING TR("InnePoł", "Inne położenie?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Poł. %", "Położenie %") -#define TR_SWITCHWARNING TR(INDENT "OstrzPrzeł", INDENT "PozycjaPrzeł") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Slider positions") -#define TR_POTWARNING TR(INDENT "Ostrz.Poten.", INDENT "PozycjaPotencj.") +#define TR_SWITCHWARNING TR("OstrzPrzeł", "PozycjaPrzeł") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Ostrz.Poten.", "PozycjaPotencj.") #define TR_TIMEZONE TR("Strefa czasowa" ,"Strefa czasowa GPS") #define TR_ADJUST_RTC TR("RegulujRTC", "RegulujRTC") #define TR_GPS "GPS" @@ -412,19 +409,19 @@ #define TR_SETMIDPOINT "CENTRUJ DRĄŻKI/SUWAKI" #define TR_MOVESTICKSPOTS "RUSZAJ DRĄŻKI/SUWAKI" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " = START" + #define TR_MENUTOSTART TR_ENTER " = START" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006USTAW ŚRODEK POT." - #define TR_MOVESTICKSPOTS CENTER "\002RUSZAJ DR/TH/POT./OSIE" + #define TR_SETMIDPOINT "USTAW ŚRODEK POT." + #define TR_MOVESTICKSPOTS "RUSZAJ DR/TH/POT./OSIE" #else - #define TR_SETMIDPOINT TR(CENTER "\006USTAW ŚRODEK OSI", CENTER "\004CENTRUJ DRĄŻKI/SUWAKI") - #define TR_MOVESTICKSPOTS CENTER "\007RUSZAJ DRĄŻKI/POT." + #define TR_SETMIDPOINT TR("USTAW ŚRODEK OSI", "CENTRUJ DRĄŻKI/SUWAKI") + #define TR_MOVESTICKSPOTS "RUSZAJ DRĄŻKI/POT." #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " = KONIEC" + #define TR_MENUWHENDONE TR_ENTER " = KONIEC" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "Brak Danych" +#define TR_NODATA "Brak Danych" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "TmixMaks" @@ -518,7 +515,7 @@ #define TR_MONITOR_OUTPUT_DESC "Wyjścia" #define TR_MONITOR_MIXER_DESC "Mixers" #define TR_RECEIVER_NUM TR("Nr RX", "Nr odbiornika") - #define TR_RECEIVER INDENT "Odbiornik" + #define TR_RECEIVER "Odbiornik" #define TR_MULTI_RFTUNE TR("Freq tune", "RF Freq. fine tune") #define TR_MULTI_RFPOWER "Moc RF" #define TR_MULTI_WBUS "Wyjście" @@ -527,13 +524,12 @@ #define TR_RF_POWER "Moc RF" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") #define TR_MULTI_OPTION TR("Opcja", "Wartość opcji") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.",INDENT "Bind on channel") +#define TR_MULTI_AUTOBIND TR("Bind Ch.","Bind on channel") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disable Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Disable Telemetry") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "Low power mode") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Disable int. RF", "Disable internal RF") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -551,8 +547,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem WŁ" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem WYŁ" #define TR_PROTOCOL_INVALID TR("Prot. invalid", "Protocol invalid") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "Module Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -564,7 +560,7 @@ #define TR_REPEAT_AT_ZERO "Powtórz przy Zerze" #define TR_BATT_CALIB "Kalib:Baterii" #define TR_CURRENT_CALIB " +=\006Kalibracja prądu" -#define TR_VOLTAGE TR (INDENT"Napięcie",INDENT"Źródło Napięcia") +#define TR_VOLTAGE TR ("Napięcie","Źródło Napięcia") #define TR_SELECT_MODEL "Wybór modelu" #define TR_MANAGE_MODELS "MENADŻER MODELI" #define TR_MODELS "Modele" @@ -635,7 +631,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogi i zrzuty ekranu wyłączone" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logi i zrzuty ekranu" LCDW_128_480_LINEBREAK "wyłączone" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logi i zrzuty ekranu" LCDW_128_LINEBREAK "wyłączone" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -667,7 +663,6 @@ #define TR_CPU_TEMP "Temp. CPU\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "Temp. MB" -#define TR_TEMPWARNING INDENT "Przegrzanie" #define TR_TTL_WARNING "Uwaga: Nie przekraczaj 3.3V na pinach TX/RX!" #define TR_FUNC "Funkcja" #define TR_V1 "V1" @@ -743,11 +738,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetry","Trainer" #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Prędkość:" #define TR_SD_SECTORS "Sektory :" #define TR_SD_SIZE "Wielkość:" -#define TR_TYPE INDENT TR_SD_TYPE +#define TR_TYPE "Typ:" #define TR_GLOBAL_VARS "Zmienne Globalne" #define TR_GVARS "Zmien.Glob." #define TR_GLOBAL_VAR "Zmienna Globalna" @@ -795,7 +789,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "Zewn.Moduł RF" -#define TR_FAILSAFE TR(INDENT"Failsafe",INDENT"Tryb Failsafe") +#define TR_FAILSAFE TR("Failsafe","Tryb Failsafe") #define TR_FAILSAFESET "USTAWIENIE FAILSAFE" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Owner ID" @@ -879,7 +873,7 @@ #define TR_SET "[Set]" #define TR_TRAINER "Port Trenera" #define TR_CHANS "Kanały" -#define TR_ANTENNAPROBLEM CENTER "Problem z anteną TX" +#define TR_ANTENNAPROBLEM "Problem z anteną TX" #define TR_MODELIDUSED TR("ID zajęte","ID modelu zajęte") #define TR_MODELIDUNIQUE "ID jest unikalne" #define TR_MODULE "Moduł " @@ -894,8 +888,8 @@ #define TR_DISABLE "Wyłącz" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "Jednostka" -#define TR_TELEMETRY_NEWSENSOR INDENT "Dodaj nowy czujnik..." -#define TR_CHANNELRANGE TR(INDENT "ZakrKn",INDENT "Zakres kanału") +#define TR_TELEMETRY_NEWSENSOR "Dodaj nowy czujnik..." +#define TR_CHANNELRANGE TR("ZakrKn","Zakres kanału") #define TR_AFHDS3_RX_FREQ TR("RX freq.", "RX frequency") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetry") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -914,9 +908,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Wymaga FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Wymaga EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certyfikacji firmware" -#define TR_LOWALARM INDENT "Alarm niski" -#define TR_CRITICALALARM INDENT "Alarm krytyczny" -#define TR_DISABLE_ALARM TR(INDENT "Disable alarms", INDENT "Disable telemetry alarms") +#define TR_LOWALARM "Alarm niski" +#define TR_CRITICALALARM "Alarm krytyczny" +#define TR_DISABLE_ALARM TR("Disable alarms", "Disable telemetry alarms") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -939,8 +933,8 @@ #define TR_CONSTANT "Stała " #define TR_PREFLIGHT_POTSLIDER_CHECK "WYŁ","ZAŁ","Auto" #define TR_PREFLIGHT "Pre-start Checks" -#define TR_CHECKLIST TR(INDENT "Czeklista",INDENT "Pokaż Listę Ostrzeżeń") -#define TR_CHECKLIST_INTERACTIVE TR(INDENT "C-Interakt", INDENT "Interkatywna lista ostrż.") +#define TR_CHECKLIST TR("Czeklista","Pokaż Listę Ostrzeżeń") +#define TR_CHECKLIST_INTERACTIVE TR("C-Interakt", "Interkatywna lista ostrż.") #define TR_AUX_SERIAL_MODE "Port szreg." #define TR_AUX2_SERIAL_MODE "Port szreg. 2" #define TR_AUX_SERIAL_PORT_POWER "Zasil.portu" @@ -1092,7 +1086,7 @@ #define TR_UNSUPPORTED_RX "Niewspierany RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Wysokość" +#define TR_ALTITUDE "Wysokość" #define TR_SCALE "Skala" #define TR_VIEW_CHANNELS "Pokaż Kanały" #define TR_VIEW_NOTES "Pokaż Notki" @@ -1115,8 +1109,7 @@ #define TR_FILTER "Filtr" #define TR_TELEMETRYFULL "Wszyskie miejsca zajęte!" //TODO: translation -#define TR_INVERTED_SERIAL INDENT "Odwróć" -#define TR_IGNORE_INSTANCE INDENT "Ignoruj przypadek" +#define TR_IGNORE_INSTANCE "Ignoruj przypadek" #define TR_SHOW_INSTANCE_ID "Pokaż ID instancji" #define TR_DISCOVER_SENSORS "Znajdź nowe czujniki" #define TR_STOP_DISCOVER_SENSORS "Szukanie STOP " @@ -1133,12 +1126,7 @@ #define TR_SETUP "Ustawienia" #define TR_LAYOUT "Układ" #define TR_ADD_MAIN_VIEW "Dodaj główny widok" -#define TR_BACKGROUND_COLOR "Kolor tła" -#define TR_MAIN_COLOR "Główny kolor" -#define TR_BAR2_COLOR "Drugi kolor pas." -#define TR_BAR1_COLOR "Główny kolor pas." #define TR_TEXT_COLOR "Kolor tekstu" -#define TR_TEXT_VIEWER "Podgląd tekstu" #define TR_MENU_INPUTS STR_CHAR_INPUT "Wejścia" #define TR_MENU_LUA STR_CHAR_LUA "SkryptyLUA" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index d0d216f1608..0eb4042acc5 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -63,7 +63,7 @@ #define TR_MULTI_CUSTOM "Custom" #define TR_VTRIMINC "Expo","ExFino","Fino","Médio","Largo" #define TR_VDISPLAYTRIMS "Não","Trocar","Sim" -#define TR_VBEEPCOUNTDOWN "Silêncioso","Bipes","Voz","Vibrar",TR2_2("B & V","Bipes & Vibrar"),TR2_2("V & V","Voz & Vibrar") +#define TR_VBEEPCOUNTDOWN "Silêncioso","Bipes","Voz","Vibrar",TR("B & V","Bipes & Vibrar"),TR("V & V","Voz & Vibrar") #define TR_COUNTDOWNVALUES "5s","10s","20s","30s" #define TR_VVARIOCENTER "Tom","silêncio" #define TR_CURVE_TYPES "Normal","Custom" @@ -281,9 +281,9 @@ #define TR_BEEPCTR TR("Bip Cntr", "Bipe quando centralizado") #define TR_USE_GLOBAL_FUNCS TR("Funcs.Glob", "Usar func.global") #define TR_PROTOCOL TR("Proto", "Protocolo") - #define TR_PPMFRAME INDENT "frame PPM" - #define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") - #define STR_WARN_BATTVOLTAGE TR(INDENT "Saída em VBAT: ", INDENT "AVISO: Tensão de saída em VBAT: ") + #define TR_PPMFRAME "frame PPM" + #define TR_REFRESHRATE TR("Refresh", "Refresh rate") + #define STR_WARN_BATTVOLTAGE TR("Saída em VBAT: ", "AVISO: Tensão de saída em VBAT: ") #define TR_WARN_5VOLTS "AVISO: Tensão de saída em 5 volts" #define TR_MS "ms" #define TR_SWITCH "Chave" @@ -296,9 +296,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Check FM Trims" #else - #define TR_CHECKTRIMS CENTER "\006Check\012trims" + #define TR_CHECKTRIMS "\006Check\012trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Tipo do Swash" #define TR_COLLECTIVE TR("Coletivo", "Org. passo do Coletivo") #define TR_AILERON TR("Rolagem", "Org. cíclico Rolagem") @@ -310,7 +309,7 @@ #else #define TR_LEFT_STICK "Esq" #endif -#define TR_SUBTYPE INDENT "Subtype" +#define TR_SUBTYPE "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_SOURCE "Fonte" @@ -338,8 +337,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "Alcance" -#define TR_CENTER INDENT "Centro" +#define TR_RANGE "Alcance" +#define TR_CENTER "Centro" #define TR_ALARM "Alarme" #define TR_BLADES "Lâminas/Pás" #define TR_SCREEN "Tela\001" @@ -373,27 +372,25 @@ #define TR_THROTTLE_START "Iniciar Motor" #define TR_THROTTLEREVERSE TR("T-Reverso", "Reverso") #define TR_MINUTEBEEP TR("Minuto", "Cada Minuto") -#define TR_BEEPCOUNTDOWN INDENT "ContagemRegr" -#define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistente") +#define TR_BEEPCOUNTDOWN "ContagemRegr" +#define TR_PERSISTENT TR("Persist.", "Persistente") #define TR_BACKLIGHT_LABEL "Backlight" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Duração" -#define TR_BLONBRIGHTNESS INDENT "Brilho LIGA" -#define TR_BLOFFBRIGHTNESS INDENT "Brilho DESL" +#define TR_BLONBRIGHTNESS "Brilho LIGA" +#define TR_BLOFFBRIGHTNESS "Brilho DESL" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Cor" #define TR_SPLASHSCREEN "Tela abertura" #define TR_PLAY_HELLO "Som ao ligar" #define TR_PWR_ON_DELAY "Delay para LIGA" #define TR_PWR_OFF_DELAY "Delay para DESL" -#define TR_THROTTLE_WARNING TR(INDENT "A-Aceler.", INDENT "Pos do acelerador") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Cust-Pos", INDENT INDENT INDENT INDENT "Custom position?") +#define TR_THROTTLE_WARNING TR("A-Aceler.", "Pos do acelerador") +#define TR_CUSTOM_THROTTLE_WARNING TR("Cust-Pos", "Custom position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "A-Chaves", INDENT "Pos das chaves") -#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders") -#define TR_SLIDERWARNING TR(INDENT "Slid. pos.", INDENT "Pos do Slider") -#define TR_POTWARNING TR(INDENT "Pot warn.", INDENT "Pos dos Pots") +#define TR_SWITCHWARNING TR("A-Chaves", "Pos das chaves") +#define TR_POTWARNINGSTATE "Pots & sliders" +#define TR_POTWARNING TR("Pot warn.", "Pos dos Pots") #define TR_TIMEZONE "Fuso horário" #define TR_ADJUST_RTC "Ajuste RTC" #define TR_GPS "GPS" @@ -402,7 +399,7 @@ #define TR_POTS "Pots" #define TR_SWITCHES "Chaves" #define TR_SWITCHES_DELAY TR("Play delay", "Play delay (sw. mid pos)") -#define TR_SLAVE CENTER "Escravo" +#define TR_SLAVE "Escravo" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplier" #define TR_CAL "Cal" @@ -418,19 +415,19 @@ #define TR_SETMIDPOINT "CENTRE EIXO/SLIDERS" #define TR_MOVESTICKSPOTS "MOVA EIXO/POTS" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " P/ INICIAR" + #define TR_MENUTOSTART TR_ENTER " P/ INICIAR" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006SET MEIO DOS POTS" - #define TR_MOVESTICKSPOTS CENTER "\002MOVA DIR/MOT/POTS/AXIS" + #define TR_SETMIDPOINT "SET MEIO DOS POTS" + #define TR_MOVESTICKSPOTS "MOVA DIR/MOT/POTS/AXIS" #else - #define TR_SETMIDPOINT TR(CENTER "\006SET EIXO MEIO", CENTER "\004CENTRE AXIS/SLIDERS") - #define TR_MOVESTICKSPOTS CENTER "\007MOVA AXIS/POTS" + #define TR_SETMIDPOINT TR("SET EIXO MEIO", "CENTRE AXIS/SLIDERS") + #define TR_MOVESTICKSPOTS "MOVA AXIS/POTS" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " QUANDO TERM." + #define TR_MENUWHENDONE TR_ENTER " QUANDO TERM." #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "SEM DADOS" +#define TR_NODATA "SEM DADOS" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -532,13 +529,12 @@ #define TR_RF_POWER "Pot. RF" #define TR_MULTI_FIXEDID TR("IDFixo", "ID Fixo") #define TR_MULTI_OPTION TR("Opção", "Valor opção") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind Ch.", INDENT "Bind on channel") +#define TR_MULTI_AUTOBIND TR("Bind Ch.", "Bind on channel") #define TR_DISABLE_CH_MAP TR("No Ch. map", "Disable Ch. map") #define TR_DISABLE_TELEM TR("No Telem", "Disable Telemetry") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") -#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Low power", "Low power mode") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("ON", "Enabled") #define TR_DISABLE_INTERNAL TR("Desatv RF intern", "Desatv RF interno") #define TR_MODULE_NO_SERIAL_MODE TR("!serial mode", "Not in serial mode") @@ -556,8 +552,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem LIGA" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Telem DESL" #define TR_PROTOCOL_INVALID TR("Prot inválido", "Protocol inválido") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Module Status") -#define TR_MODULE_SYNC TR(INDENT "Sync", INDENT "Proto Sync Status") +#define TR_MODULE_STATUS TR("Status", "Module Status") +#define TR_MODULE_SYNC TR("Sync", "Proto Sync Status") #define TR_MULTI_SERVOFREQ TR("Servo rate", "Servo update rate") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("RF Channel", "Select RF channel") @@ -574,7 +570,7 @@ #define TR_REPEAT_AT_ZERO "Repeat zero" #define TR_BATT_CALIB TR("Batt. calib", "Battery calibration") #define TR_CURRENT_CALIB "Current calib" -#define TR_VOLTAGE TR(INDENT "Tensão", INDENT "Origem tensão") +#define TR_VOLTAGE TR("Tensão", "Origem tensão") #define TR_SELECT_MODEL "Selec. modelo" #define TR_MANAGE_MODELS "MANAGE MODELS" #define TR_MODELS "Modelos" @@ -645,7 +641,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLogs e captura de tela desativados" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs e captura" LCDW_128_480_LINEBREAK "de tela desativados" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Logs e captura" LCDW_128_LINEBREAK "de tela desativados" #endif #define TR_NEEDS_FILE "NEEDS FILE" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -677,7 +673,6 @@ #define TR_CPU_TEMP "CPU temp." #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB Temp." -#define TR_TEMPWARNING INDENT "SobrAquec." #define TR_TTL_WARNING "Aviso: Não exceder 3,3V nos pinos TX/RX !" #define TR_FUNC "Função" #define TR_V1 "V1" @@ -754,11 +749,10 @@ #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Tipo:" #define TR_SD_SPEED "Vel:" #define TR_SD_SECTORS "Sectores:" #define TR_SD_SIZE "Tam:" -#define TR_TYPE INDENT "Tipo" +#define TR_TYPE "Tipo" #define TR_GLOBAL_VARS "Variáveis Global" #define TR_GVARS "GVARS" #define TR_GLOBAL_VAR "Variável Global" @@ -806,7 +800,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "More options available" #define TR_NO_MODULE_INFORMATION "No module information" #define TR_EXTERNALRF "RF Externo" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe mode") +#define TR_FAILSAFE TR("Failsafe", "Failsafe mode") #define TR_FAILSAFESET "FAILSAFE SETTINGS" #define TR_REG_ID "ID Reg." #define TR_OWNER_ID "ID dono" @@ -890,7 +884,7 @@ #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" #define TR_CHANS "Chans" -#define TR_ANTENNAPROBLEM CENTER "TX antenna problem!" +#define TR_ANTENNAPROBLEM "TX antenna problem!" #define TR_MODELIDUSED "ID used in:" #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "Módulo" @@ -905,8 +899,8 @@ #define TR_DISABLE "Desativar" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "Unit" -#define TR_TELEMETRY_NEWSENSOR INDENT "Adic Sensor" -#define TR_CHANNELRANGE TR(INDENT "Range Ch.", INDENT "Range Canal") +#define TR_TELEMETRY_NEWSENSOR "Adic Sensor" +#define TR_CHANNELRANGE TR("Range Ch.", "Range Canal") #define TR_ANTENNACONFIRM1 "EXT. ANTENNA" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Internal","Ask","Per model","Internal + External" @@ -920,9 +914,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Requires FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Requires EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certified firmware" -#define TR_LOWALARM INDENT "Alarme baixo" -#define TR_CRITICALALARM INDENT "Alarme critic" -#define TR_DISABLE_ALARM TR(INDENT "Desativ alarm", INDENT "Desativar alames telemetria") +#define TR_LOWALARM "Alarme baixo" +#define TR_CRITICALALARM "Alarme critic" +#define TR_DISABLE_ALARM TR("Desativ alarm", "Desativar alames telemetria") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -945,8 +939,8 @@ #define TR_CONSTANT "Constant" #define TR_PREFLIGHT_POTSLIDER_CHECK "DESL","LIGA","AUTO" #define TR_PREFLIGHT "pré-Checks" -#define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display checklist") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "Cklist-int", INDENT "Checklist Interat.", INDENT "Checklist interativa") +#define TR_CHECKLIST TR("Checklist", "Display checklist") +#define TR_CHECKLIST_INTERACTIVE TR3("Cklist-int", "Checklist Interat.", "Checklist interativa") #define TR_AUX_SERIAL_MODE "Serial port" #define TR_AUX2_SERIAL_MODE "Serial port 2" #define TR_AUX_SERIAL_PORT_POWER "Port power" @@ -1098,7 +1092,7 @@ #define TR_UNSUPPORTED_RX "Unsupported RX" #define TR_OTA_UPDATE_ERROR "OTA update error" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Altitude" +#define TR_ALTITUDE "Altitude" #define TR_SCALE "Scale" #define TR_VIEW_CHANNELS "View Channels" #define TR_VIEW_NOTES "View Notes" @@ -1120,13 +1114,12 @@ #define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL TR("All slots full!", "All telemetry slots full!") -#define TR_INVERTED_SERIAL INDENT "Invert" -#define TR_IGNORE_INSTANCE TR(INDENT "No inst.", INDENT "Ignore instances") +#define TR_IGNORE_INSTANCE TR("No inst.", "Ignore instances") #define TR_SHOW_INSTANCE_ID "Show instance ID" #define TR_DISCOVER_SENSORS "Detect. novos" #define TR_STOP_DISCOVER_SENSORS "Stop" #define TR_DELETE_ALL_SENSORS "Apagar todos" -#define TR_CONFIRMDELETE "Really " LCDW_128_480_LINEBREAK "delete all ?" +#define TR_CONFIRMDELETE "Really " LCDW_128_LINEBREAK "delete all ?" #define TR_SELECT_WIDGET "Select widget" #define TR_WIDGET_FULLSCREEN "Full screen" #define TR_REMOVE_WIDGET "Remove widget" @@ -1138,12 +1131,7 @@ #define TR_SETUP "Setup" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Add main view" -#define TR_BACKGROUND_COLOR "Background color" -#define TR_MAIN_COLOR "Main color" -#define TR_BAR2_COLOR "Secondary bar color" -#define TR_BAR1_COLOR "Main bar color" #define TR_TEXT_COLOR "Text color" -#define TR_TEXT_VIEWER "Text Viewer" #define TR_MENU_INPUTS STR_CHAR_INPUT "Inputs" #define TR_MENU_LUA STR_CHAR_LUA "Lua scripts" #define TR_MENU_STICKS STR_CHAR_STICK "Eixos" diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index ebd6449f7c4..139ccf93a8a 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -62,7 +62,7 @@ #define TR_MULTI_CUSTOM "Настроенный" #define TR_VTRIMINC TR("Экспо","экспо"),TR("Оч мелк","Оч мелко"),"Мелко","Сред","Грубо" #define TR_VDISPLAYTRIMS "Нет","Измен","Да" -#define TR_VBEEPCOUNTDOWN "Без звука", "Сигн", "Голос", "Вибро", TR2_2("Звук вибро", "Сигн вибро"), TR2_2("Голос вибро", "Голос вибро") +#define TR_VBEEPCOUNTDOWN "Без звука", "Сигн", "Голос", "Вибро", TR("Звук вибро", "Сигн вибро"), TR("Голос вибро", "Голос вибро") #define TR_COUNTDOWNVALUES "5с","10с","20с","30с" #define TR_VVARIOCENTER "Тон","Тихо" #define TR_CURVE_TYPES "Стд","Выбор" @@ -280,9 +280,9 @@ #define TR_BEEPCTR TR("Звук на цен", "Звук на центре") #define TR_USE_GLOBAL_FUNCS TR("Глоб. функц", "Глоб функц") #define TR_PROTOCOL TR("Проток", "Протокол") - #define TR_PPMFRAME INDENT "Фрейм PPM" - #define TR_REFRESHRATE TR(INDENT "Обновл", INDENT "Част обновл") - #define STR_WARN_BATTVOLTAGE TR(INDENT "Выход - V АКБ: ", INDENT "Предупреждение: уровень выхода - V АКБ: ") + #define TR_PPMFRAME "Фрейм PPM" + #define TR_REFRESHRATE TR("Обновл", "Част обновл") + #define STR_WARN_BATTVOLTAGE TR("Выход - V АКБ: ", "Предупреждение: уровень выхода - V АКБ: ") #define TR_WARN_5VOLTS "Предупреждение: уровень выхода - 5 вольт" #define TR_MS "ms" #define TR_SWITCH "Тумблер" @@ -295,9 +295,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Провер тримов" #else - #define TR_CHECKTRIMS CENTER "\006Check\012trims" + #define TR_CHECKTRIMS "\006Check\012trims" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Наклонный тип" #define TR_COLLECTIVE TR("Коллек", "Коллек") #define TR_AILERON TR("Крен", "Крен") @@ -309,7 +308,7 @@ #else #define TR_LEFT_STICK "Лев" #endif -#define TR_SUBTYPE INDENT "Подтип" +#define TR_SUBTYPE "Подтип" #define TR_NOFREEEXPO "Нет своб экспо!" #define TR_NOFREEMIXER "Нет своб микш!" #define TR_SOURCE "Источ" @@ -337,8 +336,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "Диапаз" -#define TR_CENTER INDENT "Центр" +#define TR_RANGE "Диапаз" +#define TR_CENTER "Центр" #define TR_ALARM "Сигнал тревоги" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "Экран\001" @@ -372,27 +371,25 @@ #define TR_THROTTLE_START "Газ cтарт" #define TR_THROTTLEREVERSE TR("Г-Реверс", "Реверс") #define TR_MINUTEBEEP TR("Минут", "Минут") -#define TR_BEEPCOUNTDOWN INDENT "Обр отс" -#define TR_PERSISTENT TR(INDENT "Пост", INDENT "Пост") +#define TR_BEEPCOUNTDOWN "Обр отс" +#define TR_PERSISTENT TR("Пост", "Пост") #define TR_BACKLIGHT_LABEL "Подсветка" #define TR_GHOST_MENU_LABEL "Меню призр" #define TR_STATUS "Статус" -#define TR_BLDELAY INDENT "Продолж" -#define TR_BLONBRIGHTNESS INDENT "Подсветка Вкл" -#define TR_BLOFFBRIGHTNESS INDENT "Подсветка Вык" +#define TR_BLONBRIGHTNESS "Подсветка Вкл" +#define TR_BLOFFBRIGHTNESS "Подсветка Вык" #define TR_KEYS_BACKLIGHT "Подсветка клавиш" #define TR_BLCOLOR "Цвет" #define TR_SPLASHSCREEN "Заставка" #define TR_PLAY_HELLO "Звук запуска" #define TR_PWR_ON_DELAY "Время включ" #define TR_PWR_OFF_DELAY "Время выключ" -#define TR_THROTTLE_WARNING TR(INDENT "Г-Предупр", INDENT "Статис газа") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Свое пол", INDENT INDENT INDENT INDENT "Свое пол?") +#define TR_THROTTLE_WARNING TR("Г-Предупр", "Статис газа") +#define TR_CUSTOM_THROTTLE_WARNING TR("Свое пол", "Свое пол?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Пол. %", "Положение %") -#define TR_SWITCHWARNING TR(INDENT "П-Предупр", INDENT "Поз тумбл") -#define TR_POTWARNINGSTATE TR(INDENT "Сост потенц и тумбл", INDENT "Потенц и тумбл") -#define TR_SLIDERWARNING TR(INDENT "Полож тумб.", INDENT "Полож тумбл") -#define TR_POTWARNING TR(INDENT "Полож пот", INDENT "Полож потенц") +#define TR_SWITCHWARNING TR("П-Предупр", "Поз тумбл") +#define TR_POTWARNINGSTATE "Сост потенц и тумбл" +#define TR_POTWARNING TR("Полож пот", "Полож потенц") #define TR_TIMEZONE "Временная зона" #define TR_ADJUST_RTC "Настроить RTC" #define TR_GPS "GPS" @@ -401,7 +398,7 @@ #define TR_POTS "Потенциом" #define TR_SWITCHES "Тумблеры" #define TR_SWITCHES_DELAY TR("Зад воспр", "Задерж воспр (средн. полож. тумбл.)") -#define TR_SLAVE CENTER "Рабочий" +#define TR_SLAVE "Рабочий" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Множитель" #define TR_CAL "Звонок" @@ -417,19 +414,19 @@ #define TR_SETMIDPOINT "ЦЕНТР AXIS/СЛАЙДЕРЫ" #define TR_MOVESTICKSPOTS "Перемещ AXIS/ПОТЕНЦ" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " СТАРТ" + #define TR_MENUTOSTART TR_ENTER " СТАРТ" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006ВЫБ СЕРЕД ПОТЕНЦ" - #define TR_MOVESTICKSPOTS CENTER "\002ДВИГ ST/TH/POTS/AXIS" + #define TR_SETMIDPOINT "ВЫБ СЕРЕД ПОТЕНЦ" + #define TR_MOVESTICKSPOTS "ДВИГ ST/TH/POTS/AXIS" #else - #define TR_SETMIDPOINT TR(CENTER "\006ВЫБ AXIS СЕРЕД", CENTER "\004ЦЕНТР AXIS/СЛАЙДЕРЫ") - #define TR_MOVESTICKSPOTS CENTER "\007ДВИГ AXIS/Потенц" + #define TR_SETMIDPOINT TR("ВЫБ AXIS СЕРЕД", "ЦЕНТР AXIS/СЛАЙДЕРЫ") + #define TR_MOVESTICKSPOTS "ДВИГ AXIS/Потенц" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " ПО ОКОНЧАНИЮ" + #define TR_MENUWHENDONE TR_ENTER " ПО ОКОНЧАНИЮ" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "НЕТ ДАННЫХ" +#define TR_NODATA "НЕТ ДАННЫХ" #define TR_US "US" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Макс Tmix" @@ -531,13 +528,12 @@ #define TR_RF_POWER "Мощность RF" #define TR_MULTI_FIXEDID TR("Фикс ID", "Фикс ID") #define TR_MULTI_OPTION TR("Опция", "Знач опции") -#define TR_MULTI_AUTOBIND TR(INDENT "Прив к кан", INDENT "Прив к кан") +#define TR_MULTI_AUTOBIND TR("Прив к кан", "Прив к кан") #define TR_DISABLE_CH_MAP TR("Откл карту кан", "Откл карту кан") #define TR_DISABLE_TELEM TR("Без телеметрии", "Откл телем") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Автоопр", INDENT "Автоопр формата") -#define TR_MULTI_LOWPOWER TR(INDENT "Низк потребл", INDENT "Низк потребл") -#define TR_MULTI_LNA_DISABLE INDENT "Откл LNA" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "Связь S.Port") +#define TR_MULTI_LOWPOWER TR("Низк потребл", "Низк потребл") +#define TR_MULTI_LNA_DISABLE "Откл LNA" +#define TR_MODULE_TELEMETRY TR("S.Port", "Связь S.Port") #define TR_MODULE_TELEM_ON TR("Вкл", "Вкл") #define TR_DISABLE_INTERNAL TR("Откл внутр.", "Откл внут RF") #define TR_MODULE_NO_SERIAL_MODE TR("!Режим SERIAL", "Не в режиме SERIAL") @@ -555,8 +551,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Кн9-16 Телем Вкл" #define TR_BINDING_CH9_16_TELEM_OFF "Кн9-16 Телем Выкл" #define TR_PROTOCOL_INVALID TR("Недопус протокол", "Протокол недейств") -#define TR_MODULE_STATUS TR(INDENT "Статус", INDENT "Статус") -#define TR_MODULE_SYNC TR(INDENT "Синхро", INDENT "Синхро протокола") +#define TR_MODULE_STATUS TR("Статус", "Статус") +#define TR_MODULE_SYNC TR("Синхро", "Синхро протокола") #define TR_MULTI_SERVOFREQ TR("Частота серво", "Частота серво") #define TR_MULTI_MAX_THROW TR("Макс. ход", "Вкл макс. ход") #define TR_MULTI_RFCHAN TR("RF Канал", "Выбр RF канал") @@ -573,7 +569,7 @@ #define TR_REPEAT_AT_ZERO "Повт при нуле" #define TR_BATT_CALIB TR("Калибр АКБ", "Калибр АКБ") #define TR_CURRENT_CALIB "Калибр тока" -#define TR_VOLTAGE TR(INDENT "Напряжение", INDENT "Напряжение") +#define TR_VOLTAGE TR("Напряжение", "Напряжение") #define TR_SELECT_MODEL "Выбор модели" #define TR_MANAGE_MODELS "УПРАВЛЕНИЕ МОДЕЛЯМИ" #define TR_MODELS "Модели" @@ -644,7 +640,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nЛоги и скриншоты откл" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Логи и скриншоты" LCDW_128_480_LINEBREAK "Откл" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Логи и скриншоты" LCDW_128_LINEBREAK "Откл" #endif #define TR_NEEDS_FILE "НУЖЕН ФАЙЛ" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -676,7 +672,6 @@ #define TR_CPU_TEMP "Темпер проц" #define TR_COPROC "Сопроцессор" #define TR_COPROC_TEMP "Темпер сопроц" -#define TR_TEMPWARNING INDENT "Перегрев" #define TR_TTL_WARNING "Внимание: Не превышать напряжение 3,3 В на выводах TX/RX !" #define TR_FUNC "Функция" #define TR_V1 "V1" @@ -753,11 +748,10 @@ #endif #define TR_SD_INFO_TITLE "SD Инфо" -#define TR_SD_TYPE "Тип:" #define TR_SD_SPEED "Скорость:" #define TR_SD_SECTORS "Сектора:" #define TR_SD_SIZE "Размер:" -#define TR_TYPE INDENT "Тип" +#define TR_TYPE "Тип" #define TR_GLOBAL_VARS "Глоб переменные" #define TR_GVARS "ГЛОБ ПЕРЕМ" #define TR_GLOBAL_VAR "Глоб переменная" @@ -805,7 +799,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Доступно больше опций" #define TR_NO_MODULE_INFORMATION "Нет инфо о модуле" #define TR_EXTERNALRF "Внеш RF" -#define TR_FAILSAFE TR(INDENT "Сбой", INDENT "Режим сбоя") +#define TR_FAILSAFE TR("Сбой", "Режим сбоя") #define TR_FAILSAFESET "Настройки сбоя" #define TR_REG_ID "ID регистр." #define TR_OWNER_ID "ID владел." @@ -889,7 +883,7 @@ #define TR_SET BUTTON("Установить") #define TR_TRAINER "Тренажер" #define TR_CHANS "Каналы" -#define TR_ANTENNAPROBLEM CENTER "Проблема с антенной TX!" +#define TR_ANTENNAPROBLEM "Проблема с антенной TX!" #define TR_MODELIDUSED "ID использован в:" #define TR_MODELIDUNIQUE "ID уникален" #define TR_MODULE "Модуль" @@ -904,8 +898,8 @@ #define TR_DISABLE "Выключено" #define TR_TOPLCDTIMER "Верхний таймер LCD" #define TR_UNIT "Единица" -#define TR_TELEMETRY_NEWSENSOR INDENT "Добавить новый" -#define TR_CHANNELRANGE TR(INDENT "Диапазон", INDENT "Диапазон кан") +#define TR_TELEMETRY_NEWSENSOR "Добавить новый" +#define TR_CHANNELRANGE TR("Диапазон", "Диапазон кан") #define TR_ANTENNACONFIRM1 "ВНЕШ АНТЕННА" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Внут","Запрос","На модель","Внутр + Внеш" @@ -919,9 +913,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Требует FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Требует EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "Сертифиц ПО" -#define TR_LOWALARM INDENT "Низкий сигнал" -#define TR_CRITICALALARM INDENT "Критич сигнал" -#define TR_DISABLE_ALARM TR(INDENT "Откл сигналы", INDENT "Откл сигналы") +#define TR_LOWALARM "Низкий сигнал" +#define TR_CRITICALALARM "Критич сигнал" +#define TR_DISABLE_ALARM TR("Откл сигналы", "Откл сигналы") #define TR_POPUP "Всплыв" #define TR_MIN "Мин" #define TR_MAX "Макс" @@ -944,8 +938,8 @@ #define TR_CONSTANT "Постоянное значение" #define TR_PREFLIGHT_POTSLIDER_CHECK "Выкл","Вкл","Авто" #define TR_PREFLIGHT "Предстарт проверки" -#define TR_CHECKLIST TR(INDENT "Контр список", INDENT "Контр список") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-интерактив", INDENT "Интерактив checklist", INDENT "Интерактивный checklist") +#define TR_CHECKLIST TR("Контр список", "Контр список") +#define TR_CHECKLIST_INTERACTIVE TR3("C-интерактив", "Интерактив checklist", "Интерактивный checklist") #define TR_AUX_SERIAL_MODE "Послед порт" #define TR_AUX2_SERIAL_MODE "Послед порт 2" #define TR_AUX_SERIAL_PORT_POWER "Мощность порта" @@ -1097,7 +1091,7 @@ #define TR_UNSUPPORTED_RX "Непод приёмник" #define TR_OTA_UPDATE_ERROR "Ошибка OTA-обновл" #define TR_DEVICE_RESET "Сброс устройства..." -#define TR_ALTITUDE INDENT "Высота" +#define TR_ALTITUDE "Высота" #define TR_SCALE "Масштаб" #define TR_VIEW_CHANNELS "Просмотр каналов" #define TR_VIEW_NOTES "Просмотр заметок" @@ -1119,8 +1113,7 @@ #define TR_ONLYPOSITIVE "Положител" #define TR_FILTER "Фильтр" #define TR_TELEMETRYFULL TR("Слоты заняты!", "Слоты заняты!") -#define TR_INVERTED_SERIAL INDENT "Инвертир" -#define TR_IGNORE_INSTANCE TR(INDENT "Нет инстанса", INDENT "Игнор инстансы") +#define TR_IGNORE_INSTANCE TR("Нет инстанса", "Игнор инстансы") #define TR_SHOW_INSTANCE_ID "Показать ID инстанса" #define TR_DISCOVER_SENSORS "Поиск нов датч" #define TR_STOP_DISCOVER_SENSORS "Остановить" @@ -1137,12 +1130,7 @@ #define TR_SETUP "Настройка" #define TR_LAYOUT "Макет" #define TR_ADD_MAIN_VIEW "Добавить экран" -#define TR_BACKGROUND_COLOR "Цвет фона" -#define TR_MAIN_COLOR "Основной цвет" -#define TR_BAR2_COLOR "Цвет вторич панели" -#define TR_BAR1_COLOR "Основной цвет панели" #define TR_TEXT_COLOR "Цвет текста" -#define TR_TEXT_VIEWER "Текстовый" #define TR_MENU_INPUTS STR_CHAR_INPUT "Входы" #define TR_MENU_LUA STR_CHAR_LUA "Скрипты Lua" #define TR_MENU_STICKS STR_CHAR_STICK "Axis" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 15794b3a3dc..d307bcc0267 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -70,7 +70,7 @@ #define TR_MULTI_CUSTOM "Anpassad" #define TR_VTRIMINC TR("Expo","Exponentiell"),TR("xFin","Extra fin"),"Fin","Medium","Grov" #define TR_VDISPLAYTRIMS "Nej","Ändring","Ja" -#define TR_VBEEPCOUNTDOWN "Tyst", "Pip", "Röst", "Vibrera", TR2_2("P & Vib","Pip & Vibrera"),TR2_2("R & Vib","Röst & Vibrera") +#define TR_VBEEPCOUNTDOWN "Tyst", "Pip", "Röst", "Vibrera", TR("P & Vib","Pip & Vibrera"),TR("R & Vib","Röst & Vibrera") #define TR_VVARIOCENTER "Pip","Tyst" #define TR_CURVE_TYPES "Normal","Anpassad" @@ -291,9 +291,9 @@ #define TR_BEEPCTR TR("Cntr. pip", "Pip när centrerad") #define TR_USE_GLOBAL_FUNCS TR("Glob.funk.", "Anv. globala funk.") #define TR_PROTOCOL TR("Proto.", "Protokoll") -#define TR_PPMFRAME INDENT "PPM-paket" -#define TR_REFRESHRATE TR(INDENT "Refresh", INDENT "Refresh rate") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Utspänning = VBAT: ", INDENT "VARNING: Utspänning är VBAT: ") +#define TR_PPMFRAME "PPM-paket" +#define TR_REFRESHRATE TR("Refresh", "Refresh rate") +#define STR_WARN_BATTVOLTAGE TR("Utspänning = VBAT: ", "VARNING: Utspänning är VBAT: ") #define TR_WARN_5VOLTS "VARNING: Spänning ut är 5 volt" #define TR_MS "ms" #define TR_SWITCH "Brytare" @@ -306,9 +306,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Kolla FL-trimmar" #else - #define TR_CHECKTRIMS CENTER "\006Kolla\012trimmar" + #define TR_CHECKTRIMS "\006Kolla\012trimmar" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Swashtyp" #define TR_COLLECTIVE "Kollektiv" #define TR_AILERON "Skevroderkälla" @@ -320,7 +319,7 @@ #else #define TR_LEFT_STICK "Vä" #endif -#define TR_SUBTYPE INDENT "Subtyp" +#define TR_SUBTYPE "Subtyp" #define TR_NOFREEEXPO "Ingen ledig expo!" #define TR_NOFREEMIXER "Ingen ledig mixer!" #define TR_SOURCE "Källa" @@ -350,8 +349,8 @@ #define TR_GV TR("G","GV") #endif -#define TR_RANGE INDENT "MinMax" -#define TR_CENTER INDENT "Center" +#define TR_RANGE "MinMax" +#define TR_CENTER "Center" #define TR_ALARM "Alarm" #define TR_BLADES "Blad" #define TR_SCREEN "Skärm\001" @@ -385,27 +384,25 @@ #define TR_THROTTLE_START "Gas Start" #define TR_THROTTLEREVERSE TR("Omv. gas", "Omvänd gas") #define TR_MINUTEBEEP "Minutpip" -#define TR_BEEPCOUNTDOWN INDENT "Nedräkning" -#define TR_PERSISTENT INDENT "Beständig" +#define TR_BEEPCOUNTDOWN "Nedräkning" +#define TR_PERSISTENT "Beständig" #define TR_BACKLIGHT_LABEL "Belysning" #define TR_GHOST_MENU_LABEL "GHOST MENY" #define TR_STATUS "Status" -#define TR_BLDELAY INDENT "Av efter" -#define TR_BLONBRIGHTNESS INDENT "Ljusstyrka på" -#define TR_BLOFFBRIGHTNESS INDENT "Ljusstyrka av" +#define TR_BLONBRIGHTNESS "Ljusstyrka på" +#define TR_BLOFFBRIGHTNESS "Ljusstyrka av" #define TR_KEYS_BACKLIGHT "Tangentbelysning" #define TR_SPLASHSCREEN "Startbild" #define TR_PLAY_HELLO "Startljud" #define TR_PWR_ON_DELAY "Fördröj start" #define TR_PWR_OFF_DELAY "Fördröj avslut" #define TR_BLCOLOR "Färg" -#define TR_THROTTLE_WARNING TR(INDENT "Gasvarn.", INDENT "Gasvarning") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Egen pos", INDENT INDENT INDENT INDENT "Egen position?") +#define TR_THROTTLE_WARNING TR("Gasvarn.", "Gasvarning") +#define TR_CUSTOM_THROTTLE_WARNING TR("Egen pos", "Egen position?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Pos. %", "Position %") -#define TR_SWITCHWARNING TR(INDENT "Bryt.varn.", INDENT "Brytarvarning") -#define TR_POTWARNINGSTATE TR(INDENT "Vred&Regl.", INDENT "Vred & reglage") -#define TR_SLIDERWARNING TR(INDENT "Regl. pos.", INDENT "Reglagepositioner") -#define TR_POTWARNING TR(INDENT "Vredläge", INDENT "Vredlägen") +#define TR_SWITCHWARNING TR("Bryt.varn.", "Brytarvarning") +#define TR_POTWARNINGSTATE "Vred & reglage" +#define TR_POTWARNING TR("Vredläge", "Vredlägen") #define TR_TIMEZONE "Tidszon" #define TR_ADJUST_RTC "Justera RTC" #define TR_GPS "GPS" @@ -431,20 +428,20 @@ #define TR_SETMIDPOINT "CENTRERA AXLAR/REGLAGE" #define TR_MOVESTICKSPOTS "RÖR AXLAR/VRED" #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " FÖR ATT STARTA" + #define TR_MENUTOSTART TR_ENTER " FÖR ATT STARTA" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006CENTRERA VRED" - #define TR_MOVESTICKSPOTS CENTER "\002RÖR ST/GA/VRED/AXLAR" + #define TR_SETMIDPOINT "CENTRERA VRED" + #define TR_MOVESTICKSPOTS "RÖR ST/GA/VRED/AXLAR" #else - #define TR_SETMIDPOINT TR(CENTER "\006CENTRERA AXLAR", CENTER "\004CENTRERA AXLAR/REGLAGE") - #define TR_MOVESTICKSPOTS CENTER "\007RÖR AXLAR/VRED" + #define TR_SETMIDPOINT TR("CENTRERA AXLAR", "CENTRERA AXLAR/REGLAGE") + #define TR_MOVESTICKSPOTS "RÖR AXLAR/VRED" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " AVSLUTAR" + #define TR_MENUWHENDONE TR_ENTER " AVSLUTAR" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "DATA SAKNAS" +#define TR_NODATA "DATA SAKNAS" #define TR_US "us" #define TR_HZ "Hz" @@ -547,13 +544,12 @@ #define TR_RF_POWER "RF styrka" #define TR_MULTI_FIXEDID TR("FastID", "Fast ID") #define TR_MULTI_OPTION TR("Alternativ", "Alternativets värde") -#define TR_MULTI_AUTOBIND TR(INDENT "Bind ka.",INDENT "Bind via kanal") +#define TR_MULTI_AUTOBIND TR("Bind ka.","Bind via kanal") #define TR_DISABLE_CH_MAP TR("Mappa ej KA", "Inaktivera kanalmappning") #define TR_DISABLE_TELEM TR("Ej telem.", "Inaktivera telemetri") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Auto", INDENT "Autodetektera format") -#define TR_MULTI_LOWPOWER TR(INDENT "Låg effekt", INDENT "Lågeffektläge") -#define TR_MULTI_LNA_DISABLE INDENT "LNA disable" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("Låg effekt", "Lågeffektläge") +#define TR_MULTI_LNA_DISABLE "LNA disable" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("På", "Aktiverad") #define TR_DISABLE_INTERNAL TR("Inaktiv. int. RF", "Inaktivera intern RF") #define TR_MODULE_NO_SERIAL_MODE TR("!seriellt läge", "Ej i seriellt läge") @@ -571,8 +567,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ka9-16 Telem på" #define TR_BINDING_CH9_16_TELEM_OFF "Ka9-16 Telem av" #define TR_PROTOCOL_INVALID TR("Prot ogiltigt", "Ogiltigt protokoll") -#define TR_MODULE_STATUS TR(INDENT "Status", INDENT "Modulstatus") -#define TR_MODULE_SYNC TR(INDENT "Synk", INDENT "Proto synk.status") +#define TR_MODULE_STATUS TR("Status", "Modulstatus") +#define TR_MODULE_SYNC TR("Synk", "Proto synk.status") #define TR_MULTI_SERVOFREQ TR("Servofrekv.", "Servouppdateringsfrekvens") #define TR_MULTI_MAX_THROW TR("Max. utslag", "Aktivera max. utslag") #define TR_MULTI_RFCHAN TR("RF kanal", "Välj RF kanal") @@ -584,7 +580,7 @@ #define TR_REPEAT_AT_ZERO TR("Rep. vid noll", "Repetera vid noll") #define TR_BATT_CALIB TR("Kalib. batt." ,"Kalibrera batteri") #define TR_CURRENT_CALIB "Kalib. ström" -#define TR_VOLTAGE INDENT "Volt" +#define TR_VOLTAGE "Volt" #define TR_SELECT_MODEL "Välj modell" #define TR_MANAGE_MODELS "MODELLHANTERING" #define TR_MODELS "Modeller" @@ -655,7 +651,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nLoggar och skärmklipp inaktiverade" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Loggar och " LCDW_128_480_LINEBREAK "skärmklipp inaktiverade" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Loggar och " LCDW_128_LINEBREAK "skärmklipp inaktiverade" #endif #define TR_NEEDS_FILE "BEHÖVER FIL" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -687,7 +683,6 @@ #define TR_CPU_TEMP "CPU temp.\016>" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "MB temp. \016>" -#define TR_TEMPWARNING TR(INDENT "Hög temp", INDENT "Hög temperatur") #define TR_TTL_WARNING "Varning: Överskrid inte 3.3V på TX/RX pinnarna!" #define TR_FUNC "Funktion" #define TR_V1 "Värde 1" @@ -763,11 +758,10 @@ #define TR_BLUETOOTH_MODES "---","Telemetri","Lärare" #endif #define TR_SD_INFO_TITLE "SD INFO" -#define TR_SD_TYPE "Typ: " #define TR_SD_SPEED "Hastighet:" #define TR_SD_SECTORS "Sektorer:" #define TR_SD_SIZE "Strl:" -#define TR_TYPE INDENT "Typ" +#define TR_TYPE "Typ" #define TR_GLOBAL_VARS "Globala variabler" #define TR_GVARS "GLOBAL V." #define TR_GLOBAL_VAR "Global variabel" @@ -817,7 +811,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Fler alternativ finns" #define TR_NO_MODULE_INFORMATION "Modulinformation saknas" #define TR_EXTERNALRF "Extern radiomodul" -#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafeläge") +#define TR_FAILSAFE TR("Failsafe", "Failsafeläge") #define TR_FAILSAFESET "Failsafeinställning" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "Ägar-ID" @@ -901,7 +895,7 @@ #define TR_SET BUTTON(TR("Def", "Ställ in")) #define TR_TRAINER "Lärare" #define TR_CHANS "Kan" -#define TR_ANTENNAPROBLEM CENTER "Fel på TX-antennen" +#define TR_ANTENNAPROBLEM "Fel på TX-antennen" #if defined(COLORLCD) #define TR_MODELIDUSED "ID använt i:" #else @@ -920,8 +914,8 @@ #define TR_DISABLE "Inaktivera" #define TR_TOPLCDTIMER "Översta LCD timer" #define TR_UNIT "Enhet" -#define TR_TELEMETRY_NEWSENSOR INDENT "Lägg till..." -#define TR_CHANNELRANGE TR(INDENT "Kanalomr.", INDENT "Kanalområde") +#define TR_TELEMETRY_NEWSENSOR "Lägg till..." +#define TR_CHANNELRANGE TR("Kanalomr.", "Kanalområde") #define TR_AFHDS3_RX_FREQ TR("Rx frekv.", "Rx frekvens") #define TR_AFHDS3_ONE_TO_ONE_TELEMETRY TR("Unicast/Tel.", "Unicast/Telemetry") #define TR_AFHDS3_ONE_TO_MANY "Multicast" @@ -942,9 +936,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Kräver FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Kräver EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "certifierad firmware" -#define TR_LOWALARM INDENT "Lågalarm" -#define TR_CRITICALALARM INDENT "Kritiskt alarm" -#define TR_DISABLE_ALARM TR(INDENT "Inaktivera alarm", INDENT "Inaktivera telemetrialarm") +#define TR_LOWALARM "Lågalarm" +#define TR_CRITICALALARM "Kritiskt alarm" +#define TR_DISABLE_ALARM TR("Inaktivera alarm", "Inaktivera telemetrialarm") #define TR_POPUP "Popup" #define TR_MIN "Min" #define TR_MAX "Max" @@ -968,8 +962,8 @@ #define TR_PREFLIGHT_POTSLIDER_CHECK "Av","På","Auto" #define TR_PREFLIGHT "Startkontroller" #define TR_PREFLIGHT_POTSLIDER_CHECK "Av","På","Auto" -#define TR_CHECKLIST TR(INDENT "Checklista", INDENT "Visa checklista") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "C-Interakt", INDENT "Interakt. checklista", INDENT "Interaktiv checklista") +#define TR_CHECKLIST TR("Checklista", "Visa checklista") +#define TR_CHECKLIST_INTERACTIVE TR3("C-Interakt", "Interakt. checklista", "Interaktiv checklista") #define TR_AUX_SERIAL_MODE "Serieport" #define TR_AUX2_SERIAL_MODE "Serieport 2" #define TR_AUX_SERIAL_PORT_POWER "Strömkälla" @@ -1121,7 +1115,7 @@ #define TR_UNSUPPORTED_RX "Rx stöds ej" #define TR_OTA_UPDATE_ERROR "OTA uppdateringsfel" #define TR_DEVICE_RESET "Device reset..." -#define TR_ALTITUDE INDENT "Höjd" +#define TR_ALTITUDE "Höjd" #define TR_SCALE "Skala" #define TR_VIEW_CHANNELS "Visa kanaler" #define TR_VIEW_NOTES "Visa anteckningar" @@ -1144,8 +1138,7 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "Alla telemetriplatser upptagna!" -#define TR_INVERTED_SERIAL INDENT "Inverterad" -#define TR_IGNORE_INSTANCE TR(INDENT "Ej inst.", INDENT "Ignorera instansfel") +#define TR_IGNORE_INSTANCE TR("Ej inst.", "Ignorera instansfel") #define TR_SHOW_INSTANCE_ID "Visa instans-ID" #define TR_DISCOVER_SENSORS "Sök nya" #define TR_STOP_DISCOVER_SENSORS "Avbryt sökning" @@ -1168,12 +1161,7 @@ #define TR_SETUP "Konfigurera" #define TR_LAYOUT "Layout" #define TR_ADD_MAIN_VIEW "Lägg till huvudvy" -#define TR_BACKGROUND_COLOR "Bakgrundsfärg" -#define TR_MAIN_COLOR "Huvudfärg" -#define TR_BAR2_COLOR "Sekundär stapelfärg" -#define TR_BAR1_COLOR "Primär stapelfärg" #define TR_TEXT_COLOR "Textfärg" -#define TR_TEXT_VIEWER "Textgranskare" #define TR_MENU_INPUTS STR_CHAR_INPUT "Input" #define TR_MENU_LUA STR_CHAR_LUA "Lua-skript" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 196c83b6405..bb125e95a81 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -278,9 +278,9 @@ #define TR_TTRIM_SW TR("微調選擇", "微調選擇") #define TR_BEEPCTR TR("中點提示音", "中點蜂鳴提示音") #define TR_USE_GLOBAL_FUNCS TR("全局功能", "全局功能可介入") -#define TR_PPMFRAME INDENT "PPM幀" -#define TR_REFRESHRATE TR(INDENT "刷新率", INDENT "刷新速率") -#define STR_WARN_BATTVOLTAGE TR(INDENT "輸出為電池電壓: ", INDENT "注意輸出電平為電池電壓") +#define TR_PPMFRAME "PPM幀" +#define TR_REFRESHRATE TR("刷新率", "刷新速率") +#define STR_WARN_BATTVOLTAGE TR("輸出為電池電壓: ", "注意輸出電平為電池電壓") #define TR_WARN_5VOLTS "注意輸出電平是5V" #define TR_MS "ms" #define TR_SWITCH "開關" @@ -295,7 +295,6 @@ #else #define TR_CHECKTRIMS "\006檢查\012微調" #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "斜盤類型" #define TR_COLLECTIVE TR("螺距源", "螺距混控源") #define TR_AILERON TR("橫滾源", "橫滾混控源") @@ -307,7 +306,7 @@ #else #define TR_LEFT_STICK "左搖桿" #endif -#define TR_SUBTYPE INDENT "子類型" +#define TR_SUBTYPE "子類型" #define TR_NOFREEEXPO "指數曲線已滿!" #define TR_NOFREEMIXER "混控數量已滿!" #define TR_SOURCE "輸入源" @@ -335,8 +334,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "範圍" -#define TR_CENTER INDENT "中點" +#define TR_RANGE "範圍" +#define TR_CENTER "中點" #define TR_ALARM "報警" #define TR_BLADES "Blades/Poles" #define TR_SCREEN "屏幕\001" @@ -370,12 +369,11 @@ #define TR_THROTTLE_START "油門開始" #define TR_THROTTLEREVERSE TR("油門反向", "油門反向") #define TR_MINUTEBEEP TR("分", "分鐘播報") -#define TR_BEEPCOUNTDOWN INDENT "倒數" -#define TR_PERSISTENT TR(INDENT "關機保持", INDENT "關機保持") +#define TR_BEEPCOUNTDOWN "倒數" +#define TR_PERSISTENT TR("關機保持", "關機保持") #define TR_BACKLIGHT_LABEL "背光" #define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_STATUS "狀態" -#define TR_BLDELAY INDENT "保持時間" #define TR_BLONBRIGHTNESS "背光開" #define TR_BLOFFBRIGHTNESS "背光關" #define TR_KEYS_BACKLIGHT "按鍵背光" @@ -384,13 +382,12 @@ #define TR_PLAY_HELLO "開機語音" #define TR_PWR_ON_DELAY "開機延遲" #define TR_PWR_OFF_DELAY "關機延遲" -#define TR_THROTTLE_WARNING TR(INDENT "油門狀態", INDENT "油門狀態") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "自定位置", INDENT INDENT INDENT INDENT "自定油門位置?") +#define TR_THROTTLE_WARNING TR("油門狀態", "油門狀態") +#define TR_CUSTOM_THROTTLE_WARNING TR("自定位置", "自定油門位置?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("位置 %", "油門位置 %") -#define TR_SWITCHWARNING TR(INDENT "開關位置", INDENT "開關位置") -#define TR_POTWARNINGSTATE TR(INDENT "旋鈕滑塊", INDENT "旋鈕和滑塊") -#define TR_SLIDERWARNING TR(INDENT "滑塊位置", INDENT "滑塊位置") -#define TR_POTWARNING TR(INDENT "旋鈕位置", INDENT "旋鈕位置") +#define TR_SWITCHWARNING TR("開關位置", "開關位置") +#define TR_POTWARNINGSTATE "旋鈕和滑塊" +#define TR_POTWARNING TR("旋鈕位置", "旋鈕位置") #define TR_TIMEZONE "時區" #define TR_ADJUST_RTC "時鐘設置" #define TR_GPS "GPS" @@ -399,7 +396,7 @@ #define TR_POTS "電位器" #define TR_SWITCHES "開關" #define TR_SWITCHES_DELAY TR("開關經過延時", "延時播放(開關經過)") -#define TR_SLAVE CENTER "從機" +#define TR_SLAVE "從機" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "倍率" #define TR_CAL "校準" @@ -415,19 +412,19 @@ #define TR_SETMIDPOINT "校準中點，按[Enter]保存" #define TR_MOVESTICKSPOTS "校準邊界，按[Enter]保存並完成" #else - #define TR_MENUTOSTART CENTER "\010按" TR_ENTER " 開始" + #define TR_MENUTOSTART "按" TR_ENTER " 開始" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006校準中點" - #define TR_MOVESTICKSPOTS CENTER "\002校準邊界" + #define TR_SETMIDPOINT "校準中點" + #define TR_MOVESTICKSPOTS "校準邊界" #else - #define TR_SETMIDPOINT TR(CENTER "\006校準中點", CENTER "\004校準中點") - #define TR_MOVESTICKSPOTS CENTER "\007校準邊界" + #define TR_SETMIDPOINT TR("校準中點", "校準中點") + #define TR_MOVESTICKSPOTS "校準邊界" #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " 完成" + #define TR_MENUWHENDONE TR_ENTER " 完成" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "NO DATA" +#define TR_NODATA "NO DATA" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" @@ -529,13 +526,12 @@ #define TR_RF_POWER "發射功率" #define TR_MULTI_FIXEDID TR("固定ID", "固定ID") #define TR_MULTI_OPTION TR("選項值", "選項值") -#define TR_MULTI_AUTOBIND TR(INDENT "對頻通道", INDENT "通道控制對頻") +#define TR_MULTI_AUTOBIND TR("對頻通道", "通道控制對頻") #define TR_DISABLE_CH_MAP TR("禁用通道映射", "禁用通道重映射") #define TR_DISABLE_TELEM TR("禁用回傳", "禁用回傳") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "自動格式", INDENT "自動識別格式") -#define TR_MULTI_LOWPOWER TR(INDENT "低功率", INDENT "低功率模式") -#define TR_MULTI_LNA_DISABLE INDENT "禁用接收放大器" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") +#define TR_MULTI_LOWPOWER TR("低功率", "低功率模式") +#define TR_MULTI_LNA_DISABLE "禁用接收放大器" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") #define TR_MODULE_TELEM_ON TR("開", "啟用") #define TR_DISABLE_INTERNAL TR("禁用內置發射", "禁用內置發射") #define TR_MODULE_NO_SERIAL_MODE TR("非端口模式", "未開啟端口模式") @@ -553,8 +549,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 開啟回傳" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 關閉回傳" #define TR_PROTOCOL_INVALID TR("無效協議", "無效協議") -#define TR_MODULE_STATUS TR(INDENT "狀態", INDENT "多協議狀態") -#define TR_MODULE_SYNC TR(INDENT "同步", INDENT "協議同步狀態") +#define TR_MODULE_STATUS TR("狀態", "多協議狀態") +#define TR_MODULE_SYNC TR("同步", "協議同步狀態") #define TR_MULTI_SERVOFREQ TR("舵機頻率", "舵機更新頻率") #define TR_MULTI_MAX_THROW TR("Max. Throw", "Enable max. throw") #define TR_MULTI_RFCHAN TR("頻道", "選擇發射頻道") @@ -571,7 +567,7 @@ #define TR_REPEAT_AT_ZERO "無變化報警" #define TR_BATT_CALIB TR("電池校準", "電池電壓校準") #define TR_CURRENT_CALIB "電流校準" -#define TR_VOLTAGE TR(INDENT "電壓源", INDENT "電壓來源") +#define TR_VOLTAGE TR("電壓源", "電壓來源") #define TR_SELECT_MODEL "選擇模型" #define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "個模型" @@ -642,7 +638,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\n日誌和截屏功能將被禁用" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036日誌和 " LCDW_128_480_LINEBREAK "截屏功能將被禁用" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036日誌和 " LCDW_128_LINEBREAK "截屏功能將被禁用" #endif #define TR_NEEDS_FILE "需要文件名包含" #define TR_EXT_MULTI_SPEC "opentx-inv" @@ -674,7 +670,6 @@ #define TR_CPU_TEMP "CPU 溫度" #define TR_COPROC "CoProc." #define TR_COPROC_TEMP "主板溫度" -#define TR_TEMPWARNING INDENT "過熱" #define TR_TTL_WARNING "警告: TX和RX引腳電平不能超過3.3V !" #define TR_FUNC "功能" #define TR_V1 "V1" @@ -751,11 +746,10 @@ #endif #define TR_SD_INFO_TITLE "存儲卡詳情" -#define TR_SD_TYPE "類型:" #define TR_SD_SPEED "速度:" #define TR_SD_SECTORS "扇區:" #define TR_SD_SIZE "容量:" -#define TR_TYPE INDENT "類型" +#define TR_TYPE "類型" #define TR_GLOBAL_VARS "全局變量" #define TR_GVARS "全局變量" #define TR_GLOBAL_VAR "全局變量" @@ -803,7 +797,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "更多可用選項" #define TR_NO_MODULE_INFORMATION "無模塊信息" #define TR_EXTERNALRF "外置發射" -#define TR_FAILSAFE TR(INDENT "失控保護", INDENT "失控保護模式") +#define TR_FAILSAFE TR("失控保護", "失控保護模式") #define TR_FAILSAFESET "失控保護設置" #define TR_REG_ID "Reg. ID" #define TR_OWNER_ID "所有者ID" @@ -887,7 +881,7 @@ #define TR_SET BUTTON("設置") #define TR_TRAINER "教練" #define TR_CHANS "通道" -#define TR_ANTENNAPROBLEM CENTER "發射機天線故障!" +#define TR_ANTENNAPROBLEM "發射機天線故障!" #define TR_MODELIDUSED "ID已使用:" #define TR_MODELIDUNIQUE "ID is unique" #define TR_MODULE "模塊" @@ -902,8 +896,8 @@ #define TR_DISABLE "禁用" #define TR_TOPLCDTIMER "Top LCD Timer" #define TR_UNIT "單位" -#define TR_TELEMETRY_NEWSENSOR INDENT "添加新傳感器..." -#define TR_CHANNELRANGE TR(INDENT "通道範圍", INDENT "通道範圍") +#define TR_TELEMETRY_NEWSENSOR "添加新傳感器..." +#define TR_CHANNELRANGE TR("通道範圍", "通道範圍") #define TR_ANTENNACONFIRM1 "外置天線" #if defined(PCBX12S) #define TR_ANTENNA_MODES "內置天線","詢問","基於模型","外置天線" @@ -917,9 +911,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "請使用FCC版本" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "請使用EU版本" #define TR_MODULE_PROTOCOL_WARN_LINE2 "經認證的韌體" -#define TR_LOWALARM INDENT "信號弱警告" -#define TR_CRITICALALARM INDENT "信號極弱警告" -#define TR_DISABLE_ALARM TR(INDENT "禁止回傳警告", INDENT "禁止回傳警告") +#define TR_LOWALARM "信號弱警告" +#define TR_CRITICALALARM "信號極弱警告" +#define TR_DISABLE_ALARM TR("禁止回傳警告", "禁止回傳警告") #define TR_POPUP "彈窗提示" #define TR_MIN "最小" #define TR_MAX "最大" @@ -942,8 +936,8 @@ #define TR_CONSTANT "固定值" #define TR_PREFLIGHT_POTSLIDER_CHECK "關閉","開啟","自動" #define TR_PREFLIGHT "初始檢查" -#define TR_CHECKLIST TR(INDENT "顯示列表", INDENT "顯示列表") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "檢查列表", INDENT "自定義檢查列表", INDENT "自定義檢查列表") +#define TR_CHECKLIST TR("顯示列表", "顯示列表") +#define TR_CHECKLIST_INTERACTIVE TR3("檢查列表", "自定義檢查列表", "自定義檢查列表") #define TR_AUX_SERIAL_MODE "端口" #define TR_AUX2_SERIAL_MODE "端口 2" #define TR_AUX_SERIAL_PORT_POWER "端口供電" @@ -1095,7 +1089,7 @@ #define TR_UNSUPPORTED_RX "不支持此接收機" #define TR_OTA_UPDATE_ERROR "OTA 更新失敗" #define TR_DEVICE_RESET "正在重啟設備..." -#define TR_ALTITUDE INDENT "高度" +#define TR_ALTITUDE "高度" #define TR_SCALE "比例" #define TR_VIEW_CHANNELS "查看通道" #define TR_VIEW_NOTES "View Notes" @@ -1117,13 +1111,12 @@ #define TR_ONLYPOSITIVE "正向" #define TR_FILTER "濾波器" #define TR_TELEMETRYFULL TR("項目已滿!", "回傳項目已滿!") -#define TR_INVERTED_SERIAL INDENT "反向" -#define TR_IGNORE_INSTANCE TR(INDENT "忽略ID", INDENT "忽略ID鑑別") +#define TR_IGNORE_INSTANCE TR("忽略ID", "忽略ID鑑別") #define TR_SHOW_INSTANCE_ID "顯示實例ID" #define TR_DISCOVER_SENSORS "掃描新的回傳項目" #define TR_STOP_DISCOVER_SENSORS "停止掃描" #define TR_DELETE_ALL_SENSORS "刪除所有回傳項目" -#define TR_CONFIRMDELETE "真的 " LCDW_128_480_LINEBREAK "要刪除全部嗎 ?" +#define TR_CONFIRMDELETE "真的 " LCDW_128_LINEBREAK "要刪除全部嗎 ?" #define TR_SELECT_WIDGET "選擇小部件" #define TR_WIDGET_FULLSCREEN "全屏" #define TR_REMOVE_WIDGET "移除小部件" @@ -1135,12 +1128,7 @@ #define TR_SETUP "設置" #define TR_LAYOUT "佈局" #define TR_ADD_MAIN_VIEW "添加主視圖" -#define TR_BACKGROUND_COLOR "背景顏色" -#define TR_MAIN_COLOR "主顏色" -#define TR_BAR2_COLOR "二級條形圖顏色" -#define TR_BAR1_COLOR "主條形圖顏色" #define TR_TEXT_COLOR "文本顏色" -#define TR_TEXT_VIEWER "文本視圖" #define TR_MENU_INPUTS STR_CHAR_INPUT "輸入" #define TR_MENU_LUA STR_CHAR_LUA "LUA腳本" #define TR_MENU_STICKS STR_CHAR_STICK "搖桿(軸)" diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 94bbd533e86..eb31dcfc78e 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -62,7 +62,7 @@ #define TR_MULTI_CUSTOM "Налаштований" #define TR_VTRIMINC TR("Експо","Експоненц."),TR("Наддрібн.","Над дрібно"),"Дрібно","Середньо","Грубо" #define TR_VDISPLAYTRIMS "Немає","Змін.","Так" -#define TR_VBEEPCOUNTDOWN "Тихо","Сигн.","Голос","Вібро",TR2_2("С & В","Сигн. & Вібро"),TR2_2("Г & В","Голос & Вібро") +#define TR_VBEEPCOUNTDOWN "Тихо","Сигн.","Голос","Вібро",TR("С & В","Сигн. & Вібро"),TR("Г & В","Голос & Вібро") #define TR_COUNTDOWNVALUES "5с","10с","20с","30с" #define TR_VVARIOCENTER "Тон","Тиша" #define TR_CURVE_TYPES "Стандарт","Вибір" @@ -280,9 +280,9 @@ #define TR_BEEPCTR TR("Сигн. в центр", "Сигнал в центрі") #define TR_USE_GLOBAL_FUNCS TR("Глоб.функц.", "Викор. глобальні функції") #define TR_PROTOCOL TR("Проток.", "Протокол") -#define TR_PPMFRAME INDENT "PPM прийм" -#define TR_REFRESHRATE TR(INDENT "Оновл.", INDENT "Частота оновлення") -#define STR_WARN_BATTVOLTAGE TR(INDENT "Вихід VBAT: ", INDENT "Warning: вихідний рівень VBAT: ") /* for untranslated - use english */ +#define TR_PPMFRAME "PPM прийм" +#define TR_REFRESHRATE TR("Оновл.", "Частота оновлення") +#define STR_WARN_BATTVOLTAGE TR("Вихід VBAT: ", "Warning: вихідний рівень VBAT: ") /* for untranslated - use english */ #define TR_WARN_5VOLTS "Warning: вихідний рівень 5 вольт" #define TR_MS "ms" #define TR_SWITCH "Перемикач" @@ -295,9 +295,8 @@ #if defined(COLORLCD) #define TR_CHECKTRIMS "Перевірка FM трим." #else - #define TR_CHECKTRIMS CENTER "\006Перевір\012трим." + #define TR_CHECKTRIMS "\006Перевір\012трим." #endif -#define OFS_CHECKTRIMS CENTER_OFS+(9*FW) #define TR_SWASHTYPE "Тип перекосу" #define TR_COLLECTIVE TR("Колективний", "Колективне джерело тону") #define TR_AILERON TR("Крен", "Крен") @@ -309,7 +308,7 @@ #else #define TR_LEFT_STICK "Ліво" #endif -#define TR_SUBTYPE INDENT "Підтип" +#define TR_SUBTYPE "Підтип" #define TR_NOFREEEXPO "Немає вільного expo!" #define TR_NOFREEMIXER "Немає вільного мікшеру!" #define TR_SOURCE "Джерело" @@ -337,8 +336,8 @@ #else #define TR_GV TR("G", "GV") #endif -#define TR_RANGE INDENT "Діапазон" -#define TR_CENTER INDENT "Центр" +#define TR_RANGE "Діапазон" +#define TR_CENTER "Центр" #define TR_ALARM "Тривога" #define TR_BLADES "Леза/Піни" /*need to be clarified by context*/ #define TR_SCREEN "Екран\001" @@ -372,27 +371,25 @@ #define TR_THROTTLE_START "Газ на старт" #define TR_THROTTLEREVERSE TR("Газ-реверс", "Реверс") #define TR_MINUTEBEEP TR("Хв.", "Хв. сигнал") -#define TR_BEEPCOUNTDOWN INDENT "Відлік" -#define TR_PERSISTENT TR(INDENT "Присутн.", INDENT "Присутній") +#define TR_BEEPCOUNTDOWN "Відлік" +#define TR_PERSISTENT TR("Присутн.", "Присутній") #define TR_BACKLIGHT_LABEL "Підсвітка" #define TR_GHOST_MENU_LABEL "Меню Привид" #define TR_STATUS "Статус" -#define TR_BLDELAY INDENT "Тривалість" -#define TR_BLONBRIGHTNESS INDENT "ON яскравість" -#define TR_BLOFFBRIGHTNESS INDENT "OFF яскравість" +#define TR_BLONBRIGHTNESS "ON яскравість" +#define TR_BLOFFBRIGHTNESS "OFF яскравість" #define TR_KEYS_BACKLIGHT "Яскравість кнопки" #define TR_BLCOLOR "Колір" #define TR_SPLASHSCREEN "Заставка" #define TR_PLAY_HELLO "Звук запуску" #define TR_PWR_ON_DELAY "Pwr On затримка" #define TR_PWR_OFF_DELAY "Pwr Off затримка" -#define TR_THROTTLE_WARNING TR(INDENT "Г-попер.", INDENT "Стан Газу") -#define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Користув. полож.", INDENT INDENT INDENT INDENT "Користувацьке положення?") +#define TR_THROTTLE_WARNING TR("Г-попер.", "Стан Газу") +#define TR_CUSTOM_THROTTLE_WARNING TR("Користув. полож.", "Користувацьке положення?") #define TR_CUSTOM_THROTTLE_WARNING_VAL TR("Полож. %", "Положення %") -#define TR_SWITCHWARNING TR(INDENT "Позиц. перемик.", INDENT "Позиції пермикача") /*need to be clarified by context*/ -#define TR_POTWARNINGSTATE TR(INDENT "Потенц.&Повзун.", INDENT "Потенціометри & Повзунки") -#define TR_SLIDERWARNING TR(INDENT "Позиц. повзунк.", INDENT "Позиція повзунків") /*need to be clarified by context*/ -#define TR_POTWARNING TR(INDENT "Потенц.", INDENT "Позиц. потенц.") /*need to be clarified by context*/ +#define TR_SWITCHWARNING TR("Позиц. перемик.", "Позиції пермикача") /*need to be clarified by context*/ +#define TR_POTWARNINGSTATE "Потенціометри & Повзунки" +#define TR_POTWARNING TR("Потенц.", "Позиц. потенц.") /*need to be clarified by context*/ #define TR_TIMEZONE "Часовий пояс" #define TR_ADJUST_RTC "налаштувати RTC" #define TR_GPS "GPS" /* use english */ @@ -401,7 +398,7 @@ #define TR_POTS "Потенціометри" #define TR_SWITCHES "Перемикачі" #define TR_SWITCHES_DELAY TR("Затримка відтвор.", "Затримка відтворення (середнє полож. перем.)") -#define TR_SLAVE CENTER "Slave" /* use english */ +#define TR_SLAVE "Slave" /* use english */ #define TR_MODESRC "Mode\006% Source" /* use english */ #define TR_MULTIPLIER "Множник" #define TR_CAL "Калібрув." @@ -417,19 +414,19 @@ #define TR_SETMIDPOINT "ЦЕНТРУВАТИ ВАЖЕЛІ/ПОВЗУНКИ" #define TR_MOVESTICKSPOTS "РУХАЙТЕ ВІСІ/ПОТЕНЦ." #else - #define TR_MENUTOSTART CENTER "\010" TR_ENTER " ДЛЯ СТАРТУ" + #define TR_MENUTOSTART TR_ENTER " ДЛЯ СТАРТУ" #if defined(SURFACE_RADIO) - #define TR_SETMIDPOINT CENTER "\006ВІДЦЕНТР. ПОТЕНЦ." - #define TR_MOVESTICKSPOTS CENTER "\002РУХАЙТЕ ST/TH/ПОТЕНЦ./ВІСІ" + #define TR_SETMIDPOINT "ВІДЦЕНТР. ПОТЕНЦ." + #define TR_MOVESTICKSPOTS "РУХАЙТЕ ST/TH/ПОТЕНЦ./ВІСІ" #else - #define TR_SETMIDPOINT TR(CENTER "\006ВІДЦЕНТР. ВІСІ", CENTER "\004ВІДЦЕНТР. ВІСІ/ПОВЗУНКИ") - #define TR_MOVESTICKSPOTS CENTER "\007РУХАЙТЕ ВІСІ/ПОТЕНЦ." + #define TR_SETMIDPOINT TR("ВІДЦЕНТР. ВІСІ", "ВІДЦЕНТР. ВІСІ/ПОВЗУНКИ") + #define TR_MOVESTICKSPOTS "РУХАЙТЕ ВІСІ/ПОТЕНЦ." #endif - #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " КОЛИ ЗАКІНЧЕНО" + #define TR_MENUWHENDONE TR_ENTER " КОЛИ ЗАКІНЧЕНО" #endif #define TR_TXnRX "Tx:\0Rx:" #define OFS_RX 4 -#define TR_NODATA CENTER "НЕМАЄ ДАНИХ" +#define TR_NODATA "НЕМАЄ ДАНИХ" #define TR_US "us" #define TR_HZ "Hz" #define TR_TMIXMAXMS "Tmix max" /* use english */ @@ -531,13 +528,12 @@ #define TR_RF_POWER "RF Потужність" #define TR_MULTI_FIXEDID TR("FixedID", "Fixed ID") /* use english */ #define TR_MULTI_OPTION TR("Опція", "Значення опції") -#define TR_MULTI_AUTOBIND TR(INDENT "Прив'язка до кан.", INDENT "Прив'язка до каналу") +#define TR_MULTI_AUTOBIND TR("Прив'язка до кан.", "Прив'язка до каналу") #define TR_DISABLE_CH_MAP TR("Викл. карту каналів", "Виключити карту каналів") #define TR_DISABLE_TELEM TR("Викл. телеметрії", "Виключити телеметрію") -#define TR_MULTI_DSM_AUTODTECT TR(INDENT "Автовизначення", INDENT "Формат автовизначення") -#define TR_MULTI_LOWPOWER TR(INDENT "Низька потужн.", INDENT "Режим низької потужності") -#define TR_MULTI_LNA_DISABLE INDENT "Вимкн. LNA" -#define TR_MODULE_TELEMETRY TR(INDENT "S.Port", INDENT "S.Port link") /* use english */ +#define TR_MULTI_LOWPOWER TR("Низька потужн.", "Режим низької потужності") +#define TR_MULTI_LNA_DISABLE "Вимкн. LNA" +#define TR_MODULE_TELEMETRY TR("S.Port", "S.Port link") /* use english */ #define TR_MODULE_TELEM_ON TR("ON", "Увімкнено") #define TR_DISABLE_INTERNAL TR("Вимкн. внутр.", "Вимкнути внутрішній RF") #define TR_MODULE_NO_SERIAL_MODE TR("Не Serial реж.", "Не в Serial режимі") @@ -555,8 +551,8 @@ #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Телем ON" #define TR_BINDING_CH9_16_TELEM_OFF "Ch9-16 Телем OFF" #define TR_PROTOCOL_INVALID TR("Прот.невірн.", "Протокол невірний") -#define TR_MODULE_STATUS TR(INDENT "Статус", INDENT "Статус модуля") -#define TR_MODULE_SYNC TR(INDENT "Синх", INDENT "Синхро протоколу") +#define TR_MODULE_STATUS TR("Статус", "Статус модуля") +#define TR_MODULE_SYNC TR("Синх", "Синхро протоколу") #define TR_MULTI_SERVOFREQ TR("Частота серво", "Частота оновлення серво") #define TR_MULTI_MAX_THROW TR("Max. Хід", "Увімкн. max. хід") #define TR_MULTI_RFCHAN TR("RF Канал", "Обери RF канал") @@ -573,7 +569,7 @@ #define TR_REPEAT_AT_ZERO "Повтори нуль" #define TR_BATT_CALIB TR("Batt. калібр.", "Battery калібровка") #define TR_CURRENT_CALIB "Калібровка струму" -#define TR_VOLTAGE TR(INDENT "Напруга", INDENT "Джерело напруги") +#define TR_VOLTAGE TR("Напруга", "Джерело напруги") #define TR_SELECT_MODEL "Оберіть модель" #define TR_MANAGE_MODELS "КЕРУВАННЯ МОДЕЛЯМИ" #define TR_MODELS "Моделі" @@ -644,7 +640,7 @@ #if defined(COLORLCD) #define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\nЛоги і скріншоти вимкнені" #else -#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Логи і скріншоти" LCDW_128_480_LINEBREAK "вимкнені" +#define TR_SDCARD_FULL_EXT TR_SDCARD_FULL "\036Логи і скріншоти" LCDW_128_LINEBREAK "вимкнені" #endif #define TR_NEEDS_FILE "ПОТРІБЕН ФАЙЛ" #define TR_EXT_MULTI_SPEC "opentx-inv" /*need to be clarified by context*/ @@ -676,7 +672,6 @@ #define TR_CPU_TEMP "CPU темп." #define TR_COPROC "Сопроцессор" #define TR_COPROC_TEMP "MB темп." -#define TR_TEMPWARNING INDENT "Перегрів" #define TR_TTL_WARNING "Увага: Не перевищуйте 3.3V на пінах TX/RX!" #define TR_FUNC "Функція" #define TR_V1 "V1" @@ -753,11 +748,10 @@ #endif #define TR_SD_INFO_TITLE "SD інфо" -#define TR_SD_TYPE "Тип:" #define TR_SD_SPEED "Швидкість:" #define TR_SD_SECTORS "Сектори:" #define TR_SD_SIZE "Розмір:" -#define TR_TYPE INDENT "Тип" +#define TR_TYPE "Тип" #define TR_GLOBAL_VARS "Глобальні змінні" #define TR_GVARS "Г.ЗМ." #define TR_GLOBAL_VAR "Глобальні змінні" @@ -805,7 +799,7 @@ #define TR_MORE_OPTIONS_AVAILABLE "Доступні додаткові опції" #define TR_NO_MODULE_INFORMATION "Інформація по модулю відсутня" #define TR_EXTERNALRF "Зовнішній RF" -#define TR_FAILSAFE TR(INDENT "Відмова", INDENT "Режим відмови") +#define TR_FAILSAFE TR("Відмова", "Режим відмови") #define TR_FAILSAFESET "НАЛАШТУВАННЯ АВАРІЙНОГО РЕЖИМУ" #define TR_REG_ID "Рег. ID" #define TR_OWNER_ID "ID Користувача" @@ -889,7 +883,7 @@ #define TR_SET BUTTON("Встановл.") #define TR_TRAINER "Тренер" #define TR_CHANS "Канали" -#define TR_ANTENNAPROBLEM CENTER "Помилка TX антени!" +#define TR_ANTENNAPROBLEM "Помилка TX антени!" #define TR_MODELIDUSED "ID використано в:" #define TR_MODELIDUNIQUE "ID унікальний" #define TR_MODULE "Модуль" @@ -904,8 +898,8 @@ #define TR_DISABLE "Деактивувати" #define TR_TOPLCDTIMER "Верхній таймер LCD" #define TR_UNIT "Одиниця" -#define TR_TELEMETRY_NEWSENSOR INDENT "Додати новий" -#define TR_CHANNELRANGE TR(INDENT "Діапазон кан.", INDENT "Діапазон каналу") +#define TR_TELEMETRY_NEWSENSOR "Додати новий" +#define TR_CHANNELRANGE TR("Діапазон кан.", "Діапазон каналу") #define TR_ANTENNACONFIRM1 "ЗОВН. АНТЕНА" #if defined(PCBX12S) #define TR_ANTENNA_MODES "Внутрішній","Запит","На модель","Внутрійшній + Зовнішній" @@ -919,9 +913,9 @@ #define TR_MODULE_PROTOCOL_FCC_WARN_LINE1 "Потрібно FCC" #define TR_MODULE_PROTOCOL_EU_WARN_LINE1 "Потрібно EU" #define TR_MODULE_PROTOCOL_WARN_LINE2 "сертифікований firmware" -#define TR_LOWALARM INDENT "Не критична аварія" -#define TR_CRITICALALARM INDENT "Критична аварія" -#define TR_DISABLE_ALARM TR(INDENT "Вимкнути аварії", INDENT "Вимкнути аварії телеметрії") +#define TR_LOWALARM "Не критична аварія" +#define TR_CRITICALALARM "Критична аварія" +#define TR_DISABLE_ALARM TR("Вимкнути аварії", "Вимкнути аварії телеметрії") #define TR_POPUP "Всплив." #define TR_MIN "Min" #define TR_MAX "Max" @@ -944,8 +938,8 @@ #define TR_CONSTANT "Постійна" #define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","AUTO" #define TR_PREFLIGHT "Стартові перевірки" -#define TR_CHECKLIST TR(INDENT "Чекліст", INDENT "Чекліст Дисплею") -#define TR_CHECKLIST_INTERACTIVE TR3(INDENT "Інт. спис.", INDENT "Інтеракт. список", INDENT "Інтерактивний список") +#define TR_CHECKLIST TR("Чекліст", "Чекліст Дисплею") +#define TR_CHECKLIST_INTERACTIVE TR3("Інт. спис.", "Інтеракт. список", "Інтерактивний список") #define TR_AUX_SERIAL_MODE "Послідовний порт" #define TR_AUX2_SERIAL_MODE "Послідовний порт 2" #define TR_AUX_SERIAL_PORT_POWER "Порт живлення" @@ -1097,7 +1091,7 @@ #define TR_UNSUPPORTED_RX "Несумісний RX" #define TR_OTA_UPDATE_ERROR "Помилка оновлення OTA" #define TR_DEVICE_RESET "Скидання пристрою..." -#define TR_ALTITUDE INDENT "Висота" +#define TR_ALTITUDE "Висота" #define TR_SCALE "Масштаб" #define TR_VIEW_CHANNELS "Перегляд каналів" #define TR_VIEW_NOTES "Перегляд нотаток" @@ -1119,13 +1113,12 @@ #define TR_ONLYPOSITIVE "Позитив" #define TR_FILTER "Фільтр" #define TR_TELEMETRYFULL TR("Всі слоти повні!", "Всі слоти телеметрії повні!") -#define TR_INVERTED_SERIAL INDENT "Інверт" -#define TR_IGNORE_INSTANCE TR(INDENT "Немає інстанса.", INDENT "Ігнорувати інстанси") +#define TR_IGNORE_INSTANCE TR("Немає інстанса.", "Ігнорувати інстанси") #define TR_SHOW_INSTANCE_ID "Показати інстанс ID" #define TR_DISCOVER_SENSORS "Пошук нового" #define TR_STOP_DISCOVER_SENSORS "Stop" #define TR_DELETE_ALL_SENSORS "Видалити всі" -#define TR_CONFIRMDELETE "Дійсно " LCDW_128_480_LINEBREAK "видалити всі ?" +#define TR_CONFIRMDELETE "Дійсно " LCDW_128_LINEBREAK "видалити всі ?" #define TR_SELECT_WIDGET "Обрати віджет" #define TR_WIDGET_FULLSCREEN "На весь екран" #define TR_REMOVE_WIDGET "Видалити віджет" @@ -1137,12 +1130,7 @@ #define TR_SETUP "Встановлення" #define TR_LAYOUT "Шар" #define TR_ADD_MAIN_VIEW "Додати головний вид" -#define TR_BACKGROUND_COLOR "Фоновий колір" -#define TR_MAIN_COLOR "Головний колір" -#define TR_BAR2_COLOR "Колір вторинної панелі" -#define TR_BAR1_COLOR "Колір основної панелі" #define TR_TEXT_COLOR "Колір тексту" -#define TR_TEXT_VIEWER "Переглядач тексту" #define TR_MENU_INPUTS STR_CHAR_INPUT "Входи" #define TR_MENU_LUA STR_CHAR_LUA "Lua скрипти" #define TR_MENU_STICKS STR_CHAR_STICK "Вісі" From 55622edf4cebfaf6b617946a799f8f0972352688 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Thu, 30 May 2024 05:47:11 +0000 Subject: [PATCH 6/6] fix: DEF_CHAN_ORD parameter spacing --- radio/src/gui/212x64/radio_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 19774cf8a89..f3621eb559b 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -644,7 +644,7 @@ void menuRadioSetup(event_t event) lcdDrawTextAlignedLeft(y, STR_DEF_CHAN_ORD); // RAET->AETR { for (uint8_t i = 0; i < adcGetMaxInputs(ADC_INPUT_MAIN); i++) { - putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, inputMappingChannelOrder(i), attr); + putsChnLetter(RADIO_SETUP_2ND_COLUMN + i*FW, y, inputMappingChannelOrder(i), attr); } if (attr) { auto max_order = inputMappingGetMaxChannelOrder() - 1;