6 files changed, 31 insertions, 33 deletions

diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 3248f10f0e..d16ef6912d 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -281,8 +281,8 @@ static int draw_eq_slider(struct screen * screen, int x, int y,
 #if NB_SCREENS > 1
     if (screen->screen_type == SCREEN_REMOTE) {
         if (mode == GAIN) {
-            screen->putsxy(current_x, y + 2, str(LANG_EQUALIZER_BAND_GAIN));
-            screen->getstringsize(str(LANG_EQUALIZER_BAND_GAIN), &w, &h);
+            screen->putsxy(current_x, y + 2, str(LANG_GAIN));
+            screen->getstringsize(str(LANG_GAIN), &w, &h);
         } else if (mode == CUTOFF) {
             screen->putsxy(current_x, y + 2, str(LANG_EQUALIZER_BAND_CUTOFF));
             screen->getstringsize(str(LANG_EQUALIZER_BAND_CUTOFF), &w, &h);
@@ -454,7 +454,7 @@ bool eq_menu_graphical(void)
             voice_unit = UNIT_DB;
             
             snprintf(buf, sizeof(buf), str(LANG_SYSFONT_EQUALIZER_EDIT_MODE),
-                str(LANG_SYSFONT_EQUALIZER_BAND_GAIN));
+                str(LANG_SYSFONT_GAIN));
             
             screens[SCREEN_MAIN].putsxy(2, y, buf);
         } else if (mode == CUTOFF) {
@@ -596,7 +596,7 @@ static bool eq_save_preset(void)
                 break;
         }
         else {
-            gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL));
+            gui_syncsplash(HZ, str(LANG_CANCEL));
             return false;
         }
     }
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 7891a5c8a8..9529d93027 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -67,12 +67,12 @@ int browse_folder(void *param)
 
 static int reset_settings(void)
 {
-    unsigned char *lines[]={str(LANG_RESET_ASK_RECORDER)};
+    unsigned char *lines[]={str(LANG_RESET_ASK)};
     unsigned char *yes_lines[]={
-        str(LANG_RESET_DONE_SETTING),
+        str(LANG_SETTINGS),
         str(LANG_RESET_DONE_CLEAR)
     };
-    unsigned char *no_lines[]={yes_lines[0], str(LANG_RESET_DONE_CANCEL)};
+    unsigned char *no_lines[]={yes_lines[0], str(LANG_CANCEL)};
     struct text_message message={(char **)lines, 1};
     struct text_message yes_message={(char **)yes_lines, 2};
     struct text_message no_message={(char **)no_lines, 2};
@@ -186,9 +186,11 @@ static bool show_info(void)
                     talk_value(battery_level(), UNIT_PERCENT, true);
 #if CONFIG_CHARGING >= CHARGING_MONITOR
                     if (charge_state == CHARGING)
-                        talk_id(LANG_BATTERY_CHARGE, true);               
+                        talk_id(LANG_BATTERY_CHARGE, true);
+#if CONFIG_CHARGING == CHARGING_CONTROL
                     else if (charge_state == TOPOFF)
                         talk_id(LANG_BATTERY_TOPOFF_CHARGE, true);
+#endif
                     else if (charge_state == TRICKLE)
                         talk_id(LANG_BATTERY_TRICKLE_CHARGE, true);
 #endif
@@ -252,13 +254,9 @@ static bool show_info(void)
             int integer = buflen / 1000;
             int decimal = buflen % 1000;
 
-#ifdef HAVE_LCD_CHARCELLS
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_PLAYER),
+            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT),
                      integer, decimal);
-#else
-            snprintf(s, sizeof(s), (char *)str(LANG_BUFFER_STAT_RECORDER),
-                     integer, decimal);
-#endif
+
             FOR_NB_SCREENS(i)
                 screens[i].puts_scroll(0, y, (unsigned char *)s);
             y++;
@@ -341,7 +339,7 @@ static bool show_info(void)
 
 #ifndef SIMULATOR
             case ACTION_STD_OK:
-                gui_syncsplash(0, str(LANG_DIRCACHE_BUILDING));
+                gui_syncsplash(0, str(LANG_SCANNING_DISK));
                 fat_recalc_free(IF_MV(0));
 #ifdef HAVE_MULTIVOLUME
                 if (fat_ismounted(1))
@@ -359,7 +357,7 @@ static bool show_info(void)
     }
     return false;
 }
-MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU),
+MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_ROCKBOX_INFO),
                    (menu_function)show_info, NULL, NULL, Icon_NOICON);
 
 
@@ -406,7 +404,7 @@ MENUITEM_FUNCTION(simulate_usb_item, 0, ID2P(LANG_USB),
                    (menu_function)simulate_usb, NULL, NULL, Icon_NOICON);
 #endif
 
-MAKE_MENU(info_menu, ID2P(LANG_INFO), 0, Icon_Questionmark,
+MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_Questionmark,
           &show_info_item, &show_credits_item, &show_runtime_item, 
           &sleep_timer_call, &debug_menu_item
 #ifdef SIMULATOR
@@ -440,7 +438,7 @@ int mainmenu_callback(int action,const struct menu_item_ex *this_item)
 #else
 #define mainmenu_callback NULL
 #endif
-MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS_MENU), mainmenu_callback,
+MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback,
         Icon_Submenu_Entered,
         &sound_settings,
         &settings_menu_item, &manage_settings, &browse_themes,
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index c1de862cd0..17e54d7771 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -167,7 +167,7 @@ MENUITEM_SETTING(cuesheet, &global_settings.cuesheet, cuesheet_callback);
 MENUITEM_SETTING(unplug_mode, &global_settings.unplug_mode, NULL);
 MENUITEM_SETTING(unplug_rw, &global_settings.unplug_rw, NULL);
 MENUITEM_SETTING(unplug_autoresume, &global_settings.unplug_autoresume, NULL);
-MAKE_MENU(unplug_menu, ID2P(LANG_UNPLUG), 0, Icon_NOICON,
+MAKE_MENU(unplug_menu, ID2P(LANG_HEADPHONE_UNPLUG), 0, Icon_NOICON,
           &unplug_mode, &unplug_rw, &unplug_autoresume);
 #endif
 
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c
index b942dab3ee..d66a71caba 100644
--- a/apps/menus/playlist_menu.c
+++ b/apps/menus/playlist_menu.c
@@ -75,10 +75,10 @@ MENUITEM_FUNCTION(catalog, 0, ID2P(LANG_CATALOG),
 MENUITEM_SETTING(recursive_dir_insert, &global_settings.recursive_dir_insert, NULL);
 MENUITEM_SETTING(warn_on_erase, &global_settings.warnon_erase_dynplaylist, NULL);
 
-MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLIST_MENU), NULL,
+MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
           &recursive_dir_insert, &warn_on_erase);
-MAKE_MENU(playlist_options, ID2P(LANG_PLAYLIST_MENU), NULL,
+MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
           &create_playlist_item, &view_playlist, &save_playlist, &catalog);
 
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 3fdaa02f3d..d53d42ddfa 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -76,7 +76,7 @@ static int recsource_func(void)
         HAVE_MIC_REC_([AUDIO_SRC_MIC]
             = { STR(LANG_RECORDING_SRC_MIC) },)
         HAVE_LINE_REC_([AUDIO_SRC_LINEIN]
-            = { STR(LANG_RECORDING_SRC_LINE) },)
+            = { STR(LANG_LINE_IN) },)
         HAVE_SPDIF_REC_([AUDIO_SRC_SPDIF]
             = { STR(LANG_RECORDING_SRC_DIGITAL) },)
         HAVE_FMRADIO_REC_([AUDIO_SRC_FMRADIO]
@@ -217,7 +217,7 @@ static int recchannels_func(void)
         [CHN_MODE_MONO]   = { STR(LANG_CHANNEL_MONO)   }
     };
 #if CONFIG_CODEC == MAS3587F
-    return set_option(str(LANG_RECORDING_CHANNELS),
+    return set_option(str(LANG_CHANNELS),
                       &global_settings.rec_channels, INT,
                       names, CHN_NUM_MODES, NULL );
 #endif /* CONFIG_CODEC == MAS3587F */
@@ -245,7 +245,7 @@ static int recchannels_func(void)
 
     make_options_from_indexes(names, table, n_opts, opts);
 
-    ret = set_option(str(LANG_RECORDING_CHANNELS), &rec_channels,
+    ret = set_option(str(LANG_CHANNELS), &rec_channels,
                      INT, opts, n_opts, NULL );
 
     if (!ret)
@@ -254,7 +254,7 @@ static int recchannels_func(void)
     return ret;
 #endif /* CONFIG_CODEC == SWCODEC */
 }
-MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_RECORDING_CHANNELS), 
+MENUITEM_FUNCTION(recchannels, 0, ID2P(LANG_CHANNELS),
                     recchannels_func, NULL, NULL, Icon_Menu_setting);
 
 #if CONFIG_CODEC == SWCODEC
@@ -438,7 +438,7 @@ bool rectrigger(void)
     static const unsigned char *trigger_modes[] = {
         ID2P(LANG_OFF),
         ID2P(LANG_RECORD_TRIG_NOREARM),
-        ID2P(LANG_RECORD_TRIG_REARM)
+        ID2P(LANG_REPEAT)
     };
 
 #define PRERECORD_TIMES_COUNT 31
@@ -452,18 +452,18 @@ bool rectrigger(void)
 #define TRIGGER_TYPE_COUNT 3
     static const unsigned char *trigger_types[] = {
         ID2P(LANG_RECORD_TRIGGER_STOP),
-        ID2P(LANG_RECORD_TRIGGER_PAUSE),
+        ID2P(LANG_PAUSE),
         ID2P(LANG_RECORD_TRIGGER_NEWFILESTP),
     };
 
     static const unsigned char *option_name[] = {
-        [TRIGGER_MODE] =    ID2P(LANG_RECORD_TRIGGER_MODE),
+        [TRIGGER_MODE] =    ID2P(LANG_RECORD_TRIGGER),
         [TRIGGER_TYPE] =    ID2P(LANG_RECORD_TRIGGER_TYPE),
         [PRERECORD_TIME] =  ID2P(LANG_RECORD_PRERECORD_TIME),
         [START_THRESHOLD] = ID2P(LANG_RECORD_START_THRESHOLD),
-        [START_DURATION] =  ID2P(LANG_RECORD_MIN_DURATION),
+        [START_DURATION] =  ID2P(LANG_MIN_DURATION),
         [STOP_THRESHOLD] =  ID2P(LANG_RECORD_STOP_THRESHOLD),
-        [STOP_POSTREC] =    ID2P(LANG_RECORD_STOP_POSTREC),
+        [STOP_POSTREC] =    ID2P(LANG_MIN_DURATION),
         [STOP_GAP] =        ID2P(LANG_RECORD_STOP_GAP)
     };
 
@@ -637,7 +637,7 @@ bool rectrigger(void)
 
         switch (button) {
             case ACTION_STD_CANCEL:
-                gui_syncsplash(50, str(LANG_MENU_SETTING_CANCEL));
+                gui_syncsplash(50, str(LANG_CANCEL));
                 global_settings.rec_start_thres = old_start_thres;
                 global_settings.rec_start_duration = old_start_duration;
                 global_settings.rec_prerecord_time = old_prerecord_time;
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index cd2950665c..1e09abed5d 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -228,7 +228,7 @@ static int timedate_set(void)
         tm.tm_year = YEAR-1900;
     }
 
-    result = (int)set_time_screen(str(LANG_TIME), &tm);
+    result = (int)set_time_screen(str(LANG_SET_TIME), &tm);
 
     if(tm.tm_year != -1) {
         set_time(&tm);
@@ -236,7 +236,7 @@ static int timedate_set(void)
     return result;
 }
 
-MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_TIME), 
+MENUITEM_FUNCTION(time_set, 0, ID2P(LANG_SET_TIME), 
                     timedate_set, NULL, NULL, Icon_NOICON);
 MENUITEM_SETTING(timeformat, &global_settings.timeformat, NULL);
 MAKE_MENU(time_menu, ID2P(LANG_TIME_MENU), 0, Icon_NOICON, &time_set, &timeformat);