Index: main_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/main_menu.c,v retrieving revision 1.55 diff -u -r1.55 main_menu.c --- main_menu.c 31 Aug 2002 23:07:11 -0000 1.55 +++ main_menu.c 3 Sep 2002 16:52:20 -0000 @@ -47,7 +47,8 @@ #include "screensavers_menu.h" #endif /* End USE_SCREENSAVERS */ int show_logo( void ) { @@ -153,32 +154,32 @@ while(!done) { lcd_clear_display(); - lcd_puts(0, 0, "Rockbox info:"); + lcd_puts(0, 0, LANG_INFO_1); integer = buflen / 100; decimal = buflen % 100; #ifdef HAVE_LCD_CHARCELLS - snprintf(s, sizeof(s), "Buf: %d.%02dMb", integer, decimal); + snprintf(s, sizeof(s), LANG_INFO_2, integer, decimal); lcd_puts(0, 0, s); #else - snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); + snprintf(s, sizeof(s), LANG_INFO_2, integer, decimal); lcd_puts(0, 2, s); #endif #ifdef HAVE_LCD_CHARCELLS - snprintf(s, sizeof(s), "Batt: %d%%%s", + snprintf(s, sizeof(s), LANG_INFO_3, battery_level(), battery_level_safe() ? "" : "!"); lcd_puts(0, 1, s); #else #ifdef HAVE_CHARGE_CTRL if (charger_enabled) - snprintf(s, sizeof(s), "Battery: charging"); + snprintf(s, sizeof(s), LANG_INFO_3_1); else - snprintf(s, sizeof(s), "Battery: %d%%%s", + snprintf(s, sizeof(s), LANG_INFO_3, battery_level(), battery_level_safe() ? "" : " !!"); lcd_puts(0, 3, s); #else - snprintf(s, sizeof(s), "Battery: %d%%%s", + snprintf(s, sizeof(s), LANG_INFO_3, battery_level(), battery_level_safe() ? "" : " !!"); lcd_puts(0, 3, s); #endif @@ -203,22 +204,22 @@ /* main menu */ struct menu_items items[] = { - { "Sound Settings", sound_menu }, - { "General Settings", settings_menu }, + { LANG_MAIN_1, sound_menu }, + { LANG_MAIN_2, settings_menu }, #ifdef HAVE_LCD_BITMAP #ifdef USE_GAMES - { "Games", games_menu }, + { LANG_MAIN_3, games_menu }, #endif #ifdef USE_SCREENSAVERS - { "Screensavers", screensavers_menu }, + { LANG_MAIN_4, screensavers_menu }, #endif /* end USE_SCREENSAVERS */ #endif - { "Info", show_info }, - { "Version", show_credits }, + { LANG_MAIN_5, show_info }, + { LANG_MAIN_6, show_credits }, #ifndef SIMULATOR - { "Debug (keep out!)", debug_menu }, + { LANG_MAIN_7, debug_menu }, #else - { "USB (sim)", simulate_usb }, + { LANG_MAIN_7, simulate_usb }, #endif }; Index: playlist.c =================================================================== RCS file: /cvsroot/rockbox/apps/playlist.c,v retrieving revision 1.44 diff -u -r1.44 playlist.c --- playlist.c 28 Aug 2002 09:22:44 -0000 1.44 +++ playlist.c 3 Sep 2002 16:52:20 -0000 @@ -209,7 +209,7 @@ /* If file is NULL, the list is in RAM */ if(file) { lcd_clear_display(); - lcd_puts(0,0,"Loading..."); + lcd_puts(0,0,LANG_PLAYLIST_1); status_draw(); lcd_update(); playlist.in_ram = false; @@ -239,7 +239,7 @@ if(global_settings.playlist_shuffle) { if(!playlist.in_ram) { - lcd_puts(0,0,"Shuffling..."); + lcd_puts(0,0,LANG_PLAYLIST_2); status_draw(); lcd_update(); randomise_playlist( random_seed ); @@ -273,7 +273,7 @@ } if(!playlist.in_ram) { - lcd_puts(0,0,"Playing... "); + lcd_puts(0,0,LANG_PLAYLIST_3); status_draw(); lcd_update(); } @@ -354,8 +354,8 @@ close(fd); lcd_clear_display(); - lcd_puts(0,0,"Playlist"); - lcd_puts(0,1,"buffer full"); + lcd_puts(0,0,LANG_PLAYLIST_4); + lcd_puts(0,1,LANG_PLAYLIST_5); lcd_update(); sleep(HZ*2); lcd_clear_display(); @@ -368,7 +368,7 @@ if(!playlist.in_ram) { if ( current_tick >= next_tick ) { next_tick = current_tick + HZ; - snprintf(line, sizeof line, "%d files", + snprintf(line, sizeof line, LANG_PLAYLIST_6, playlist.amount); lcd_puts(0,1,line); status_draw(); @@ -384,7 +384,7 @@ break; } if(!playlist.in_ram) { - snprintf(line, sizeof line, "%d files", playlist.amount); + snprintf(line, sizeof line, LANG_PLAYLIST_6, playlist.amount); lcd_puts(0,1,line); status_draw(); lcd_update(); Index: screensavers_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/screensavers_menu.c,v retrieving revision 1.6 diff -u -r1.6 screensavers_menu.c --- screensavers_menu.c 31 Aug 2002 20:57:53 -0000 1.6 +++ screensavers_menu.c 3 Sep 2002 16:52:20 -0000 @@ -40,9 +40,9 @@ Menu result; struct menu_items items[] = { - { "Boxes", boxes }, - { "Bounce", bounce }, - { "Blank", blank }, + { LANG_SSAVER_1, boxes }, + { LANG_SSAVER_2, bounce }, + { LANG_SSAVER_3, blank }, }; m=menu_init( items, sizeof items / sizeof(struct menu_items) ); Index: settings_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/settings_menu.c,v retrieving revision 1.41 diff -u -r1.41 settings_menu.c --- settings_menu.c 1 Sep 2002 19:50:45 -0000 1.41 +++ settings_menu.c 3 Sep 2002 16:52:21 -0000 @@ -39,57 +39,57 @@ static Menu show_hidden_files(void) { - set_bool( "[Show hidden files]", &global_settings.show_hidden_files ); + set_bool( LANG_HIDDEN_1, &global_settings.show_hidden_files ); return MENU_OK; } static Menu contrast(void) { - set_int( "[Contrast]", "", &global_settings.contrast, + set_int( LANG_CONTRAST_1, "", &global_settings.contrast, lcd_set_contrast, 1, 0, MAX_CONTRAST_SETTING ); return MENU_OK; } static Menu shuffle(void) { - set_bool( "[Shuffle]", &global_settings.playlist_shuffle ); + set_bool( LANG_SHUFFLE_1, &global_settings.playlist_shuffle ); return MENU_OK; } static Menu mp3_filter(void) { - set_bool( "[MP3/M3U filter]", &global_settings.mp3filter ); + set_bool( LANG_FILTER_1, &global_settings.mp3filter ); return MENU_OK; } static Menu sort_case(void) { - set_bool( "[Sort case sensitive]", &global_settings.sort_case ); + set_bool( LANG_CASE_1, &global_settings.sort_case ); return MENU_OK; } static Menu resume(void) { - char* names[] = { "off", "ask", "on " }; - set_option( "[Resume]", &global_settings.resume, names, 3 ); + char* names[] = { LANG_RESUME_2, LANG_RESUME_3, LANG_RESUME_4 }; + set_option( LANG_RESUME_1, &global_settings.resume, names, 3 ); return MENU_OK; } static Menu backlight_timer(void) { - char* names[] = { "off", "on ", + char* names[] = { LANG_BACKLIGHT_2, LANG_BACKLIGHT_3, "1s ", "2s ", "3s ", "4s ", "5s ", "6s ", "7s ", "8s ", "9s ", "10s", "15s", "20s", "25s", "30s", "45s", "60s", "90s"}; - set_option("[Backlight]", &global_settings.backlight, names, 19 ); + set_option(LANG_BACKLIGHT_1, &global_settings.backlight, names, 19 ); backlight_time(global_settings.backlight); return MENU_OK; } static Menu scroll_speed(void) { - set_int("Scroll speed indicator... ", "", &global_settings.scroll_speed, + set_int( LANG_SCROLL_1, "", &global_settings.scroll_speed, &lcd_scroll_speed, 1, 1, 20 ); return MENU_OK; } @@ -97,7 +97,7 @@ #ifdef HAVE_CHARGE_CTRL static Menu deep_discharge(void) { - set_bool( "[Deep discharge]", &global_settings.discharge ); + set_bool( LANG_DISCHARGE_1, &global_settings.discharge ); charge_restart_level = global_settings.discharge ? CHARGE_RESTART_LO : CHARGE_RESTART_HI; return MENU_OK; } @@ -123,7 +123,7 @@ timedate[4] = ((timedate[4] & 0x10) >> 4) * 10 + (timedate[4] & 0x0f); /* month */ timedate[5] = ((timedate[5] & 0x30) >> 4) * 10 + (timedate[5] & 0x0f); /* day */ - set_time("[Set time/date]",timedate); + set_time(LANG_TIME_1,timedate); if(timedate[0] != -1) { timedate[0] = ((timedate[0]/10) << 4 | timedate[0]%10) & 0x3f; /* hour */ @@ -147,18 +147,18 @@ static Menu spindown(void) { - set_int("[Disk spindown]", "s", &global_settings.disk_spindown, + set_int(LANG_SPINDOWN_1, "s", &global_settings.disk_spindown, ata_spindown, 1, 1, 254 ); return MENU_OK; } static Menu ff_rewind_accel(void) { - char* names[] = { "off ", "2x/1s ", "2x/2s ", "2x/3s ", + char* names[] = { LANG_REWIND_2, "2x/1s ", "2x/2s ", "2x/3s ", "2x/4s ", "2x/5s ", "2x/6s ", "2x/7s ", "2x/8s ", "2x/9s ", "2x/10s", "2x/11s", "2x/12s", "2x/13s", "2x/14s", "2x/15s", }; - set_option("[FF/rewind accel]", &global_settings.ff_rewind_accel, + set_option(LANG_REWIND_1, &global_settings.ff_rewind_accel, names, 16 ); return MENU_OK; } @@ -169,22 +169,22 @@ Menu result; struct menu_items items[] = { - { "Shuffle", shuffle }, - { "MP3/M3U filter", mp3_filter }, - { "Sort mode", sort_case }, - { "Backlight Timer", backlight_timer }, - { "Contrast", contrast }, - { "Scroll speed", scroll_speed }, + { LANG_SETTING_1, shuffle }, + { LANG_SETTING_2, mp3_filter }, + { LANG_SETTING_3, sort_case }, + { LANG_SETTING_4, backlight_timer }, + { LANG_SETTING_5, contrast }, + { LANG_SETTING_6, scroll_speed }, #ifdef HAVE_CHARGE_CTRL - { "Deep discharge", deep_discharge }, + { LANG_SETTING_7, deep_discharge }, #endif #ifdef HAVE_RTC - { "Time/Date", timedate_set }, + { LANG_SETTING_8, timedate_set }, #endif - { "Show hidden files", show_hidden_files }, - { "FF/Rewind Accel", ff_rewind_accel }, - { "Resume", resume }, - { "Disk spindown", spindown }, + { LANG_SETTING_9, show_hidden_files }, + { LANG_SETTING_10, ff_rewind_accel }, + { LANG_SETTING_11, resume }, + { LANG_SETTING_12, spindown }, }; bool old_shuffle = global_settings.playlist_shuffle; Index: sound_menu.c =================================================================== RCS file: /cvsroot/rockbox/apps/sound_menu.c,v retrieving revision 1.25 diff -u -r1.25 sound_menu.c --- sound_menu.c 23 Aug 2002 12:32:52 -0000 1.25 +++ sound_menu.c 3 Sep 2002 16:52:21 -0000 @@ -147,45 +147,45 @@ static Menu volume(void) { - set_sound("Volume", &global_settings.volume, SOUND_VOLUME); + set_sound(LANG_VOLUME_1, &global_settings.volume, SOUND_VOLUME); return MENU_OK; } static Menu balance(void) { - set_sound("Balance", &global_settings.balance, SOUND_BALANCE); + set_sound(LANG_BALANCE_1, &global_settings.balance, SOUND_BALANCE); return MENU_OK; } static Menu bass(void) { - set_sound("Bass", &global_settings.bass, SOUND_BASS); + set_sound(LANG_BASS_1, &global_settings.bass, SOUND_BASS); return MENU_OK; }; static Menu treble(void) { - set_sound("Treble", &global_settings.treble, SOUND_TREBLE); + set_sound(LANG_TREBLE_1, &global_settings.treble, SOUND_TREBLE); return MENU_OK; } #ifdef HAVE_MAS3587F static Menu loudness(void) { - set_sound("Loudness", &global_settings.loudness, SOUND_LOUDNESS); + set_sound(LANG_LOUDNESS_1, &global_settings.loudness, SOUND_LOUDNESS); return MENU_OK; }; static Menu bass_boost(void) { - set_sound("Bass boost", &global_settings.bass_boost, SOUND_SUPERBASS); + set_sound(LANG_BOOST_1, &global_settings.bass_boost, SOUND_SUPERBASS); return MENU_OK; }; static Menu avc(void) { - char* names[] = { "off", "2s ", "4s ", "8s " }; - set_option("[AV decay time]", &global_settings.avc, names, 4 ); + char* names[] = { LANG_DECAY_2, "2s ", "4s ", "8s " }; + set_option(LANG_DECAY_1, &global_settings.avc, names, 4 ); mpeg_sound_set(SOUND_AVC, global_settings.avc); return MENU_OK; } @@ -196,14 +196,14 @@ int m; Menu result; struct menu_items items[] = { - { "Volume", volume }, - { "Bass", bass }, - { "Treble", treble }, - { "Balance", balance }, + { LANG_VOLUME_1, volume }, + { LANG_BASS_1, bass }, + { LANG_TREBLE_1, treble }, + { LANG_BALANCE_1, balance }, #ifdef HAVE_MAS3587F - { "Loudness", loudness }, - { "Bass Boost", bass_boost }, - { "Auto Volume", avc } + { LANG_LOUDNESS_1, loudness }, + { LANG_BOOST_1, bass_boost }, + { LANG_DECAY_3, avc } #endif }; Index: tree.c =================================================================== RCS file: /cvsroot/rockbox/apps/tree.c,v retrieving revision 1.109 diff -u -r1.109 tree.c --- tree.c 2 Sep 2002 12:46:31 -0000 1.109 +++ tree.c 3 Sep 2002 16:52:22 -0000 @@ -265,8 +265,8 @@ lcd_double_height(false); #endif lcd_clear_display(); - lcd_puts(0,0,"Dir buffer"); - lcd_puts(0,1,"is full!"); + lcd_puts(0,0,LANG_TREESHOW_1); + lcd_puts(0,1,LANG_TREESHOW_2); lcd_update(); sleep(HZ*2); lcd_clear_display(); @@ -343,12 +343,12 @@ return true; lcd_clear_display(); - lcd_puts(0,0,"Resume?"); + lcd_puts(0,0,LANG_ASK_1); #ifdef HAVE_LCD_CHARCELLS - lcd_puts(0,1,"(Play/Stop)"); + lcd_puts(0,1,LANG_ASK_2); #else - lcd_puts(0,1,"Play = Yes"); - lcd_puts(0,2,"Any other = No"); + lcd_puts(0,1,LANG_ASK_3); + lcd_puts(0,2,LANG_ASK_4); #endif lcd_update(); if (button_get(true) == BUTTON_PLAY) Index: wps.c =================================================================== RCS file: /cvsroot/rockbox/apps/wps.c,v retrieving revision 1.130 diff -u -r1.130 wps.c --- wps.c 1 Sep 2002 20:08:08 -0000 1.130 +++ wps.c 3 Sep 2002 16:52:22 -0000 @@ -120,17 +120,17 @@ #ifdef HAVE_LCD_CHARCELLS if(locked) - lcd_puts(0, 0, "Keylock ON"); + lcd_puts(0, 0, LANG_KEYLOCK_1); else - lcd_puts(0, 0, "Keylock OFF"); + lcd_puts(0, 0, LANG_KEYLOCK_2); #else if(locked) { - lcd_puts(2, 3, "Key lock is ON"); + lcd_puts(2, 3, LANG_KEYLOCK_1); } else { - lcd_puts(2, 3, "Key lock is OFF"); + lcd_puts(2, 3, LANG_KEYLOCK_2); } lcd_update(); #endif @@ -145,17 +145,17 @@ #ifdef HAVE_LCD_CHARCELLS if (muted) - lcd_puts(0, 0, "Mute ON"); + lcd_puts(0, 0, LANG_MUTE_1); else - lcd_puts(0, 0, "Mute OFF"); + lcd_puts(0, 0, LANG_MUTE_2); #else if (muted) { - lcd_puts(2, 3, "Mute is ON"); + lcd_puts(2, 3, LANG_MUTE_1); } else { - lcd_puts(2, 3, "Mute is OFF"); + lcd_puts(2, 3, LANG_MUTE_2); } lcd_update(); #endif @@ -190,8 +190,8 @@ lcd_stop_scroll(); lcd_clear_display(); - lcd_puts(0, 0, "-ID3 Info- "); - lcd_puts(0, 1, "--Screen-- "); + lcd_puts(0, 0, LANG_ID3SHOW_1); + lcd_puts(0, 1, LANG_ID3SHOW_2); sleep(HZ); while (!exit) @@ -202,23 +202,23 @@ switch (menu_pos) { case 0: - lcd_puts(0, 0, "[Title]"); - lcd_puts_scroll(0, 1, id3->title ? id3->title : ""); + lcd_puts(0, 0, LANG_ID3SHOW_3); + lcd_puts_scroll(0, 1, id3->title ? id3->title : LANG_ID3SHOW_3_1); break; case 1: - lcd_puts(0, 0, "[Artist]"); + lcd_puts(0, 0, LANG_ID3SHOW_4); lcd_puts_scroll(0, 1, - id3->artist ? id3->artist : ""); + id3->artist ? id3->artist : LANG_ID3SHOW_4_1); break; case 2: - lcd_puts(0, 0, "[Album]"); - lcd_puts_scroll(0, 1, id3->album ? id3->album : ""); + lcd_puts(0, 0, LANG_ID3SHOW_5); + lcd_puts_scroll(0, 1, id3->album ? id3->album : LANG_ID3SHOW_5_1); break; case 3: - lcd_puts(0, 0, "[Length]"); + lcd_puts(0, 0, LANG_ID3SHOW_6); snprintf(scroll_text,sizeof(scroll_text), "%d:%02d", id3->length / 60000, id3->length % 60000 / 1000 ); @@ -226,21 +226,21 @@ break; case 4: - lcd_puts(0, 0, "[Bitrate]"); + lcd_puts(0, 0, LANG_ID3SHOW_7); snprintf(scroll_text,sizeof(scroll_text), "%d kbps", id3->bitrate); lcd_puts(0, 1, scroll_text); break; case 5: - lcd_puts(0, 0, "[Frequency]"); + lcd_puts(0, 0, LANG_ID3SHOW_8); snprintf(scroll_text,sizeof(scroll_text), "%d kHz", id3->frequency); lcd_puts(0, 1, scroll_text); break; case 6: - lcd_puts(0, 0, "[Path]"); + lcd_puts(0, 0, LANG_ID3SHOW_9); lcd_puts_scroll(0, 1, id3->path); break; } Index: wps-display.c =================================================================== RCS file: /cvsroot/rockbox/apps/wps-display.c,v retrieving revision 1.13 diff -u -r1.13 wps-display.c --- wps-display.c 2 Sep 2002 13:32:31 -0000 1.13 +++ wps-display.c 3 Sep 2002 16:52:22 -0000 @@ -572,7 +572,7 @@ else bmp_time_line = 6; - format_display(buf, sizeof(buf), id3, "Time: %pc/%pt", &flags); + format_display(buf, sizeof(buf), id3, LANG_REFRESH_1, &flags); lcd_puts(0, bmp_time_line, buf); slidebar(0, LCD_HEIGHT-6, LCD_WIDTH, 6, @@ -598,11 +598,11 @@ if (!id3 && !mpeg_is_playing()) { #ifdef HAVE_LCD_CHARCELLS - lcd_puts(0, 0, "End of list"); - lcd_puts(0, 1, ""); + lcd_puts(0, 0, LANG_WPSDISPLAY_1); + lcd_puts(0, 1, LANG_WPSDISPLAY_2); #else - lcd_puts(0, 2, ""); - lcd_puts(5, 4, "Press ON"); + lcd_puts(0, 2, LANG_WPSDISPLAY_1); + lcd_puts(5, 4, LANG_WPSDISPLAY_2); #endif } else Index: recorder/blank.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/blank.c,v retrieving revision 1.5 diff -u -r1.5 blank.c --- recorder/blank.c 1 Sep 2002 17:14:17 -0000 1.5 +++ recorder/blank.c 3 Sep 2002 16:52:22 -0000 @@ -30,15 +30,16 @@ #include #endif #include - -#define SS_TITLE "Blank" +/* not used, defined at language file and changed to LANG_BLANK_TITLE +#define SS_TITLE "Blank" +*/ #define SS_TITLE_FONT 2 Menu blank(void) { int w, h; - char *off = "[Off] to stop"; - int len = strlen(SS_TITLE); + char *off = LANG_BLANK_1; + int len = strlen(LANG_BLANK_TITLE); lcd_getfontsize(SS_TITLE_FONT, &w, &h); @@ -55,7 +56,7 @@ h /= 2; lcd_clear_display(); - lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); + lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, LANG_BLANK_TITLE, SS_TITLE_FONT); len = strlen(off); lcd_getfontsize(0, &w, &h); Index: recorder/bounce.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/bounce.c,v retrieving revision 1.7 diff -u -r1.7 bounce.c --- recorder/bounce.c 1 Sep 2002 17:14:17 -0000 1.7 +++ recorder/bounce.c 3 Sep 2002 16:52:23 -0000 @@ -30,8 +30,9 @@ #include #endif #include - +/* SS_TITLE not used, defined at language file, using LANG_BOUNCER_TITLE #define SS_TITLE "Bouncer" +*/ #define SS_TITLE_FONT 2 unsigned char table[]={ @@ -87,8 +88,8 @@ Menu bounce(void) { int w, h; - char *off = "[Off] to stop"; - int len = strlen(SS_TITLE); + char *off = LANG_BOUNCER_1; + int len = strlen(LANG_BOUNCER_TITLE); lcd_getfontsize(SS_TITLE_FONT, &w, &h); @@ -105,7 +106,7 @@ h /= 2; lcd_clear_display(); - lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); + lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, LANG_BOUNCER_TITLE, SS_TITLE_FONT); len = strlen(off); lcd_getfontsize(0, &w, &h); Index: recorder/boxes.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/boxes.c,v retrieving revision 1.5 diff -u -r1.5 boxes.c --- recorder/boxes.c 1 Sep 2002 17:14:17 -0000 1.5 +++ recorder/boxes.c 3 Sep 2002 16:52:23 -0000 @@ -31,8 +31,9 @@ #include #endif #include - +/* SS_TITLE not used, defined at language file as LANG_BOXES_TITLE #define SS_TITLE "Boxes" +*/ #define SS_TITLE_FONT 2 static void ss_loop(void) @@ -81,8 +82,8 @@ Menu boxes(void) { int w, h; - char *off = "[Off] to stop"; - int len = strlen(SS_TITLE); + char *off = LANG_BOXES_1; + int len = strlen(LANG_BOXES_TITLE); lcd_getfontsize(SS_TITLE_FONT, &w, &h); @@ -99,7 +100,7 @@ h /= 2; lcd_clear_display(); - lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, SS_TITLE, SS_TITLE_FONT); + lcd_putsxy(LCD_WIDTH/2-len, (LCD_HEIGHT/2)-h, LANG_BOXES_TITLE, SS_TITLE_FONT); len = strlen(off); lcd_getfontsize(0, &w, &h); Index: recorder/sokoban.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/sokoban.c,v retrieving revision 1.17 diff -u -r1.17 sokoban.c --- recorder/sokoban.c 1 Sep 2002 17:14:17 -0000 1.17 +++ recorder/sokoban.c 3 Sep 2002 16:52:24 -0000 @@ -980,8 +980,8 @@ lcd_drawrect (80,0,32,32); lcd_drawrect (80,32,32,64); - lcd_putsxy (81, 10, "Level", 0); - lcd_putsxy (81, 42, "Moves", 0); + lcd_putsxy (81, 10, LANG_SOKOBAN_SCREEN_1, 0); + lcd_putsxy (81, 42, LANG_SOKOBAN_SCREEN_2, 0); /* print out the screen */ lcd_update(); } @@ -1320,7 +1320,7 @@ if (current_level == NUM_LEVELS) { for(ii=0; ii<30 ; ii++) { lcd_clear_display(); - lcd_putsxy(10, 20, "YOU WIN!!", 2); + lcd_putsxy(10, 20, LANG_SOKOBAN_LOOP_1, 2); lcd_update(); lcd_invertrect(0,0,111,63); lcd_update(); @@ -1365,10 +1365,10 @@ lcd_clear_display(); - lcd_putsxy( 3,12, "[Off] to stop", 0); - lcd_putsxy( 3,22, "[F1] - level",0); - lcd_putsxy( 3,32, "[F2] same level",0); - lcd_putsxy( 3,42, "[F3] + level",0); + lcd_putsxy( 3,12, LANG_SOKOBAN_MENU_1, 0); + lcd_putsxy( 3,22, LANG_SOKOBAN_MENU_2,0); + lcd_putsxy( 3,32, LANG_SOKOBAN_MENU_3,0); + lcd_putsxy( 3,42, LANG_SOKOBAN_MENU_4,0); lcd_update(); sleep(HZ*2); Index: recorder/tetris.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/tetris.c,v retrieving revision 1.26 diff -u -r1.26 tetris.c --- recorder/tetris.c 1 Sep 2002 17:14:17 -0000 1.26 +++ recorder/tetris.c 3 Sep 2002 16:52:24 -0000 @@ -316,7 +316,7 @@ score += l*l; } - snprintf (s, sizeof(s), "%d Rows - Level %d", lines, level); + snprintf (s, sizeof(s), LANG_TETRIS_MOVE_1, lines, level); lcd_putsxy (2, 42, s, 0); new_block(); @@ -365,7 +365,7 @@ if(gameover()) { lcd_clearrect(0, 52, LCD_WIDTH, LCD_HEIGHT - 52); - lcd_putsxy (2, 52, "You lose!", 0); + lcd_putsxy (2, 52,LANG_TETRIS_LOOP_1, 0); lcd_update(); sleep(HZ * 3); return; @@ -395,7 +395,7 @@ init_tetris(); draw_frame(start_x, start_x + max_x - 1, start_y - 1, start_y + max_y); - lcd_putsxy (2, 42, "0 Rows - Level 0", 0); + lcd_putsxy (2, 42,LANG_TETRIS_INIT_1 , 0); lcd_update(); next_b = t_rand(blocks); Index: recorder/wormlet.c =================================================================== RCS file: /cvsroot/rockbox/apps/recorder/wormlet.c,v retrieving revision 1.5 diff -u -r1.5 wormlet.c --- recorder/wormlet.c 1 Sep 2002 17:14:17 -0000 1.5 +++ recorder/wormlet.c 3 Sep 2002 16:52:24 -0000 @@ -553,42 +553,42 @@ char buf2[15]; /* Title */ - snprintf(buf, sizeof (buf), "Wormlet"); + snprintf(buf, sizeof (buf), LANG_WORM_SCORE_1); lcd_putsxy(FIELD_RECT_WIDTH + 3, 0, buf, 0); /* length */ - snprintf(buf, sizeof (buf), "length:"); + snprintf(buf, sizeof (buf), LANG_WORM_SCORE_2); lcd_putsxy(FIELD_RECT_WIDTH + 3, 12, buf, 0); snprintf(buf, sizeof (buf), "%d ", getWormLength() - growing); lcd_putsxy(FIELD_RECT_WIDTH + 3, 20, buf, 0); switch (checkCollision()) { case COLLISION_NONE: - snprintf(buf, sizeof(buf), "I'm hungry! "); + snprintf(buf, sizeof(buf), LANG_WORM_SCORE_3); if (growing > 0) - snprintf(buf2, sizeof(buf2), "growing"); + snprintf(buf2, sizeof(buf2), LANG_WORM_SCORE_4); else snprintf(buf2, sizeof(buf2), " "); break; case COLLISION_WORM: - snprintf(buf, sizeof(buf), "Ouch! I bit"); - snprintf(buf2, sizeof(buf2), "myself! "); + snprintf(buf, sizeof(buf), LANG_WORM_SCORE_5); + snprintf(buf2, sizeof(buf2), LANG_WORM_SCORE_5_1); break; case COLLISION_FOOD: - snprintf(buf, sizeof(buf), "Yummy! "); - snprintf(buf2, sizeof(buf2), "growing"); + snprintf(buf, sizeof(buf), LANG_WORM_SCORE_6); + snprintf(buf2, sizeof(buf2), LANG_WORM_SCORE_4); break; case COLLISION_ARGH: - snprintf(buf, sizeof(buf), "Argh! I'm "); - snprintf(buf2, sizeof(buf2), "poisoned! "); + snprintf(buf, sizeof(buf), LANG_WORM_SCORE_7); + snprintf(buf2, sizeof(buf2), LANG_WORM_SCORE_7_1); break; case COLLISION_FIELD: - snprintf(buf, sizeof(buf), "Boing! "); - snprintf(buf2, sizeof(buf2), "Headcrash!"); + snprintf(buf, sizeof(buf), LANG_WORM_SCORE_8); + snprintf(buf2, sizeof(buf2), LANG_WORM_SCORE_8_1); break; } lcd_putsxy(FIELD_RECT_WIDTH + 3, 32, buf, 0);