diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 2b7200df69..a410646ca5 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -10778,23 +10778,6 @@
histogram: "Histogram interval"
-
- id: LANG_LINEOUT_ONOFF
- desc: in system settings menu
- user: core
-
- *: none
- lineout_poweroff: "Line Out"
-
-
- *: none
- lineout_poweroff: "Line Out"
-
-
- *: none
- lineout_poweroff: "Line Out"
-
-
id: LANG_HOTKEY
desc: hotkey menu
@@ -16210,62 +16193,6 @@
*: "Expert"
-
- id: LANG_STEREOSW_MODE
- desc: Stereo Switch Mode
- user: core
-
- *: "Stereo Switch Mode"
-
-
- *: "Stereo Switch Mode"
-
-
- *: "Stereo Switch Mode"
-
-
-
- id: LANG_REVERSE
- desc: in settings_menu
- user: core
-
- *: "Reverse"
-
-
- *: "Reverse"
-
-
- *: "Reverse"
-
-
-
- id: LANG_ALWAYS_ZERO
- desc: in settings_menu
- user: core
-
- *: "Always 0"
-
-
- *: "Always 0"
-
-
- *: "Always 0"
-
-
-
- id: LANG_ALWAYS_ONE
- desc: in settings_menu
- user: core
-
- *: "Always 1"
-
-
- *: "Always 1"
-
-
- *: "Always 1"
-
-
id: LANG_LEGAL_NOTICES
desc: in system menu
@@ -16504,3 +16431,68 @@
*: "View Album Art"
+
+ id: LANG_HP_LO_SELECT
+ desc: Output Select
+ user: core
+
+ *: none
+ erosqnative: "Output Select"
+
+
+ *: none
+ erosqnative: "Output Select"
+
+
+ *: none
+ erosqnative: "Output Select"
+
+
+
+ id: LANG_HEADPHONE
+ desc: in settings_menu
+ user: core
+
+ *: none
+ erosqnative: "Headphone"
+
+
+ *: none
+ erosqnative: "Headphone"
+
+
+ *: none
+ erosqnative: "Headphone"
+
+
+
+ id: LANG_LINEOUT
+ desc: in settings_menu
+ user: core
+
+ *: none
+ erosqnative,lineout_poweroff: "Line Out"
+
+
+ *: "Line Out"
+ erosqnative,lineout_poweroff: "Line Out"
+
+
+ *: "Line Out"
+ erosqnative,lineout_poweroff: "Line Out"
+
+
+
+ id: LANG_FONT_LOAD_ERROR
+ desc: Displayed when font loading fails
+ user: core
+
+ *: "Unable to load font: (%s)"
+
+
+ *: "Unable to load font: (%s)"
+
+
+ *: "tracks saved"
+
+
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1c6259cc98..4377ba8ee1 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -50,7 +50,7 @@
# target name, for example: swcodec: "swcodec-specific string".
#
# The target names used are picked from the configure script and are set in the
-# MODELNAME variable in the root makefile. Currently, they are:
+# MODELNAME variable in the root makefile. This is an incomplete list:
# Target Target string
# iriver
# H100/H110/H115 iriverh100
@@ -10925,23 +10925,6 @@
histogram: "Histogram interval"
-
- id: LANG_LINEOUT_ONOFF
- desc: in system settings menu
- user: core
-
- *: none
- lineout_poweroff: "Line Out"
-
-
- *: none
- lineout_poweroff: "Line Out"
-
-
- *: none
- lineout_poweroff: "Line Out"
-
-
id: LANG_HOTKEY
desc: hotkey menu
@@ -16530,13 +16513,16 @@
desc: Output Select
user: core
- *: "Output Select"
+ *: none
+ erosqnative: "Output Select"
- *: "Output Select"
+ *: none
+ erosqnative: "Output Select"
- *: "Output Select"
+ *: none
+ erosqnative: "Output Select"
@@ -16544,13 +16530,16 @@
desc: in settings_menu
user: core
- *: "Headphone"
+ *: none
+ erosqnative: "Headphone"
- *: "Headphone"
+ *: none
+ erosqnative: "Headphone"
- *: "Headphone"
+ *: none
+ erosqnative: "Headphone"
@@ -16558,13 +16547,16 @@
desc: in settings_menu
user: core
- *: "Lineout"
+ *: none
+ lineout_poweroff,erosqnative: "Line Out"
- *: "Lineout"
+ *: none
+ lineout_poweroff,erosqnative: "Line Out"
- *: "Lineout"
+ *: none
+ lineout_poweroff,erosqnative: "Line Out"
diff --git a/apps/settings_list.c b/apps/settings_list.c
index c68a7e3114..6275b4d119 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1184,7 +1184,7 @@ const struct settings_list settings[] = {
true, "accessory power supply", accessory_supply_set),
#endif
#ifdef HAVE_LINEOUT_POWEROFF
- OFFON_SETTING(0, lineout_active, LANG_LINEOUT_ONOFF,
+ OFFON_SETTING(0, lineout_active, LANG_LINEOUT,
true, "lineout", lineout_set),
#endif
/* tuner */