From dcb47afeffb0d1eaa69e4eb14a6e5a9c94b10a26 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 14 Feb 2021 22:20:31 +0100 Subject: [PATCH] - vfd-setup: minor changes in locales Signed-off-by: Thilo Graf --- data/locale/deutsch.locale | 4 ++-- data/locale/english.locale | 4 ++-- src/gui/vfd_setup.cpp | 4 ++-- src/system/locals.h | 4 ++-- src/system/locals_intern.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 171fdfe44..995265566 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1112,8 +1112,8 @@ lcd4l_support_off aus lcd4l_support_on ein lcd4l_weather Wetter im Standby-Modus lcd_info_line Zeige in Infozeile -lcd_info_line_channel Kanalname -lcd_info_line_channel_no Kanalnummer +lcd_info_line_channelname Kanalname +lcd_info_line_channelnumber Kanalnummer lcd_info_line_clock Uhrzeit lcdcontroler.brightness Normalbetrieb lcdcontroler.brightnessdeepstandby Deep-Standby diff --git a/data/locale/english.locale b/data/locale/english.locale index 84a2c4dc8..ccade52eb 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1112,8 +1112,8 @@ lcd4l_support_off off lcd4l_support_on on lcd4l_weather Weather in standby mode lcd_info_line Show in infoline -lcd_info_line_channel Channelname -lcd_info_line_channel_no Channelnumber +lcd_info_line_channelname Channelname +lcd_info_line_channelnumber Channelnumber lcd_info_line_clock Clock lcdcontroler.brightness Normal mode lcdcontroler.brightnessdeepstandby Deep-standby diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 824b9d8ac..e98f5c483 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -114,9 +114,9 @@ const CMenuOptionChooser::keyval LEDMENU_OPTIONS[LEDMENU_OPTION_COUNT] = const CMenuOptionChooser::keyval LCD_INFO_OPTIONS[LCD_INFO_OPTION_COUNT] = { #if BOXMODEL_H7 || BOXMODEL_BRE2ZE4K - { 0, LOCALE_LCD_INFO_LINE_CHANNEL_NO }, + { 0, LOCALE_LCD_INFO_LINE_CHANNELNUMBER }, #else - { 0, LOCALE_LCD_INFO_LINE_CHANNEL }, + { 0, LOCALE_LCD_INFO_LINE_CHANNELNAME }, #endif { 1, LOCALE_LCD_INFO_LINE_CLOCK } }; diff --git a/src/system/locals.h b/src/system/locals.h index 0fc5642ed..85b82ea3c 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1139,8 +1139,8 @@ typedef enum LOCALE_LCD4L_SUPPORT_ON, LOCALE_LCD4L_WEATHER, LOCALE_LCD_INFO_LINE, - LOCALE_LCD_INFO_LINE_CHANNEL, - LOCALE_LCD_INFO_LINE_CHANNEL_NO, + LOCALE_LCD_INFO_LINE_CHANNELNAME, + LOCALE_LCD_INFO_LINE_CHANNELNUMBER, LOCALE_LCD_INFO_LINE_CLOCK, LOCALE_LCDCONTROLER_BRIGHTNESS, LOCALE_LCDCONTROLER_BRIGHTNESSDEEPSTANDBY, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 9d54a7d76..5dcc61486 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1139,8 +1139,8 @@ const char * locale_real_names[] = "lcd4l_support_on", "lcd4l_weather", "lcd_info_line", - "lcd_info_line_channel", - "lcd_info_line_channel_no", + "lcd_info_line_channelname", + "lcd_info_line_channelnumber", "lcd_info_line_clock", "lcdcontroler.brightness", "lcdcontroler.brightnessdeepstandby",