1 files changed, 12 insertions, 14 deletions

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,