Thorough .lang rework: Removed all deprecated strings, combined string which were only split because long ago we had no splash(), sorted strings into logical groups to ease the transition to langv2. Bunped binary .lng version.

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

apps/dbtree.c

@@ -131,9 +131,7 @@ int db_load(struct tree_context* c)
             i = db_search(c, searchstring);
             c->dirlength = c->filesindir = i;
             if (c->dirfull) {
-                gui_syncsplash(HZ, true, (unsigned char *)"%s %s",
+                gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL));
-                               str(LANG_SHOWDIR_ERROR_BUFFER),
-                               str(LANG_SHOWDIR_ERROR_FULL));
                 c->dirfull = false;
             }
             else

apps/eq_menu.c

@@ -745,8 +745,7 @@ static bool eq_save_preset(void)
 
     close(fd);
 
-    gui_syncsplash(HZ, true, (unsigned char *)"%s %s", str(LANG_SETTINGS_SAVED1),
+    gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED));
-           str(LANG_SETTINGS_SAVED2));
 
     return true;
 }

apps/filetree.c

@@ -437,13 +437,7 @@ int ft_enter(struct tree_context* c)
             case TREE_ATTR_CFG:
                 if (!settings_load_config(buf))
                     break;
-                lcd_clear_display();
+                gui_syncsplash(HZ, true, str(LANG_SETTINGS_LOADED));
-                lcd_puts(0,0,str(LANG_SETTINGS_LOADED1));
-                lcd_puts(0,1,str(LANG_SETTINGS_LOADED2));
-#ifdef HAVE_LCD_BITMAP
-                lcd_update();
-#endif
-                sleep(HZ/2);
                 break;
 
             case TREE_ATTR_BMARK:

apps/language.h

@@ -22,7 +22,7 @@
 
 /* both these must match the two initial bytes in the binary lang file */
 #define LANGUAGE_COOKIE  0x1a
-#define LANGUAGE_VERSION 0x02
+#define LANGUAGE_VERSION 0x03
 
 /* Initialize language array with the builtin strings */
 void lang_init(void);

apps/playlist.c

@@ -1621,9 +1621,7 @@ static void display_playlist_count(int count, const unsigned char *fmt)
  */
 static void display_buffer_full(void)
 {
-    gui_syncsplash(HZ*2, true, (unsigned char *)"%s %s",
+    gui_syncsplash(HZ*2, true, str(LANG_PLAYLIST_BUFFER_FULL));
-                   str(LANG_PLAYINDICES_PLAYLIST),
-                   str(LANG_PLAYINDICES_BUFFER));
 }
 
 /*

apps/settings.c

@@ -1621,8 +1621,7 @@ bool settings_save_config(void)
 
     close(fd);
 
-    gui_syncsplash(HZ, true, (unsigned char *)"%s %s", str(LANG_SETTINGS_SAVED1),
+    gui_syncsplash(HZ, true, str(LANG_SETTINGS_SAVED));
-           str(LANG_SETTINGS_SAVED2));
     return true;
 }
 

apps/tagtree.c

@@ -127,9 +127,7 @@ int tagtree_load(struct tree_context* c)
             i = tagtree_search(c, searchstring);
             c->dirlength = c->filesindir = i;
             if (c->dirfull) {
-                gui_syncsplash(HZ, true, (unsigned char *)"%s %s",
+                gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL));
-                               str(LANG_SHOWDIR_ERROR_BUFFER),
-                               str(LANG_SHOWDIR_ERROR_FULL));
                 c->dirfull = false;
             }
             else

apps/talk.c

@@ -677,8 +677,6 @@ int talk_value(long n, int unit, bool enqueue)
         VOICE_KHZ, 
         VOICE_DB, 
         VOICE_PERCENT,
-        VOICE_MEGABYTE,
-        VOICE_GIGABYTE,
         VOICE_MILLIAMPHOURS,
         VOICE_PIXEL,
         VOICE_PER_SEC,

apps/talk.h

@@ -36,8 +36,6 @@ enum {
     UNIT_KHZ,     /* kHz */
     UNIT_DB,      /* dB, mandatory sign */
     UNIT_PERCENT, /* % */
-    UNIT_MB,      /* megabyte */
-    UNIT_GB,      /* gigabyte */
     UNIT_MAH,     /* milliAmp hours */
     UNIT_PIXEL,   /* pixels */
     UNIT_PER_SEC, /* per second */

apps/tree.c

@@ -205,14 +205,15 @@ bool check_rockboxdir(void)
 {
     DIR *dir = opendir(ROCKBOX_DIR);
     if(!dir)
-    {
+    {   /* No need to localise this message.
+           If .rockbox is missing, it wouldn't work anyway */
         int i;
         FOR_NB_SCREENS(i)
             screens[i].clear_display();
-        gui_syncsplash(HZ*2, true, str(LANG_NO_ROCKBOX_DIR));
+        gui_syncsplash(HZ*2, true, "No .rockbox directory");
         FOR_NB_SCREENS(i)
             screens[i].clear_display();
-        gui_syncsplash(HZ*2, true, str(LANG_INSTALLATION_INCOMPLETE));
+        gui_syncsplash(HZ*2, true, "Installation incomplete");
         return false;
     }
     closedir(dir);
@@ -331,22 +332,7 @@ static int update_dir(void)
         if(!id3db && (tc.dirfull ||
                       tc.filesindir == global_settings.max_files_in_dir) )
         {
-            /* dir full */
+            gui_syncsplash(HZ, true, str(LANG_SHOWDIR_BUFFER_FULL));
-            int i;
-            FOR_NB_SCREENS(i)
-            {
-                gui_textarea_clear(&screens[i]);
-#ifdef HAVE_LCD_CHARCELLS
-                screens[i].double_height(false);
-#endif
-                screens[i].clear_display();
-                screens[i].puts(0,0,str(LANG_SHOWDIR_ERROR_BUFFER));
-                screens[i].puts(0,1,str(LANG_SHOWDIR_ERROR_FULL));
-                gui_textarea_update(&screens[i]);
-            }
-            sleep(HZ*2);
-            FOR_NB_SCREENS(i)
-                gui_textarea_clear(&screens[i]);
         }
     }
     gui_synclist_set_nb_items(&tree_lists, tc.filesindir);

tools/binlang

@@ -43,7 +43,7 @@ open(ENG, "<$english") or die "Can't open $english";
 open(LANG, "<$input") or die "Can't open $input";
 open(OUTF, ">$output") or die "Can't open $output";
 
-my $langversion = 2;
+my $langversion = 3;
 
 binmode OUTF;