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

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 @@
 </phrase>
 <phrase>
   id: LANG_RECORD_TIMESPLIT
-  desc: Record timer menu
+  desc: Record split menu
   user:
   <source>
     *: "File Split Options"
   </source>
   <dest>
-    *: "Timer Options"
+    *: "File Split Options"
   </dest>
   <voice>
-    *: "Timer Options"
+    *: "File Split Options"
   </voice>
 </phrase>
 <phrase>
@@ -10741,97 +10741,3 @@
     *: "Context Menu"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_MULTIINT_CONFIRM
-  desc: Confirm string for multi_int settings
-  user:
-  <source>
-    *: "Press PLAY to confirm"
-  </source>
-  <dest>
-    *: "Press PLAY to confirm"
-    h100,h120,h300: "Press NAVI to confirm"
-    ipod*,x5,gigabeat: "Press SELECT to confirm"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIMER_SET
-  desc: Recording timer menu
-  <source>
-    *: "Set countdown timer"
-  </source>
-  <dest>
-    *: "Set countdown timer"
-  </dest>
-  <voice>
-    *: "Set countdown timer"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIMER_REPEAT
-  desc: Recording timer menu
-  <source>
-    *: "Record repeat timer"
-  </source>
-  <dest>
-    *: "Record repeat timer"
-  </dest>
-  <voice>
-    *: "Record repeat timer"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIMER_DAYS
-  desc: recording timer settings string
-  <source>
-    *: "Days"
-  </source>
-  <dest>
-    *: "Days"
-  </dest>
-  <voice>
-    *: "Days"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIMER_HRS
-  desc: recording timer settings string
-  <source>
-    *: "Hrs"
-  </source>
-  <dest>
-    *: "Hrs"
-  </dest>
-  <voice>
-    *: "Hours"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_TIMER_MINS
-  desc: recording timer settings string
-  <source>
-    *: "Mins"
-  </source>
-  <dest>
-    *: "Mins"
-  </dest>
-  <voice>
-    *: "Minutes"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REC_TIMER
-  desc: recording screen timer string
-  <source>
-    *: "Timer"
-  </source>
-  <dest>
-    *: "Timer"
-  </dest>
-  <voice>
-    *: "Timer"
-  </voice>
-</phrase>