diff options
| -rw-r--r-- | apps/lang.c | 7 | ||||
| -rw-r--r-- | apps/lang.h | 10 | ||||
| -rw-r--r-- | apps/lang/english.lang | 36 | ||||
| -rw-r--r-- | apps/main_menu.c | 15 |
4 files changed, 60 insertions, 8 deletions
diff --git a/apps/lang.c b/apps/lang.c index 8e0f01b6f9..af8b16aa5a 100644 --- a/apps/lang.c +++ b/apps/lang.c @@ -5,5 +5,12 @@ unsigned char *language_strings[]={ "Sound Settings", "General Settings", "Games", + "Demos", + "Info", + "Version", + "Debug (keep out!)", + "Rockbox info:", + "Buf: %d.%02dMb", + "Buffer: %d.%02dMb", }; /* end of generated string list */ diff --git a/apps/lang.h b/apps/lang.h index a6d0cab4a0..b841271eff 100644 --- a/apps/lang.h +++ b/apps/lang.h @@ -1,7 +1,7 @@ /* This file was automaticly generated using genlang */ /* * The str() macro/functions is how to access strings that might be - * translated. Use it like str(MACRO) and except a string to be + * translated. Use it like str(MACRO) and expect a string to be * returned! */ #define str(x) language_strings[x] @@ -9,9 +9,17 @@ /* this is the array with all the strings */ extern unsigned char *language_strings[]; +/* The enum below contains all available strings */ enum { LANG_SOUND_SETTINGS, LANG_GENERAL_SETTINGS, LANG_GAMES, + LANG_DEMOS, + LANG_INFO, + LANG_VERSION, + LANG_DEBUG, + LANG_ROCKBOX_INFO, + LANG_BUFFER_STAT_PLAYER, + LANG_BUFFER_STAT_RECORDER, }; /* end of generated enum list */ diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 7e2b0f130e..db99993471 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -12,3 +12,39 @@ id: LANG_GAMES desc: in the main menu eng: "Games" new: + +id: LANG_DEMOS +desc: in the main menu +eng: "Demos" +new: + +id: LANG_INFO +desc: in the main menu +eng: "Info" +new: + +id: LANG_VERSION +desc: in the main menu +eng: "Version" +new: + +id: LANG_DEBUG +desc: in the main menu +eng: "Debug (keep out!)" +new: + +id: LANG_ROCKBOX_INFO +desc: displayed topmost on the info screen +eng: "Rockbox info:" +new: + +id: LANG_BUFFER_STAT_PLAYER +desc: the buffer size player-screen width, %d MB %d fraction of MB +eng: "Buf: %d.%02dMb" +new: + +id: LANG_BUFFER_STAT_RECORDER +desc: the buffer size recorder-screen width, %d MB %d fraction of MB +eng: "Buffer: %d.%02dMb" +new: + diff --git a/apps/main_menu.c b/apps/main_menu.c index 43a9654c39..7430671fc0 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -158,15 +158,16 @@ Menu show_info(void) while(!done) { lcd_clear_display(); - lcd_puts(0, 0, "Rockbox info:"); + lcd_puts(0, 0, str(LANG_ROCKBOX_INFO)); integer = buflen / 100; decimal = buflen % 100; #ifdef HAVE_LCD_CHARCELLS - snprintf(s, sizeof(s), "Buf: %d.%02dMb", integer, decimal); + snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_PLAYER), integer, decimal); lcd_puts(0, 0, s); #else - snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); + snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_RECORDER), integer, + decimal); lcd_puts(0, 2, s); #endif @@ -215,13 +216,13 @@ Menu main_menu(void) { str(LANG_GAMES), games_menu }, #endif #ifdef USE_DEMOS - { "Demos", demo_menu }, + { str(LANG_DEMOS), demo_menu }, #endif /* end USE_DEMOS */ #endif - { "Info", show_info }, - { "Version", show_credits }, + { str(LANG_INFO), show_info }, + { str(LANG_VERSION), show_credits }, #ifndef SIMULATOR - { "Debug (keep out!)", debug_menu }, + { str(LANG_DEBUG), debug_menu }, #else { "USB (sim)", simulate_usb }, #endif |