From c80b1b0640131ed239dfee6f139cfff2c94737e9 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 11 May 2013 12:57:36 +0200 Subject: [PATCH] - locals: use more matching descriptions for screen positions --- data/locale/deutsch.locale | 5 +++-- data/locale/english.locale | 5 +++-- src/gui/osd_setup.cpp | 4 ++-- src/system/locals.h | 3 ++- src/system/locals_intern.h | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 702dd166e..6d6c306af 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1705,10 +1705,11 @@ settings.menu_pos Position settings.menus Menüs settings.missingoptionsconffile Die Neutrino-HD Einstellungen wurden erweitert.\nDie neuen Werte werden auf Standard gesetzt. settings.noconffile Die Neutrino-HD Einstellungen wurden nicht\ngefunden. Es werden Standardwerte benutzt. +settings.pos_bottom_center unten zentriert settings.pos_bottom_left unten links settings.pos_bottom_right unten rechts -settings.pos_default_center oben Mitte -settings.pos_higher_center unten Mitte +settings.pos_default_center zentriert +settings.pos_top_center oben zentriert settings.pos_top_left oben links settings.pos_top_right oben rechts settings.restore Image-Einstellungen: Wiederherstellen diff --git a/data/locale/english.locale b/data/locale/english.locale index 915007398..12f357934 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1705,10 +1705,11 @@ settings.menu_pos Menu position settings.menus Menus settings.missingoptionsconffile The Neutrino-HD settings have been updated.\nNew Options will be set to default. settings.noconffile No Neutrino-HD settings found.\nUsing defaults. +settings.pos_bottom_center bottom center settings.pos_bottom_left bottom left settings.pos_bottom_right bottom right -settings.pos_default_center top center -settings.pos_higher_center higher center +settings.pos_default_center center +settings.pos_top_center top center settings.pos_top_left top left settings.pos_top_right top right settings.restore Image-Settings: Restore diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index e97c13a0d..1f00e23f1 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -339,8 +339,8 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_ { 1 , LOCALE_SETTINGS_POS_TOP_LEFT }, { 2 , LOCALE_SETTINGS_POS_BOTTOM_LEFT }, { 3 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT }, - { 4 , LOCALE_SETTINGS_POS_DEFAULT_CENTER }, - { 5 , LOCALE_SETTINGS_POS_HIGHER_CENTER } + { 4 , LOCALE_SETTINGS_POS_TOP_CENTER }, + { 5 , LOCALE_SETTINGS_POS_BOTTOM_CENTER } }; #define MENU_DISP_POS_OPTIONS_COUNT 5 diff --git a/src/system/locals.h b/src/system/locals.h index c3aef8b74..7e8d1f76c 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1732,10 +1732,11 @@ typedef enum LOCALE_SETTINGS_MENUS, LOCALE_SETTINGS_MISSINGOPTIONSCONFFILE, LOCALE_SETTINGS_NOCONFFILE, + LOCALE_SETTINGS_POS_BOTTOM_CENTER, LOCALE_SETTINGS_POS_BOTTOM_LEFT, LOCALE_SETTINGS_POS_BOTTOM_RIGHT, LOCALE_SETTINGS_POS_DEFAULT_CENTER, - LOCALE_SETTINGS_POS_HIGHER_CENTER, + LOCALE_SETTINGS_POS_TOP_CENTER, LOCALE_SETTINGS_POS_TOP_LEFT, LOCALE_SETTINGS_POS_TOP_RIGHT, LOCALE_SETTINGS_RESTORE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 500cada98..d241acc6f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1732,10 +1732,11 @@ const char * locale_real_names[] = "settings.menus", "settings.missingoptionsconffile", "settings.noconffile", + "settings.pos_bottom_center", "settings.pos_bottom_left", "settings.pos_bottom_right", "settings.pos_default_center", - "settings.pos_higher_center", + "settings.pos_top_center", "settings.pos_top_left", "settings.pos_top_right", "settings.restore",