*** Lang v2 cleanup (FS#6574) ***

1) Introduces apps/features.txt that controls which strings are included 
for each target based on defines.
2) .lng and .voice files are now target specific and the format versions 
of both these file types have been bumped, which means that new voice 
files are needed. 
3) Use the 'features' mechanism to exclude strings for targets that 
didn't use them.
4) Delete unused and deprecated and duplicated strings, sort strings in 
english.lang

Some string IDs were changed so translations will be slightly worse than 
before.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14198 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 8 insertions, 13 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 9dddff3ea2..5f437824b8 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -294,7 +294,7 @@ bool gui_wps_display(void)
 #ifdef HAVE_LCD_BITMAP
         gui_syncstatusbar_draw(&statusbars, true);
 #endif
-        gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER));
+        gui_syncsplash(HZ, str(LANG_END_PLAYLIST));
         return true;
     }
     else
@@ -440,17 +440,10 @@ void display_keylock_text(bool locked)
     FOR_NB_SCREENS(i)
         gui_wps[i].display->stop_scroll();
 
-#ifdef HAVE_LCD_CHARCELLS
     if(locked)
-        s = str(LANG_KEYLOCK_ON_PLAYER);
+        s = str(LANG_KEYLOCK_ON);
     else
-        s = str(LANG_KEYLOCK_OFF_PLAYER);
-#else
-    if(locked)
-        s = str(LANG_KEYLOCK_ON_RECORDER);
-    else
-        s = str(LANG_KEYLOCK_OFF_RECORDER);
-#endif
+        s = str(LANG_KEYLOCK_OFF);
     gui_syncsplash(HZ, s);
 }
 
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 6bb69c21bb..ba4e54a616 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -409,7 +409,7 @@ bool option_screen(struct settings_list *setting,
                 }
             }
             if (show_cancel)
-                gui_syncsplash(HZ/2, str(LANG_MENU_SETTING_CANCEL));
+                gui_syncsplash(HZ/2, str(LANG_CANCEL));
             done = true;
         }
         else if (action == ACTION_STD_OK)
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 4f874df325..b689ad923b 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -74,8 +74,10 @@ static void gui_yesno_draw(struct gui_yesno * yn)
     {
         if(nb_lines+line_shift+3<=display->nb_lines)
             nb_lines++;
-        display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_PLAY_RECORDER));
-        display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY_RECORDER));
+        display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_BUTTON));
+#ifdef HAVE_LCD_BITMAP
+        display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY));
+#endif
     }
     gui_textarea_update(display);
 }