diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-09-17 07:45:19 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-17 07:45:19 +0000 |
commit | b377086bef8f053542abe20e7d6663ae92cbcb25 (patch) | |
tree | 13870ab529dbbf06a7a1c335b29d30ab540681f5 | |
parent | c2c8d1cd1e910ade611e595372ae0a8cd800c8c8 (diff) | |
download | rockbox-b377086bef8f053542abe20e7d6663ae92cbcb25.tar.gz rockbox-b377086bef8f053542abe20e7d6663ae92cbcb25.zip |
a few more translated strings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2316 a1c6a512-1295-4272-9138-f99709370657
-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[]={ | |||
5 | "Sound Settings", | 5 | "Sound Settings", |
6 | "General Settings", | 6 | "General Settings", |
7 | "Games", | 7 | "Games", |
8 | "Demos", | ||
9 | "Info", | ||
10 | "Version", | ||
11 | "Debug (keep out!)", | ||
12 | "Rockbox info:", | ||
13 | "Buf: %d.%02dMb", | ||
14 | "Buffer: %d.%02dMb", | ||
8 | }; | 15 | }; |
9 | /* end of generated string list */ | 16 | /* 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 @@ | |||
1 | /* This file was automaticly generated using genlang */ | 1 | /* This file was automaticly generated using genlang */ |
2 | /* | 2 | /* |
3 | * The str() macro/functions is how to access strings that might be | 3 | * The str() macro/functions is how to access strings that might be |
4 | * translated. Use it like str(MACRO) and except a string to be | 4 | * translated. Use it like str(MACRO) and expect a string to be |
5 | * returned! | 5 | * returned! |
6 | */ | 6 | */ |
7 | #define str(x) language_strings[x] | 7 | #define str(x) language_strings[x] |
@@ -9,9 +9,17 @@ | |||
9 | /* this is the array with all the strings */ | 9 | /* this is the array with all the strings */ |
10 | extern unsigned char *language_strings[]; | 10 | extern unsigned char *language_strings[]; |
11 | 11 | ||
12 | /* The enum below contains all available strings */ | ||
12 | enum { | 13 | enum { |
13 | LANG_SOUND_SETTINGS, | 14 | LANG_SOUND_SETTINGS, |
14 | LANG_GENERAL_SETTINGS, | 15 | LANG_GENERAL_SETTINGS, |
15 | LANG_GAMES, | 16 | LANG_GAMES, |
17 | LANG_DEMOS, | ||
18 | LANG_INFO, | ||
19 | LANG_VERSION, | ||
20 | LANG_DEBUG, | ||
21 | LANG_ROCKBOX_INFO, | ||
22 | LANG_BUFFER_STAT_PLAYER, | ||
23 | LANG_BUFFER_STAT_RECORDER, | ||
16 | }; | 24 | }; |
17 | /* end of generated enum list */ | 25 | /* 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 | |||
12 | desc: in the main menu | 12 | desc: in the main menu |
13 | eng: "Games" | 13 | eng: "Games" |
14 | new: | 14 | new: |
15 | |||
16 | id: LANG_DEMOS | ||
17 | desc: in the main menu | ||
18 | eng: "Demos" | ||
19 | new: | ||
20 | |||
21 | id: LANG_INFO | ||
22 | desc: in the main menu | ||
23 | eng: "Info" | ||
24 | new: | ||
25 | |||
26 | id: LANG_VERSION | ||
27 | desc: in the main menu | ||
28 | eng: "Version" | ||
29 | new: | ||
30 | |||
31 | id: LANG_DEBUG | ||
32 | desc: in the main menu | ||
33 | eng: "Debug (keep out!)" | ||
34 | new: | ||
35 | |||
36 | id: LANG_ROCKBOX_INFO | ||
37 | desc: displayed topmost on the info screen | ||
38 | eng: "Rockbox info:" | ||
39 | new: | ||
40 | |||
41 | id: LANG_BUFFER_STAT_PLAYER | ||
42 | desc: the buffer size player-screen width, %d MB %d fraction of MB | ||
43 | eng: "Buf: %d.%02dMb" | ||
44 | new: | ||
45 | |||
46 | id: LANG_BUFFER_STAT_RECORDER | ||
47 | desc: the buffer size recorder-screen width, %d MB %d fraction of MB | ||
48 | eng: "Buffer: %d.%02dMb" | ||
49 | new: | ||
50 | |||
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) | |||
158 | while(!done) | 158 | while(!done) |
159 | { | 159 | { |
160 | lcd_clear_display(); | 160 | lcd_clear_display(); |
161 | lcd_puts(0, 0, "Rockbox info:"); | 161 | lcd_puts(0, 0, str(LANG_ROCKBOX_INFO)); |
162 | 162 | ||
163 | integer = buflen / 100; | 163 | integer = buflen / 100; |
164 | decimal = buflen % 100; | 164 | decimal = buflen % 100; |
165 | #ifdef HAVE_LCD_CHARCELLS | 165 | #ifdef HAVE_LCD_CHARCELLS |
166 | snprintf(s, sizeof(s), "Buf: %d.%02dMb", integer, decimal); | 166 | snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_PLAYER), integer, decimal); |
167 | lcd_puts(0, 0, s); | 167 | lcd_puts(0, 0, s); |
168 | #else | 168 | #else |
169 | snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); | 169 | snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_RECORDER), integer, |
170 | decimal); | ||
170 | lcd_puts(0, 2, s); | 171 | lcd_puts(0, 2, s); |
171 | #endif | 172 | #endif |
172 | 173 | ||
@@ -215,13 +216,13 @@ Menu main_menu(void) | |||
215 | { str(LANG_GAMES), games_menu }, | 216 | { str(LANG_GAMES), games_menu }, |
216 | #endif | 217 | #endif |
217 | #ifdef USE_DEMOS | 218 | #ifdef USE_DEMOS |
218 | { "Demos", demo_menu }, | 219 | { str(LANG_DEMOS), demo_menu }, |
219 | #endif /* end USE_DEMOS */ | 220 | #endif /* end USE_DEMOS */ |
220 | #endif | 221 | #endif |
221 | { "Info", show_info }, | 222 | { str(LANG_INFO), show_info }, |
222 | { "Version", show_credits }, | 223 | { str(LANG_VERSION), show_credits }, |
223 | #ifndef SIMULATOR | 224 | #ifndef SIMULATOR |
224 | { "Debug (keep out!)", debug_menu }, | 225 | { str(LANG_DEBUG), debug_menu }, |
225 | #else | 226 | #else |
226 | { "USB (sim)", simulate_usb }, | 227 | { "USB (sim)", simulate_usb }, |
227 | #endif | 228 | #endif |