mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 01:11:12 +02:00
update glcd
Conflicts: src/gui/movieplayer.h src/gui/weather_locations.h src/neutrino.cpp
This commit is contained in:
@@ -857,10 +857,24 @@ const char * locale_real_names[] =
|
||||
"fsk.to_12",
|
||||
"fsk.to_16",
|
||||
"fsk.to_7",
|
||||
"glcd.align_center",
|
||||
"glcd.align_channel",
|
||||
"glcd.align_duration",
|
||||
"glcd.align_end",
|
||||
"glcd.align_epg",
|
||||
"glcd.align_left",
|
||||
"glcd.align_none",
|
||||
"glcd.align_right",
|
||||
"glcd.align_start",
|
||||
"glcd.align_time",
|
||||
"glcd.bar_width",
|
||||
"glcd.bar_x_position",
|
||||
"glcd.bar_y_position",
|
||||
"glcd.brightness",
|
||||
"glcd.brightness_dim",
|
||||
"glcd.brightness_dim_time",
|
||||
"glcd.brightness_settings",
|
||||
"glcd.brightness_standby",
|
||||
"glcd.clock.analog",
|
||||
"glcd.clock.digital_hm",
|
||||
"glcd.color.amber",
|
||||
"glcd.color.black",
|
||||
"glcd.color.blue",
|
||||
@@ -882,25 +896,62 @@ const char * locale_real_names[] =
|
||||
"glcd.color.teal",
|
||||
"glcd.color.white",
|
||||
"glcd.color.yellow",
|
||||
"glcd.channel_x_position",
|
||||
"glcd.channel_y_position",
|
||||
"glcd.digital_clock_y_position",
|
||||
"glcd.display",
|
||||
"glcd.duration_x_position",
|
||||
"glcd.duration_y_position",
|
||||
"glcd.enable",
|
||||
"glcd.end_x_position",
|
||||
"glcd.end_y_position",
|
||||
"glcd.epg_x_position",
|
||||
"glcd.epg_y_position",
|
||||
"glcd.font",
|
||||
"glcd.font_autoresize",
|
||||
"glcd.head",
|
||||
"glcd.logo_x_position",
|
||||
"glcd.logo_y_position",
|
||||
"glcd.mirror_osd",
|
||||
"glcd.mirror_video",
|
||||
"glcd.position_settings",
|
||||
"glcd.restart",
|
||||
"glcd.scroll_speed",
|
||||
"glcd.select.bar",
|
||||
"glcd.select.bg",
|
||||
"glcd.select.fg",
|
||||
"glcd.show_duration",
|
||||
"glcd.show_end",
|
||||
"glcd.show_logo",
|
||||
"glcd.show_progressbar",
|
||||
"glcd.show_start",
|
||||
"glcd.show_time",
|
||||
"glcd.show_weather",
|
||||
"glcd.simple_clock_y_position",
|
||||
"glcd.size_bar",
|
||||
"glcd.size_channel",
|
||||
"glcd.size_duration",
|
||||
"glcd.size_end",
|
||||
"glcd.size_epg",
|
||||
"glcd.size_logo",
|
||||
"glcd.size_simple_clock",
|
||||
"glcd.size_start",
|
||||
"glcd.size_time",
|
||||
"glcd.size_time_standby",
|
||||
"glcd.theme",
|
||||
"glcd.theme_position_settings",
|
||||
"glcd.theme_settings",
|
||||
"glcd.standby_analog_clock",
|
||||
"glcd.standby_digital_clock",
|
||||
"glcd.standby_lcd_clock",
|
||||
"glcd.standby_led_clock",
|
||||
"glcd.standby_settings",
|
||||
"glcd.standby_weather",
|
||||
"glcd.start_x_position",
|
||||
"glcd.start_y_position",
|
||||
"glcd.time_in_standby",
|
||||
"glcd.time_x_position",
|
||||
"glcd.time_y_position",
|
||||
"glcd.volume",
|
||||
"hdd_10min",
|
||||
"hdd_1min",
|
||||
@@ -1699,6 +1750,7 @@ const char * locale_real_names[] =
|
||||
"menu.hint_volume_pos",
|
||||
"menu.hint_volume_size",
|
||||
"menu.hint_weather_api_key",
|
||||
"menu.hint_weather_country",
|
||||
"menu.hint_weather_enabled",
|
||||
"menu.hint_weather_location",
|
||||
"menu.hint_webradio_setup",
|
||||
@@ -2771,6 +2823,9 @@ const char * locale_real_names[] =
|
||||
"videomenu.zappingmode_mute",
|
||||
"videomenu.zappingmode_hold",
|
||||
"weather.api_key",
|
||||
"weather.country",
|
||||
"weather.country_deutschland",
|
||||
"weather.country_norway",
|
||||
"weather.enabled",
|
||||
"weather.location",
|
||||
"webradio.head",
|
||||
|
Reference in New Issue
Block a user