Index: tools/configure
===================================================================
--- tools/configure	(revision 14056)
+++ tools/configure	(working copy)
@@ -1717,10 +1717,13 @@
 	\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.[ch]\
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
-	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt
+	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
+	          voicefontids
 
 voice: tools
-	\$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(LANGUAGE) \$(ARCHOS) voicesettings.sh
+	\$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ features
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
+	\$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$(LANGUAGE) \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings.sh
 
 tools:
 	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
@@ -1736,20 +1739,24 @@
 	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 1 -o rockbox-fonts.zip \$(TARGET) \$(BINARY)
 
 zip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
+	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 mapzip:
 	\$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
 
 fullzip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -r "\$(ROOTDIR)" -f 2 -o rockbox-full.zip \$(TARGET) \$(BINARY)
 
 7zip:
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 tar:
 	\$(SILENT)rm -f rockbox.tar
-	\$(SILENT)\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\" -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
+	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(ARCHOS)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.tar" -z "tar --no-recursion -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 bzip2: tar
 	\$(SILENT)bzip2 -f9 rockbox.tar
Index: tools/buildzip.pl
===================================================================
--- tools/buildzip.pl	(revision 14056)
+++ tools/buildzip.pl	(working copy)
@@ -37,6 +37,12 @@
         shift @ARGV;
         shift @ARGV;    
     }
+    elsif($ARGV[0] eq "-i") {
+        # The target id name as used in TARGET_ID in the root makefile
+        $target_id=$ARGV[1];
+        shift @ARGV;
+        shift @ARGV;    
+    }
     elsif($ARGV[0] eq "-o") {
         $output=$ARGV[1];
         shift @ARGV;
@@ -158,8 +164,8 @@
     for(@files) {
         my $output = $_;
         $output =~ s/(.*)\.lang/$1.lng/;
-        print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -b=$outputlang/$output $dir/$_\n" if($verbose);
-        system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
+        print "$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_\n" if($verbose);
+        system ("$ROOT/tools/genlang -e=$dir/english.lang -t=$archos -i=$target_id -b=$outputlang/$output $dir/$_ >/dev/null 2>&1");
     }
 }
 
Index: tools/genvoice.sh
===================================================================
--- tools/genvoice.sh	(revision 14056)
+++ tools/genvoice.sh	(working copy)
@@ -34,13 +34,17 @@
 ENCODER=lame
 # Where to save temporary files
 TEMPDIR=/tmp
+# List of IDs to send to voicefont
+VOICEFONTIDS=voicefontids
 
 ###################
 # End of settings #
 ###################
 
+TARGET_ID="$4"
 createvoicefile() {
-    $VOICEFONT "$LANG_FILE" "$TEMPDIR/" "./$RLANG.voice"
+    $GENLANG -e=$ENGLISH -o -t=$TARGET $LANG_FILE > $VOICEFONTIDS
+    $VOICEFONT "$VOICEFONTIDS" "$TARGET_ID" "$TEMPDIR/" "./$RLANG.voice"
 }
 
 deletefiles() {
@@ -106,7 +110,7 @@
 }
 
 if [ -z "$3" ]; then
-    echo "Usage: $0 rockboxdirectory language target [settingsfile]";
+    echo "Usage: $0 rockboxdirectory language target targetid [settingsfile]";
     exit 32
 else
     if [ ! -d "$1" ] || [ ! -f "$1/tools/genlang" ]; then
@@ -117,12 +121,12 @@
         echo "Error: $2 is not a valid language"
         exit 34
     fi
-    if [ ! -z "$4" ]; then
-        if [ -f "$4" ]; then
+    if [ ! -z "$5" ]; then
+        if [ -f "$5" ]; then
             # Read settings from file
-            source "$4"
+            source "$5"
         else
-            echo "Error: $4 does not exist"
+            echo "Error: $5 does not exist"
             exit 36
         fi
     fi
Index: tools/voicefont.c
===================================================================
--- tools/voicefont.c	(revision 14056)
+++ tools/voicefont.c	(working copy)
@@ -90,10 +90,10 @@
     if (argc < 2)
     {
         printf("Makes a Rockbox voicefont from a collection of mp3 clips.\n");
-        printf("Usage: voicefont <language file> <mp3 path> <output file>\n");
+        printf("Usage: voicefont <string id list file> <target id> <mp3 path> <output file>\n");
         printf("\n");
         printf("Example: \n");
-        printf("voicefont english.lang voice\\ voicefont.bin\n");
+        printf("voicefont voicefontids.txt 2 voice\\ voicefont.bin\n");
         return -1;
     }
     
@@ -123,10 +123,10 @@
     }
     fclose(pFile);
 
-    pFile = fopen(argv[3], "wb");
+    pFile = fopen(argv[4], "wb");
     if (pFile == NULL)
     {
-        printf("Error opening output file %s\n", argv[3]);
+        printf("Error opening output file %s\n", argv[4]);
         return -2;
     }
     fseek(pFile, 16 + count*8, SEEK_SET); /* space for header */
@@ -137,8 +137,8 @@
             count_voiceonly++;
         
         pos[i] = ftell(pFile);
-        sprintf(mp3filename1, "%s%s.mp3", argv[2], names[i]);
-        sprintf(mp3filename2, "%s%s.wav.mp3", argv[2], names[i]);
+        sprintf(mp3filename1, "%s%s.mp3", argv[3], names[i]);
+        sprintf(mp3filename2, "%s%s.wav.mp3", argv[3], names[i]);
         mp3filename = mp3filename1;
         pMp3File = fopen(mp3filename, "rb");
         if (pMp3File == NULL)
@@ -168,18 +168,23 @@
     /* Create the file format: */
 
     /* 1st 32 bit value in the file is the version number    */
-    value = SWAP4(200); /* 2.00 */
+    value = SWAP4(300); /* 3.00 */
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /* 2nd 32 bit value in the file is the header size (= 1st table position) */
-    value = SWAP4(16); /* 16 bytes: for version, header size, number1, number2 */
+    /* 2nd 32 bit value in the file is the id number for the target
+       we made the voce file for */
+    value = SWAP4(atoi(argv[2]));
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /* 3rd 32 bit value in the file is the number of clips in 1st table   */
+    /* 3rd 32 bit value in the file is the header size (= 1st table position) */
+    value = SWAP4(20); /* 20 bytes: for version, target id, header size, number1, number2 */
+    fwrite(&value, sizeof(value), 1, pFile);
+
+    /* 4th 32 bit value in the file is the number of clips in 1st table   */
     value = SWAP4(count-count_voiceonly);
     fwrite(&value, sizeof(value), 1, pFile);
 
-    /*  4th bit value in the file is the number of clips in 2nd table */
+    /* 5th bit value in the file is the number of clips in 2nd table */
     value = SWAP4(count_voiceonly);
     fwrite(&value, sizeof(value), 1, pFile);
 
Index: tools/genlang
===================================================================
--- tools/genlang	(revision 14056)
+++ tools/genlang	(working copy)
@@ -11,7 +11,7 @@
 #
 
 # binary version for the binary lang file
-my $langversion = 3; # 3 was the latest one used in the v1 format
+my $langversion = 4; # 3 was the latest one used in the v1 format
 
 # A note for future users and readers: The original v1 language system allowed
 # the build to create and use a different language than english built-in. We
@@ -48,6 +48,9 @@
     separated with colons. This will make genlang to use all the specified
     strings when searching for a matching phrase.
 
+ -i=<target id>
+    The target id number, needed for -b.
+
  -o
     Voice mode output. Outputs all id: and voice: lines for the given target!
 
@@ -88,11 +91,18 @@
     print "Please use at least one of -p, -u, -o and -b\n";
     exit;
 }
+
 if(($binary || $update || $voiceout) && !$english) {
     print "Please use -e too when you use -b, -o or -u\n";
     exit;
 }
 
+my $target_id = $i;
+if($binary && !$target_id) {
+    print "Please specify a target id number\n";
+    exit;
+}
+
 my $target = $t;
 if(!$target && !$update) {
     print "Please specify a target (with -t)!\n";
@@ -579,7 +589,7 @@
 
     open(OUTF, ">$binary") or die "Can't create $binary";
     binmode OUTF;
-    printf OUTF ("\x1a%c", $langversion); # magic lang file header
+    printf OUTF ("\x1a%c%c", $langversion, $target_id); # magic lang file header
 
     # loop over the target phrases
     for $i (1 .. $idcount) {
Index: apps/playlist.c
===================================================================
--- apps/playlist.c	(revision 14056)
+++ apps/playlist.c	(working copy)
@@ -484,7 +484,7 @@
         lcd_setmargins(0, 0);
 #endif
 
-    gui_syncsplash(0, str(LANG_PLAYLIST_LOAD));
+    gui_syncsplash(0, str(LANG_WAIT));
 
     if (!buffer)
     {
@@ -1666,13 +1666,7 @@
         lcd_setmargins(0, 0);
 #endif
 
-    gui_syncsplash(0, fmt, count,
-#if CONFIG_KEYPAD == PLAYER_PAD
-                   str(LANG_STOP_ABORT)
-#else
-                   str(LANG_OFF_ABORT)
-#endif
-        );
+    gui_syncsplash(0, fmt, count, str(LANG_OFF_ABORT));
 }
 
 /*
@@ -1995,12 +1989,7 @@
             {
                 gui_syncsplash(0, str(LANG_LOADING_PERCENT), 
                                (total_read+count)*100/control_file_size,
-#if CONFIG_KEYPAD == PLAYER_PAD
-                               str(LANG_STOP_ABORT)
-#else
-                               str(LANG_OFF_ABORT)
-#endif
-                               );
+                               str(LANG_OFF_ABORT));
                 if (action_userabort(TIMEOUT_NOBLOCK))
                 {
                     /* FIXME: 
Index: apps/screens.c
===================================================================
--- apps/screens.c	(revision 14056)
+++ apps/screens.c	(working copy)
@@ -398,7 +398,7 @@
 
     if (display->nb_lines < 4) /* very small screen, just show the pitch value */
     {
-        w = snprintf((char *)buf, sizeof(buf), "%s: %d.%d%%",str(LANG_SYSFONT_PITCH),
+        w = snprintf((char *)buf, sizeof(buf), "%s: %d.%d%%",str(LANG_PITCH),
                   pitch / 10, pitch % 10 );
         display->putsxy((display->width-(w*display->char_width))/2,
                          display->nb_lines/2,buf);
@@ -408,9 +408,9 @@
 
         /* UP: Pitch Up */
         if (pitch_mode == PITCH_MODE_ABSOLUTE) {
-            ptr = str(LANG_SYSFONT_PITCH_UP);
+            ptr = str(LANG_PITCH_UP);
         } else {
-            ptr = str(LANG_SYSFONT_PITCH_UP_SEMITONE);
+            ptr = str(LANG_PITCH_UP_SEMITONE);
         }
         display->getstringsize(ptr,&w,&h);
         display->putsxy((display->width-w)/2, 0, ptr);
@@ -419,9 +419,9 @@
 
         /* DOWN: Pitch Down */
         if (pitch_mode == PITCH_MODE_ABSOLUTE) {
-            ptr = str(LANG_SYSFONT_PITCH_DOWN);
+            ptr = str(LANG_PITCH_DOWN);
         } else {
-            ptr = str(LANG_SYSFONT_PITCH_DOWN_SEMITONE);
+            ptr = str(LANG_PITCH_DOWN_SEMITONE);
         }
         display->getstringsize(ptr,&w,&h);
         display->putsxy((display->width-w)/2, display->height - h, ptr);
@@ -443,7 +443,7 @@
                              w+1, (display->height-h)/2, 7, 8);
 
         /* "Pitch" */
-        snprintf((char *)buf, sizeof(buf), str(LANG_SYSFONT_PITCH));
+        snprintf((char *)buf, sizeof(buf), str(LANG_PITCH));
         display->getstringsize(buf,&w,&h);
         display->putsxy((display->width-w)/2, (display->height/2)-h, buf);
         /* "XX.X%" */
@@ -654,14 +654,14 @@
         [1]={ STR(LANG_SYSFONT_ON) }
     };
     static const struct opt_items bottom_items[] = {
-        [SHOW_ALL]={ STR(LANG_SYSFONT_FILTER_ALL) },
+        [SHOW_ALL]={ STR(LANG_SYSFONT_ALL) },
         [SHOW_SUPPORTED]={ STR(LANG_SYSFONT_FILTER_SUPPORTED) },
         [SHOW_MUSIC]={ STR(LANG_SYSFONT_FILTER_MUSIC) },
         [SHOW_PLAYLIST]={ STR(LANG_SYSFONT_FILTER_PLAYLIST) },
     };
     static const struct opt_items right_items[] = {
         [REPEAT_OFF]={ STR(LANG_SYSFONT_OFF) },
-        [REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) },
+        [REPEAT_ALL]={ STR(LANG_SYSFONT_ALL) },
         [REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) },
         [REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) },
 #ifdef AB_REPEAT_ENABLE
@@ -1014,7 +1014,7 @@
 
             /* print help text */
             if (screens[s].nb_lines > 4)
-                screens[s].puts(0, 4, str(LANG_TIME_SET));
+                screens[s].puts(0, 4, str(LANG_TIME_SET_BUTTON));
             if (screens[s].nb_lines > 5)
                 screens[s].puts(0, 5, str(LANG_TIME_REVERT));
             screens[s].update();
Index: apps/action.c
===================================================================
--- apps/action.c	(revision 14056)
+++ apps/action.c	(working copy)
@@ -141,7 +141,7 @@
         {
             last_button = BUTTON_NONE;
             keys_locked = false;
-            gui_syncsplash(HZ/2, str(LANG_KEYLOCK_OFF_PLAYER));
+            gui_syncsplash(HZ/2, str(LANG_KEYLOCK_OFF));
             return ACTION_REDRAW;
         } 
         else 
@@ -150,7 +150,7 @@
 #endif
         {
             if ((button&BUTTON_REL))
-                gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON_PLAYER));
+                gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON));
             return ACTION_REDRAW;
         }
     }
@@ -189,7 +189,7 @@
     {       
         unlock_combo = button;
         keys_locked = true;
-        gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON_PLAYER));
+        gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON));
         
         button_clear_queue();
         return ACTION_REDRAW;
Index: apps/language.c
===================================================================
--- apps/language.c	(revision 14056)
+++ apps/language.c	(working copy)
@@ -45,14 +45,15 @@
     int fsize;
     int fd = open(filename, O_RDONLY);
     int retcode=0;
-    unsigned char lang_header[2];
+    unsigned char lang_header[3];
     if(fd == -1)
         return 1;
     fsize = filesize(fd) - 2;
     if(fsize <= MAX_LANGUAGE_SIZE) {
-        read(fd, lang_header, 2);
+        read(fd, lang_header, 3);
         if((lang_header[0] == LANGUAGE_COOKIE) &&
-           (lang_header[1] == LANGUAGE_VERSION)) {
+           (lang_header[1] == LANGUAGE_VERSION) &&
+           (lang_header[2] == TARGET_ID)) {
             read(fd, language_buffer, MAX_LANGUAGE_SIZE);
             unsigned char *ptr = language_buffer;
             int id;
Index: apps/recorder/radio.c
===================================================================
--- apps/recorder/radio.c	(revision 14056)
+++ apps/recorder/radio.c	(working copy)
@@ -496,7 +496,7 @@
 
 #ifdef HAS_BUTTONBAR
     gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU),
-        str(LANG_FM_BUTTONBAR_PRESETS), str(LANG_FM_BUTTONBAR_RECORD));
+        str(LANG_PRESET), str(LANG_FM_BUTTONBAR_RECORD));
 #endif
 
 #ifndef HAVE_NOISY_IDLE_MODE
@@ -680,7 +680,7 @@
                 }
 #ifdef HAS_BUTTONBAR
                 gui_buttonbar_set(&buttonbar, str(LANG_BUTTONBAR_MENU),
-                                  str(LANG_FM_BUTTONBAR_PRESETS),
+                                  str(LANG_PRESET),
                                   str(LANG_FM_BUTTONBAR_RECORD));
 #endif
                 update_screen = true;
@@ -713,7 +713,7 @@
 #ifdef HAS_BUTTONBAR
                 gui_buttonbar_set(&buttonbar,
                                   str(LANG_BUTTONBAR_MENU),
-                                  str(LANG_FM_BUTTONBAR_PRESETS),
+                                  str(LANG_PRESET),
                                   str(LANG_FM_BUTTONBAR_RECORD));
 #endif
                 update_screen = true;
@@ -858,8 +858,8 @@
                 FOR_NB_SCREENS(i)
                     screens[i].puts_scroll(0, top_of_screen + 2, buf);
 
-                snprintf(buf, 128, "%s %s", str(LANG_FM_TUNE_MODE),
-                         radio_mode ? str(LANG_RADIO_PRESET_MODE) :
+                snprintf(buf, 128, "%s %s", str(LANG_MODE),
+                         radio_mode ? str(LANG_PRESET) :
                                       str(LANG_RADIO_SCAN_MODE));
                 FOR_NB_SCREENS(i)
                     screens[i].puts_scroll(0, top_of_screen + 3, buf);
@@ -1223,7 +1223,7 @@
     return action;
     (void)this_item;
 }
-MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_FM_BUTTONBAR_PRESETS),
+MAKE_MENU(handle_radio_preset_menu, ID2P(LANG_PRESET),
             radio_preset_callback, Icon_NOICON, &radio_edit_preset_item, 
             &radio_delete_preset_item);
 /* present a list of preset stations */
@@ -1255,7 +1255,7 @@
     gui_buttonbar_draw(&buttonbar);
 #endif
     gui_synclist_init(&lists, presets_get_name, NULL, false, 1);
-    gui_synclist_set_title(&lists, str(LANG_FM_BUTTONBAR_PRESETS), NOICON);
+    gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON);
     gui_synclist_set_icon_callback(&lists, NULL);
     gui_synclist_set_nb_items(&lists, num_presets);
     gui_synclist_select_item(&lists, curr_preset<0 ? 0 : curr_preset);
@@ -1318,8 +1318,8 @@
 {
     (void)selected_item;
     (void)data;
-    snprintf(buffer, MAX_PATH, "%s %s", str(LANG_FM_TUNE_MODE),
-             radio_mode ? str(LANG_RADIO_PRESET_MODE) :
+    snprintf(buffer, MAX_PATH, "%s %s", str(LANG_MODE),
+             radio_mode ? str(LANG_PRESET) :
                           str(LANG_RADIO_SCAN_MODE));
     return buffer;
 }
@@ -1455,7 +1455,7 @@
 #endif /* HAVE_RECORDING */
 
 #ifdef FM_RECORDING_SCREEN
-MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING_MENU), 
+MENUITEM_FUNCTION(recscreen_item, 0, ID2P(LANG_RECORDING), 
                     fm_recording_screen, NULL, NULL, Icon_Recording);
 #endif
 #ifdef FM_RECORDING_SETTINGS
@@ -1463,7 +1463,7 @@
                     fm_recording_settings, NULL, NULL, Icon_Recording);
 #endif
 #ifndef FM_PRESET
-MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_FM_BUTTONBAR_PRESETS), 
+MENUITEM_FUNCTION(radio_presets_item, 0, ID2P(LANG_PRESET), 
                     handle_radio_presets, NULL, NULL, Icon_NOICON);
 #endif
 #ifndef FM_PRESET_ADD
Index: apps/recorder/recording.c
===================================================================
--- apps/recorder/recording.c	(revision 14056)
+++ apps/recorder/recording.c	(working copy)
@@ -1512,7 +1512,7 @@
             if(global_settings.rec_source == AUDIO_SRC_MIC)
             {
                 /* Draw MIC recording gain */
-                snprintf(buf, sizeof(buf), "%s:%s", str(LANG_SYSFONT_RECORDING_GAIN),
+                snprintf(buf, sizeof(buf), "%s:%s", str(LANG_SYSFONT_GAIN),
                          fmt_gain(SOUND_MIC_GAIN,
                                   global_settings.rec_mic_gain,
                                   buf2, sizeof(buf2)));
@@ -1904,12 +1904,12 @@
 
         FOR_NB_SCREENS(i)
         {
-            screens[i].getstringsize(str(LANG_SYSFONT_RECORDING_CHANNELS), &w, &h);
+            screens[i].getstringsize(str(LANG_SYSFONT_CHANNELS), &w, &h);
             screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2,
-                       str(LANG_SYSFONT_RECORDING_CHANNELS));
-            screens[i].getstringsize(str(LANG_SYSFONT_F2_MODE), &w, &h);
+                       str(LANG_SYSFONT_CHANNELS));
+            screens[i].getstringsize(str(LANG_SYSFONT_MODE), &w, &h);
             screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h,
-                       str(LANG_SYSFONT_F2_MODE));
+                       str(LANG_SYSFONT_MODE));
             screens[i].getstringsize(ptr, &w, &h);
             screens[i].putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr);
             screens[i].mono_bitmap(bitmap_icons_7x8[Icon_FastForward], 
@@ -1982,7 +1982,7 @@
     char *src_str[] =
     {
         str(LANG_SYSFONT_RECORDING_SRC_MIC),
-        str(LANG_SYSFONT_RECORDING_SRC_LINE),
+        str(LANG_SYSFONT_LINE_IN),
         str(LANG_SYSFONT_RECORDING_SRC_DIGITAL)
     };
     struct audio_recording_options rec_options;
Index: apps/language.h
===================================================================
--- apps/language.h	(revision 14056)
+++ apps/language.h	(working copy)
@@ -22,7 +22,7 @@
 
 /* both these must match the two initial bytes in the binary lang file */
 #define LANGUAGE_COOKIE  0x1a
-#define LANGUAGE_VERSION 0x03
+#define LANGUAGE_VERSION 0x04
 
 /* Initialize language array with the builtin strings */
 void lang_init(void);
Index: apps/Makefile
===================================================================
--- apps/Makefile	(revision 14056)
+++ apps/Makefile	(working copy)
@@ -90,6 +90,8 @@
 
 dep: $(DEPFILE)
 
+features: $(OBJDIR)/features
+
 build-codecs:
 	$(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib
 	$(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs
@@ -195,9 +197,22 @@
     
 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.
+# button.h is included for the HAS_BUTTON_HOLD define.
+#
+
+$(OBJDIR)/features: features.txt
+	$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
+	$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \
+	grep -v "^\#" | 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 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/tree.c
===================================================================
--- apps/tree.c	(revision 14056)
+++ apps/tree.c	(working copy)
@@ -1318,10 +1318,10 @@
         FOR_NB_SCREENS(i)
         {
             screens[i].putsxy((LCD_WIDTH/2) -
-                              ((strlen(str(LANG_DIRCACHE_BUILDING)) *
+                              ((strlen(str(LANG_SCANNING_DISK)) *
                                 screens[i].char_width)/2),
                               LCD_HEIGHT-screens[i].char_height*3,
-                              str(LANG_DIRCACHE_BUILDING));
+                              str(LANG_SCANNING_DISK));
             gui_textarea_update(&screens[i]);
         }
 
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 14056)
+++ apps/lang/english.lang	(working copy)
@@ -29,6 +29,51 @@
 # when doing updates etc, while the <dest> ones are used when this file is
 # used to simply get the full set of english strings for a particular target.
 #
+# All phrases have a default string like: *: "default" that will be used if no
+# other string matches for the particular model you build the language for. If
+# you want a particular string for the iriver h300 series you'd write it like:
+# h300: "h300-specific string" (and of couse use the default string too on the
+# line below). If your string isn't used for all targets set the default to
+# none like: *: none this will not include the string for target that will not
+# need it (see apps/features.txt for available categories that can be used
+# instead of the target name, for example: swcodec: "swcodec-specific string".
+#
+#
+# The target names used are picked from the configure script and are set in the
+# ARCHOS variable in the root makefile. Currently, they are:
+# Target        Target string
+# Archos
+# Player/Studio     player
+# Recorder          recorder
+# FM Recorder       fmrecorder
+# Recorder V2       recorderv2
+# Ondio SP          ondiosp
+# Ondio FM          ondiofm
+# iriver
+# H100/H110/H115    h100
+# H120/H140         h120
+# H320/H340         h300
+# H10               h10
+# IFP 7XX           ifp7xx
+# iaudio
+# X5                x5
+# M5                m5
+# ipod
+# All iPods         ipod*
+# 4G Color/Photo    ipodcolor
+# Nano              ipodnano
+# Video (5G)        ipodvideo
+# 3G                ipod3g
+# 4G gray           ipod4g
+# mini              ipodmini
+# mini 2G           ipodmini2g
+# Toshiba
+# Gigabeat Fxx      gigabeatf
+#
+# Sandisk
+# Sansa E200        e200
+#
+
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -86,7 +131,7 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME_SETTING_ASK
+  id: LANG_ASK
   desc: in settings_menu
   user:
   <source>
@@ -114,1275 +159,1340 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WAIT
-  desc: general please wait splash
+  id: LANG_NORMAL
+  desc: in settings_menu
   user:
   <source>
-    *: "Loading..."
+    *: "Normal"
   </source>
   <dest>
-    *: "Loading..."
+    *: "Normal"
   </dest>
   <voice>
-    *: ""
+    *: "Normal"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONFIRM_SHUTDOWN
-  desc: in shutdown screen
+  id: LANG_GAIN
+  desc: Generic string for gain used in EQ menu and recording screen
   user:
   <source>
-    *: "Press OFF to shut down"
+    *: "Gain"
   </source>
   <dest>
-    *: "Press OFF to shut down"
+    *: "Gain"
   </dest>
   <voice>
-    *: ""
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUTTINGDOWN
-  desc: in main menu
+  id: LANG_WAIT
+  desc: general please wait splash
   user:
   <source>
-    *: "Shutting down..."
+    *: "Loading..."
   </source>
   <dest>
-    *: "Shutting down..."
+    *: "Loading..."
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  id: LANG_LOADING_PERCENT
+  desc: splash number of percents loaded
   user:
   <source>
-    *: "Restarting playback..."
+    *: "Loading... %d%% done (%s)"
   </source>
   <dest>
-    *: "Restarting playback..."
+    *: "Loading... %d%% done (%s)"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOVE_MMC
-  desc: before acknowledging usb in case an MMC is inserted (Ondio)
+  id: LANG_SCANNING_DISK
+  desc: when booting up and rebuilding the cache and calculating free space
   user:
   <source>
-    *: "Please remove inserted MMC"
+    *: "Scanning disk..."
   </source>
   <dest>
-    *: "Please remove inserted MMC"
+    *: "Scanning disk..."
   </dest>
   <voice>
-    *: "Please remove multimedia card"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MENU_SETTING_CANCEL
-  desc: Visual confirmation of canceling a changed setting
+  id: LANG_SHUTTINGDOWN
+  desc: in main menu
   user:
   <source>
-    *: "Canceled"
+    *: "Shutting down..."
   </source>
   <dest>
-    *: "Cancelled"
+    *: "Shutting down..."
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FAILED
-  desc: Something failed. To be appended after actions
+  id: LANG_PLAYLIST_SHUFFLE
+  desc: displayed on screen while shuffling a playlist
   user:
   <source>
-    *: "Failed"
+    *: "Shuffling..."
   </source>
   <dest>
-    *: "Failed"
+    *: "Shuffling..."
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
-  desc: in the main menu
+  id: LANG_CANCEL
+  desc: Visual confirmation of canceling a changed setting
   user:
   <source>
-    *: "Recent Bookmarks"
+    *: "Cancelled"
   </source>
   <dest>
-    *: "Recent Bookmarks"
+    *: "Cancelled"
   </dest>
   <voice>
-    *: "Recent Bookmarks"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SOUND_SETTINGS
-  desc: in the main menu
+  id: LANG_FAILED
+  desc: Something failed. To be appended after actions
   user:
   <source>
-    *: "Sound Settings"
+    *: "Failed"
   </source>
   <dest>
-    *: "Sound Settings"
+    *: "Failed"
   </dest>
   <voice>
-    *: "Sound Settings"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GENERAL_SETTINGS
-  desc: in the main menu
+  id: LANG_CHANNELS
+  desc: in sound_settings
   user:
   <source>
-    *: "General Settings"
+    *: "Channels"
   </source>
   <dest>
-    *: "General Settings"
+    *: "Channels"
   </dest>
   <voice>
-    *: "General Settings"
+    *: "Channels"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MANAGE_MENU
-  desc: in the main menu
+  id: LANG_RESET_ASK
+  desc: confirm to reset settings
   user:
   <source>
-    *: "Manage Settings"
+    *: "Are You Sure?"
   </source>
   <dest>
-    *: "Manage Settings"
+    *: "Are You Sure?"
   </dest>
   <voice>
-    *: "Manage Settings"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUSTOM_THEME
-  desc: in the main menu
+  id: LANG_CONFIRM_WITH_BUTTON
+  desc: Generic string to use to confirm
   user:
   <source>
-    *: "Browse Themes"
+    *: "PLAY = Yes"
+    h100,h120,h300: "NAVI = Yes"
+    ipod*,x5,m5,gigabeatf,e200,h10,h10_5gb: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
-    *: "Browse Themes"
+    *: "PLAY = Yes"
+    h100,h120,h300: "NAVI = Yes"
+    ipod*,x5,m5,gigabeatf,e200,h10,h10_5gb: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
-    *: "Browse Themes"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_RADIO
-  desc: in the main menu
+  id: LANG_CANCEL_WITH_ANY
+  desc: Generic string to use to cancel
   user:
   <source>
-    *: "FM Radio"
+    *: "Any Other = No"
+    player: none
   </source>
   <dest>
-    *: "FM Radio"
+    *: "Any Other = No"
+    player: none
   </dest>
   <voice>
-    *: "FM Radio"
+    *: ""
+    player: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING
-  desc: in the main menu
+  id: LANG_ROCKBOX_TITLE
+  desc: main menu title
   user:
   <source>
-    *: "Recording"
+    *: "Rockbox"
   </source>
   <dest>
-    *: "Recording"
+    *: "Rockbox"
   </dest>
   <voice>
-    *: "Recording"
+    *: "Rockbox"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_MENU
+  id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
   desc: in the main menu
   user:
   <source>
-    *: "Playlist"
+    *: "Recent Bookmarks"
   </source>
   <dest>
-    *: "Playlist"
+    *: "Recent Bookmarks"
   </dest>
   <voice>
-    *: "Playlist"
+    *: "Recent Bookmarks"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGINS
-  desc: in the main menu
+  id: LANG_DIR_BROWSER
+  desc: main menu title
   user:
   <source>
-    *: "Plugins"
+    *: "Files"
   </source>
   <dest>
-    *: "Plugins"
+    *: "Files"
   </dest>
   <voice>
-    *: "Plugins"
+    *: "Files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INFO
-  desc: in the main menu
+  id: LANG_TAGCACHE
+  desc: in the main menu and the settings menu
   user:
   <source>
-    *: "System"
+    *: "Database"
   </source>
   <dest>
-    *: "System"
+    *: "Database"
   </dest>
   <voice>
-    *: "System"
+    *: "Database"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUTDOWN
-  desc: in main menu
+  id: LANG_NOW_PLAYING
+  desc: in the main menu
   user:
   <source>
-    *: "Shut down"
+    *: "Now Playing"
   </source>
   <dest>
-    *: "Shut down"
+    *: "Now Playing"
   </dest>
   <voice>
-    *: "Shut down"
+    *: "Now Playing"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOLUME
-  desc: in sound_settings
+  id: LANG_RESUME_PLAYBACK
+  desc: in the main menu
   user:
   <source>
-    *: "Volume"
+    *: "Resume Playback"
   </source>
   <dest>
-    *: "Volume"
+    *: "Resume Playback"
   </dest>
   <voice>
-    *: "Volume"
+    *: "Resume Playback"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BASS
-  desc: in sound_settings
+  id: LANG_SETTINGS
+  desc:  in main menu and visual confirmation after settings reset
   user:
   <source>
-    *: "Bass"
+    *: "Settings"
   </source>
   <dest>
-    *: "Bass"
+    *: "Settings"
   </dest>
   <voice>
-    *: "Bass"
+    *: "Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TREBLE
-  desc: in sound_settings
+  id: LANG_RECORDING
+  desc: in the main menu
   user:
   <source>
-    *: "Treble"
+    *: none
+    recording: "Recording"
   </source>
   <dest>
-    *: "Treble"
+    *: none
+    recording: "Recording"
   </dest>
   <voice>
-    *: "Treble"
+    *: none
+    recording: "Recording"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BALANCE
-  desc: in sound_settings
+  id: LANG_FM_RADIO
+  desc: in the main menu
   user:
   <source>
-    *: "Balance"
+    *: none
+    radio: "FM Radio"
   </source>
   <dest>
-    *: "Balance"
+    *: none
+    radio: "FM Radio"
   </dest>
   <voice>
-    *: "Balance"
+    *: none
+    radio: "FM Radio"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_MENU
-  desc: in sound_settings
+  id: LANG_PLAYLISTS
+  desc: in the main menu and  file vew setting
   user:
   <source>
-    *: "Channels"
+    *: "Playlists"
   </source>
   <dest>
-    *: "Channels"
+    *: "Playlists"
   </dest>
   <voice>
-    *: "Channels"
+    *: "Playlists"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL
-  desc: in sound_settings
+  id: LANG_PLUGINS
+  desc: in the main menu
   user:
   <source>
-    *: "Channel Configuration"
+    *: "Plugins"
   </source>
   <dest>
-    *: "Channel Configuration"
+    *: "Plugins"
   </dest>
   <voice>
-    *: "Channel Configuration"
+    *: "Plugins"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  id: LANG_SYSTEM
+  desc: in the main menu ang settings menu
   user:
   <source>
-    *: "Stereo"
+    *: "System"
   </source>
   <dest>
-    *: "Stereo"
+    *: "System"
   </dest>
   <voice>
-    *: "Stereo"
+    *: "System"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  id: LANG_BOOKMARK_SELECT_BOOKMARK
+  desc: bookmark selection list title
   user:
   <source>
-    *: "Mono"
+    *: "Select Bookmark"
   </source>
   <dest>
-    *: "Mono"
+    *: "Select Bookmark"
   </dest>
   <voice>
-    *: "Mono"
+    *: "Select Bookmark"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_CUSTOM
-  desc: in sound_settings
+  id: LANG_BOOKMARK_DONT_RESUME
+  desc: top item in the list when asking user about bookmark auto load
   user:
   <source>
-    *: "Custom"
+    *: "<Don't Resume>"
   </source>
   <dest>
-    *: "Custom"
+    *: "<Don't Resume>"
   </dest>
   <voice>
-    *: "Custom"
+    *: "Do not resume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_LEFT
-  desc: in sound_settings
+  id: LANG_BOOKMARK_SHUFFLE
+  desc: bookmark selection list, bookmark enables shuffle
   user:
   <source>
-    *: "Mono Left"
+    *: ", Shuffle"
   </source>
   <dest>
-    *: "Mono Left"
+    *: ", Shuffle"
   </dest>
   <voice>
-    *: "Mono Left"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_RIGHT
-  desc: in sound_settings
+  id: LANG_BOOKMARK_INVALID
+  desc: bookmark selection list, bookmark couldn't be parsed
   user:
   <source>
-    *: "Mono Right"
+    *: "<Invalid Bookmark>"
   </source>
   <dest>
-    *: "Mono Right"
+    *: "<Invalid Bookmark>"
   </dest>
   <voice>
-    *: "Mono Right"
+    *: "Invalid Bookmark"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_KARAOKE
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CONTEXT_MENU
+  desc: bookmark selection list context menu
   user:
   <source>
-    *: "Karaoke"
+    *: "Bookmark Actions"
   </source>
   <dest>
-    *: "Karaoke"
+    *: "Bookmark Actions"
   </dest>
   <voice>
-    *: "Karaoke"
+    *: "Bookmark Actions"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STEREO_WIDTH
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CONTEXT_RESUME
+  desc: bookmark context menu, resume this bookmark
   user:
   <source>
-    *: "Stereo Width"
+    *: "Resume"
   </source>
   <dest>
-    *: "Stereo Width"
+    *: "Resume"
   </dest>
   <voice>
-    *: "Stereo Width"
+    *: "Resume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LOUDNESS
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CONTEXT_DELETE
+  desc: bookmark context menu, delete this bookmark
   user:
   <source>
-    *: "Loudness"
+    *: "Delete"
   </source>
   <dest>
-    *: "Loudness"
+    *: "Delete"
   </dest>
   <voice>
-    *: "Loudness"
+    *: "Delete"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTOVOL
-  desc: in sound_settings
+  id: LANG_AUTO_BOOKMARK_QUERY
+  desc: prompt for user to decide to create an bookmark
   user:
   <source>
-    *: "Auto Volume"
+    *: "Create a Bookmark?"
   </source>
   <dest>
-    *: "Auto Volume"
+    *: "Create a Bookmark?"
   </dest>
   <voice>
-    *: "Auto Volume"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DECAY
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CREATE_SUCCESS
+  desc: Indicates bookmark was successfully created
   user:
   <source>
-    *: "AV Decay Time"
+    *: "Bookmark Created"
   </source>
   <dest>
-    *: "AV Decay Time"
+    *: "Bookmark Created"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SUPERBASS
-  desc: in sound settings
+  id: LANG_BOOKMARK_CREATE_FAILURE
+  desc: Indicates bookmark was not created
   user:
   <source>
-    *: "Super Bass"
+    *: "Bookmark Failed!"
   </source>
   <dest>
-    *: "Super Bass"
+    *: "Bookmark Failed!"
   </dest>
   <voice>
-    *: "Super Bass"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_ENABLE
-  desc: in sound settings
+  id: LANG_BOOKMARK_LOAD_EMPTY
+  desc: Indicates bookmark was empty
   user:
   <source>
-    *: "MDB Enable"
+    *: "Bookmark Empty"
   </source>
   <dest>
-    *: "MDB Enable"
+    *: "Bookmark Empty"
   </dest>
   <voice>
-    *: "MDB Enable"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_STRENGTH
-  desc: in sound settings
+  id: LANG_SOUND_SETTINGS
+  desc: in the main menu
   user:
   <source>
-    *: "MDB Strength"
+    *: "Sound Settings"
   </source>
   <dest>
-    *: "MDB Strength"
+    *: "Sound Settings"
   </dest>
   <voice>
-    *: "MDB Strength"
+    *: "Sound Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_HARMONICS
-  desc: in sound settings
+  id: LANG_VOLUME
+  desc: in sound_settings
   user:
   <source>
-    *: "MDB Harmonics"
+    *: "Volume"
   </source>
   <dest>
-    *: "MDB Harmonics"
+    *: "Volume"
   </dest>
   <voice>
-    *: "MDB Harmonics"
+    *: "Volume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_CENTER
-  desc: in sound settings
+  id: LANG_BASS
+  desc: in sound_settings
   user:
   <source>
-    *: "MDB Center Frequency"
+    *: "Bass"
   </source>
   <dest>
-    *: "MDB Center Frequency"
+    *: "Bass"
   </dest>
   <voice>
-    *: "MDB Center Frequency"
+    *: "Bass"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_SHAPE
-  desc: in sound settings
+  id: LANG_TREBLE
+  desc: in sound_settings
   user:
   <source>
-    *: "MDB Shape"
+    *: "Treble"
   </source>
   <dest>
-    *: "MDB Shape"
+    *: "Treble"
   </dest>
   <voice>
-    *: "MDB Shape"
+    *: "Treble"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED
-  desc: in sound settings
+  id: LANG_BALANCE
+  desc: in sound_settings
   user:
   <source>
-    *: "Crossfeed"
+    *: "Balance"
   </source>
   <dest>
-    *: "Crossfeed"
+    *: "Balance"
   </dest>
   <voice>
-    *: "Crossfeed"
+    *: "Balance"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER
-  desc: in the sound settings menu
+  id: LANG_CHANNEL_CONFIGURATION
+  desc: in sound_settings
   user:
   <source>
-    *: "Equalizer"
+    *: "Channel Configuration"
   </source>
   <dest>
-    *: "Equalizer"
+    *: "Channel Configuration"
   </dest>
   <voice>
-    *: "Equalizer"
+    *: "Channel Configuration"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYBACK
-  desc: in settings_menu()
+  id: LANG_CHANNEL_STEREO
+  desc: in sound_settings
   user:
   <source>
-    *: "Playback"
+    *: "Stereo"
   </source>
   <dest>
-    *: "Playback"
+    *: "Stereo"
   </dest>
   <voice>
-    *: "Playback"
+    *: "Stereo"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILE
-  desc: in settings_menu()
+  id: LANG_CHANNEL_MONO
+  desc: in sound_settings
   user:
   <source>
-    *: "File View"
+    *: "Mono"
   </source>
   <dest>
-    *: "File View"
+    *: "Mono"
   </dest>
   <voice>
-    *: "File View"
+    *: "Mono"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY
-  desc: in settings_menu()
+  id: LANG_CHANNEL_CUSTOM
+  desc: in sound_settings
   user:
   <source>
-    *: "Display"
+    *: "Custom"
   </source>
   <dest>
-    *: "Display"
+    *: "Custom"
   </dest>
   <voice>
-    *: "Display"
+    *: "Custom"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSTEM
-  desc: in settings_menu()
+  id: LANG_CHANNEL_LEFT
+  desc: in sound_settings
   user:
   <source>
-    *: "System"
+    *: "Mono Left"
   </source>
   <dest>
-    *: "System"
+    *: "Mono Left"
   </dest>
   <voice>
-    *: "System"
+    *: "Mono Left"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS
-  desc: in general settings
+  id: LANG_CHANNEL_RIGHT
+  desc: in sound_settings
   user:
   <source>
-    *: "Bookmarking"
+    *: "Mono Right"
   </source>
   <dest>
-    *: "Bookmarking"
+    *: "Mono Right"
   </dest>
   <voice>
-    *: "Bookmarking"
+    *: "Mono Right"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LANGUAGE
-  desc: in settings_menu
+  id: LANG_CHANNEL_KARAOKE
+  desc: in sound_settings
   user:
   <source>
-    *: "Language"
+    *: "Karaoke"
   </source>
   <dest>
-    *: "Language"
+    *: "Karaoke"
   </dest>
   <voice>
-    *: "Language"
+    *: "Karaoke"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE
-  desc: root of voice menu
+  id: LANG_STEREO_WIDTH
+  desc: in sound_settings
   user:
   <source>
-    *: "Voice"
+    *: "Stereo Width"
   </source>
   <dest>
-    *: "Voice"
+    *: "Stereo Width"
   </dest>
   <voice>
-    *: "Voice"
+    *: "Stereo Width"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUSTOM_CFG
-  desc: in setting_menu()
+  id: LANG_CROSSFEED
+  desc: in sound settings
   user:
   <source>
-    *: "Browse .cfg files"
+    *: none
+    swcodec: "Crossfeed"
   </source>
   <dest>
-    *: "Browse .cfg files"
+    *: none
+    swcodec: "Crossfeed"
   </dest>
   <voice>
-    *: "Browse configuration files"
+    *: none
+    swcodec: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FIRMWARE
-  desc: DEPRECATED
+  id: LANG_CROSSFEED_DIRECT_GAIN
+  desc: in crossfeed settings
   user:
   <source>
-    *: ""
+    *: none
+    swcodec: "Direct Gain"
   </source>
   <dest>
-    *: deprecated
+    *: none
+    swcodec: "Direct Gain"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Direct gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET
-  desc: in system_settings_menu()
-  user:
+  id: LANG_CROSSFEED_CROSS_GAIN
+  desc: in crossfeed settings
   <source>
-    *: "Reset Settings"
+    *: none
+    swcodec: "Cross Gain"
   </source>
   <dest>
-    *: "Reset Settings"
+    *: none
+    swcodec: "Cross Gain"
   </dest>
   <voice>
-    *: "Reset Settings"
+    *: none
+    swcodec: "Cross gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK_RECORDER
-  desc: confirm to reset settings
-  user:
+  id: LANG_CROSSFEED_HF_ATTENUATION
+  desc: in crossfeed settings
   <source>
-    *: "Are You Sure?"
+    *: none
+    swcodec: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: "Are You Sure?"
+    *: none
+    swcodec: "High-Frequency Attenuation"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
-  user:
+  id: LANG_CROSSFEED_HF_CUTOFF
+  desc: in crossfeed settings
   <source>
-    *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    ipod*: "SELECT = Yes"
-    x5: "SELECT = Yes"
-    h10,h10_5gb: "SELECT = Yes"
-    gigabeatf: "SELECT = Yes"
-    e200: "SELECT = Yes"
+    *: none
+    swcodec: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    ipod*: "SELECT = Yes"
-    x5: "SELECT = Yes"
-    h10,h10_5gb: "SELECT = Yes"
-    gigabeatf: "SELECT = Yes"
-    e200: "SELECT = Yes"
+    *: none
+    swcodec: "High-Frequency Cutoff"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  id: LANG_EQUALIZER
+  desc: in the sound settings menu
   user:
   <source>
-    *: "Any Other = No"
+    *: none
+    swcodec: "Equalizer"
   </source>
   <dest>
-    *: "Any Other = No"
+    *: none
+    swcodec: "Equalizer"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Equalizer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_DONE_SETTING
-  desc: visual confirmation after settings reset
+  id: LANG_EQUALIZER_ENABLED
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Settings"
+    *: none
+    swcodec: "Enable EQ"
   </source>
   <dest>
-    *: "Settings"
+    *: none
+    swcodec: "Enable EQ"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_DONE_CLEAR
-  desc: visual confirmation after settings reset
+  id: LANG_EQUALIZER_GRAPHICAL
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Cleared"
+    *: none
+    swcodec: "Graphical EQ"
   </source>
   <dest>
-    *: "Cleared"
+    *: none
+    swcodec: "Graphical EQ"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_DONE_CANCEL
-  desc: Visual confirmation of cancelation
+  id: LANG_EQUALIZER_PRECUT
+  desc: in eq settings
   user:
   <source>
-    *: "Canceled"
+    *: none
+    swcodec: "Precut"
   </source>
   <dest>
-    *: "Cancelled"
+    *: none
+    swcodec: "Precut"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_SETTINGS
-  desc: in system_settings_menu()
+  id: LANG_EQUALIZER_GAIN
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Write .cfg file"
+    *: none
+    swcodec: "Simple EQ Settings"
   </source>
   <dest>
-    *: "Write .cfg file"
+    *: none
+    swcodec: "Simple EQ Settings"
   </dest>
   <voice>
-    *: "Write configuration file"
+    *: none
+    swcodec: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_SAVE_PLAYER
-  desc: displayed if save settings has failed
+  id: LANG_EQUALIZER_ADVANCED
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Save Failed"
+    *: none
+    swcodec: "Advanced EQ Settings"
   </source>
   <dest>
-    *: "Save Failed"
+    *: none
+    swcodec: "Advanced EQ Settings"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_BATTERY_PLAYER
-  desc: if save settings has failed
+  id: LANG_EQUALIZER_SAVE
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Partition?"
+    *: none
+    swcodec: "Save EQ Preset"
   </source>
   <dest>
-    *: "Partition?"
+    *: none
+    swcodec: "Save EQ Preset"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_SAVE_RECORDER
-  desc: displayed if save settings has failed
+  id: LANG_EQUALIZER_BROWSE
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Save Failed"
+    *: none
+    swcodec: "Browse EQ Presets"
   </source>
   <dest>
-    *: "Save Failed"
+    *: none
+    swcodec: "Browse EQ Presets"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_BATTERY_RECORDER
-  desc: if save settings has failed
+  id: LANG_EQUALIZER_EDIT_MODE
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "No partition?"
+    *: none
+    swcodec: "Edit mode: %s"
   </source>
   <dest>
-    *: "No partition?"
+    *: none
+    swcodec: "Edit mode: %s"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_MENU
-  desc: in the recording sub menu
-  user:
-  <source>
-    *: "Recording"
-  </source>
-  <dest>
-    *: "Recording"
-  </dest>
-  <voice>
-    *: "Recording"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORDING_SETTINGS
-  desc: in the main menu
-  user:
-  <source>
-    *: "Recording Settings"
-  </source>
-  <dest>
-    *: "Recording Settings"
-  </dest>
-  <voice>
-    *: "Recording Settings"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_EQUALIZER_ENABLED
+  id: LANG_EQUALIZER_GAIN_ITEM
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Enable EQ"
+    *: none
+    swcodec: "%d Hz Band Gain"
   </source>
   <dest>
-    *: "Enable EQ"
+    *: none
+    swcodec: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: "Enable equalizer"
+    *: none
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_GRAPHICAL
+  id: LANG_EQUALIZER_BAND_LOW_SHELF
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Graphical EQ"
+    *: none
+    swcodec: "Low Shelf Filter"
   </source>
   <dest>
-    *: "Graphical EQ"
+    *: none
+    swcodec: "Low Shelf Filter"
   </dest>
   <voice>
-    *: "Graphical equalizer"
+    *: none
+    swcodec: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_PRECUT
-  desc: in eq settings
-  user:
-  <source>
-    *: "Precut"
-  </source>
-  <dest>
-    *: "Precut"
-  </dest>
-  <voice>
-    *: "Pre-cut"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_EQUALIZER_GAIN
+  id: LANG_EQUALIZER_BAND_PEAK
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Simple EQ Settings"
+    *: none
+    swcodec: "Peak Filter %d"
   </source>
   <dest>
-    *: "Simple EQ Settings"
+    *: none
+    swcodec: "Peak Filter %d"
   </dest>
   <voice>
-    *: "Simple equalizer settings"
+    *: none
+    swcodec: "Peak filter"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_ADVANCED
+  id: LANG_EQUALIZER_BAND_HIGH_SHELF
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Advanced EQ Settings"
+    *: none
+    swcodec: "High Shelf Filter"
   </source>
   <dest>
-    *: "Advanced EQ Settings"
+    *: none
+    swcodec: "High Shelf Filter"
   </dest>
   <voice>
-    *: "Advanced equalizer settings"
+    *: none
+    swcodec: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_SAVE
+  id: LANG_EQUALIZER_BAND_CUTOFF
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Save EQ Preset"
+    *: none
+    swcodec: "Cutoff Frequency"
   </source>
   <dest>
-    *: "Save EQ Preset"
+    *: none
+    swcodec: "Cutoff Frequency"
   </dest>
   <voice>
-    *: "Save equalizer preset"
+    *: none
+    swcodec: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BROWSE
+  id: LANG_EQUALIZER_BAND_CENTER
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Browse EQ Presets"
+    *: none
+    swcodec: "Center Frequency"
   </source>
   <dest>
-    *: "Browse EQ Presets"
+    *: none
+    swcodec: "Center Frequency"
   </dest>
   <voice>
-    *: "Browse equalizer presets"
+    *: none
+    swcodec: "Center frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_EDIT_MODE
+  id: LANG_EQUALIZER_BAND_Q
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Edit mode: %s"
+    *: none
+    swcodec: "Q"
   </source>
   <dest>
-    *: "Edit mode: %s"
+    *: none
+    swcodec: "Q"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Q"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_GAIN_ITEM
-  desc: in the equalizer settings menu
+  id: LANG_EQUALIZER_HARDWARE
+  desc: in the sound settings menu
   user:
   <source>
-    *: "%d Hz Band Gain"
+    *: none
+    ipodvideo: "Hardware Equalizer"
   </source>
   <dest>
-    *: "%d Hz Band Gain"
+    *: none
+    ipodvideo: "Hardware Equalizer"
   </dest>
   <voice>
-    *: ""
+    *: none
+    ipodvideo: "Hardware equalizer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_LOW_SHELF
+  id: LANG_EQUALIZER_HARDWARE_ENABLED
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Low Shelf Filter"
+    *: none
+    ipodvideo: "Enable Hardware EQ"
   </source>
   <dest>
-    *: "Low Shelf Filter"
+    *: none
+    ipodvideo: "Enable Hardware EQ"
   </dest>
   <voice>
-    *: "Low shelf filter"
+    *: none
+    ipodvideo: "Enable hardware equalizer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_PEAK
+  id: LANG_EQUALIZER_BANDWIDTH
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Peak Filter %d"
+    *: none
+    ipodvideo: "Bandwidth"
   </source>
   <dest>
-    *: "Peak Filter %d"
+    *: none
+    ipodvideo: "Bandwidth"
   </dest>
   <voice>
-    *: "Peak filter"
+    *: none
+    ipodvideo: "Bandwidth"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_HIGH_SHELF
+  id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "High Shelf Filter"
+    *: none
+    ipodvideo: "Narrow"
   </source>
   <dest>
-    *: "High Shelf Filter"
+    *: none
+    ipodvideo: "Narrow"
   </dest>
   <voice>
-    *: "High shelf filter"
+    *: none
+    ipodvideo: "Narrow"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_CUTOFF
+  id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE
   desc: in the equalizer settings menu
   user:
   <source>
-    *: "Cutoff Frequency"
+    *: none
+    ipodvideo: "Wide"
   </source>
   <dest>
-    *: "Cutoff Frequency"
+    *: none
+    ipodvideo: "Wide"
   </dest>
   <voice>
-    *: "Cutoff Frequency"
+    *: none
+    ipodvideo: "Wide"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_CENTER
-  desc: in the equalizer settings menu
+  id: LANG_DITHERING
+  desc: in the sound settings menu
   user:
   <source>
-    *: "Center Frequency"
+    *: none
+    swcodec: "Dithering"
   </source>
   <dest>
-    *: "Center Frequency"
+    *: none
+    swcodec: "Dithering"
   </dest>
   <voice>
-    *: "Center frequency"
+    *: none
+    swcodec: "Dithering"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_Q
-  desc: in the equalizer settings menu
+  id: LANG_LOUDNESS
+  desc: in sound_settings
   user:
   <source>
-    *: "Q"
+    *: none
+    masf: "Loudness"
   </source>
   <dest>
-    *: "Q"
+    *: none
+    masf: "Loudness"
   </dest>
   <voice>
-    *: "Q"
+    *: none
+    masf: "Loudness"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BAND_GAIN
-  desc: in the equalizer settings menu
+  id: LANG_AUTOVOL
+  desc: in sound_settings
   user:
   <source>
-    *: "Gain"
+    *: none
+    masf: "Auto Volume"
   </source>
   <dest>
-    *: "Gain"
+    *: none
+    masf: "Auto Volume"
   </dest>
   <voice>
-    *: "Gain"
+    *: none
+    masf: "Auto Volume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATE_PLAYLIST
-  desc: Menu option for creating a playlist
+  id: LANG_DECAY
+  desc: in sound_settings
   user:
   <source>
-    *: "Create Playlist"
+    *: none
+    masf: "AV Decay Time"
   </source>
   <dest>
-    *: "Create Playlist"
+    *: none
+    masf: "AV Decay Time"
   </dest>
   <voice>
-    *: "Create Playlist"
+    *: none
+    masf: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VIEW_DYNAMIC_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_SUPERBASS
+  desc: in sound settings
   user:
   <source>
-    *: "View Current Playlist"
+    *: none
+    masf: "Super Bass"
   </source>
   <dest>
-    *: "View Current Playlist"
+    *: none
+    masf: "Super Bass"
   </dest>
   <voice>
-    *: "View Current Playlist"
+    masf: "Super Bass"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_DYNAMIC_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_MDB_ENABLE
+  desc: in sound settings
   user:
   <source>
-    *: "Save Current Playlist"
+    *: none
+    masf: "MDB Enable"
   </source>
   <dest>
-    *: "Save Current Playlist"
+    *: none
+    masf: "MDB Enable"
   </dest>
   <voice>
-    *: "Save Current Playlist"
+    *: none
+    masf: "MDB Enable"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECURSE_DIRECTORY
-  desc: In playlist menu
+  id: LANG_MDB_STRENGTH
+  desc: in sound settings
   user:
   <source>
-    *: "Recursively Insert Directories"
+    *: none
+    masf: "MDB Strength"
   </source>
   <dest>
-    *: "Recursively Insert Directories"
+    *: none
+    masf: "MDB Strength"
   </dest>
   <voice>
-    *: "Recursively Insert Directories"
+    *: none
+    masf: "MDB Strength"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARN_ERASEDYNPLAYLIST_MENU
-  desc: in playlist options menu, option to warn when erasing dynamic playlist
+  id: LANG_MDB_HARMONICS
+  desc: in sound settings
   user:
   <source>
-    *: "Warn When Erasing Dynamic Playlist"
+    *: none
+    masf: "MDB Harmonics"
   </source>
   <dest>
-    *: "Warn When Erasing Dynamic Playlist"
+    *: none
+    masf: "MDB Harmonics"
   </dest>
   <voice>
-    *: "Warn When Erasing Dynamic Playlist"
+    *: none
+    masf: "MDB Harmonics"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INFO_MENU
-  desc: in the info menu
+  id: LANG_MDB_CENTER
+  desc: in sound settings
   user:
   <source>
-    *: "Rockbox Info"
+    *: none
+    masf: "MDB Center Frequency"
   </source>
   <dest>
-    *: "Rockbox Info"
+    *: none
+    masf: "MDB Center Frequency"
   </dest>
   <voice>
-    *: "Rockbox Info"
+    *: none
+    masf: "MDB Center Frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VERSION
-  desc: in the info menu
+  id: LANG_MDB_SHAPE
+  desc: in sound settings
   user:
   <source>
-    *: "Version"
+    *: none
+    masf: "MDB Shape"
   </source>
   <dest>
-    *: "Version"
+    *: none
+    masf: "MDB Shape"
   </dest>
   <voice>
-    *: "Version"
+    *: none
+    masf: "MDB Shape"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DEBUG
-  desc: in the info menu
+  id: LANG_GENERAL_SETTINGS
+  desc: in the main menu
   user:
   <source>
-    *: "Debug (Keep Out!)"
+    *: "General Settings"
   </source>
   <dest>
-    *: "Debug (Keep Out!)"
+    *: "General Settings"
   </dest>
   <voice>
-    *: "Debug, keep out!"
+    *: "General Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_USB
-  desc: in the info menu
+  id: LANG_PLAYBACK
+  desc: in settings_menu()
   user:
   <source>
-    *: "USB (Sim)"
+    *: "Playback"
   </source>
   <dest>
-    *: "USB (Sim)"
+    *: "Playback"
   </dest>
   <voice>
-    *: ""
+    *: "Playback"
   </voice>
 </phrase>
 <phrase>
@@ -1414,8 +1524,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPEAT_ALL
-  desc: repeat playlist once all songs have completed
+  id: LANG_ALL
+  desc: generic string used both in dir file filter and repeat mode selection
   user:
   <source>
     *: "All"
@@ -1443,7 +1553,7 @@
 </phrase>
 <phrase>
   id: LANG_REPEAT_AB
-  desc: repeat one song
+  desc: desc: repeat range from point A to B
   user:
   <source>
     *: "A-B"
@@ -1470,45 +1580,62 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME
-  desc: DEPRECATED
+  id: LANG_WIND_MENU
+  desc: in the playback sub menu
   user:
   <source>
-    *: ""
+    *: "Fast-Forward/Rewind"
   </source>
   <dest>
-    *: deprecated
+    *: "Fast-Forward/Rewind"
   </dest>
   <voice>
-    *: ""
+    *: "Fast forward and Rewind"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WIND_MENU
-  desc: in the playback sub menu
+  id: LANG_FFRW_STEP
+  desc: in settings_menu
   user:
   <source>
-    *: "Fast-Forward/Rewind"
+    *: "FF/RW Min Step"
   </source>
   <dest>
-    *: "Fast-Forward/Rewind"
+    *: "FF/RW Min Step"
   </dest>
   <voice>
-    *: "Fast forward and Rewind"
+    *: "Minimum Step"
   </voice>
 </phrase>
 <phrase>
+  id: LANG_FFRW_ACCEL
+  desc: in settings_menu
+  user:
+  <source>
+    *: "FF/RW Accel"
+  </source>
+  <dest>
+    *: "FF/RW Accel"
+  </dest>
+  <voice>
+    *: "Acceleration"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_MP3BUFFER_MARGIN
   desc: MP3 buffer margin time
   user:
   <source>
     *: "Anti-Skip Buffer"
+    ondio*: none
   </source>
   <dest>
     *: "Anti-Skip Buffer"
-  </dest>
+    ondio*: none
+    </dest>
   <voice>
     *: "Anti-Skip Buffer"
+    ondio*: none    
   </voice>
 </phrase>
 <phrase>
@@ -1544,1839 +1671,1473 @@
   desc: in playback settings
   user:
   <source>
-    *: "Crossfade"
+    *: none
+    swcodec: "Crossfade"
   </source>
   <dest>
-    *: "Crossfade"
+    *: none
+    swcodec: "Crossfade"
   </dest>
   <voice>
-    *: "Crossfade"
+    *: none
+    swcodec: "Crossfade"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLAYGAIN
-  desc: in replaygain
+  id: LANG_CROSSFADE_ENABLE
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "Replaygain"
+    *: none
+    swcodec: "Enable Crossfade"
   </source>
   <dest>
-    *: "Replaygain"
+    *: none
+    swcodec: "Enable Crossfade"
   </dest>
   <voice>
-    *: "Replaygain"
+    *: none
+    swcodec: "Enable Crossfade"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BEEP
-  desc: in playback settings
+  id: LANG_TRACKSKIP
+  desc: in crossfade settings
   user:
   <source>
-    *: "Beep Volume"
+    *: none
+    swcodec: "Track Skip Only"
   </source>
   <dest>
-    *: "Beep Volume"
+    *: none
+    swcodec: "Track Skip Only"
   </dest>
   <voice>
-    *: "Beep Volume"
+    *: none
+    swcodec: "Track Skip Only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEAK
-  desc: in beep volume in playback settings
+  id: LANG_SHUFFLE_TRACKSKIP
+  desc: in settings_menu
   user:
   <source>
-    *: "Weak"
+    *: none
+    swcodec: "Shuffle and Track Skip"
   </source>
   <dest>
-    *: "Weak"
+    *: none
+    swcodec: "Shuffle and Track Skip"
   </dest>
   <voice>
-    *: "Weak"
+    *: none
+    swcodec: "Shuffle and Track Skip"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MODERATE
-  desc: in beep volume in playback settings
+  id: LANG_CROSSFADE_FADE_IN_DELAY
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "Moderate"
+    *: none
+    swcodec: "Fade-In Delay"
   </source>
   <dest>
-    *: "Moderate"
+    *: none
+    swcodec: "Fade-In Delay"
   </dest>
   <voice>
-    *: "Moderate"
+    *: none
+    swcodec: "Fade-In Delay"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STRONG
-  desc: in beep volume in playback settings
+  id: LANG_CROSSFADE_FADE_IN_DURATION
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "Strong"
+    *: none
+    swcodec: "Fade-In Duration"
   </source>
   <dest>
-    *: "Strong"
+    *: none
+    swcodec: "Fade-In Duration"
   </dest>
   <voice>
-    *: "Strong"
+    *: none
+    swcodec: "Fade-In Duration"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPDIF_ENABLE
-  desc: in playback settings menu. enable/disable the optical out
+  id: LANG_CROSSFADE_FADE_OUT_DELAY
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "Optical Output"
+    *: none
+    swcodec: "Fade-Out Delay"
   </source>
   <dest>
-    *: "Optical Output"
+    *: none
+    swcodec: "Fade-Out Delay"
   </dest>
   <voice>
-    *: "Optical Output"
+    *: none
+    swcodec: "Fade-Out Delay"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ORDER
-  desc: in playback settings screen
+  id: LANG_CROSSFADE_FADE_OUT_DURATION
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "ID3 Tag Priority"
+    *: none
+    swcodec: "Fade-Out Duration"
   </source>
   <dest>
-    *: "ID3 Tag Priority"
+    *: none
+    swcodec: "Fade-Out Duration"
   </dest>
   <voice>
-    *: "ID3 Tag Priority"
+    *: none
+    swcodec: "Fade-Out Duration"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_V1_FIRST
-  desc: in playback settings screen
+  id: LANG_CROSSFADE_FADE_OUT_MODE
+  desc: in crossfade settings menu
   user:
   <source>
-    *: "V1 then V2"
+    *: none
+    swcodec: "Fade-Out Mode"
   </source>
   <dest>
-    *: "V1 then V2"
+    *: none
+    swcodec: "Fade-Out Mode"
   </dest>
   <voice>
-    *: "Version 1 then version 2"
+    *: none
+    swcodec: "Fade-Out Mode"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_V2_FIRST
-  desc: in playback settings screen
+  id: LANG_MIX
+  desc: in playback settings, crossfade option
   user:
   <source>
-    *: "V2 then V1"
+    *: none
+    swcodec: "Mix"
   </source>
   <dest>
-    *: "V2 then V1"
+    *: none
+    swcodec: "Mix"
   </dest>
   <voice>
-    *: "Version 2 then version 1"
+    *: none
+    swcodec: "Mix"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NEXT_FOLDER
-  desc: in settings_menu. Should we allow move to next/prev folder from last/first track of current one
+  id: LANG_REPLAYGAIN
+  desc: in replaygain
   user:
   <source>
-    *: "Auto-Change Directory"
+    *: "Replaygain"
   </source>
   <dest>
-    *: "Auto-Change Directory"
+    *: "Replaygain"
   </dest>
   <voice>
-    *: "Auto-Change Directory"
+    *: "Replaygain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE
-  desc: in settings menu
+  id: LANG_REPLAYGAIN_ENABLE
+  desc: in replaygain
   user:
   <source>
-    *: "Database"
+    *: "Enable Replaygain"
   </source>
   <dest>
-    *: "Database"
+    *: "Enable Replaygain"
   </dest>
   <voice>
-    *: "Database"
+    *: "Enable Replaygain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_DISK
-  desc:
+  id: LANG_REPLAYGAIN_NOCLIP
+  desc: in replaygain
   user:
   <source>
-    *: ""
+    *: none
+    swcodec: "Prevent Clipping"
   </source>
   <dest>
-    *: ""
+    *: none
+    swcodec: "Prevent Clipping"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_RAM
-  desc: in tag cache settings
+  id: LANG_REPLAYGAIN_MODE
+  desc: in replaygain
   user:
   <source>
-    *: "Load to RAM"
+    *: "Replaygain Type"
   </source>
   <dest>
-    *: "Load to RAM"
+    *: "Replaygain Type"
   </dest>
   <voice>
-    *: "Load to RAM"
+    *: "Replaygain Type"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_FORCE_UPDATE
-  desc: in tag cache settings
+  id: LANG_ALBUM_GAIN
+  desc: in replaygain
   user:
   <source>
-    *: "Initialize now"
+    *: "Album Gain"
   </source>
   <dest>
-    *: "Initialize now"
+    *: "Album Gain"
   </dest>
   <voice>
-    *: "Initialize now"
+    *: "Album Gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
-  desc: in tag cache settings
+  id: LANG_TRACK_GAIN
+  desc: in replaygain
   user:
   <source>
-    *: "Updating in background"
+    *: "Track Gain"
   </source>
   <dest>
-    *: "Updating in background"
+    *: "Track Gain"
   </dest>
   <voice>
-    *: ""
+    *: "Track Gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_INIT
-  desc: while initializing tagcache on boot
+  id: LANG_SHUFFLE_GAIN
+  desc: use track gain if shuffle mode is on, album gain otherwise
   user:
   <source>
-    *: "Committing database"
+    *: "Track Gain if Shuffling"
   </source>
   <dest>
-    *: "Committing database"
+    *: "Track Gain if Shuffling"
   </dest>
   <voice>
-    *: ""
+    *: "Track Gain if Shuffling"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RUNTIMEDB_ACTIVE
-  desc: in settings_menu.
+  id: LANG_REPLAYGAIN_PREAMP
+  desc: in replaygain settings
   user:
   <source>
-    *: "Gather Runtime Data"
+    *: "Pre-amp"
   </source>
   <dest>
-    *: "Gather Runtime Data"
+    *: "Pre-amp"
   </dest>
   <voice>
-    *: "Gather Runtime Data"
+    *: "Preamp"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_CASE
-  desc: in settings_menu
+  id: LANG_BEEP
+  desc: in playback settings
   user:
   <source>
-    *: "Sort Case Sensitive"
+    *: none
+    swcodec: "Beep Volume"
   </source>
   <dest>
-    *: "Sort Case Sensitive"
+    *: none
+    swcodec: "Beep Volume"
   </dest>
   <voice>
-    *: "Sort Case Sensitive"
+    *: none
+    swcodec: "Beep Volume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_DIR
-  desc: browser sorting setting
+  id: LANG_WEAK
+  desc: in beep volume in playback settings
   user:
   <source>
-    *: "Sort Directories"
+    *: none
+    swcodec: "Weak"
   </source>
   <dest>
-    *: "Sort Directories"
+    *: none
+    swcodec: "Weak"
   </dest>
   <voice>
-    *: "sort directories"
+    *: none
+    swcodec: "Weak"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_FILE
-  desc: browser sorting setting
+  id: LANG_MODERATE
+  desc: in beep volume in playback settings
   user:
   <source>
-    *: "Sort Files"
+    *: none
+    swcodec: "Moderate"
   </source>
   <dest>
-    *: "Sort Files"
+    *: none
+    swcodec: "Moderate"
   </dest>
   <voice>
-    *: "sort files"
+    *: none
+    swcodec: "Moderate"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_ALPHA
-  desc: browser sorting setting
+  id: LANG_STRONG
+  desc: in beep volume in playback settings
   user:
   <source>
-    *: "Alphabetical"
+    *: none
+    swcodec: "Strong"
   </source>
   <dest>
-    *: "Alphabetical"
+    *: none
+    swcodec: "Strong"
   </dest>
   <voice>
-    *: "Alphabetical"
+    *: none
+    swcodec: "Strong"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_DATE
-  desc: browser sorting setting
+  id: LANG_SPDIF_ENABLE
+  desc: in playback settings menu. enable/disable the optical out
   user:
   <source>
-    *: "By Date"
+    *: none
+    spdif_power: "Optical Output"
   </source>
   <dest>
-    *: "By Date"
+    *: none
+    spdif_power: "Optical Output"
   </dest>
   <voice>
-    *: "By Date"
+    *: none
+    spdif_power: "Optical Output"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_DATE_REVERSE
-  desc: browser sorting setting
+  id: LANG_ID3_ORDER
+  desc: in playback settings screen
   user:
   <source>
-    *: "By Newest Date"
+    *: "ID3 Tag Priority"
   </source>
   <dest>
-    *: "By Newest Date"
+    *: "ID3 Tag Priority"
   </dest>
   <voice>
-    *: "By Newest Date"
+    *: "ID3 Tag Priority"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SORT_TYPE
-  desc: browser sorting setting
+  id: LANG_ID3_V1_FIRST
+  desc: in playback settings screen
   user:
   <source>
-    *: "By Type"
+    *: "V1 then V2"
   </source>
   <dest>
-    *: "By Type"
+    *: "V1 then V2"
   </dest>
   <voice>
-    *: "By Type"
+    *: "Version 1 then version 2"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER
-  desc: setting name for dir filter
+  id: LANG_ID3_V2_FIRST
+  desc: in playback settings screen
   user:
   <source>
-    *: "Show Files"
+    *: "V2 then V1"
   </source>
   <dest>
-    *: "Show Files"
+    *: "V2 then V1"
   </dest>
   <voice>
-    *: "Show Files"
+    *: "Version 2 then version 1"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER_ALL
-  desc: show all files
+  id: LANG_NEXT_FOLDER
+  desc: in settings_menu. Should we allow move to next/prev folder from last/first track of current one
   user:
   <source>
-    *: "All"
+    *: "Auto-Change Directory"
   </source>
   <dest>
-    *: "All"
+    *: "Auto-Change Directory"
   </dest>
   <voice>
-    *: "All"
+    *: "Auto-Change Directory"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER_SUPPORTED
-  desc: show all file types supported by Rockbox
-  user:
+  id: LANG_RANDOM
+  desc: random folder
   <source>
-    *: "Supported"
+    *: "Random"
   </source>
   <dest>
-    *: "Supported"
+    *: "Random"
   </dest>
   <voice>
-    *: "Supported"
+    *: "Random"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER_MUSIC
-  desc: show only music-related files
+  id: LANG_AUDIOSCROBBLER
+  desc: "Last.fm Log" in the playback menu
   user:
   <source>
-    *: "Music"
+    *: "Last.fm Log"
   </source>
   <dest>
-    *: "Music"
+    *: "Last.fm Log"
   </dest>
   <voice>
-    *: "Music"
+    *: "Last.fm Log"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER_PLAYLIST
-  desc: show only playlist
+  id: LANG_CUESHEET_ENABLE
+  desc: cuesheet support option
   user:
   <source>
-    *: "Playlists"
+    *: "Cuesheet Support"
   </source>
   <dest>
-    *: "Playlists"
+    *: "Cuesheet Support"
   </dest>
   <voice>
-    *: "Playlists"
+    *: "Cuesheet Support"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILTER_ID3DB
-  desc: show ID3 Database
+  id: LANG_HEADPHONE_UNPLUG
+  desc: in settings_menu.
   user:
   <source>
-    *: "Database"
+    *: none
+    headphone_detection: "Pause on Headphone Unplug"
   </source>
   <dest>
-    *: "Database"
+    *: none
+    headphone_detection: "Pause on Headphone Unplug"
   </dest>
   <voice>
-    *: "Database"
+    *: none
+    headphone_detection: "Pause on Headphone Unplug"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FOLLOW
-  desc: in settings_menu
+  id: LANG_HEADPHONE_UNPLUG_RESUME
+  desc: in pause_phones_menu.
   user:
   <source>
-    *: "Follow Playlist"
+    *: none
+    headphone_detection: "Pause and Resume"
   </source>
   <dest>
-    *: "Follow Playlist"
+    *: none
+    headphone_detection: "Pause and Resume"
   </dest>
   <voice>
-    *: "Follow Playlist"
+    *: none
+    headphone_detection: "Pause and Resume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_ICONS
-  desc: in settings_menu
+  id: LANG_HEADPHONE_UNPLUG_RW
+  desc: in pause_phones_menu.
   user:
   <source>
-    *: "Show Icons"
+    *: none
+    headphone_detection: "Duration to Rewind"
   </source>
   <dest>
-    *: "Show Icons"
+    *: none
+    headphone_detection: "Duration to Rewind"
   </dest>
   <voice>
-    *: "Show Icons"
+    *: none
+    headphone_detection: "Duration to Rewind"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUSTOM_FONT
-  desc: in setting_menu()
+  id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
+  desc: in pause_phones_menu.
   user:
   <source>
-    *: "Browse Fonts"
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
   </source>
   <dest>
-    *: "Browse Fonts"
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
   </dest>
   <voice>
-    *: "Browse Fonts"
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WHILE_PLAYING
+  id: LANG_FILE
   desc: in settings_menu()
   user:
   <source>
-    *: "Browse .wps files"
+    *: "File View"
   </source>
   <dest>
-    *: "Browse .wps files"
+    *: "File View"
   </dest>
   <voice>
-    *: "Browse while-playing-screen files"
+    *: "File View"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_WHILE_PLAYING
-  desc: in settings_menu()
+  id: LANG_SORT_CASE
+  desc: in settings_menu
   user:
   <source>
-    *: "Browse .rwps files"
+    *: "Sort Case Sensitive"
   </source>
   <dest>
-    *: "Browse .rwps files"
+    *: "Sort Case Sensitive"
   </dest>
   <voice>
-    *: "Browse remote while-playing-screen files"
+    *: "Sort Case Sensitive"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LCD_MENU
-  desc: in the display sub menu
+  id: LANG_SORT_DIR
+  desc: browser sorting setting
   user:
   <source>
-    *: "LCD Settings"
+    *: "Sort Directories"
   </source>
   <dest>
-    *: "LCD Settings"
+    *: "Sort Directories"
   </dest>
   <voice>
-    *: "LCD Settings"
+    *: "sort directories"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LCD_REMOTE_MENU
-  desc: in the display sub menu
+  id: LANG_SORT_FILE
+  desc: browser sorting setting
   user:
   <source>
-    *: "Remote-LCD Settings"
+    *: "Sort Files"
   </source>
   <dest>
-    *: "Remote-LCD Settings"
+    *: "Sort Files"
   </dest>
   <voice>
-    *: "Remote LCD settings"
+    *: "sort files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_MENU
-  desc: in display_settings_menu()
+  id: LANG_SORT_ALPHA
+  desc: browser sorting setting
   user:
   <source>
-    *: "Scrolling"
+    *: "Alphabetical"
   </source>
   <dest>
-    *: "Scrolling"
+    *: "Alphabetical"
   </dest>
   <voice>
-    *: "Scrolling"
+    *: "Alphabetical"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BARS_MENU
-  desc: in the display sub menu
+  id: LANG_SORT_DATE
+  desc: browser sorting setting
   user:
   <source>
-    *: "Status-/Scrollbar"
+    *: "By Date"
   </source>
   <dest>
-    *: "Status-/Scrollbar"
+    *: "By Date"
   </dest>
   <voice>
-    *: "Status- and Scrollbar"
+    *: "By Date"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_MENU
-  desc: in the display menu
+  id: LANG_SORT_DATE_REVERSE
+  desc: browser sorting setting
   user:
   <source>
-    *: "Peak Meter"
+    *: "By Newest Date"
   </source>
   <dest>
-    *: "Peak Meter"
+    *: "By Newest Date"
   </dest>
   <voice>
-    *: "Peak Meter"
+    *: "By Newest Date"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DEFAULT_CODEPAGE
-  desc: default encoding used with id3 tags
+  id: LANG_SORT_TYPE
+  desc: browser sorting setting
   user:
   <source>
-    *: "Default Codepage"
+    *: "By Type"
   </source>
   <dest>
-    *: "Default Codepage"
+    *: "By Type"
   </dest>
   <voice>
-    *: "Default codepage"
+    *: "By Type"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_LATIN1
-  desc: in codepage setting menu
+  id: LANG_FILTER
+  desc: setting name for dir filter
   user:
   <source>
-    *: "Latin1 (ISO-8859-1)"
+    *: "Show Files"
   </source>
   <dest>
-    *: "Latin1 (ISO-8859-1)"
+    *: "Show Files"
   </dest>
   <voice>
-    *: "Latin 1"
+    *: "Show Files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_GREEK
-  desc: in codepage setting menu
+  id: LANG_FILTER_SUPPORTED
+  desc: show all file types supported by Rockbox
   user:
   <source>
-    *: "Greek (ISO-8859-7)"
+    *: "Supported"
   </source>
   <dest>
-    *: "Greek (ISO-8859-7)"
+    *: "Supported"
   </dest>
   <voice>
-    *: "Greek"
+    *: "Supported"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_HEBREW
-  desc: in codepage setting menu
+  id: LANG_FILTER_MUSIC
+  desc: show only music-related files
   user:
   <source>
-    *: "Hebrew (ISO-8859-8)"
+    *: "Music"
   </source>
   <dest>
-    *: "Hebrew (ISO-8859-8)"
+    *: "Music"
   </dest>
   <voice>
-    *: "Hebrew"
+    *: "Music"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_CYRILLIC
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Cyrillic (CP1251)"
-  </source>
-  <dest>
-    *: "Cyrillic (CP1251)"
-  </dest>
-  <voice>
-    *: "Cyrillic"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_THAI
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Thai (ISO-8859-11)"
-  </source>
-  <dest>
-    *: "Thai (ISO-8859-11)"
-  </dest>
-  <voice>
-    *: "Thai"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_ARABIC
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Arabic (CP1256)"
-  </source>
-  <dest>
-    *: "Arabic (CP1256)"
-  </dest>
-  <voice>
-    *: "Arabic"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_TURKISH
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Turkish (ISO-8859-9)"
-  </source>
-  <dest>
-    *: "Turkish (ISO-8859-9)"
-  </dest>
-  <voice>
-    *: "Turkish"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_LATIN_EXTENDED
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Latin Extended (ISO-8859-2)"
-  </source>
-  <dest>
-    *: "Latin Extended (ISO-8859-2)"
-  </dest>
-  <voice>
-    *: "Latin extended"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_JAPANESE
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Japanese (SJIS)"
-  </source>
-  <dest>
-    *: "Japanese (SJIS)"
-  </dest>
-  <voice>
-    *: "Japanese"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_SIMPLIFIED
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Simp. Chinese (GB2312)"
-  </source>
-  <dest>
-    *: "Simp. Chinese (GB2312)"
-  </dest>
-  <voice>
-    *: "Simplified Chinese"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_KOREAN
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Korean (KSX1001)"
-  </source>
-  <dest>
-    *: "Korean (KSX1001)"
-  </dest>
-  <voice>
-    *: "Korean"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_TRADITIONAL
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Trad. Chinese (BIG5)"
-  </source>
-  <dest>
-    *: "Trad. Chinese (BIG5)"
-  </dest>
-  <voice>
-    *: "Traditional Chinese"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CODEPAGE_UTF8
-  desc: in codepage setting menu
-  user:
-  <source>
-    *: "Unicode (UTF-8)"
-  </source>
-  <dest>
-    *: "Unicode (UTF-8)"
-  </dest>
-  <voice>
-    *: "Unicode"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_MENU
-  desc: in the system sub menu
-  user:
-  <source>
-    *: "Battery"
-  </source>
-  <dest>
-    *: "Battery"
-  </dest>
-  <voice>
-    *: "Battery"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DISK_MENU
-  desc: in the system sub menu
-  user:
-  <source>
-    *: "Disk"
-  </source>
-  <dest>
-    *: "Disk"
-  </dest>
-  <voice>
-    *: "Disk"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIME_MENU
-  desc: in the system sub menu
-  user:
-  <source>
-    *: "Time & Date"
-  </source>
-  <dest>
-    *: "Time & Date"
-  </dest>
-  <voice>
-    *: "Time and Date"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_POWEROFF_IDLE
+  id: LANG_FOLLOW
   desc: in settings_menu
   user:
   <source>
-    *: "Idle Poweroff"
+    *: "Follow Playlist"
   </source>
   <dest>
-    *: "Idle Poweroff"
+    *: "Follow Playlist"
   </dest>
   <voice>
-    *: "Idle Poweroff"
+    *: "Follow Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SLEEP_TIMER
-  desc: sleep timer setting
-  user:
-  <source>
-    *: "Sleep Timer"
-  </source>
-  <dest>
-    *: "Sleep Timer"
-  </dest>
-  <voice>
-    *: "Sleep Timer"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALARM_MOD_ALARM_MENU
-  desc: The name of the additional entry in the main menu for the RTC alarm mod.
-  user:
-  <source>
-    *: "Wake-Up Alarm"
-  </source>
-  <dest>
-    *: "Wake-Up Alarm"
-  </dest>
-  <voice>
-    *: "Wake-Up Alarm"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_LIMITS_MENU
-  desc: in the system sub menu
-  user:
-  <source>
-    *: "Limits"
-  </source>
-  <dest>
-    *: "Limits"
-  </dest>
-  <voice>
-    *: "Limits"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_LINE_IN
+  id: LANG_SHOW_PATH
   desc: in settings_menu
   user:
   <source>
-    *: "Line In"
+    *: "Show Path"
   </source>
   <dest>
-    *: "Line In"
+    *: "Show Path"
   </dest>
   <voice>
-    *: "Line In"
+    *: "Show Path"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CAR_ADAPTER_MODE
-  desc: Displayed for setting car adapter mode to on/off
+  id: LANG_SHOW_PATH_CURRENT
+  desc: in show path menu
   user:
   <source>
-    *: "Car Adapter Mode"
+    *: "Current Directory Only"
   </source>
   <dest>
-    *: "Car Adapter Mode"
+    *: "Current Directory Only"
   </dest>
   <voice>
-    *: "Car Adapter Mode"
+    *: "Current Directory Only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_AUTOCREATE
-  desc: prompt for user to decide to create an bookmark
+  id: LANG_DISPLAY_FULL_PATH
+  desc: track display options
   user:
   <source>
-    *: "Bookmark on Stop"
+    *: "Full Path"
   </source>
   <dest>
-    *: "Bookmark on Stop"
+    *: "Full Path"
   </dest>
   <voice>
-    *: "Bookmark on Stop"
+    *: "Full Path"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES
-  desc: Save in recent bookmarks only
+  id: LANG_BUILDING_DATABASE
+  desc: splash database building progress
   user:
   <source>
-    *: "Yes - Recent only"
+    *: "Building database... %d found (OFF to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
+    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
+    x5,m5: "Building database... %d found (Long PLAY to return)"
+    h10,h10_5gb,e200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
-    *: "Yes - Recent only"
+    *: "Building database... %d found (OFF to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
+    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
+    x5,m5: "Building database... %d found (Long PLAY to return)"
+    h10,h10_5gb,e200: "Building database... %d found (PREV to return)"
   </dest>
   <voice>
-    *: "Yes - Recent only"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK
-  desc: Save in recent bookmarks only
+  id: LANG_TAGCACHE_RAM
+  desc: in tag cache settings
   user:
   <source>
-    *: "Ask - Recent only"
+    *: none
+    tc_ramcache: "Load to RAM"
   </source>
   <dest>
-    *: "Ask - Recent only"
+    *: none
+    tc_ramcache: "Load to RAM"
   </dest>
   <voice>
-    *: "Ask - Recent only"
+    *: none
+    tc_ramcache: "Load to RAM"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_AUTOLOAD
-  desc: prompt for user to decide to create a bookmark
+  id: LANG_TAGCACHE_AUTOUPDATE
+  desc: in tag cache settings
   user:
   <source>
-    *: "Load Last Bookmark"
+    *: "Auto Update"
   </source>
   <dest>
-    *: "Load Last Bookmark"
+    *: "Auto Update"
   </dest>
   <voice>
-    *: "Load Last Bookmark"
+    *: "Auto Update"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS
-  desc: Configuration option to maintain a list of recent bookmarks
+  id: LANG_TAGCACHE_FORCE_UPDATE
+  desc: in tag cache settings
   user:
   <source>
-    *: "Maintain a List of Recent Bookmarks?"
+    *: "Initialize now"
   </source>
   <dest>
-    *: "Maintain a List of Recent Bookmarks?"
+    *: "Initialize now"
   </dest>
   <voice>
-    *: "Maintain a List of Recent Bookmarks?"
+    *: "Initialize now"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
-  desc: Save only on bookmark for each playlist in recent bookmarks
+  id: LANG_TAGCACHE_UPDATE
+  desc: in tag cache settings
   user:
   <source>
-    *: "Unique only"
+    *: "Update Now"
   </source>
   <dest>
-    *: "Unique only"
+    *: "Update Now"
   </dest>
   <voice>
-    *: "Unique only"
+    *: "Update Now"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_MENU
-  desc: item of voice menu, enable/disable the voice UI
+  id: LANG_RUNTIMEDB_ACTIVE
+  desc: in settings_menu.
   user:
   <source>
-    *: "Voice Menus"
+    *: "Gather Runtime Data"
   </source>
   <dest>
-    *: "Voice Menus"
+    *: "Gather Runtime Data"
   </dest>
   <voice>
-    *: "Voice Menus"
+    *: "Gather Runtime Data"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_DIR
-  desc: item of voice menu, set the voice mode for directories
+  id: LANG_TAGCACHE_EXPORT
+  desc: in tag cache settings
   user:
   <source>
-    *: "Voice Directories"
+    *: "Export Modifications"
   </source>
   <dest>
-    *: "Voice Directories"
+    *: "Export Modifications"
   </dest>
   <voice>
-    *: "Voice Directories"
+    *: "Export Modifications"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_FILE
-  desc: item of voice menu, set the voice mode for files
+  id: LANG_TAGCACHE_IMPORT
+  desc: in tag cache settings
   user:
   <source>
-    *: "Voice Filenames"
+    *: "Import Modifications"
   </source>
   <dest>
-    *: "Voice Filenames"
+    *: "Import Modifications"
   </dest>
   <voice>
-    *: "Voice Filenames"
+    *: "Import Modifications"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_NUMBER
-  desc: "talkbox" mode for files+directories
+  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
+  desc: in tag cache settings
   user:
   <source>
-    *: "Numbers"
+    *: "Updating in background"
   </source>
   <dest>
-    *: "Numbers"
+    *: "Updating in background"
   </dest>
   <voice>
-    *: "Numbers"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_SPELL
-  desc: "talkbox" mode for files+directories
+  id: LANG_TAGCACHE_INIT
+  desc: while initializing tagcache on boot
   user:
   <source>
-    *: "Spell"
+    *: "Committing database"
   </source>
   <dest>
-    *: "Spell"
+    *: "Committing database"
   </dest>
   <voice>
-    *: "Spell"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_DIR_HOVER
-  desc: "talkbox" mode for directories + files
-  user:
+  id: LANG_TAGCACHE_BUSY
+  desc: when trying to shutdown and tagcache is committing
   <source>
-    *: ".talk mp3 clip"
+    *: "Database is not ready"
   </source>
   <dest>
-    *: ".talk mp3 clip"
+    *: "Database is not ready"
   </dest>
   <voice>
-    *: "talk mp3 clip"
+    *: "Database is not ready"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_QUALITY
-  desc: in the recording settings
+  id: LANG_TAGNAVI_ALL_TRACKS
+  desc: "<All tracks>" entry in tag browser
   user:
   <source>
-    *: "Quality"
+    *: "<All tracks>"
   </source>
   <dest>
-    *: "Quality"
+    *: "<All tracks>"
   </dest>
   <voice>
-    *: "Quality"
+    *: "All tracks"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_FREQUENCY
-  desc: in the recording settings
+  id: LANG_DISPLAY
+  desc: in settings_menu()
   user:
   <source>
-    *: "Frequency"
+    *: "Display"
   </source>
   <dest>
-    *: "Frequency"
+    *: "Display"
   </dest>
   <voice>
-    *: "Frequency"
+    *: "Display"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SOURCE
-  desc: in the recording settings
+  id: LANG_CUSTOM_FONT
+  desc: in setting_menu()
   user:
   <source>
-    *: "Source"
+    *: none
+    lcd_bitmap: "Browse Fonts"
   </source>
   <dest>
-    *: "Source"
+    *: none
+    lcd_bitmap: "Browse Fonts"
   </dest>
   <voice>
-    *: "Source"
+    *: none
+    lcd_bitmap: "Browse Fonts"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SRC_MIC
-  desc: in the recording settings
+  id: LANG_WHILE_PLAYING
+  desc: in settings_menu()
   user:
   <source>
-    *: "Mic"
-    h100,h120,h300: "Internal Mic"
+    *: "Browse .wps files"
   </source>
   <dest>
-    *: "Mic"
-    h100,h120,h300: "Internal Mic"
+    *: "Browse .wps files"
   </dest>
   <voice>
-    *: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    *: "Browse while-playing-screen files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SRC_LINE
-  desc: in the recording settings
+  id: LANG_REMOTE_WHILE_PLAYING
+  desc: in settings_menu()
   user:
   <source>
-    *: "Line In"
+    *: none
+    remote: "Browse .rwps files"
   </source>
   <dest>
-    *: "Line In"
+    *: none
+    remote: "Browse .rwps files"
   </dest>
   <voice>
-    *: "Line In"
+    *: none
+    remote: "Browse remote while-playing-screen files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SRC_DIGITAL
-  desc: in the recording settings
+  id: LANG_LCD_MENU
+  desc: in the display sub menu
   user:
   <source>
-    *: "Digital"
+    *: "LCD Settings"
   </source>
   <dest>
-    *: "Digital"
+    *: "LCD Settings"
   </dest>
   <voice>
-    *: "Digital"
+    *: "LCD Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_CHANNELS
-  desc: in the recording settings
+  id: LANG_BACKLIGHT
+  desc: in settings_menu
   user:
   <source>
-    *: "Channels"
+    *: "Backlight"
   </source>
   <dest>
-    *: "Channels"
+    *: "Backlight"
   </dest>
   <voice>
-    *: "Channels"
+    *: "Backlight"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_EDITABLE
-  desc: Editable recordings setting
+  id: LANG_BACKLIGHT_ON_WHEN_CHARGING
+  desc: in display_settings_menu, backlight timeout with charger connected
   user:
   <source>
-    *: "Independent Frames"
+    *: none
+    charging: "Backlight (While Plugged In)"
   </source>
   <dest>
-    *: "Independent Frames"
+    *: none
+    charging: "Backlight (While Plugged In)"
   </dest>
   <voice>
-    *: "Independent Frames"
+    *: none
+    charging: "Backlight (While Plugged In)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TIMESPLIT
-  desc: Record split menu
+  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
+  desc: in lcd settings
   user:
   <source>
-    *: "File Split Options"
+    *: none
+    hold_button: "Backlight (On Hold Key)"
   </source>
   <dest>
-    *: "File Split Options"
+    *: none
+    hold_button: "Backlight (On Hold Key)"
   </dest>
   <voice>
-    *: "File Split Options"
+    *: none
+    hold_button: "Backlight on hold key"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_PRERECORD_TIME
-  desc: in recording settings_menu
+  id: LANG_CAPTION_BACKLIGHT
+  desc: in settings_menu
   user:
   <source>
-    *: "Prerecord Time"
+    *: "Caption Backlight"
   </source>
   <dest>
-    *: "Prerecord Time"
+    *: "Caption Backlight"
   </dest>
   <voice>
-    *: "Pre-Record time"
+    *: "Caption Backlight"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_DIRECTORY
-  desc: in recording settings_menu
+  id: LANG_BACKLIGHT_FADE_IN
+  desc: in settings_menu
   user:
   <source>
-    *: "Directory"
+    *: none
+    backlight_fade: "Backlight Fade In"
   </source>
   <dest>
-    *: "Directory"
+    *: none
+    backlight_fade: "Backlight Fade In"
   </dest>
   <voice>
-    *: "Directory"
+    *: none
+    backlight_fade: "Backlight Fade In"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_CURRENT_DIR
-  desc: in recording directory options
+  id: LANG_BACKLIGHT_FADE_OUT
+  desc: in settings_menu
   user:
   <source>
-    *: "Current Directory"
+    *: none
+    backlight_fade: "Backlight Fade Out"
   </source>
   <dest>
-    *: "Current Directory"
+    *: none
+    backlight_fade: "Backlight Fade Out"
   </dest>
   <voice>
-    *: "Current directory"
+    *: none
+    backlight_fade: "Backlight Fade Out"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STARTUP
-  desc: DEPRECATED
+  id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
+  desc: Backlight behaviour setting
   user:
   <source>
-    *: ""
+    *: "First Keypress Enables Backlight Only"
   </source>
   <dest>
-    *: deprecated
+    *: "First Keypress Enables Backlight Only"
   </dest>
   <voice>
-    *: ""
+    *: "First Keypress Enables Backlight Only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER
-  desc: in recording settings_menu
+  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
+  desc: In display settings, time to switch LCD chip into power saving state
   user:
   <source>
-    *: "Trigger"
+    *: none
+    lcd_sleep: "Sleep (After Backlight Off)"
   </source>
   <dest>
-    *: "Trigger"
+    *: none
+    lcd_sleep: "Sleep (After Backlight Off)"
   </dest>
   <voice>
-    *: "Trigger"
+    *: none
+    lcd_sleep: "Sleep after backlight off"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLIP_LIGHT
-  desc: in record settings menu.
+  id: LANG_NEVER
+  desc: in lcd settings
   user:
   <source>
-    *: "Clipping Light"
+    *: none
+    lcd_sleep: "Never"
   </source>
   <dest>
-    *: "Clipping Light"
+    *: none
+    lcd_sleep: "Never"
   </dest>
   <voice>
-    *: "Clipping Light"
+    *: none
+    lcd_sleep: "Never"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAIN_UNIT
-  desc: in record settings menu.
+  id: LANG_BRIGHTNESS
+  desc: in settings_menu
   user:
   <source>
-    *: "Main Unit Only"
+    *: none
+    backlight_brightness: "Brightness"
   </source>
   <dest>
-    *: "Main Unit Only"
+    *: none
+    backlight_brightness: "Brightness"
   </dest>
   <voice>
-    *: "Main unit only"
+    *: none
+    backlight_brightness: "Brightness"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_UNIT
-  desc: in record settings menu.
-  user:
-  <source>
-    *: "Remote Unit Only"
-  </source>
-  <dest>
-    *: "Remote Unit Only"
-  </dest>
-  <voice>
-    *: "Remote unit only"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REMOTE_MAIN
-  desc: in record settings menu.
-  user:
-  <source>
-    *: "Main and Remote Unit"
-  </source>
-  <dest>
-    *: "Main and Remote Unit"
-  </dest>
-  <voice>
-    *: "Main and remote unit"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FFRW_STEP
+  id: LANG_CONTRAST
   desc: in settings_menu
   user:
   <source>
-    *: "FF/RW Min Step"
+    *: "Contrast"
   </source>
   <dest>
-    *: "FF/RW Min Step"
+    *: "Contrast"
   </dest>
   <voice>
-    *: "Minimum Step"
+    *: "Contrast"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FFRW_ACCEL
+  id: LANG_INVERT
   desc: in settings_menu
   user:
   <source>
-    *: "FF/RW Accel"
+    *: none
+    lcd_invert: "LCD Mode"
   </source>
   <dest>
-    *: "FF/RW Accel"
+    *: none
+    lcd_invert: "LCD Mode"
   </dest>
   <voice>
-    *: "Acceleration"
+    *: none
+    lcd_invert: "LCD Mode"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_ENABLE
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Enable Crossfade"
-  </source>
-  <dest>
-    *: "Enable Crossfade"
-  </dest>
-  <voice>
-    *: "Enable Crossfade"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TRACKSKIP
-  desc: in crossfade settings
-  user:
-  <source>
-    *: "Track Skip Only"
-  </source>
-  <dest>
-    *: "Track Skip Only"
-  </dest>
-  <voice>
-    *: "Track Skip Only"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFADE_FADE_IN_DELAY
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Fade-In Delay"
-  </source>
-  <dest>
-    *: "Fade-In Delay"
-  </dest>
-  <voice>
-    *: "Fade-In Delay"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFADE_FADE_IN_DURATION
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Fade-In Duration"
-  </source>
-  <dest>
-    *: "Fade-In Duration"
-  </dest>
-  <voice>
-    *: "Fade-In Duration"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFADE_FADE_OUT_DELAY
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Fade-Out Delay"
-  </source>
-  <dest>
-    *: "Fade-Out Delay"
-  </dest>
-  <voice>
-    *: "Fade-Out Delay"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFADE_FADE_OUT_DURATION
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Fade-Out Duration"
-  </source>
-  <dest>
-    *: "Fade-Out Duration"
-  </dest>
-  <voice>
-    *: "Fade-Out Duration"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFADE_FADE_OUT_MODE
-  desc: in crossfade settings menu
-  user:
-  <source>
-    *: "Fade-Out Mode"
-  </source>
-  <dest>
-    *: "Fade-Out Mode"
-  </dest>
-  <voice>
-    *: "Fade-Out Mode"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MIX
-  desc: in playback settings, crossfade option
-  user:
-  <source>
-    *: "Mix"
-  </source>
-  <dest>
-    *: "Mix"
-  </dest>
-  <voice>
-    *: "Mix"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REPLAYGAIN_ENABLE
-  desc: in replaygain
-  user:
-  <source>
-    *: "Enable Replaygain"
-  </source>
-  <dest>
-    *: "Enable Replaygain"
-  </dest>
-  <voice>
-    *: "Enable Replaygain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REPLAYGAIN_NOCLIP
-  desc: in replaygain
-  user:
-  <source>
-    *: "Prevent Clipping"
-  </source>
-  <dest>
-    *: "Prevent Clipping"
-  </dest>
-  <voice>
-    *: "Prevent Clipping"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REPLAYGAIN_MODE
-  desc: in replaygain
-  user:
-  <source>
-    *: "Replaygain Type"
-  </source>
-  <dest>
-    *: "Replaygain Type"
-  </dest>
-  <voice>
-    *: "Replaygain Type"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALBUM_GAIN
-  desc: in replaygain
-  user:
-  <source>
-    *: "Album Gain"
-  </source>
-  <dest>
-    *: "Album Gain"
-  </dest>
-  <voice>
-    *: "Album Gain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TRACK_GAIN
-  desc: in replaygain
-  user:
-  <source>
-    *: "Track Gain"
-  </source>
-  <dest>
-    *: "Track Gain"
-  </dest>
-  <voice>
-    *: "Track Gain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SHUFFLE_GAIN
-  desc: use track gain if shuffle mode is on, album gain otherwise
-  user:
-  <source>
-    *: "Track Gain if Shuffling"
-  </source>
-  <dest>
-    *: "Track Gain if Shuffling"
-  </dest>
-  <voice>
-    *: "Track Gain if Shuffling"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REPLAYGAIN_PREAMP
-  desc: in replaygain settings
-  user:
-  <source>
-    *: "Pre-amp"
-  </source>
-  <dest>
-    *: "Pre-amp"
-  </dest>
-  <voice>
-    *: "Preamp"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BACKLIGHT
+  id: LANG_INVERT_LCD_INVERSE
   desc: in settings_menu
   user:
   <source>
-    *: "Backlight"
+    *: none
+    lcd_invert: "Inverse"
   </source>
   <dest>
-    *: "Backlight"
+    *: none
+    lcd_invert: "Inverse"
   </dest>
   <voice>
-    *: "Backlight"
+    *: none
+    lcd_invert: "Inverse"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_ON_WHEN_CHARGING
-  desc: in display_settings_menu, backlight timeout with charger connected
+  id: LANG_FLIP_DISPLAY
+  desc: in settings_menu, option to turn display+buttos by 180 degrees
   user:
   <source>
-    *: "Backlight (While Plugged In)"
+    *: none
+    lcd_bitmap: "Upside Down"
   </source>
   <dest>
-    *: "Backlight (While Plugged In)"
+    *: none
+    lcd_bitmap: "Upside Down"
   </dest>
   <voice>
-    *: "Backlight (While Plugged In)"
+    *: none
+    lcd_bitmap: "Upside Down"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CAPTION_BACKLIGHT
+  id: LANG_INVERT_CURSOR
   desc: in settings_menu
   user:
   <source>
-    *: "Caption Backlight"
+    *: none
+    lcd_bitmap: "Line Selector"
   </source>
   <dest>
-    *: "Caption Backlight"
+    *: none
+    lcd_bitmap: "Line Selector"
   </dest>
   <voice>
-    *: "Caption Backlight"
+    *: none
+    lcd_bitmap: "Line Selector"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FADE_IN
+  id: LANG_INVERT_CURSOR_POINTER
   desc: in settings_menu
   user:
   <source>
-    *: "Backlight Fade In"
+    *: none
+    lcd_bitmap: "Pointer"
   </source>
   <dest>
-    *: "Backlight Fade In"
+    *: none
+    lcd_bitmap: "Pointer"
   </dest>
   <voice>
-    *: "Backlight Fade In"
+    *: none
+    lcd_bitmap: "Pointer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FADE_OUT
+  id: LANG_INVERT_CURSOR_BAR
   desc: in settings_menu
   user:
   <source>
-    *: "Backlight Fade Out"
+    *: none
+    lcd_bitmap: "Bar (Inverse)"
   </source>
   <dest>
-    *: "Backlight Fade Out"
+    *: none
+    lcd_bitmap: "Bar (Inverse)"
   </dest>
   <voice>
-    *: "Backlight Fade Out"
+    *: none
+    lcd_bitmap: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BRIGHTNESS
-  desc: in settings_menu
+  id: LANG_CLEAR_BACKDROP
+  desc: text for LCD settings menu
   user:
   <source>
-    *: "Brightness"
+    *: none
+    lcd_non-mono: "Clear Backdrop"
   </source>
   <dest>
-    *: "Brightness"
+    *: none
+    lcd_non-mono: "Clear Backdrop"
   </dest>
   <voice>
-    *: "Brightness"
+    *: none
+    lcd_non-mono: "Clear Backdrop"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONTRAST
-  desc: in settings_menu
+  id: LANG_BACKGROUND_COLOR
+  desc: menu entry to set the background color
   user:
   <source>
-    *: "Contrast"
+    *: none
+    lcd_non-mono: "Background Colour"
   </source>
   <dest>
-    *: "Contrast"
+    *: none
+    lcd_non-mono: "Background Colour"
   </dest>
   <voice>
-    *: "Contrast"
+    *: none
+    lcd_non-mono: "Background Colour"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
-  desc: Backlight behaviour setting
+  id: LANG_FOREGROUND_COLOR
+  desc: menu entry to set the foreground color
   user:
   <source>
-    *: "First Keypress Enables Backlight Only"
+    *: none
+    lcd_non-mono: "Foreground Colour"
   </source>
   <dest>
-    *: "First Keypress Enables Backlight Only"
+    *: none
+    lcd_non-mono: "Foreground Colour"
   </dest>
   <voice>
-    *: "First Keypress Enables Backlight Only"
+    *: none
+    lcd_non-mono: "Foreground Colour"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT
-  desc: in settings_menu
+  id: LANG_RESET_COLORS
+  desc: menu
   user:
   <source>
-    *: "LCD Mode"
+    *: none
+    lcd_non-mono: "Reset Colours"
   </source>
   <dest>
-    *: "LCD Mode"
+    *: none
+    lcd_non-mono: "Reset Colours"
   </dest>
   <voice>
-    *: "LCD Mode"
+    *: none
+    lcd_non-mono: "Reset Colours"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_LCD_NORMAL
-  desc: in settings_menu
+  id: LANG_COLOR_RGB_LABELS
+  desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
   user:
   <source>
-    *: "Normal"
+    *: none
+    lcd_color: "RGB"
   </source>
   <dest>
-    *: "Normal"
+   *: none
+    lcd_color: "RGB"
   </dest>
   <voice>
-    *: "Normal"
+   *: none
+    lcd_color: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_LCD_INVERSE
-  desc: in settings_menu
+  id: LANG_COLOR_RGB_VALUE
+  desc: in color screen
   user:
   <source>
-    *: "Inverse"
+   *: none
+    lcd_color: "RGB: %02X%02X%02X"
   </source>
   <dest>
-    *: "Inverse"
+   *: none
+    lcd_color: "RGB: %02X%02X%02X"
   </dest>
   <voice>
-    *: "Inverse"
+   *: none
+    lcd_color: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FLIP_DISPLAY
-  desc: in settings_menu, option to turn display+buttos by 180 degreed
+  id: LANG_COLOR_UNACCEPTABLE
+  desc: splash when user selects an invalid colour
   user:
   <source>
-    *: "Upside Down"
+   *: none
+    lcd_non-mono: "Invalid colour"
   </source>
   <dest>
-    *: "Upside Down"
+   *: none
+    lcd_non-mono: "Invalid colour"
   </dest>
   <voice>
-    *: "Upside Down"
+   *: none
+    lcd_non-mono: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR
-  desc: in settings_menu
+  id: LANG_LCD_REMOTE_MENU
+  desc: in the display sub menu
   user:
   <source>
-    *: "Line Selector"
+    *: none
+    remote: "Remote-LCD Settings"
   </source>
   <dest>
-    *: "Line Selector"
+    *: none
+    remote: "Remote-LCD Settings"
   </dest>
   <voice>
-    *: "Line Selector"
+    *: none
+    remote: "Remote LCD settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_POINTER
-  desc: in settings_menu
+  id: LANG_REDUCE_TICKING
+  desc: in remote lcd settings menu
   user:
   <source>
-    *: "Pointer"
+    *: none
+    remote_ticking: "Reduce Ticking"
   </source>
   <dest>
-    *: "Pointer"
+    *: none
+    remote_ticking: "Reduce Ticking"
   </dest>
   <voice>
-    *: "Pointer"
+    *: none
+    remote_ticking: "Reduce Ticking"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_BAR
+  id: LANG_SHOW_ICONS
   desc: in settings_menu
   user:
   <source>
-    *: "Bar (Inverse)"
+    *: "Show Icons"
   </source>
   <dest>
-    *: "Bar (Inverse)"
+    *: "Show Icons"
   </dest>
   <voice>
-    *: "Inverse Bar"
+    *: "Show Icons"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_BACKDROP
-  desc: text for LCD settings menu
+  id: LANG_SCROLL_MENU
+  desc: in display_settings_menu()
   user:
   <source>
-    *: "Clear Backdrop"
+    *: "Scrolling"
   </source>
   <dest>
-    *: "Clear Backdrop"
+    *: "Scrolling"
   </dest>
   <voice>
-    *: "Clear Backdrop"
+    *: "Scrolling"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKGROUND_COLOR
-  desc: menu entry to set the background color
+  id: LANG_SCROLL
+  desc: in settings_menu
   user:
   <source>
-    *: "Background Colour"
+    *: "Scroll Speed Setting Example"
   </source>
   <dest>
-    *: "Background Colour"
+    *: "Scroll Speed Setting Example"
   </dest>
   <voice>
-    *: "Background Colour"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FOREGROUND_COLOR
-  desc: menu entry to set the foreground color
-  user:
-  <source>
-    *: "Foreground Colour"
-  </source>
-  <dest>
-    *: "Foreground Colour"
-  </dest>
-  <voice>
-    *: "Foreground Colour"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RESET_COLORS
-  desc: menu
-  user:
-  <source>
-    *: "Reset Colours"
-  </source>
-  <dest>
-    *: "Reset Colours"
-  </dest>
-  <voice>
-    *: "Reset Colours"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REDUCE_TICKING
-  desc: in remote lcd settings menu
-  user:
-  <source>
-    *: "Reduce Ticking"
-  </source>
-  <dest>
-    *: "Reduce Ticking"
-  </dest>
-  <voice>
-    *: "Reduce Ticking"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SCROLL_SPEED
   desc: in display_settings_menu()
   user:
@@ -3391,20 +3152,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL
-  desc: in settings_menu
-  user:
-  <source>
-    *: "Scroll Speed Setting Example"
-  </source>
-  <dest>
-    *: "Scroll Speed Setting Example"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SCROLL_DELAY
   desc: Delay before scrolling
   user:
@@ -3461,8 +3208,25 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_REMOTE_SCROLL_SETS
+  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  user:
+  <source>
+    *: none
+    remote: "Remote Scrolling Options"
+  </source>
+  <dest>
+    *: none
+    remote: "Remote Scrolling Options"
+  </dest>
+  <voice>
+    *: none
+    remote: "Remote Scrolling Options"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user:
   <source>
     *: "Jump Scroll"
@@ -3545,17 +3309,72 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_LISTACCEL_START_DELAY
+  desc: Delay before list starts accelerating
+  user:
+  <source>
+    *: "List Acceleration Start Delay"
+    scrollwheel: none
+  </source>
+  <dest>
+    *: "List Acceleration Start Delay"
+    scrollwheel: none
+  </dest>
+  <voice>
+    *: "List Acceleration Start Delay"
+    scrollwheel: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LISTACCEL_ACCEL_SPEED
+  desc: list acceleration speed
+  user:
+  <source>
+    *: "List Acceleration Speed"
+    scrollwheel: none
+  </source>
+  <dest>
+    *: "List Acceleration Speed"
+    scrollwheel: none
+  </dest>
+  <voice>
+    *: "List Acceleration Speed"
+    scrollwheel: none
+  </voice>
+</phrase>
+
+<phrase>
+  id: LANG_BARS_MENU
+  desc: in the display sub menu
+  user:
+  <source>
+    *: none
+    lcd_bitmap: "Status-/Scrollbar"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Status-/Scrollbar"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Status- and Scrollbar"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_SCROLL_BAR
   desc: display menu, F3 substitute
   user:
   <source>
-    *: "Scroll Bar"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </source>
   <dest>
-    *: "Scroll Bar"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </dest>
   <voice>
-    *: "Scroll Bar"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3563,13 +3382,16 @@
   desc: display menu, F3 substitute
   user:
   <source>
-    *: "Status Bar"
+    *: none
+    lcd_bitmap: "Status Bar"
   </source>
   <dest>
-    *: "Status Bar"
+    *: none
+    lcd_bitmap: "Status Bar"
   </dest>
   <voice>
-    *: "Status Bar"
+    *: none
+    lcd_bitmap: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3577,13 +3399,16 @@
   desc: in settings menu
   user:
   <source>
-    *: "Button Bar"
+    *: none
+    recorder_pad: "Button Bar"
   </source>
   <dest>
-    *: "Button Bar"
+    *: none
+    recorder_pad: "Button Bar"
   </dest>
   <voice>
-    *: "Button Bar"
+    *: none
+    recorder_pad: "Button Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3591,13 +3416,16 @@
   desc: Volume type title
   user:
   <source>
-    *: "Volume Display"
+    *: none
+    lcd_bitmap: "Volume Display"
   </source>
   <dest>
-    *: "Volume Display"
+    *: none
+    lcd_bitmap: "Volume Display"
   </dest>
   <voice>
-    *: "Volume Display"
+    *: none
+    lcd_bitmap: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3605,13 +3433,16 @@
   desc: Battery type title
   user:
   <source>
-    *: "Battery Display"
+    *: none
+    lcd_bitmap: "Battery Display"
   </source>
   <dest>
-    *: "Battery Display"
+    *: none
+    lcd_bitmap: "Battery Display"
   </dest>
   <voice>
-    *: "Battery Display"
+    *: none
+    lcd_bitmap: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3619,13 +3450,16 @@
   desc: Label for type of icon display
   user:
   <source>
-    *: "Graphic"
+    *: none
+    lcd_bitmap: "Graphic"
   </source>
   <dest>
-    *: "Graphic"
+    *: none
+    lcd_bitmap: "Graphic"
   </dest>
   <voice>
-    *: "Graphic"
+    *: none
+    lcd_bitmap: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3633,41 +3467,50 @@
   desc: Label for type of icon display
   user:
   <source>
-    *: "Numeric"
+    *: none
+    lcd_bitmap: "Numeric"
   </source>
   <dest>
-    *: "Numeric"
+    *: none
+    lcd_bitmap: "Numeric"
   </dest>
   <voice>
-    *: "Numeric"
+    *: none
+    lcd_bitmap: "Numeric"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_RELEASE
-  desc: in the peak meter menu
+  id: LANG_PM_MENU
+  desc: in the display menu
   user:
   <source>
-    *: "Peak Release"
+    *: "Peak Meter"
+    masd: none
   </source>
   <dest>
-    *: "Peak Release"
+    *: "Peak Meter"
+    masd: none
   </dest>
   <voice>
-    *: "Peak Release"
+    *: "Peak Meter"
+    masd: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_UNITS_PER_READ
+  id: LANG_PM_CLIP_HOLD
   desc: in the peak meter menu
   user:
   <source>
-    *: "Units Per Read"
+    *: "Clip Hold Time"
+    masd: none
   </source>
   <dest>
-    *: "Units Per Read"
+    *: "Clip Hold Time"
+    masd: none
   </dest>
   <voice>
-    *: "Units Per Read"
+    *: "Clip Hold Time"
+    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3676,54 +3519,83 @@
   user:
   <source>
     *: "Peak Hold Time"
+    masd: none
   </source>
   <dest>
     *: "Peak Hold Time"
+    masd: none
   </dest>
   <voice>
     *: "Peak Hold Time"
+    masd: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_CLIP_HOLD
+  id: LANG_PM_ETERNAL
   desc: in the peak meter menu
   user:
   <source>
-    *: "Clip Hold Time"
+    *: "Eternal"
+    masd: none
   </source>
   <dest>
-    *: "Clip Hold Time"
+    *: "Eternal"
+    masd: none
   </dest>
   <voice>
-    *: "Clip Hold Time"
+    *: "Eternal"
+    masd: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_ETERNAL
+  id: LANG_PM_RELEASE
   desc: in the peak meter menu
   user:
   <source>
-    *: "Eternal"
+    *: "Peak Release"
+    masd: none
   </source>
   <dest>
-    *: "Eternal"
+    *: "Peak Release"
+    masd: none
   </dest>
   <voice>
-    *: "Eternal"
+    *: "Peak Release"
+    masd: none
   </voice>
 </phrase>
 <phrase>
+  id: LANG_PM_UNITS_PER_READ
+  desc: in the peak meter menu
+  user:
+  <source>
+    *: "Units Per Read"
+    masd: none
+  </source>
+  <dest>
+    *: "Units Per Read"
+    masd: none
+  </dest>
+  <voice>
+    *: "Units Per Read"
+    masd: none
+  </voice>
+</phrase>
+<phrase>
   id: LANG_PM_SCALE
   desc: in the peak meter menu
   user:
   <source>
     *: "Scale"
+    masd: none
   </source>
   <dest>
     *: "Scale"
+    masd: none
   </dest>
   <voice>
     *: "Scale"
+    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3732,12 +3604,15 @@
   user:
   <source>
     *: "Logarithmic (dB)"
+    masd: none
   </source>
   <dest>
     *: "Logarithmic (dB)"
+    masd: none
   </dest>
   <voice>
     *: "Logarithmic decibel"
+    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3746,12 +3621,15 @@
   user:
   <source>
     *: "Linear (%)"
+    masd: none
   </source>
   <dest>
     *: "Linear (%)"
+    masd: none
   </dest>
   <voice>
     *: "Linear percent"
+    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3760,12 +3638,15 @@
   user:
   <source>
     *: "Minimum Of Range"
+    masd: none
   </source>
   <dest>
     *: "Minimum Of Range"
+    masd: none
   </dest>
   <voice>
     *: "Minimum Of Range"
+    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3774,4467 +3655,4807 @@
   user:
   <source>
     *: "Maximum Of Range"
+    masd: none
   </source>
   <dest>
     *: "Maximum Of Range"
+    masd: none
   </dest>
   <voice>
     *: "Maximum Of Range"
+    masd: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_CAPACITY
-  desc: in settings_menu
+  id: LANG_DEFAULT_CODEPAGE
+  desc: default encoding used with id3 tags
   user:
   <source>
-    *: "Battery Capacity"
+    *: "Default Codepage"
   </source>
   <dest>
-    *: "Battery Capacity"
+    *: "Default Codepage"
   </dest>
   <voice>
-    *: "Battery Capacity"
+    *: "Default codepage"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  id: LANG_CODEPAGE_LATIN1
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Battery Type"
+    *: "Latin1 (ISO-8859-1)"
   </source>
   <dest>
-    *: "Battery Type"
+    *: "Latin1 (ISO-8859-1)"
   </dest>
   <voice>
-    *: "Battery type"
+    *: "Latin 1"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_ALKALINE
-  desc: in battery settings
+  id: LANG_CODEPAGE_GREEK
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Alkaline"
+    *: "Greek (ISO-8859-7)"
   </source>
   <dest>
-    *: "Alkaline"
+    *: "Greek (ISO-8859-7)"
   </dest>
   <voice>
-    *: "Alkaline"
+    *: "Greek"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_NIMH
-  desc: in battery settings
+  id: LANG_CODEPAGE_HEBREW
+  desc: in codepage setting menu
   user:
   <source>
-    *: "NiMH"
+    *: none
+    lcd_bitmap: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: "NiMH"
+    *: none
+    lcd_bitmap: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: "Nickel metal hydride"
+    *: none
+    lcd_bitmap: "Hebrew"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPINDOWN
-  desc: in settings_menu
+  id: LANG_CODEPAGE_CYRILLIC
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Disk Spindown"
+    *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "Disk Spindown"
+    *: "Cyrillic (CP1251)"
   </dest>
   <voice>
-    *: "Disk Spindown"
+    *: "Cyrillic"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_POWEROFF
-  desc: DEPRECATED
+  id: LANG_CODEPAGE_THAI
+  desc: in codepage setting menu
   user:
   <source>
-    *: ""
+    *: none
+    lcd_bitmap: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: deprecated
+    *: none
+    lcd_bitmap: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: ""
+    *: none
+    lcd_bitmap: "Thai"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRCACHE_ENABLE
-  desc: in directory cache settings
+  id: LANG_CODEPAGE_ARABIC
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Directory Cache"
+    *: none
+    lcd_bitmap: "Arabic (CP1256)"
   </source>
   <dest>
-    *: "Directory Cache"
+    *: none
+    lcd_bitmap: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: "Directory Cache"
+    *: none
+    lcd_bitmap: "Arabic"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRCACHE_REBOOT
-  desc: DEPRECATED
+  id: LANG_CODEPAGE_TURKISH
+  desc: in codepage setting menu
   user:
   <source>
-    *: ""
+    *: "Turkish (ISO-8859-9)"
   </source>
   <dest>
-    *: ""
+    *: "Turkish (ISO-8859-9)"
   </dest>
   <voice>
-    *: ""
+    *: "Turkish"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRCACHE_BUILDING
-  desc: when booting up and rebuilding the cache
+  id: LANG_CODEPAGE_LATIN_EXTENDED
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Scanning disk..."
+    *: "Latin Extended (ISO-8859-2)"
   </source>
   <dest>
-    *: "Scanning disk..."
+    *: "Latin Extended (ISO-8859-2)"
   </dest>
   <voice>
-    *: ""
+    *: "Latin extended"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME
-  desc: in settings_menu
+  id: LANG_CODEPAGE_JAPANESE
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Set Time/Date"
+    *: none
+    lcd_bitmap: "Japanese (SJIS)"
   </source>
   <dest>
-    *: "Set Time/Date"
+    *: none
+    lcd_bitmap: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: "Set Time and Date"
+    *: none
+    lcd_bitmap: "Japanese"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIMEFORMAT
-  desc: select the time format of time in status bar
+  id: LANG_CODEPAGE_SIMPLIFIED
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Time Format"
+    *: none
+    lcd_bitmap: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: "Time Format"
+    *: none
+    lcd_bitmap: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: "Time Format"
+    *: none
+    lcd_bitmap: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_12_HOUR_CLOCK
-  desc: option for 12 hour clock
+  id: LANG_CODEPAGE_KOREAN
+  desc: in codepage setting menu
   user:
   <source>
-    *: "12 Hour Clock"
+    *: none
+    lcd_bitmap: "Korean (KSX1001)"
   </source>
   <dest>
-    *: "12 Hour Clock"
+    *: none
+    lcd_bitmap: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: "12 Hour Clock"
+    *: none
+    lcd_bitmap: "Korean"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_24_HOUR_CLOCK
-  desc: option for 24 hour clock
+  id: LANG_CODEPAGE_TRADITIONAL
+  desc: in codepage setting menu
   user:
   <source>
-    *: "24 Hour Clock"
+    *: none
+    lcd_bitmap: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: "24 Hour Clock"
+    *: none
+    lcd_bitmap: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: "24 Hour Clock"
+    *: none
+    lcd_bitmap: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAX_FILES_IN_DIR
-  desc: in settings_menu
+  id: LANG_CODEPAGE_UTF8
+  desc: in codepage setting menu
   user:
   <source>
-    *: "Max Files in Dir Browser"
+    *: "Unicode (UTF-8)"
   </source>
   <dest>
-    *: "Max Files in Dir Browser"
+    *: "Unicode (UTF-8)"
   </dest>
   <voice>
-    *: "Maximum files in directory browser"
+    *: "Unicode"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAX_FILES_IN_PLAYLIST
+  id: LANG_BUTTONLIGHT_TIMEOUT
   desc: in settings_menu
   user:
   <source>
-    *: "Max Playlist Size"
+    *: none
+    e200: "Wheel Light Timeout"
+    gigabeatf: "Button Light Timeout"
   </source>
   <dest>
-    *: "Max Playlist Size"
+    *: none
+    e200: "Wheel Light Timeout"
+    gigabeatf: "Button Light Timeout"
   </dest>
   <voice>
-    *: "Maximum playlist size"
+    *: none
+    e200: "Wheel Light Timeout"
+    gigabeatf: "Button Light Timeout"    
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST
-  desc: Used when you need to say playlist, also voiced
+  id: LANG_BUTTONLIGHT_BRIGHTNESS
+  desc: in settings_menu
   user:
   <source>
-    *: "Playlist"
+    *: none
+    gigabeatf: "Button Light Brightness"
   </source>
   <dest>
-    *: "Playlist"
+    *: none
+    gigabeatf: "Button Light Brightness"
   </dest>
   <voice>
-    *: "Playlist"
+    *: none
+    gigabeatf: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU
-  desc: Text on main menu to get to bookmark commands
+  id: LANG_START_SCREEN
+  desc: in the system sub menu
   user:
   <source>
-    *: "Bookmarks"
+    *: "Start Screen"
   </source>
   <dest>
-    *: "Bookmarks"
+    *: "Start Screen"
   </dest>
   <voice>
-    *: "Bookmarks"
+    *: "Start Screen"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MENU_SHOW_ID3_INFO
-  desc: Menu option to start tag viewer
+  id: LANG_MAIN_MENU
+  desc: in start screen setting
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Main Menu"
   </source>
   <dest>
-    *: "Show ID3 Info"
+    *: "Main Menu"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Main Menu"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MENU_SET_RATING
-  desc: in wps context menu
+  id: LANG_PREVIOUS_SCREEN
+  desc: in start screen setting
   user:
   <source>
-    *: "Set Song Rating"
+    *: "Previous Screen"
   </source>
   <dest>
-    *: "Set Song Rating"
+    *: "Previous Screen"
   </dest>
   <voice>
-    *: "Set Song Rating"
+    *: "Previous Screen"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RATING
-  desc: in set_rating
+  id: LANG_BATTERY_MENU
+  desc: in the system sub menu
   user:
   <source>
-    *: "Rating:"
+    *: "Battery"
   </source>
   <dest>
-    *: "Rating:"
+    *: "Battery"
   </dest>
   <voice>
-    *: ""
+    *: "Battery"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RENAME
-  desc: The verb/action Rename
+  id: LANG_BATTERY_CAPACITY
+  desc: in settings_menu
   user:
   <source>
-    *: "Rename"
+    *: "Battery Capacity"
   </source>
   <dest>
-    *: "Rename"
+    *: "Battery Capacity"
   </dest>
   <voice>
-    *: "Rename"
+    *: "Battery Capacity"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUT
-  desc: The verb/action Cut
+  id: LANG_BATTERY_TYPE
+  desc: in battery settings
   user:
   <source>
-    *: "Cut"
+    *: none
+    battery_types: "Battery Type"
   </source>
   <dest>
-    *: "Cut"
+    *: none
+    battery_types: "Battery Type"
   </dest>
   <voice>
-    *: "Cut"
+    *: none
+    battery_types: "Battery type"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COPY
-  desc: The verb/action Copy
+  id: LANG_BATTERY_TYPE_ALKALINE
+  desc: in battery settings
   user:
   <source>
-    *: "Copy"
+    *: none
+    battery_types: "Alkaline"
   </source>
   <dest>
-    *: "Copy"
+    *: none
+    battery_types: "Alkaline"
   </dest>
   <voice>
-    *: "Copy"
+    *: none
+    battery_types: "Alkaline"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PASTE
-  desc: The verb/action Paste
+  id: LANG_BATTERY_TYPE_NIMH
+  desc: in battery settings
   user:
   <source>
-    *: "Paste"
+    *: none
+    battery_types: "NiMH"
   </source>
   <dest>
-    *: "Paste"
+    *: none
+    battery_types: "NiMH"
   </dest>
   <voice>
-    *: "Paste"
+    *: none
+    battery_types: "Nickel metal hydride"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REALLY_OVERWRITE
-  desc: The verb/action Paste
+  id: LANG_DISK_MENU
+  desc: in the system sub menu
   user:
   <source>
-    *: "File/directory exists. Overwrite?"
+    *: "Disk"
   </source>
   <dest>
-    *: "File/directory exists. Overwrite?"
+    *: "Disk"
   </dest>
   <voice>
-    *: ""
+    *: "Disk"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETE
-  desc: The verb/action Delete
+  id: LANG_SPINDOWN
+  desc: in settings_menu
   user:
   <source>
-    *: "Delete"
+    *: "Disk Spindown"
   </source>
   <dest>
-    *: "Delete"
+    *: "Disk Spindown"
   </dest>
   <voice>
-    *: "Delete"
+    *: "Disk Spindown"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_BACKDROP
-  desc: text for onplay menu entry
+  id: LANG_DIRCACHE_ENABLE
+  desc: in directory cache settings
   user:
   <source>
-    *: "Set As Backdrop"
+    *: none
+    dircache: "Directory Cache"
   </source>
   <dest>
-    *: "Set As Backdrop"
+    *: none
+    dircache: "Directory Cache"
   </dest>
   <voice>
-    *: "Set As Backdrop"
+    *: none
+    dircache: "Directory Cache"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETE_DIR
-  desc: in on+play menu
+  id: LANG_TIME_MENU
+  desc: in the system sub menu
   user:
   <source>
-    *: "Delete Directory"
+    *: none
+    rtc: "Time & Date"
   </source>
   <dest>
-    *: "Delete Directory"
+    *: none
+    rtc: "Time & Date"
   </dest>
   <voice>
-    *: "delete directory"
+    *: none
+    rtc: "Time and Date"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REALLY_DELETE
-  desc: Really Delete?
+  id: LANG_SET_TIME
+  desc: in settings_menu
   user:
   <source>
-    *: "Delete?"
+    *: none
+    rtc: "Set Time/Date"
   </source>
   <dest>
-    *: "Delete?"
+    *: none
+    rtc: "Set Time/Date"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "Set Time and Date"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETED
-  desc: A file has beed deleted
+  id: LANG_TIMEFORMAT
+  desc: select the time format of time in status bar
   user:
   <source>
-    *: "Deleted"
+    *: none
+    rtc: "Time Format"
   </source>
   <dest>
-    *: "Deleted"
+    *: none
+    rtc: "Time Format"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "Time Format"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ONPLAY_OPEN_WITH
-  desc: Onplay open with
+  id: LANG_12_HOUR_CLOCK
+  desc: option for 12 hour clock
   user:
   <source>
-    *: "Open With..."
+    *: none
+    rtc: "12 Hour Clock"
   </source>
   <dest>
-    *: "Open With..."
+    *: none
+    rtc: "12 Hour Clock"
   </dest>
   <voice>
-    *: "open with"
+    *: none
+    rtc: "12 Hour Clock"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATE_DIR
-  desc: in main menu
+  id: LANG_24_HOUR_CLOCK
+  desc: option for 24 hour clock
   user:
   <source>
-    *: "Create Directory"
+    *: none
+    rtc: "24 Hour Clock"
   </source>
   <dest>
-    *: "Create Directory"
+    *: none
+    rtc: "24 Hour Clock"
   </dest>
   <voice>
-    *: "Create Directory"
+    *: none
+    rtc: "24 Hour Clock"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH
-  desc: "pitch" in the pitch screen
+  id: LANG_TIME_SET_BUTTON
+  desc: used in set_time()
   user:
   <source>
-    *: "Pitch"
+    *: none
+    rtc: "ON = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,gigabeatf: "SELECT = Set"
   </source>
   <dest>
-    *: "Pitch"
+    *: none
+    rtc: "ON = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,gigabeatf: "SELECT = Set"
   </dest>
   <voice>
-    *: "Pitch"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VIEW
-  desc: in on+play menu
+  id: LANG_TIME_REVERT
+  desc: used in set_time()
   user:
   <source>
-    *: "View"
+    *: none
+    rtc: "OFF = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,e200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb: "PREV = Revert"
+    gigabeatf: "A = Revert"
   </source>
   <dest>
-    *: "View"
+    *: none
+    rtc: "OFF = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,e200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb: "PREV = Revert"
+    gigabeatf: "A = Revert"
   </dest>
   <voice>
-    *: "View"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUFFLE_PLAYLIST
-  desc: in playlist menu, reshuffles the order in which songs are played
+  id: LANG_WEEKDAY_SUNDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Reshuffle"
+    *: none
+    rtc: "Sun"
   </source>
   <dest>
-    *: "Reshuffle"
+    *: none
+    rtc: "Sun"
   </dest>
   <voice>
-    *: "Reshuffle"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  id: LANG_WEEKDAY_MONDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Insert"
+    *: none
+    rtc: "Mon"
   </source>
   <dest>
-    *: "Insert"
+    *: none
+    rtc: "Mon"
   </dest>
   <voice>
-    *: "Insert"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_FIRST
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  id: LANG_WEEKDAY_TUESDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Insert next"
+    *: none
+    rtc: "Tue"
   </source>
   <dest>
-    *: "Insert next"
+    *: none
+    rtc: "Tue"
   </dest>
   <voice>
-    *: "Insert next"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_LAST
-  desc: in onplay menu.  append a track/playlist into dynamic playlist.
+  id: LANG_WEEKDAY_WEDNESDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Insert last"
+    *: none
+    rtc: "Wed"
   </source>
   <dest>
-    *: "Insert last"
+    *: none
+    rtc: "Wed"
   </dest>
   <voice>
-    *: "Insert last"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_SHUFFLED
-  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
+  id: LANG_WEEKDAY_THURSDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Insert shuffled"
+    *: none
+    rtc: "Thu"
   </source>
   <dest>
-    *: "Insert shuffled"
+    *: none
+    rtc: "Thu"
   </dest>
   <voice>
-    *: "Insert shuffled"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE
-  desc: The verb/action Queue
+  id: LANG_WEEKDAY_FRIDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Queue"
+    *: none
+    rtc: "Fri"
   </source>
   <dest>
-    *: "Queue"
+    *: none
+    rtc: "Fri"
   </dest>
   <voice>
-    *: "Queue"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_FIRST
-  desc: in onplay menu.  queue a track/playlist into dynamic playlist.
+  id: LANG_WEEKDAY_SATURDAY
+  desc: Maximum 3-letter abbreviation for weekday
   user:
   <source>
-    *: "Queue next"
+    *: none
+    rtc: "Sat"
   </source>
   <dest>
-    *: "Queue next"
+    *: none
+    rtc: "Sat"
   </dest>
   <voice>
-    *: "Queue next"
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_LAST
-  desc: in onplay menu.  queue a track/playlist at end of playlist.
+  id: LANG_MONTH_JANUARY
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Queue last"
+    *: none
+    rtc: "Jan"
   </source>
   <dest>
-    *: "Queue last"
+    *: none
+    rtc: "Jan"
   </dest>
   <voice>
-    *: "Queue last"
+    *: none
+    rtc: "January"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_SHUFFLED
-  desc: in onplay menu.  queue a track/playlist randomly into dynamic playlist
+  id: LANG_MONTH_FEBRUARY
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Queue shuffled"
+    *: none
+    rtc: "Feb"
   </source>
   <dest>
-    *: "Queue shuffled"
+    *: none
+    rtc: "Feb"
   </dest>
   <voice>
-    *: "Queue shuffled"
+    *: none
+    rtc: "February"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SEARCH_IN_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_MONTH_MARCH
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Search In Playlist"
+    *: none
+    rtc: "Mar"
   </source>
   <dest>
-    *: "Search In Playlist"
+    *: none
+    rtc: "Mar"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: none
+    rtc: "March"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_SEARCH_MSG
-  desc: splash number of tracks inserted
+  id: LANG_MONTH_APRIL
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Searching... %d found (%s)"
+    *: none
+    rtc: "Apr"
   </source>
   <dest>
-    *: "Searching... %d found (%s)"
+    *: none
+    rtc: "Apr"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "April"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_CREATE
-  desc: Used off of the bookmark menu to create a bookmark
+  id: LANG_MONTH_MAY
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Create Bookmark"
+    *: none
+    rtc: "May"
   </source>
   <dest>
-    *: "Create Bookmark"
+    *: none
+    rtc: "May"
   </dest>
   <voice>
-    *: "Create Bookmark"
+    *: none
+    rtc: "May"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_LIST
-  desc: Used off of the bookmark menu to list available bookmarks for the currently playing directory or M3U
+  id: LANG_MONTH_JUNE
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "List Bookmarks"
+    *: none
+    rtc: "Jun"
   </source>
   <dest>
-    *: "List Bookmarks"
+    *: none
+    rtc: "Jun"
   </dest>
   <voice>
-    *: "List Bookmarks"
+    *: none
+    rtc: "June"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ROCKBOX_INFO
-  desc: displayed topmost on the info screen
+  id: LANG_MONTH_JULY
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Rockbox Info:"
+    *: none
+    rtc: "Jul"
   </source>
   <dest>
-    *: "Rockbox Info:"
+    *: none
+    rtc: "Jul"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "July"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  id: LANG_MONTH_AUGUST
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Buf: %d.%03dMB"
+    *: none
+    rtc: "Aug"
   </source>
   <dest>
-    *: "Buf: %d.%03dMB"
+    *: none
+    rtc: "Aug"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "August"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  id: LANG_MONTH_SEPTEMBER
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Buffer: %d.%03dMB"
+    *: none
+    rtc: "Sep"
   </source>
   <dest>
-    *: "Buffer: %d.%03dMB"
+    *: none
+    rtc: "Sep"
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "September"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_CHARGE
-  desc: tells that the battery is charging, instead of battery level
+  id: LANG_MONTH_OCTOBER
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Battery: Charging"
+    *: none
+    rtc: "Oct"
   </source>
   <dest>
-    *: "Battery: Charging"
+    *: none
+    rtc: "Oct"
   </dest>
   <voice>
-    *: "Charging"
+    *: none
+    rtc: "October"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running
+  id: LANG_MONTH_NOVEMBER
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Battery: Top-Off Chg"
+    *: none
+    rtc: "Nov"
   </source>
   <dest>
-    *: "Battery: Top-Off Chg"
+    *: none
+    rtc: "Nov"
   </dest>
   <voice>
-    *: "Top off charge"
+    *: none
+    rtc: "November"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TRICKLE_CHARGE
-  desc: in info display, shows that trickle charge is running
+  id: LANG_MONTH_DECEMBER
+  desc: Maximum 3-letter abbreviation for monthname
   user:
   <source>
-    *: "Battery: Trickle Chg"
+    *: none
+    rtc: "Dec"
   </source>
   <dest>
-    *: "Battery: Trickle Chg"
+    *: none
+    rtc: "Dec"
   </dest>
   <voice>
-    *: "Trickle charge"
+    *: none
+    rtc: "December"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TIME
-  desc: battery level in % and estimated time remaining
+  id: LANG_POWEROFF_IDLE
+  desc: in settings_menu
   user:
   <source>
-    *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    *: "Idle Poweroff"
   </source>
   <dest>
-    *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    *: "Idle Poweroff"
   </dest>
   <voice>
-    *: "Battery level"
+    *: "Idle Poweroff"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_SIZE_INFO
-  desc: disk size info
+  id: LANG_SLEEP_TIMER
+  desc: sleep timer setting
   user:
   <source>
-    *: "Disk:"
+    *: "Sleep Timer"
   </source>
   <dest>
-    *: "Disk:"
+    *: "Sleep Timer"
   </dest>
   <voice>
-    *: ""
+    *: "Sleep Timer"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_FREE_INFO
-  desc: disk size info
+  id: LANG_LIMITS_MENU
+  desc: in the system sub menu
   user:
   <source>
-    *: "Free:"
+    *: "Limits"
   </source>
   <dest>
-    *: "Free:"
+    *: "Limits"
   </dest>
   <voice>
-    *: "Free diskspace:"
+    *: "Limits"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_NAME_INTERNAL
-  desc: in info menu; name for internal disk with multivolume (keep short!)
+  id: LANG_MAX_FILES_IN_DIR
+  desc: in settings_menu
   user:
   <source>
-    *: "Int:"
+    *: "Max Files in Dir Browser"
   </source>
   <dest>
-    *: "Int:"
+    *: "Max Files in Dir Browser"
   </dest>
   <voice>
-    *: "Internal"
+    *: "Maximum files in directory browser"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_NAME_MMC
-  desc: in info menu;  name for external disk with multivolume (Ondio; keep short!)
+  id: LANG_MAX_FILES_IN_PLAYLIST
+  desc: in settings_menu
   user:
   <source>
-    *: "MMC:"
+    *: "Max Playlist Size"
   </source>
   <dest>
-    *: "MMC:"
+    *: "Max Playlist Size"
   </dest>
   <voice>
-    *: "Multimedia card"
+    *: "Maximum playlist size"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CAR_ADAPTER_MODE
+  desc: Displayed for setting car adapter mode to on/off
   user:
   <source>
-    *: ""
+    *: none
+    charging: "Car Adapter Mode"
   </source>
   <dest>
-    *: ""
+    *: none
+    charging: "Car Adapter Mode"
   </dest>
   <voice>
-    *: "Current time:"
+    *: none
+    charging: "Car Adapter Mode"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_UP
-  desc: in wps
+  id: LANG_ALARM_MOD_ALARM_MENU
+  desc: The name of the additional entry in the main menu for the RTC alarm mod.
   user:
   <source>
-    *: "Pitch Up"
+    *: none
+    alarm: "Wake-Up Alarm"
   </source>
   <dest>
-    *: "Pitch Up"
+    *: none
+    alarm: "Wake-Up Alarm"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: "Wake-Up Alarm"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_DOWN
-  desc: in wps
+  id: LANG_ALARM_WAKEUP_SCREEN
+  desc: in alarm menu setting
   user:
   <source>
-    *: "Pitch Down"
+    *: none
+    alarm: "Alarm Wake up Screen"
   </source>
   <dest>
-    *: "Pitch Down"
+    *: none
+    alarm: "Alarm Wake up Screen"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: "Alarm Wake up Screen"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PAUSE
-  desc: in wps
+  id: LANG_ALARM_MOD_TIME
+  desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
   user:
   <source>
-    *: "Pause"
+    *: none
+    alarm: "Alarm Time: %02d:%02d"
   </source>
   <dest>
-    *: "Pause"
+    *: none
+    alarm: "Alarm Time: %02d:%02d"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_F2_MODE
-  desc: in wps F2 pressed
+  id: LANG_ALARM_MOD_TIME_TO_GO
+  desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user:
   <source>
-    *: "Mode:"
+    *: none
+    alarm: "Waking Up In %d:%02d"
   </source>
   <dest>
-    *: "Mode:"
+    *: none
+    alarm: "Waking Up In %d:%02d"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_F3_STATUS
-  desc: in wps F3 pressed
+  id: LANG_ALARM_MOD_SHUTDOWN
+  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>
-    *: "Status"
+    *: none
+    alarm: "Alarm Set"
   </source>
   <dest>
-    *: "Status"
+    *: none
+    alarm: "Alarm Set"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_F3_SCROLL
-  desc: in wps F3 pressed
+  id: LANG_ALARM_MOD_ERROR
+  desc: The text that tells that the time is incorrect (for the RTC alarm mod).
   user:
   <source>
-    *: "Scroll"
+    *: none
+    alarm: "Alarm Time Is Too Soon!"
   </source>
   <dest>
-    *: "Scroll"
+    *: none
+    alarm: "Alarm Time Is Too Soon!"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_F3_BAR
-  desc: in wps F3 pressed
+  id: LANG_ALARM_MOD_KEYS
+  desc: Shown key functions in alarm menu (for the RTC alarm mod).
   user:
   <source>
-    *: "Bar"
+    *: none
+    alarm: "PLAY=Set OFF=Cancel"
+    ipod*: "SELECT=Set MENU=Cancel"
   </source>
   <dest>
-    *: "Bar"
+    *: none
+    alarm: "PLAY=Set OFF=Cancel"
+    ipod*: "SELECT=Set MENU=Cancel"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm,ipod*: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_LIST_BOOKMARKS
-  desc: DEPRECATED
+  id: LANG_ALARM_MOD_DISABLE
+  desc: Announce that the RTC alarm has been turned off
   user:
   <source>
-    *: ""
+    *: none
+    alarm: "Alarm Disabled"
   </source>
   <dest>
-    *: deprecated
+    *: none
+    alarm: "Alarm Disabled"
   </dest>
   <voice>
-    *: ""
+    *: none
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_EXIT
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS
+  desc: in general settings
   user:
   <source>
-    *: ""
+    *: "Bookmarking"
   </source>
   <dest>
-    *: deprecated
+    *: "Bookmarking"
   </dest>
   <voice>
-    *: ""
+    *: "Bookmarking"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_BOOKMARK_TEXT
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_AUTOCREATE
+  desc: prompt for user to decide to create an bookmark
   user:
   <source>
-    *: ""
+    *: "Bookmark on Stop"
   </source>
   <dest>
-    *: deprecated
+    *: "Bookmark on Stop"
   </dest>
   <voice>
-    *: ""
+    *: "Bookmark on Stop"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_INDEX_TEXT
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES
+  desc: Save in recent bookmarks only
   user:
   <source>
-    *: ""
+    *: "Yes - Recent only"
   </source>
   <dest>
-    *: deprecated
+    *: "Yes - Recent only"
   </dest>
   <voice>
-    *: ""
+    *: "Yes - Recent only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_TIME_TEXT
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK
+  desc: Save in recent bookmarks only
   user:
   <source>
-    *: ""
+    *: "Ask - Recent only"
   </source>
   <dest>
-    *: deprecated
+    *: "Ask - Recent only"
   </dest>
   <voice>
-    *: ""
+    *: "Ask - Recent only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_PLAY
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_AUTOLOAD
+  desc: prompt for user to decide to create a bookmark
   user:
   <source>
-    *: ""
+    *: "Load Last Bookmark"
   </source>
   <dest>
-    *: deprecated
+    *: "Load Last Bookmark"
   </dest>
   <voice>
-    *: ""
+    *: "Load Last Bookmark"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_DELETE
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS
+  desc: Configuration option to maintain a list of recent bookmarks
   user:
   <source>
-    *: ""
+    *: "Maintain a List of Recent Bookmarks?"
   </source>
   <dest>
-    *: deprecated
+    *: "Maintain a List of Recent Bookmarks?"
   </dest>
   <voice>
-    *: ""
+    *: "Maintain a List of Recent Bookmarks?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_AUTOLOAD_QUERY
-  desc: DEPRECATED
+  id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
+  desc: Save only on bookmark for each playlist in recent bookmarks
   user:
   <source>
-    *: ""
+    *: "Unique only"
   </source>
   <dest>
-    *: deprecated
+    *: "Unique only"
   </dest>
   <voice>
-    *: ""
+    *: "Unique only"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTO_BOOKMARK_QUERY
-  desc: prompt for user to decide to create an bookmark
+  id: LANG_LANGUAGE
+  desc: in settings_menu
   user:
   <source>
-    *: "Create a Bookmark?"
+    *: "Language"
   </source>
   <dest>
-    *: "Create a Bookmark?"
+    *: "Language"
   </dest>
   <voice>
-    *: ""
+    *: "Language"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CREATE_SUCCESS
-  desc: Indicates bookmark was successfully created
+  id: LANG_LANGUAGE_LOADED
+  desc: shown when a language has been loaded from the dir browser
   user:
   <source>
-    *: "Bookmark Created"
+    *: "New Language"
   </source>
   <dest>
-    *: "Bookmark Created"
+    *: "New Language"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CREATE_FAILURE
-  desc: Indicates bookmark was not created
+  id: LANG_VOICE
+  desc: root of voice menu
   user:
   <source>
-    *: "Bookmark Failed!"
+    *: "Voice"
   </source>
   <dest>
-    *: "Bookmark Failed!"
+    *: "Voice"
   </dest>
   <voice>
-    *: ""
+    *: "Voice"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_LOAD_EMPTY
-  desc: Indicates bookmark was empty
+  id: LANG_VOICE_MENU
+  desc: item of voice menu, enable/disable the voice UI
   user:
   <source>
-    *: "Bookmark Empty"
+    *: "Voice Menus"
   </source>
   <dest>
-    *: "Bookmark Empty"
+    *: "Voice Menus"
   </dest>
   <voice>
-    *: ""
+    *: "Voice Menus"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME_SET
-  desc: used in set_time()
+  id: LANG_VOICE_DIR
+  desc: item of voice menu, set the voice mode for directories
   user:
   <source>
-    *: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*: "SELECT = Set"
-    x5: "SELECT = Set"
-    h10,h10_5gb: "SELECT = Set"
-    gigabeatf: "SELECT = Set"
-    e200: "SELECT = Set"
+    *: "Voice Directories"
   </source>
   <dest>
-    *: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*: "SELECT = Set"
-    x5: "SELECT = Set"
-    h10,h10_5gb: "SELECT = Set"
-    gigabeatf: "SELECT = Set"
-    e200: "SELECT = Set"
+    *: "Voice Directories"
   </dest>
   <voice>
-    *: ""
+    *: "Voice Directories"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME_REVERT
-  desc: used in set_time()
+  id: LANG_VOICE_DIR_TALK
+  desc: Item of voice menu, whether to use directory .talk clips
   user:
   <source>
-    *: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,e200: "MENU = Revert"
-    x5: "RECORD = Revert"
-    h10,h10_5gb: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    *: "Use Directory .talk Clips"
   </source>
   <dest>
-    *: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,e200: "MENU = Revert"
-    x5: "RECORD = Revert"
-    h10,h10_5gb: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    *: "Use Directory .talk Clips"
   </dest>
   <voice>
-    *: ""
+    *: "Use Directory .talk Clips"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_ON_PLAYER
-  desc: displayed when key lock is on
+  id: LANG_VOICE_FILE
+  desc: item of voice menu, set the voice mode for files
   user:
   <source>
-    *: "Key Lock ON"
+    *: "Voice Filenames"
   </source>
   <dest>
-    *: "Key Lock ON"
+    *: "Voice Filenames"
   </dest>
   <voice>
-    *: ""
+    *: "Voice Filenames"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_OFF_PLAYER
-  desc: displayed when key lock is turned off
+  id: LANG_VOICE_FILE_TALK
+  desc: Item of voice menu, whether to use file .talk clips
   user:
   <source>
-    *: "Key Lock OFF"
+    *: "Use File .talk Clips"
   </source>
   <dest>
-    *: "Key Lock OFF"
+    *: "Use File .talk Clips"
   </dest>
   <voice>
-    *: ""
+    *: "Use File .talk Clips"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_ON_RECORDER
-  desc: displayed when key lock is on
+  id: LANG_VOICE_NUMBER
+  desc: "talkbox" mode for files+directories
   user:
   <source>
-    *: "Keylock is ON"
+    *: "Numbers"
   </source>
   <dest>
-    *: "Keylock is ON"
+    *: "Numbers"
   </dest>
   <voice>
-    *: ""
+    *: "Numbers"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_OFF_RECORDER
-  desc: displayed when key lock is turned off
+  id: LANG_VOICE_SPELL
+  desc: "talkbox" mode for files+directories
   user:
   <source>
-    *: "Keylock is OFF"
+    *: "Spell"
   </source>
   <dest>
-    *: "Keylock is OFF"
+    *: "Spell"
   </dest>
   <voice>
-    *: ""
+    *: "Spell"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_TIME
-  desc: Display of recorded time
+  id: LANG_VOICE_DIR_HOVER
+  desc: "talkbox" mode for directories + files
   user:
   <source>
-    *: "Time:"
+    *: ".talk mp3 clip"
   </source>
   <dest>
-    *: "Time:"
+    *: ".talk mp3 clip"
   </dest>
   <voice>
-    *: ""
+    *: "talk mp3 clip"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TIMESPLIT_REC
-  desc: Display of record timer interval setting, on the record screen
+  id: LANG_MANAGE_MENU
+  desc: in the main menu
   user:
   <source>
-    *: "Split Time:"
+    *: "Manage Settings"
   </source>
   <dest>
-    *: "Split Time:"
+    *: "Manage Settings"
   </dest>
   <voice>
-    *: ""
+    *: "Manage Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SIZE
-  desc: Display of recorded file size
+  id: LANG_CUSTOM_CFG
+  desc: in setting_menu()
   user:
   <source>
-    *: "Size:"
+    *: "Browse .cfg files"
   </source>
   <dest>
-    *: "Size:"
+    *: "Browse .cfg files"
   </dest>
   <voice>
-    *: ""
+    *: "Browse configuration files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_PRERECORD
-  desc: in recording and radio screen
+  id: LANG_SETTINGS_LOADED
+  desc: Feedback shown when a .cfg file is loaded
   user:
   <source>
-    *: "Pre-Recording"
+    *: "Settings Loaded"
   </source>
   <dest>
-    *: "Pre-Recording"
+    *: "Settings Loaded"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_GAIN
-  desc: in the recording screen
+  id: LANG_RESET
+  desc: in system_settings_menu()
   user:
   <source>
-    *: "Gain"
+    *: "Reset Settings"
   </source>
   <dest>
-    *: "Gain"
+    *: "Reset Settings"
   </dest>
   <voice>
-    *: ""
+    *: "Reset Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_LEFT
-  desc: in the recording screen
+  id: LANG_RESET_DONE_CLEAR
+  desc: visual confirmation after settings reset
   user:
   <source>
-    *: "Gain Left"
+    *: "Cleared"
   </source>
   <dest>
-    *: "Gain Left"
+    *: "Cleared"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_RIGHT
-  desc: in the recording screen
+  id: LANG_SAVE_SETTINGS
+  desc: in system_settings_menu()
   user:
   <source>
-    *: "Gain Right"
+    *: "Write .cfg file"
   </source>
   <dest>
-    *: "Gain Right"
+    *: "Write .cfg file"
   </dest>
   <voice>
-    *: ""
+    *: "Write configuration file"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_GAIN_ANALOG
-  desc: in the recording screen
+  id: LANG_SETTINGS_SAVED
+  desc: Feedback shown when a .cfg file is saved
   user:
   <source>
-    *: "A"
+    *: "Settings Saved"
   </source>
   <dest>
-    *: "A"
+    *: "Settings Saved"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_GAIN_DIGITAL
-  desc: in the recording screen
+  id: LANG_SAVE_THEME
+  desc: save a theme file
   user:
   <source>
-    *: "D"
+    *: "Save Theme Settings"
   </source>
   <dest>
-    *: "D"
+    *: "Save Theme Settings"
   </dest>
   <voice>
-    *: ""
+    *: "Save Theme Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_FULL
-  desc: in recording screen
+  id: LANG_CUSTOM_THEME
+  desc: in the main menu
   user:
   <source>
-    *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    *: "Browse Themes"
   </source>
   <dest>
-    *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    *: "Browse Themes"
   </dest>
   <voice>
-    *: ""
+    *: "Browse Themes"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_MODE
-  desc: in recording settings_menu
+  id: LANG_RECORDING_SETTINGS
+  desc: in the main menu
   user:
   <source>
-    *: "Trigger"
+    *: none
+    recording: "Recording Settings"
   </source>
   <dest>
-    *: "Trigger"
+    *: none
+    recording: "Recording Settings"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "Recording Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIG_NOREARM
-  desc: in recording settings_menu
+  id: LANG_FM_MENU
+  desc: fm menu title
   user:
   <source>
-    *: "Once"
+    *: none
+    radio: "FM Radio Menu"
   </source>
   <dest>
-    *: "Once"
+    *: none
+    radio: "FM Radio Menu"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "FM Radio Menu"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIG_REARM
-  desc: in recording settings_menu
+  id: LANG_FM_STATION
+  desc: in radio screen
   user:
   <source>
-    *: "Repeat"
+    *: none
+    radio: "Station: %d.%02d MHz"
   </source>
   <dest>
-    *: "Repeat"
+    *: none
+    radio: "Station: %d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_START_THRESHOLD
-  desc: in recording settings_menu
+  id: LANG_FM_NO_PRESETS
+  desc: error when preset list is empty
   user:
   <source>
-    *: "Start Above"
+    *: none
+    radio: "No presets"
   </source>
   <dest>
-    *: "Start Above"
+    *: none
+    radio: "No presets"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_MIN_DURATION
-  desc: in recording settings_menu
+  id: LANG_FM_ADD_PRESET
+  desc: in radio menu
   user:
   <source>
-    *: "for at least"
+    *: none
+    radio: "Add Preset"
   </source>
   <dest>
-    *: "for at least"
+    *: none
+    radio: "Add Preset"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Add Preset"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STOP_THRESHOLD
-  desc: in recording settings_menu
+  id: LANG_FM_EDIT_PRESET
+  desc: in radio screen
   user:
   <source>
-    *: "Stop Below"
+    *: none
+    radio: "Edit Preset"
   </source>
   <dest>
-    *: "Stop Below"
+    *: none
+    radio: "Edit Preset"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Edit Preset"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STOP_POSTREC
-  desc: in recording settings_menu
+  id: LANG_FM_DELETE_PRESET
+  desc: in radio screen
   user:
   <source>
-    *: "for at least"
+    *: none
+    radio: "Remove Preset"
   </source>
   <dest>
-    *: "for at least"
+    *: none
+    radio: "Remove Preset"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Remove Preset"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STOP_GAP
-  desc: in recording settings_menu
+  id: LANG_FM_PRESET_SAVE_FAILED
+  desc: in radio screen
   user:
   <source>
-    *: "Presplit Gap"
+    *: none
+    radio: "Preset Save Failed"
   </source>
   <dest>
-    *: "Presplit Gap"
+    *: none
+    radio: "Preset Save Failed"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DB_INF
-  desc: -inf db for values below measurement
+  id: LANG_FM_NO_FREE_PRESETS
+  desc: in radio screen
   user:
   <source>
-    *: "-inf"
+    *: none
+    radio: "The Preset List is Full"
   </source>
   <dest>
-    *: "-inf"
+    *: none
+    radio: "The Preset List is Full"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIG_IDLE
-  desc: waiting for threshold
+  id: LANG_BUTTONBAR_MENU
+  desc: in button bar
   user:
   <source>
-    *: "Trigger Idle"
+    *: none
+    radio_screen_button_bar: "Menu"
   </source>
   <dest>
-    *: "Trigger Idle"
+    *: none
+    radio_screen_button_bar: "Menu"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_ACTIVE
-  desc:
+  id: LANG_FM_BUTTONBAR_EXIT
+  desc: in radio screen
   user:
   <source>
-    *: "Trigger Active"
+    *: none
+    radio_screen_button_bar: "Exit"
   </source>
   <dest>
-    *: "Trigger Active"
+    *: none
+    radio_screen_button_bar: "Exit"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_TIME
-  desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
+  id: LANG_FM_BUTTONBAR_ACTION
+  desc: in radio screen
   user:
   <source>
-    *: "Alarm Time: %02d:%02d"
+    *: none
+    radio_screen_button_bar: "Action"
   </source>
   <dest>
-    *: "Alarm Time: %02d:%02d"
+    *: none
+    radio_screen_button_bar: "Action"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_screen_button_bar: ""
   </voice>
-</phrase>
+</phrase>-->
 <phrase>
-  id: LANG_ALARM_MOD_TIME_TO_GO
-  desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
+  id: LANG_PRESET
+  desc: in button bar and radio screen / menu
   user:
   <source>
-    *: "Waking Up In %d:%02d"
+    *: none
+    radio: "Preset"
   </source>
   <dest>
-    *: "Waking Up In %d:%02d"
+    *: none
+    radio: "Preset"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_SHUTDOWN
-  desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
+  id: LANG_FM_BUTTONBAR_ADD
+  desc: in radio screen
   user:
   <source>
-    *: "Alarm Set"
+    *: none
+    radio_screen_button_bar: "Add"
   </source>
   <dest>
-    *: "Alarm Set"
+    *: none
+    radio_screen_button_bar: "Add"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_ERROR
-  desc: The text that tells that the time is incorrect (for the RTC alarm mod).
+  id: LANG_FM_BUTTONBAR_RECORD
+  desc: in radio screen
   user:
   <source>
-    *: "Alarm Time Is Too Soon!"
+    *: none
+    radio_screen_button_bar: "Record"
   </source>
   <dest>
-    *: "Alarm Time Is Too Soon!"
+    *: none
+    radio_screen_button_bar: "Record"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_KEYS
-  desc: Shown key functions in alarm menu (for the RTC alarm mod).
+  id: LANG_FM_MONO_MODE
+  desc: in radio screen
   user:
   <source>
-    *: "PLAY=Set OFF=Cancel"
-    ipod*: "SELECT=Set MENU=Cancel"
+    *: none
+    radio: "Force mono"
   </source>
   <dest>
-    *: "PLAY=Set OFF=Cancel"
-    ipod*: "SELECT=Set MENU=Cancel"
+    *: none
+    radio: "Force mono"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Force mono"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_DISABLE
-  desc: Announce that the RTC alarm has been turned off
+  id: LANG_FM_FREEZE
+  desc: splash screen during freeze in radio mode
   user:
   <source>
-    *: "Alarm Disabled"
+    *: none
+    radio: "Screen frozen!"
   </source>
   <dest>
-    *: "Alarm Disabled"
+    *: none
+    radio: "Screen frozen!"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_RGB_LABELS
-  desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
+  id: LANG_FM_SCAN_PRESETS
+  desc: in radio menu
   user:
   <source>
-    *: "RGB"
+    *: none
+    radio: "Auto-Scan Presets"
   </source>
   <dest>
-    *: "RGB"
+    *: none
+    radio: "Auto-Scan Presets"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Auto scan presets"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_RGB_VALUE
-  desc: in color screen
+  id: LANG_FM_CLEAR_PRESETS
+  desc: confirmation if presets can be cleared
   user:
   <source>
-    *: "RGB: %02X%02X%02X"
+    *: none
+    radio: "Clear Current Presets?"
   </source>
   <dest>
-    *: "RGB: %02X%02X%02X"
+    *: none
+    radio: "Clear Current Presets?"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_UNACCEPTABLE
-  desc: splash when user selects an invalid colour
+  id: LANG_FM_SCANNING
+  desc: during auto scan
   user:
   <source>
-    *: "Invalid colour"
+    *: none
+    radio: "Scanning %d.%02d MHz"
   </source>
   <dest>
-    *: "Invalid colour"
+    *: none
+    radio: "Scanning %d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TITLE
-  desc: in tag viewer
+  id: LANG_FM_DEFAULT_PRESET_NAME
+  desc: default preset name for auto scan mode
   user:
   <source>
-    *: "[Title]"
+    *: none
+    radio: "%d.%02d MHz"
   </source>
   <dest>
-    *: "[Title]"
+    *: none
+    radio: "%d.%02d MHz"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ARTIST
-  desc: in tag viewer
+  id: LANG_RADIO_SCAN_MODE
+  desc: in radio screen / menu
   user:
   <source>
-    *: "[Artist]"
+    *: none
+    radio: "Scan"
   </source>
   <dest>
-    *: "[Artist]"
+    *: none
+    radio: "Scan"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM
-  desc: in tag viewer
+  id: LANG_FM_PRESET_LOAD
+  desc: load preset list in fm radio
   user:
   <source>
-    *: "[Album]"
+    *: none
+    radio: "Load Preset List"
   </source>
   <dest>
-    *: "[Album]"
+    *: none
+    radio: "Load Preset List"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Load Preset List"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TRACKNUM
-  desc: in tag viewer
+  id: LANG_FM_PRESET_SAVE
+  desc: Save preset list in fm radio
   user:
   <source>
-    *: "[Tracknum]"
+    *: none
+    radio: "Save Preset List"
   </source>
   <dest>
-    *: "[Tracknum]"
+    *: none
+    radio: "Save Preset List"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Save Preset List"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_GENRE
-  desc: in tag viewer
+  id: LANG_FM_PRESET_CLEAR
+  desc: clear preset list in fm radio
   user:
   <source>
-    *: "[Genre]"
+    *: none
+    radio: "Clear Preset List"
   </source>
   <dest>
-    *: "[Genre]"
+    *: none
+    radio: "Clear Preset List"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Clear Preset List"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_YEAR
-  desc: in tag viewer
+  id: LANG_FMR
+  desc: Used when you need to say Preset List, also voiced
   user:
   <source>
-    *: "[Year]"
+    *: none
+    radio: "Preset List"
   </source>
   <dest>
-    *: "[Year]"
+    *: none
+    radio: "Preset List"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Preset List"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_LENGTH
-  desc: in tag viewer
+  id: LANG_FM_FIRST_AUTOSCAN
+  desc: When you run the radio without an fmr file in settings
   user:
   <source>
-    *: "[Length]"
+    *: none
+    radio: "No settings found. Autoscan?"
   </source>
   <dest>
-    *: "[Length]"
+    *: none
+    radio: "No settings found. Autoscan?"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_PLAYLIST
-  desc: in tag viewer
+  id: LANG_FM_SAVE_CHANGES
+  desc: When you try to exit radio to confirm save
   user:
   <source>
-    *: "[Playlist]"
+    *: none
+    radio: "Save Changes?"
   </source>
   <dest>
-    *: "[Playlist]"
+    *: none
+    radio: "Save Changes?"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_BITRATE
-  desc: in tag viewer
-  user:
+  id: LANG_FM_REGION
+  desc: fm tuner region setting
   <source>
-    *: "[Bitrate]"
+    *: none
+    radio: "Region"
   </source>
   <dest>
-    *: "[Bitrate]"
+    *: none
+    radio: "Region"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Region"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNIT_DB
-  desc: in browse_id3
-  user:
+  id: LANG_FM_EUROPE
+  desc: fm tuner region europe
   <source>
-    *: "dB"
+    *: none
+    radio: "Europe"
   </source>
   <dest>
-    *: "dB"
+    *: none
+    radio: "Europe"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Europe"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_VBR
-  desc: in browse_id3
-  user:
+  id: LANG_FM_US
+  desc: fm region us / canada
   <source>
-    *: " (VBR)"
+    *: none
+    radio: "US / Canada"
   </source>
   <dest>
-    *: " (VBR)"
+    *: none
+    radio: "US / Canada"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "US / Canada"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_FREQUENCY
-  desc: in tag viewer
-  user:
+  id: LANG_FM_JAPAN
+  desc: fm region japan
   <source>
-    *: "[Frequency]"
+    *: none
+    radio: "Japan"
   </source>
   <dest>
-    *: "[Frequency]"
+    *: none
+    radio: "Japan"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Japan"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TRACK_GAIN
-  desc: in tag viewer
-  user:
+  id: LANG_FM_KOREA
+  desc: fm region korea
   <source>
-    *: "[Track Gain]"
+    *: none
+    radio: "Korea"
   </source>
   <dest>
-    *: "[Track Gain]"
+    *: none
+    radio: "Korea"
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio: "Korea"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM_GAIN
-  desc: in tag viewer
+  id: LANG_RECORDING_FORMAT
+  desc: audio format item in recording menu
   user:
   <source>
-    *: "[Album Gain]"
+    *: none
+    recording: "Format"
   </source>
   <dest>
-    *: "[Album Gain]"
+    *: none
+    recording: "Format"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "Format"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_PATH
-  desc: in tag viewer
+  id: LANG_AFMT_MPA_L3
+  desc: audio format description
   user:
   <source>
-    *: "[Path]"
+    *: none
+    recording: "MPEG Layer 3"
   </source>
   <dest>
-    *: "[Path]"
+    *: none
+    recording: "MPEG Layer 3"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "MPEG Layer 3"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_NO_INFO
-  desc: in tag viewer
+  id: LANG_AFMT_PCM_WAV
+  desc: audio format description
   user:
   <source>
-    *: "<No Info>"
+    *: none
+    recording: "PCM Wave"
   </source>
   <dest>
-    *: "<No Info>"
+    *: none
+    recording: "PCM Wave"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "PCM Wave"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_SUNDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_AFMT_WAVPACK
+  desc: audio format description
   user:
   <source>
-    *: "Sun"
+    *: none
+    recording_swcodec: "WavPack"
   </source>
   <dest>
-    *: "Sun"
+    *: none
+    recording_swcodec: "WavPack"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording_swcodec: "WavPack"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_MONDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_AFMT_AIFF
+  desc: audio format description
   user:
   <source>
-    *: "Mon"
+    *: none
+    recording: "AIFF"
   </source>
   <dest>
-    *: "Mon"
+    *: none
+    recording: "AIFF"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "AIFF"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_TUESDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_ENCODER_SETTINGS
+  desc: encoder settings
   user:
   <source>
-    *: "Tue"
+    *: none
+    recording: "Encoder Settings"
   </source>
   <dest>
-    *: "Tue"
+    *: none
+    recording: "Encoder Settings"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "Encoder Settings"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_WEDNESDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_BITRATE
+  desc: bits-kilobits per unit time
   user:
   <source>
-    *: "Wed"
+    *: none
+    recording_swcodec: "Bitrate"
   </source>
   <dest>
-    *: "Wed"
+    *: none
+    recording_swcodec: "Bitrate"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording_swcodec: "Bitrate"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_THURSDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_NO_SETTINGS
+  desc: when something has settings in a certain context
   user:
   <source>
-    *: "Thu"
+    *: none
+    recording: "(No Settings)"
   </source>
   <dest>
-    *: "Thu"
+    *: none
+    recording: "(No Settings)"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "No settings available"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_FRIDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_RECORDING_QUALITY
+  desc: in the recording settings
   user:
   <source>
-    *: "Fri"
+    *: none
+    recording_hwcodec: "Quality"
   </source>
   <dest>
-    *: "Fri"
+    *: none
+    recording_hwcodec: "Quality"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording_hwcodec: "Quality"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_SATURDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_RECORDING_FREQUENCY
+  desc: in the recording settings
   user:
   <source>
-    *: "Sat"
+    *: none
+    recording: "Frequency"
   </source>
   <dest>
-    *: "Sat"
+    *: none
+    recording: "Frequency"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JANUARY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_SOURCE_FREQUENCY
+  desc: when recording source frequency setting must follow source
   user:
   <source>
-    *: "Jan"
+    *: none
+    recording: "(Same As Source)"
   </source>
   <dest>
-    *: "Jan"
+    *: none
+    recording: "(Same As Source)"
   </dest>
   <voice>
-    *: "January"
+    *: none
+    recording: "Same As Source"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_FEBRUARY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_RECORDING_SOURCE
+  desc: in the recording settings
   user:
   <source>
-    *: "Feb"
+    *: none
+    recording: "Source"
   </source>
   <dest>
-    *: "Feb"
+    *: none
+    recording: "Source"
   </dest>
   <voice>
-    *: "February"
+    *: none
+    recording: "Source"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_MARCH
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_RECORDING_SRC_MIC
+  desc: in the recording settings
   user:
   <source>
-    *: "Mar"
+    *: none
+    recording: "Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
-    *: "Mar"
+    *: none
+    recording: "Microphone"
+    h100,h120,h300: "Internal Microphone"
   </dest>
   <voice>
-    *: "March"
+    *: none
+    recording: "Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_APRIL
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_RECORDING_SRC_DIGITAL
+  desc: in the recording settings
   user:
   <source>
-    *: "Apr"
+    *: none
+    recording: "Digital"
   </source>
   <dest>
-    *: "Apr"
+    *: none
+    recording: "Digital"
   </dest>
   <voice>
-    *: "April"
+    *: none
+    recording: "Digital"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_MAY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_LINE_IN
+  desc: in the recording settings
   user:
   <source>
-    *: "May"
+    *: none
+    recording,player: "Line In"
   </source>
   <dest>
-    *: "May"
+    *: none
+    recording,player: "Line In"
   </dest>
   <voice>
-    *: "May"
+    *: none
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JUNE
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_RECORDING_EDITABLE
+  desc: Editable recordings setting
   user:
   <source>
-    *: "Jun"
+    *: none
+    recording_hwcodec: "Independent Frames"
   </source>
   <dest>
-    *: "Jun"
+    *: none
+    recording_hwcodec: "Independent Frames"
   </dest>
   <voice>
-    *: "June"
+    *: none
+    recording_hwcodec: "Independent Frames"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JULY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_RECORD_TIMESPLIT
+  desc: Record split menu
   user:
   <source>
-    *: "Jul"
+    *: none
+    recording: "File Split Options"
   </source>
   <dest>
-    *: "Jul"
+    *: none
+    recording: "File Split Options"
   </dest>
   <voice>
-    *: "July"
+    *: none
+    recording: "File Split Options"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_AUGUST
-  desc: Maximum 3-letter abbreviation for monthname
-  user:
+  id: LANG_SPLIT_MEASURE
+  desc: in record timesplit options
   <source>
-    *: "Aug"
+    *: none
+    recording: "Split Measure"
   </source>
   <dest>
-    *: "Aug"
+    *: none
+    recording: "Split Measure"
   </dest>
   <voice>
-    *: "August"
+    *: none
+    recording: "Split Measure"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_SEPTEMBER
-  desc: Maximum 3-letter abbreviation for monthname
-  user:
+  id: LANG_SPLIT_TYPE
+  desc: in record timesplit options
   <source>
-    *: "Sep"
+    *: none
+    recording: "What to do when Splitting"
   </source>
   <dest>
-    *: "Sep"
+    *: none
+    recording: "What to do when Splitting"
   </dest>
   <voice>
-    *: "September"
+    *: none
+    recording: "What to do when Splitting"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_OCTOBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_START_NEW_FILE
+  desc: in record timesplit options
   user:
   <source>
-    *: "Oct"
+    *: none
+    recording: "Start new file"
   </source>
   <dest>
-    *: "Oct"
+    *: none
+    recording: "Start new file"
   </dest>
   <voice>
-    *: "October"
+    *: none
+    recording: "Start new file"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_NOVEMBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_STOP_RECORDING
+  desc: in record timesplit options
   user:
   <source>
-    *: "Nov"
+    *: none
+    recording: "Stop recording"
   </source>
   <dest>
-    *: "Nov"
+    *: none
+    recording: "Stop recording"
   </dest>
   <voice>
-    *: "November"
+    *: none
+    recording: "Stop recording"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_DECEMBER
-  desc: Maximum 3-letter abbreviation for monthname
-  user:
+  id: LANG_SPLIT_TIME
+  desc: in record timesplit options
   <source>
-    *: "Dec"
+    *: none
+    recording: "Split Time"
   </source>
   <dest>
-    *: "Dec"
+    *: none
+    recording: "Split Time"
   </dest>
   <voice>
-    *: "December"
+    *: none
+    recording: "Split Time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_ZERO
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_SPLIT_SIZE
+  desc: in record timesplit options
   <source>
-    *: ""
+    *: none
+    recording: "Split Filesize"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Split Filesize"
   </dest>
   <voice>
-    *: "0"
+    *: none
+    recording: "Split Filesize"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_ONE
-  desc: spoken only, for composing numbers
+  id: LANG_REC_SIZE
+  desc: in record timesplit options
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Filesize"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Filesize"
   </dest>
   <voice>
-    *: "1"
+    *: none
+    recording: "Filesize"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_TWO
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_PRERECORD_TIME
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Prerecord Time"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Prerecord Time"
   </dest>
   <voice>
-    *: "2"
+    *: none
+    recording: "Pre-Record time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_THREE
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_DIRECTORY
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Directory"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Directory"
   </dest>
   <voice>
-    *: "3"
+    *: none
+    recording: "Directory"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FOUR
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_CURRENT_DIR
+  desc: in recording directory options
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Current Directory"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Current Directory"
   </dest>
   <voice>
-    *: "4"
+    *: none
+    recording: "Current directory"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FIFE
-  desc: spoken only, for composing numbers
+  id: LANG_SET_AS_REC_DIR
+  desc: used in the onplay menu to set a recording dir
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Set As Recording Directory"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Set As Recording Directory"
   </dest>
   <voice>
-    *: "5"
+    *: none
+    recording: "Set As Recording Directory"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SIX
-  desc: spoken only, for composing numbers
+  id: LANG_CLEAR_REC_DIR
+  desc:
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Clear Recording Directory"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Clear Recording Directory"
   </dest>
   <voice>
-    *: "6"
+    *: none
+    recording: "Clear Recording Directory"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SEVEN
-  desc: spoken only, for composing numbers
+  id: LANG_REC_DIR_NOT_WRITABLE
+  desc:
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Can't write to recording directory"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Can't write to recording directory"
   </dest>
   <voice>
-    *: "7"
+    *: none
+    recording: "Can't write to recording directory"
   </voice>
 </phrase>
+
 <phrase>
-  id: VOICE_EIGHT
-  desc: spoken only, for composing numbers
+  id: LANG_CLIP_LIGHT
+  desc: in record settings menu.
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Clipping Light"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Clipping Light"
   </dest>
   <voice>
-    *: "8"
+    *: none
+    recording: "Clipping Light"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_NINE
-  desc: spoken only, for composing numbers
+  id: LANG_MAIN_UNIT
+  desc: in record settings menu.
   user:
   <source>
-    *: ""
+    *: none
+    remote: "Main Unit Only"
   </source>
   <dest>
-    *: ""
+    *: none
+    remote: "Main Unit Only"
   </dest>
   <voice>
-    *: "9"
+    *: none
+    remote: "Main unit only"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_TEN
-  desc: spoken only, for composing numbers
+  id: LANG_REMOTE_UNIT
+  desc: in record settings menu.
   user:
   <source>
-    *: ""
+    *: none
+    remote: "Remote Unit Only"
   </source>
   <dest>
-    *: ""
+    *: none
+    remote: "Remote Unit Only"
   </dest>
   <voice>
-    *: "10"
+    *: none
+    remote: "Remote unit only"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_ELEVEN
-  desc: spoken only, for composing numbers
+  id: LANG_REMOTE_MAIN
+  desc: in record settings menu.
   user:
   <source>
-    *: ""
+    *: none
+    remote: "Main and Remote Unit"
   </source>
   <dest>
-    *: ""
+    *: none
+    remote: "Main and Remote Unit"
   </dest>
   <voice>
-    *: "11"
+    *: none
+    remote: "Main and remote unit"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_TWELVE
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_TRIGGER
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Trigger"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Trigger"
   </dest>
   <voice>
-    *: "12"
+    *: none
+    recording: "Trigger"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_THIRTEEN
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_TRIG_NOREARM
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Once"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Once"
   </dest>
   <voice>
-    *: "13"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FOURTEEN
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_RECORD_TRIGGER_TYPE
+  desc: in recording trigger menu
   <source>
-    *: ""
+    *: none
+    recording: "Trigtype"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Trigtype"
   </dest>
   <voice>
-    *: "14"
+    *: none
+    recording: "Trigtype"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FIFTEEN
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_RECORD_TRIGGER_NEWFILESTP
+  desc: trigger types
   <source>
-    *: ""
+    *: none
+    recording: "New file"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "New file"
   </dest>
   <voice>
-    *: "15"
+    *: none
+    recording: "New file"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SIXTEEN
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_RECORD_TRIGGER_STOP
+  desc: trigger types
   <source>
-    *: ""
+    *: none
+    recording: "Stop"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Stop"
   </dest>
   <voice>
-    *: "16"
+    *: none
+    recording: "Stop"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SEVENTEEN
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_START_THRESHOLD
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Start Above"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Start Above"
   </dest>
   <voice>
-    *: "17"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EIGHTEEN
-  desc: spoken only, for composing numbers
+  id: LANG_MIN_DURATION
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "for at least"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "for at least"
   </dest>
   <voice>
-    *: "18"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_NINETEEN
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_STOP_THRESHOLD
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Stop Below"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Stop Below"
   </dest>
   <voice>
-    *: "19"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_TWENTY
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_STOP_GAP
+  desc: in recording settings_menu
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Presplit Gap"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Presplit Gap"
   </dest>
   <voice>
-    *: "20"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_THIRTY
-  desc: spoken only, for composing numbers
+  id: LANG_RECORD_PRERECORD
+  desc: in recording and radio screen
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Pre-Recording"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Pre-Recording"
   </dest>
   <voice>
-    *: "30"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FORTY
-  desc: spoken only, for composing numbers
+  id: LANG_RECORDING_LEFT
+  desc: in the recording screen
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Gain Left"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Gain Left"
   </dest>
   <voice>
-    *: "40"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FIFTY
-  desc: spoken only, for composing numbers
+  id: LANG_RECORDING_RIGHT
+  desc: in the recording screen
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Gain Right"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Gain Right"
   </dest>
   <voice>
-    *: "50"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SIXTY
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_RECORD_AGC_PRESET
+  desc: automatic gain control in record settings
   <source>
-    *: ""
+    *: none
+    agc: "Automatic Gain Control"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "Automatic Gain Control"
   </dest>
   <voice>
-    *: "60"
+    *: none
+    agc: "Automatic gain control"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SEVENTY
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_AGC_SAFETY
+  desc: AGC preset
   <source>
-    *: ""
+    *: none
+    agc: "Safety (clip)"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "Safety (clip)"
   </dest>
   <voice>
-    *: "70"
+    *: none
+    agc: "Safety (clip)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EIGHTY
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_AGC_LIVE
+  desc: AGC preset
   <source>
-    *: ""
+    *: none
+    agc: "Live (slow)"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "Live (slow)"
   </dest>
   <voice>
-    *: "80"
+    *: none
+    agc: "Live (slow)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_NINETY
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_AGC_DJSET
+  desc: AGC preset
   <source>
-    *: ""
+    *: none
+    agc: "DJ-Set (slow)"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "DJ-Set (slow)"
   </dest>
   <voice>
-    *: "90"
+    *: none
+    agc: "DJ set (slow)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_HUNDRED
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_AGC_MEDIUM
+  desc: AGC preset
   <source>
-    *: ""
+    *: none
+    agc: "Medium"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "Medium"
   </dest>
   <voice>
-    *: "hundred"
+    *: none
+    agc: "Medium"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_THOUSAND
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_AGC_VOICE
+  desc: AGC preset
   <source>
-    *: ""
+    *: none
+    agc: "Voice (fast)"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "Voice (fast)"
   </dest>
   <voice>
-    *: "thousand"
+    *: none
+    agc: "Voice (fast)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MILLION
-  desc: spoken only, for composing numbers
-  user:
+  id: LANG_RECORD_AGC_CLIPTIME
+  desc: in record settings
   <source>
-    *: ""
+    *: none
+    agc: "AGC clip time"
   </source>
   <dest>
-    *: ""
+    *: none
+    agc: "AGC clip time"
   </dest>
   <voice>
-    *: "million"
+    *: none
+    agc: "AGC clip time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_BILLION
-  desc: spoken only, for composing numbers
+  id: LANG_REMOTE_LCD_OFF
+  desc: Remote lcd off splash in recording screen
   user:
   <source>
-    *: ""
+    *: none
+    remote: "Remote Display OFF"
   </source>
   <dest>
-    *: ""
+    *: none
+    remote: "Remote Display OFF"
   </dest>
   <voice>
-    *: "billion"
+    *: none
+    remote: "Remote Display OFF"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MINUS
-  desc: spoken only, for composing numbers
+  id: LANG_REMOTE_LCD_ON
+  desc: Remote lcd off splash in recording screen
   user:
   <source>
-    *: ""
+    *: none
+    remote: "(Vol- : Re-enable)"
   </source>
   <dest>
-    *: ""
+    *: none
+    remote: "(Vol- : Re-enable)"
   </dest>
   <voice>
-    *: "minus"
+    *: none
+    remote: "(Vol- : Re-enable)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PLUS
-  desc: spoken only, for composing numbers
+  id: LANG_CREATE_PLAYLIST
+  desc: Menu option for creating a playlist
   user:
   <source>
-    *: ""
+    *: "Create Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Create Playlist"
   </dest>
   <voice>
-    *: "plus"
+    *: "Create Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MILLISECONDS
-  desc: spoken only, a unit postfix
+  id: LANG_PLAYLISTVIEWER_SETTINGS
+  desc: title for the playlist viewer settings menus
   user:
   <source>
-    *: ""
+    *: "Playlist Viewer Settings"
   </source>
   <dest>
-    *: ""
+    *: "Playlist Viewer Settings"
   </dest>
   <voice>
-    *: "milliseconds"
+    *: "Playlist Viewer Settings"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SECOND
-  desc: spoken only, a unit postfix
+  id: LANG_VIEW_DYNAMIC_PLAYLIST
+  desc: in playlist menu.
   user:
   <source>
-    *: ""
+    *: "View Current Playlist"
   </source>
   <dest>
-    *: ""
+    *: "View Current Playlist"
   </dest>
   <voice>
-    *: "second"
+    *: "View Current Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_SECONDS
-  desc: spoken only, a unit postfix
+  id: LANG_MOVE
+  desc: The verb/action Move
   user:
   <source>
-    *: ""
+    *: "Move"
   </source>
   <dest>
-    *: ""
+    *: "Move"
   </dest>
   <voice>
-    *: "seconds"
+    *: "Move"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MINUTE
-  desc: spoken only, a unit postfix
+  id: LANG_SHOW_INDICES
+  desc: in playlist viewer menu
   user:
   <source>
-    *: ""
+    *: "Show Indices"
   </source>
   <dest>
-    *: ""
+    *: "Show Indices"
   </dest>
   <voice>
-    *: "minute"
+    *: "Show Indices"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MINUTES
-  desc: spoken only, a unit postfix
+  id: LANG_TRACK_DISPLAY
+  desc: in playlist viewer on+play menu
   user:
   <source>
-    *: ""
+    *: "Track Display"
   </source>
   <dest>
-    *: ""
+    *: "Track Display"
   </dest>
   <voice>
-    *: "minutes"
+    *: "Track Display"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_HOUR
-  desc: spoken only, a unit postfix
+  id: LANG_DISPLAY_TRACK_NAME_ONLY
+  desc: track display options
   user:
   <source>
-    *: ""
+    *: "Track Name Only"
   </source>
   <dest>
-    *: ""
+    *: "Track Name Only"
   </dest>
   <voice>
-    *: "hour"
+    *: "Track Name Only"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_HOURS
-  desc: spoken only, a unit postfix
+  id: LANG_REMOVE
+  desc: in playlist viewer on+play menu
   user:
   <source>
-    *: ""
+    *: "Remove"
   </source>
   <dest>
-    *: ""
+    *: "Remove"
   </dest>
   <voice>
-    *: "hours"
+    *: "Remove"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_KHZ
-  desc: spoken only, a unit postfix
+  id: LANG_SAVE_DYNAMIC_PLAYLIST
+  desc: in playlist menu.
   user:
   <source>
-    *: ""
+    *: "Save Current Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Save Current Playlist"
   </dest>
   <voice>
-    *: "kilohertz"
+    *: "Save Current Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_DB
-  desc: spoken only, a unit postfix
+  id: LANG_PLAYLIST_SAVE_COUNT
+  desc: splash number of tracks saved
   user:
   <source>
-    *: ""
+    *: "Saved %d tracks (%s)"
   </source>
   <dest>
-    *: ""
+    *: "Saved %d tracks (%s)"
   </dest>
   <voice>
-    *: "decibel"
-  </voice>
-</phrase>
-<phrase>
-  id: VOICE_PERCENT
-  desc: spoken only, a unit postfix
-  user:
-  <source>
     *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: "percent"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_MILLIAMPHOURS
-  desc: spoken only, a unit postfix
+  id: LANG_CATALOG
+  desc: in onplay menu
   user:
   <source>
-    *: ""
+    *: "Playlist Catalog"
   </source>
   <dest>
-    *: ""
+    *: "Playlist Catalog"
   </dest>
   <voice>
-    *: "milli-amp hours"
+    *: "Playlist Catalog"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PIXEL
-  desc: spoken only, a unit postfix
+  id: LANG_RECURSE_DIRECTORY
+  desc: In playlist menu
   user:
   <source>
-    *: ""
+    *: "Recursively Insert Directories"
   </source>
   <dest>
-    *: ""
+    *: "Recursively Insert Directories"
   </dest>
   <voice>
-    *: "pixel"
+    *: "Recursively Insert Directories"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PER_SEC
-  desc: spoken only, a unit postfix
+  id: LANG_RECURSE_DIRECTORY_QUESTION
+  desc: Asked from onplay screen
   user:
   <source>
-    *: ""
+    *: "Recursively?"
   </source>
   <dest>
-    *: ""
+    *: "Recursively?"
   </dest>
   <voice>
-    *: "per second"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_HERTZ
-  desc: spoken only, a unit postfix
+  id: LANG_WARN_ERASEDYNPLAYLIST_MENU
+  desc: in playlist options menu, option to warn when erasing dynamic playlist
   user:
   <source>
-    *: ""
+    *: "Warn When Erasing Dynamic Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Warn When Erasing Dynamic Playlist"
   </dest>
   <voice>
-    *: "hertz"
+    *: "Warn When Erasing Dynamic Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BYTE
-  desc: a unit postfix
+  id: LANG_WARN_ERASEDYNPLAYLIST_PROMPT
+  desc: prompt shown when about to erase a modified dynamic playlist
   user:
   <source>
-    *: "B"
+    *: "Erase dynamic playlist?"
   </source>
   <dest>
-    *: "B"
+    *: "Erase dynamic playlist?"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KILOBYTE
-  desc: a unit postfix, also voiced
+  id: LANG_SHUTDOWN
+  desc: in main menu
   user:
   <source>
-    *: "KB"
+    *: none
+    soft_shutdown: "Shut down"
   </source>
   <dest>
-    *: "KB"
+    *: none
+    soft_shutdown: "Shut down"
   </dest>
   <voice>
-    *: "kilobyte"
+    *: none
+    soft_shutdown: "Shut down"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MEGABYTE
-  desc: a unit postfix, also voiced
+  id: LANG_ROCKBOX_INFO
+  desc: displayed topmost on the info screen and in the info menu
   user:
   <source>
-    *: "MB"
+    *: "Rockbox Info"
   </source>
   <dest>
-    *: "MB"
+    *: "Rockbox Info"
   </dest>
   <voice>
-    *: "megabyte"
+    *: "Rockbox Info"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GIGABYTE
-  desc: a unit postfix, also voiced
+  id: LANG_BUFFER_STAT
+  desc: the buffer size, %d MB %d fraction of MB
   user:
   <source>
-    *: "GB"
+    *: "Buffer: %d.%03dMB"
+    player: "Buf: %d.%03dMB"
   </source>
   <dest>
-    *: "GB"
+    *: "Buffer: %d.%03dMB"
+    player: "Buf: %d.%03dMB"
   </dest>
   <voice>
-    *: "gigabyte"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_POINT
-  desc: decimal separator for composing numbers
+  id: LANG_BATTERY_TIME
+  desc: battery level in % and estimated time remaining
   user:
   <source>
-    *: "."
+    *: "Battery: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
-    *: "."
+    *: "Battery: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
-    *: "point"
+    *: "Battery level"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_A
-  desc: spoken only, for spelling
+  id: LANG_DISK_SIZE_INFO
+  desc: disk size info
   user:
   <source>
-    *: ""
+    *: "Disk:"
   </source>
   <dest>
-    *: ""
+    *: "Disk:"
   </dest>
   <voice>
-    *: "A"
-  </voice>
-</phrase>
-<phrase>
-  id: VOICE_CHAR_B
-  desc: spoken only, for spelling
-  user:
-  <source>
     *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: "B"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_C
-  desc: spoken only, for spelling
+  id: LANG_DISK_FREE_INFO
+  desc: disk size info
   user:
   <source>
-    *: ""
+    *: "Free:"
   </source>
   <dest>
-    *: ""
+    *: "Free:"
   </dest>
   <voice>
-    *: "C"
+    *: "Free diskspace:"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_D
-  desc: spoken only, for spelling
+  id: LANG_DISK_NAME_INTERNAL
+  desc: in info menu; name for internal disk with multivolume (keep short!)
   user:
   <source>
-    *: ""
+    *: none
+    multivolume: "Int:"
   </source>
   <dest>
-    *: ""
+    *: none
+    multivolume: "Int:"
   </dest>
   <voice>
-    *: "D"
+    *: none
+    multivolume: "Internal"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_E
-  desc: spoken only, for spelling
+  id: LANG_DISK_NAME_MMC
+  desc: in info menu;  name for external disk with multivolume (Ondio; keep short!)
   user:
   <source>
-    *: ""
+    *: none
+    e200: "mSD:"
+    ondio*: "MMC:"
   </source>
   <dest>
-    *: ""
+    *: none
+    e200: "mSD:"
+    ondio*: "MMC:"
   </dest>
   <voice>
-    *: "E"
+    *: none
+    e200: "micro Secure Digital card:"
+    ondio*: "Multimedia card"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_F
-  desc: spoken only, for spelling
+  id: LANG_VERSION
+  desc: in the info menu
   user:
   <source>
-    *: ""
+    *: "Version"
   </source>
   <dest>
-    *: ""
+    *: "Version"
   </dest>
   <voice>
-    *: "F"
+    *: "Version"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_G
-  desc: spoken only, for spelling
+  id: LANG_RUNNING_TIME
+  desc: in run time screen
   user:
   <source>
-    *: ""
+    *: "Running Time"
   </source>
   <dest>
-    *: ""
+    *: "Running Time"
   </dest>
   <voice>
-    *: "G"
+    *: "Running Time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_H
-  desc: spoken only, for spelling
+  id: LANG_CURRENT_TIME
+  desc: in run time screen
   user:
   <source>
-    *: ""
+    *: "Current Time"
   </source>
   <dest>
-    *: ""
+    *: "Current Time"
   </dest>
   <voice>
-    *: "H"
+    *: "Current Time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_I
-  desc: spoken only, for spelling
+  id: LANG_TOP_TIME
+  desc: in run time screen
   user:
   <source>
-    *: ""
+    *: "Top Time"
   </source>
   <dest>
-    *: ""
+    *: "Top Time"
   </dest>
   <voice>
-    *: "I"
+    *: "Top Time"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_J
-  desc: spoken only, for spelling
+  id: LANG_CLEAR_TIME
+  desc: in run time screen
   user:
   <source>
-    *: ""
+    *: "Clear Time?"
   </source>
   <dest>
-    *: ""
+    *: "Clear Time?"
   </dest>
   <voice>
-    *: "J"
+    *: "Clear Time?"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_K
-  desc: spoken only, for spelling
+  id: LANG_DEBUG
+  desc: in the info menu
   user:
   <source>
-    *: ""
+    *: "Debug (Keep Out!)"
   </source>
   <dest>
-    *: ""
+    *: "Debug (Keep Out!)"
   </dest>
   <voice>
-    *: "K"
+    *: "Debug, keep out!"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_L
-  desc: spoken only, for spelling
+  id: LANG_USB
+  desc: in the info menu
   user:
   <source>
-    *: ""
+    *: none
+    sim: "USB (Sim)"
   </source>
   <dest>
-    *: ""
+    *: none
+    sim: "USB (Sim)"
   </dest>
   <voice>
-    *: "L"
+    *: none
+    sim: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_M
-  desc: spoken only, for spelling
+  id: LANG_PLAYLIST
+  desc: Used when you need to say playlist, also voiced
   user:
   <source>
-    *: ""
+    *: "Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Playlist"
   </dest>
   <voice>
-    *: "M"
+    *: "Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_N
-  desc: spoken only, for spelling
+  id: LANG_INSERT
+  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
   user:
   <source>
-    *: ""
+    *: "Insert"
   </source>
   <dest>
-    *: ""
+    *: "Insert"
   </dest>
   <voice>
-    *: "N"
+    *: "Insert"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_O
-  desc: spoken only, for spelling
+  id: LANG_INSERT_FIRST
+  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
   user:
   <source>
-    *: ""
+    *: "Insert next"
   </source>
   <dest>
-    *: ""
+    *: "Insert next"
   </dest>
   <voice>
-    *: "O"
+    *: "Insert next"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_P
-  desc: spoken only, for spelling
+  id: LANG_INSERT_LAST
+  desc: in onplay menu.  append a track/playlist into dynamic playlist.
   user:
   <source>
-    *: ""
+    *: "Insert last"
   </source>
   <dest>
-    *: ""
+    *: "Insert last"
   </dest>
   <voice>
-    *: "P"
+    *: "Insert last"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_Q
-  desc: spoken only, for spelling
+  id: LANG_INSERT_SHUFFLED
+  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
   user:
   <source>
-    *: ""
+    *: "Insert shuffled"
   </source>
   <dest>
-    *: ""
+    *: "Insert shuffled"
   </dest>
   <voice>
-    *: "Q"
+    *: "Insert shuffled"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_R
-  desc: spoken only, for spelling
+  id: LANG_QUEUE
+  desc: The verb/action Queue
   user:
   <source>
-    *: ""
+    *: "Queue"
   </source>
   <dest>
-    *: ""
+    *: "Queue"
   </dest>
   <voice>
-    *: "R"
+    *: "Queue"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_S
-  desc: spoken only, for spelling
+  id: LANG_QUEUE_FIRST
+  desc: in onplay menu.  queue a track/playlist into dynamic playlist.
   user:
   <source>
-    *: ""
+    *: "Queue next"
   </source>
   <dest>
-    *: ""
+    *: "Queue next"
   </dest>
   <voice>
-    *: "S"
+    *: "Queue next"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_T
-  desc: spoken only, for spelling
+  id: LANG_QUEUE_LAST
+  desc: in onplay menu.  queue a track/playlist at end of playlist.
   user:
   <source>
-    *: ""
+    *: "Queue last"
   </source>
   <dest>
-    *: ""
+    *: "Queue last"
   </dest>
   <voice>
-    *: "T"
+    *: "Queue last"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_U
-  desc: spoken only, for spelling
+  id: LANG_QUEUE_SHUFFLED
+  desc: in onplay menu.  queue a track/playlist randomly into dynamic playlist
   user:
   <source>
-    *: ""
+    *: "Queue shuffled"
   </source>
   <dest>
-    *: ""
+    *: "Queue shuffled"
   </dest>
   <voice>
-    *: "U"
+    *: "Queue shuffled"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_V
-  desc: spoken only, for spelling
+  id: LANG_REPLACE
+  desc: in onplay menu.  Replace the current playlist with a new one.
   user:
   <source>
-    *: ""
+    *: "Play Next"
   </source>
   <dest>
-    *: ""
+    *: "Play Next"
   </dest>
   <voice>
-    *: "V"
+    *: "Play Next"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_W
-  desc: spoken only, for spelling
+  id: LANG_PLAYLIST_INSERT_COUNT
+  desc: splash number of tracks inserted
   user:
   <source>
-    *: ""
+    *: "Inserted %d tracks (%s)"
   </source>
   <dest>
-    *: ""
+    *: "Inserted %d tracks (%s)"
   </dest>
   <voice>
-    *: "W"
-  </voice>
-</phrase>
-<phrase>
-  id: VOICE_CHAR_X
-  desc: spoken only, for spelling
-  user:
-  <source>
     *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: "X"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_Y
-  desc: spoken only, for spelling
+  id: LANG_PLAYLIST_QUEUE_COUNT
+  desc: splash number of tracks queued
   user:
   <source>
-    *: ""
+    *: "Queued %d tracks (%s)"
   </source>
   <dest>
-    *: ""
+    *: "Queued %d tracks (%s)"
   </dest>
   <voice>
-    *: "Y"
-  </voice>
-</phrase>
-<phrase>
-  id: VOICE_CHAR_Z
-  desc: spoken only, for spelling
-  user:
-  <source>
     *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: "Z"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_DOT
-  desc: spoken only, for spelling
+  id: LANG_VIEW
+  desc: in on+play menu
   user:
   <source>
-    *: ""
+    *: "View"
   </source>
   <dest>
-    *: ""
+    *: "View"
   </dest>
   <voice>
-    *: "dot"
+    *: "View"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PAUSE
-  desc: spoken only, for spelling, a split second of silence (difficult to author)
+  id: LANG_SEARCH_IN_PLAYLIST
+  desc: in playlist menu.
   user:
   <source>
-    *: ""
+    *: "Search In Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Search In Playlist"
   </dest>
   <voice>
-    *: " "
+    *: "Search In Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_FILE
-  desc: spoken only, prefix for file number
+  id: LANG_PLAYLIST_SEARCH_MSG
+  desc: splash number of tracks inserted
   user:
   <source>
-    *: ""
+    *: "Searching... %d found (%s)"
   </source>
   <dest>
-    *: ""
+    *: "Searching... %d found (%s)"
   </dest>
   <voice>
-    *: "file"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_DIR
-  desc: spoken only, prefix for directory number
+  id: LANG_SHUFFLE_PLAYLIST
+  desc: in playlist menu, reshuffles the order in which songs are played
   user:
   <source>
-    *: ""
+    *: "Reshuffle"
   </source>
   <dest>
-    *: ""
+    *: "Reshuffle"
   </dest>
   <voice>
-    *: "folder"
+    *: "Reshuffle"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_MPA
-  desc: spoken only, for file extension
+  id: LANG_CATALOG_VIEW
+  desc: in onplay playlist catalog submenu
   user:
   <source>
-    *: ""
+    *: "View Catalog"
   </source>
   <dest>
-    *: ""
+    *: "View Catalog"
   </dest>
   <voice>
-    *: "audio"
+    *: "View Catalog"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_CFG
-  desc: spoken only, for file extension
+  id: LANG_CATALOG_ADD_TO
+  desc: in onplay playlist catalog submenu
   user:
   <source>
-    *: ""
+    *: "Add to Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Add to Playlist"
   </dest>
   <voice>
-    *: "configuration"
+    *: "Add to Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_WPS
-  desc: spoken only, for file extension
+  id: LANG_CATALOG_ADD_TO_NEW
+  desc: in onplay playlist catalog submenu
   user:
   <source>
-    *: ""
+    *: "Add to New Playlist"
   </source>
   <dest>
-    *: ""
+    *: "Add to New Playlist"
   </dest>
   <voice>
-    *: "while-playing-screen"
+    *: "Add to New Playlist"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_TXT
-  desc: spoken only, for file extension
+  id: LANG_CATALOG_NO_DIRECTORY
+  desc: error message when playlist catalog directory doesn't exist
   user:
   <source>
-    *: ""
+    *: "%s doesn't exist"
   </source>
   <dest>
-    *: ""
+    *: "%s doesn't exist"
   </dest>
   <voice>
-    *: "text"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_ROCK
-  desc: spoken only, for file extension
+  id: LANG_CATALOG_NO_PLAYLISTS
+  desc: error message when no playlists for playlist catalog
   user:
   <source>
-    *: ""
+    *: "No Playlists"
   </source>
   <dest>
-    *: ""
+    *: "No Playlists"
   </dest>
   <voice>
-    *: "plugin"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_FONT
-  desc: spoken only, for file extension
+  id: LANG_BOOKMARK_MENU
+  desc: Text on main menu to get to bookmark commands
   user:
   <source>
-    *: ""
+    *: "Bookmarks"
   </source>
   <dest>
-    *: ""
+    *: "Bookmarks"
   </dest>
   <voice>
-    *: "font"
+    *: "Bookmarks"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_BMARK
-  desc: spoken only, for file extension and the word in general
+  id: LANG_BOOKMARK_MENU_CREATE
+  desc: Used off of the bookmark menu to create a bookmark
   user:
   <source>
-    *: ""
+    *: "Create Bookmark"
   </source>
   <dest>
-    *: ""
+    *: "Create Bookmark"
   </dest>
   <voice>
-    *: "bookmark"
+    *: "Create Bookmark"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_UCL
-  desc: spoken only, for file extension
+  id: LANG_BOOKMARK_MENU_LIST
+  desc: Used off of the bookmark menu to list available bookmarks for the currently playing directory or M3U
   user:
   <source>
-    *: ""
+    *: "List Bookmarks"
   </source>
   <dest>
-    *: ""
+    *: "List Bookmarks"
   </dest>
   <voice>
-    *: "flash"
+    *: "List Bookmarks"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_AJZ
-  desc: spoken only, for file extension
+  id: LANG_ONPLAY_MENU_TITLE
+  desc: title for the onplay menus
   user:
   <source>
-    *: ""
+    *: "Context Menu"
   </source>
   <dest>
-    *: ""
+    *: "Context Menu"
   </dest>
   <voice>
-    *: "firmware"
+    *: "Context Menu"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_RWPS
-  desc: spoken only, for file extension
+  id: LANG_MENU_SET_RATING
+  desc: Set the rating of a file in the wps context menu
   user:
   <source>
-    *: ""
+    *: "Menu set rating"
   </source>
   <dest>
-    *: ""
+    *: "Menu set rating"
   </dest>
   <voice>
-    *: "remote while-playing-screen"
+    *: "Menu set rating"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_KBD
-  desc: spoken only, for file extension
+  id: LANG_BROWSE_CUESHEET
+  desc:
   user:
   <source>
-    *: ""
+    *: "Browse Cuesheet"
   </source>
   <dest>
-    *: ""
+    *: "Browse Cuesheet"
   </dest>
   <voice>
-    *: "keyboard"
+    *: "Browse Cuesheet"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_LOAD
-  desc: displayed on screen while loading a playlist
+  id: LANG_MENU_SHOW_ID3_INFO
+  desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Loading..."
+    *: "Show ID3 Info"
   </source>
   <dest>
-    *: "Loading..."
+    *: "Show ID3 Info"
   </dest>
   <voice>
-    *: ""
+    *: "Show ID3 Info"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_SHUFFLE
-  desc: displayed on screen while shuffling a playlist
+  id: LANG_ID3_TITLE
+  desc: in tag viewer
   user:
   <source>
-    *: "Shuffling..."
+    *: "[Title]"
   </source>
   <dest>
-    *: "Shuffling..."
+    *: "[Title]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_BUFFER_FULL
-  desc: in playlist.indices() when playlist is full
+  id: LANG_ID3_ARTIST
+  desc: in tag viewer
   user:
   <source>
-    *: "Playlist Buffer Full"
+    *: "[Artist]"
   </source>
   <dest>
-    *: "Playlist Buffer Full"
+    *: "[Artist]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_END_PLAYLIST_PLAYER
-  desc: DEPRECATED
+  id: LANG_ID3_ALBUM
+  desc: in tag viewer
   user:
   <source>
-    *: ""
+    *: "[Album]"
   </source>
   <dest>
-    *: deprecated
+    *: "[Album]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_END_PLAYLIST_RECORDER
-  desc: when playlist has finished
+  id: LANG_ID3_TRACKNUM
+  desc: in tag viewer
   user:
   <source>
-    *: "End of Song List"
-    player: "End of List"
+    *: "[Tracknum]"
   </source>
   <dest>
-    *: "End of Song List"
-    player: "End of List"
+    *: "[Tracknum]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATING
-  desc: Screen feedback during playlist creation
+  id: LANG_ID3_GENRE
+  desc: in tag viewer
   user:
   <source>
-    *: "Creating"
+    *: "[Genre]"
   </source>
   <dest>
-    *: "Creating"
+    *: "[Genre]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_INSERT_COUNT
-  desc: splash number of tracks inserted
+  id: LANG_ID3_YEAR
+  desc: in tag viewer
   user:
   <source>
-    *: "Inserted %d tracks (%s)"
+    *: "[Year]"
   </source>
   <dest>
-    *: "Inserted %d tracks (%s)"
+    *: "[Year]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_QUEUE_COUNT
-  desc: splash number of tracks queued
+  id: LANG_ID3_LENGTH
+  desc: in tag viewer
   user:
   <source>
-    *: "Queued %d tracks (%s)"
+    *: "[Length]"
   </source>
   <dest>
-    *: "Queued %d tracks (%s)"
+    *: "[Length]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_SAVE_COUNT
-  desc: splash number of tracks saved
+  id: LANG_ID3_PLAYLIST
+  desc: in tag viewer
   user:
   <source>
-    *: "Saved %d tracks (%s)"
+    *: "[Playlist]"
   </source>
   <dest>
-    *: "Saved %d tracks (%s)"
+    *: "[Playlist]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECURSE_DIRECTORY_QUESTION
-  desc: Asked from onplay screen
+  id: LANG_ID3_BITRATE
+  desc: in tag viewer
   user:
   <source>
-    *: "Recursively?"
+    *: "[Bitrate]"
   </source>
   <dest>
-    *: "Recursively?"
+    *: "[Bitrate]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARN_ERASEDYNPLAYLIST_PROMPT
-  desc: prompt shown when about to erase a modified dynamic playlist
+  id: LANG_ID3_ALBUMARTIST
+  desc: in tag viewer
   user:
   <source>
-    *: "Erase dynamic playlist?"
+    *: "[Album Artist]"
   </source>
   <dest>
-    *: "Erase dynamic playlist?"
+    *: "[Album Artist]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NOTHING_TO_RESUME
-  desc: Error message displayed when resume button pressed but no playlist
+  id: LANG_ID3_COMMENT
+  desc: in tag viewer
   user:
   <source>
-    *: "Nothing to resume"
+    *: "[Comment]"
   </source>
   <dest>
-    *: "Nothing to resume"
+    *: "[Comment]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR
-  desc: Playlist error
+  id: LANG_ID3_VBR
+  desc: in browse_id3
   user:
   <source>
-    *: "Error updating playlist control file"
+    *: " (VBR)"
   </source>
   <dest>
-    *: "Error updating playlist control file"
+    *: " (VBR)"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_ACCESS_ERROR
-  desc: Playlist error
+  id: LANG_ID3_FREQUENCY
+  desc: in tag viewer
   user:
   <source>
-    *: "Error accessing playlist file"
+    *: "[Frequency]"
   </source>
   <dest>
-    *: "Error accessing playlist file"
+    *: "[Frequency]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR
-  desc: Playlist error
+  id: LANG_ID3_TRACK_GAIN
+  desc: in tag viewer
   user:
   <source>
-    *: "Error accessing playlist control file"
+    *: "[Track Gain]"
   </source>
   <dest>
-    *: "Error accessing playlist control file"
+    *: "[Track Gain]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR
-  desc: Playlist error
+  id: LANG_ID3_ALBUM_GAIN
+  desc: in tag viewer
   user:
   <source>
-    *: "Error accessing directory"
+    *: "[Album Gain]"
   </source>
   <dest>
-    *: "Error accessing directory"
+    *: "[Album Gain]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_INVALID
-  desc: Playlist resume error
+  id: LANG_ID3_PATH
+  desc: in tag viewer
   user:
   <source>
-    *: "Playlist control file is invalid"
+    *: "[Path]"
   </source>
   <dest>
-    *: "Playlist control file is invalid"
+    *: "[Path]"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_STATION
-  desc: in radio screen
+  id: LANG_ID3_NO_INFO
+  desc: in tag viewer
   user:
   <source>
-    *: "Station: %d.%02d MHz"
+    *: "<No Info>"
   </source>
   <dest>
-    *: "Station: %d.%02d MHz"
+    *: "<No Info>"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_NO_PRESETS
-  desc: error when preset list is empty
+  id: LANG_RENAME
+  desc: The verb/action Rename
   user:
   <source>
-    *: "No presets"
+    *: "Rename"
   </source>
   <dest>
-    *: "No presets"
+    *: "Rename"
   </dest>
   <voice>
-    *: ""
+    *: "Rename"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_ADD_PRESET
-  desc: in radio menu
+  id: LANG_CUT
+  desc: The verb/action Cut
   user:
   <source>
-    *: "Add Preset"
+    *: "Cut"
   </source>
   <dest>
-    *: "Add Preset"
+    *: "Cut"
   </dest>
   <voice>
-    *: "Add Preset"
+    *: "Cut"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_EDIT_PRESET
-  desc: in radio screen
+  id: LANG_COPY
+  desc: The verb/action Copy
   user:
   <source>
-    *: "Edit Preset"
+    *: "Copy"
   </source>
   <dest>
-    *: "Edit Preset"
+    *: "Copy"
   </dest>
   <voice>
-    *: "Edit Preset"
+    *: "Copy"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_DELETE_PRESET
-  desc: in radio screen
+  id: LANG_PASTE
+  desc: The verb/action Paste
   user:
   <source>
-    *: "Remove Preset"
+    *: "Paste"
   </source>
   <dest>
-    *: "Remove Preset"
+    *: "Paste"
   </dest>
   <voice>
-    *: "Remove Preset"
+    *: "Paste"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_SAVE_FAILED
-  desc: in radio screen
+  id: LANG_REALLY_OVERWRITE
+  desc: The verb/action Paste
   user:
   <source>
-    *: "Preset Save Failed"
+    *: "File/directory exists. Overwrite?"
   </source>
   <dest>
-    *: "Preset Save Failed"
+    *: "File/directory exists. Overwrite?"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_NO_FREE_PRESETS
-  desc: in radio screen
+  id: LANG_DELETE
+  desc: The verb/action Delete
   user:
   <source>
-    *: "The Preset List is Full"
+    *: "Delete"
   </source>
   <dest>
-    *: "The Preset List is Full"
+    *: "Delete"
   </dest>
   <voice>
-    *: ""
+    *: "Delete"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONBAR_MENU
-  desc: in button bar
+  id: LANG_DELETE_DIR
+  desc: in on+play menu
   user:
   <source>
-    *: "Menu"
+    *: "Delete Directory"
   </source>
   <dest>
-    *: "Menu"
+    *: "Delete Directory"
   </dest>
   <voice>
-    *: ""
+    *: "delete directory"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_EXIT
-  desc: in radio screen
+  id: LANG_REALLY_DELETE
+  desc: Really Delete?
   user:
   <source>
-    *: "Exit"
+    *: "Delete?"
   </source>
   <dest>
-    *: "Exit"
+    *: "Delete?"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_ACTION
-  desc: in radio screen
+  id: LANG_COPYING
+  desc:
   user:
   <source>
-    *: "Action"
+    *: "Copying..."
   </source>
   <dest>
-    *: "Action"
+    *: "Copying..."
   </dest>
   <voice>
-    *: ""
+    *: "Copying"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_PRESETS
-  desc: in button bar
+  id: LANG_DELETING
+  desc:
   user:
   <source>
-    *: "Preset"
+    *: "Deleting..."
   </source>
   <dest>
-    *: "Preset"
+    *: "Deleting..."
   </dest>
   <voice>
-    *: ""
+    *: "Deleting"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_ADD
-  desc: in radio screen
+  id: LANG_MOVING
+  desc:
   user:
   <source>
-    *: "Add"
+    *: "Moving..."
   </source>
   <dest>
-    *: "Add"
+    *: "Moving..."
   </dest>
   <voice>
-    *: ""
+    *: "Moving"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_RECORD
-  desc: in radio screen
+  id: LANG_DELETED
+  desc: A file has beed deleted
   user:
   <source>
-    *: "Record"
+    *: "Deleted"
   </source>
   <dest>
-    *: "Record"
+    *: "Deleted"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_MONO_MODE
-  desc: in radio screen
+  id: LANG_SET_AS_BACKDROP
+  desc: text for onplay menu entry
   user:
   <source>
-    *: "Force mono"
+    *: none
+    lcd_non-mono: "Set As Backdrop"
   </source>
   <dest>
-    *: "Force mono"
+    *: none
+    lcd_non-mono: "Set As Backdrop"
   </dest>
   <voice>
-    *: "Force mono"
+    *: none
+    lcd_non-mono: "Set As Backdrop"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_FREEZE
-  desc: splash screen during freeze in radio mode
+  id: LANG_BACKDROP_LOADED
+  desc: text for splash to indicate a new backdrop has been loaded successfully
   user:
   <source>
-    *: "Screen frozen!"
+    *: none
+    lcd_non-mono: "Backdrop Loaded"
   </source>
   <dest>
-    *: "Screen frozen!"
+    *: none
+    lcd_non-mono: "Backdrop Loaded"
   </dest>
   <voice>
-    *: ""
+    *: none
+    lcd_non-mono: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_SCAN_PRESETS
-  desc: in radio menu
+  id: LANG_BACKDROP_FAILED
+  desc: text for splash to indicate a failure to load a bitmap as backdrop
   user:
   <source>
-    *: "Auto-Scan Presets"
+    *: none
+    lcd_non-mono: "Backdrop Failed"
   </source>
   <dest>
-    *: "Auto-Scan Presets"
+    *: none
+    lcd_non-mono: "Backdrop Failed"
   </dest>
   <voice>
-    *: "Auto scan presets"
+    *: none
+    lcd_non-mono: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_CLEAR_PRESETS
-  desc: confirmation if presets can be cleared
+  id: LANG_ONPLAY_OPEN_WITH
+  desc: Onplay open with
   user:
   <source>
-    *: "Clear Current Presets?"
+    *: "Open With..."
   </source>
   <dest>
-    *: "Clear Current Presets?"
+    *: "Open With..."
   </dest>
   <voice>
-    *: ""
+    *: "open with"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_SCANNING
-  desc: during auto scan
+  id: LANG_CREATE_DIR
+  desc: in main menu
   user:
   <source>
-    *: "Scanning %d.%02d MHz"
+    *: "Create Directory"
   </source>
   <dest>
-    *: "Scanning %d.%02d MHz"
+    *: "Create Directory"
   </dest>
   <voice>
-    *: ""
+    *: "Create Directory"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_DEFAULT_PRESET_NAME
-  desc: default preset name for auto scan mode
+  id: LANG_PROPERTIES
+  desc: browser file/dir properties
   user:
   <source>
-    *: "%d.%02d MHz"
+    *: "Properties"
   </source>
   <dest>
-    *: "%d.%02d MHz"
+    *: "Properties"
   </dest>
   <voice>
-    *: ""
+    *: "Properties"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_TUNE_MODE
-  desc: in radio screen / menu
+  id: LANG_PITCH
+  desc: "pitch" in the pitch screen
   user:
   <source>
-    *: "Mode:"
+    *: none
+    pitchscreen: "Pitch"
   </source>
   <dest>
-    *: "Mode:"
+    *: none
+    pitchscreen: "Pitch"
   </dest>
   <voice>
-    *: ""
+    *: none
+    pitchscreen: "Pitch"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RADIO_SCAN_MODE
-  desc: in radio screen / menu
+  id: LANG_PITCH_UP
+  desc: in wps
   user:
   <source>
-    *: "Scan"
+    *: none
+    pitchscreen: "Pitch Up"
   </source>
   <dest>
-    *: "Scan"
+    *: none
+    pitchscreen: "Pitch Up"
   </dest>
   <voice>
-    *: ""
+    *: none
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RADIO_PRESET_MODE
-  desc: in radio screen / menu
+  id: LANG_PITCH_DOWN
+  desc: in wps
   user:
   <source>
-    *: "Preset"
+    *: none
+    pitchscreen: "Pitch Down"
   </source>
   <dest>
-    *: "Preset"
+    *: none
+    pitchscreen: "Pitch Down"
   </dest>
   <voice>
-    *: ""
+    *: none
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRBROWSE_F1
-  desc: in dir browser, F1 button bar text
+  id: LANG_PITCH_UP_SEMITONE
+  desc: in wps
   user:
   <source>
-    *: "Menu"
+    *: none
+    pitchscreen: "Semitone Up"
   </source>
   <dest>
-    *: "Menu"
+    *: none
+    pitchscreen: "Semitone Up"
   </dest>
   <voice>
-    *: ""
+    *: none
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRBROWSE_F2
-  desc: in dir browser, F2 button bar text
+  id: LANG_PITCH_DOWN_SEMITONE
+  desc: in wps
   user:
   <source>
-    *: "Option"
+    *: none
+    pitchscreen: "Semitone Down"
   </source>
   <dest>
-    *: "Option"
+    *: none
+    pitchscreen: "Semitone Down"
   </dest>
   <voice>
-    *: ""
+    *: none
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRBROWSE_F3
-  desc: in dir browser, F3 button bar text
+  id: LANG_PLAYLIST_BUFFER_FULL
+  desc: in playlist.indices() when playlist is full
   user:
   <source>
-    *: "LCD"
+    *: "Playlist Buffer Full"
   </source>
   <dest>
-    *: "LCD"
+    *: "Playlist Buffer Full"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOWDIR_BUFFER_FULL
-  desc: in showdir(), displayed on screen when you reach buffer limit
+  id: LANG_END_PLAYLIST
+  desc: when playlist has finished
   user:
   <source>
-    *: "Dir Buffer is Full!"
+    *: "End of Song List"
+    player: "End of List"
   </source>
   <dest>
-    *: "Dir Buffer is Full!"
+    *: "End of Song List"
+    player: "End of List"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LANGUAGE_LOADED
-  desc: shown when a language has been loaded from the dir browser
+  id: LANG_CREATING
+  desc: Screen feedback during playlist creation
   user:
   <source>
-    *: "New Language"
+    *: "Creating"
   </source>
   <dest>
-    *: "New Language"
+    *: "Creating"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_LOADED
-  desc: Feedback shown when a .cfg file is loaded
+  id: LANG_NOTHING_TO_RESUME
+  desc: Error message displayed when resume button pressed but no playlist
   user:
   <source>
-    *: "Settings Loaded"
+    *: "Nothing to resume"
   </source>
   <dest>
-    *: "Settings Loaded"
+    *: "Nothing to resume"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_SAVED
-  desc: Feedback shown when a .cfg file is saved
+  id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR
+  desc: Playlist error
   user:
   <source>
-    *: "Settings Saved"
+    *: "Error updating playlist control file"
   </source>
   <dest>
-    *: "Settings Saved"
+    *: "Error updating playlist control file"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOT_CHANGED
-  desc: File browser discovered the boot file was changed
+  id: LANG_PLAYLIST_ACCESS_ERROR
+  desc: Playlist error
   user:
   <source>
-    *: "Boot changed"
+    *: "Error accessing playlist file"
   </source>
   <dest>
-    *: "Boot changed"
+    *: "Error accessing playlist file"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REBOOT_NOW
-  desc: Do you want to reboot?
+  id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR
+  desc: Playlist error
   user:
   <source>
-    *: "Reboot now?"
+    *: "Error accessing playlist control file"
   </source>
   <dest>
-    *: "Reboot now?"
+    *: "Error accessing playlist control file"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR
+  desc: Playlist error
   user:
   <source>
-    *: "OFF to abort"
-    h100,h120,h300: "STOP to abort"
-    ipod*: "PLAY/PAUSE to abort"
-    x5: "Long PLAY to abort"
-    h10,h10_5gb: "PREV to abort"
-    e200: "PREV to abort"
+    *: "Error accessing directory"
   </source>
   <dest>
-    *: "OFF to abort"
-    h100,h120,h300: "STOP to abort"
-    ipod*: "PLAY/PAUSE to abort"
-    x5: "Long PLAY to abort"
-    h10,h10_5gb: "PREV to abort"
-    e200: "PREV to abort"
+    *: "Error accessing directory"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STOP_ABORT
-  desc: Used on player models
+  id: LANG_PLAYLIST_CONTROL_INVALID
+  desc: Playlist resume error
   user:
   <source>
-    *: "STOP to abort"
+    *: "Playlist control file is invalid"
   </source>
   <dest>
-    *: "STOP to abort"
+    *: "Playlist control file is invalid"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_FILES
-  desc: in settings_menu
+  id: LANG_SETTINGS_SAVE_FAILED
+  desc: displayed if save settings has failed
   user:
   <source>
-    *: "No files"
+    *: "Save Failed"
   </source>
   <dest>
-    *: "No files"
+    *: "Save Failed"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKDROP_LOADED
-  desc: text for splash to indicate a new backdrop has been loaded successfully
+  id: LANG_SETTINGS_PARTITION
+  desc: if save settings has failed
   user:
   <source>
-    *: "Backdrop Loaded"
+    *: "No partition?"
+    player: "Partition?"
   </source>
   <dest>
-    *: "Backdrop Loaded"
+    *: "No partition?"
+    player: "Partition?"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKDROP_FAILED
-  desc: text for splash to indicate a failure to load a bitmap as backdrop
+  id: LANG_PAUSE
+  desc: in wps and recording trigger menu
   user:
   <source>
-    *: "Backdrop Failed"
+    *: "Pause"
   </source>
   <dest>
-    *: "Backdrop Failed"
+    *: "Pause"
   </dest>
   <voice>
-    *: ""
+    *: "Pause"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYBOARD_LOADED
-  desc: shown when a keyboard has been loaded from the dir browser
+  id: LANG_MODE
+  desc: in wps F2 pressed and radio screen
   user:
   <source>
-    *: "New Keyboard"
+    *: "Mode:"
   </source>
   <dest>
-    *: "New Keyboard"
+    *: "Mode:"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_ARTISTS
-  desc: ID3 virtual folder name
+  id: LANG_TIME
+  desc: Used on the bookmark select window to label elapsed time
   user:
   <source>
-    *: "Artists"
+    *: "Time"
   </source>
   <dest>
-    *: "Artists"
+    *: "Time"
   </dest>
   <voice>
-    *: ""
+    *: "Time"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_ALBUMS
-  desc: ID3 virtual folder name
+  id: LANG_USB_CHARGING
+  desc: in Battery menu
   user:
   <source>
-    *: "Albums"
+    *: none
+    usb_charging: "Charge During USB Connection"
   </source>
   <dest>
-    *: "Albums"
+    *: none
+    usb_charging: "Charge During USB Connection"
   </dest>
   <voice>
-    *: ""
+    *: none
+    usb_charging: "Charge During U S B Connection"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_SONGS
-  desc: ID3 virtual folder name
+  id: LANG_KEYLOCK_ON
+  desc: displayed when key lock is on
   user:
   <source>
-    *: "Songs"
+    *: "Keylock is ON"
+    player: "Key Lock ON"
   </source>
   <dest>
-    *: "Songs"
+    *: "Keylock is ON"
+    player: "Key Lock ON"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_GENRES
-  desc: in tag cache
+  id: LANG_KEYLOCK_OFF
+  desc: displayed when key lock is turned off
   user:
   <source>
-    *: "Genres"
+    *: "Keylock is OFF"
+    player: "Key Lock OFF"
   </source>
   <dest>
-    *: "Genres"
+    *: "Keylock is OFF"
+    player: "Key Lock OFF"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_SEARCH
-  desc: ID3 virtual folder name
+  id: LANG_RECORDING_TIME
+  desc: Display of recorded time
   user:
   <source>
-    *: "Search"
+    *: none
+    recording: "Time:"
   </source>
   <dest>
-    *: "Search"
+    *: none
+    recording: "Time:"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_SEARCH_ARTISTS
-  desc: ID3 virtual folder name
+  id: LANG_DISK_FULL
+  desc: in recording screen
   user:
   <source>
-    *: "Search Artists"
+    *: none
+    recording: "The disk is full. Press STOP to continue."
   </source>
   <dest>
-    *: "Search Artists"
+    *: none
+    recording: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_SEARCH_ALBUMS
-  desc: ID3 virtual folder name
+  id: LANG_DB_INF
+  desc: -inf db for values below measurement
   user:
   <source>
-    *: "Search Albums"
+    *: none
+    recording: "-inf"
   </source>
   <dest>
-    *: "Search Albums"
+    *: none
+    recording: "-inf"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_SEARCH_SONGS
-  desc: ID3 virtual folder name
+  id: LANG_CONFIRM_SHUTDOWN
+  desc: in shutdown screen
   user:
   <source>
-    *: "Search Songs"
+    *: none
+    soft_shutdown: "Press OFF to shut down"
   </source>
   <dest>
-    *: "Search Songs"
+    *: none
+    soft_shutdown: "Press OFF to shut down"
   </dest>
   <voice>
-    *: ""
+    *: none
+    soft_shutdown: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_MATCHES
-  desc: ID3 virtual folder name
+  id: LANG_REMOVE_MMC
+  desc: before acknowledging usb in case an MMC is inserted (Ondio)
   user:
   <source>
-    *: "Found %d matches"
+    *: none
+    ondio*: "Please remove inserted MMC"
   </source>
   <dest>
-    *: "Found %d matches"
+    *: none
+    ondio*: "Please remove inserted MMC"
   </dest>
   <voice>
-    *: ""
+    *: none
+    ondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3DB_ALL_SONGS
-  desc: ID3 virtual folder name
+  id: LANG_BOOT_CHANGED
+  desc: File browser discovered the boot file was changed
   user:
   <source>
-    *: "<All songs>"
+    *: "Boot changed"
   </source>
   <dest>
-    *: "<All songs>"
+    *: "Boot changed"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MOVE
-  desc: The verb/action Move
+  id: LANG_REBOOT_NOW
+  desc: Do you want to reboot?
   user:
   <source>
-    *: "Move"
+    *: "Reboot now?"
   </source>
   <dest>
-    *: "Move"
+    *: "Reboot now?"
   </dest>
   <voice>
-    *: "Move"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MOVE_FAILED
-  desc: Error message displayed in playlist viewer
+  id: LANG_OFF_ABORT
+  desc: Used on recorder models
   user:
   <source>
-    *: "Move Failed"
+    *: "OFF to abort"
+    player,h100,h120,h300: "STOP to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200: "PREV to abort"
   </source>
   <dest>
-    *: "Move Failed"
+    *: "OFF to abort"
+    player,h100,h120,h300: "STOP to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200: "PREV to abort"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_INDICES
-  desc: in playlist viewer menu
+  id: LANG_NO_FILES
+  desc: in settings_menu
   user:
   <source>
-    *: "Show Indices"
+    *: "No files"
   </source>
   <dest>
-    *: "Show Indices"
+    *: "No files"
   </dest>
   <voice>
-    *: "Show Indices"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TRACK_DISPLAY
-  desc: in playlist viewer on+play menu
+  id: LANG_KEYBOARD_LOADED
+  desc: shown when a keyboard has been loaded from the dir browser
   user:
   <source>
-    *: "Track Display"
+    *: "New Keyboard"
   </source>
   <dest>
-    *: "Track Display"
+    *: "New Keyboard"
   </dest>
   <voice>
-    *: "Track Display"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY_TRACK_NAME_ONLY
-  desc: track display options
-  user:
-  <source>
-    *: "Track Name Only"
-  </source>
-  <dest>
-    *: "Track Name Only"
-  </dest>
-  <voice>
-    *: "Track Name Only"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DISPLAY_FULL_PATH
-  desc: track display options
-  user:
-  <source>
-    *: "Full Path"
-  </source>
-  <dest>
-    *: "Full Path"
-  </dest>
-  <voice>
-    *: "Full Path"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REMOVE
-  desc: in playlist viewer on+play menu
-  user:
-  <source>
-    *: "Remove"
-  </source>
-  <dest>
-    *: "Remove"
-  </dest>
-  <voice>
-    *: "Remove"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FILE_OPTIONS
-  desc: in playlist viewer on+play menu
-  user:
-  <source>
-    *: "File Options"
-  </source>
-  <dest>
-    *: "File Options"
-  </dest>
-  <voice>
-    *: "File Options"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PLUGIN_CANT_OPEN
   desc: Plugin open error message
   user:
@@ -8333,1517 +8554,1253 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILETYPES_PLUGIN_NAME_LONG
-  desc: Viewer plugin name too long
+  id: LANG_SHOWDIR_BUFFER_FULL
+  desc: in showdir(), displayed on screen when you reach buffer limit
   user:
   <source>
-    *: "Plugin name too long"
+    *: "Dir Buffer is Full!"
   </source>
   <dest>
-    *: "Plugin name too long"
+    *: "Dir Buffer is Full!"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILETYPES_STRING_BUFFER_EMPTY
-  desc: Filetype string buffer empty
+  id: LANG_INVALID_FILENAME
+  desc: "invalid filename entered" error message
   user:
   <source>
-    *: "Filetype string buffer empty"
+    *: "Invalid Filename!"
   </source>
   <dest>
-    *: "Filetype string buffer empty"
+    *: "Invalid Filename!"
   </dest>
   <voice>
-    *: ""
+    *: "Invalid Filename"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME_CONFIRM_PLAYER
-  desc: possible answers to resume question
+  id: LANG_FILETYPES_PLUGIN_NAME_LONG
+  desc: Viewer plugin name too long
   user:
   <source>
-    *: "(PLAY/STOP)"
+    *: "Plugin name too long"
   </source>
   <dest>
-    *: "(PLAY/STOP)"
+    *: "Plugin name too long"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_LOAD
-  desc: load preset list in fm radio
+  id: LANG_FILETYPES_STRING_BUFFER_FULL
+  desc: Filetype string buffer full
   user:
   <source>
-    *: "Load Preset List"
+    *: "Filetype string buffer full"
   </source>
   <dest>
-    *: "Load Preset List"
+    *: "Filetype string buffer full"
   </dest>
   <voice>
-    *: "Load Preset List"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_SAVE
-  desc: Save preset list in fm radio
+  id: LANG_RESTARTING_PLAYBACK
+  desc: splash screen displayed when pcm buffer size is changed
   user:
   <source>
-    *: "Save Preset List"
+    *: none
+    swcodec: "Restarting playback..."
   </source>
   <dest>
-    *: "Save Preset List"
+    *: none
+    swcodec: "Restarting playback..."
   </dest>
   <voice>
-    *: "Save Preset List"
+    *: none
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_CLEAR
-  desc: clear preset list in fm radio
+  id: LANG_PLEASE_REBOOT
+  desc: when activating an option that requires a reboot
   user:
   <source>
-    *: "Clear Preset List"
+    *: "Please reboot to enable"
   </source>
   <dest>
-    *: "Clear Preset List"
+    *: "Please reboot to enable"
   </dest>
   <voice>
-    *: "Clear Preset List"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FMR
-  desc: Used when you need to say Preset List, also voiced
+  id: LANG_BATTERY_CHARGE
+  desc: tells that the battery is charging, instead of battery level
   user:
   <source>
-    *: "Preset List"
+    *: none
+    charging: "Battery: Charging"
   </source>
   <dest>
-    *: "Preset List"
+    *: none
+    charging: "Battery: Charging"
   </dest>
   <voice>
-    *: "Preset List"
+    *: none
+    charging: "Charging"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_FIRST_AUTOSCAN
-  desc: When you run the radio without an fmr file in settings
+  id: LANG_BATTERY_TOPOFF_CHARGE
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user:
   <source>
-    *: "No settings found. Autoscan?"
+    *: none
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
-    *: "No settings found. Autoscan?"
+    *: none
+    recorder: "Battery: Top-Off Chg"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_SAVE_CHANGES
-  desc: When you try to exit radio to confirm save
+  id: LANG_BATTERY_TRICKLE_CHARGE
+  desc: in info display, shows that trickle charge is running
   user:
   <source>
-    *: "Save Changes?"
+    *: none
+    charging: "Battery: Trickle Chg"
   </source>
   <dest>
-    *: "Save Changes?"
+    *: none
+    charging: "Battery: Trickle Chg"
   </dest>
   <voice>
-    *: ""
+    *: none
+    charging: "Trickle charge"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PIXELS
-  desc: In the settings menu
-  user:
-  <source>
-    *: "pixels"
-  </source>
-  <dest>
-    *: "pixels"
-  </dest>
-  <voice>
-    *: "pixels"
-  </voice>
-</phrase>
 <phrase>
-  id: LANG_CROSSFEED_DIRECT_GAIN
-  desc: in crossfeed settings
+  id: LANG_WARNING_BATTERY_LOW
+  desc: general warning
   user:
   <source>
-    *: "Direct Gain"
+    *: "WARNING! Low Battery!"
   </source>
   <dest>
-    *: "Direct Gain"
+    *: "WARNING! Low Battery!"
   </dest>
   <voice>
-    *: "Direct gain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFEED_CROSS_GAIN
-  desc: in crossfeed settings
-  <source>
-    *: "Cross Gain"
-  </source>
-  <dest>
-    *: "Cross Gain"
-  </dest>
-  <voice>
-    *: "Cross gain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFEED_HF_ATTENUATION
-  desc: in crossfeed settings
-  <source>
-    *: "High-Frequency Attenuation"
-  </source>
-  <dest>
-    *: "High-Frequency Attenuation"
-  </dest>
-  <voice>
-    *: "High-frequency attenuation"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CROSSFEED_HF_CUTOFF
-  desc: in crossfeed settings
-  <source>
-    *: "High-Frequency Cutoff"
-  </source>
-  <dest>
-    *: "High-Frequency Cutoff"
-  </dest>
-  <voice>
-    *: "High-frequency cutoff"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_UNIT_HERTZ
-  desc: in sound settings
-  <source>
-    *: "Hz"
-  </source>
-  <dest>
-    *: "Hz"
-  </dest>
-  <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_BUSY
-  desc: when trying to shutdown and tagcache is committing
-  <source>
-    *: "Database is not ready"
-  </source>
-  <dest>
-    *: "Database is not ready"
-  </dest>
-  <voice>
-    *: "Database is not ready"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  id: LANG_WARNING_BATTERY_EMPTY
+  desc: general warning
   user:
   <source>
-    *: "<All tracks>"
+    *: "Battery empty! RECHARGE!"
   </source>
   <dest>
-    *: "<All tracks>"
+    *: "Battery empty! RECHARGE!"
   </dest>
   <voice>
-    *: "All tracks"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVALID_FILENAME
-  desc: "invalid filename entered" error message
+  id: LANG_BYTE
+  desc: a unit postfix
   user:
   <source>
-    *: "Invalid Filename!"
+    *: "B"
   </source>
   <dest>
-    *: "Invalid Filename!"
+    *: "B"
   </dest>
   <voice>
-    *: "Invalid Filename"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_SCROLL_SETS
-  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  id: LANG_KILOBYTE
+  desc: a unit postfix, also voiced
   user:
   <source>
-    *: "Remote Scrolling Options"
+    *: "KB"
   </source>
   <dest>
-    *: "Remote Scrolling Options"
+    *: "KB"
   </dest>
   <voice>
-    *: "Remote Scrolling Options"
+    *: "kilobyte"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_UPDATE
-  desc: in tag cache settings
+  id: LANG_MEGABYTE
+  desc: a unit postfix, also voiced
   user:
   <source>
-    *: "Update Now"
+    *: "MB"
   </source>
   <dest>
-    *: "Update Now"
+    *: "MB"
   </dest>
   <voice>
-    *: "Update Now"
+    *: "megabyte"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_AUTOUPDATE
-  desc: in tag cache settings
+  id: LANG_GIGABYTE
+  desc: a unit postfix, also voiced
   user:
   <source>
-    *: "Auto Update"
+    *: "GB"
   </source>
   <dest>
-    *: "Auto Update"
+    *: "GB"
   </dest>
   <voice>
-    *: "Auto Update"
+    *: "gigabyte"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_EXPORT
-  desc: in tag cache settings
+  id: LANG_POINT
+  desc: decimal separator for composing numbers
   user:
   <source>
-    *: "Export Modifications"
+    *: "."
   </source>
   <dest>
-    *: "Export Modifications"
+    *: "."
   </dest>
   <voice>
-    *: "Export Modifications"
+    *: "point"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG
-  desc: in onplay menu
+  id: VOICE_ZERO
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Playlist Catalog"
+    *: ""
   </source>
   <dest>
-    *: "Playlist Catalog"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist Catalog"
+    *: "0"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_ADD_TO
-  desc: in onplay playlist catalog submenu
+  id: VOICE_ONE
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Add to Playlist"
+    *: ""
   </source>
   <dest>
-    *: "Add to Playlist"
+    *: ""
   </dest>
   <voice>
-    *: "Add to Playlist"
+    *: "1"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_ADD_TO_NEW
-  desc: in onplay playlist catalog submenu
+  id: VOICE_TWO
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Add to New Playlist"
+    *: ""
   </source>
   <dest>
-    *: "Add to New Playlist"
+    *: ""
   </dest>
   <voice>
-    *: "Add to New Playlist"
+    *: "2"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_VIEW
-  desc: in onplay playlist catalog submenu
+  id: VOICE_THREE
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "View Catalog"
+    *: ""
   </source>
   <dest>
-    *: "View Catalog"
+    *: ""
   </dest>
   <voice>
-    *: "View Catalog"
+    *: "3"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_NO_DIRECTORY
-  desc: error message when playlist catalog directory doesn't exist
+  id: VOICE_FOUR
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "%s doesn't exist"
-  </source>
-  <dest>
-    *: "%s doesn't exist"
-  </dest>
-  <voice>
     *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CATALOG_NO_PLAYLISTS
-  desc: error message when no playlists for playlist catalog
-  user:
-  <source>
-    *: "No Playlists"
   </source>
   <dest>
-    *: "No Playlists"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "4"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_IMPORT
-  desc: in tag cache settings
+  id: VOICE_FIFE
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Import Modifications"
+    *: ""
   </source>
   <dest>
-    *: "Import Modifications"
+    *: ""
   </dest>
   <voice>
-    *: "Import Modifications"
+    *: "5"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPLIT_MEASURE
-  desc: in record timesplit options
-  <source>
-    *: "Split Measure"
-  </source>
-  <dest>
-    *: "Split Measure"
-  </dest>
-  <voice>
-    *: "Split Measure"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SPLIT_TYPE
-  desc: in record timesplit options
-  <source>
-    *: "What to do when Splitting"
-  </source>
-  <dest>
-    *: "What to do when Splitting"
-  </dest>
-  <voice>
-    *: "What to do when Splitting"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SPLIT_TIME
-  desc: in record timesplit options
-  <source>
-    *: "Split Time"
-  </source>
-  <dest>
-    *: "Split Time"
-  </dest>
-  <voice>
-    *: "Split Time"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SPLIT_SIZE
-  desc: in record timesplit options
-  <source>
-    *: "Split Filesize"
-  </source>
-  <dest>
-    *: "Split Filesize"
-  </dest>
-  <voice>
-    *: "Split Filesize"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REC_TIME
-  desc: in record timesplit options
+  id: VOICE_SIX
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Time"
+    *: ""
   </source>
   <dest>
-    *: "Time"
+    *: ""
   </dest>
   <voice>
-    *: "Time"
+    *: "6"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REC_SIZE
-  desc: in record timesplit options
+  id: VOICE_SEVEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Filesize"
+    *: ""
   </source>
   <dest>
-    *: "Filesize"
+    *: ""
   </dest>
   <voice>
-    *: "Filesize"
+    *: "7"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_START_NEW_FILE
-  desc: in record timesplit options
+  id: VOICE_EIGHT
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Start new file"
+    *: ""
   </source>
   <dest>
-    *: "Start new file"
+    *: ""
   </dest>
   <voice>
-    *: "Start new file"
+    *: "8"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STOP_RECORDING
-  desc: in record timesplit options
+  id: VOICE_NINE
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Stop recording"
+    *: ""
   </source>
   <dest>
-    *: "Stop recording"
+    *: ""
   </dest>
   <voice>
-    *: "Stop recording"
+    *: "9"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_LCD_OFF
-  desc: Remote lcd off splash
+  id: VOICE_TEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Remote Display OFF"
+    *: ""
   </source>
   <dest>
-    *: "Remote Display OFF"
+    *: ""
   </dest>
   <voice>
-    *: "Remote Display OFF"
+    *: "10"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_LCD_ON
-  desc: Remote lcd off splash
+  id: VOICE_ELEVEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "(Vol- : Re-enable)"
+    *: ""
   </source>
   <dest>
-    *: "(Vol- : Re-enable)"
+    *: ""
   </dest>
   <voice>
-    *: "(Vol- : Re-enable)"
+    *: "11"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL
-  desc: in lcd settings
+  id: VOICE_TWELVE
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Normal"
+    *: ""
   </source>
   <dest>
-    *: "Normal"
+    *: ""
   </dest>
   <voice>
-    *: "Normal"
+    *: "12"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
-  desc: in lcd settings
+  id: VOICE_THIRTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Backlight (On Hold Key)"
+    *: ""
   </source>
   <dest>
-    *: "Backlight (On Hold Key)"
+    *: ""
   </dest>
   <voice>
-    *: "Backlight on hold key"
+    *: "13"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NEVER
-  desc: in lcd settings
+  id: VOICE_FOURTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Never"
+    *: ""
   </source>
   <dest>
-    *: "Never"
+    *: ""
   </dest>
   <voice>
-    *: "Never"
+    *: "14"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
-  desc: In display settings, time to switch LCD chip into power saving state
+  id: VOICE_FIFTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Sleep (After Backlight Off)"
+    *: ""
   </source>
   <dest>
-    *: "Sleep (After Backlight Off)"
+    *: ""
   </dest>
   <voice>
-    *: "Sleep after backlight off"
+    *: "15"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_SET_BOOL_YES
-  desc: bool true representation
+  id: VOICE_SIXTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Yes"
+    *: ""
   </source>
   <dest>
-    *: "Yes"
+    *: ""
   </dest>
   <voice>
-    *: "Yes"
+    *: "16"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_SET_BOOL_NO
-  desc: bool false representation
+  id: VOICE_SEVENTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "No"
+    *: ""
   </source>
   <dest>
-    *: "No"
+    *: ""
   </dest>
   <voice>
-    *: "No"
+    *: "17"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_ON
-  desc: Used in a lot of places
+  id: VOICE_EIGHTEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "On"
+    *: ""
   </source>
   <dest>
-    *: "On"
+    *: ""
   </dest>
   <voice>
-    *: "On"
+    *: "18"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_OFF
-  desc: Used in a lot of places
+  id: VOICE_NINETEEN
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Off"
+    *: ""
   </source>
   <dest>
-    *: "Off"
+    *: ""
   </dest>
   <voice>
-    *: "Off"
+    *: "19"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_VOLUME
-  desc: in sound_settings
+  id: VOICE_TWENTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Volume"
+    *: ""
   </source>
   <dest>
-    *: "Volume"
+    *: ""
   </dest>
   <voice>
-    *: "Volume"
+    *: "20"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_CHANNEL_STEREO
-  desc: in sound_settings
+  id: VOICE_THIRTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Stereo"
+    *: ""
   </source>
   <dest>
-    *: "Stereo"
+    *: ""
   </dest>
   <voice>
-    *: "Stereo"
+    *: "30"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_CHANNEL_MONO
-  desc: in sound_settings
+  id: VOICE_FORTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Mono"
+    *: ""
   </source>
   <dest>
-    *: "Mono"
+    *: ""
   </dest>
   <voice>
-    *: "Mono"
+    *: "40"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
+  id: VOICE_FIFTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Edit mode: %s"
+    *: ""
   </source>
   <dest>
-    *: "Edit mode: %s"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "50"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
-  desc: in the equalizer settings menu
+  id: VOICE_SIXTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Cutoff Frequency"
+    *: ""
   </source>
   <dest>
-    *: "Cutoff Frequency"
+    *: ""
   </dest>
   <voice>
-    *: "Cutoff Frequency"
+    *: "60"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_EQUALIZER_BAND_GAIN
-  desc: in the equalizer settings menu
+  id: VOICE_SEVENTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Gain"
+    *: ""
   </source>
   <dest>
-    *: "Gain"
+    *: ""
   </dest>
   <voice>
-    *: "Gain"
+    *: "70"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_SHUFFLE
-  desc: in settings_menu
+  id: VOICE_EIGHTY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Shuffle"
+    *: ""
   </source>
   <dest>
-    *: "Shuffle"
+    *: ""
   </dest>
   <voice>
-    *: "Shuffle"
+    *: "80"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_REPEAT
-  desc: in settings_menu
+  id: VOICE_NINETY
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Repeat"
+    *: ""
   </source>
   <dest>
-    *: "Repeat"
+    *: ""
   </dest>
   <voice>
-    *: "Repeat"
+    *: "90"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_REPEAT_ALL
-  desc: repeat playlist once all songs have completed
+  id: VOICE_HUNDRED
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "All"
+    *: ""
   </source>
   <dest>
-    *: "All"
+    *: ""
   </dest>
   <voice>
-    *: "All"
+    *: "hundred"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_REPEAT_ONE
-  desc: repeat one song
+  id: VOICE_THOUSAND
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "One"
+    *: ""
   </source>
   <dest>
-    *: "One"
+    *: ""
   </dest>
   <voice>
-    *: "One"
+    *: "thousand"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_REPEAT_AB
-  desc: repeat one song
+  id: VOICE_MILLION
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "A-B"
+    *: ""
   </source>
   <dest>
-    *: "A-B"
+    *: ""
   </dest>
   <voice>
-    *: "A-B"
+    *: "million"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER
-  desc: setting name for dir filter
+  id: VOICE_BILLION
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Show Files"
+    *: ""
   </source>
   <dest>
-    *: "Show Files"
+    *: ""
   </dest>
   <voice>
-    *: "Show Files"
+    *: "billion"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER_ALL
-  desc: show all files
+  id: VOICE_MINUS
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "All"
+    *: ""
   </source>
   <dest>
-    *: "All"
+    *: ""
   </dest>
   <voice>
-    *: "All"
+    *: "minus"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER_SUPPORTED
-  desc: show all file types supported by Rockbox
+  id: VOICE_PLUS
+  desc: spoken only, for composing numbers
   user:
   <source>
-    *: "Supported"
+    *: ""
   </source>
   <dest>
-    *: "Supported"
+    *: ""
   </dest>
   <voice>
-    *: "Supported"
+    *: "plus"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER_MUSIC
-  desc: show only music-related files
+  id: VOICE_MILLISECONDS
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Music"
+    *: ""
   </source>
   <dest>
-    *: "Music"
+    *: ""
   </dest>
   <voice>
-    *: "Music"
+    *: "milliseconds"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER_PLAYLIST
-  desc: show only playlist
+  id: VOICE_SECOND
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Playlists"
+    *: ""
   </source>
   <dest>
-    *: "Playlists"
+    *: ""
   </dest>
   <voice>
-    *: "Playlists"
+    *: "second"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FILTER_ID3DB
-  desc: show ID3 Database
+  id: VOICE_SECONDS
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Database"
+    *: ""
   </source>
   <dest>
-    *: "Database"
+    *: ""
   </dest>
   <voice>
-    *: "Database"
+    *: "seconds"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_QUALITY
-  desc: in the recording settings
+  id: VOICE_MINUTE
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Quality"
+    *: ""
   </source>
   <dest>
-    *: "Quality"
+    *: ""
   </dest>
   <voice>
-    *: "Quality"
+    *: "minute"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_FREQUENCY
-  desc: in the recording settings
+  id: VOICE_MINUTES
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Frequency"
+    *: ""
   </source>
   <dest>
-    *: "Frequency"
+    *: ""
   </dest>
   <voice>
-    *: "Frequency"
+    *: "minutes"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SOURCE
-  desc: in the recording settings
+  id: VOICE_HOUR
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Source"
+    *: ""
   </source>
   <dest>
-    *: "Source"
+    *: ""
   </dest>
   <voice>
-    *: "Source"
+    *: "hour"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_MIC
-  desc: in the recording settings
+  id: VOICE_HOURS
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Int. Mic"
+    *: ""
   </source>
   <dest>
-    *: "Int. Mic"
+    *: ""
   </dest>
   <voice>
-    *: "Internal Microphone"
+    *: "hours"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_LINE
-  desc: in the recording settings
+  id: VOICE_KHZ
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Line In"
+    *: ""
   </source>
   <dest>
-    *: "Line In"
+    *: ""
   </dest>
   <voice>
-    *: "Line In"
+    *: "kilohertz"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_DIGITAL
-  desc: in the recording settings
+  id: VOICE_DB
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Digital"
+    *: ""
   </source>
   <dest>
-    *: "Digital"
+    *: ""
   </dest>
   <voice>
-    *: "Digital"
+    *: "decibel"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_CHANNELS
-  desc: in the recording settings
+  id: VOICE_PERCENT
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Channels"
+    *: ""
   </source>
   <dest>
-    *: "Channels"
+    *: ""
   </dest>
   <voice>
-    *: "Channels"
+    *: "percent"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORD_TRIGGER
-  desc: in recording settings_menu
+  id: VOICE_MILLIAMPHOURS
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Trigger"
+    *: ""
   </source>
   <dest>
-    *: "Trigger"
+    *: ""
   </dest>
   <voice>
-    *: "Trigger"
+    *: "milli-amp hours"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_FLIP_DISPLAY
-  desc: in settings_menu, option to turn display+buttos by 180 degreed
+  id: VOICE_PIXEL
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Upside Down"
+    *: ""
   </source>
   <dest>
-    *: "Upside Down"
+    *: ""
   </dest>
   <voice>
-    *: "Upside Down"
+    *: "pixel"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_SCROLL_BAR
-  desc: display menu, F3 substitute
+  id: VOICE_PER_SEC
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Scroll Bar"
+    *: ""
   </source>
   <dest>
-    *: "Scroll Bar"
+    *: ""
   </dest>
   <voice>
-    *: "Scroll Bar"
+    *: "per second"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_STATUS_BAR
-  desc: display menu, F3 substitute
+  id: VOICE_HERTZ
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Status Bar"
+    *: ""
   </source>
   <dest>
-    *: "Status Bar"
+    *: ""
   </dest>
   <voice>
-    *: "Status Bar"
+    *: "hertz"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_PITCH
-  desc: "pitch" in the pitch screen
+  id: VOICE_KBIT_PER_SEC
+  desc: spoken only, a unit postfix
   user:
   <source>
-    *: "Pitch"
+    *: ""
   </source>
   <dest>
-    *: "Pitch"
+    *: ""
   </dest>
   <voice>
-    *: "Pitch"
+    *: "kilobits per second"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_PITCH_UP
-  desc: in wps
+  id: VOICE_CHAR_A
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Pitch Up"
+    *: ""
   </source>
   <dest>
-    *: "Pitch Up"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "A"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_PITCH_DOWN
-  desc: in wps
+  id: VOICE_CHAR_B
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Pitch Down"
+    *: ""
   </source>
   <dest>
-    *: "Pitch Down"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "B"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_F2_MODE
-  desc: in wps F2 pressed
+  id: VOICE_CHAR_C
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Mode:"
+    *: ""
   </source>
   <dest>
-    *: "Mode:"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "C"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_TIME
-  desc: Display of recorded time
+  id: VOICE_CHAR_D
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Time:"
+    *: ""
   </source>
   <dest>
-    *: "Time:"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "D"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORD_TIMESPLIT_REC
-  desc: Display of record timer interval setting, on the record screen
+  id: VOICE_CHAR_E
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Split Time:"
+    *: ""
   </source>
   <dest>
-    *: "Split Time:"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "E"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SIZE
-  desc: Display of recorded file size
+  id: VOICE_CHAR_F
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Size:"
+    *: ""
   </source>
   <dest>
-    *: "Size:"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "F"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORD_PRERECORD
-  desc: in recording and radio screen
+  id: VOICE_CHAR_G
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Pre-Recording"
+    *: ""
   </source>
   <dest>
-    *: "Pre-Recording"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "G"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_GAIN
-  desc: in the recording screen
+  id: VOICE_CHAR_H
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Gain"
+    *: ""
   </source>
   <dest>
-    *: "Gain"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "H"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_LEFT
-  desc: in the recording screen
+  id: VOICE_CHAR_I
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Gain Left"
+    *: ""
   </source>
   <dest>
-    *: "Gain Left"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "I"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_RIGHT
-  desc: in the recording screen
+  id: VOICE_CHAR_J
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Gain Right"
+    *: ""
   </source>
   <dest>
-    *: "Gain Right"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "J"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DISK_FULL
-  desc: in recording screen
+  id: VOICE_CHAR_K
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "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."
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "K"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F1
-  desc: in dir browser, F1 button bar text
+  id: VOICE_CHAR_L
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Menu"
+    *: ""
   </source>
   <dest>
-    *: "Menu"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "L"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F2
-  desc: in dir browser, F2 button bar text
+  id: VOICE_CHAR_M
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Option"
+    *: ""
   </source>
   <dest>
-    *: "Option"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "M"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F3
-  desc: in dir browser, F3 button bar text
+  id: VOICE_CHAR_N
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "LCD"
-  </source>
-  <dest>
-    *: "LCD"
-  </dest>
-  <voice>
     *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_SPLIT_SIZE
-  desc: in record timesplit options
-  <source>
-    *: "Split Filesize"
   </source>
   <dest>
-    *: "Split Filesize"
+    *: ""
   </dest>
   <voice>
-    *: "Split Filesize"
+    *: "N"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LOADING_PERCENT
-  desc: splash number of percents loaded
+  id: VOICE_CHAR_O
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Loading... %d%% done (%s)"
+    *: ""
   </source>
   <dest>
-    *: "Loading... %d%% done (%s)"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "O"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_HARDWARE
-  desc: in the sound settings menu
+  id: VOICE_CHAR_P
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Hardware Equalizer"
+    *: ""
   </source>
   <dest>
-    *: "Hardware Equalizer"
+    *: ""
   </dest>
   <voice>
-    *: "Hardware equalizer"
+    *: "P"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_HARDWARE_ENABLED
-  desc: in the equalizer settings menu
+  id: VOICE_CHAR_Q
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Enable Hardware EQ"
+    *: ""
   </source>
   <dest>
-    *: "Enable Hardware EQ"
+    *: ""
   </dest>
   <voice>
-    *: "Enable hardware equalizer"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_BANDWIDTH
-  desc: in the equalizer settings menu
+  id: VOICE_CHAR_R
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Bandwidth"
+    *: ""
   </source>
   <dest>
-    *: "Bandwidth"
+    *: ""
   </dest>
   <voice>
-    *: "Bandwidth"
+    *: "R"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW
-  desc: in the equalizer settings menu
+  id: VOICE_CHAR_S
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Narrow"
+    *: ""
   </source>
   <dest>
-    *: "Narrow"
+    *: ""
   </dest>
   <voice>
-    *: "Narrow"
+    *: "S"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE
-  desc: in the equalizer settings menu
+  id: VOICE_CHAR_T
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Wide"
+    *: ""
   </source>
   <dest>
-    *: "Wide"
+    *: ""
   </dest>
   <voice>
-    *: "Wide"
+    *: "T"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_PATH
-  desc: in settings_menu
+  id: VOICE_CHAR_U
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Show Path"
+    *: ""
   </source>
   <dest>
-    *: "Show Path"
+    *: ""
   </dest>
   <voice>
-    *: "Show Path"
+    *: "U"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_PATH_CURRENT
-  desc: in show path menu
+  id: VOICE_CHAR_V
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Current Directory Only"
+    *: ""
   </source>
   <dest>
-    *: "Current Directory Only"
+    *: ""
   </dest>
   <voice>
-    *: "Current Directory Only"
+    *: "V"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_PATH_FULL
-  desc: in show path menu
+  id: VOICE_CHAR_W
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Full Path"
+    *: ""
   </source>
   <dest>
-    *: "Full Path"
+    *: ""
   </dest>
   <voice>
-    *: "Full Path"
+    *: "W"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_AGC_PRESET
-  desc: automatic gain control in record settings
-  <source>
-    *: "Automatic Gain Control"
-  </source>
-  <dest>
-    *: "Automatic Gain Control"
-  </dest>
-  <voice>
-    *: "Automatic gain control"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AGC_SAFETY
-  desc: AGC preset
-  <source>
-    *: "Safety (clip)"
-  </source>
-  <dest>
-    *: "Safety (clip)"
-  </dest>
-  <voice>
-    *: "Safety (clip)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AGC_LIVE
-  desc: AGC preset
-  <source>
-    *: "Live (slow)"
-  </source>
-  <dest>
-    *: "Live (slow)"
-  </dest>
-  <voice>
-    *: "Live (slow)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AGC_DJSET
-  desc: AGC preset
-  <source>
-    *: "DJ-Set (slow)"
-  </source>
-  <dest>
-    *: "DJ-Set (slow)"
-  </dest>
-  <voice>
-    *: "DJ set (slow)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AGC_MEDIUM
-  desc: AGC preset
-  <source>
-    *: "Medium"
-  </source>
-  <dest>
-    *: "Medium"
-  </dest>
-  <voice>
-    *: "Medium"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AGC_VOICE
-  desc: AGC preset
-  <source>
-    *: "Voice (fast)"
-  </source>
-  <dest>
-    *: "Voice (fast)"
-  </dest>
-  <voice>
-    *: "Voice (fast)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORD_AGC_CLIPTIME
-  desc: in record settings
-  <source>
-    *: "AGC clip time"
-  </source>
-  <dest>
-    *: "AGC clip time"
-  </dest>
-  <voice>
-    *: "AGC clip time"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_AGC_PRESET
-  desc: automatic gain control in recording screen
-  <source>
-    *: "AGC"
-  </source>
-  <dest>
-    *: "AGC"
-  </dest>
-  <voice>
-    *: "AGC"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORDING_AGC_MAXGAIN
-  desc: AGC maximum gain in recording screen
-  <source>
-    *: "AGC max. gain"
-  </source>
-  <dest>
-    *: "AGC max. gain"
-  </dest>
-  <voice>
-    *: "AGC maximum gain"
-  </voice>
-</phrase>
-<phrase>
-  id: VOICE_KBIT_PER_SEC
-  desc: spoken only, a unit postfix
+  id: VOICE_CHAR_X
+  desc: spoken only, for spelling
   user:
   <source>
     *: ""
@@ -9852,1205 +9809,1121 @@
     *: ""
   </dest>
   <voice>
-    *: "kilobits per second"
+    *: "X"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_FILENAME
-  desc: Filename header in recording screen
+  id: VOICE_CHAR_Y
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Filename:"
+    *: ""
   </source>
   <dest>
-    *: "Filename:"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "Y"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNPLUG
-  desc: in settings_menu.
+  id: VOICE_CHAR_Z
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Pause on Headphone Unplug"
+    *: ""
   </source>
   <dest>
-    *: "Pause on Headphone Unplug"
+    *: ""
   </dest>
   <voice>
-    *: "Pause on Headphone Unplug"
+    *: "Z"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNPLUG_RESUME
-  desc: in pause_phones_menu.
+  id: VOICE_DOT
+  desc: spoken only, for spelling
   user:
   <source>
-    *: "Pause and Resume"
+    *: ""
   </source>
   <dest>
-    *: "Pause and Resume"
+    *: ""
   </dest>
   <voice>
-    *: "Pause and Resume"
+    *: "dot"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNPLUG_RW
-  desc: in pause_phones_menu.
+  id: VOICE_PAUSE
+  desc: spoken only, for spelling, a split second of silence (difficult to author)
   user:
   <source>
-    *: "Duration to Rewind"
+    *: ""
   </source>
   <dest>
-    *: "Duration to Rewind"
+    *: ""
   </dest>
   <voice>
-    *: "Duration to Rewind"
+    *: " "
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNPLUG_DISABLE_AUTORESUME
-  desc: in pause_phones_menu.
+  id: VOICE_FILE
+  desc: spoken only, prefix for file number
   user:
   <source>
-    *: "Disable resume on startup if phones unplugged"
+    *: ""
   </source>
   <dest>
-    *: "Disable resume on startup if phones unplugged"
+    *: ""
   </dest>
   <voice>
-    *: "Disable resume on startup if phones unplugged"
+    *: "file"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_REGION
-  desc: fm tuner region setting
-  <source>
-    *: "Region"
-  </source>
-  <dest>
-    *: "Region"
-  </dest>
-  <voice>
-    *: "Region"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_EUROPE
-  desc: fm tuner region europe
-  <source>
-    *: "Europe"
-  </source>
-  <dest>
-    *: "Europe"
-  </dest>
-  <voice>
-    *: "Europe"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_US
-  desc: fm region us / canada
-  <source>
-    *: "US / Canada"
-  </source>
-  <dest>
-    *: "US / Canada"
-  </dest>
-  <voice>
-    *: "US / Canada"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_JAPAN
-  desc: fm region japan
-  <source>
-    *: "Japan"
-  </source>
-  <dest>
-    *: "Japan"
-  </dest>
-  <voice>
-    *: "Japan"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_KOREA
-  desc: fm region korea
-  <source>
-    *: "Korea"
-  </source>
-  <dest>
-    *: "Korea"
-  </dest>
-  <voice>
-    *: "Korea"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RANDOM
-  desc: random folder
-  <source>
-    *: "Random"
-  </source>
-  <dest>
-    *: "Random"
-  </dest>
-  <voice>
-    *: "Random"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AUDIOSCROBBLER
-  desc: "Last.fm Log" in the playback menu
+  id: VOICE_DIR
+  desc: spoken only, prefix for directory number
   user:
   <source>
-    *: "Last.fm Log"
+    *: ""
   </source>
   <dest>
-    *: "Last.fm Log"
+    *: ""
   </dest>
   <voice>
-    *: "Last.fm Log"
+    *: "folder"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLEASE_REBOOT
-  desc: when activating an option that requires a reboot
+  id: VOICE_EXT_MPA
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Please reboot to enable"
+    *: ""
   </source>
   <dest>
-    *: "Please reboot to enable"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "audio"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DITHERING
-  desc: in the sound settings menu
+  id: VOICE_EXT_CFG
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Dithering"
+    *: ""
   </source>
   <dest>
-    *: "Dithering"
+    *: ""
   </dest>
   <voice>
-    *: "Dithering"
+    *: "configuration"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_PITCH_UP_SEMITONE
-  desc: in wps
+  id: VOICE_EXT_WPS
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Semitone Up"
+    *: ""
   </source>
   <dest>
-    *: "Semitone Up"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "while-playing-screen"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_PITCH_DOWN_SEMITONE
-  desc: in wps
+  id: VOICE_EXT_TXT
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Semitone Down"
+    *: ""
   </source>
   <dest>
-    *: "Semitone Down"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "text"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_FORMAT
-  desc: audio format item in recording menu
+  id: VOICE_EXT_ROCK
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Format"
+    *: ""
   </source>
   <dest>
-    *: "Format"
+    *: ""
   </dest>
   <voice>
-    *: "Format"
+    *: "plugin"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_MPA_L3
-  desc: audio format description
+  id: VOICE_EXT_FONT
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "MPEG Layer 3"
+    *: ""
   </source>
   <dest>
-    *: "MPEG Layer 3"
+    *: ""
   </dest>
   <voice>
-    *: "MPEG Layer 3"
+    *: "font"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_PCM_WAV
-  desc: audio format description
+  id: VOICE_EXT_BMARK
+  desc: spoken only, for file extension and the word in general
   user:
   <source>
-    *: "PCM Wave"
+    *: ""
   </source>
   <dest>
-    *: "PCM Wave"
+    *: ""
   </dest>
   <voice>
-    *: "PCM Wave"
+    *: "bookmark"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_WAVPACK
-  desc: audio format description
+  id: VOICE_EXT_AJZ
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "WavPack"
+    *: ""
   </source>
   <dest>
-    *: "WavPack"
+    *: ""
   </dest>
   <voice>
-    *: "WavPack"
+    *: "firmware"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ENCODER_SETTINGS
-  desc: encoder settings
+  id: VOICE_EXT_RWPS
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "Encoder Settings"
+    *: none
+    remote: ""
   </source>
   <dest>
-    *: "Encoder Settings"
+    *: none
+    remote: ""
   </dest>
   <voice>
-    *: "Encoder Settings"
+    *: none
+    remote: "remote while-playing-screen"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_SETTINGS
-  desc: when something has settings in a certain context
+  id: VOICE_EXT_KBD
+  desc: spoken only, for file extension
   user:
   <source>
-    *: "(No Settings)"
+    *: ""
   </source>
   <dest>
-    *: "(No Settings)"
+    *: ""
   </dest>
   <voice>
-    *: "No settings available"
+    *: "keyboard"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SOURCE_FREQUENCY
-  desc: when recording source frequency setting must follow source
+  id: VOICE_EXT_CUESHEET
+  desc:
   user:
   <source>
-    *: "(Same As Source)"
+    *: ""
   </source>
   <dest>
-    *: "(Same As Source)"
+     *: ""
   </dest>
   <voice>
-    *: "Same As Source"
+    *: "cuesheet"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BITRATE
-  desc: bits-kilobits per unit time
+  id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
+  desc: voice only, used in the bookmark list to label index number
   user:
   <source>
-    *: "Bitrate"
+    *: ""
   </source>
   <dest>
-    *: "Bitrate"
+    *: ""
   </dest>
   <voice>
-    *: "Bitrate"
+    *: "Index"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_TYPE
-  desc: in recording trigger menu
-  <source>
-    *: "Trigtype"
-  </source>
-  <dest>
-    *: "Trigtype"
-  </dest>
-  <voice>
-    *: "Trigtype"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORD_TRIGGER_STOP
-  desc: trigger types
-  <source>
-    *: "Stop"
-  </source>
-  <dest>
-    *: "Stop"
-  </dest>
-  <voice>
-    *: "Stop"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORD_TRIGGER_PAUSE
-  desc: trigger types
-  <source>
-    *: "Pause"
-  </source>
-  <dest>
-    *: "Pause"
-  </dest>
-  <voice>
-    *: "Pause"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORD_TRIGGER_NEWFILESTP
-  desc: trigger types
-  <source>
-    *: "New file"
-  </source>
-  <dest>
-    *: "New file"
-  </dest>
-  <voice>
-    *: "New file"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_WARNING_BATTERY_LOW
-  desc: general warning
+  id: VOICE_CURRENT_TIME
+  desc: spoken only, for wall clock announce
   user:
   <source>
-    *: "WARNING! Low Battery!"
+    *: none
+    rtc: ""
   </source>
   <dest>
-    *: "WARNING! Low Battery!"
+    *: none
+    rtc: ""
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "Current time:"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARNING_BATTERY_EMPTY
-  desc: general warning
+  id: LANG_SYSFONT_SET_BOOL_YES
+  desc: bool true representation
   user:
   <source>
-    *: "Battery empty! RECHARGE!"
+    *: none
+    lcd_bitmap: "Yes"
   </source>
   <dest>
-    *: "Battery empty! RECHARGE!"
+    *: none
+    lcd_bitmap: "Yes"
   </dest>
   <voice>
-    *: ""
+    *: none
+    lcd_bitmap: "Yes"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_AIFF
-  desc: audio format description
+  id: LANG_SYSFONT_SET_BOOL_NO
+  desc: bool false representation
   user:
   <source>
-    *: "AIFF"
+    *: none
+    lcd_bitmap: "No"
   </source>
   <dest>
-    *: "AIFF"
+    *: none
+    lcd_bitmap: "No"
   </dest>
   <voice>
-    *: "AIFF"
+    *: none
+    lcd_bitmap: "No"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_AGC_SAFETY
-  desc: AGC preset
-  <source>
-    *: "Safety (clip)"
-  </source>
-  <dest>
-    *: "Safety (clip)"
-  </dest>
-  <voice>
-    *: "Safety (clip)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_AGC_LIVE
-  desc: AGC preset
-  <source>
-    *: "Live (slow)"
-  </source>
-  <dest>
-    *: "Live (slow)"
-  </dest>
-  <voice>
-    *: "Live (slow)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_AGC_DJSET
-  desc: AGC preset
-  <source>
-    *: "DJ-Set (slow)"
-  </source>
-  <dest>
-    *: "DJ-Set (slow)"
-  </dest>
-  <voice>
-    *: "DJ set (slow)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_AGC_MEDIUM
-  desc: AGC preset
-  <source>
-    *: "Medium"
-  </source>
-  <dest>
-    *: "Medium"
-  </dest>
-  <voice>
-    *: "Medium"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_AGC_VOICE
-  desc: AGC preset
-  <source>
-    *: "Voice (fast)"
-  </source>
-  <dest>
-    *: "Voice (fast)"
-  </dest>
-  <voice>
-    *: "Voice (fast)"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
-  desc: AGC maximum gain in recording screen
-  <source>
-    *: "AGC max. gain"
-  </source>
-  <dest>
-    *: "AGC max. gain"
-  </dest>
-  <voice>
-    *: "AGC maximum gain"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES
-  desc: browser file/dir properties
+  id: LANG_SYSFONT_ON
+  desc: Used in a lot of places
   user:
   <source>
-    *: "Properties"
+    *: none
+    lcd_bitmap: "On"
   </source>
   <dest>
-    *: "Properties"
+    *: none
+    lcd_bitmap: "On"
   </dest>
   <voice>
-    *: "Properties"
+    *: none
+    lcd_bitmap: "On"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUFFLE_TRACKSKIP
-  desc: in settings_menu
+  id: LANG_SYSFONT_OFF
+  desc: Used in a lot of places
   user:
   <source>
-    *: "Shuffle and Track Skip"
+    *: none
+    lcd_bitmap: "Off"
   </source>
   <dest>
-    *: "Shuffle and Track Skip"
+    *: none
+    lcd_bitmap: "Off"
   </dest>
   <voice>
-    *: "Shuffle and Track Skip"
+    *: none
+    lcd_bitmap: "Off"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RUNNING_TIME
-  desc: in run time screen
+  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Running Time"
+    *: none
+    swcodec: "Edit mode: %s"
   </source>
   <dest>
-    *: "Running Time"
+    *: none
+    swcodec: "Edit mode: %s"
   </dest>
   <voice>
-    *: "Running Time"
+    *: none
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CURRENT_TIME
-  desc: in run time screen
+  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Current Time"
+    *: none
+    swcodec: "Cutoff Frequency"
   </source>
   <dest>
-    *: "Current Time"
+    *: none
+    swcodec: "Cutoff Frequency"
   </dest>
   <voice>
-    *: "Current Time"
+    *: none
+    swcodec: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TOP_TIME
-  desc: in run time screen
+  id: LANG_SYSFONT_GAIN
+  desc: in the equalizer settings menu
   user:
   <source>
-    *: "Top Time"
+    *: none
+    lcd_bitmap: "Gain"
   </source>
   <dest>
-    *: "Top Time"
+    *: none
+    lcd_bitmap: "Gain"
   </dest>
   <voice>
-    *: "Top Time"
+    *: none
+    lcd_bitmap: "Gain"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_TIME
-  desc: in run time screen
+  id: LANG_SYSFONT_SHUFFLE
+  desc: in settings_menu
   user:
   <source>
-    *: "Clear Time?"
+    *: none
+    lcd_bitmap: "Shuffle"
   </source>
   <dest>
-    *: "Clear Time?"
+    *: none
+    lcd_bitmap: "Shuffle"
   </dest>
   <voice>
-    *: "Clear Time?"
+    *: none
+    lcd_bitmap: "Shuffle"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLACE
-  desc: in onplay menu.  Replace the current playlist with a new one.
+  id: LANG_SYSFONT_REPEAT
+  desc: in settings_menu
   user:
   <source>
-    *: "Play Next"
+    *: none
+    lcd_bitmap: "Repeat"
   </source>
   <dest>
-    *: "Play Next"
+    *: none
+    lcd_bitmap: "Repeat"
   </dest>
   <voice>
-    *: "Play Next"
+    *: none
+    lcd_bitmap: "Repeat"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_THEME
-  desc: save a theme file
+  id: LANG_SYSFONT_ALL
+  desc: repeat playlist once all songs have completed
   user:
   <source>
-    *: "Save Theme Settings"
+    *: none
+    lcd_bitmap: "All"
   </source>
   <dest>
-    *: "Save Theme Settings"
+    *: none
+    lcd_bitmap: "All"
   </dest>
   <voice>
-    *: "Save Theme Settings"
+    *: none
+    lcd_bitmap: "All"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_USB_CHARGING
-  desc: in Battery menu
+  id: LANG_SYSFONT_REPEAT_ONE
+  desc: repeat one song
   user:
   <source>
-    *: "Charge During USB Connection"
+    *: none
+    lcd_bitmap: "One"
   </source>
   <dest>
-    *: "Charge During USB Connection"
+    *: none
+    lcd_bitmap: "One"
   </dest>
   <voice>
-    *: "Charge During U S B Connection"
+    *: none
+    lcd_bitmap: "One"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUMARTIST
-  desc: in tag viewer
+  id: LANG_SYSFONT_REPEAT_AB
+  desc: repeat range from point A to B
   user:
   <source>
-    *: "[Album Artist]"
+    *: none
+    lcd_bitmap: "A-B"
   </source>
   <dest>
-    *: "[Album Artist]"
+    *: none
+    lcd_bitmap: "A-B"
   </dest>
   <voice>
-    *: ""
+    *: none
+    lcd_bitmap: "A-B"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_COMMENT
-  desc: in tag viewer
+  id: LANG_SYSFONT_FILTER
+  desc: setting name for dir filter
   user:
   <source>
-    *: "[Comment]"
+    *: none
+    lcd_bitmap: "Show Files"
   </source>
   <dest>
-    *: "[Comment]"
+    *: none
+    lcd_bitmap: "Show Files"
   </dest>
   <voice>
-    *: ""
+    *: none
+    lcd_bitmap: "Show Files"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUESHEET
-  desc:
+  id: LANG_SYSFONT_FILTER_SUPPORTED
+  desc: show all file types supported by Rockbox
   user:
   <source>
-    *: "Cuesheet"
+    *: none
+    lcd_bitmap: "Supported"
   </source>
   <dest>
-    *: "Cuesheet"
+    *: none
+    lcd_bitmap: "Supported"
   </dest>
   <voice>
-    *: "Cuesheet"
+    *: none
+    lcd_bitmap: "Supported"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUESHEET_ENABLE
-  desc: cuesheet support option
+  id: LANG_SYSFONT_FILTER_MUSIC
+  desc: show only music-related files
   user:
   <source>
-    *: "Cuesheet Support"
+    *: none
+    lcd_bitmap: "Music"
   </source>
   <dest>
-    *: "Cuesheet Support"
+    *: none
+    lcd_bitmap: "Music"
   </dest>
   <voice>
-    *: "Cuesheet Support"
+    *: none
+    lcd_bitmap: "Music"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_MENU
-  desc: fm menu title
+  id: LANG_SYSFONT_FILTER_PLAYLIST
+  desc: show only playlist
   user:
   <source>
-    *: "FM Radio Menu"
+    *: none
+    lcd_bitmap: "Playlists"
   </source>
   <dest>
-    *: "FM Radio Menu"
+    *: none
+    lcd_bitmap: "Playlists"
   </dest>
   <voice>
-    *: "FM Radio Menu"
+    *: none
+    lcd_bitmap: "Playlists"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIR_BROWSER
-  desc: in root menu
+  id: LANG_SYSFONT_FLIP_DISPLAY
+  desc: in settings_menu, option to turn display+buttos by 180 degreed
   user:
   <source>
-    *: "Files"
+    *: none
+    lcd_bitmap: "Upside Down"
   </source>
   <dest>
-    *: "Files"
+    *: none
+    lcd_bitmap: "Upside Down"
   </dest>
   <voice>
-    *: "Files"
+    *: none
+    lcd_bitmap: "Upside Down"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_MENU
-  desc: in root menu
+  id: LANG_SYSFONT_SCROLL_BAR
+  desc: display menu, F3 substitute
   user:
   <source>
-    *: "Settings"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </source>
   <dest>
-    *: "Settings"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </dest>
   <voice>
-    *: "Settings"
+    *: none
+    lcd_bitmap: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NOW_PLAYING
-  desc: in root menu
+  id: LANG_SYSFONT_STATUS_BAR
+  desc: display menu, F3 substitute
   user:
   <source>
-    *: "Now Playing"
+    *: none
+    lcd_bitmap: "Status Bar"
   </source>
   <dest>
-    *: "Now Playing"
+    *: none
+    lcd_bitmap: "Status Bar"
   </dest>
   <voice>
-    *: "Now Playing"
+    *: none
+    lcd_bitmap: "Status Bar"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME_PLAYBACK
-  desc: in root menu
+  id: LANG_SYSFONT_MODE
+  desc: in wps F2 pressed
   user:
   <source>
-    *: "Resume Playback"
+    *: none
+    lcd_bitmap: "Mode:"
   </source>
   <dest>
-    *: "Resume Playback"
+    *: none
+    lcd_bitmap: "Mode:"
   </dest>
   <voice>
-    *: "Resume Playback"
+    *: none
+    lcd_bitmap: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_START_SCREEN
-  desc: in root menu setting
+  id: LANG_SYSFONT_DIRBROWSE_F1
+  desc: in dir browser, F1 button bar text /* there appears to be a bug that makes these strings not be included in the right build if they are excluded from any... */
   user:
   <source>
-    *: "Start Screen"
+    *: none
+    recorder_pad: "Menu"
   </source>
   <dest>
-    *: "Start Screen"
+    *: none
+    recorder_pad: "Menu"
   </dest>
   <voice>
-    *: "Start Screen"
+    *: none
+    recorder_pad: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ROCKBOX_TITLE
-  desc: in root menu
+  id: LANG_SYSFONT_DIRBROWSE_F2
+  desc: in dir browser, F2 button bar text
   user:
   <source>
-    *: "Rockbox"
+    *: none
+    recorder_pad: "Option"
   </source>
   <dest>
-    *: "Rockbox"
+    *: none
+    recorder_pad: "Option"
   </dest>
   <voice>
-    *: "Rockbox"
+    *: none
+    recorder_pad: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAIN_MENU
-  desc: in root menu setting
+  id: LANG_SYSFONT_DIRBROWSE_F3
+  desc: in dir browser, F3 button bar text
   user:
   <source>
-    *: "Main Menu"
+    *: none
+    recorder_pad: "LCD"
   </source>
   <dest>
-    *: "Main Menu"
+    *: none
+    recorder_pad: "LCD"
   </dest>
   <voice>
-    *: "Main Menu"
+    *: none
+    recorder_pad: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PREVIOUS_SCREEN
-  desc: in root menu setting
+  id: LANG_SYSFONT_DISK_FULL
+  desc: in recording screen
   user:
   <source>
-    *: "Previous Screen"
+    *: none
+    recording: "The disk is full. Press STOP to continue."
   </source>
   <dest>
-    *: "Previous Screen"
+    *: none
+    recording: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
-    *: "Previous Screen"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_WAKEUP_SCREEN
-  desc: in alarm menu setting
+  id: LANG_SYSFONT_VOLUME
+  desc: in sound_settings
   user:
   <source>
-    *: "Alarm Wake up Screen"
+    *: none
+    recording: "Volume"
   </source>
   <dest>
-    *: "Alarm Wake up Screen"
+    *: none
+    recording: "Volume"
   </dest>
   <voice>
-    *: "Alarm Wake up Screen"
+    *: none
+    recording: "Volume"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUILDING_DATABASE
-  desc: splash database building progress
+  id: LANG_SYSFONT_CHANNEL_STEREO
+  desc: in sound_settings
   user:
   <source>
-    *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5: "Building database... %d found (Long PLAY to return)"
-    h10,h10_5gb: "Building database... %d found (PREV to return)"
-    e200: "Building database... %d found (PREV to return)"
+    *: none
+    recording: "Stereo"
   </source>
   <dest>
-    *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5: "Building database... %d found (Long PLAY to return)"
-    h10,h10_5gb: "Building database... %d found (PREV to return)"
-    e200: "Building database... %d found (PREV to return)"
+    *: none
+    recording: "Stereo"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "Stereo"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ONPLAY_MENU_TITLE
-  desc: title for the onplay menus
+  id: LANG_SYSFONT_CHANNEL_MONO
+  desc: in sound_settings
   user:
   <source>
-    *: "Context Menu"
+    *: none
+    recording: "Mono"
   </source>
   <dest>
-    *: "Context Menu"
+    *: none
+    recording: "Mono"
   </dest>
   <voice>
-    *: "Context Menu"
+    *: none
+    recording: "Mono"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONLIGHT_TIMEOUT
-  desc: in settings_menu
+  id: LANG_SYSFONT_RECORDING_QUALITY
+  desc: in the recording settings
   user:
   <source>
-    *: ""
-    e200: "Wheel Light Timeout"
-    gigabeatf: "Button Light Timeout"
+    *: none
+    recording_hwcodec: "Quality"
   </source>
   <dest>
-    *: ""
-    e200: "Wheel Light Timeout"
-    gigabeatf: "Button Light Timeout"
+    *: none
+    recording_hwcodec: "Quality"
   </dest>
   <voice>
-    *: ""
-    e200: "Wheel Light Timeout"
-    gigabeatf: "Button Light Timeout"
+    *: none
+    recording_hwcodec: "Quality"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONLIGHT_BRIGHTNESS
-  desc: in settings_menu
+  id: LANG_SYSFONT_RECORDING_FREQUENCY
+  desc: in the recording settings
   user:
   <source>
-    *: ""
-    gigabeatf: "Button Light Brightness"
+    *: none
+    recording: "Frequency"
   </source>
   <dest>
-    *: ""
-    gigabeatf: "Button Light Brightness"
+    *: none
+    recording: "Frequency"
   </dest>
   <voice>
-    *: ""
-    gigabeatf: "Button Light Brightness"
+    *: none
+    recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLISTVIEWER_SETTINGS
-  desc: title for the playlist viewer settings menus
+  id: LANG_SYSFONT_RECORDING_SOURCE
+  desc: in the recording settings
   user:
   <source>
-    *: "Playlist Viewer Settings"
+    *: none
+    recording: "Source"
   </source>
   <dest>
-    *: "Playlist Viewer Settings"
+    *: none
+    recording: "Source"
   </dest>
   <voice>
-    *: "Playlist Viewer Settings"
+    *: none
+    recording: "Source"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BROWSE_CUESHEET
-  desc:
+  id: LANG_SYSFONT_RECORDING_SRC_MIC
+  desc: in the recording settings
   user:
   <source>
-    *: "Browse Cuesheet"
+    *: none
+    recording: "Int. Mic"
   </source>
   <dest>
-    *: "Browse Cuesheet"
+    *: none
+    recording: "Int. Mic"
   </dest>
   <voice>
-    *: "Browse Cuesheet"
+    *: none
+    recording: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COPYING
-  desc:
+  id: LANG_SYSFONT_LINE_IN
+  desc: in the recording settings
   user:
   <source>
-    *: "Copying..."
+    *: none
+    recording: "Line In"
   </source>
   <dest>
-    *: "Copying..."
+    *: none
+    recording: "Line In"
   </dest>
   <voice>
-    *: "Copying"
+    *: none
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETING
-  desc:
+  id: LANG_SYSFONT_RECORDING_SRC_DIGITAL
+  desc: in the recording settings
   user:
   <source>
-    *: "Deleting..."
+    *: none
+    recording: "Digital"
   </source>
   <dest>
-    *: "Deleting..."
+    *: none
+    recording: "Digital"
   </dest>
   <voice>
-    *: "Deleting"
+    *: none
+    recording: "Digital"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MOVING
-  desc:
+  id: LANG_SYSFONT_CHANNELS
+  desc: in the recording settings
   user:
   <source>
-    *: "Moving..."
+    *: none
+    recording: "Channels"
   </source>
   <dest>
-    *: "Moving..."
+    *: none
+    recording: "Channels"
   </dest>
   <voice>
-    *: "Moving"
+    *: none
+    recording: "Channels"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_BOOKMARK
-  desc: bookmark selection list title
+  id: LANG_SYSFONT_RECORD_TRIGGER
+  desc: in recording settings_menu
   user:
   <source>
-    *: "Select Bookmark"
+    *: none
+    recording: "Trigger"
   </source>
   <dest>
-    *: "Select Bookmark"
+    *: none
+    recording: "Trigger"
   </dest>
   <voice>
-    *: "Select Bookmark"
+    *: none
+    recording: "Trigger"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_DONT_RESUME
-  desc: top item in the list when asking user about bookmark auto load
+  id: LANG_SYSFONT_RECORDING_TIME
+  desc: Display of recorded time
   user:
   <source>
-    *: "<Don't Resume>"
+    *: none
+    recording: "Time:"
   </source>
   <dest>
-    *: "<Don't Resume>"
+    *: none
+    recording: "Time:"
   </dest>
   <voice>
-    *: "Do Not Resume"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SHUFFLE
-  desc: bookmark selection list, bookmark enables shuffle
+  id: LANG_SYSFONT_RECORD_TIMESPLIT_REC
+  desc: Display of record timer interval setting, on the record screen
   user:
   <source>
-    *: ", Shuffle"
+    *: none
+    recording: "Split Time:"
   </source>
   <dest>
-    *: ", Shuffle"
+    *: none
+    recording: "Split Time:"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_INVALID
-  desc: bookmark selection list, bookmark couldn't be parsed
+  id: LANG_SYSFONT_RECORDING_SIZE
+  desc: Display of recorded file size
   user:
   <source>
-    *: "<Invalid Bookmark>"
+    *: none
+    recording: "Size:"
   </source>
   <dest>
-    *: "<Invalid Bookmark>"
+    *: none
+    recording: "Size:"
   </dest>
   <voice>
-    *: "Invalid Bookmark"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_MENU
-  desc: bookmark selection list context menu
+  id: LANG_SYSFONT_RECORD_PRERECORD
+  desc: in recording and radio screen
   user:
   <source>
-    *: "Bookmark Actions"
+    *: none
+    recording: "Pre-Recording"
   </source>
   <dest>
-    *: "Bookmark Actions"
+    *: none
+    recording: "Pre-Recording"
   </dest>
   <voice>
-    *: "Bookmark Actions"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_RESUME
-  desc: bookmark context menu, resume this bookmark
+  id: LANG_SYSFONT_RECORDING_LEFT
+  desc: in the recording screen
   user:
   <source>
-    *: "Resume"
+    *: none
+    recording: "Gain Left"
   </source>
   <dest>
-    *: "Resume"
+    *: none
+    recording: "Gain Left"
   </dest>
   <voice>
-    *: "Resume"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_DELETE
-  desc: bookmark context menu, delete this bookmark
+  id: LANG_SYSFONT_RECORDING_RIGHT
+  desc: in the recording screen
   user:
   <source>
-    *: "Delete"
+    *: none
+    recording: "Gain Right"
   </source>
   <dest>
-    *: "Delete"
+    *: none
+    recording: "Gain Right"
   </dest>
   <voice>
-    *: "Delete"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
-  desc: voice only, used in the bookmark list to label index number
-  user:
+  id: LANG_SYSFONT_SPLIT_SIZE
+  desc: in record timesplit options
   <source>
-    *: ""
+    *: none
+    recording: "Split Filesize"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Split Filesize"
   </dest>
   <voice>
-    *: "Index"
+    *: none
+    recording: "Split Filesize"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_BOOKMARK_SELECT_TIME_TEXT
-  desc: voice only, used in the bookmark select list to label elapsed time
+  id: LANG_SYSFONT_RECORDING_FILENAME
+  desc: Filename header in recording screen
   user:
   <source>
-    *: ""
+    *: none
+    recording: "Filename:"
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "Filename:"
   </dest>
   <voice>
-    *: "Time"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LISTACCEL_START_DELAY
-  desc: Delay before list starts accelerating
-  user:
+  id: LANG_SYSFONT_RECORDING_AGC_PRESET
+  desc: automatic gain control in recording screen
   <source>
-    *: "List Acceleration Start Delay"
-    e200: ""
+    *: none
+    agc: "AGC"
   </source>
   <dest>
-    *: "List Acceleration Start Delay"
-    e200: ""
+    *: none
+    agc: "AGC"
   </dest>
   <voice>
-    *: "List Acceleration Start Delay"
-    e200: ""
+    *: none
+    agc: "AGC"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LISTACCEL_ACCEL_SPEED
-  desc: list acceleration speed
-  user:
+  id: LANG_SYSFONT_AGC_SAFETY
+  desc: AGC preset
   <source>
-    *: "List Acceleration Speed"
-    e200: ""
+    *: none
+    agc: "Safety (clip)"
   </source>
   <dest>
-    *: "List Acceleration Speed"
-    e200: ""
+    *: none
+    agc: "Safety (clip)"
   </dest>
   <voice>
-    *: "List Acceleration Speed"
-    e200: ""
+    *: none
+    agc: "Safety (clip)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_DIR_TALK
-  desc: Item of voice menu, whether to use directory .talk clips
-  user:
+  id: LANG_SYSFONT_AGC_LIVE
+  desc: AGC preset
   <source>
-    *: "Use Directory .talk Clips"
+    *: none
+    agc: "Live (slow)"
   </source>
   <dest>
-    *: "Use Directory .talk Clips"
+    *: none
+    agc: "Live (slow)"
   </dest>
   <voice>
-    *: "Use Directory .talk Clips"
+    *: none
+    agc: "Live (slow)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_FILE_TALK
-  desc: Item of voice menu, whether to use file .talk clips
-  user:
+  id: LANG_SYSFONT_AGC_DJSET
+  desc: AGC preset
   <source>
-    *: "Use File .talk Clips"
+    *: none
+    agc: "DJ-Set (slow)"
   </source>
   <dest>
-    *: "Use File .talk Clips"
+    *: none
+    agc: "DJ-Set (slow)"
   </dest>
   <voice>
-    *: "Use File .talk Clips"
+    *: none
+    agc: "DJ set (slow)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_REC_DIR
-  desc:
-  user:
+  id: LANG_SYSFONT_AGC_MEDIUM
+  desc: AGC preset
   <source>
-    *: "Set As Recording Directory"
+    *: none
+    agc: "Medium"
   </source>
   <dest>
-    *: "Set As Recording Directory"
+    *: none
+    agc: "Medium"
   </dest>
   <voice>
-    *: "Set As Recording Directory"
+    *: none
+    agc: "Medium"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_REC_DIR
-  desc:
-  user:
+  id: LANG_SYSFONT_AGC_VOICE
+  desc: AGC preset
   <source>
-    *: "Clear Recording Directory"
+    *: none
+    agc: "Voice (fast)"
   </source>
   <dest>
-    *: "Clear Recording Directory"
+    *: none
+    agc: "Voice (fast)"
   </dest>
   <voice>
-    *: "Clear Recording Directory"
+    *: none
+    agc: "Voice (fast)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REC_DIR_NOT_WRITABLE
-  desc:
-  user:
+  id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
+  desc: AGC maximum gain in recording screen
   <source>
-    *: "Can't write to recording directory"
+    *: none
+    agc: "AGC max. gain"
   </source>
   <dest>
-    *: "Can't write to recording directory"
+    *: none
+    agc: "AGC max. gain"
   </dest>
   <voice>
-    *: "Can't write to recording directory"
+    *: none
+    agc: "AGC maximum gain"
   </voice>
 </phrase>
+
Index: apps/settings.c
===================================================================
--- apps/settings.c	(revision 14056)
+++ apps/settings.c	(working copy)
@@ -536,11 +536,11 @@
         {
             screens[i].clear_display();
 #ifdef HAVE_LCD_CHARCELLS
-            screens[i].puts(0, 0, str(LANG_SETTINGS_SAVE_PLAYER));
-            screens[i].puts(0, 1, str(LANG_SETTINGS_BATTERY_PLAYER));
+            screens[i].puts(0, 0, str(LANG_SETTINGS_SAVE_FAILED));
+            screens[i].puts(0, 1, str(LANG_SETTINGS_PARTITION));
 #else
-            screens[i].puts(4, 2, str(LANG_SETTINGS_SAVE_RECORDER));
-            screens[i].puts(2, 4, str(LANG_SETTINGS_BATTERY_RECORDER));
+            screens[i].puts(4, 2, str(LANG_SETTINGS_SAVE_FAILED));
+            screens[i].puts(2, 4, str(LANG_SETTINGS_PARTITION));
             screens[i].update();
 #endif
         }
@@ -575,7 +575,7 @@
             break;
         }
         else {
-            gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL));
+            gui_syncsplash(HZ, str(LANG_CANCEL));
             return false;
         }
     }
Index: apps/onplay.c
===================================================================
--- apps/onplay.c	(revision 14056)
+++ apps/onplay.c	(working copy)
@@ -295,7 +295,7 @@
                   save_playlist, NULL, NULL, Icon_Playlist);
 MENUITEM_FUNCTION(reshuffle_item, 0, ID2P(LANG_SHUFFLE_PLAYLIST),
                   shuffle_playlist, NULL, NULL, Icon_Playlist);
-MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST_MENU), 
+MAKE_ONPLAYMENU( wps_playlist_menu, ID2P(LANG_PLAYLIST), 
                  NULL, Icon_Playlist, 
                  &playlist_viewer_item, &search_playlist_item,
                  &playlist_save_item, &reshuffle_item
@@ -373,7 +373,7 @@
                   view_playlist, NULL,
                   treeplaylist_callback, Icon_Playlist);
 
-MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_PLAYLIST_MENU), 
+MAKE_ONPLAYMENU( tree_playlist_menu, ID2P(LANG_PLAYLIST), 
                  treeplaylist_callback, Icon_Playlist,
                  
                  /* view */
@@ -497,7 +497,7 @@
 #endif
         if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK))
         {
-            gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL));
+            gui_syncsplash(HZ, str(LANG_CANCEL));
             result = -1;
             break;
         }
@@ -1011,6 +1011,7 @@
 /* CONTEXT_WPS items */
 MENUITEM_FUNCTION(browse_id3_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO),
                   browse_id3, NULL, NULL, Icon_NOICON);
+/* NOTE: the LANG_MENU_SET_RATING string has been removed from english.lang */
 #ifdef HAVE_PITCHSCREEN
 MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
                   pitch_screen, NULL, NULL, Icon_Audio);
Index: apps/gui/gwps-common.c
===================================================================
--- apps/gui/gwps-common.c	(revision 14056)
+++ apps/gui/gwps-common.c	(working copy)
@@ -294,7 +294,7 @@
 #ifdef HAVE_LCD_BITMAP
         gui_syncstatusbar_draw(&statusbars, true);
 #endif
-        gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER));
+        gui_syncsplash(HZ, str(LANG_END_PLAYLIST));
         return true;
     }
     else
@@ -440,17 +440,10 @@
     FOR_NB_SCREENS(i)
         gui_wps[i].display->stop_scroll();
 
-#ifdef HAVE_LCD_CHARCELLS
     if(locked)
-        s = str(LANG_KEYLOCK_ON_PLAYER);
+        s = str(LANG_KEYLOCK_ON);
     else
-        s = str(LANG_KEYLOCK_OFF_PLAYER);
-#else
-    if(locked)
-        s = str(LANG_KEYLOCK_ON_RECORDER);
-    else
-        s = str(LANG_KEYLOCK_OFF_RECORDER);
-#endif
+        s = str(LANG_KEYLOCK_OFF);
     gui_syncsplash(HZ, s);
 }
 
Index: apps/gui/option_select.c
===================================================================
--- apps/gui/option_select.c	(revision 14056)
+++ apps/gui/option_select.c	(working copy)
@@ -409,7 +409,7 @@
                 }
             }
             if (show_cancel)
-                gui_syncsplash(HZ/2, str(LANG_MENU_SETTING_CANCEL));
+                gui_syncsplash(HZ/2, str(LANG_CANCEL));
             done = true;
         }
         else if (action == ACTION_STD_OK)
Index: apps/gui/yesno.c
===================================================================
--- apps/gui/yesno.c	(revision 14056)
+++ apps/gui/yesno.c	(working copy)
@@ -74,8 +74,10 @@
     {
         if(nb_lines+line_shift+3<=display->nb_lines)
             nb_lines++;
-        display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_PLAY_RECORDER));
-        display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY_RECORDER));
+        display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_BUTTON));
+#ifdef HAVE_LCD_BITMAP
+        display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY));
+#endif
     }
     gui_textarea_update(display);
 }
Index: apps/menus/recording_menu.c
===================================================================
--- apps/menus/recording_menu.c	(revision 14056)
+++ apps/menus/recording_menu.c	(working copy)
@@ -76,7 +76,7 @@
         HAVE_MIC_REC_([AUDIO_SRC_MIC]
             = { STR(LANG_RECORDING_SRC_MIC) },)
         HAVE_LINE_REC_([AUDIO_SRC_LINEIN]
-            = { STR(LANG_RECORDING_SRC_LINE) },)
+            = { STR(LANG_LINE_IN) },)
         HAVE_SPDIF_REC_([AUDIO_SRC_SPDIF]
             = { STR(LANG_RECORDING_SRC_DIGITAL) },)
         HAVE_FMRADIO_REC_([AUDIO_SRC_FMRADIO]
@@ -217,7 +217,7 @@
         [CHN_MODE_MONO]   = { STR(LANG_CHANNEL_MONO)   }
     };
 #if CONFIG_CODEC == MAS3587F
-    return set_option(str(LANG_RECORDING_CHANNELS),
+    return set_option(str(LANG_CHANNELS),
                       &global_settings.rec_channels, INT,
                       names, CHN_NUM_MODES, NULL );
 #endif /* CONFIG_CODEC == MAS3587F */
@@ -245,7 +245,7 @@
 
     make_options_from_indexes(names, table, n_opts, opts);
 
-    ret = set_option(str(LANG_RECORDING_CHANNELS), &rec_channels,
+    ret = set_option(str(LANG_CHANNELS), &rec_channels,
                      INT, opts, n_opts, NULL );
 
     if (!ret)
@@ -254,7 +254,7 @@
     return ret;
 #endif /* CONFIG_CODEC == SWCODEC */
 }
-MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), 
+MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS),
                     recchannels_func, NULL, NULL, Icon_Menu_setting);
 
 #if CONFIG_CODEC == SWCODEC
@@ -438,7 +438,7 @@
     static const unsigned char *trigger_modes[] = {
         ID2P(LANG_OFF),
         ID2P(LANG_RECORD_TRIG_NOREARM),
-        ID2P(LANG_RECORD_TRIG_REARM)
+        ID2P(LANG_REPEAT)
     };
 
 #define PRERECORD_TIMES_COUNT 31
@@ -452,18 +452,18 @@
 #define TRIGGER_TYPE_COUNT 3
     static const unsigned char *trigger_types[] = {
         ID2P(LANG_RECORD_TRIGGER_STOP),
-        ID2P(LANG_RECORD_TRIGGER_PAUSE),
+        ID2P(LANG_PAUSE),
         ID2P(LANG_RECORD_TRIGGER_NEWFILESTP),
     };
 
     static const unsigned char *option_name[] = {
-        [TRIGGER_MODE] =    ID2P(LANG_RECORD_TRIGGER_MODE),
+        [TRIGGER_MODE] =    ID2P(LANG_RECORD_TRIGGER),
         [TRIGGER_TYPE] =    ID2P(LANG_RECORD_TRIGGER_TYPE),
         [PRERECORD_TIME] =  ID2P(LANG_RECORD_PRERECORD_TIME),
         [START_THRESHOLD] = ID2P(LANG_RECORD_START_THRESHOLD),
-        [START_DURATION] =  ID2P(LANG_RECORD_MIN_DURATION),
+        [START_DURATION] =  ID2P(LANG_MIN_DURATION),
         [STOP_THRESHOLD] =  ID2P(LANG_RECORD_STOP_THRESHOLD),
-        [STOP_POSTREC] =    ID2P(LANG_RECORD_STOP_POSTREC),
+        [STOP_POSTREC] =    ID2P(LANG_MIN_DURATION),
         [STOP_GAP] =        ID2P(LANG_RECORD_STOP_GAP)
     };
 
@@ -637,7 +637,7 @@
 
         switch (button) {
             case ACTION_STD_CANCEL:
-                gui_syncsplash(50, str(LANG_MENU_SETTING_CANCEL));
+                gui_syncsplash(50, str(LANG_CANCEL));
                 global_settings.rec_start_thres = old_start_thres;
                 global_settings.rec_start_duration = old_start_duration;
                 global_settings.rec_prerecord_time = old_prerecord_time;
Index: apps/menus/settings_menu.c
===================================================================
--- apps/menus/settings_menu.c	(revision 14056)
+++ apps/menus/settings_menu.c	(working copy)
@@ -224,7 +224,7 @@
         tm.tm_year = YEAR-1900;
     }
 
-    result = (int)set_time_screen(str(LANG_TIME), &tm);
+    result = (int)set_time_screen(str(LANG_SET_TIME), &tm);
 
     if(tm.tm_year != -1) {
         set_time(&tm);
@@ -232,7 +232,7 @@
     return result;
 }
 
-MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), 
+MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), 
                     timedate_set, NULL, NULL, Icon_NOICON);
 MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL);
 MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat);
Index: apps/menus/playlist_menu.c
===================================================================
--- apps/menus/playlist_menu.c	(revision 14056)
+++ apps/menus/playlist_menu.c	(working copy)
@@ -75,10 +75,10 @@
 MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
 MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL);
 
-MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLIST_MENU), NULL,
+MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
           &recursive_dir_insert, &warn_on_erase);
-MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL,
+MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
           &create_playlist_item, &view_playlist, &save_playlist, &catalog);
 
Index: apps/menus/main_menu.c
===================================================================
--- apps/menus/main_menu.c	(revision 14056)
+++ apps/menus/main_menu.c	(working copy)
@@ -67,12 +67,12 @@
 
 static int reset_settings(void)
 {
-    unsigned char *lines[]={str(LANG_RESET_ASK_RECORDER)};
+    unsigned char *lines[]={str(LANG_RESET_ASK)};
     unsigned char *yes_lines[]={
-        str(LANG_RESET_DONE_SETTING),
+        str(LANG_SETTINGS),
         str(LANG_RESET_DONE_CLEAR)
     };
-    unsigned char *no_lines[]={yes_lines[0], str(LANG_RESET_DONE_CANCEL)};
+    unsigned char *no_lines[]={yes_lines[0], str(LANG_CANCEL)};
     struct text_message message={(char **)lines, 1};
     struct text_message yes_message={(char **)yes_lines, 2};
     struct text_message no_message={(char **)no_lines, 2};
@@ -186,9 +186,11 @@
                     talk_value(battery_level(), UNIT_PERCENT, true);
 #if CONFIG_CHARGING >= CHARGING_MONITOR
                     if (charge_state == CHARGING)
-                        talk_id(LANG_BATTERY_CHARGE, true);               
+                        talk_id(LANG_BATTERY_CHARGE, true);
+#if CONFIG_CHARGING == CHARGING_CONTROL
                     else if (charge_state == TOPOFF)
                         talk_id(LANG_BATTERY_TOPOFF_CHARGE, true);
+#endif
                     else if (charge_state == TRICKLE)
                         talk_id(LANG_BATTERY_TRICKLE_CHARGE, true);
 #endif
@@ -252,13 +254,9 @@
             int integer = buflen / 1000;
             int decimal = buflen % 1000;
 
-#ifdef HAVE_LCD_CHARCELLS
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_PLAYER),
+            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT),
                      integer, decimal);
-#else
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_RECORDER),
-                     integer, decimal);
-#endif
+
             FOR_NB_SCREENS(i)
                 screens[i].puts_scroll(0, y, (unsigned char *)s);
             y++;
@@ -341,7 +339,7 @@
 
 #ifndef SIMULATOR
             case ACTION_STD_OK:
-                gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING));
+                gui_syncsplash(0, str(LANG_SCANNING_DISK));
                 fat_recalc_free(IF_MV(0));
 #ifdef HAVE_MULTIVOLUME
                 if (fat_ismounted(1))
@@ -359,7 +357,7 @@
     }
     return false;
 }
-MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU),
+MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO),
                    (menu_function)show_info, NULL, NULL, Icon_NOICON);
 
 
@@ -406,7 +404,7 @@
                    (menu_function)simulate_usb, NULL, NULL, Icon_NOICON);
 #endif
 
-MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark,
+MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark,
           &show_info_item, &show_credits_item, &show_runtime_item, 
           &sleep_timer_call, &debug_menu_item
 #ifdef SIMULATOR
@@ -440,7 +438,7 @@
 #else
 #define mainmenu_callback NULL
 #endif
-MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS_MENU), mainmenu_callback,
+MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
         Icon_Submenu_Entered,
         &sound_settings,
         &settings_menu_item, &manage_settings, &browse_themes,
Index: apps/menus/eq_menu.c
===================================================================
--- apps/menus/eq_menu.c	(revision 14056)
+++ apps/menus/eq_menu.c	(working copy)
@@ -281,8 +281,8 @@
 #if NB_SCREENS > 1
     if (screen->screen_type == SCREEN_REMOTE) {
         if (mode == GAIN) {
-            screen->putsxy(current_x, y + 2, str(LANG_EQUALIZER_BAND_GAIN));
-            screen->getstringsize(str(LANG_EQUALIZER_BAND_GAIN), &w, &h);
+            screen->putsxy(current_x, y + 2, str(LANG_GAIN));
+            screen->getstringsize(str(LANG_GAIN), &w, &h);
         } else if (mode == CUTOFF) {
             screen->putsxy(current_x, y + 2, str(LANG_EQUALIZER_BAND_CUTOFF));
             screen->getstringsize(str(LANG_EQUALIZER_BAND_CUTOFF), &w, &h);
@@ -454,7 +454,7 @@
             voice_unit = UNIT_DB;
             
             snprintf(buf, sizeof(buf), str(LANG_SYSFONT_EQUALIZER_EDIT_MODE),
-                str(LANG_SYSFONT_EQUALIZER_BAND_GAIN));
+                str(LANG_SYSFONT_GAIN));
             
             screens[SCREEN_MAIN].putsxy(2, y, buf);
         } else if (mode == CUTOFF) {
@@ -596,7 +596,7 @@
                 break;
         }
         else {
-            gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL));
+            gui_syncsplash(HZ, str(LANG_CANCEL));
             return false;
         }
     }
Index: apps/menus/playback_menu.c
===================================================================
--- apps/menus/playback_menu.c	(revision 14056)
+++ apps/menus/playback_menu.c	(working copy)
@@ -165,7 +165,7 @@
 MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL);
 MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL);
 MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL);
-MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON,
+MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON,
           &unplug_mode, &unplug_rw, &unplug_autoresume);
 #endif
 
Index: apps/playlist_viewer.c
===================================================================
--- apps/playlist_viewer.c	(revision 14056)
+++ apps/playlist_viewer.c	(working copy)
@@ -430,7 +430,7 @@
     int result, ret = 0;
     struct playlist_entry * current_track=
         playlist_buffer_get_track(&viewer.buffer, index);
-    MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST_MENU), NULL, 
+    MENUITEM_STRINGLIST(menu_items, ID2P(LANG_PLAYLIST), NULL, 
                         ID2P(LANG_REMOVE), ID2P(LANG_MOVE),
                         ID2P(LANG_CATALOG_ADD_TO), ID2P(LANG_CATALOG_ADD_TO_NEW));
     bool current = (current_track->index == viewer.current_playing_track);
@@ -569,7 +569,7 @@
                   &playlist_callback_icons:NULL);
     gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks);
     gui_synclist_select_item(&playlist_lists, viewer.selected_track);
-    gui_synclist_set_title(&playlist_lists, str(LANG_PLAYLIST_MENU), Icon_Playlist);
+    gui_synclist_set_title(&playlist_lists, str(LANG_PLAYLIST), Icon_Playlist);
     gui_synclist_draw(&playlist_lists);
     while (!exit)
     {
@@ -577,7 +577,7 @@
         if (global_status.resume_index == -1)
         {
             /* Play has stopped */
-            gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER));
+            gui_syncsplash(HZ, str(LANG_END_PLAYLIST));
             goto exit;
         }
 
@@ -635,8 +635,8 @@
                     ret_val = playlist_move(viewer.playlist, viewer.move_track,
                         current_track->index);
                     if (ret_val < 0)
-                        gui_syncsplash(HZ, str(LANG_MOVE_FAILED));
-
+                         gui_syncsplash(HZ, (unsigned char *)"%s %s",
+                             str(LANG_MOVE), str(LANG_FAILED));
                     update_playlist(true);
                     viewer.move_track = -1;
                 }
@@ -749,12 +749,7 @@
     for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++)
     {
         gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG),found_indicies_count,
-#if CONFIG_KEYPAD == PLAYER_PAD
-                   str(LANG_STOP_ABORT)
-#else
-                   str(LANG_OFF_ABORT)
-#endif
-        );
+                   str(LANG_OFF_ABORT));
         if (action_userabort(TIMEOUT_NOBLOCK))
             return ret;
         playlist_get_track_info(viewer.playlist,i,&track);
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c	(revision 14056)
+++ apps/settings_list.c	(working copy)
@@ -387,8 +387,8 @@
     OFFON_SETTING(0, superbass, LANG_SUPERBASS, false, "superbass", set_superbass),
 #endif
          
-    CHOICE_SETTING(0,channel_config,LANG_CHANNEL,0,"channels",
-         "stereo,mono,custom,mono left,mono right,karaoke", 
+    CHOICE_SETTING(0,channel_config,LANG_CHANNEL_CONFIGURATION,0,"channels",
+         "stereo,mono,custom,mono left,mono right,karaoke",
          sound_set_channels,
          6, ID2P(LANG_CHANNEL_STEREO), ID2P(LANG_CHANNEL_MONO),
             ID2P(LANG_CHANNEL_CUSTOM), ID2P(LANG_CHANNEL_LEFT),
@@ -412,7 +412,7 @@
 #else
         4,
 #endif
-        ID2P(LANG_OFF), ID2P(LANG_REPEAT_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE)
+        ID2P(LANG_OFF), ID2P(LANG_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE)
 #ifdef AB_REPEAT_ENABLE
         ,ID2P(LANG_REPEAT_AB)
 #endif
@@ -440,9 +440,13 @@
 #endif
 #endif /* HAVE_BACKLIGHT */
 #ifdef HAVE_LCD_BITMAP
+#ifdef HAVE_LCD_INVERT
     BOOL_SETTING(0, invert, LANG_INVERT, false ,"invert", off_on,
-        LANG_INVERT_LCD_INVERSE, LANG_INVERT_LCD_NORMAL, lcd_set_invert_display),
+        LANG_INVERT_LCD_INVERSE, LANG_NORMAL, lcd_set_invert_display),
+#endif
+#ifdef HAVE_LCD_FLIP
     OFFON_SETTING(0,flip_display, LANG_FLIP_DISPLAY, false,"flip display", NULL),
+#endif
     /* display */
     BOOL_SETTING(F_TEMPVAR, invert_cursor, LANG_INVERT_CURSOR, true ,"invert cursor", off_on,
         LANG_INVERT_CURSOR_BAR, LANG_INVERT_CURSOR_POINTER, NULL),
@@ -457,9 +461,11 @@
     CHOICE_SETTING(0, battery_display, LANG_BATTERY_DISPLAY, 0,
         "battery display", graphic_numeric, NULL, 2,
         ID2P(LANG_DISPLAY_GRAPHIC), ID2P(LANG_DISPLAY_NUMERIC)),
+#if CONFIG_RTC
     CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0,
         "time format", "24hour,12hour", NULL, 2,
         ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)),
+#endif
 #endif /* HAVE_LCD_BITMAP */
     OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL),
     /* system */
@@ -514,7 +520,7 @@
         "remote contrast", UNIT_INT, MIN_REMOTE_CONTRAST_SETTING, 
         MAX_REMOTE_CONTRAST_SETTING, 1, NULL, NULL, lcd_remote_set_contrast),
     BOOL_SETTING(0, remote_invert, LANG_INVERT, false ,"remote invert", off_on,
-        LANG_INVERT_LCD_INVERSE, LANG_INVERT_LCD_NORMAL, lcd_remote_set_invert_display),
+        LANG_INVERT_LCD_INVERSE, LANG_NORMAL, lcd_remote_set_invert_display),
     OFFON_SETTING(0,remote_flip_display, LANG_FLIP_DISPLAY,
         false,"remote flip display", NULL),
     INT_SETTING_W_CFGVALS(F_FLIPLIST, remote_backlight_timeout, LANG_BACKLIGHT, 6,
@@ -628,10 +634,9 @@
         TALK_ID(5, UNIT_SEC), TALK_ID(15, UNIT_SEC),
         TALK_ID(30, UNIT_SEC), TALK_ID(1, UNIT_MIN), TALK_ID(2, UNIT_MIN),
         TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN)),
-#else
     INT_SETTING(0, buffer_margin, LANG_MP3BUFFER_MARGIN, 0, "antiskip",
                     UNIT_SEC, 0, 7, 1, NULL, NULL, audio_set_buffer_margin),
-#endif
+#endif /* CONFIG_CODEC */
     /* disk */
 #ifndef HAVE_MMC
     INT_SETTING(0, disk_spindown, LANG_SPINDOWN, 5, "disk spindown",
@@ -639,8 +644,8 @@
 #endif /* HAVE_MMC */
     /* browser */
     CHOICE_SETTING(0, dirfilter, LANG_FILTER, SHOW_SUPPORTED, "show files",
-        "all,supported,music,playlists", NULL, 4, ID2P(LANG_FILTER_ALL),
-        ID2P(LANG_FILTER_SUPPORTED), ID2P(LANG_FILTER_MUSIC), ID2P(LANG_FILTER_PLAYLIST)),
+        "all,supported,music,playlists", NULL, 4, ID2P(LANG_ALL),
+        ID2P(LANG_FILTER_SUPPORTED), ID2P(LANG_FILTER_MUSIC), ID2P(LANG_PLAYLISTS)),
     OFFON_SETTING(0,sort_case,LANG_SORT_CASE,false,"sort case",NULL),
     OFFON_SETTING(0,browse_current,LANG_FOLLOW,false,"follow playlist",NULL),
     OFFON_SETTING(0,playlist_viewer_icons,LANG_SHOW_ICONS,true,
@@ -652,17 +657,17 @@
                     ID2P(LANG_DISPLAY_TRACK_NAME_ONLY), ID2P(LANG_DISPLAY_FULL_PATH)),
     CHOICE_SETTING(0, recursive_dir_insert, LANG_RECURSE_DIRECTORY , RECURSE_OFF,
         "recursive directory insert", off_on_ask, NULL , 3 ,
-        ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_RESUME_SETTING_ASK)),
+        ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_ASK)),
     /* bookmarks */
     CHOICE_SETTING(0, autocreatebookmark, LANG_BOOKMARK_SETTINGS_AUTOCREATE,
         BOOKMARK_NO, "autocreate bookmarks",
         "off,on,ask,recent only - on,recent only - ask", NULL, 5,
         ID2P(LANG_SET_BOOL_NO), ID2P(LANG_SET_BOOL_YES),
-        ID2P(LANG_RESUME_SETTING_ASK), ID2P(LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES),
+        ID2P(LANG_ASK), ID2P(LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES),
         ID2P(LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK)),
     CHOICE_SETTING(0, autoloadbookmark, LANG_BOOKMARK_SETTINGS_AUTOLOAD, 
         BOOKMARK_NO, "autoload bookmarks", off_on_ask, NULL, 3,
-        ID2P(LANG_SET_BOOL_NO), ID2P(LANG_SET_BOOL_YES), ID2P(LANG_RESUME_SETTING_ASK)),
+        ID2P(LANG_SET_BOOL_NO), ID2P(LANG_SET_BOOL_YES), ID2P(LANG_ASK)),
     CHOICE_SETTING(0, usemrb, LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS,
         BOOKMARK_NO, "use most-recent-bookmarks", "off,on,unique only", NULL, 3,
         ID2P(LANG_SET_BOOL_NO), ID2P(LANG_SET_BOOL_YES),
@@ -763,14 +768,14 @@
         TALK_ID(512, UNIT_MB), TALK_ID(650, UNIT_MB), TALK_ID(700, UNIT_MB), 
         TALK_ID(1024, UNIT_MB), TALK_ID(1536, UNIT_MB), TALK_ID(1792, UNIT_MB)),
     {F_T_INT|F_RECSETTING, &global_settings.rec_channels,
-        LANG_RECORDING_CHANNELS, INT(0),
+        LANG_CHANNELS, INT(0),
         "rec channels","stereo,mono",UNUSED},
     CHOICE_SETTING(F_RECSETTING, rec_split_type, LANG_SPLIT_TYPE, 0 ,
         "rec split type", "Split, Stop", NULL, 2,
         ID2P(LANG_START_NEW_FILE), ID2P(LANG_STOP_RECORDING)),
     CHOICE_SETTING(F_RECSETTING, rec_split_method, LANG_SPLIT_MEASURE, 0 ,
         "rec split method", "Time,Filesize", NULL, 2,
-        ID2P(LANG_REC_TIME), ID2P(LANG_REC_SIZE)),
+        ID2P(LANG_TIME), ID2P(LANG_REC_SIZE)),
     {F_T_INT|F_RECSETTING, &global_settings.rec_source,
         LANG_RECORDING_SOURCE, INT(0),
         "rec source",
@@ -789,21 +794,18 @@
     CHOICE_SETTING(F_RECSETTING, cliplight, LANG_CLIP_LIGHT, 0 ,
         "cliplight", "off,main,both,remote", NULL, 
 #ifdef HAVE_REMOTE_LCD
-        4,
+        4, ID2P(LANG_OFF), ID2P(LANG_MAIN_UNIT), ID2P(LANG_REMOTE_MAIN),
+        ID2P(LANG_REMOTE_UNIT)
 #else
-        2,
+        2, ID2P(LANG_OFF), ID2P(LANG_ON)
 #endif
-        ID2P(LANG_OFF), ID2P(LANG_MAIN_UNIT)
-#ifdef HAVE_REMOTE_LCD
-        , ID2P(LANG_REMOTE_MAIN), ID2P(LANG_REMOTE_UNIT)
-#endif
         ),
     {F_T_INT|F_RECSETTING,&global_settings.cliplight,LANG_CLIP_LIGHT,INT(0),
         "cliplight","off,main,both,remote",UNUSED},
 #endif
 #ifdef DEFAULT_REC_MIC_GAIN
     {F_T_INT|F_RECSETTING,&global_settings.rec_mic_gain,
-        LANG_RECORDING_GAIN,INT(DEFAULT_REC_MIC_GAIN),
+        LANG_GAIN,INT(DEFAULT_REC_MIC_GAIN),
         "rec mic gain",NULL,UNUSED},
 #endif /* DEFAULT_REC_MIC_GAIN */
 #ifdef DEFAULT_REC_LEFT_GAIN
@@ -854,16 +856,16 @@
         LANG_RECORD_STOP_THRESHOLD,INT(-45),
         "trigger stop threshold",NULL,UNUSED},
     {F_T_INT|F_RECSETTING,&global_settings.rec_start_duration,
-        LANG_RECORD_MIN_DURATION,INT(0),
+        LANG_MIN_DURATION,INT(0),
         "trigger start duration",trig_durations_conf,UNUSED},
     {F_T_INT|F_RECSETTING,&global_settings.rec_stop_postrec,
-        LANG_RECORD_STOP_POSTREC,INT(2),
+        LANG_MIN_DURATION,INT(2),
         "trigger stop postrec",trig_durations_conf,UNUSED},
     {F_T_INT|F_RECSETTING,&global_settings.rec_stop_gap,
         LANG_RECORD_STOP_GAP,INT(1),
         "trigger min gap",trig_durations_conf,UNUSED},
     {F_T_INT|F_RECSETTING,&global_settings.rec_trigger_mode,
-        LANG_RECORD_TRIGGER_MODE,INT(0),
+        LANG_RECORD_TRIGGER,INT(0),
         "trigger mode","off,once,repeat",UNUSED},
 #endif /* HAVE_RECORDING */
 
@@ -960,19 +962,19 @@
                     UNIT_INT, EQ_Q_MIN, EQ_Q_MAX, EQ_Q_STEP,
                     eq_q_format, NULL, NULL),
     /* -240..240 (or -24db to +24db) */
-    INT_SETTING(0, eq_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 0 gain",
+    INT_SETTING(0, eq_band0_gain, LANG_GAIN, 0, "eq band 0 gain",
                     UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
                     eq_gain_format, NULL, NULL),
-    INT_SETTING(0, eq_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 1 gain",
+    INT_SETTING(0, eq_band1_gain, LANG_GAIN, 0, "eq band 1 gain",
                     UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
                     eq_gain_format, NULL, NULL),
-    INT_SETTING(0, eq_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 2 gain",
+    INT_SETTING(0, eq_band2_gain, LANG_GAIN, 0, "eq band 2 gain",
                     UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
                     eq_gain_format, NULL, NULL),
-    INT_SETTING(0, eq_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 3 gain",
+    INT_SETTING(0, eq_band3_gain, LANG_GAIN, 0, "eq band 3 gain",
                     UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
                     eq_gain_format, NULL, NULL),
-    INT_SETTING(0, eq_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, "eq band 4 gain",
+    INT_SETTING(0, eq_band4_gain, LANG_GAIN, 0, "eq band 4 gain",
                     UNIT_DB, EQ_GAIN_MIN, EQ_GAIN_MAX, EQ_GAIN_STEP,
                     eq_gain_format, NULL, NULL),
 
@@ -992,9 +994,10 @@
     OFFON_SETTING(0,tagcache_autoupdate,
         LANG_TAGCACHE_AUTOUPDATE,false,"tagcache_autoupdate",NULL),
 #endif
+    CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0,
+        "default codepage",
 #ifdef HAVE_LCD_BITMAP
-    CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0,
-        "default codepage", /* The order must match with that in unicode.c */
+        /* The order must match with that in unicode.c */
         "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,cp1256,"
         "iso8859-9,iso8859-2,sjis,gb2312,ksx1001,big5,utf-8",
         set_codepage, 13,
@@ -1006,15 +1009,13 @@
         ID2P(LANG_CODEPAGE_KOREAN), ID2P(LANG_CODEPAGE_TRADITIONAL),
         ID2P(LANG_CODEPAGE_UTF8)),
 #else /* !HAVE_LCD_BITMAP */
-    CHOICE_SETTING(0, default_codepage, LANG_DEFAULT_CODEPAGE, 0,
-        "default codepage", /* The order must match with that in unicode.c */
+        /* The order must match with that in unicode.c */
         "iso8859-1,iso8859-7,cp1251,iso8859-9,iso8859-2,utf-8",
         set_codepage, 6,
         ID2P(LANG_CODEPAGE_LATIN1), ID2P(LANG_CODEPAGE_GREEK),
         ID2P(LANG_CODEPAGE_CYRILLIC), ID2P(LANG_CODEPAGE_TURKISH),
         ID2P(LANG_CODEPAGE_LATIN_EXTENDED), ID2P(LANG_CODEPAGE_UTF8)),
 #endif
-
     OFFON_SETTING(0,warnon_erase_dynplaylist,
         LANG_WARN_ERASEDYNPLAYLIST_MENU,false,
         "warn when erasing dynamic playlist",NULL),
@@ -1024,7 +1025,7 @@
     CHOICE_SETTING(0, backlight_on_button_hold,
         LANG_BACKLIGHT_ON_BUTTON_HOLD, 0, "backlight on button hold",
         "normal,off,on", backlight_set_on_button_hold, 3,
-        ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
+        ID2P(LANG_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
 #endif
 
 #ifdef HAVE_LCD_SLEEP
@@ -1046,7 +1047,7 @@
         "eq hardware band 0 cutoff", "80Hz,105Hz,135Hz,175Hz", NULL, 4,
         TALK_ID(80, UNIT_HERTZ), TALK_ID(105, UNIT_HERTZ), 
         TALK_ID(135, UNIT_HERTZ), TALK_ID(175, UNIT_HERTZ)),
-    INT_SETTING(0, eq_hw_band0_gain, LANG_EQUALIZER_BAND_GAIN, 0, 
+    INT_SETTING(0, eq_hw_band0_gain, LANG_GAIN, 0, 
         "eq hardware band 0 gain", UNIT_DB, EQ_HW_GAIN_MIN, 
         EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
 
@@ -1058,7 +1059,7 @@
         "eq hardware band 1 bandwidth", "narrow,wide", NULL, 2,
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), 
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
-    INT_SETTING(0, eq_hw_band1_gain, LANG_EQUALIZER_BAND_GAIN, 0, 
+    INT_SETTING(0, eq_hw_band1_gain, LANG_GAIN, 0, 
         "eq hardware band 1 gain", UNIT_DB, EQ_HW_GAIN_MIN, 
         EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
 
@@ -1070,7 +1071,7 @@
         "eq hardware band 2 bandwidth", "narrow,wide", NULL, 2,
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), 
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
-    INT_SETTING(0, eq_hw_band2_gain, LANG_EQUALIZER_BAND_GAIN, 0, 
+    INT_SETTING(0, eq_hw_band2_gain, LANG_GAIN, 0, 
         "eq hardware band 2 gain", UNIT_DB, EQ_HW_GAIN_MIN, 
         EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
 
@@ -1082,7 +1083,7 @@
         "eq hardware band 3 bandwidth", "narrow,wide", NULL, 2,
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW), 
         ID2P(LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE)),
-    INT_SETTING(0, eq_hw_band3_gain, LANG_EQUALIZER_BAND_GAIN, 0, 
+    INT_SETTING(0, eq_hw_band3_gain, LANG_GAIN, 0, 
         "eq hardware band 3 gain", UNIT_DB, EQ_HW_GAIN_MIN, 
         EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
 
@@ -1090,7 +1091,7 @@
         "eq hardware band 4 cutoff", "5.3kHz,6.9kHz,9kHz,11.7kHz", NULL, 4,
         TALK_ID(5300, UNIT_HERTZ), TALK_ID(6900, UNIT_HERTZ), 
         TALK_ID(9000, UNIT_HERTZ), TALK_ID(11700, UNIT_HERTZ)),
-    INT_SETTING(0, eq_hw_band4_gain, LANG_EQUALIZER_BAND_GAIN, 0, 
+    INT_SETTING(0, eq_hw_band4_gain, LANG_GAIN, 0, 
         "eq hardware band 4 gain", UNIT_DB, EQ_HW_GAIN_MIN, 
         EQ_HW_GAIN_MAX, EQ_HW_GAIN_STEP, eq_hw_gain_format, NULL, NULL),
 #endif
@@ -1099,7 +1100,7 @@
         "hold_lr_for_scroll_in_list",NULL),
     CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_OFF,
         "show path in browser", "off,current directory,full path", NULL, 3,
-        ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), ID2P(LANG_SHOW_PATH_FULL)),
+        ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), ID2P(LANG_DISPLAY_FULL_PATH)),
 
 #ifdef HAVE_AGC
     {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORD_AGC_PRESET,INT(1),
@@ -1119,16 +1120,16 @@
     CHOICE_SETTING(0, remote_backlight_on_button_hold,
         LANG_BACKLIGHT_ON_BUTTON_HOLD, 0, "remote backlight on button hold",
         "normal,off,on", remote_backlight_set_on_button_hold, 3,
-        ID2P(LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
+        ID2P(LANG_NORMAL), ID2P(LANG_OFF), ID2P(LANG_ON)),
 #endif
 #endif
 #ifdef HAVE_HEADPHONE_DETECTION
-    CHOICE_SETTING(0, unplug_mode, LANG_UNPLUG, 0,
+    CHOICE_SETTING(0, unplug_mode, LANG_HEADPHONE_UNPLUG, 0,
         "pause on headphone unplug", "off,pause,pause and resume", NULL, 3,
-        ID2P(LANG_OFF), ID2P(LANG_PAUSE), ID2P(LANG_UNPLUG_RESUME)),
-    INT_SETTING(0, unplug_rw, LANG_UNPLUG_RW, 0, "rewind duration on pause",                      
+        ID2P(LANG_OFF), ID2P(LANG_PAUSE), ID2P(LANG_HEADPHONE_UNPLUG_RESUME)),
+    INT_SETTING(0, unplug_rw, LANG_HEADPHONE_UNPLUG_RW, 0, "rewind duration on pause",                      
                     UNIT_SEC, 0, 15, 1, NULL, NULL,NULL) ,
-    OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false,
+    OFFON_SETTING(0,unplug_autoresume,LANG_HEADPHONE_UNPLUG_RESUME,false,
         "disable autoresume if phones not present",NULL),
 #endif
 #if CONFIG_TUNER
@@ -1191,7 +1192,7 @@
 #endif
             ID2P(LANG_PREVIOUS_SCREEN), ID2P(LANG_MAIN_MENU),
             ID2P(LANG_DIR_BROWSER), ID2P(LANG_TAGCACHE),
-            ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS_MENU),
+            ID2P(LANG_RESUME_PLAYBACK), ID2P(LANG_SETTINGS),
 #ifdef HAVE_RECORDING
             ID2P(LANG_RECORDING),
 #endif
Index: apps/talk.c
===================================================================
--- apps/talk.c	(revision 14056)
+++ apps/talk.c	(working copy)
@@ -95,6 +95,7 @@
 struct voicefile /* file format of our voice file */
 {
     int version; /* version of the voicefile */
+    int target_id; /* the rockbox target the file was made for */
     int table;   /* offset to index table, (=header size) */
     int id1_max; /* number of "normal" clips contained in above index */
     int id2_max; /* number of "voice only" clips contained in above index */
@@ -197,6 +198,11 @@
     {
         p_voicefile = (struct voicefile*)audiobuf;
 
+        if (p_voicefile->target_id != TARGET_ID)
+        {
+            logf("Incompatible voice file (wrong target)");
+            goto load_err;
+        }
 #if CONFIG_CODEC != SWCODEC
         /* MASCODEC: now use audiobuf for voice then thumbnail */
         p_thumbnail = audiobuf + file_size;
Index: apps/features.txt
===================================================================
--- apps/features.txt	(revision 0)
+++ apps/features.txt	(revision 0)
@@ -0,0 +1,155 @@
+/* This file controls which strings are included when rockbox is built and
+   when the .lng and .voice files are built. That means that a change in this
+   file will break compatiblity with older .lng and .voice files and that those
+   version numbers should be updated. It also means that changing defines in
+   the various config*.h files could also break back compatiblity */  
+
+#if defined(HAVE_AGC)
+agc
+#endif
+
+#if defined(HAVE_RTC_ALARM)
+alarm
+#endif
+
+#if defined(HAVE_BACKLIGHT_BRIGHTNESS)
+backlight_brightness
+#endif
+
+#if defined(HAVE_BACKLIGHT_PWM_FADING)
+backlight_fade
+#endif
+
+#if BATTERY_TYPES_COUNT > 1
+battery_types
+#endif
+
+#if defined(HAVE_DIRCACHE)
+dircache
+#endif
+
+#if defined(HAVE_HEADPHONE_DETECTION)
+headphone_detection
+#endif
+
+#if defined(HAS_BUTTON_HOLD)
+hold_button
+#endif
+
+#if defined(HAVE_LCD_BITMAP)
+lcd_bitmap
+#endif
+
+#if defined(HAVE_LCD_CHARCELLS)
+lcd_charcell
+#endif
+
+#if LCD_DEPTH > 1
+lcd_non-mono
+#endif
+
+#if defined(HAVE_LCD_COLOR)
+lcd_color
+#endif
+
+#if defined(HAVE_LCD_FLIP)
+lcd_flip
+#endif
+
+#if defined(HAVE_LCD_INVERT) || defined(HAVE_REMOTE_LCD)
+lcd_invert
+#endif
+
+#if defined(HAVE_LCD_SLEEP)
+lcd_sleep
+#endif
+
+#if defined(HAVE_PITCHSCREEN)
+pitchscreen
+#endif
+
+#if defined(HAVE_MULTIVOLUME)
+multivolume
+#endif
+
+#if defined(HAVE_QUICKSCREEN)
+quickscreen
+#endif
+
+#if defined(CONFIG_TUNER)
+radio
+#endif
+
+#if (CONFIG_KEYPAD == RECORDER_PAD)
+recorder_pad
+#if defined(CONFIG_TUNER)
+radio_screen_button_bar
+#endif
+#endif
+
+#if defined(HAVE_RECORDING)
+recording
+#if CONFIG_CODEC == SWCODEC
+recording_swcodec
+#else
+recording_hwcodec
+#endif
+#endif
+
+#if defined(HAVE_REMOTE_LCD)
+remote
+#endif
+
+#if defined(HAVE_REMOTE_LCD_TICKING)
+remote_ticking
+#endif
+
+#if CONFIG_RTC
+rtc
+#endif
+
+#if defined(HAVE_SCROLLWHEEL)
+scrollwheel
+#endif
+
+#if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
+soft_shutdown
+#endif
+
+#if defined(HAVE_SPDIF_POWER)
+spdif_power
+#endif
+
+#if CONFIG_CODEC == SWCODEC
+swcodec
+#else
+hwcodec
+#endif
+
+#if defined(HAVE_TAGCACHE)
+tagcache
+#endif
+
+#if defined(HAVE_TC_RAMCACHE)
+tc_ramcache
+#endif
+
+#if CONFIG_CHARGING || defined(SIMULATOR)
+charging
+#if defined(HAVE_USB_POWER) || defined(SIMULATOR)
+usb_charging
+#endif
+#endif
+
+#if defined(SIMULATOR)
+sim
+#endif
+
+#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+masf
+#endif
+
+#if (CONFIG_CODEC == MAS3507D)
+masd
+#endif
+
Index: apps/filetypes.c
===================================================================
--- apps/filetypes.c	(revision 14056)
+++ apps/filetypes.c	(working copy)
@@ -101,7 +101,7 @@
     { "kbd", FILE_ATTR_KBD, Icon_Keyboard, VOICE_EXT_KBD },
 #endif
     { "bmark",FILE_ATTR_BMARK, Icon_Bookmark,  VOICE_EXT_BMARK },
-    { "cue",  FILE_ATTR_CUE,   Icon_Bookmark,  LANG_CUESHEET },
+    { "cue",  FILE_ATTR_CUE,   Icon_Bookmark,  VOICE_EXT_CUESHEET },
 #ifdef BOOTFILE_EXT
     { BOOTFILE_EXT, FILE_ATTR_MOD, Icon_Firmware, VOICE_EXT_AJZ },
 #endif /* #ifndef SIMULATOR */
Index: apps/bookmark.c
===================================================================
--- apps/bookmark.c	(revision 14056)
+++ apps/bookmark.c	(working copy)
@@ -190,7 +190,7 @@
     struct text_message message={(char **)lines, 1};
 #else
     unsigned char *lines[]={str(LANG_AUTO_BOOKMARK_QUERY),
-                            str(LANG_RESUME_CONFIRM_PLAYER)};
+                            str(LANG_CONFIRM_WITH_BUTTON)};
     struct text_message message={(char **)lines, 2};
 #endif
 #if LCD_DEPTH > 1
@@ -819,7 +819,7 @@
     talk_number(bookmark_id + 1, true);
     talk_id(VOICE_BOOKMARK_SELECT_INDEX_TEXT, true);
     talk_number(resume_index + 1, true);
-    talk_id(VOICE_BOOKMARK_SELECT_TIME_TEXT, true);
+    talk_id(LANG_TIME, true);
     if (ms / 60000)
         talk_value(ms / 60000, UNIT_MIN, true);
     talk_value((ms % 60000) / 1000, UNIT_SEC, true);
Index: apps/root_menu.c
===================================================================
--- apps/root_menu.c	(revision 14056)
+++ apps/root_menu.c	(working copy)
@@ -315,14 +315,14 @@
 MENUITEM_RETURNVALUE_DYNTEXT(wps_item, GO_TO_WPS, NULL, get_wps_item_name, 
                                 NULL, Icon_Playback_menu);
 #ifdef HAVE_RECORDING
-MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING_MENU), GO_TO_RECSCREEN,  
+MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING), GO_TO_RECSCREEN,  
                         NULL, Icon_Recording);
 #endif
 #if CONFIG_TUNER
 MENUITEM_RETURNVALUE(fm, ID2P(LANG_FM_RADIO), GO_TO_FM,  
                         item_callback, Icon_Radio_screen);
 #endif
-MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS_MENU), GO_TO_MAINMENU,  
+MENUITEM_RETURNVALUE(menu_, ID2P(LANG_SETTINGS), GO_TO_MAINMENU,  
                         NULL, Icon_Submenu_Entered);
 MENUITEM_RETURNVALUE(bookmarks, ID2P(LANG_BOOKMARK_MENU_RECENT_BOOKMARKS),
                         GO_TO_RECENTBMARKS,  item_callback, 
Index: apps/main.c
===================================================================
--- apps/main.c	(revision 14056)
+++ apps/main.c	(working copy)
@@ -151,7 +151,7 @@
             {
                 /* This will be in default language, settings are not
                    applied yet. Not really any easy way to fix that. */
-                gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING));
+                gui_syncsplash(0, str(LANG_SCANNING_DISK));
                 clear = true;
             }
             
@@ -169,7 +169,7 @@
         {
             if (global_status.dircache_size <= 0)
             {
-                gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING));
+                gui_syncsplash(0, str(LANG_SCANNING_DISK));
                 clear = true;
             }
             result = dircache_build(global_status.dircache_size);
Index: apps/playlist_catalog.c
===================================================================
--- apps/playlist_catalog.c	(revision 14056)
+++ apps/playlist_catalog.c	(working copy)
@@ -320,12 +320,7 @@
 static void display_insert_count(int count)
 {
     gui_syncsplash(0, str(LANG_PLAYLIST_INSERT_COUNT), count,
-#if CONFIG_KEYPAD == PLAYER_PAD
-        str(LANG_STOP_ABORT)
-#else
-        str(LANG_OFF_ABORT)
-#endif
-        );
+        str(LANG_OFF_ABORT));
 }
 
 /* Add specified track into playlist.  Callback from directory insert */
Index: apps/tagtree.c
===================================================================
--- apps/tagtree.c	(revision 14056)
+++ apps/tagtree.c	(working copy)
@@ -915,12 +915,7 @@
     if (current_tick - last_tick > HZ/4)
     {
         gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG), count,
-#if CONFIG_KEYPAD == PLAYER_PAD
-                       str(LANG_STOP_ABORT)
-#else
-                       str(LANG_OFF_ABORT)
-#endif
-                       );
+                          str(LANG_OFF_ABORT));
         if (action_userabort(TIMEOUT_NOBLOCK))
             return false;
         last_tick = current_tick;
@@ -1603,7 +1598,7 @@
     }
 
     if (tc->filesindir <= 0)
-        gui_syncsplash(HZ, str(LANG_END_PLAYLIST_PLAYER));
+        gui_syncsplash(HZ, str(LANG_END_PLAYLIST));
     else
     {
         logf("insert_all_playlist");