diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-15 22:16:28 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-15 22:16:28 +0000 |
commit | ce05addf52ed784026d9ca8397f3c2e239ff9ed4 (patch) | |
tree | 2371e53a613848849ed7ada266b92c26fb3542d2 /apps/lang/english.lang | |
parent | 49cf05cb91c9160b79323bb8c798604b3cd8e2f2 (diff) | |
download | rockbox-ce05addf52ed784026d9ca8397f3c2e239ff9ed4.tar.gz rockbox-ce05addf52ed784026d9ca8397f3c2e239ff9ed4.zip |
Revert recording/repeat timer for now. It is useful as a feature, but didn't receive enough testing on multiple targets, and fixing it is non-trivial. Later reversal would be complicated because of .lng spreading. * The patch should probably redone in a different way, as it's huge for what it does... * Issues: (1) The repeat timer setting has NULL pointer hits. (2) The multi-int setting screen breaks with proportional fonts, and with somewhat larger fonts. (3) On some targets, all values except the leftmost one are unreachable. * Hint: The timer itself would be much simpler if it'd just store & compare ticks (497 days before it wraps).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13172 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/lang/english.lang')
-rw-r--r-- | apps/lang/english.lang | 100 |
1 files changed, 3 insertions, 97 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 66b864e0cc..69900c5e6a 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -2720,16 +2720,16 @@ | |||
2720 | </phrase> | 2720 | </phrase> |
2721 | <phrase> | 2721 | <phrase> |
2722 | id: LANG_RECORD_TIMESPLIT | 2722 | id: LANG_RECORD_TIMESPLIT |
2723 | desc: Record timer menu | 2723 | desc: Record split menu |
2724 | user: | 2724 | user: |
2725 | <source> | 2725 | <source> |
2726 | *: "File Split Options" | 2726 | *: "File Split Options" |
2727 | </source> | 2727 | </source> |
2728 | <dest> | 2728 | <dest> |
2729 | *: "Timer Options" | 2729 | *: "File Split Options" |
2730 | </dest> | 2730 | </dest> |
2731 | <voice> | 2731 | <voice> |
2732 | *: "Timer Options" | 2732 | *: "File Split Options" |
2733 | </voice> | 2733 | </voice> |
2734 | </phrase> | 2734 | </phrase> |
2735 | <phrase> | 2735 | <phrase> |
@@ -10741,97 +10741,3 @@ | |||
10741 | *: "Context Menu" | 10741 | *: "Context Menu" |
10742 | </voice> | 10742 | </voice> |
10743 | </phrase> | 10743 | </phrase> |
10744 | <phrase> | ||
10745 | id: LANG_MULTIINT_CONFIRM | ||
10746 | desc: Confirm string for multi_int settings | ||
10747 | user: | ||
10748 | <source> | ||
10749 | *: "Press PLAY to confirm" | ||
10750 | </source> | ||
10751 | <dest> | ||
10752 | *: "Press PLAY to confirm" | ||
10753 | h100,h120,h300: "Press NAVI to confirm" | ||
10754 | ipod*,x5,gigabeat: "Press SELECT to confirm" | ||
10755 | </dest> | ||
10756 | <voice> | ||
10757 | *: "" | ||
10758 | </voice> | ||
10759 | </phrase> | ||
10760 | <phrase> | ||
10761 | id: LANG_TIMER_SET | ||
10762 | desc: Recording timer menu | ||
10763 | <source> | ||
10764 | *: "Set countdown timer" | ||
10765 | </source> | ||
10766 | <dest> | ||
10767 | *: "Set countdown timer" | ||
10768 | </dest> | ||
10769 | <voice> | ||
10770 | *: "Set countdown timer" | ||
10771 | </voice> | ||
10772 | </phrase> | ||
10773 | <phrase> | ||
10774 | id: LANG_TIMER_REPEAT | ||
10775 | desc: Recording timer menu | ||
10776 | <source> | ||
10777 | *: "Record repeat timer" | ||
10778 | </source> | ||
10779 | <dest> | ||
10780 | *: "Record repeat timer" | ||
10781 | </dest> | ||
10782 | <voice> | ||
10783 | *: "Record repeat timer" | ||
10784 | </voice> | ||
10785 | </phrase> | ||
10786 | <phrase> | ||
10787 | id: LANG_TIMER_DAYS | ||
10788 | desc: recording timer settings string | ||
10789 | <source> | ||
10790 | *: "Days" | ||
10791 | </source> | ||
10792 | <dest> | ||
10793 | *: "Days" | ||
10794 | </dest> | ||
10795 | <voice> | ||
10796 | *: "Days" | ||
10797 | </voice> | ||
10798 | </phrase> | ||
10799 | <phrase> | ||
10800 | id: LANG_TIMER_HRS | ||
10801 | desc: recording timer settings string | ||
10802 | <source> | ||
10803 | *: "Hrs" | ||
10804 | </source> | ||
10805 | <dest> | ||
10806 | *: "Hrs" | ||
10807 | </dest> | ||
10808 | <voice> | ||
10809 | *: "Hours" | ||
10810 | </voice> | ||
10811 | </phrase> | ||
10812 | <phrase> | ||
10813 | id: LANG_TIMER_MINS | ||
10814 | desc: recording timer settings string | ||
10815 | <source> | ||
10816 | *: "Mins" | ||
10817 | </source> | ||
10818 | <dest> | ||
10819 | *: "Mins" | ||
10820 | </dest> | ||
10821 | <voice> | ||
10822 | *: "Minutes" | ||
10823 | </voice> | ||
10824 | </phrase> | ||
10825 | <phrase> | ||
10826 | id: LANG_REC_TIMER | ||
10827 | desc: recording screen timer string | ||
10828 | <source> | ||
10829 | *: "Timer" | ||
10830 | </source> | ||
10831 | <dest> | ||
10832 | *: "Timer" | ||
10833 | </dest> | ||
10834 | <voice> | ||
10835 | *: "Timer" | ||
10836 | </voice> | ||
10837 | </phrase> | ||