summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/lang/english.lang34
-rw-r--r--apps/recorder/tetris.c12
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
eng: "Follow Playlist"
new:
+# depreciated
+id: LANG_RESET_ASK_PLAYER
+desc: confirm to reset settings
+eng: ""
+new:
+
+# depreciated
+id: LANG_RESET_CONFIRM_PLAYER
+desc: confirm to reset settings
+eng: ""
+new:
+
id: LANG_RESET_ASK_RECORDER
desc: confirm to reset settings
eng: "Are you sure?"
new:
-id: LANG_RESET_CONFIRM
+# depreciated
+id: LANG_RESET_CONFIRM_RECORDER
desc: confirm to reset settings
-eng: "PLAY=Reset"
+eng: ""
new:
-id: LANG_RESET_CANCEL
+# depreciated
+id: LANG_RESET_CANCEL_RECORDER
desc: confirm to reset settings
eng: "OFF=Cancel"
new:
@@ -782,7 +796,7 @@ new:
id: LANG_TETRIS_LEVEL
desc: tetris game
-eng: "0 Rows - Level 0"
+eng: "Rows - Level"
new:
id: LANG_POWEROFF_IDLE
@@ -874,3 +888,15 @@ id: LANG_REPEAT_ONE
desc: repeat one song
eng: "One"
new:
+
+id: LANG_RESET_CONFIRM
+desc: confirm to reset settings
+eng: "PLAY=Reset"
+new:
+
+id: LANG_RESET_CANCEL
+desc: confirm to reset settings
+eng: "OFF=Cancel"
+new:
+
+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)
if(line)
{
lines++;
- // move rows down
+ /* move rows down */
for(i = x; i < max_x - 1; i++)
for (j = 0; j < max_y; j++)
*(virtual + j * max_x + i) = *(virtual + j * max_x + (i + 1));
- x--; // re-check this line
+ x--; /* re-check this line */
}
}
@@ -318,7 +318,8 @@ static void move_down(void)
score += l*l;
}
- snprintf (s, sizeof(s), "%d Rows - Level %d", lines, level);
+ snprintf (s, sizeof(s), "%d %s %d", lines,
+ str(LANG_TETRIS_LEVEL), level);
lcd_putsxy (2, 42, s);
new_block();
@@ -400,10 +401,13 @@ static void init_tetris(void)
bool tetris(void)
{
+ char buf[20];
+
init_tetris();
draw_frame(start_x, start_x + max_x - 1, start_y - 1, start_y + max_y);
- lcd_putsxy (2, 42, str(LANG_TETRIS_LEVEL));
+ snprintf(buf, sizeof(buf), "0 %s 0", str(LANG_TETRIS_LEVEL));
+ lcd_putsxy (2, 42, buf);
lcd_update();
next_b = t_rand(blocks);