Reverted r23881 mistakenly committed to branch.v3.4

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_4@23882 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 83 insertions, 83 deletions

diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 2fed974f7a..ac7f23ac39 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -264,15 +264,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = כן"
-    iriverh100,iriverh120,iriverh300: "NAVI = כן"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = כן"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = כן"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = כן"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -284,15 +284,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "אחר = לא"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2368,17 +2368,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: " בונה מסד נתונים... %d (OFF כדי לחזור) נמצאו"
-    iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו"
+    h100,h120,h300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו"
     ipod*: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
+    x5,m5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו"
+    h10,h10_5gb,e200*,c200*,sa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3206,7 +3206,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "זמן תאורת כפתור"
-    sansafuze*,sansae200*: "זמן תאורת הגלגל"
+    fuze*,e200*: "זמן תאורת הגלגל"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4129,18 +4129,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = כוון"
-    iriverh100,iriverh120,iriverh300: "NAVI = כוון"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = כוון"
+    h100,h120,h300: "NAVI = כוון"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = כוון"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4150,28 +4150,28 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = ביטול"
-    iriverh100,iriverh120,iriverh300: "STOP = ביטול"
-    ipod*,sansac200*,gogearsa9200: "MENU = ביטול"
-    iaudiox5,iaudiom5: "RECORD = ביטול"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ביטול"
-    gigabeatfx: "POWER = ביטול"
+    h100,h120,h300: "STOP = ביטול"
+    ipod*,c200*,sa9200: "MENU = ביטול"
+    x5,m5: "RECORD = ביטול"
+    h10,h10_5gb,e200*,fuze*: "PREV = ביטול"
+    gigabeatf: "POWER = ביטול"
     mrobe100: "DISPLAY = ביטול"
     gigabeats: "BACK = ביטול"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4694,14 +4694,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=אישור OFF=ביטול"
     ipod*: "SELECT=אישור MENU=ביטול"
-    iriverh10,iriverh10_5gb: "SELECT=אישור PREV=ביטול"
+    h10,h10_5gb: "SELECT=אישור PREV=ביטול"
     gigabeats: "SELECT=אישור POWER=ביטול"
   </dest>
   <voice>
@@ -5876,17 +5876,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "מיקרופון"
-    iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
+    h100,h120,h300: "מיקרופון פנימי"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5912,15 +5912,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "כניסת שמע"
+    recording,player: "כניסת שמע"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6850,11 +6850,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "חוצץ:"
-    archosplayer: "חצץ:"
+    player: "חצץ:"
   </dest>
   <voice>
     *: "Buffer size"
@@ -6866,13 +6866,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6930,19 +6930,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "MSD:"
+    e200*,c200*,fuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8054,15 +8054,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "סוף רשימת השירים"
-    archosplayer: "סוף הרשימה"
+    player: "סוף הרשימה"
   </dest>
   <voice>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8302,16 +8302,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "הכונן מלא. לחץ על OFF כדי להמשיך"
-    iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך"
-    iaudiom5,iaudiox5: "הכונן מלא. לחץ על POWER כדי להמשיך"
-    sansae200*,sansac200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
+    h100,h120,h300: "הכונן מלא. לחץ על STOP כדי להמשיך"
+    m5,x5: "הכונן מלא. לחץ על POWER כדי להמשיך"
+    e200*,c200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
   </dest>
   <voice>
     *: none
@@ -8398,25 +8398,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF כדי לבטל"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP כדי לבטל"
+    player,h100,h120,h300: "STOP כדי לבטל"
     ipod*: "PLAY/PAUSE כדי לבטל"
-    iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV כדי לבטל"
+    x5,m5: "PLAY ארוך כדי לבטל"
+    h10,h10_5gb,e200*,c200*: "PREV כדי לבטל"
     gigabeats: "BACK כדי לבטל"
-    gigabeatfx: "POWER כדי לבטל"
+    gigabeatf: "POWER כדי לבטל"
   </dest>
   <voice>
     *: ""
@@ -8640,19 +8640,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "סוללה: כיבוי במקסימום"
+    recorder: "סוללה: כיבוי במקסימום"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Top off charge"
+    recorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10469,7 +10469,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11680,15 +11680,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "רגישות משטח מגע"
+    gigabeatf: "רגישות משטח מגע"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11697,15 +11697,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "גבוה"
+    gigabeatf: "גבוה"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </voice>
 </phrase>
 <phrase>