Index: tools/genlang =================================================================== --- tools/genlang (revision 12164) +++ 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/playlist.c =================================================================== --- apps/playlist.c (revision 12164) +++ apps/playlist.c (working copy) @@ -484,7 +484,7 @@ lcd_setmargins(0, 0); #endif - gui_syncsplash(0, true, str(LANG_PLAYLIST_LOAD)); + gui_syncsplash(0, true, str(LANG_WAIT)); if (!buffer) { @@ -1663,13 +1663,7 @@ lcd_setmargins(0, 0); #endif - gui_syncsplash(0, true, fmt, count, -#if CONFIG_KEYPAD == PLAYER_PAD - str(LANG_STOP_ABORT) -#else - str(LANG_OFF_ABORT) -#endif - ); + gui_syncsplash(0, true, fmt, count, str(LANG_OFF_ABORT)); } /* @@ -1991,12 +1985,7 @@ { gui_syncsplash(0, true, 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 12164) +++ 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%" */ @@ -651,17 +651,17 @@ [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) }, #ifdef HAVE_TAGCACHE - [SHOW_ID3DB]={ STR(LANG_SYSFONT_FILTER_ID3DB) } + [SHOW_ID3DB]={ STR(LANG_SYSFONT_TAGCACHE) } #endif }; 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) }, #if (AB_REPEAT_ENABLE == 1) @@ -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 12164) +++ 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++; @@ -347,7 +343,7 @@ /* info menu */ static const struct menu_item items[] = { - { ID2P(LANG_INFO_MENU), show_info }, + { ID2P(LANG_ROCKBOX_INFO), show_info }, { ID2P(LANG_VERSION), show_credits }, { ID2P(LANG_RUNNING_TIME), view_runtime }, { ID2P(LANG_DEBUG), debug_menu }, Index: apps/action.c =================================================================== --- apps/action.c (revision 12164) +++ 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/recorder/radio.c =================================================================== --- apps/recorder/radio.c (revision 12164) +++ apps/recorder/radio.c (working copy) @@ -466,7 +466,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 cpu_idle_mode(true); @@ -693,7 +693,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; @@ -724,7 +724,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; @@ -861,8 +861,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); @@ -1385,8 +1385,8 @@ static void create_radiomode_menu(void) { - snprintf(radiomode_menu_string, 32, "%s %s", str(LANG_FM_TUNE_MODE), - radio_mode ? str(LANG_RADIO_PRESET_MODE) : + snprintf(radiomode_menu_string, 32, "%s %s", str(LANG_MODE), + radio_mode ? str(LANG_PRESET) : str(LANG_RADIO_SCAN_MODE)); } @@ -1556,7 +1556,7 @@ static const struct menu_item items[] = { /* Add functions not accessible via buttons */ #ifndef FM_PRESET - { ID2P(LANG_FM_BUTTONBAR_PRESETS), handle_radio_presets }, + { ID2P(LANG_PRESET), handle_radio_presets }, #endif #ifndef FM_PRESET_ADD { ID2P(LANG_FM_ADD_PRESET) , radio_add_preset }, Index: apps/recorder/recording.c =================================================================== --- apps/recorder/recording.c (revision 12164) +++ apps/recorder/recording.c (working copy) @@ -1847,12 +1847,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], @@ -1925,7 +1925,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 12164) +++ 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 12164) +++ 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 12164) +++ apps/settings.c (working copy) @@ -523,11 +523,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 } @@ -549,7 +549,7 @@ break; } else { - gui_syncsplash(HZ, true, str(LANG_MENU_SETTING_CANCEL)); + gui_syncsplash(HZ, true, str(LANG_CANCEL)); return false; } } @@ -1009,7 +1009,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 12164) +++ apps/lang/english.lang (working copy) @@ -132,13 +132,16 @@ desc: in shutdown screen user: - *: "Press OFF to shut down" + *: NONE + recorder: "Press OFF to shut down" - *: "Press OFF to shut down" + *: NONE + recorder: "Press OFF to shut down" - *: "" + *: NONE + recorder: "" @@ -160,13 +163,16 @@ desc: splash screen displayed when pcm buffer size is changed user: - *: "Restarting playback..." + *: NONE + swcodec: "Restarting playback..." - *: "Restarting playback..." + *: NONE + swcodec: "Restarting playback..." - *: "" + *: NONE + swcodec: "" @@ -174,21 +180,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 +295,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 +312,16 @@ desc: in the main menu user: - *: "Recording" + *: NONE + recording: "Recording" - *: "Recording" + *: NONE + recording: "Recording" - *: "Recording" + *: NONE + recording: "Recording" @@ -356,13 +371,16 @@ desc: in main menu user: - *: "Shut down" + *: NONE + player: "Shut down" - *: "Shut down" + *: NONE + player: "Shut down" - *: "Shut down" + *: NONE + player: "Shut down" @@ -422,7 +440,7 @@ - id: LANG_CHANNEL_MENU + id: LANG_CHANNELS desc: in sound_settings user: @@ -566,13 +584,16 @@ desc: in sound_settings user: - *: "Auto Volume" + *: NONE + hwcodec: "Auto Volume" - *: "Auto Volume" + *: NONE + hwcodec: "Auto Volume" - *: "Auto Volume" + *: NONE + hwcodec: "Auto Volume" @@ -580,13 +601,16 @@ desc: in sound_settings user: - *: "AV Decay Time" + *: NONE + hwcodec: "AV Decay Time" - *: "AV Decay Time" + *: NONE + hwcodec: "AV Decay Time" - *: "" + *: NONE + hwcodec: "" @@ -594,13 +618,15 @@ desc: in sound settings user: - *: "Super Bass" + *: NONE + hwcodec: "Super Bass" - *: "Super Bass" + *: NONE + hwcodec: "Super Bass" - *: "Super Bass" + hwcodec: "Super Bass" @@ -608,13 +634,16 @@ desc: in sound settings user: - *: "MDB Enable" + *: NONE + hwcodec: "MDB Enable" - *: "MDB Enable" + *: NONE + hwcodec: "MDB Enable" - *: "MDB Enable" + *: NONE + hwcodec: "MDB Enable" @@ -622,13 +651,16 @@ desc: in sound settings user: - *: "MDB Strength" + *: NONE + hwcodec: "MDB Strength" - *: "MDB Strength" + *: NONE + hwcodec: "MDB Strength" - *: "MDB Strength" + *: NONE + hwcodec: "MDB Strength" @@ -636,13 +668,16 @@ desc: in sound settings user: - *: "MDB Harmonics" + *: NONE + hwcodec: "MDB Harmonics" - *: "MDB Harmonics" + *: NONE + hwcodec: "MDB Harmonics" - *: "MDB Harmonics" + *: NONE + hwcodec: "MDB Harmonics" @@ -650,13 +685,16 @@ desc: in sound settings user: - *: "MDB Center Frequency" + *: NONE + hwcodec: "MDB Center Frequency" - *: "MDB Center Frequency" + *: NONE + hwcodec: "MDB Center Frequency" - *: "MDB Center Frequency" + *: NONE + hwcodec: "MDB Center Frequency" @@ -664,13 +702,16 @@ desc: in sound settings user: - *: "MDB Shape" + *: NONE + hwcodec: "MDB Shape" - *: "MDB Shape" + *: NONE + hwcodec: "MDB Shape" - *: "MDB Shape" + *: NONE + hwcodec: "MDB Shape" @@ -678,13 +719,16 @@ desc: in sound settings user: - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" - *: "Crossfeed" + *: NONE + swcodec: "Crossfeed" @@ -692,13 +736,16 @@ desc: in the sound settings menu user: - *: "Equalizer" + *: NONE + swcodec: "Equalizer" - *: "Equalizer" + *: NONE + swcodec: "Equalizer" - *: "Equalizer" + *: NONE + swcodec: "Equalizer" @@ -814,20 +861,6 @@ - id: LANG_FIRMWARE - desc: DEPRECATED - user: - - *: "" - - - *: deprecated - - - *: "" - - - id: LANG_RESET desc: in system_settings_menu() user: @@ -842,7 +875,7 @@ - id: LANG_RESET_ASK_RECORDER + id: LANG_RESET_ASK desc: confirm to reset settings user: @@ -920,20 +953,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 +967,7 @@ - id: LANG_SETTINGS_SAVE_PLAYER + id: LANG_SETTINGS_SAVE_FAILED desc: displayed if save settings has failed user: @@ -962,42 +981,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 +1001,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 +1018,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 +1035,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 +1052,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 +1069,16 @@ desc: in eq settings user: - *: "Precut" + *: NONE + swcodec: "Precut" - *: "Precut" + *: NONE + swcodec: "Precut" - *: "Pre-cut" + *: NONE + swcodec: "Pre-cut" @@ -1078,13 +1086,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 +1103,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 +1120,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 +1137,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 +1154,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 +1171,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 +1188,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 +1205,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 +1222,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 +1239,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 +1256,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 +1273,16 @@ desc: in the equalizer settings menu user: - *: "Q" + *: NONE + swcodec: "Q" - *: "Q" + *: NONE + swcodec: "Q" - *: "Q" + *: NONE + swcodec: "Q" @@ -1246,13 +1290,16 @@ desc: in the equalizer settings menu user: - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" @@ -1326,20 +1373,6 @@ - id: LANG_INFO_MENU - desc: in the info menu - user: - - *: "Rockbox Info" - - - *: "Rockbox Info" - - - *: "Rockbox Info" - - - id: LANG_VERSION desc: in the info menu user: @@ -1410,8 +1443,8 @@ - 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: *: "All" @@ -1540,13 +1573,16 @@ desc: in playback settings user: - *: "Crossfade" + *: NONE + swcodec: "Crossfade" - *: "Crossfade" + *: NONE + swcodec: "Crossfade" - *: "Crossfade" + *: NONE + swcodec: "Crossfade" @@ -1554,13 +1590,16 @@ desc: in replaygain user: - *: "Replaygain" + *: NONE + swcodec: "Replaygain" - *: "Replaygain" + *: NONE + swcodec: "Replaygain" - *: "Replaygain" + *: NONE + swcodec: "Replaygain" @@ -1568,13 +1607,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 +1624,16 @@ desc: in beep volume in playback settings user: - *: "Weak" + *: NONE + swcodec: "Weak" - *: "Weak" + *: NONE + swcodec: "Weak" - *: "Weak" + *: NONE + swcodec: "Weak" @@ -1596,13 +1641,16 @@ desc: in beep volume in playback settings user: - *: "Moderate" + *: NONE + swcodec: "Moderate" - *: "Moderate" + *: NONE + swcodec: "Moderate" - *: "Moderate" + *: NONE + swcodec: "Moderate" @@ -1610,13 +1658,16 @@ desc: in beep volume in playback settings user: - *: "Strong" + *: NONE + swcodec: "Strong" - *: "Strong" + *: NONE + swcodec: "Strong" - *: "Strong" + *: NONE + swcodec: "Strong" @@ -1624,13 +1675,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 +1758,6 @@ - id: LANG_TAGCACHE_DISK - desc: - user: - - *: "" - - - *: "" - - - *: "" - - - id: LANG_TAGCACHE_RAM desc: in tag cache settings user: @@ -1900,20 +1940,6 @@ - id: LANG_FILTER_ALL - desc: show all files - user: - - *: "All" - - - *: "All" - - - *: "All" - - - id: LANG_FILTER_SUPPORTED desc: show all file types supported by Rockbox user: @@ -1956,20 +1982,6 @@ - id: LANG_FILTER_ID3DB - desc: show ID3 Database - user: - - *: "Database" - - - *: "Database" - - - *: "Database" - - - id: LANG_FOLLOW desc: in settings_menu user: @@ -2030,13 +2042,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 +2073,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 +2356,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 +2401,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" @@ -2404,20 +2428,6 @@ - id: LANG_LINE_IN - desc: in settings_menu - user: - - *: "Line In" - - - *: "Line In" - - - *: "Line In" - - - id: LANG_CAR_ADAPTER_MODE desc: Displayed for setting car adapter mode to on/off user: @@ -2646,20 +2656,23 @@ 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" - id: LANG_RECORDING_SRC_LINE + id: LANG_LINE_IN desc: in the recording settings user: @@ -2687,20 +2700,6 @@ - id: LANG_RECORDING_CHANNELS - desc: in the recording settings - user: - - *: "Channels" - - - *: "Channels" - - - *: "Channels" - - - id: LANG_RECORDING_EDITABLE desc: Editable recordings setting user: @@ -2831,13 +2830,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 +2847,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 +2892,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 +2909,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 +2926,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 +2943,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 +2960,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 +2977,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 +2994,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 +3011,16 @@ desc: in playback settings, crossfade option user: - *: "Mix" + *: NONE + swcodec: "Mix" - *: "Mix" + *: NONE + swcodec: "Mix" - *: "Mix" + *: NONE + swcodec: "Mix" @@ -2999,13 +3028,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 +3045,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 +3062,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 +3079,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 +3096,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 +3113,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" @@ -3139,13 +3189,16 @@ desc: in settings_menu user: - *: "Backlight Fade In" + *: NONE + backlight_fade: "Backlight Fade In" - *: "Backlight Fade In" + *: NONE + backlight_fade: "Backlight Fade In" - *: "Backlight Fade In" + *: NONE + backlight_fade: "Backlight Fade In" @@ -3153,13 +3206,16 @@ desc: in settings_menu user: - *: "Backlight Fade Out" + *: NONE + backlight_fade: "Backlight Fade Out" - *: "Backlight Fade Out" + *: NONE + backlight_fade: "Backlight Fade Out" - *: "Backlight Fade Out" + *: NONE + backlight_fade: "Backlight Fade Out" @@ -3209,17 +3265,20 @@ 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" - id: LANG_INVERT_LCD_NORMAL + id: LANG_NORMAL desc: in settings_menu user: @@ -3237,13 +3296,16 @@ desc: in settings_menu user: - *: "Inverse" + *: NONE + lcd_invert: "Inverse" - *: "Inverse" + *: NONE + lcd_invert: "Inverse" - *: "Inverse" + *: NONE + lcd_invert: "Inverse" @@ -3251,13 +3313,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 +3372,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 +3389,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 +3406,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 +3423,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 +3440,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 +3541,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 +3558,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 +3575,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" @@ -3797,13 +3886,16 @@ desc: in battery settings user: - *: "Battery Type" + *: NONE + battery_types: "Battery Type" - *: "Battery Type" + *: NONE + battery_types: "Battery Type" - *: "Battery type" + *: NONE + battery_types: "Battery type" @@ -3811,13 +3903,16 @@ desc: in battery settings user: - *: "Alkaline" + *: NONE + battery_types: "Alkaline" - *: "Alkaline" + *: NONE + battery_types: "Alkaline" - *: "Alkaline" + *: NONE + battery_types: "Alkaline" @@ -3825,13 +3920,16 @@ desc: in battery settings user: - *: "NiMH" + *: NONE + battery_types: "NiMH" - *: "NiMH" + *: NONE + battery_types: "NiMH" - *: "Nickel metal hydride" + *: NONE + battery_types: "Nickel metal hydride" @@ -3849,48 +3947,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 +3982,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 +3999,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 +4016,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 +4033,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 +4232,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 +4315,6 @@ - id: LANG_PITCH - desc: "pitch" in the pitch screen - user: - - *: "Pitch" - - - *: "Pitch" - - - *: "Pitch" - - - id: LANG_VIEW desc: in on+play menu user: @@ -4438,40 +4512,28 @@ id: LANG_ROCKBOX_INFO - desc: displayed topmost on the info screen + desc: displayed topmost on the info screen and in the info menu user: - *: "Rockbox Info:" + *: "Rockbox Info" - *: "Rockbox Info:" + *: "Rockbox Info" - *: "" + *: "Rockbox Info" - 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 +4629,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 +4646,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 +4673,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 +4711,53 @@ desc: in wps user: - *: "Pitch Down" + *: NONE + pitchscreen: "Pitch Down" - *: "Pitch Down" + *: NONE + pitchscreen: "Pitch Down" - *: "" + *: NONE + pitchscreen: " " + 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: @@ -4647,8 +4772,8 @@ - id: LANG_F2_MODE - desc: in wps F2 pressed + id: LANG_MODE + desc: in wps F2 pressed and radio screen user: *: "Mode:" @@ -4939,56 +5064,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,31 +5227,17 @@ 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." *: "" - id: LANG_RECORD_TRIGGER_MODE - desc: in recording settings_menu - user: - - *: "Trigger" - - - *: "Trigger" - - - *: "" - - - id: LANG_RECORD_TRIG_NOREARM desc: in recording settings_menu user: @@ -5295,13 +5382,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 +5399,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 +5416,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 +5433,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 +5450,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 +5467,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 +5484,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 +5501,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 +5518,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 +5685,7 @@ - id: LANG_ID3_FRECUENCY + id: LANG_ID3_FREQUENCY desc: in tag viewer user: @@ -5589,13 +5703,16 @@ desc: in tag viewer user: - *: "[Track Gain]" + *: NONE + swcodec: "[Track Gain]" - *: "[Track Gain]" + *: NONE + swcodec: "[Track Gain]" - *: "" + *: NONE + swcodec: "" @@ -5603,13 +5720,16 @@ desc: in tag viewer user: - *: "[Album Gain]" + *: NONE + swcodec: "[Album Gain]" - *: "[Album Gain]" + *: NONE + swcodec: "[Album Gain]" - *: "" + *: NONE + swcodec: "" @@ -7223,20 +7343,6 @@ - id: LANG_PLAYLIST_LOAD - desc: displayed on screen while loading a playlist - user: - - *: "Loading..." - - - *: "Loading..." - - - *: "" - - - id: LANG_PLAYLIST_SHUFFLE desc: displayed on screen while shuffling a playlist user: @@ -7265,28 +7371,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 +7559,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 +7576,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 +7593,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 +7610,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 +7627,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 +7644,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 +7661,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 +7692,16 @@ desc: in radio screen user: - *: "Exit" + *: NONE + radio: "Exit" - *: "Exit" + *: NONE + radio: "Exit" - *: "" + *: NONE + radio: "" @@ -7591,27 +7709,33 @@ desc: in radio screen user: - *: "Action" + *: NONE + radio: "Action" - *: "Action" + *: NONE + radio: "Action" - *: "" + *: NONE + radio: "" - id: LANG_FM_BUTTONBAR_PRESETS - desc: in button bar + id: LANG_PRESET + desc: in button bar and radio screen / menu user: - *: "Preset" + *: NONE + radio: "Preset" - *: "Preset" + *: NONE + radio: "Preset" - *: "" + *: NONE + radio: "" @@ -7619,13 +7743,16 @@ desc: in radio screen user: - *: "Add" + *: NONE + radio: "Add" - *: "Add" + *: NONE + radio: "Add" - *: "" + *: NONE + radio: "" @@ -7633,13 +7760,16 @@ desc: in radio screen user: - *: "Record" + *: NONE + radio: "Record" - *: "Record" + *: NONE + radio: "Record" - *: "" + *: NONE + radio: "" @@ -7647,13 +7777,16 @@ desc: in radio screen user: - *: "Force mono" + *: NONE + radio: "Force mono" - *: "Force mono" + *: NONE + radio: "Force mono" - *: "" + *: NONE + radio: "" @@ -7661,13 +7794,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 +7811,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 +7828,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 +7845,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,100 +7862,36 @@ 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: "" - id: LANG_FM_TUNE_MODE - desc: in radio screen / menu - user: - - *: "Mode:" - - - *: "Mode:" - - - *: "" - - - id: LANG_RADIO_SCAN_MODE desc: in radio screen / menu user: - *: "Scan" + *: NONE + radio: "Scan" - *: "Scan" + *: NONE + radio: "Scan" - *: "" + *: NONE + radio: "" - id: LANG_RADIO_PRESET_MODE - desc: in radio screen / menu - user: - - *: "Preset" - - - *: "Preset" - - - *: "" - - - - 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: @@ -7900,14 +7981,14 @@ user: *: "OFF to abort" - h100,h120,h300: "STOP to abort" + player,h100,h120,h300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" x5: "Long PLAY to abort" h10: "PREV to abort" *: "OFF to abort" - h100,h120,h300: "STOP to abort" + player,h100,h120,h300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" x5: "Long PLAY to abort" h10: "PREV to abort" @@ -7917,20 +7998,6 @@ - id: LANG_STOP_ABORT - desc: Used on player models - user: - - *: "STOP to abort" - - - *: "STOP to abort" - - - *: "" - - - id: LANG_NO_FILES desc: in settings_menu user: @@ -7949,13 +8016,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 +8033,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 +8442,12 @@ desc: possible answers to resume question user: - *: "(PLAY/STOP)" + *: NONE + player: "(PLAY/STOP)" - *: "(PLAY/STOP)" + *: NONE + player: "(PLAY/STOP)" *: "" @@ -8383,13 +8458,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 +8475,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 +8492,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 +8509,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 +8526,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 +8543,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 +8560,16 @@ desc: In the settings menu user: - *: "pixels" + *: NONE + lcd_bitmap: "pixels" - *: "pixels" + *: NONE + lcd_bitmap: "pixels" - *: "pixels" + *: NONE + lcd_bitmap: "pixels" @@ -8481,52 +8577,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 +8696,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" @@ -8874,20 +8985,6 @@ - id: LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL - desc: in lcd settings - user: - - *: "Normal" - - - *: "Normal" - - - *: "Normal" - - - id: LANG_BACKLIGHT_ON_BUTTON_HOLD desc: in lcd settings user: @@ -9032,13 +9129,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 +9146,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 +9163,16 @@ desc: in the equalizer settings menu user: - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" - *: "Gain" + *: NONE + swcodec: "Gain" @@ -9098,7 +9204,7 @@ - id: LANG_SYSFONT_REPEAT_ALL + id: LANG_SYSFONT_ALL desc: repeat playlist once all songs have completed user: @@ -9154,20 +9260,6 @@ - id: LANG_SYSFONT_FILTER_ALL - desc: show all files - user: - - *: "All" - - - *: "All" - - - *: "All" - - - id: LANG_SYSFONT_FILTER_SUPPORTED desc: show all file types supported by Rockbox user: @@ -9210,7 +9302,7 @@ - id: LANG_SYSFONT_FILTER_ID3DB + id: LANG_SYSFONT_TAGCACHE desc: show ID3 Database user: @@ -9280,7 +9372,7 @@ - id: LANG_SYSFONT_RECORDING_SRC_LINE + id: LANG_SYSFONT_LINE_IN desc: in the recording settings user: @@ -9308,7 +9400,7 @@ - id: LANG_SYSFONT_RECORDING_CHANNELS + id: LANG_SYSFONT_CHANNELS desc: in the recording settings user: @@ -9378,49 +9470,7 @@ - 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 + id: LANG_SYSFONT_MODE desc: in wps F2 pressed user: @@ -9537,11 +9587,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 +9671,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 +9688,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 +9719,16 @@ desc: in the equalizer settings menu user: - *: "Narrow" + *: NONE + ipodvideo: "Narrow" - *: "Narrow" + *: NONE + ipodvideo: "Narrow" - *: "Narrow" + *: NONE + ipodvideo: "Narrow" @@ -9677,13 +9736,16 @@ desc: in the equalizer settings menu user: - *: "Wide" + *: NONE + ipodvideo: "Wide" - *: "Wide" + *: NONE + ipodvideo: "Wide" - *: "Wide" + *: NONE + ipodvideo: "Wide" @@ -9732,117 +9794,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 +9963,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,97 +10156,101 @@ 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 + id: LANG_RECORDING_FORMAT + desc: audio format item in recording menu user: - *: "Semitone Up" + *: NONE + swcodec: "Format" - *: "Semitone Up" + *: NONE + swcodec: "Format" - *: "" + *: NONE + swcodec: "Format" - id: LANG_SYSFONT_PITCH_DOWN_SEMITONE - desc: in wps + id: LANG_AFMT_MPA_L3 + desc: audio format description user: - *: "Semitone Down" + *: NONE + swcodec: "MPEG Layer 3" - *: "Semitone Down" + *: NONE + swcodec: "MPEG Layer 3" - *: "" + *: NONE + swcodec: "MPEG Layer 3" - id: LANG_RECORDING_FORMAT - desc: audio format item in recording menu - user: - - *: "Format" - - - *: "Format" - - - *: "Format" - - - - id: LANG_AFMT_MPA_L3 + id: LANG_AFMT_PCM_WAV desc: audio format description user: - *: "MPEG Layer 3" + *: NONE + swcodec: "PCM Wave" - *: "MPEG Layer 3" + *: NONE + swcodec: "PCM Wave" - *: "MPEG Layer 3" + *: NONE + swcodec: "PCM Wave" - id: LANG_AFMT_PCM_WAV + id: LANG_AFMT_WAVPACK desc: audio format description user: - *: "PCM Wave" + *: NONE + swcodec: "WavPack" - *: "PCM Wave" + *: NONE + swcodec: "WavPack" - *: "PCM Wave" + *: NONE + swcodec: "WavPack" - id: LANG_AFMT_WAVPACK + id: LANG_AFMT_AIFF desc: audio format description user: - *: "WavPack" + *: NONE + swcodec: "AIFF" - *: "WavPack" + *: NONE + swcodec: "AIFF" - *: "WavPack" + *: NONE + swcodec: "AIFF" @@ -10138,13 +10258,16 @@ desc: encoder settings user: - *: "Encoder Settings" + *: NONE + swcodec: "Encoder Settings" - *: "Encoder Settings" + *: NONE + swcodec: "Encoder Settings" - *: "Encoder Settings" + *: NONE + swcodec: "Encoder Settings" @@ -10270,95 +10393,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 +10507,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 12164) +++ 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 12164) +++ 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 12164) +++ 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; } @@ -820,12 +817,7 @@ for (i=0;(i 1 +battery_types +#endif + +#if defined(HAVE_DIRCACHE) +dircache +#endif + +#if defined(HAVE_HEADPHONE_DETECTION) +headphone_detection +#endif + +#if defined(HAVE_LCD_BITMAP) +lcd_bitmap +#endif + +#if defined(HAVE_LCD_CHARCELLS) +lcd_charcell +#endif + +#if LCD_DEPTH > 1 +lcd_color +#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_HEADPHONE_DETECTION) +headphone_detection +#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 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 +#else +hwcodec +#endif + +#if defined(HAVE_TAGCACHE) +tagcache +#endif + Index: apps/sound_menu.c =================================================================== --- apps/sound_menu.c (revision 12164) +++ apps/sound_menu.c (working copy) @@ -314,7 +314,7 @@ static const struct opt_items names[AUDIO_NUM_SOURCES] = { [AUDIO_SRC_MIC] = { STR(LANG_RECORDING_SRC_MIC) }, - [AUDIO_SRC_LINEIN] = { STR(LANG_RECORDING_SRC_LINE) }, + [AUDIO_SRC_LINEIN] = { STR(LANG_LINE_IN) }, #ifdef HAVE_SPDIF_IN [AUDIO_SRC_SPDIF] = { STR(LANG_RECORDING_SRC_DIGITAL) }, #endif @@ -490,7 +490,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 */ @@ -518,7 +518,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) @@ -772,7 +772,7 @@ { ID2P(LANG_TREBLE), treble }, #endif { ID2P(LANG_BALANCE), balance }, - { ID2P(LANG_CHANNEL_MENU), chanconf }, + { ID2P(LANG_CHANNELS), chanconf }, { ID2P(LANG_STEREO_WIDTH), stereo_width }, #if CONFIG_CODEC == SWCODEC { ID2P(LANG_CROSSFEED), crossfeed_menu }, @@ -914,7 +914,7 @@ }; 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), @@ -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; @@ -1265,7 +1265,7 @@ #endif { ID2P(LANG_RECORDING_FREQUENCY), recfrequency }, { ID2P(LANG_RECORDING_SOURCE), recsource }, /* not shown if no_source */ - { ID2P(LANG_RECORDING_CHANNELS), recchannels }, + { ID2P(LANG_CHANNELS), recchannels }, #if CONFIG_CODEC == MAS3587F { ID2P(LANG_RECORDING_EDITABLE), receditable }, #endif Index: apps/eq_menu.c =================================================================== --- apps/eq_menu.c (revision 12164) +++ 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/playlist_catalog.c =================================================================== --- apps/playlist_catalog.c (revision 12164) +++ apps/playlist_catalog.c (working copy) @@ -320,12 +320,7 @@ static void display_insert_count(int count) { gui_syncsplash(0, true, 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 12164) +++ apps/tagtree.c (working copy) @@ -878,12 +878,7 @@ if (current_tick - last_tick > HZ/4) { gui_syncsplash(0, true, 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; @@ -1566,7 +1561,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");