lang: collapse the two "line out" strings into one.

Change-Id: I7928f693a1cfbdbadd66102812027b989796be19

3 files changed, 85 insertions, 101 deletions

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
@@ -10779,23 +10779,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LINEOUT_ONOFF
-  desc: in system settings menu
-  user: core
-  <source>
-    *: none
-    lineout_poweroff: "Line Out"
-  </source>
-  <dest>
-    *: none
-    lineout_poweroff: "Line Out"
-  </dest>
-  <voice>
-    *: none
-    lineout_poweroff: "Line Out"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
   user: core
@@ -16211,62 +16194,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STEREOSW_MODE
-  desc: Stereo Switch Mode
-  user: core
-  <source>
-    *: "Stereo Switch Mode"
-  </source>
-  <dest>
-    *: "Stereo Switch Mode"
-  </dest>
-  <voice>
-    *: "Stereo Switch Mode"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REVERSE
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Reverse"
-  </source>
-  <dest>
-    *: "Reverse"
-  </dest>
-  <voice>
-    *: "Reverse"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALWAYS_ZERO
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Always 0"
-  </source>
-  <dest>
-    *: "Always 0"
-  </dest>
-  <voice>
-    *: "Always 0"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALWAYS_ONE
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Always 1"
-  </source>
-  <dest>
-    *: "Always 1"
-  </dest>
-  <voice>
-    *: "Always 1"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_LEGAL_NOTICES
   desc: in system menu
   user: core
@@ -16504,3 +16431,68 @@
     *: "View Album Art"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_HP_LO_SELECT
+  desc: Output Select
+  user: core
+  <source>
+    *: none
+    erosqnative: "Output Select"
+  </source>
+  <dest>
+    *: none
+    erosqnative: "Output Select"
+  </dest>
+  <voice>
+    *: none
+    erosqnative: "Output Select"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HEADPHONE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    erosqnative: "Headphone"
+  </source>
+  <dest>
+    *: none
+    erosqnative: "Headphone"
+  </dest>
+  <voice>
+    *: none
+    erosqnative: "Headphone"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LINEOUT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    erosqnative,lineout_poweroff: "Line Out"
+  </source>
+  <dest>
+    *: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
+  </dest>
+  <voice>
+    *: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FONT_LOAD_ERROR
+  desc: Displayed when font loading fails
+  user: core
+  <source>
+    *: "Unable to load font: (%s)"
+  </source>
+  <dest>
+    *: "Unable to load font: (%s)"
+  </dest>
+  <voice>
+    *: "tracks saved"
+  </voice>
+</phrase>
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
@@ -10926,23 +10926,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LINEOUT_ONOFF
-  desc: in system settings menu
-  user: core
-  <source>
-    *: none
-    lineout_poweroff: "Line Out"
-  </source>
-  <dest>
-    *: none
-    lineout_poweroff: "Line Out"
-  </dest>
-  <voice>
-    *: none
-    lineout_poweroff: "Line Out"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
   user: core
@@ -16530,13 +16513,16 @@
   desc: Output Select
   user: core
   <source>
-    *: "Output Select"
+    *: none
+    erosqnative: "Output Select"
   </source>
   <dest>
-    *: "Output Select"
+    *: none
+    erosqnative: "Output Select"
   </dest>
   <voice>
-    *: "Output Select"
+    *: none
+    erosqnative: "Output Select"
   </voice>
 </phrase>
 <phrase>
@@ -16544,13 +16530,16 @@
   desc: in settings_menu
   user: core
   <source>
-    *: "Headphone"
+    *: none
+    erosqnative: "Headphone"
   </source>
   <dest>
-    *: "Headphone"
+    *: none
+    erosqnative: "Headphone"
   </dest>
   <voice>
-    *: "Headphone"
+    *: none
+    erosqnative: "Headphone"
   </voice>
 </phrase>
 <phrase>
@@ -16558,13 +16547,16 @@
   desc: in settings_menu
   user: core
   <source>
-    *: "Lineout"
+    *: none
+    lineout_poweroff,erosqnative: "Line Out"
   </source>
   <dest>
-    *: "Lineout"
+    *: none
+    lineout_poweroff,erosqnative: "Line Out"
   </dest>
   <voice>
-    *: "Lineout"
+    *: none
+    lineout_poweroff,erosqnative: "Line Out"
   </voice>
 </phrase>
 <phrase>
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 */