diff options
author | Robert Hak <adiamas@rockbox.org> | 2003-06-25 08:25:29 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2003-06-25 08:25:29 +0000 |
commit | b88f2bc9b11ed54aae6bfb1affadf28e435ab736 (patch) | |
tree | cf43ce55934af4200c190d5069f7f0cf166aee23 /apps | |
parent | c8fb78fd446be6c38a32ac9e87af48ab7f8cb300 (diff) | |
download | rockbox-b88f2bc9b11ed54aae6bfb1affadf28e435ab736.tar.gz rockbox-b88f2bc9b11ed54aae6bfb1affadf28e435ab736.zip |
english language updated to be a bit more general, we now offer button descriptions on delete for recorder
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/lang/english.lang | 16 | ||||
-rw-r--r-- | apps/onplay.c | 6 | ||||
-rw-r--r-- | apps/tree.c | 4 |
3 files changed, 22 insertions, 4 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index c44b4aaa7f..12249ee048 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -443,14 +443,16 @@ desc: possible answers to resume question | |||
443 | eng: "(PLAY/STOP)" | 443 | eng: "(PLAY/STOP)" |
444 | new: | 444 | new: |
445 | 445 | ||
446 | # depreciated | ||
446 | id: LANG_RESUME_CONFIRM_RECORDER | 447 | id: LANG_RESUME_CONFIRM_RECORDER |
447 | desc: possible answer to resume question | 448 | desc: possible answer to resume question |
448 | eng: "PLAY = Yes" | 449 | eng: "" |
449 | new: | 450 | new: |
450 | 451 | ||
452 | # depreciated | ||
451 | id: LANG_RESUME_CANCEL_RECORDER | 453 | id: LANG_RESUME_CANCEL_RECORDER |
452 | desc: possible answer to resume question | 454 | desc: possible answer to resume question |
453 | eng: "Any Other = No" | 455 | eng: "" |
454 | new: | 456 | new: |
455 | 457 | ||
456 | id: LANG_KEYLOCK_ON_PLAYER | 458 | id: LANG_KEYLOCK_ON_PLAYER |
@@ -1557,3 +1559,13 @@ id: LANG_DISK_FULL | |||
1557 | desc: in recording screen | 1559 | desc: in recording screen |
1558 | eng: "The disk is full. Press OFF to continue." | 1560 | eng: "The disk is full. Press OFF to continue." |
1559 | new: | 1561 | new: |
1562 | |||
1563 | id: LANG_CONFIRM_WITH_PLAY_RECORDER | ||
1564 | desc: Generic recorder string to use to confirm | ||
1565 | eng: "PLAY = Yes" | ||
1566 | new: | ||
1567 | |||
1568 | id: LANG_CANCEL_WITH_ANY_RECORDER | ||
1569 | desc: Generic recorder string to use to cancel | ||
1570 | eng: "Any Other = No" | ||
1571 | new: | ||
diff --git a/apps/onplay.c b/apps/onplay.c index 557c457bbf..3e0f5a365e 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -55,6 +55,12 @@ static bool delete_file(void) | |||
55 | lcd_clear_display(); | 55 | lcd_clear_display(); |
56 | lcd_puts(0,0,str(LANG_REALLY_DELETE)); | 56 | lcd_puts(0,0,str(LANG_REALLY_DELETE)); |
57 | lcd_puts_scroll(0,1,selected_file); | 57 | lcd_puts_scroll(0,1,selected_file); |
58 | |||
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | lcd_puts(0,3,str(LANG_CONFIRM_WITH_PLAY_RECORDER)); | ||
61 | lcd_puts(0,4,str(LANG_CANCEL_WITH_ANY_RECORDER)); | ||
62 | #endif | ||
63 | |||
58 | lcd_update(); | 64 | lcd_update(); |
59 | 65 | ||
60 | while (!exit) { | 66 | while (!exit) { |
diff --git a/apps/tree.c b/apps/tree.c index bc9ae7b883..9935d8263d 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -524,8 +524,8 @@ bool ask_resume(void) | |||
524 | status_draw(false); | 524 | status_draw(false); |
525 | lcd_puts(0,1,str(LANG_RESUME_CONFIRM_PLAYER)); | 525 | lcd_puts(0,1,str(LANG_RESUME_CONFIRM_PLAYER)); |
526 | #else | 526 | #else |
527 | lcd_puts(0,1,str(LANG_RESUME_CONFIRM_RECORDER)); | 527 | lcd_puts(0,1,str(LANG_CONFIRM_WITH_PLAY_RECORDER)); |
528 | lcd_puts(0,2,str(LANG_RESUME_CANCEL_RECORDER)); | 528 | lcd_puts(0,2,str(LANG_CANCEL_WITH_ANY_RECORDER)); |
529 | #endif | 529 | #endif |
530 | lcd_update(); | 530 | lcd_update(); |
531 | 531 | ||