*** 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

1 files changed, 3 insertions, 14 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 39d7cc1e3d..caf5856ae8 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -484,7 +484,7 @@ static int add_indices_to_playlist(struct playlist_info* playlist,
         lcd_setmargins(0, 0);
 #endif
 
-    gui_syncsplash(0, str(LANG_PLAYLIST_LOAD));
+    gui_syncsplash(0, str(LANG_WAIT));
 
     if (!buffer)
     {
@@ -1668,13 +1668,7 @@ static void display_playlist_count(int count, const unsigned char *fmt)
         lcd_setmargins(0, 0);
 #endif
 
-    gui_syncsplash(0, fmt, count,
-#if CONFIG_KEYPAD == PLAYER_PAD
-                   str(LANG_STOP_ABORT)
-#else
-                   str(LANG_OFF_ABORT)
-#endif
-        );
+    gui_syncsplash(0, fmt, count, str(LANG_OFF_ABORT));
 }
 
 /*
@@ -1997,12 +1991,7 @@ int playlist_resume(void)
             {
                 gui_syncsplash(0, 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: