Index: tools/genlang =================================================================== --- tools/genlang (revision 12140) +++ 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 Index: apps/screens.c =================================================================== --- apps/screens.c (revision 12140) +++ apps/screens.c (working copy) @@ -393,7 +393,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); @@ -403,9 +403,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); @@ -414,9 +414,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); @@ -438,7 +438,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%" */ @@ -1148,7 +1148,7 @@ LANG_ID3_LENGTH, LANG_ID3_PLAYLIST, LANG_ID3_BITRATE, - LANG_ID3_FRECUENCY, + LANG_ID3_FREQUENCY, #if CONFIG_CODEC == SWCODEC LANG_ID3_TRACK_GAIN, LANG_ID3_ALBUM_GAIN, @@ -1207,7 +1207,7 @@ id3->vbr ? str(LANG_ID3_VBR) : (const unsigned char*) ""); info=buffer; break; - case 9:/*LANG_ID3_FRECUENCY*/ + case 9:/*LANG_ID3_FREQUENCY*/ snprintf(buffer, MAX_PATH, "%ld Hz", id3->frequency); info=buffer; break; Index: apps/main_menu.c =================================================================== --- apps/main_menu.c (revision 12140) +++ apps/main_menu.c (working copy) @@ -174,13 +174,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++; Index: apps/action.c =================================================================== --- apps/action.c (revision 12140) +++ apps/action.c (working copy) @@ -130,7 +130,7 @@ { last_button = BUTTON_NONE; keys_locked = false; - gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_OFF_PLAYER)); + gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_OFF)); return ACTION_REDRAW; } else @@ -139,7 +139,7 @@ #endif { if ((button&BUTTON_REL)) - gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON_PLAYER)); + gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON)); return ACTION_REDRAW; } } @@ -179,7 +179,7 @@ unlock_combo = button; keys_locked = true; action_signalscreenchange(); - gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON_PLAYER)); + gui_syncsplash(HZ/2, true, str(LANG_KEYLOCK_ON)); button_clear_queue(); return ACTION_REDRAW; Index: apps/language.h =================================================================== --- apps/language.h (revision 12140) +++ 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 12140) +++ apps/Makefile (working copy) @@ -195,9 +195,25 @@ include $(TOOLSDIR)/make.inc -$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang - @mkdir -p $(dir $@) - $(call PRINTS,GENLANG)perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS) $< +# apps/features.txt is a file that (is preprocessed and) lists named features +# based on defines in the config-*.h files. The named features will be passed +# to genlang and thus (translated) phrases can be used based on those names. +# +$(OBJDIR)/features: features.txt + $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ + $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - | \ + grep -v "^\#" > $@; \ + echo "" >/dev/null + +$(OBJDIR)/lang.o: lang/$(LANGUAGE).lang $(OBJDIR)/features + $(SILENT)mkdir -p `dirname $@` + $(SILENT)for f in `cat $(OBJDIR)/features`; do \ + if test -n "$$feat"; then \ + feat="$$feat:"; \ + fi; \ + feat="$$feat$$f"; \ + done; \ + perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS):$$feat $< $(call PRINTS,CC lang.c)$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@ clean: Index: apps/settings.c =================================================================== --- apps/settings.c (revision 12140) +++ apps/settings.c (working copy) @@ -404,11 +404,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 } @@ -826,7 +826,7 @@ break; } else { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, str(LANG_CANCEL)); return false; } } @@ -1026,7 +1026,7 @@ } else if (action == ACTION_STD_CANCEL) { - gui_syncsplash(HZ/2,true,str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ/2,true,str(LANG_CANCEL)); if (cb_data->type == INT) *(int*)variable = oldvalue; else *(bool*)variable = (bool)oldvalue; Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (revision 12140) +++ apps/lang/english.lang (working copy) @@ -174,21 +174,24 @@ desc: before acknowledging usb in case an MMC is inserted (Ondio) user: - *: "Please remove inserted MMC" + *: NONE + ondio: "Please remove inserted MMC" - *: "Please remove inserted MMC" + *: NONE + ondio: "Please remove inserted MMC" - *: "Please remove multimedia card" + *: NONE + ondio: "Please remove multimedia card" - id: LANG_MENU_SETTING_CANCEL + id: LANG_CANCEL desc: Visual confirmation of canceling a changed setting user: - *: "Canceled" + *: "Cancelled" *: "Cancelled" @@ -286,13 +289,16 @@ desc: in the main menu user: - *: "FM Radio" + *: NONE + radio: "FM Radio" - *: "FM Radio" + *: NONE + radio: "FM Radio" - *: "FM Radio" + *: NONE + radio: "FM Radio" @@ -300,13 +306,16 @@ desc: in the main menu user: - *: "Recording" + *: NONE + recording: "Recording" - *: "Recording" + *: NONE + recording: "Recording" - *: "Recording" + *: NONE + recording: "Recording" @@ -678,13 +687,16 @@ desc: in sound settings user: - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" @@ -692,13 +704,16 @@ desc: in the sound settings menu user: - *: "Equalizer" + *: NONE + swcodec: "Equalizer" - *: "Equalizer" + *: NONE + swcodec: "Equalizer" - *: "Equalizer" + *: NONE + swcodec: "Equalizer" @@ -814,20 +829,6 @@ - id: LANG_FIRMWARE - desc: DEPRECATED - user: - - *: "" - - - *: deprecated - - - *: "" - - - id: LANG_RESET desc: in system_settings_menu() user: @@ -842,7 +843,7 @@ - id: LANG_RESET_ASK_RECORDER + id: LANG_RESET_ASK desc: confirm to reset settings user: @@ -920,20 +921,6 @@ - id: LANG_RESET_DONE_CANCEL - desc: Visual confirmation of cancelation - user: - - *: "Canceled" - - - *: "Cancelled" - - - *: "" - - - id: LANG_SAVE_SETTINGS desc: in system_settings_menu() user: @@ -948,7 +935,7 @@ - id: LANG_SETTINGS_SAVE_PLAYER + id: LANG_SETTINGS_SAVE_FAILED desc: displayed if save settings has failed user: @@ -962,42 +949,16 @@ - id: LANG_SETTINGS_BATTERY_PLAYER + id: LANG_SETTINGS_PARTITION desc: if save settings has failed user: - *: "Partition?" - - - *: "Partition?" - - - *: "" - - - - id: LANG_SETTINGS_SAVE_RECORDER - desc: displayed if save settings has failed - user: - - *: "Save Failed" - - - *: "Save Failed" - - - *: "" - - - - id: LANG_SETTINGS_BATTERY_RECORDER - desc: if save settings has failed - user: - *: "No partition?" + player: "Partition?" *: "No partition?" + player: "Partition?" *: "" @@ -1008,13 +969,16 @@ desc: in the recording sub menu user: - *: "Recording Screen" + *: NONE + recording: "Recording Screen" - *: "Recording Screen" + *: NONE + recording: "Recording Screen" - *: "Recording Screen" + *: NONE + recording: "Recording Screen" @@ -1022,13 +986,16 @@ desc: in the main menu user: - *: "Recording Settings" + *: NONE + recording: "Recording Settings" - *: "Recording Settings" + *: NONE + recording: "Recording Settings" - *: "Recording Settings" + *: NONE + recording: "Recording Settings" @@ -1036,13 +1003,16 @@ desc: in the equalizer settings menu user: - *: "Enable EQ" + *: NONE + swcodec: "Enable EQ" - *: "Enable EQ" + *: NONE + swcodec: "Enable EQ" - *: "Enable equalizer" + *: NONE + swcodec: "Enable equalizer" @@ -1050,13 +1020,16 @@ desc: in the equalizer settings menu user: - *: "Graphical EQ" + *: NONE + swcodec: "Graphical EQ" - *: "Graphical EQ" + *: NONE + swcodec: "Graphical EQ" - *: "Graphical equalizer" + *: NONE + swcodec: "Graphical equalizer" @@ -1064,13 +1037,16 @@ desc: in eq settings user: - *: "Precut" + *: NONE + swcodec: "Precut" - *: "Precut" + *: NONE + swcodec: "Precut" - *: "Pre-cut" + *: NONE + swcodec: "Pre-cut" @@ -1078,13 +1054,16 @@ desc: in the equalizer settings menu user: - *: "Simple EQ Settings" + *: NONE + swcodec: "Simple EQ Settings" - *: "Simple EQ Settings" + *: NONE + swcodec: "Simple EQ Settings" - *: "Simple equalizer settings" + *: NONE + swcodec: "Simple equalizer settings" @@ -1092,13 +1071,16 @@ desc: in the equalizer settings menu user: - *: "Advanced EQ Settings" + *: NONE + swcodec: "Advanced EQ Settings" - *: "Advanced EQ Settings" + *: NONE + swcodec: "Advanced EQ Settings" - *: "Advanced equalizer settings" + *: NONE + swcodec: "Advanced equalizer settings" @@ -1106,13 +1088,16 @@ desc: in the equalizer settings menu user: - *: "Save EQ Preset" + *: NONE + swcodec: "Save EQ Preset" - *: "Save EQ Preset" + *: NONE + swcodec: "Save EQ Preset" - *: "Save equalizer preset" + *: NONE + swcodec: "Save equalizer preset" @@ -1120,13 +1105,16 @@ desc: in the equalizer settings menu user: - *: "Browse EQ Presets" + *: NONE + swcodec: "Browse EQ Presets" - *: "Browse EQ Presets" + *: NONE + swcodec: "Browse EQ Presets" - *: "Browse equalizer presets" + *: NONE + swcodec: "Browse equalizer presets" @@ -1134,13 +1122,16 @@ desc: in the equalizer settings menu user: - *: "Edit mode: %s" + *: NONE + swcodec: "Edit mode: %s" - *: "Edit mode: %s" + *: NONE + swcodec: "Edit mode: %s" - *: "" + *: NONE + swcodec: "" @@ -1148,13 +1139,16 @@ desc: in the equalizer settings menu user: - *: "%d Hz Band Gain" + *: NONE + swcodec: "%d Hz Band Gain" - *: "%d Hz Band Gain" + *: NONE + swcodec: "%d Hz Band Gain" - *: "" + *: NONE + swcodec: "" @@ -1162,13 +1156,16 @@ desc: in the equalizer settings menu user: - *: "Low Shelf Filter" + *: NONE + swcodec: "Low Shelf Filter" - *: "Low Shelf Filter" + *: NONE + swcodec: "Low Shelf Filter" - *: "Low shelf filter" + *: NONE + swcodec: "Low shelf filter" @@ -1176,13 +1173,16 @@ desc: in the equalizer settings menu user: - *: "Peak Filter %d" + *: NONE + swcodec: "Peak Filter %d" - *: "Peak Filter %d" + *: NONE + swcodec: "Peak Filter %d" - *: "Peak filter" + *: NONE + swcodec: "Peak filter" @@ -1190,13 +1190,16 @@ desc: in the equalizer settings menu user: - *: "High Shelf Filter" + *: NONE + swcodec: "High Shelf Filter" - *: "High Shelf Filter" + *: NONE + swcodec: "High Shelf Filter" - *: "High shelf filter" + *: NONE + swcodec: "High shelf filter" @@ -1204,13 +1207,16 @@ desc: in the equalizer settings menu user: - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" @@ -1218,13 +1224,16 @@ desc: in the equalizer settings menu user: - *: "Center Frequency" + *: NONE + swcodec: "Center Frequency" - *: "Center Frequency" + *: NONE + swcodec: "Center Frequency" - *: "Center frequency" + *: NONE + swcodec: "Center frequency" @@ -1232,13 +1241,16 @@ desc: in the equalizer settings menu user: - *: "Q" + *: NONE + swcodec: "Q" - *: "Q" + *: NONE + swcodec: "Q" - *: "Q" + *: NONE + swcodec: "Q" @@ -1246,13 +1258,16 @@ desc: in the equalizer settings menu user: - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" @@ -1540,13 +1555,16 @@ desc: in playback settings user: - *: "Crossfade" + *: NONE + swcodec: "Crossfade" - *: "Crossfade" + *: NONE + swcodec: "Crossfade" - *: "Crossfade" + *: NONE + swcodec: "Crossfade" @@ -1554,13 +1572,16 @@ desc: in replaygain user: - *: "Replaygain" + *: NONE + swcodec: "Replaygain" - *: "Replaygain" + *: NONE + swcodec: "Replaygain" - *: "Replaygain" + *: NONE + swcodec: "Replaygain" @@ -1568,13 +1589,16 @@ desc: in playback settings user: - *: "Beep Volume" + *: NONE + swcodec: "Beep Volume" - *: "Beep Volume" + *: NONE + swcodec: "Beep Volume" - *: "Beep Volume" + *: NONE + swcodec: "Beep Volume" @@ -1582,13 +1606,16 @@ desc: in beep volume in playback settings user: - *: "Weak" + *: NONE + swcodec: "Weak" - *: "Weak" + *: NONE + swcodec: "Weak" - *: "Weak" + *: NONE + swcodec: "Weak" @@ -1596,13 +1623,16 @@ desc: in beep volume in playback settings user: - *: "Moderate" + *: NONE + swcodec: "Moderate" - *: "Moderate" + *: NONE + swcodec: "Moderate" - *: "Moderate" + *: NONE + swcodec: "Moderate" @@ -1610,13 +1640,16 @@ desc: in beep volume in playback settings user: - *: "Strong" + *: NONE + swcodec: "Strong" - *: "Strong" + *: NONE + swcodec: "Strong" - *: "Strong" + *: NONE + swcodec: "Strong" @@ -1624,13 +1657,16 @@ desc: in playback settings menu. enable/disable the optical out user: - *: "Optical Output" + *: NONE + spdif_power: "Optical Output" - *: "Optical Output" + *: NONE + spdif_power: "Optical Output" - *: "Optical Output" + *: NONE + spdif_power: "Optical Output" @@ -1704,20 +1740,6 @@ - id: LANG_TAGCACHE_DISK - desc: - user: - - *: "" - - - *: "" - - - *: "" - - - id: LANG_TAGCACHE_RAM desc: in tag cache settings user: @@ -2030,13 +2052,16 @@ desc: in settings_menu() user: - *: "Browse .rwps files" + *: NONE + remote: "Browse .rwps files" - *: "Browse .rwps files" + *: NONE + remote: "Browse .rwps files" - *: "Browse remote while-playing-screen files" + *: NONE + remote: "Browse remote while-playing-screen files" @@ -2058,13 +2083,16 @@ desc: in the display sub menu user: - *: "Remote-LCD Settings" + *: NONE + remote: "Remote-LCD Settings" - *: "Remote-LCD Settings" + *: NONE + remote: "Remote-LCD Settings" - *: "Remote LCD settings" + *: NONE + remote: "Remote LCD settings" @@ -2338,13 +2366,16 @@ desc: in the system sub menu user: - *: "Time & Date" + *: NONE + rtc: "Time & Date" - *: "Time & Date" + *: NONE + rtc: "Time & Date" - *: "Time and Date" + *: NONE + rtc: "Time and Date" @@ -2380,13 +2411,16 @@ desc: The name of the additional entry in the main menu for the RTC alarm mod. user: - *: "Wake-Up Alarm" + *: NONE + alarm: "Wake-Up Alarm" - *: "Wake-Up Alarm" + *: NONE + alarm: "Wake-Up Alarm" - *: "Wake-Up Alarm" + *: NONE + alarm: "Wake-Up Alarm" @@ -2646,15 +2680,18 @@ desc: in the recording settings user: - *: "Mic" - h100,h120,h300: "Internal Mic" + *: NONE + recording: "Microphone" + h100,h120,h300: "Internal Microphone" - *: "Mic" - h100,h120,h300: "Internal Mic" + *: NONE + recording: "Microphone" + h100,h120,h300: "Internal Microphone" - *: "Microphone" + *: NONE + recording: "Microphone" h100,h120,h300: "Internal Microphone" @@ -2831,13 +2868,16 @@ desc: in record settings menu. user: - *: "Remote Unit Only" + *: NONE + remote: "Remote Unit Only" - *: "Remote Unit Only" + *: NONE + remote: "Remote Unit Only" - *: "Remote unit only" + *: NONE + remote: "Remote unit only" @@ -2845,13 +2885,16 @@ desc: in record settings menu. user: - *: "Main and Remote Unit" + *: NONE + remote: "Main and Remote Unit" - *: "Main and Remote Unit" + *: NONE + remote: "Main and Remote Unit" - *: "Main and remote unit" + *: NONE + remote: "Main and remote unit" @@ -2887,13 +2930,16 @@ desc: in crossfade settings menu user: - *: "Enable Crossfade" + *: NONE + swcodec: "Enable Crossfade" - *: "Enable Crossfade" + *: NONE + swcodec: "Enable Crossfade" - *: "Enable Crossfade" + *: NONE + swcodec: "Enable Crossfade" @@ -2901,13 +2947,16 @@ desc: in crossfade settings user: - *: "Track Skip Only" + *: NONE + swcodec: "Track Skip Only" - *: "Track Skip Only" + *: NONE + swcodec: "Track Skip Only" - *: "Track Skip Only" + *: NONE + swcodec: "Track Skip Only" @@ -2915,13 +2964,16 @@ desc: in crossfade settings menu user: - *: "Fade-In Delay" + *: NONE + swcodec: "Fade-In Delay" - *: "Fade-In Delay" + *: NONE + swcodec: "Fade-In Delay" - *: "Fade-In Delay" + *: NONE + swcodec: "Fade-In Delay" @@ -2929,13 +2981,16 @@ desc: in crossfade settings menu user: - *: "Fade-In Duration" + *: NONE + swcodec: "Fade-In Duration" - *: "Fade-In Duration" + *: NONE + swcodec: "Fade-In Duration" - *: "Fade-In Duration" + *: NONE + swcodec: "Fade-In Duration" @@ -2943,13 +2998,16 @@ desc: in crossfade settings menu user: - *: "Fade-Out Delay" + *: NONE + swcodec: "Fade-Out Delay" - *: "Fade-Out Delay" + *: NONE + swcodec: "Fade-Out Delay" - *: "Fade-Out Delay" + *: NONE + swcodec: "Fade-Out Delay" @@ -2957,13 +3015,16 @@ desc: in crossfade settings menu user: - *: "Fade-Out Duration" + *: NONE + swcodec: "Fade-Out Duration" - *: "Fade-Out Duration" + *: NONE + swcodec: "Fade-Out Duration" - *: "Fade-Out Duration" + *: NONE + swcodec: "Fade-Out Duration" @@ -2971,13 +3032,16 @@ desc: in crossfade settings menu user: - *: "Fade-Out Mode" + *: NONE + swcodec: "Fade-Out Mode" - *: "Fade-Out Mode" + *: NONE + swcodec: "Fade-Out Mode" - *: "Fade-Out Mode" + *: NONE + swcodec: "Fade-Out Mode" @@ -2985,13 +3049,16 @@ desc: in playback settings, crossfade option user: - *: "Mix" + *: NONE + swcodec: "Mix" - *: "Mix" + *: NONE + swcodec: "Mix" - *: "Mix" + *: NONE + swcodec: "Mix" @@ -2999,13 +3066,16 @@ desc: in replaygain user: - *: "Enable Replaygain" + *: NONE + swcodec: "Enable Replaygain" - *: "Enable Replaygain" + *: NONE + swcodec: "Enable Replaygain" - *: "Enable Replaygain" + *: NONE + swcodec: "Enable Replaygain" @@ -3013,13 +3083,16 @@ desc: in replaygain user: - *: "Prevent Clipping" + *: NONE + swcodec: "Prevent Clipping" - *: "Prevent Clipping" + *: NONE + swcodec: "Prevent Clipping" - *: "Prevent Clipping" + *: NONE + swcodec: "Prevent Clipping" @@ -3027,13 +3100,16 @@ desc: in replaygain user: - *: "Replaygain Type" + *: NONE + swcodec: "Replaygain Type" - *: "Replaygain Type" + *: NONE + swcodec: "Replaygain Type" - *: "Replaygain Type" + *: NONE + swcodec: "Replaygain Type" @@ -3041,13 +3117,16 @@ desc: in replaygain user: - *: "Album Gain" + *: NONE + swcodec: "Album Gain" - *: "Album Gain" + *: NONE + swcodec: "Album Gain" - *: "Album Gain" + *: NONE + swcodec: "Album Gain" @@ -3055,13 +3134,16 @@ desc: in replaygain user: - *: "Track Gain" + *: NONE + swcodec: "Track Gain" - *: "Track Gain" + *: NONE + swcodec: "Track Gain" - *: "Track Gain" + *: NONE + swcodec: "Track Gain" @@ -3069,27 +3151,33 @@ desc: use track gain if shuffle mode is on, album gain otherwise user: - *: "Track Gain if Shuffling" + *: NONE + swcodec: "Track Gain if Shuffling" - *: "Track Gain if Shuffling" + *: NONE + swcodec: "Track Gain if Shuffling" - *: "Track Gain if Shuffling" + *: NONE + swcodec: "Track Gain if Shuffling" id: LANG_REPLAYGAIN_PREAMP desc: in replaygain settings - user: + user: *: NONE + swcodec *: "Pre-amp" - *: "Pre-amp" + *: NONE + swcodec: "Pre-amp" - *: "Preamp" + *: NONE + swcodec: "Preamp" @@ -3209,13 +3297,16 @@ desc: in settings_menu user: - *: "LCD Mode" + *: NONE + lcd_invert: "LCD Mode" - *: "LCD Mode" + *: NONE + lcd_invert: "LCD Mode" - *: "LCD Mode" + *: NONE + lcd_invert: "LCD Mode" @@ -3223,13 +3314,16 @@ desc: in settings_menu user: - *: "Normal" + *: NONE + lcd_invert: "Normal" - *: "Normal" + *: NONE + lcd_invert: "Normal" - *: "Normal" + *: NONE + lcd_invert: "Normal" @@ -3237,13 +3331,16 @@ desc: in settings_menu user: - *: "Inverse" + *: NONE + lcd_invert: "Inverse" - *: "Inverse" + *: NONE + lcd_invert: "Inverse" - *: "Inverse" + *: NONE + lcd_invert: "Inverse" @@ -3251,13 +3348,16 @@ desc: in settings_menu, option to turn display+buttos by 180 degreed user: - *: "Upside Down" + *: NONE + lcd_flip: "Upside Down" - *: "Upside Down" + *: NONE + lcd_flip: "Upside Down" - *: "Upside Down" + *: NONE + lcd_flip: "Upside Down" @@ -3307,13 +3407,16 @@ desc: text for LCD settings menu user: - *: "Clear Backdrop" + *: NONE + lcd_color: "Clear Backdrop" - *: "Clear Backdrop" + *: NONE + lcd_color: "Clear Backdrop" - *: "Clear Backdrop" + *: NONE + lcd_color: "Clear Backdrop" @@ -3321,13 +3424,16 @@ desc: menu entry to set the background color user: - *: "Background Colour" + *: NONE + lcd_color: "Background Colour" - *: "Background Colour" + *: NONE + lcd_color: "Background Colour" - *: "Background Colour" + *: NONE + lcd_color: "Background Colour" @@ -3335,13 +3441,16 @@ desc: menu entry to set the foreground color user: - *: "Foreground Colour" + *: NONE + lcd_color: "Foreground Colour" - *: "Foreground Colour" + *: NONE + lcd_color: "Foreground Colour" - *: "Foreground Colour" + *: NONE + lcd_color: "Foreground Colour" @@ -3349,13 +3458,16 @@ desc: menu user: - *: "Reset Colours" + *: NONE + lcd_color: "Reset Colours" - *: "Reset Colours" + *: NONE + lcd_color: "Reset Colours" - *: "Reset Colours" + *: NONE + lcd_color: "Reset Colours" @@ -3363,13 +3475,16 @@ desc: in remote lcd settings menu user: - *: "Reduce Ticking" + *: NONE + remote_ticking: "Reduce Ticking" - *: "Reduce Ticking" + *: NONE + remote_ticking: "Reduce Ticking" - *: "Reduce Ticking" + *: NONE + remote_ticking: "Reduce Ticking" @@ -3461,13 +3576,16 @@ desc: (player) menu altarnative for jump scroll user: - *: "Jump Scroll" + *: NONE + player: "Jump Scroll" - *: "Jump Scroll" + *: NONE + player: "Jump Scroll" - *: "Jump Scroll" + *: NONE + player: "Jump Scroll" @@ -3475,13 +3593,16 @@ desc: (player) the jump scroll shall be done "one time" user: - *: "One time" + *: NONE + player: "One time" - *: "One time" + *: NONE + player: "One time" - *: "One time" + *: NONE + player: "One time" @@ -3489,13 +3610,16 @@ desc: (player) Delay before making a jump scroll user: - *: "Jump Scroll Delay" + *: NONE + player: "Jump Scroll Delay" - *: "Jump Scroll Delay" + *: NONE + player: "Jump Scroll Delay" - *: "Jump Scroll Delay" + *: NONE + player: "Jump Scroll Delay" @@ -3849,48 +3973,23 @@ - id: LANG_POWEROFF - desc: DEPRECATED - user: - - *: "" - - - *: deprecated - - - *: "" - - - id: LANG_DIRCACHE_ENABLE desc: in directory cache settings user: - *: "Directory Cache" + *: NONE + dircache: "Directory Cache" - *: "Directory Cache" + *: NONE + dircache: "Directory Cache" - *: "Directory Cache" + *: NONE + dircache: "Directory Cache" - id: LANG_DIRCACHE_REBOOT - desc: DEPRECATED - user: - - *: "" - - - *: "" - - - *: "" - - - id: LANG_DIRCACHE_BUILDING desc: when booting up and rebuilding the cache user: @@ -3909,13 +4008,16 @@ desc: in settings_menu user: - *: "Set Time/Date" + *: NONE + rtc: "Set Time/Date" - *: "Set Time/Date" + *: NONE + rtc: "Set Time/Date" - *: "Set Time and Date" + *: NONE + rtc: "Set Time and Date" @@ -3923,13 +4025,16 @@ desc: select the time format of time in status bar user: - *: "Time Format" + *: NONE + rtc: "Time Format" - *: "Time Format" + *: NONE + rtc: "Time Format" - *: "Time Format" + *: NONE + rtc: "Time Format" @@ -3937,13 +4042,16 @@ desc: option for 12 hour clock user: - *: "12 Hour Clock" + *: NONE + rtc: "12 Hour Clock" - *: "12 Hour Clock" + *: NONE + rtc: "12 Hour Clock" - *: "12 Hour Clock" + *: NONE + rtc: "12 Hour Clock" @@ -3951,13 +4059,16 @@ desc: option for 24 hour clock user: - *: "24 Hour Clock" + *: NONE + rtc: "24 Hour Clock" - *: "24 Hour Clock" + *: NONE + rtc: "24 Hour Clock" - *: "24 Hour Clock" + *: NONE + rtc: "24 Hour Clock" @@ -4147,13 +4258,16 @@ desc: text for onplay menu entry user: - *: "Set As Backdrop" + *: NONE + lcd_color: "Set As Backdrop" - *: "Set As Backdrop" + *: NONE + lcd_color: "Set As Backdrop" - *: "Set As Backdrop" + *: NONE + lcd_color: "Set As Backdrop" @@ -4227,20 +4341,6 @@ - id: LANG_PITCH - desc: "pitch" in the pitch screen - user: - - *: "Pitch" - - - *: "Pitch" - - - *: "Pitch" - - - id: LANG_VIEW desc: in on+play menu user: @@ -4451,27 +4551,15 @@ - id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + id: LANG_BUFFER_STAT + desc: the buffer size, %d MB %d fraction of MB user: - *: "Buf: %d.%03dMB" - - - *: "Buf: %d.%03dMB" - - - *: "" - - - - id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB - user: - *: "Buffer: %d.%03dMB" + player: "Buf: %d.%03dMB" + player: "Buf: %d.%03dMB" *: "Buffer: %d.%03dMB" @@ -4567,13 +4655,16 @@ desc: in info menu; name for internal disk with multivolume (keep short!) user: - *: "Int:" + *: NONE + multivolume: "Int:" - *: "Int:" + *: NONE + multivolume: "Int:" - *: "Internal" + *: NONE + multivolume: "Internal" @@ -4581,13 +4672,16 @@ desc: in info menu; name for external disk with multivolume (Ondio; keep short!) user: - *: "MMC:" + *: NONE + ondio: "MMC:" - *: "MMC:" + *: NONE + ondio: "MMC:" - *: "Multimedia card" + *: NONE + ondio: "Multimedia card" @@ -4605,17 +4699,37 @@ + id: LANG_PITCH + desc: "pitch" in the pitch screen + user: + + *: NONE + pitchscreen: "Pitch" + + + *: NONE + pitchscreen: "Pitch" + + + *: NONE + pitchscreen: "Pitch" + + + id: LANG_PITCH_UP desc: in wps user: - *: "Pitch Up" + *: NONE + pitchscreen: "Pitch Up" - *: "Pitch Up" + *: NONE + pitchscreen: "Pitch Up" - *: "" + *: NONE + pitchscreen: "" @@ -4623,16 +4737,52 @@ desc: in wps user: - *: "Pitch Down" + *: NONE + pitchscreen: "Pitch Down" - *: "Pitch Down" + *: NONE + pitchscreen: "Pitch Down" *: "" + id: LANG_PITCH_UP_SEMITONE + desc: in wps + user: + + *: NONE + pitchscreen: "Semitone Up" + + + *: NONE + pitchscreen: "Semitone Up" + + + *: NONE + pitchscreen: "" + + + + id: LANG_PITCH_DOWN_SEMITONE + desc: in wps + user: + + *: NONE + pitchscreen: "Semitone Down" + + + *: NONE + pitchscreen: "Semitone Down" + + + *: NONE + pitchscreen: "" + + + id: LANG_PAUSE desc: in wps user: @@ -4939,56 +5089,32 @@ - id: LANG_KEYLOCK_ON_PLAYER + id: LANG_KEYLOCK_ON desc: displayed when key lock is on user: - *: "Key Lock ON" - - - *: "Key Lock ON" - - - *: "" - - - - id: LANG_KEYLOCK_OFF_PLAYER - desc: displayed when key lock is turned off - user: - - *: "Key Lock OFF" - - - *: "Key Lock OFF" - - - *: "" - - - - id: LANG_KEYLOCK_ON_RECORDER - desc: displayed when key lock is on - user: - *: "Keylock is ON" + player: "Key Lock ON" *: "Keylock is ON" + player: "Key Lock ON" *: "" - id: LANG_KEYLOCK_OFF_RECORDER + id: LANG_KEYLOCK_OFF desc: displayed when key lock is turned off user: *: "Keylock is OFF" + player: "Key Lock OFF" *: "Keylock is OFF" + player: "Key Lock OFF" *: "" @@ -5126,11 +5252,11 @@ user: *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + recording: "The disk is full. Press STOP to continue." *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + recording: "The disk is full. Press STOP to continue." *: "" @@ -5295,13 +5421,16 @@ desc: The current alarm time shown in the alarm menu for the RTC alarm mod. user: - *: "Alarm Time: %02d:%02d" + *: NONE + alarm: "Alarm Time: %02d:%02d" - *: "Alarm Time: %02d:%02d" + *: NONE + alarm: "Alarm Time: %02d:%02d" - *: "" + *: NONE + alarm: "" @@ -5309,13 +5438,16 @@ desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod. user: - *: "Waking Up In %d:%02d" + *: NONE + alarm: "Waking Up In %d:%02d" - *: "Waking Up In %d:%02d" + *: NONE + alarm: "Waking Up In %d:%02d" - *: "" + *: NONE + alarm: "" @@ -5323,13 +5455,16 @@ desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod). user: - *: "Alarm Set" + *: NONE + alarm: "Alarm Set" - *: "Alarm Set" + *: NONE + alarm: "Alarm Set" - *: "" + *: NONE + alarm: "" @@ -5337,13 +5472,16 @@ desc: The text that tells that the time is incorrect (for the RTC alarm mod). user: - *: "Alarm Time Is Too Soon!" + *: NONE + alarm: "Alarm Time Is Too Soon!" - *: "Alarm Time Is Too Soon!" + *: NONE + alarm: "Alarm Time Is Too Soon!" - *: "" + *: NONE + alarm: "" @@ -5351,13 +5489,16 @@ desc: Shown key functions in alarm menu (for the RTC alarm mod). user: - *: "PLAY=Set OFF=Cancel" + *: NONE + alarm: "PLAY=Set OFF=Cancel" - *: "PLAY=Set OFF=Cancel" + *: NONE + alarm: "PLAY=Set OFF=Cancel" - *: "" + *: NONE + alarm: "" @@ -5365,13 +5506,16 @@ desc: Announce that the RTC alarm has been turned off user: - *: "Alarm Disabled" + *: NONE + alarm: "Alarm Disabled" - *: "Alarm Disabled" + *: NONE + alarm: "Alarm Disabled" - *: "" + *: NONE + alarm: "" @@ -5379,13 +5523,16 @@ desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH user: - *: "RGB" + *: NONE + lcd_color: "RGB" - *: "RGB" + *: NONE + lcd_color: "RGB" - *: "" + *: NONE + lcd_color: "" @@ -5393,13 +5540,16 @@ desc: in color screen user: - *: "RGB: %02X%02X%02X" + *: NONE + lcd_color: "RGB: %02X%02X%02X" - *: "RGB: %02X%02X%02X" + *: NONE + lcd_color: "RGB: %02X%02X%02X" - *: "" + *: NONE + lcd_color: "" @@ -5407,13 +5557,16 @@ desc: splash when user selects an invalid colour user: - *: "Invalid colour" + *: NONE + lcd_color: "Invalid colour" - *: "Invalid colour" + *: NONE + lcd_color: "Invalid colour" - *: "" + *: NONE + lcd_color: "" @@ -5571,7 +5724,7 @@ - id: LANG_ID3_FRECUENCY + id: LANG_ID3_FREQUENCY desc: in tag viewer user: @@ -5589,13 +5742,16 @@ desc: in tag viewer user: - *: "[Track Gain]" + *: NONE + swcodec: "[Track Gain]" - *: "[Track Gain]" + *: NONE + swcodec: "[Track Gain]" - *: "" + *: NONE + swcodec: "" @@ -5603,13 +5759,16 @@ desc: in tag viewer user: - *: "[Album Gain]" + *: NONE + swcodec: "[Album Gain]" - *: "[Album Gain]" + *: NONE + swcodec: "[Album Gain]" - *: "" + *: NONE + swcodec: "" @@ -7265,28 +7424,16 @@ - id: LANG_END_PLAYLIST_PLAYER + id: LANG_END_PLAYLIST desc: when playlist has finished user: - *: "End of List" - - - *: "End of List" - - - *: "" - - - - id: LANG_END_PLAYLIST_RECORDER - desc: when playlist has finished - user: - *: "End of Song List" + player: "End of List" *: "End of Song List" + player: "End of List" *: "" @@ -7465,13 +7612,16 @@ desc: in radio screen user: - *: "Station: %d.%02d MHz" + *: NONE + radio: "Station: %d.%02d MHz" - *: "Station: %d.%02d MHz" + *: NONE + radio: "Station: %d.%02d MHz" - *: "" + *: NONE + radio: "" @@ -7479,13 +7629,16 @@ desc: error when preset list is empty user: - *: "No presets" + *: NONE + radio: "No presets" - *: "No presets" + *: NONE + radio: "No presets" - *: "" + *: NONE + radio: "" @@ -7493,13 +7646,16 @@ desc: in radio menu user: - *: "Add Preset" + *: NONE + radio: "Add Preset" - *: "Add Preset" + *: NONE + radio: "Add Preset" - *: "Add Preset" + *: NONE + radio: "Add Preset" @@ -7507,13 +7663,16 @@ desc: in radio screen user: - *: "Edit Preset" + *: NONE + radio: "Edit Preset" - *: "Edit Preset" + *: NONE + radio: "Edit Preset" - *: "Edit Preset" + *: NONE + radio: "Edit Preset" @@ -7521,13 +7680,16 @@ desc: in radio screen user: - *: "Remove Preset" + *: NONE + radio: "Remove Preset" - *: "Remove Preset" + *: NONE + radio: "Remove Preset" - *: "Remove Preset" + *: NONE + radio: "Remove Preset" @@ -7535,13 +7697,16 @@ desc: in radio screen user: - *: "Preset Save Failed" + *: NONE + radio: "Preset Save Failed" - *: "Preset Save Failed" + *: NONE + radio: "Preset Save Failed" - *: "" + *: NONE + radio: "" @@ -7549,13 +7714,16 @@ desc: in radio screen user: - *: "The Preset List is Full" + *: NONE + radio: "The Preset List is Full" - *: "The Preset List is Full" + *: NONE + radio: "The Preset List is Full" - *: "" + *: NONE + radio: "" @@ -7577,13 +7745,16 @@ desc: in radio screen user: - *: "Exit" + *: NONE + radio: "Exit" - *: "Exit" + *: NONE + radio: "Exit" - *: "" + *: NONE + radio: "" @@ -7591,13 +7762,16 @@ desc: in radio screen user: - *: "Action" + *: NONE + radio: "Action" - *: "Action" + *: NONE + radio: "Action" - *: "" + *: NONE + radio: "" @@ -7605,13 +7779,16 @@ desc: in button bar user: - *: "Preset" + *: NONE + radio: "Preset" - *: "Preset" + *: NONE + radio: "Preset" - *: "" + *: NONE + radio: "" @@ -7619,13 +7796,16 @@ desc: in radio screen user: - *: "Add" + *: NONE + radio: "Add" - *: "Add" + *: NONE + radio: "Add" - *: "" + *: NONE + radio: "" @@ -7633,13 +7813,16 @@ desc: in radio screen user: - *: "Record" + *: NONE + radio: "Record" - *: "Record" + *: NONE + radio: "Record" - *: "" + *: NONE + radio: "" @@ -7647,13 +7830,16 @@ desc: in radio screen user: - *: "Force mono" + *: NONE + radio: "Force mono" - *: "Force mono" + *: NONE + radio: "Force mono" - *: "" + *: NONE + radio: "" @@ -7661,13 +7847,16 @@ desc: splash screen during freeze in radio mode user: - *: "Screen frozen!" + *: NONE + radio: "Screen frozen!" - *: "Screen frozen!" + *: NONE + radio: "Screen frozen!" - *: "" + *: NONE + radio: "" @@ -7675,13 +7864,16 @@ desc: in radio menu user: - *: "Auto-Scan Presets" + *: NONE + radio: "Auto-Scan Presets" - *: "Auto-Scan Presets" + *: NONE + radio: "Auto-Scan Presets" - *: "Auto scan presets" + *: NONE + radio: "Auto scan presets" @@ -7689,13 +7881,16 @@ desc: confirmation if presets can be cleared user: - *: "Clear Current Presets?" + *: NONE + radio: "Clear Current Presets?" - *: "Clear Current Presets?" + *: NONE + radio: "Clear Current Presets?" - *: "" + *: NONE + radio: "" @@ -7703,13 +7898,16 @@ desc: during auto scan user: - *: "Scanning %d.%02d MHz" + *: NONE + radio: "Scanning %d.%02d MHz" - *: "Scanning %d.%02d MHz" + *: NONE + radio: "Scanning %d.%02d MHz" - *: "" + *: NONE + radio: "" @@ -7717,13 +7915,16 @@ desc: default preset name for auto scan mode user: - *: "%d.%02d MHz" + *: NONE + radio: "%d.%02d MHz" - *: "%d.%02d MHz" + *: NONE + radio: "%d.%02d MHz" - *: "" + *: NONE + radio: "" @@ -7731,13 +7932,16 @@ desc: in radio screen / menu user: - *: "Mode:" + *: NONE + radio: "Mode:" - *: "Mode:" + *: NONE + radio: "Mode:" - *: "" + *: NONE + radio: "" @@ -7745,13 +7949,16 @@ desc: in radio screen / menu user: - *: "Scan" + *: NONE + radio: "Scan" - *: "Scan" + *: NONE + radio: "Scan" - *: "" + *: NONE + radio: "" @@ -7759,58 +7966,19 @@ desc: in radio screen / menu user: - *: "Preset" + *: NONE + radio: "Preset" - *: "Preset" + *: NONE + radio: "Preset" - *: "" + *: NONE + radio: "" - id: LANG_DIRBROWSE_F1 - desc: in dir browser, F1 button bar text - user: - - *: "Menu" - - - *: "Menu" - - - *: "" - - - - id: LANG_DIRBROWSE_F2 - desc: in dir browser, F2 button bar text - user: - - *: "Option" - - - *: "Option" - - - *: "" - - - - id: LANG_DIRBROWSE_F3 - desc: in dir browser, F3 button bar text - user: - - *: "LCD" - - - *: "LCD" - - - *: "" - - - id: LANG_SHOWDIR_BUFFER_FULL desc: in showdir(), displayed on screen when you reach buffer limit user: @@ -7949,13 +8117,16 @@ desc: text for splash to indicate a new backdrop has been loaded successfully user: - *: "Backdrop Loaded" + *: NONE + lcd_color: "Backdrop Loaded" - *: "Backdrop Loaded" + *: NONE + lcd_color: "Backdrop Loaded" - *: "" + *: NONE + lcd_color: "" @@ -7963,13 +8134,16 @@ desc: text for splash to indicate a failure to load a bitmap as backdrop user: - *: "Backdrop Failed" + *: NONE + lcd_color: "Backdrop Failed" - *: "Backdrop Failed" + *: NONE + lcd_color: "Backdrop Failed" - *: "" + *: NONE + lcd_color: "" @@ -8369,10 +8543,12 @@ desc: possible answers to resume question user: - *: "(PLAY/STOP)" + *: NONE + player: "(PLAY/STOP)" - *: "(PLAY/STOP)" + *: NONE + player: "(PLAY/STOP)" *: "" @@ -8383,13 +8559,16 @@ desc: load preset list in fm radio user: - *: "Load Preset List" + *: NONE + radio: "Load Preset List" - *: "Load Preset List" + *: NONE + radio: "Load Preset List" - *: "Load Preset List" + *: NONE + radio: "Load Preset List" @@ -8397,13 +8576,16 @@ desc: Save preset list in fm radio user: - *: "Save Preset List" + *: NONE + radio: "Save Preset List" - *: "Save Preset List" + *: NONE + radio: "Save Preset List" - *: "Save Preset List" + *: NONE + radio: "Save Preset List" @@ -8411,13 +8593,16 @@ desc: clear preset list in fm radio user: - *: "Clear Preset List" + *: NONE + radio: "Clear Preset List" - *: "Clear Preset List" + *: NONE + radio: "Clear Preset List" - *: "Clear Preset List" + *: NONE + radio: "Clear Preset List" @@ -8425,13 +8610,16 @@ desc: Used when you need to say Preset List, also voiced user: - *: "Preset List" + *: NONE + radio: "Preset List" - *: "Preset List" + *: NONE + radio: "Preset List" - *: "Preset List" + *: NONE + radio: "Preset List" @@ -8439,13 +8627,16 @@ desc: When you run the radio without an fmr file in settings user: - *: "No settings found. Autoscan?" + *: NONE + radio: "No settings found. Autoscan?" - *: "No settings found. Autoscan?" + *: NONE + radio: "No settings found. Autoscan?" - *: "" + *: NONE + radio: "" @@ -8453,13 +8644,16 @@ desc: When you try to exit radio to confirm save user: - *: "Save Changes?" + *: NONE + radio: "Save Changes?" - *: "Save Changes?" + *: NONE + radio: "Save Changes?" - *: "" + *: NONE + radio: "" @@ -8467,13 +8661,16 @@ desc: In the settings menu user: - *: "pixels" + *: NONE + lcd_bitmap: "pixels" - *: "pixels" + *: NONE + lcd_bitmap: "pixels" - *: "pixels" + *: NONE + lcd_bitmap: "pixels" @@ -8481,52 +8678,64 @@ desc: in crossfeed settings user: - *: "Direct Gain" + *: NONE + swcodec: "Direct Gain" - *: "Direct Gain" + *: NONE + swcodec: "Direct Gain" - *: "Direct gain" + *: NONE + swcodec: "Direct gain" id: LANG_CROSSFEED_CROSS_GAIN desc: in crossfeed settings - *: "Cross Gain" + *: NONE + swcodec: "Cross Gain" - *: "Cross Gain" + *: NONE + swcodec: "Cross Gain" - *: "Cross gain" + *: NONE + swcodec: "Cross gain" id: LANG_CROSSFEED_HF_ATTENUATION desc: in crossfeed settings - *: "High-Frequency Attenuation" + *: NONE + swcodec: "High-Frequency Attenuation" - *: "High-Frequency Attenuation" + *: NONE + swcodec: "High-Frequency Attenuation" - *: "High-frequency attenuation" + *: NONE + swcodec: "High-frequency attenuation" id: LANG_CROSSFEED_HF_CUTOFF desc: in crossfeed settings - *: "High-Frequency Cutoff" + *: NONE + swcodec: "High-Frequency Cutoff" - *: "High-Frequency Cutoff" + *: NONE + swcodec: "High-Frequency Cutoff" - *: "High-frequency cutoff" + *: NONE + swcodec: "High-frequency cutoff" @@ -8588,13 +8797,16 @@ desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu user: - *: "Remote Scrolling Options" + *: NONE + remote: "Remote Scrolling Options" - *: "Remote Scrolling Options" + *: NONE + remote: "Remote Scrolling Options" - *: "Remote Scrolling Options" + *: NONE + remote: "Remote Scrolling Options" @@ -9032,13 +9244,16 @@ desc: in the equalizer settings menu user: - *: "Edit mode: %s" + *: NONE + swcodec: "Edit mode: %s" - *: "Edit mode: %s" + *: NONE + swcodec: "Edit mode: %s" - *: "" + *: NONE + swcodec: "" @@ -9046,13 +9261,16 @@ desc: in the equalizer settings menu user: - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" - *: "Cutoff Frequency" + *: NONE + swcodec: "Cutoff Frequency" @@ -9060,13 +9278,16 @@ desc: in the equalizer settings menu user: - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" @@ -9378,48 +9599,6 @@ - id: LANG_SYSFONT_PITCH - desc: "pitch" in the pitch screen - user: - - *: "Pitch" - - - *: "Pitch" - - - *: "Pitch" - - - - id: LANG_SYSFONT_PITCH_UP - desc: in wps - user: - - *: "Pitch Up" - - - *: "Pitch Up" - - - *: "" - - - - id: LANG_SYSFONT_PITCH_DOWN - desc: in wps - user: - - *: "Pitch Down" - - - *: "Pitch Down" - - - *: "" - - - id: LANG_SYSFONT_F2_MODE desc: in wps F2 pressed user: @@ -9537,11 +9716,11 @@ user: *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + recording: "The disk is full. Press STOP to continue." *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + recording: "The disk is full. Press STOP to continue." *: "" @@ -9621,13 +9800,16 @@ desc: in the sound settings menu user: - *: "Hardware Equalizer" + *: NONE + ipodvideo: "Hardware Equalizer" - *: "Hardware Equalizer" + *: NONE + ipodvideo: "Hardware Equalizer" - *: "Hardware equalizer" + *: NONE + ipodvideo: "Hardware equalizer" @@ -9635,13 +9817,16 @@ desc: in the equalizer settings menu user: - *: "Enable Hardware EQ" + *: NONE + ipodvideo: "Enable Hardware EQ" - *: "Enable Hardware EQ" + *: NONE + ipodvideo: "Enable Hardware EQ" - *: "Enable hardware equalizer" + *: NONE + ipodvideo: "Enable hardware equalizer" @@ -9663,13 +9848,16 @@ desc: in the equalizer settings menu user: - *: "Narrow" + *: NONE + ipodvideo: "Narrow" - *: "Narrow" + *: NONE + ipodvideo: "Narrow" - *: "Narrow" + *: NONE + ipodvideo: "Narrow" @@ -9677,13 +9865,16 @@ desc: in the equalizer settings menu user: - *: "Wide" + *: NONE + ipodvideo: "Wide" - *: "Wide" + *: NONE + ipodvideo: "Wide" - *: "Wide" + *: NONE + ipodvideo: "Wide" @@ -9732,117 +9923,144 @@ id: LANG_RECORD_AGC_PRESET desc: automatic gain control in record settings - *: "Automatic Gain Control" + *: NONE + agc: "Automatic Gain Control" - *: "Automatic Gain Control" + *: NONE + agc: "Automatic Gain Control" - *: "Automatic gain control" + *: NONE + agc: "Automatic gain control" id: LANG_AGC_SAFETY desc: AGC preset - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" id: LANG_AGC_LIVE desc: AGC preset - *: "Live (slow)" + *: NONE + agc: "Live (slow)" - *: "Live (slow)" + *: NONE + agc: "Live (slow)" - *: "Live (slow)" + *: NONE + agc: "Live (slow)" id: LANG_AGC_DJSET desc: AGC preset - *: "DJ-Set (slow)" + *: NONE + agc: "DJ-Set (slow)" - *: "DJ-Set (slow)" + *: NONE + agc: "DJ-Set (slow)" - *: "DJ set (slow)" + *: NONE + agc: "DJ set (slow)" id: LANG_AGC_MEDIUM desc: AGC preset - *: "Medium" + *: NONE + agc: "Medium" - *: "Medium" + *: NONE + agc: "Medium" - *: "Medium" + *: NONE + agc: "Medium" id: LANG_AGC_VOICE desc: AGC preset - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" id: LANG_RECORD_AGC_CLIPTIME desc: in record settings - *: "AGC clip time" + *: NONE + agc: "AGC clip time" - *: "AGC clip time" + *: NONE + agc: "AGC clip time" - *: "AGC clip time" + *: NONE + agc: "AGC clip time" id: LANG_SYSFONT_RECORDING_AGC_PRESET desc: automatic gain control in recording screen - *: "AGC" + *: NONE + agc: "AGC" - *: "AGC" + *: NONE + agc: "AGC" - *: "AGC" + *: NONE + agc: "AGC" id: LANG_RECORDING_AGC_MAXGAIN desc: AGC maximum gain in recording screen - *: "AGC max. gain" + *: NONE + agc: "AGC max. gain" - *: "AGC max. gain" + *: NONE + agc: "AGC max. gain" - *: "AGC maximum gain" + *: NONE + agc: "AGC maximum gain" @@ -9874,124 +10092,151 @@ - id: LANG_UNPLUG + id: LANG_HEADPHONE_UNPLUG desc: in settings_menu. user: - *: "Pause on Headphone Unplug" + *: NONE + headphone_detection: "Pause on Headphone Unplug" - *: "Pause on Headphone Unplug" + *: NONE + headphone_detection: "Pause on Headphone Unplug" - *: "Pause on Headphone Unplug" + *: NONE + headphone_detection: "Pause on Headphone Unplug" - id: LANG_UNPLUG_RESUME + id: LANG_HEADPHONE_UNPLUG_RESUME desc: in pause_phones_menu. user: - *: "Pause and Resume" + *: NONE + headphone_detection: "Pause and Resume" - *: "Pause and Resume" + *: NONE + headphone_detection: "Pause and Resume" - *: "Pause and Resume" + *: NONE + headphone_detection: "Pause and Resume" - id: LANG_UNPLUG_RW + id: LANG_HEADPHONE_UNPLUG_RW desc: in pause_phones_menu. user: - *: "Duration to Rewind" + *: NONE + headphone_detection: "Duration to Rewind" - *: "Duration to Rewind" + *: NONE + headphone_detection: "Duration to Rewind" - *: "Duration to Rewind" + *: NONE + headphone_detection: "Duration to Rewind" - id: LANG_UNPLUG_DISABLE_AUTORESUME + id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME desc: in pause_phones_menu. user: - *: "Disable resume on startup if phones unplugged" + *: NONE + headphone_detection: "Disable resume on startup if phones unplugged" - *: "Disable resume on startup if phones unplugged" + *: NONE + headphone_detection: "Disable resume on startup if phones unplugged" - *: "Disable resume on startup if phones unplugged" + *: NONE + headphone_detection: "Disable resume on startup if phones unplugged" id: LANG_FM_REGION desc: fm tuner region setting - *: "Region" + *: NONE + radio: "Region" - *: "Region" + *: NONE + radio: "Region" - *: "Region" + *: NONE + radio: "Region" id: LANG_FM_EUROPE desc: fm tuner region europe - *: "Europe" + *: NONE + radio: "Europe" - *: "Europe" + *: NONE + radio: "Europe" - *: "Europe" + *: NONE + radio: "Europe" id: LANG_FM_US desc: fm region us / canada - *: "US / Canada" + *: NONE + radio: "US / Canada" - *: "US / Canada" + *: NONE + radio: "US / Canada" - *: "US / Canada" + *: NONE + radio: "US / Canada" id: LANG_FM_JAPAN desc: fm region japan - *: "Japan" + *: NONE + radio: "Japan" - *: "Japan" + *: NONE + radio: "Japan" - *: "Japan" + *: NONE + radio: "Japan" id: LANG_FM_KOREA desc: fm region korea - *: "Korea" + *: NONE + radio: "Korea" - *: "Korea" + *: NONE + radio: "Korea" - *: "Korea" + *: NONE + radio: "Korea" @@ -10040,44 +10285,19 @@ desc: in the sound settings menu user: - *: "Dithering" + *: NONE + swcodec: "Dithering" - *: "Dithering" + *: NONE + swcodec: "Dithering" - *: "Dithering" + *: NONE + swcodec: "Dithering" - id: LANG_SYSFONT_PITCH_UP_SEMITONE - desc: in wps - user: - - *: "Semitone Up" - - - *: "Semitone Up" - - - *: "" - - - - id: LANG_SYSFONT_PITCH_DOWN_SEMITONE - desc: in wps - user: - - *: "Semitone Down" - - - *: "Semitone Down" - - - *: "" - - - id: LANG_RECORDING_FORMAT desc: audio format item in recording menu user: @@ -10124,16 +10344,36 @@ desc: audio format description user: - *: "WavPack" + *: NONE + swcodec: "WavPack" - *: "WavPack" + *: NONE + swcodec: "WavPack" - *: "WavPack" + *: NONE + swcodec: "WavPack" + id: LANG_AFMT_AIFF + desc: audio format description + user: + + *: NONE + swcodec: "AIFF" + + + *: NONE + swcodec: "AIFF" + + + *: NONE + swcodec: "AIFF" + + + id: LANG_ENCODER_SETTINGS desc: encoder settings user: @@ -10270,95 +10510,99 @@ - id: LANG_AFMT_AIFF - desc: audio format description - user: - - *: "AIFF" - - - *: "AIFF" - - - *: "AIFF" - - - id: LANG_SYSFONT_AGC_SAFETY desc: AGC preset - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" - *: "Safety (clip)" + *: NONE + agc: "Safety (clip)" id: LANG_SYSFONT_AGC_LIVE desc: AGC preset - *: "Live (slow)" + *: NONE + agc: "Live (slow)" - *: "Live (slow)" + *: NONE + agc: "Live (slow)" - *: "Live (slow)" + *: NONE + agc: "Live (slow)" id: LANG_SYSFONT_AGC_DJSET desc: AGC preset - *: "DJ-Set (slow)" + *: NONE + agc: "DJ-Set (slow)" - *: "DJ-Set (slow)" + *: NONE + agc: "DJ-Set (slow)" - *: "DJ set (slow)" + *: NONE + agc: "DJ set (slow)" id: LANG_SYSFONT_AGC_MEDIUM desc: AGC preset - *: "Medium" + *: NONE + agc: "Medium" - *: "Medium" + *: NONE + agc: "Medium" - *: "Medium" + *: NONE + agc: "Medium" id: LANG_SYSFONT_AGC_VOICE desc: AGC preset - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" - *: "Voice (fast)" + *: NONE + agc: "Voice (fast)" id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN desc: AGC maximum gain in recording screen - *: "AGC max. gain" + *: NONE + agc: "AGC max. gain" - *: "AGC max. gain" + *: NONE + agc: "AGC max. gain" - *: "AGC maximum gain" + *: NONE + agc: "AGC maximum gain" @@ -10380,13 +10624,16 @@ desc: in settings_menu user: - *: "Shuffle and Track Skip" + *: NONE + swcodec: "Shuffle and Track Skip" - *: "Shuffle and Track Skip" + *: NONE + swcodec: "Shuffle and Track Skip" - *: "Shuffle and Track Skip" + *: NONE + swcodec: "Shuffle and Track Skip" Index: apps/onplay.c =================================================================== --- apps/onplay.c (revision 12140) +++ apps/onplay.c (working copy) @@ -454,7 +454,7 @@ #endif if(ACTION_STD_CANCEL == get_action(CONTEXT_STD,TIMEOUT_NOBLOCK)) { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, str(LANG_CANCEL)); result = -1; break; } Index: apps/gui/gwps-common.c =================================================================== --- apps/gui/gwps-common.c (revision 12140) +++ apps/gui/gwps-common.c (working copy) @@ -2484,12 +2484,11 @@ if (!wps_state.id3 && !(audio_status() & AUDIO_STATUS_PLAY)) { global_status.resume_index = -1; -#ifdef HAVE_LCD_CHARCELLS - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); -#else +#ifdef HAVE_LCD_BITMAP gui_syncstatusbar_draw(&statusbars, true); - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_RECORDER)); #endif + gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST)); + return true; } else @@ -2582,17 +2581,11 @@ 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, true, s); } Index: apps/playlist_viewer.c =================================================================== --- apps/playlist_viewer.c (revision 12140) +++ apps/playlist_viewer.c (working copy) @@ -635,11 +635,8 @@ if (!viewer.playlist && !(audio_status() & AUDIO_STATUS_PLAY)) { /* Play has stopped */ -#ifdef HAVE_LCD_CHARCELLS - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); -#else - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_RECORDER)); -#endif + gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST)); + goto exit; } Index: apps/settings_menu.c =================================================================== --- apps/settings_menu.c (revision 12140) +++ apps/settings_menu.c (working copy) @@ -1700,10 +1700,10 @@ static const struct opt_items names[] = { { STR(LANG_OFF) }, { STR(LANG_PAUSE) }, - { STR(LANG_UNPLUG_RESUME) }, + { STR(LANG_HEADPHONE_UNPLUG_RESUME) }, }; bool ret; - ret=set_option( str(LANG_UNPLUG), + ret=set_option( str(LANG_HEADPHONE_UNPLUG), &global_settings.unplug_mode, INT, names, 3, NULL); return ret; @@ -1713,7 +1713,7 @@ { bool ret; - ret = set_int(str(LANG_UNPLUG_RW), "s", UNIT_SEC, + ret = set_int(str(LANG_HEADPHONE_UNPLUG_RW), "s", UNIT_SEC, &global_settings.unplug_rw, NULL, 1, 0, 15, NULL ); audio_set_crossfade(global_settings.unplug_rw); @@ -1722,7 +1722,7 @@ static bool unplug_autoresume(void) { - return set_bool( str(LANG_UNPLUG_DISABLE_AUTORESUME), + return set_bool( str(LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME), &global_settings.unplug_autoresume ); } @@ -1732,9 +1732,9 @@ bool result; static const struct menu_item items[] = { - { ID2P(LANG_UNPLUG), unplug_mode }, - { ID2P(LANG_UNPLUG_RW), unplug_rw }, - { ID2P(LANG_UNPLUG_DISABLE_AUTORESUME), unplug_autoresume }, + { ID2P(LANG_HEADPHONE_UNPLUG), unplug_mode }, + { ID2P(LANG_HEADPHONE_UNPLUG_RW), unplug_rw }, + { ID2P(LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME), unplug_autoresume }, }; m=menu_init( items, sizeof(items) / sizeof(*items), NULL, @@ -1770,7 +1770,7 @@ { ID2P(LANG_ID3_ORDER), id3_order }, { ID2P(LANG_NEXT_FOLDER), next_folder }, #ifdef HAVE_HEADPHONE_DETECTION - { ID2P(LANG_UNPLUG), unplug_menu }, + { ID2P(LANG_HEADPHONE_UNPLUG), unplug_menu }, #endif { ID2P(LANG_AUDIOSCROBBLER), audioscrobbler} }; @@ -1821,12 +1821,12 @@ } static bool 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_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}; Index: apps/settings_list.c =================================================================== --- apps/settings_list.c (revision 12140) +++ apps/settings_list.c (working copy) @@ -150,8 +150,12 @@ #endif #endif /* CONFIG_BACKLIGHT */ #ifdef HAVE_LCD_BITMAP +#ifdef HAVE_LCD_INVERT OFFON_SETTING(0,invert, LANG_INVERT, false,"invert", NULL), +#endif +#ifdef HAVE_LCD_FLIP OFFON_SETTING(0,flip_display, LANG_FLIP_DISPLAY, false,"flip display", NULL), +#endif /* display */ OFFON_SETTING(0,invert_cursor, LANG_INVERT_CURSOR, true,"invert cursor", NULL), @@ -164,8 +168,10 @@ "volume display",graphic_numeric,UNUSED}, {F_T_INT,GS(battery_display), LANG_BATTERY_DISPLAY, INT(0), "battery display",graphic_numeric,UNUSED}, +#ifdef CONFIG_RTC {F_T_INT,GS(timeformat), LANG_TIMEFORMAT, INT(0), "time format","24hour,12hour",UNUSED}, +#endif #endif /* HAVE_LCD_BITMAP */ OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), /* system */ @@ -654,11 +660,11 @@ #endif #endif #ifdef HAVE_HEADPHONE_DETECTION - {F_T_INT,GS(unplug_mode),LANG_UNPLUG,INT(0), + {F_T_INT,GS(unplug_mode),LANG_HEADPHONE_UNPLUG,INT(0), "pause on headphone unplug",NULL,UNUSED}, - {F_T_INT,GS(unplug_rw),LANG_UNPLUG_RW,INT(0), + {F_T_INT,GS(unplug_rw),LANG_HEADPHONE_UNPLUG_RW,INT(0), "rewind duration on pause",NULL,UNUSED}, - 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 #ifdef CONFIG_TUNER Index: apps/features.txt =================================================================== --- apps/features.txt (revision 0) +++ apps/features.txt (revision 0) @@ -0,0 +1,158 @@ +#if defined(HAVE_AGC) +agc +#endif + +#if defined(HAVE_ALARM_MOD) +alarm +#endif + +#if defined(HAVE_LCD_BITMAP) +lcd_bitmap +#endif + +#if LCD_DEPTH > 1 +lcd_color +#endif + +#if defined(HAVE_PITCHSCREEN) +pitchscreen +#endif + +#if defined(HAVE_HEADPHONE_DETECTION) +headphone_detection +#endif + +#if defined(HAVE_LCD_CONTRAST) +lcd_constrast +#endif + +#if defined(HAVE_LCD_FLIP) +lcd_flip +#endif + +#if defined(HAVE_LCD_INVERT) || defined(HAVE_REMOTE_LCD) +lcd_invert +#endif + +#if defined(HAVE_MULTIVOLUME) +multivolume +#endif + +#if defined(HAVE_QUICKSCREEN) +quickscreen +#endif + +#if defined(CONFIG_TUNER) +radio +#endif + +#if defined(HAVE_RECORDING) +recording +#endif + +#if defined(HAVE_REMOTE_LCD) +remote +#endif + +#if defined(HAVE_REMOTE_LCD_TICKING) +remote_ticking +#endif + +#if defined(CONFIG_RTC) +rtc +#endif + +#if defined(HAVE_SPDIF_POWER) +spdif_power +#endif + +#if CONFIG_CODEC == SWCODEC +swcodec +#endif + +#if defined(HAVE_TAGCACHE) +tagcache +#endif + +#if defined(HAVE_DIRCACHE) +dircache +#endif +#if defined(HAVE_AGC) +agc +#endif + +#if defined(HAVE_ALARM_MOD) +alarm +#endif + +#if defined(HAVE_LCD_BITMAP) +lcd_bitmap +#endif + +#if LCD_DEPTH > 1 +lcd_color +#endif + +#if defined(HAVE_PITCHSCREEN) +pitchscreen +#endif + +#if defined(HAVE_HEADPHONE_DETECTION) +headphone_detection +#endif + +#if defined(HAVE_LCD_CONTRAST) +lcd_constrast +#endif + +#if defined(HAVE_LCD_FLIP) +lcd_flip +#endif + +#if defined(HAVE_LCD_INVERT) || defined(HAVE_REMOTE_LCD) +lcd_invert +#endif + +#if defined(HAVE_MULTIVOLUME) +multivolume +#endif + +#if defined(HAVE_QUICKSCREEN) +quickscreen +#endif + +#if defined(CONFIG_TUNER) +radio +#endif + +#if defined(HAVE_RECORDING) +recording +#endif + +#if defined(HAVE_REMOTE_LCD) +remote +#endif + +#if defined(HAVE_REMOTE_LCD_TICKING) +remote_ticking +#endif + +#if defined(CONFIG_RTC) +rtc +#endif + +#if defined(HAVE_SPDIF_POWER) +spdif_power +#endif + +#if CONFIG_CODEC == SWCODEC +swcodec +#endif + +#if defined(HAVE_TAGCACHE) +tagcache +#endif + +#if defined(HAVE_DIRCACHE) +dircache +#endif Index: apps/sound_menu.c =================================================================== --- apps/sound_menu.c (revision 12140) +++ apps/sound_menu.c (working copy) @@ -1094,7 +1094,7 @@ switch (button) { case ACTION_STD_CANCEL: - gui_syncsplash(50, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(50, true, 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/eq_menu.c =================================================================== --- apps/eq_menu.c (revision 12140) +++ apps/eq_menu.c (working copy) @@ -723,7 +723,7 @@ break; } else { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, str(LANG_CANCEL)); return false; } } Index: apps/tagtree.c =================================================================== --- apps/tagtree.c (revision 12140) +++ apps/tagtree.c (working copy) @@ -1566,7 +1566,7 @@ } if (tc->filesindir <= 0) - gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST_PLAYER)); + gui_syncsplash(HZ, true, str(LANG_END_PLAYLIST)); else { logf("insert_all_playlist");