diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index bf75a93c6..eb1469ee6 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1663,11 +1663,12 @@ moviebrowser.edit_book_type_info1 Neue Sprunglänge (s) moviebrowser.edit_book_type_info2 <0 zurück , >0 vor, 0: kein moviebrowser.edit_serie Name der Serie moviebrowser.error_no_movies Keine Filme gefunden +moviebrowser.filter_off Filter aus moviebrowser.foot_filter Filter: -moviebrowser.foot_focus Fenster umschalten +moviebrowser.foot_focus Fenster wechseln moviebrowser.foot_options Optionen -moviebrowser.foot_play Film starten -moviebrowser.foot_refresh Liste neu laden +moviebrowser.foot_play Wiedergabe +moviebrowser.foot_refresh Neu laden moviebrowser.foot_sort Sortieren: moviebrowser.head Meine Aufnahmen moviebrowser.head_filter Filme nach Kategorie filtern: diff --git a/data/locale/english.locale b/data/locale/english.locale index 2a7eff1ff..cc29d58f4 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1663,10 +1663,11 @@ moviebrowser.edit_book_type_info1 Enter new jump length (s) moviebrowser.edit_book_type_info2 <0 back , >0 for, 0: none moviebrowser.edit_serie Enter name of serie moviebrowser.error_no_movies No movies found +moviebrowser.filter_off Filter off moviebrowser.foot_filter Filter: moviebrowser.foot_focus Switch window moviebrowser.foot_options Options -moviebrowser.foot_play Start movie +moviebrowser.foot_play Playback moviebrowser.foot_refresh Refresh list moviebrowser.foot_sort Sort: moviebrowser.head My recordings diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index c901f9587..251beb1c7 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -434,7 +434,7 @@ void CMovieBrowser::initGlobalSettings(void) m_settings.sorting.direction = MB_DIRECTION_DOWN; m_settings.filter.item = MB_INFO_MAX_NUMBER; - m_settings.filter.optionString = ""; + m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF); m_settings.filter.optionVar = 0; m_settings.parentalLockAge = MI_PARENTAL_OVER18; @@ -1594,7 +1594,7 @@ void CMovieBrowser::refreshFilterList(void) } else { - std::string tmp = g_Locale->getText(LOCALE_MENU_BACK); + std::string tmp = g_Locale->getText(LOCALE_MOVIEBROWSER_FILTER_OFF); m_FilterLines.lineArray[0].push_back(tmp); if (m_settings.filter.item == MB_INFO_FILEPATH) @@ -1853,17 +1853,19 @@ int CMovieBrowser::refreshFoot(bool show) int ok_loc_len = std::max(FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_BOOKMARKMANAGER_SELECT), true), FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_PLAY), true)); std::string filter_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_FILTER); + filter_text += " "; filter_text += m_settings.filter.optionString; std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT); - sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]); - int sort_text_len = FOOT_FONT->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT), true); + sort_text += " "; + int sort_text_len = FOOT_FONT->getRenderWidth(sort_text, true); int len = 0; for (int i = 0; m_localizedItemName[i] != NONEXISTANT_LOCALE; i++) len = std::max(len, FOOT_FONT->getRenderWidth(g_Locale->getText(m_localizedItemName[i]), true)); sort_text_len += len; + sort_text += g_Locale->getText(m_localizedItemName[m_settings.sorting.item]); button_label_ext footerButtons[] = { - { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, + { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_GREEN, NONEXISTANT_LOCALE, filter_text.c_str(), 0, true }, { NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_MOVIEBROWSER_FOOT_FOCUS, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_MOVIEBROWSER_FOOT_REFRESH, NULL, 0, false }, @@ -2270,7 +2272,7 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg) if (selected_line == 0) { m_settings.filter.item = MB_INFO_MAX_NUMBER; - m_settings.filter.optionString = ""; + m_settings.filter.optionString = g_Locale->getText(LOCALE_OPTIONS_OFF); m_settings.filter.optionVar = 0; refreshFilterList(); m_pcFilter->setSelectedLine(0); diff --git a/src/system/locals.h b/src/system/locals.h index 8a20d4e61..cf4336a52 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1690,6 +1690,7 @@ typedef enum LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2, LOCALE_MOVIEBROWSER_EDIT_SERIE, LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES, + LOCALE_MOVIEBROWSER_FILTER_OFF, LOCALE_MOVIEBROWSER_FOOT_FILTER, LOCALE_MOVIEBROWSER_FOOT_FOCUS, LOCALE_MOVIEBROWSER_FOOT_OPTIONS, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 8ed3606a2..da28b20bd 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1690,6 +1690,7 @@ const char * locale_real_names[] = "moviebrowser.edit_book_type_info2", "moviebrowser.edit_serie", "moviebrowser.error_no_movies", + "moviebrowser.filter_off", "moviebrowser.foot_filter", "moviebrowser.foot_focus", "moviebrowser.foot_options",