From 0a8cf7bcc16751c68006aab131a6e17a72a5fcf6 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 19 Dec 2016 17:21:51 +0100 Subject: [PATCH] personalize: pluralize 'usermenu' item; these are 'usermenus' Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2e6ee0c3fb0d8c9b5b46aeb2afbde7ec6199481d Author: vanhofen Date: 2016-12-19 (Mon, 19 Dec 2016) Origin message was: ------------------ - personalize: pluralize 'usermenu' item; these are 'usermenus' --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/gui/personalize.cpp | 4 ++-- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 5747121cc..1cb2eee57 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2687,6 +2687,7 @@ usermenu.title_blue Erweiterungen usermenu.title_green Tonwahl usermenu.title_red EPG usermenu.title_yellow Bildoptionen +usermenus.head Benutzermenüs video_mode_ok Video-Einstellungen OK? videomenu.43mode 4:3 Anzeigeverhalten videomenu.analog_auto AUTO diff --git a/data/locale/english.locale b/data/locale/english.locale index 1de49a9a2..b90154a65 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2687,6 +2687,7 @@ usermenu.title_blue Features usermenu.title_green Audio usermenu.title_red Event-List usermenu.title_yellow Video +usermenus.head User menus video_mode_ok Is this video mode working ok ? videomenu.43mode 4:3 Content mode videomenu.analog_auto AUTO diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index 25f111151..b4bf4210d 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -385,7 +385,7 @@ int CPersonalizeGui::ShowPersonalizationMenu() { pMenu->addItem(GenericMenuSeparatorLine); uMenu = new CMenuWidget(LOCALE_PERSONALIZE_HEAD, NEUTRINO_ICON_PERSONALIZE, width, MN_WIDGET_ID_PERSONALIZE_USERMENU); - pMenu->addItem(new CMenuForwarder(LOCALE_USERMENU_HEAD, true, NULL, uMenu, NULL, CRCInput::RC_green)); + pMenu->addItem(new CMenuForwarder(LOCALE_USERMENUS_HEAD, true, NULL, uMenu, NULL, CRCInput::RC_green)); ShowUserMenu(); } @@ -488,7 +488,7 @@ void CPersonalizeGui::ShowUserMenu() { int uMenu_shortcut = 1; - uMenu->addIntroItems(LOCALE_USERMENU_HEAD); + uMenu->addIntroItems(LOCALE_USERMENUS_HEAD); uMenu->addItem(new CMenuOptionChooser(LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL, &g_settings.personalize[SNeutrinoSettings::P_UMENU_SHOW_CANCEL], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); diff --git a/src/system/locals.h b/src/system/locals.h index e16443b72..2fececf52 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2714,6 +2714,7 @@ typedef enum LOCALE_USERMENU_TITLE_GREEN, LOCALE_USERMENU_TITLE_RED, LOCALE_USERMENU_TITLE_YELLOW, + LOCALE_USERMENUS_HEAD, LOCALE_VIDEO_MODE_OK, LOCALE_VIDEOMENU_43MODE, LOCALE_VIDEOMENU_ANALOG_AUTO, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index fa5ccbd91..aa8fce3bd 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2714,6 +2714,7 @@ const char * locale_real_names[] = "usermenu.title_green", "usermenu.title_red", "usermenu.title_yellow", + "usermenus.head", "video_mode_ok", "videomenu.43mode", "videomenu.analog_auto",