Mark deprecated strings, correct button names in some splashes, some minor tweaks

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14384 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 35 insertions, 29 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index fa3f8ed383..3df4ec4911 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -2420,14 +2420,14 @@
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5,m5: "Building database... %d found (Left to return)"
+    x5,m5: "Building database... %d found (LEFT to return)"
     h10,h10_5gb,e200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5,m5: "Building database... %d found (Left to return)"
+    x5,m5: "Building database... %d found (LEFT to return)"
     h10,h10_5gb,e200: "Building database... %d found (PREV to return)"
   </dest>
   <voice>
@@ -2703,15 +2703,15 @@
   user:
   <source>
     *: none
-    hold_button: "Backlight (On Hold Key)"
+    hold_button: "Backlight on Hold"
   </source>
   <dest>
     *: none
-    hold_button: "Backlight (On Hold Key)"
+    hold_button: "Backlight on Hold"
   </dest>
   <voice>
     *: none
-    hold_button: "Backlight on hold key"
+    hold_button: "Backlight on hold"
   </voice>
 </phrase>
 <phrase>
@@ -2767,13 +2767,13 @@
   desc: Backlight behaviour setting
   user:
   <source>
-    *: "First Keypress Enables Backlight Only"
+    *: "First Buttonpress Enables Backlight Only"
   </source>
   <dest>
-    *: "First Keypress Enables Backlight Only"
+    *: "First Buttonpress Enables Backlight Only"
   </dest>
   <voice>
-    *: "First Keypress Enables Backlight Only"
+    *: "First Buttonpress Enables Backlight Only"
   </voice>
 </phrase>
 <phrase>
@@ -6147,19 +6147,19 @@
 </phrase>
 <phrase>
   id: LANG_RECORD_CURRENT_DIR
-  desc: in recording directory options
+  desc: DEPRECATED
   user:
   <source>
     *: none
-    recording: "Current Directory"
+    recording: ""
   </source>
   <dest>
     *: none
-    recording: "Current Directory"
+    recording: deprecated
   </dest>
   <voice>
     *: none
-    recording: "Current directory"
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -8279,12 +8279,10 @@
   desc: displayed when key lock is on
   user:
   <source>
-    *: "Keylock is ON"
-    player: "Key Lock ON"
+    *: "Buttons Locked"
   </source>
   <dest>
-    *: "Keylock is ON"
-    player: "Key Lock ON"
+    *: "Buttons Locked"
   </dest>
   <voice>
     *: ""
@@ -8295,12 +8293,10 @@
   desc: displayed when key lock is turned off
   user:
   <source>
-    *: "Keylock is OFF"
-    player: "Key Lock OFF"
+    *: "Buttons Unlocked"
   </source>
   <dest>
-    *: "Keylock is OFF"
-    player: "Key Lock OFF"
+    *: "Buttons Unlocked"
   </dest>
   <voice>
     *: ""
@@ -8329,15 +8325,21 @@
   user:
   <source>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200: "The disk is full. Press UP to continue."
   </dest>
   <voice>
     *: none
-    recording: ""
+    recording,h100,h120,h300,m5,x5,e200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9939,16 +9941,16 @@
 </phrase>
 <phrase>
   id: VOICE_EXT_TXT
-  desc: spoken only, for file extension
+  desc: DEPRECATED
   user:
   <source>
     *: ""
   </source>
   <dest>
-    *: ""
+    *: deprecated
   </dest>
   <voice>
-    *: "text"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10480,15 +10482,19 @@
   user:
   <source>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5,ipod*,e200: "The disk is full. Press LEFT to continue."
   </source>
   <dest>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5,ipod*,e200: "The disk is full. Press LEFT to continue."
   </dest>
   <voice>
     *: none
-    recording: ""
+    recording,h100,h120,h300,m5,x5,ipod*,e200: ""
   </voice>
 </phrase>
 <phrase>