Index: apps/Makefile
===================================================================
--- apps/Makefile	(revision 12110)
+++ apps/Makefile	(working copy)
@@ -195,9 +195,25 @@
     
 include $(TOOLSDIR)/make.inc
 
-$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang
-	@mkdir -p $(dir $@)
-	$(call PRINTS,GENLANG)perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS) $<
+# apps/features.txt is a file that (is preprocessed and) lists named features
+# based on defines in the config-*.h files. The named features will be passed
+# to genlang and thus (translated) phrases can be used based on those names.
+#
+$(OBJDIR)/features: features.txt
+	$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
+	$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - | \
+	grep -v "^\#" > $@; \
+	echo "" >/dev/null 
+
+$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features
+	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)for f in `cat $(OBJDIR)/features`; do \
+	  if test -n "$$feat"; then \
+	    feat="$$feat:"; \
+	  fi; \
+	  feat="$$feat$$f"; \
+	done; \
+	perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS):$$feat $<
 	$(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@
 
 clean:
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 12110)
+++ apps/lang/english.lang	(working copy)
@@ -174,13 +174,16 @@
   desc: before acknowledging usb in case an MMC is inserted (Ondio)
   user:
   <source>
-    *: "Please remove inserted MMC"
+    *: NONE
+    ondio: "Please remove inserted MMC"
   </source>
   <dest>
-    *: "Please remove inserted MMC"
+    *: NONE
+    ondio: "Please remove inserted MMC"
   </dest>
   <voice>
-    *: "Please remove multimedia card"
+    *: NONE
+    ondio: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -286,13 +289,16 @@
   desc: in the main menu
   user:
   <source>
-    *: "FM Radio"
+    *: NONE
+    radio: "FM Radio"
   </source>
   <dest>
-    *: "FM Radio"
+    *: NONE
+    radio: "FM Radio"
   </dest>
   <voice>
-    *: "FM Radio"
+    *: NONE
+    radio: "FM Radio"
   </voice>
 </phrase>
 <phrase>
@@ -300,13 +306,16 @@
   desc: in the main menu
   user:
   <source>
-    *: "Recording"
+    *: NONE
+    recording: "Recording"
   </source>
   <dest>
-    *: "Recording"
+    *: NONE
+    recording: "Recording"
   </dest>
   <voice>
-    *: "Recording"
+    *: NONE
+    recording: "Recording"
   </voice>
 </phrase>
 <phrase>
@@ -678,13 +687,16 @@
   desc: in sound settings
   user:
   <source>
-    *: "Crossfeed"
+    *: NONE
+    swcodec: "Crossfeed"
   </source>
   <dest>
-    *: "Crossfeed"
+    *: NONE
+    swcodec: "Crossfeed"
   </dest>
   <voice>
-    *: "Crossfeed"
+    *: NONE
+    swcodec: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -692,13 +704,16 @@
   desc: in the sound settings menu
   user:
   <source>
-    *: "Equalizer"
+    *: NONE
+    swcodec: "Equalizer"
   </source>
   <dest>
-    *: "Equalizer"
+    *: NONE
+    swcodec: "Equalizer"
   </dest>
   <voice>
-    *: "Equalizer"
+    *: NONE
+    swcodec: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1008,13 +1023,16 @@
   desc: in the recording sub menu
   user:
   <source>
-    *: "Recording Screen"
+    *: NONE
+    recording: "Recording Screen"
   </source>
   <dest>
-    *: "Recording Screen"
+    *: NONE
+    recording: "Recording Screen"
   </dest>
   <voice>
-    *: "Recording Screen"
+    *: NONE
+    recording: "Recording Screen"
   </voice>
 </phrase>
 <phrase>
@@ -1022,13 +1040,16 @@
   desc: in the main menu
   user:
   <source>
-    *: "Recording Settings"
+    *: NONE
+    recording: "Recording Settings"
   </source>
   <dest>
-    *: "Recording Settings"
+    *: NONE
+    recording: "Recording Settings"
   </dest>
   <voice>
-    *: "Recording Settings"
+    *: NONE
+    recording: "Recording Settings"
   </voice>
 </phrase>
 <phrase>
@@ -1036,13 +1057,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Enable EQ"
+    *: NONE
+    swcodec: "Enable EQ"
   </source>
   <dest>
-    *: "Enable EQ"
+    *: NONE
+    swcodec: "Enable EQ"
   </dest>
   <voice>
-    *: "Enable equalizer"
+    *: NONE
+    swcodec: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1050,13 +1074,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Graphical EQ"
+    *: NONE
+    swcodec: "Graphical EQ"
   </source>
   <dest>
-    *: "Graphical EQ"
+    *: NONE
+    swcodec: "Graphical EQ"
   </dest>
   <voice>
-    *: "Graphical equalizer"
+    *: NONE
+    swcodec: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1064,13 +1091,16 @@
   desc: in eq settings
   user:
   <source>
-    *: "Precut"
+    *: NONE
+    swcodec: "Precut"
   </source>
   <dest>
-    *: "Precut"
+    *: NONE
+    swcodec: "Precut"
   </dest>
   <voice>
-    *: "Pre-cut"
+    *: NONE
+    swcodec: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -1078,13 +1108,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Simple EQ Settings"
+    *: NONE
+    swcodec: "Simple EQ Settings"
   </source>
   <dest>
-    *: "Simple EQ Settings"
+    *: NONE
+    swcodec: "Simple EQ Settings"
   </dest>
   <voice>
-    *: "Simple equalizer settings"
+    *: NONE
+    swcodec: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -1092,13 +1125,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Advanced EQ Settings"
+    *: NONE
+    swcodec: "Advanced EQ Settings"
   </source>
   <dest>
-    *: "Advanced EQ Settings"
+    *: NONE
+    swcodec: "Advanced EQ Settings"
   </dest>
   <voice>
-    *: "Advanced equalizer settings"
+    *: NONE
+    swcodec: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -1106,13 +1142,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Save EQ Preset"
+    *: NONE
+    swcodec: "Save EQ Preset"
   </source>
   <dest>
-    *: "Save EQ Preset"
+    *: NONE
+    swcodec: "Save EQ Preset"
   </dest>
   <voice>
-    *: "Save equalizer preset"
+    *: NONE
+    swcodec: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -1120,13 +1159,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Browse EQ Presets"
+    *: NONE
+    swcodec: "Browse EQ Presets"
   </source>
   <dest>
-    *: "Browse EQ Presets"
+    *: NONE
+    swcodec: "Browse EQ Presets"
   </dest>
   <voice>
-    *: "Browse equalizer presets"
+    *: NONE
+    swcodec: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -1134,13 +1176,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Edit mode: %s"
+    *: NONE
+    swcodec: "Edit mode: %s"
   </source>
   <dest>
-    *: "Edit mode: %s"
+    *: NONE
+    swcodec: "Edit mode: %s"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
@@ -1148,13 +1193,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "%d Hz Band Gain"
+    *: NONE
+    swcodec: "%d Hz Band Gain"
   </source>
   <dest>
-    *: "%d Hz Band Gain"
+    *: NONE
+    swcodec: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
@@ -1162,13 +1210,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Low Shelf Filter"
+    *: NONE
+    swcodec: "Low Shelf Filter"
   </source>
   <dest>
-    *: "Low Shelf Filter"
+    *: NONE
+    swcodec: "Low Shelf Filter"
   </dest>
   <voice>
-    *: "Low shelf filter"
+    *: NONE
+    swcodec: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1176,13 +1227,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Peak Filter %d"
+    *: NONE
+    swcodec: "Peak Filter %d"
   </source>
   <dest>
-    *: "Peak Filter %d"
+    *: NONE
+    swcodec: "Peak Filter %d"
   </dest>
   <voice>
-    *: "Peak filter"
+    *: NONE
+    swcodec: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -1190,13 +1244,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "High Shelf Filter"
+    *: NONE
+    swcodec: "High Shelf Filter"
   </source>
   <dest>
-    *: "High Shelf Filter"
+    *: NONE
+    swcodec: "High Shelf Filter"
   </dest>
   <voice>
-    *: "High shelf filter"
+    *: NONE
+    swcodec: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1204,13 +1261,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </source>
   <dest>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </dest>
   <voice>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1218,13 +1278,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Center Frequency"
+    *: NONE
+    swcodec: "Center Frequency"
   </source>
   <dest>
-    *: "Center Frequency"
+    *: NONE
+    swcodec: "Center Frequency"
   </dest>
   <voice>
-    *: "Center frequency"
+    *: NONE
+    swcodec: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1232,13 +1295,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Q"
+    *: NONE
+    swcodec: "Q"
   </source>
   <dest>
-    *: "Q"
+    *: NONE
+    swcodec: "Q"
   </dest>
   <voice>
-    *: "Q"
+    *: NONE
+    swcodec: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1246,13 +1312,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </source>
   <dest>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </dest>
   <voice>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -2030,13 +2099,16 @@
   desc: in settings_menu()
   user:
   <source>
-    *: "Browse .rwps files"
+    *: NONE
+    remote: "Browse .rwps files"
   </source>
   <dest>
-    *: "Browse .rwps files"
+    *: NONE
+    remote: "Browse .rwps files"
   </dest>
   <voice>
-    *: "Browse remote while-playing-screen files"
+    *: NONE
+    remote: "Browse remote while-playing-screen files"
   </voice>
 </phrase>
 <phrase>
@@ -2058,13 +2130,16 @@
   desc: in the display sub menu
   user:
   <source>
-    *: "Remote-LCD Settings"
+    *: NONE
+    remote: "Remote-LCD Settings"
   </source>
   <dest>
-    *: "Remote-LCD Settings"
+    *: NONE
+    remote: "Remote-LCD Settings"
   </dest>
   <voice>
-    *: "Remote LCD settings"
+    *: NONE
+    remote: "Remote LCD settings"
   </voice>
 </phrase>
 <phrase>
@@ -2338,13 +2413,16 @@
   desc: in the system sub menu
   user:
   <source>
-    *: "Time & Date"
+    *: NONE
+    rtc: "Time & Date"
   </source>
   <dest>
-    *: "Time & Date"
+    *: NONE
+    rtc: "Time & Date"
   </dest>
   <voice>
-    *: "Time and Date"
+    *: NONE
+    rtc: "Time and Date"
   </voice>
 </phrase>
 <phrase>
@@ -2380,13 +2458,16 @@
   desc: The name of the additional entry in the main menu for the RTC alarm mod.
   user:
   <source>
-    *: "Wake-Up Alarm"
+    *: NONE
+    alarm: "Wake-Up Alarm"
   </source>
   <dest>
-    *: "Wake-Up Alarm"
+    *: NONE
+    alarm: "Wake-Up Alarm"
   </dest>
   <voice>
-    *: "Wake-Up Alarm"
+    *: NONE
+    alarm: "Wake-Up Alarm"
   </voice>
 </phrase>
 <phrase>
@@ -2647,7 +2728,7 @@
   user:
   <source>
     *: "Mic"
-    h100,h120,h300: "Internal Mic"
+    recording: "Internal Mic"
   </source>
   <dest>
     *: "Mic"
@@ -2655,7 +2736,7 @@
   </dest>
   <voice>
     *: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    recording: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -2831,13 +2912,16 @@
   desc: in record settings menu.
   user:
   <source>
-    *: "Remote Unit Only"
+    *: NONE
+    remote: "Remote Unit Only"
   </source>
   <dest>
-    *: "Remote Unit Only"
+    *: NONE
+    remote: "Remote Unit Only"
   </dest>
   <voice>
-    *: "Remote unit only"
+    *: NONE
+    remote: "Remote unit only"
   </voice>
 </phrase>
 <phrase>
@@ -2845,13 +2929,16 @@
   desc: in record settings menu.
   user:
   <source>
-    *: "Main and Remote Unit"
+    *: NONE
+    remote: "Main and Remote Unit"
   </source>
   <dest>
-    *: "Main and Remote Unit"
+    *: NONE
+    remote: "Main and Remote Unit"
   </dest>
   <voice>
-    *: "Main and remote unit"
+    *: NONE
+    remote: "Main and remote unit"
   </voice>
 </phrase>
 <phrase>
@@ -3307,13 +3394,16 @@
   desc: text for LCD settings menu
   user:
   <source>
-    *: "Clear Backdrop"
+    *: NONE
+    colourlcd: "Clear Backdrop"
   </source>
   <dest>
-    *: "Clear Backdrop"
+    *: NONE
+    colourlcd: "Clear Backdrop"
   </dest>
   <voice>
-    *: "Clear Backdrop"
+    *: NONE
+    colourlcd: "Clear Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -3321,13 +3411,16 @@
   desc: menu entry to set the background color
   user:
   <source>
-    *: "Background Colour"
+    *: NONE
+    colourlcd: "Background Colour"
   </source>
   <dest>
-    *: "Background Colour"
+    *: NONE
+    colourlcd: "Background Colour"
   </dest>
   <voice>
-    *: "Background Colour"
+    *: NONE
+    colourlcd: "Background Colour"
   </voice>
 </phrase>
 <phrase>
@@ -3335,13 +3428,16 @@
   desc: menu entry to set the foreground color
   user:
   <source>
-    *: "Foreground Colour"
+    *: NONE
+    colourlcd: "Foreground Colour"
   </source>
   <dest>
-    *: "Foreground Colour"
+    *: NONE
+    colourlcd: "Foreground Colour"
   </dest>
   <voice>
-    *: "Foreground Colour"
+    *: NONE
+    colourlcd: "Foreground Colour"
   </voice>
 </phrase>
 <phrase>
@@ -3349,13 +3445,16 @@
   desc: menu
   user:
   <source>
-    *: "Reset Colours"
+    *: NONE
+    colourlcd: "Reset Colours"
   </source>
   <dest>
-    *: "Reset Colours"
+    *: NONE
+    colourlcd: "Reset Colours"
   </dest>
   <voice>
-    *: "Reset Colours"
+    *: NONE
+    colourlcd: "Reset Colours"
   </voice>
 </phrase>
 <phrase>
@@ -3363,13 +3462,16 @@
   desc: in remote lcd settings menu
   user:
   <source>
-    *: "Reduce Ticking"
+    *: NONE
+    remote_ticking: "Reduce Ticking"
   </source>
   <dest>
-    *: "Reduce Ticking"
+    *: NONE
+    remote_ticking: "Reduce Ticking"
   </dest>
   <voice>
-    *: "Reduce Ticking"
+    *: NONE
+    remote_ticking: "Reduce Ticking"
   </voice>
 </phrase>
 <phrase>
@@ -3461,13 +3563,16 @@
   desc: (player) menu altarnative for jump scroll
   user:
   <source>
-    *: "Jump Scroll"
+    *: NONE
+    charcell: "Jump Scroll"
   </source>
   <dest>
-    *: "Jump Scroll"
+    *: NONE
+    charcell: "Jump Scroll"
   </dest>
   <voice>
-    *: "Jump Scroll"
+    *: NONE
+    charcell: "Jump Scroll"
   </voice>
 </phrase>
 <phrase>
@@ -3475,13 +3580,16 @@
   desc: (player) the jump scroll shall be done "one time"
   user:
   <source>
-    *: "One time"
+    *: NONE
+    charcell: "One time"
   </source>
   <dest>
-    *: "One time"
+    *: NONE
+    charcell: "One time"
   </dest>
   <voice>
-    *: "One time"
+    *: NONE
+    charcell: "One time"
   </voice>
 </phrase>
 <phrase>
@@ -3489,13 +3597,16 @@
   desc: (player) Delay before making a jump scroll
   user:
   <source>
-    *: "Jump Scroll Delay"
+    *: NONE
+    charcell: "Jump Scroll Delay"
   </source>
   <dest>
-    *: "Jump Scroll Delay"
+    *: NONE
+    charcell: "Jump Scroll Delay"
   </dest>
   <voice>
-    *: "Jump Scroll Delay"
+    *: NONE
+    charcell: "Jump Scroll Delay"
   </voice>
 </phrase>
 <phrase>
@@ -3909,13 +4020,16 @@
   desc: in settings_menu
   user:
   <source>
-    *: "Set Time/Date"
+    *: NONE
+    rtc: "Set Time/Date"
   </source>
   <dest>
-    *: "Set Time/Date"
+    *: NONE
+    rtc: "Set Time/Date"
   </dest>
   <voice>
-    *: "Set Time and Date"
+    *: NONE
+    rtc: "Set Time and Date"
   </voice>
 </phrase>
 <phrase>
@@ -3923,13 +4037,16 @@
   desc: select the time format of time in status bar
   user:
   <source>
-    *: "Time Format"
+    *: NONE
+    rtc: "Time Format"
   </source>
   <dest>
-    *: "Time Format"
+    *: NONE
+    rtc: "Time Format"
   </dest>
   <voice>
-    *: "Time Format"
+    *: NONE
+    rtc: "Time Format"
   </voice>
 </phrase>
 <phrase>
@@ -3937,13 +4054,16 @@
   desc: option for 12 hour clock
   user:
   <source>
-    *: "12 Hour Clock"
+    *: NONE
+    rtc: "12 Hour Clock"
   </source>
   <dest>
-    *: "12 Hour Clock"
+    *: NONE
+    rtc: "12 Hour Clock"
   </dest>
   <voice>
-    *: "12 Hour Clock"
+    *: NONE
+    rtc: "12 Hour Clock"
   </voice>
 </phrase>
 <phrase>
@@ -3951,13 +4071,16 @@
   desc: option for 24 hour clock
   user:
   <source>
-    *: "24 Hour Clock"
+    *: NONE
+    rtc: "24 Hour Clock"
   </source>
   <dest>
-    *: "24 Hour Clock"
+    *: NONE
+    rtc: "24 Hour Clock"
   </dest>
   <voice>
-    *: "24 Hour Clock"
+    *: NONE
+    rtc: "24 Hour Clock"
   </voice>
 </phrase>
 <phrase>
@@ -4147,13 +4270,16 @@
   desc: text for onplay menu entry
   user:
   <source>
-    *: "Set As Backdrop"
+    *: NONE
+    colourlcd: "Set As Backdrop"
   </source>
   <dest>
-    *: "Set As Backdrop"
+    *: NONE
+    colourlcd: "Set As Backdrop"
   </dest>
   <voice>
-    *: "Set As Backdrop"
+    *: NONE
+    colourlcd: "Set As Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -4567,13 +4693,16 @@
   desc: in info menu; name for internal disk with multivolume (keep short!)
   user:
   <source>
-    *: "Int:"
+    *: NONE
+    multivolume: "Int:"
   </source>
   <dest>
-    *: "Int:"
+    *: NONE
+    multivolume: "Int:"
   </dest>
   <voice>
-    *: "Internal"
+    *: NONE
+    multivolume: "Internal"
   </voice>
 </phrase>
 <phrase>
@@ -4581,13 +4710,16 @@
   desc: in info menu;  name for external disk with multivolume (Ondio; keep short!)
   user:
   <source>
-    *: "MMC:"
+    *: NONE
+    ondio: "MMC:"
   </source>
   <dest>
-    *: "MMC:"
+    *: NONE
+    ondio: "MMC:"
   </dest>
   <voice>
-    *: "Multimedia card"
+    *: NONE
+    ondio: "Multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -5126,11 +5258,11 @@
   user:
   <source>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press STOP to continue."
   </source>
   <dest>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
     *: ""
@@ -5295,13 +5427,16 @@
   desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
   user:
   <source>
-    *: "Alarm Time: %02d:%02d"
+    *: NONE
+    alarm: "Alarm Time: %02d:%02d"
   </source>
   <dest>
-    *: "Alarm Time: %02d:%02d"
+    *: NONE
+    alarm: "Alarm Time: %02d:%02d"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5309,13 +5444,16 @@
   desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user:
   <source>
-    *: "Waking Up In %d:%02d"
+    *: NONE
+    alarm: "Waking Up In %d:%02d"
   </source>
   <dest>
-    *: "Waking Up In %d:%02d"
+    *: NONE
+    alarm: "Waking Up In %d:%02d"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5323,13 +5461,16 @@
   desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
   user:
   <source>
-    *: "Alarm Set"
+    *: NONE
+    alarm: "Alarm Set"
   </source>
   <dest>
-    *: "Alarm Set"
+    *: NONE
+    alarm: "Alarm Set"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5337,13 +5478,16 @@
   desc: The text that tells that the time is incorrect (for the RTC alarm mod).
   user:
   <source>
-    *: "Alarm Time Is Too Soon!"
+    *: NONE
+    alarm: "Alarm Time Is Too Soon!"
   </source>
   <dest>
-    *: "Alarm Time Is Too Soon!"
+    *: NONE
+    alarm: "Alarm Time Is Too Soon!"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5351,13 +5495,16 @@
   desc: Shown key functions in alarm menu (for the RTC alarm mod).
   user:
   <source>
-    *: "PLAY=Set OFF=Cancel"
+    *: NONE
+    alarm: "PLAY=Set OFF=Cancel"
   </source>
   <dest>
-    *: "PLAY=Set OFF=Cancel"
+    *: NONE
+    alarm: "PLAY=Set OFF=Cancel"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5365,13 +5512,16 @@
   desc: Announce that the RTC alarm has been turned off
   user:
   <source>
-    *: "Alarm Disabled"
+    *: NONE
+    alarm: "Alarm Disabled"
   </source>
   <dest>
-    *: "Alarm Disabled"
+    *: NONE
+    alarm: "Alarm Disabled"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -5379,13 +5529,16 @@
   desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
   user:
   <source>
-    *: "RGB"
+    *: NONE
+    colourlcd: "RGB"
   </source>
   <dest>
-    *: "RGB"
+   *: NONE
+    colourlcd: "RGB"
   </dest>
   <voice>
-    *: ""
+   *: NONE
+    colourlcd: ""
   </voice>
 </phrase>
 <phrase>
@@ -5393,13 +5546,16 @@
   desc: in color screen
   user:
   <source>
-    *: "RGB: %02X%02X%02X"
+   *: NONE
+    colourlcd: "RGB: %02X%02X%02X"
   </source>
   <dest>
-    *: "RGB: %02X%02X%02X"
+   *: NONE
+    colourlcd: "RGB: %02X%02X%02X"
   </dest>
   <voice>
-    *: ""
+   *: NONE
+    colourlcd: ""
   </voice>
 </phrase>
 <phrase>
@@ -5407,13 +5563,16 @@
   desc: splash when user selects an invalid colour
   user:
   <source>
-    *: "Invalid colour"
+   *: NONE
+    colourlcd: "Invalid colour"
   </source>
   <dest>
-    *: "Invalid colour"
+   *: NONE
+    colourlcd: "Invalid colour"
   </dest>
   <voice>
-    *: ""
+   *: NONE
+    colourlcd: ""
   </voice>
 </phrase>
 <phrase>
@@ -7465,13 +7624,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Station: %d.%02d MHz"
+    *: NONE
+    radio: "Station: %d.%02d MHz"
   </source>
   <dest>
-    *: "Station: %d.%02d MHz"
+    *: NONE
+    radio: "Station: %d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7479,13 +7641,16 @@
   desc: error when preset list is empty
   user:
   <source>
-    *: "No presets"
+    *: NONE
+    radio: "No presets"
   </source>
   <dest>
-    *: "No presets"
+    *: NONE
+    radio: "No presets"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7493,13 +7658,16 @@
   desc: in radio menu
   user:
   <source>
-    *: "Add Preset"
+    *: NONE
+    radio: "Add Preset"
   </source>
   <dest>
-    *: "Add Preset"
+    *: NONE
+    radio: "Add Preset"
   </dest>
   <voice>
-    *: "Add Preset"
+    *: NONE
+    radio: "Add Preset"
   </voice>
 </phrase>
 <phrase>
@@ -7507,13 +7675,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Edit Preset"
+    *: NONE
+    radio: "Edit Preset"
   </source>
   <dest>
-    *: "Edit Preset"
+    *: NONE
+    radio: "Edit Preset"
   </dest>
   <voice>
-    *: "Edit Preset"
+    *: NONE
+    radio: "Edit Preset"
   </voice>
 </phrase>
 <phrase>
@@ -7521,13 +7692,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Remove Preset"
+    *: NONE
+    radio: "Remove Preset"
   </source>
   <dest>
-    *: "Remove Preset"
+    *: NONE
+    radio: "Remove Preset"
   </dest>
   <voice>
-    *: "Remove Preset"
+    *: NONE
+    radio: "Remove Preset"
   </voice>
 </phrase>
 <phrase>
@@ -7535,13 +7709,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Preset Save Failed"
+    *: NONE
+    radio: "Preset Save Failed"
   </source>
   <dest>
-    *: "Preset Save Failed"
+    *: NONE
+    radio: "Preset Save Failed"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7549,13 +7726,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "The Preset List is Full"
+    *: NONE
+    radio: "The Preset List is Full"
   </source>
   <dest>
-    *: "The Preset List is Full"
+    *: NONE
+    radio: "The Preset List is Full"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7577,13 +7757,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Exit"
+    *: NONE
+    radio: "Exit"
   </source>
   <dest>
-    *: "Exit"
+    *: NONE
+    radio: "Exit"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7591,13 +7774,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Action"
+    *: NONE
+    radio: "Action"
   </source>
   <dest>
-    *: "Action"
+    *: NONE
+    radio: "Action"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7605,13 +7791,16 @@
   desc: in button bar
   user:
   <source>
-    *: "Preset"
+    *: NONE
+    radio: "Preset"
   </source>
   <dest>
-    *: "Preset"
+    *: NONE
+    radio: "Preset"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7619,13 +7808,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Add"
+    *: NONE
+    radio: "Add"
   </source>
   <dest>
-    *: "Add"
+    *: NONE
+    radio: "Add"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7633,13 +7825,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Record"
+    *: NONE
+    radio: "Record"
   </source>
   <dest>
-    *: "Record"
+    *: NONE
+    radio: "Record"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7647,13 +7842,16 @@
   desc: in radio screen
   user:
   <source>
-    *: "Force mono"
+    *: NONE
+    radio: "Force mono"
   </source>
   <dest>
-    *: "Force mono"
+    *: NONE
+    radio: "Force mono"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7661,13 +7859,16 @@
   desc: splash screen during freeze in radio mode
   user:
   <source>
-    *: "Screen frozen!"
+    *: NONE
+    radio: "Screen frozen!"
   </source>
   <dest>
-    *: "Screen frozen!"
+    *: NONE
+    radio: "Screen frozen!"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7675,13 +7876,16 @@
   desc: in radio menu
   user:
   <source>
-    *: "Auto-Scan Presets"
+    *: NONE
+    radio: "Auto-Scan Presets"
   </source>
   <dest>
-    *: "Auto-Scan Presets"
+    *: NONE
+    radio: "Auto-Scan Presets"
   </dest>
   <voice>
-    *: "Auto scan presets"
+    *: NONE
+    radio: "Auto scan presets"
   </voice>
 </phrase>
 <phrase>
@@ -7689,13 +7893,16 @@
   desc: confirmation if presets can be cleared
   user:
   <source>
-    *: "Clear Current Presets?"
+    *: NONE
+    radio: "Clear Current Presets?"
   </source>
   <dest>
-    *: "Clear Current Presets?"
+    *: NONE
+    radio: "Clear Current Presets?"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7703,13 +7910,16 @@
   desc: during auto scan
   user:
   <source>
-    *: "Scanning %d.%02d MHz"
+    *: NONE
+    radio: "Scanning %d.%02d MHz"
   </source>
   <dest>
-    *: "Scanning %d.%02d MHz"
+    *: NONE
+    radio: "Scanning %d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7717,13 +7927,16 @@
   desc: default preset name for auto scan mode
   user:
   <source>
-    *: "%d.%02d MHz"
+    *: NONE
+    radio: "%d.%02d MHz"
   </source>
   <dest>
-    *: "%d.%02d MHz"
+    *: NONE
+    radio: "%d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7731,13 +7944,16 @@
   desc: in radio screen / menu
   user:
   <source>
-    *: "Mode:"
+    *: NONE
+    radio: "Mode:"
   </source>
   <dest>
-    *: "Mode:"
+    *: NONE
+    radio: "Mode:"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7745,13 +7961,16 @@
   desc: in radio screen / menu
   user:
   <source>
-    *: "Scan"
+    *: NONE
+    radio: "Scan"
   </source>
   <dest>
-    *: "Scan"
+    *: NONE
+    radio: "Scan"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -7759,58 +7978,19 @@
   desc: in radio screen / menu
   user:
   <source>
-    *: "Preset"
+    *: NONE
+    radio: "Preset"
   </source>
   <dest>
-    *: "Preset"
+    *: NONE
+    radio: "Preset"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRBROWSE_F1
-  desc: in dir browser, F1 button bar text
-  user:
-  <source>
-    *: "Menu"
-  </source>
-  <dest>
-    *: "Menu"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DIRBROWSE_F2
-  desc: in dir browser, F2 button bar text
-  user:
-  <source>
-    *: "Option"
-  </source>
-  <dest>
-    *: "Option"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DIRBROWSE_F3
-  desc: in dir browser, F3 button bar text
-  user:
-  <source>
-    *: "LCD"
-  </source>
-  <dest>
-    *: "LCD"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SHOWDIR_BUFFER_FULL
   desc: in showdir(), displayed on screen when you reach buffer limit
   user:
@@ -7949,13 +8129,16 @@
   desc: text for splash to indicate a new backdrop has been loaded successfully
   user:
   <source>
-    *: "Backdrop Loaded"
+    *: NONE
+    colourlcd: "Backdrop Loaded"
   </source>
   <dest>
-    *: "Backdrop Loaded"
+    *: NONE
+    colourlcd: "Backdrop Loaded"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    colourlcd: ""
   </voice>
 </phrase>
 <phrase>
@@ -7963,13 +8146,16 @@
   desc: text for splash to indicate a failure to load a bitmap as backdrop
   user:
   <source>
-    *: "Backdrop Failed"
+    *: NONE
+    colourlcd: "Backdrop Failed"
   </source>
   <dest>
-    *: "Backdrop Failed"
+    *: NONE
+    colourlcd: "Backdrop Failed"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    colourlcd: ""
   </voice>
 </phrase>
 <phrase>
@@ -8588,13 +8774,16 @@
   desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
   user:
   <source>
-    *: "Remote Scrolling Options"
+    *: NONE
+    remote: "Remote Scrolling Options"
   </source>
   <dest>
-    *: "Remote Scrolling Options"
+    *: NONE
+    remote: "Remote Scrolling Options"
   </dest>
   <voice>
-    *: "Remote Scrolling Options"
+    *: NONE
+    remote: "Remote Scrolling Options"
   </voice>
 </phrase>
 <phrase>
@@ -9032,13 +9221,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Edit mode: %s"
+    *: NONE
+    swcodec: "Edit mode: %s"
   </source>
   <dest>
-    *: "Edit mode: %s"
+    *: NONE
+    swcodec: "Edit mode: %s"
   </dest>
   <voice>
-    *: ""
+    *: NONE
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
@@ -9046,13 +9238,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </source>
   <dest>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </dest>
   <voice>
-    *: "Cutoff Frequency"
+    *: NONE
+    swcodec: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -9060,13 +9255,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </source>
   <dest>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </dest>
   <voice>
-    *: "Gain"
+    *: NONE
+    swcodec: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9537,11 +9735,11 @@
   user:
   <source>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press STOP to continue."
   </source>
   <dest>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
     *: ""
@@ -9621,13 +9819,16 @@
   desc: in the sound settings menu
   user:
   <source>
-    *: "Hardware Equalizer"
+    *: NONE
+    ipodvideo: "Hardware Equalizer"
   </source>
   <dest>
-    *: "Hardware Equalizer"
+    *: NONE
+    ipodvideo: "Hardware Equalizer"
   </dest>
   <voice>
-    *: "Hardware equalizer"
+    *: NONE
+    ipodvideo: "Hardware equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -9635,13 +9836,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Enable Hardware EQ"
+    *: NONE
+    ipodvideo: "Enable Hardware EQ"
   </source>
   <dest>
-    *: "Enable Hardware EQ"
+    *: NONE
+    ipodvideo: "Enable Hardware EQ"
   </dest>
   <voice>
-    *: "Enable hardware equalizer"
+    *: NONE
+    ipodvideo: "Enable hardware equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -9663,13 +9867,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Narrow"
+    *: NONE
+    ipodvideo: "Narrow"
   </source>
   <dest>
-    *: "Narrow"
+    *: NONE
+    ipodvideo: "Narrow"
   </dest>
   <voice>
-    *: "Narrow"
+    *: NONE
+    ipodvideo: "Narrow"
   </voice>
 </phrase>
 <phrase>
@@ -9677,13 +9884,16 @@
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Wide"
+    *: NONE
+    ipodvideo: "Wide"
   </source>
   <dest>
-    *: "Wide"
+    *: NONE
+    ipodvideo: "Wide"
   </dest>
   <voice>
-    *: "Wide"
+    *: NONE
+    ipodvideo: "Wide"
   </voice>
 </phrase>
 <phrase>
@@ -9732,117 +9942,144 @@
   id: LANG_RECORD_AGC_PRESET
   desc: automatic gain control in record settings
   <source>
-    *: "Automatic Gain Control"
+    *: NONE
+    recording: "Automatic Gain Control"
   </source>
   <dest>
-    *: "Automatic Gain Control"
+    *: NONE
+    recording: "Automatic Gain Control"
   </dest>
   <voice>
-    *: "Automatic gain control"
+    *: NONE
+    recording: "Automatic gain control"
   </voice>
 </phrase>
 <phrase>
   id: LANG_AGC_SAFETY
   desc: AGC preset
   <source>
-    *: "Safety (clip)"
+    *: NONE
+    recording: "Safety (clip)"
   </source>
   <dest>
-    *: "Safety (clip)"
+    *: NONE
+    recording: "Safety (clip)"
   </dest>
   <voice>
-    *: "Safety (clip)"
+    *: NONE
+    recording: "Safety (clip)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_AGC_LIVE
   desc: AGC preset
   <source>
-    *: "Live (slow)"
+    *: NONE
+    recording: "Live (slow)"
   </source>
   <dest>
-    *: "Live (slow)"
+    *: NONE
+    recording: "Live (slow)"
   </dest>
   <voice>
-    *: "Live (slow)"
+    *: NONE
+    recording: "Live (slow)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_AGC_DJSET
   desc: AGC preset
   <source>
-    *: "DJ-Set (slow)"
+    *: NONE
+    recording: "DJ-Set (slow)"
   </source>
   <dest>
-    *: "DJ-Set (slow)"
+    *: NONE
+    recording: "DJ-Set (slow)"
   </dest>
   <voice>
-    *: "DJ set (slow)"
+    *: NONE
+    recording: "DJ set (slow)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_AGC_MEDIUM
   desc: AGC preset
   <source>
-    *: "Medium"
+    *: NONE
+    recording: "Medium"
   </source>
   <dest>
-    *: "Medium"
+    *: NONE
+    recording: "Medium"
   </dest>
   <voice>
-    *: "Medium"
+    *: NONE
+    recording: "Medium"
   </voice>
 </phrase>
 <phrase>
   id: LANG_AGC_VOICE
   desc: AGC preset
   <source>
-    *: "Voice (fast)"
+    *: NONE
+    recording: "Voice (fast)"
   </source>
   <dest>
-    *: "Voice (fast)"
+    *: NONE
+    recording: "Voice (fast)"
   </dest>
   <voice>
-    *: "Voice (fast)"
+    *: NONE
+    recording: "Voice (fast)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_RECORD_AGC_CLIPTIME
   desc: in record settings
   <source>
-    *: "AGC clip time"
+    *: NONE
+    recording: "AGC clip time"
   </source>
   <dest>
-    *: "AGC clip time"
+    *: NONE
+    recording: "AGC clip time"
   </dest>
   <voice>
-    *: "AGC clip time"
+    *: NONE
+    recording: "AGC clip time"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_PRESET
   desc: automatic gain control in recording screen
   <source>
-    *: "AGC"
+    *: NONE
+    recording: "AGC"
   </source>
   <dest>
-    *: "AGC"
+    *: NONE
+    recording: "AGC"
   </dest>
   <voice>
-    *: "AGC"
+    *: NONE
+    recording: "AGC"
   </voice>
 </phrase>
 <phrase>
   id: LANG_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
   <source>
-    *: "AGC max. gain"
+    *: NONE
+    recording: "AGC max. gain"
   </source>
   <dest>
-    *: "AGC max. gain"
+    *: NONE
+    recording: "AGC max. gain"
   </dest>
   <voice>
-    *: "AGC maximum gain"
+    *: NONE
+    recording: "AGC maximum gain"
   </voice>
 </phrase>
 <phrase>
@@ -9933,65 +10170,80 @@
   id: LANG_FM_REGION
   desc: fm tuner region setting
   <source>
-    *: "Region"
+    *: NONE
+    radio: "Region"
   </source>
   <dest>
-    *: "Region"
+    *: NONE
+    radio: "Region"
   </dest>
   <voice>
-    *: "Region"
+    *: NONE
+    radio: "Region"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FM_EUROPE
   desc: fm tuner region europe
   <source>
-    *: "Europe"
+    *: NONE
+    radio: "Europe"
   </source>
   <dest>
-    *: "Europe"
+    *: NONE
+    radio: "Europe"
   </dest>
   <voice>
-    *: "Europe"
+    *: NONE
+    radio: "Europe"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FM_US
   desc: fm region us / canada
   <source>
-    *: "US / Canada"
+    *: NONE
+    radio: "US / Canada"
   </source>
   <dest>
-    *: "US / Canada"
+    *: NONE
+    radio: "US / Canada"
   </dest>
   <voice>
-    *: "US / Canada"
+    *: NONE
+    radio: "US / Canada"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FM_JAPAN
   desc: fm region japan
   <source>
-    *: "Japan"
+    *: NONE
+    radio: "Japan"
   </source>
   <dest>
-    *: "Japan"
+    *: NONE
+    radio: "Japan"
   </dest>
   <voice>
-    *: "Japan"
+    *: NONE
+    radio: "Japan"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FM_KOREA
   desc: fm region korea
   <source>
-    *: "Korea"
+    *: NONE
+    radio: "Korea"
   </source>
   <dest>
-    *: "Korea"
+    *: NONE
+    radio: "Korea"
   </dest>
   <voice>
-    *: "Korea"
+    *: NONE
+    radio: "Korea"
   </voice>
 </phrase>
 <phrase>
@@ -10287,78 +10539,96 @@
   id: LANG_SYSFONT_AGC_SAFETY
   desc: AGC preset
   <source>
-    *: "Safety (clip)"
+    *: NONE
+    h100,h120,h300: "Safety (clip)"
   </source>
   <dest>
-    *: "Safety (clip)"
+    *: NONE
+    h100,h120,h300: "Safety (clip)"
   </dest>
   <voice>
-    *: "Safety (clip)"
+    *: NONE
+    h100,h120,h300: "Safety (clip)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_AGC_LIVE
   desc: AGC preset
   <source>
-    *: "Live (slow)"
+    *: NONE
+    h100,h120,h300: "Live (slow)"
   </source>
   <dest>
-    *: "Live (slow)"
+    *: NONE
+    h100,h120,h300: "Live (slow)"
   </dest>
   <voice>
-    *: "Live (slow)"
+    *: NONE
+    h100,h120,h300: "Live (slow)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_AGC_DJSET
   desc: AGC preset
   <source>
-    *: "DJ-Set (slow)"
+    *: NONE
+    h100,h120,h300: "DJ-Set (slow)"
   </source>
   <dest>
-    *: "DJ-Set (slow)"
+    *: NONE
+    h100,h120,h300: "DJ-Set (slow)"
   </dest>
   <voice>
-    *: "DJ set (slow)"
+    *: NONE
+    h100,h120,h300: "DJ set (slow)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_AGC_MEDIUM
   desc: AGC preset
   <source>
-    *: "Medium"
+    *: NONE
+    h100,h120,h300: "Medium"
   </source>
   <dest>
-    *: "Medium"
+    *: NONE
+    h100,h120,h300: "Medium"
   </dest>
   <voice>
-    *: "Medium"
+    *: NONE
+    h100,h120,h300: "Medium"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_AGC_VOICE
   desc: AGC preset
   <source>
-    *: "Voice (fast)"
+    *: NONE
+    h100,h120,h300: "Voice (fast)"
   </source>
   <dest>
-    *: "Voice (fast)"
+    *: NONE
+    h100,h120,h300: "Voice (fast)"
   </dest>
   <voice>
-    *: "Voice (fast)"
+    *: NONE
+    h100,h120,h300: "Voice (fast)"
   </voice>
 </phrase>
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
   <source>
-    *: "AGC max. gain"
+    *: NONE
+    h100,h120,h300: "AGC max. gain"
   </source>
   <dest>
-    *: "AGC max. gain"
+    *: NONE
+    h100,h120,h300: "AGC max. gain"
   </dest>
   <voice>
-    *: "AGC maximum gain"
+    *: NONE
+    h100,h120,h300: "AGC maximum gain"
   </voice>
 </phrase>
 <phrase>
Index: apps/features.txt
===================================================================
--- apps/features.txt	(revision 0)
+++ apps/features.txt	(revision 0)
@@ -0,0 +1,30 @@
+#if HAVE_ALARM_MOD
+alarm
+#endif
+#if defined(HAVE_LCD_CHARCELLS)
+charcell
+#endif
+#if LCD_DEPTH > 1
+colourlcd
+#endif
+#if defined(HAVE_MULTIVOLUME)
+multivolume
+#endif
+#if defined(CONFIG_TUNER)
+radio
+#endif
+#if defined(HAVE_RECORDING)
+recording
+#endif
+#if defined(HAVE_REMOTE_LCD)
+remote
+#endif
+#if defined(HAVE_REMOTE_LCD_TICKING)
+remote_ticking
+#endif
+#if defined(CONFIG_RTC)
+rtc
+#endif
+#if defined(CONFIG_CODEC)
+swcodec
+#endif