Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-15 21:19:08 +01:00
12 changed files with 107 additions and 15 deletions

View File

@@ -2226,6 +2226,7 @@ typedef enum
LOCALE_SATSETUP_UNCOMM_INPUT,
LOCALE_SATSETUP_UNI_SETTINGS,
LOCALE_SATSETUP_UNICABLE,
LOCALE_SATSETUP_UNICABLE2,
LOCALE_SATSETUP_USALS_REPEAT,
LOCALE_SATSETUP_USE_BAT,
LOCALE_SATSETUP_USE_FTA_FLAG,

View File

@@ -2226,6 +2226,7 @@ const char * locale_real_names[] =
"satsetup.uncomm_input",
"satsetup.uni_settings",
"satsetup.unicable",
"satsetup.unicable2",
"satsetup.usals_repeat",
"satsetup.use_bat",
"satsetup.use_fta_flag",