From 0966809da02cce846cc795da31c8dc6d32e2d3aa Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Wed, 23 Nov 2005 21:06:57 +0000
Subject: [PATCH] English language tweaks.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8054 a1c6a512-1295-4272-9138-f99709370657
---
 apps/lang/english.lang | 20 ++++++++++----------
 apps/settings_menu.c   |  7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 01925785bb..0ec34b9cba 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1716,7 +1716,7 @@ new:
 id: LANG_FM_NO_PRESETS
 desc: error when preset list is empty
 eng: "No presets"
-voice: "No presets"
+voice: ""
 new:
 
 id: LANG_FM_NO_FREE_PRESETS
@@ -3366,9 +3366,9 @@ voice: "ADC Gain Left"
 new:
 
 id: LANG_RECORDING_MONITOR
-desc: in the recording settings
-eng: "Monitor Mode"
-voice: "Monitor Mode"
+desc: DEPRECATED
+eng: ""
+voice: ""
 new:
 
 id: LANG_RADIO_SCAN_MODE
@@ -3390,15 +3390,15 @@ voice: ""
 new:
 
 id: LANG_CROSSFEED_ENABLE
-desc: In the crossfeed menu
-eng: "Enable crossfeed"
+desc: DEPRECATED
+eng: ""
 voice:
 new:
 
 id: LANG_CROSSFEED
 desc: in the sound settings menu
 eng: "Crossfeed"
-voice:
+voice: "Crossfeed"
 new:
 
 id: LANG_FM_SCAN_PRESETS
@@ -3409,13 +3409,13 @@ new:
 
 id: LANG_FM_SCANNING
 desc: during auto scan
-eng: "Scanning %d.%dMHz"
+eng: "Scanning %d.%01dMHz"
 voice: ""
 new:
 
 id: LANG_FM_DEFAULT_PRESET_NAME
 desc: default preset name for auto scan mode
-eng: "%d.%dMHz"
+eng: "%d.%01dMHz"
 voice:
 new:
 
@@ -3428,7 +3428,7 @@ new:
 id: LANG_FM_CLEAR_PRESETS
 desc: confirmation if presets can be cleared
 eng: "Clear current presets?"
-voice: "Clear current presets?"
+voice: ""
 new:
 
 id: LANG_WAIT
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 864ad63964..3553c01f09 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1223,8 +1223,11 @@ static bool replaygain_settings_menu(void)
 
 static bool crossfeed(void)
 {
-    bool result = set_bool(str(LANG_CROSSFEED_ENABLE), 
-        &global_settings.crossfeed);
+    bool result = set_bool_options(str(LANG_CROSSFEED),
+                                   &global_settings.crossfeed,
+                                   STR(LANG_ON),
+                                   STR(LANG_OFF),
+                                   NULL);
 
     dsp_set_crossfeed(global_settings.crossfeed);
     return result;