diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 13 | ||||
-rw-r--r-- | apps/gui/option_select.c | 2 | ||||
-rw-r--r-- | apps/gui/yesno.c | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 9dddff3ea2..5f437824b8 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -294,7 +294,7 @@ bool gui_wps_display(void) | |||
294 | #ifdef HAVE_LCD_BITMAP | 294 | #ifdef HAVE_LCD_BITMAP |
295 | gui_syncstatusbar_draw(&statusbars, true); | 295 | gui_syncstatusbar_draw(&statusbars, true); |
296 | #endif | 296 | #endif |
297 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST_RECORDER)); | 297 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST)); |
298 | return true; | 298 | return true; |
299 | } | 299 | } |
300 | else | 300 | else |
@@ -440,17 +440,10 @@ void display_keylock_text(bool locked) | |||
440 | FOR_NB_SCREENS(i) | 440 | FOR_NB_SCREENS(i) |
441 | gui_wps[i].display->stop_scroll(); | 441 | gui_wps[i].display->stop_scroll(); |
442 | 442 | ||
443 | #ifdef HAVE_LCD_CHARCELLS | ||
444 | if(locked) | 443 | if(locked) |
445 | s = str(LANG_KEYLOCK_ON_PLAYER); | 444 | s = str(LANG_KEYLOCK_ON); |
446 | else | 445 | else |
447 | s = str(LANG_KEYLOCK_OFF_PLAYER); | 446 | s = str(LANG_KEYLOCK_OFF); |
448 | #else | ||
449 | if(locked) | ||
450 | s = str(LANG_KEYLOCK_ON_RECORDER); | ||
451 | else | ||
452 | s = str(LANG_KEYLOCK_OFF_RECORDER); | ||
453 | #endif | ||
454 | gui_syncsplash(HZ, s); | 447 | gui_syncsplash(HZ, s); |
455 | } | 448 | } |
456 | 449 | ||
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 6bb69c21bb..ba4e54a616 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -409,7 +409,7 @@ bool option_screen(struct settings_list *setting, | |||
409 | } | 409 | } |
410 | } | 410 | } |
411 | if (show_cancel) | 411 | if (show_cancel) |
412 | gui_syncsplash(HZ/2, str(LANG_MENU_SETTING_CANCEL)); | 412 | gui_syncsplash(HZ/2, str(LANG_CANCEL)); |
413 | done = true; | 413 | done = true; |
414 | } | 414 | } |
415 | else if (action == ACTION_STD_OK) | 415 | else if (action == ACTION_STD_OK) |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 4f874df325..b689ad923b 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -74,8 +74,10 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
74 | { | 74 | { |
75 | if(nb_lines+line_shift+3<=display->nb_lines) | 75 | if(nb_lines+line_shift+3<=display->nb_lines) |
76 | nb_lines++; | 76 | nb_lines++; |
77 | display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_PLAY_RECORDER)); | 77 | display->puts(0, nb_lines+line_shift, str(LANG_CONFIRM_WITH_BUTTON)); |
78 | display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY_RECORDER)); | 78 | #ifdef HAVE_LCD_BITMAP |
79 | display->puts(0, nb_lines+line_shift+1, str(LANG_CANCEL_WITH_ANY)); | ||
80 | #endif | ||
79 | } | 81 | } |
80 | gui_textarea_update(display); | 82 | gui_textarea_update(display); |
81 | } | 83 | } |