diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-10-14 12:09:57 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-10-14 12:09:57 +0000 |
commit | 59ed9d0542121be6cfb76b6ce457e898987b07af (patch) | |
tree | b815f452047ee5036fa0a81c296d62137e81cf7b | |
parent | 8f4c5040a0d40da0493527d6e765d34c2dff6d8c (diff) | |
download | rockbox-59ed9d0542121be6cfb76b6ce457e898987b07af.tar.gz rockbox-59ed9d0542121be6cfb76b6ce457e898987b07af.zip |
translation fix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2617 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 34 | ||||
-rw-r--r-- | apps/recorder/tetris.c | 12 |
2 files changed, 38 insertions, 8 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index cf5ffdfc10..75490b766d 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -274,17 +274,31 @@ desc: in settings_menu | |||
274 | eng: "Follow Playlist" | 274 | eng: "Follow Playlist" |
275 | new: | 275 | new: |
276 | 276 | ||
277 | # depreciated | ||
278 | id: LANG_RESET_ASK_PLAYER | ||
279 | desc: confirm to reset settings | ||
280 | eng: "" | ||
281 | new: | ||
282 | |||
283 | # depreciated | ||
284 | id: LANG_RESET_CONFIRM_PLAYER | ||
285 | desc: confirm to reset settings | ||
286 | eng: "" | ||
287 | new: | ||
288 | |||
277 | id: LANG_RESET_ASK_RECORDER | 289 | id: LANG_RESET_ASK_RECORDER |
278 | desc: confirm to reset settings | 290 | desc: confirm to reset settings |
279 | eng: "Are you sure?" | 291 | eng: "Are you sure?" |
280 | new: | 292 | new: |
281 | 293 | ||
282 | id: LANG_RESET_CONFIRM | 294 | # depreciated |
295 | id: LANG_RESET_CONFIRM_RECORDER | ||
283 | desc: confirm to reset settings | 296 | desc: confirm to reset settings |
284 | eng: "PLAY=Reset" | 297 | eng: "" |
285 | new: | 298 | new: |
286 | 299 | ||
287 | id: LANG_RESET_CANCEL | 300 | # depreciated |
301 | id: LANG_RESET_CANCEL_RECORDER | ||
288 | desc: confirm to reset settings | 302 | desc: confirm to reset settings |
289 | eng: "OFF=Cancel" | 303 | eng: "OFF=Cancel" |
290 | new: | 304 | new: |
@@ -782,7 +796,7 @@ new: | |||
782 | 796 | ||
783 | id: LANG_TETRIS_LEVEL | 797 | id: LANG_TETRIS_LEVEL |
784 | desc: tetris game | 798 | desc: tetris game |
785 | eng: "0 Rows - Level 0" | 799 | eng: "Rows - Level" |
786 | new: | 800 | new: |
787 | 801 | ||
788 | id: LANG_POWEROFF_IDLE | 802 | id: LANG_POWEROFF_IDLE |
@@ -874,3 +888,15 @@ id: LANG_REPEAT_ONE | |||
874 | desc: repeat one song | 888 | desc: repeat one song |
875 | eng: "One" | 889 | eng: "One" |
876 | new: | 890 | new: |
891 | |||
892 | id: LANG_RESET_CONFIRM | ||
893 | desc: confirm to reset settings | ||
894 | eng: "PLAY=Reset" | ||
895 | new: | ||
896 | |||
897 | id: LANG_RESET_CANCEL | ||
898 | desc: confirm to reset settings | ||
899 | eng: "OFF=Cancel" | ||
900 | new: | ||
901 | |||
902 | id: LANG_TETRIS_LEVEL | ||
diff --git a/apps/recorder/tetris.c b/apps/recorder/tetris.c index 53012fd717..9c706e9c8e 100644 --- a/apps/recorder/tetris.c +++ b/apps/recorder/tetris.c | |||
@@ -287,12 +287,12 @@ static int check_lines(void) | |||
287 | if(line) | 287 | if(line) |
288 | { | 288 | { |
289 | lines++; | 289 | lines++; |
290 | // move rows down | 290 | /* move rows down */ |
291 | for(i = x; i < max_x - 1; i++) | 291 | for(i = x; i < max_x - 1; i++) |
292 | for (j = 0; j < max_y; j++) | 292 | for (j = 0; j < max_y; j++) |
293 | *(virtual + j * max_x + i) = *(virtual + j * max_x + (i + 1)); | 293 | *(virtual + j * max_x + i) = *(virtual + j * max_x + (i + 1)); |
294 | 294 | ||
295 | x--; // re-check this line | 295 | x--; /* re-check this line */ |
296 | } | 296 | } |
297 | } | 297 | } |
298 | 298 | ||
@@ -318,7 +318,8 @@ static void move_down(void) | |||
318 | score += l*l; | 318 | score += l*l; |
319 | } | 319 | } |
320 | 320 | ||
321 | snprintf (s, sizeof(s), "%d Rows - Level %d", lines, level); | 321 | snprintf (s, sizeof(s), "%d %s %d", lines, |
322 | str(LANG_TETRIS_LEVEL), level); | ||
322 | lcd_putsxy (2, 42, s); | 323 | lcd_putsxy (2, 42, s); |
323 | 324 | ||
324 | new_block(); | 325 | new_block(); |
@@ -400,10 +401,13 @@ static void init_tetris(void) | |||
400 | 401 | ||
401 | bool tetris(void) | 402 | bool tetris(void) |
402 | { | 403 | { |
404 | char buf[20]; | ||
405 | |||
403 | init_tetris(); | 406 | init_tetris(); |
404 | 407 | ||
405 | draw_frame(start_x, start_x + max_x - 1, start_y - 1, start_y + max_y); | 408 | draw_frame(start_x, start_x + max_x - 1, start_y - 1, start_y + max_y); |
406 | lcd_putsxy (2, 42, str(LANG_TETRIS_LEVEL)); | 409 | snprintf(buf, sizeof(buf), "0 %s 0", str(LANG_TETRIS_LEVEL)); |
410 | lcd_putsxy (2, 42, buf); | ||
407 | lcd_update(); | 411 | lcd_update(); |
408 | 412 | ||
409 | next_b = t_rand(blocks); | 413 | next_b = t_rand(blocks); |