Rename targets to be consistent in all places. (FS #10819). Take 2.

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

148 files changed, 3364 insertions, 3434 deletions

diff --git a/apps/lang/afrikaans.lang b/apps/lang/afrikaans.lang
index 5f8ff3f0fb..25b74d6128 100644
--- a/apps/lang/afrikaans.lang
+++ b/apps/lang/afrikaans.lang
@@ -970,7 +970,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%02dMB"
@@ -984,7 +984,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%02dMB"
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index 2b14a43850..76bb135676 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -3854,15 +3854,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "عالى"
+    gigabeatfx: "عالى"
   </dest>
   <voice>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </voice>
 </phrase>
 <phrase>
@@ -4289,19 +4289,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
-    h100,h120,h300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
+    iriverh100,iriverh120,iriverh300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
     ipod*: "جاري بناء قاعدة البيانات...  عثر على d% (السابق للعودة)"
-    x5,m5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    h10,h10_5gb,e200*,c200*,fuze*: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    sa9200: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    gogearsa9200: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
   </dest>
   <voice>
     *: "المدخلات التي عثر عليها لفاعدة البيانات"
@@ -4676,7 +4676,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4837,15 +4837,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "حساسية اللمس"
+    gigabeatfx: "حساسية اللمس"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -5447,16 +5447,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "القرص مملوء. اضغط إيقاف للاستمرار."
-    h100,h120,h300: "القرص مملوء. اضغط إيقاف للاستمرار."
-    m5,x5: "القرص مملوء. اضغط زر التشغيل للاستمرار."
-    e200*,c200*: "القرص مملوء. اضغط السابق للاستمرار."
+    iriverh100,iriverh120,iriverh300: "القرص مملوء. اضغط إيقاف للاستمرار."
+    iaudiom5,iaudiox5: "القرص مملوء. اضغط زر التشغيل للاستمرار."
+    sansae200*,sansac200*: "القرص مملوء. اضغط السابق للاستمرار."
   </dest>
   <voice>
     *: none
@@ -6067,7 +6067,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -6252,17 +6252,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "ميكروفون"
-    h100,h120,h300: "ميكروفون داخلي"
+    iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
   </dest>
   <voice>
     *: none
     recording: "ميكروفون"
-    h100,h120,h300: "ميكروفون داخلي"
+    iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
   </voice>
 </phrase>
 <phrase>
@@ -6902,15 +6902,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "أي آخر = لا"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -7006,11 +7006,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "نهاية القائمة"
-    player: "نهاية القائمة الاغنية"
+    archosplayer: "نهاية القائمة الاغنية"
   </dest>
   <voice>
     *: "نهاية القائمة الاغنية"
@@ -7552,26 +7552,26 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Revert"
-    h100,h120,h300: "عرض = إاغاء الأمر"
-    ipod*,c200*: "قائمة = إاغاء الأمر"
-    x5,m5: "سجل = إاغاء الأمر"
-    h10,h10_5gb,e200*,fuze*: "السابق = إاغاء الأمر"
-    gigabeatf: "طاقة = إاغاء الأمر"
+    iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر"
+    ipod*,sansac200*: "قائمة = إاغاء الأمر"
+    iaudiox5,iaudiom5: "سجل = إاغاء الأمر"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر"
+    gigabeatfx: "طاقة = إاغاء الأمر"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "خلف = إاغاء الأمر"
-    sa9200: "يسار = إاغاء الأمر"
+    gogearsa9200: "يسار = إاغاء الأمر"
   </dest>
   <voice>
     *: none
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 66dcc29c94..ffbe06e625 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -665,12 +665,12 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрoфон"
-    h100,h120,h300: "Вграден микрофон"
+    iriverh100,iriverh120,iriverh300: "Вграден микрофон"
   </dest>
   <voice>
     *: ""
@@ -1242,19 +1242,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Батерия: нерегулирано зареждане"
+    archosrecorder: "Батерия: нерегулирано зареждане"
   </dest>
   <voice>
     *: none
-    recorder: none
+    archosrecorder: none
   </voice>
 </phrase>
 <phrase>
@@ -1280,18 +1280,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерия: %d%% %dч %dмин"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dмин"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dч %dмин"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dмин"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dч %dмин"
   </dest>
   <voice>
     *: ""
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
-    h10,ipodmini,ipodmini2g: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -1349,22 +1349,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF за отказ"
-    h100,h120,h300: "STOP за отказ"
-    ipod*,c200*,sa9200: "MENU за отказ"
-    x5,m5: "RECORD за отказ"
-    h10,h10_5gb,e200*,fuze*: "PREV за отказ"
-    gigabeatf: "POWER за отказ"
+    iriverh100,iriverh120,iriverh300: "STOP за отказ"
+    ipod*,sansac200*,gogearsa9200: "MENU за отказ"
+    iaudiox5,iaudiom5: "RECORD за отказ"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV за отказ"
+    gigabeatfx: "POWER за отказ"
     mrobe100: "DISPLAY за отказ"
     gigabeats: "BACK за отказ"
   </dest>
@@ -2914,17 +2914,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Изграждане на базата данни...  намерени %d (OFF за връщане)"
-    h100,h120,h300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
+    iriverh100,iriverh120,iriverh300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
     ipod*: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
-    x5,m5,gigabeat*,mrobe100: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3476,7 +3476,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4649,23 +4649,23 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Дискът е пълен. Натиснете OFF за да продължите."
-    h100,h120,h300: "Дискът е пълен. Натиснете STOP за да продължите."
-    m5,x5: "Дискът е пълен. Натиснете POWER за да продължите."
-    e200*,c200*: "Дискът е пълен. Натиснете PREV за да продължите."
+    iriverh100,iriverh120,iriverh300: "Дискът е пълен. Натиснете STOP за да продължите."
+    iaudiom5,iaudiox5: "Дискът е пълен. Натиснете POWER за да продължите."
+    sansae200*,sansac200*: "Дискът е пълен. Натиснете PREV за да продължите."
   </dest>
   <voice>
     *: ""
     recording: ""
-    h100,h120,h300: ""
-    m5,x5: ""
-    e200*,c200*: ""
+    iriverh100,iriverh120,iriverh300: ""
+    iaudiom5,iaudiox5: ""
+    sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4773,15 +4773,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    player: "Буф:"
+    archosplayer: "Буф:"
   </dest>
   <voice>
     *: ""
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -4987,15 +4987,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Да"
-    h100,h120,h300: "NAVI = Да"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Да"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -5022,14 +5022,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Запази"
-    h100,h120,h300: "NAVI = Запази"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Запази"
+    iriverh100,iriverh120,iriverh300: "NAVI = Запази"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Запази"
   </dest>
   <voice>
     *: none
@@ -5041,15 +5041,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Всеки друг = Не"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -5440,28 +5440,28 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF за отказ"
-    player,h100,h120,h300: "STOP за отказ"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за отказ"
     ipod*: "PLAY/PAUSE за отказ"
-    x5,m5: "Продължително PLAY за отказ"
-    h10,h10_5gb,e200*,c200*: "PREV за отказ"
+    iaudiox5,iaudiom5: "Продължително PLAY за отказ"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за отказ"
   </dest>
   <voice>
     *: ""
-    player,h100,h120,h300: ""
+    archosplayer,iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5: ""
-    h10,h10_5gb,e200*,c200*: ""
+    iaudiox5,iaudiom5: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5765,15 +5765,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Край на списъка с песни"
-    player: "Kрай на списъка"
+    archosplayer: "Kрай на списъка"
   </dest>
   <voice>
     *: ""
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -6628,7 +6628,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -6673,7 +6673,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -7731,15 +7731,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: ""
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -8844,17 +8844,17 @@
   user: core
   <source>
     *: none
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: ""
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -10206,17 +10206,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Изключване на осветяването на бутоните"
-    fuze*,e200*: "Изключване на осветяването на колелото"
+    sansafuze*,sansae200*: "Изключване на осветяването на колелото"
   </dest>
   <voice>
     *: none
     button_light: ""
-    fuze*,e200*: ""
+    sansafuze*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -10497,7 +10497,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -11358,14 +11358,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Установяване OFF=Отказ"
     ipod*: "SELECT=Установяване MENU=Отказ"
-    h10,h10_5gb: "SELECT=Установяване PREV=Отказ"
+    iriverh10,iriverh10_5gb: "SELECT=Установяване PREV=Отказ"
     gigabeats: "SELECT=Установяване POWER=Отказ"
   </dest>
   <voice>
@@ -11612,15 +11612,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Чувствителност на тъчпада"
+    gigabeatfx: "Чувствителност на тъчпада"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11933,14 +11933,14 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Високо"
+    gigabeatfx: "Високо"
   </dest>
   <voice>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </voice>
 </phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index e221c35de4..e6a0fbede4 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -261,15 +261,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Si"
-    h100,h120,h300: "NAVI = Si"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Si"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Si"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Si"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -281,15 +281,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Qualsevol altre = No"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2362,17 +2362,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construint Base de dades... %d trobats (OFF per tornar)"
-    h100,h120,h300: "Construint Base de dades... %d trobats (STOP per tornar)"
+    iriverh100,iriverh120,iriverh300: "Construint Base de dades... %d trobats (STOP per tornar)"
     ipod*: "Construint Base de dades... %d trobats (PREV per tornar)"
-    x5,m5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Construint Base de dades... %d trobats (PREV per tornar)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construint Base de dades... %d trobats (PREV per tornar)"
   </dest>
   <voice>
     *: "entrades trobades per base de dades"
@@ -3172,7 +3172,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3186,7 +3186,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3200,7 +3200,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3830,17 +3830,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Apagat de llum de botons"
-    fuze*,e200*: "Apagat de llum de roda"
+    sansafuze*,sansae200*: "Apagat de llum de roda"
   </dest>
   <voice>
     *: none
     button_light: "Apagat de llum de botons"
-    fuze*,e200*: "Apagat de llum de roda"
+    sansafuze*,sansae200*: "Apagat de llum de roda"
   </voice>
 </phrase>
 <phrase>
@@ -4121,18 +4121,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Desar"
-    h100,h120,h300: "NAVI = Desar"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Desar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Desar"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Desar"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4142,28 +4142,28 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Cancel·lar"
-    h100,h120,h300: "STOP = Cancel·lar"
-    ipod*,c200*,sa9200: "MENU = Cancel·lar"
-    x5,m5: "RECORD = Cancel·lar"
-    h10,h10_5gb,e200*,fuze*: "PREV = Cancel·lar"
-    gigabeatf: "POWER = Cancel·lar"
+    iriverh100,iriverh120,iriverh300: "STOP = Cancel·lar"
+    ipod*,sansac200*,gogearsa9200: "MENU = Cancel·lar"
+    iaudiox5,iaudiom5: "RECORD = Cancel·lar"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancel·lar"
+    gigabeatfx: "POWER = Cancel·lar"
     mrobe100: "DISPLAY = Cancel·lar"
     gigabeats: "BACK = Cancel·lar"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4685,14 +4685,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Accepta OFF=Anul·lar"
     ipod*: "SELECT=Accepta MENU=Anul·lar"
-    h10,h10_5gb: "SELECT=Accepta PREV=Anul·lar"
+    iriverh10,iriverh10_5gb: "SELECT=Accepta PREV=Anul·lar"
     gigabeats: "SELECT=Accepta POWER=Anul·lar"
   </dest>
   <voice>
@@ -5865,17 +5865,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micròfon"
-    h100,h120,h300: "Micròfon intern"
+    iriverh100,iriverh120,iriverh300: "Micròfon intern"
   </dest>
   <voice>
     *: none
     recording: "Micròfon"
-    h100,h120,h300: "Micròfon intern"
+    iriverh100,iriverh120,iriverh300: "Micròfon intern"
   </voice>
 </phrase>
 <phrase>
@@ -5901,15 +5901,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none  
-    recording,player: "Línia d'entrada"
+    recording,archosplayer: "Línia d'entrada"
   </dest>
   <voice>
     *: none
-    recording,player: "Línia d'entrada"
+    recording,archosplayer: "Línia d'entrada"
   </voice>
 </phrase>
 <phrase>
@@ -6839,15 +6839,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Mida de Buffer"
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -6856,13 +6856,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivell de batería"
@@ -6920,19 +6920,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8042,15 +8042,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fi de la Llista de Cançons"
-    player: "Fi Llista"
+    archosplayer: "Fi Llista"
   </dest>
   <voice>
     *: "Fi de la Llista de Cançons"
-    player: "Fi Llista"
+    archosplayer: "Fi Llista"
   </voice>
 </phrase>
 <phrase>
@@ -8290,20 +8290,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disc ple. Prem OFF per continuar"
-    h100,h120,h300: "Disc ple. Prem STOP per continuar"
-    m5,x5: "Disc ple. Prem POWER per continuar"
-    e200*,c200*: "Disc ple. Prem PREV per continuar"
+    iriverh100,iriverh120,iriverh300: "Disc ple. Prem STOP per continuar"
+    iaudiom5,iaudiox5: "Disc ple. Prem POWER per continuar"
+    sansae200*,sansac200*: "Disc ple. Prem PREV per continuar"
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8387,25 +8387,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF per a cancelar"
-    player,h100,h120,h300: "STOP per a cancelar"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP per a cancelar"
     ipod*: "PLAY/PAUSE per a cancelar"
-    x5,m5: "Long PLAY per a cancelar"
-    h10,h10_5gb,e200*,c200*: "PREV per a cancelar"
+    iaudiox5,iaudiom5: "Long PLAY per a cancelar"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV per a cancelar"
     gigabeats: "BACK per a cancelar"
-    gigabeatf: "POWER per a cancelar"
+    gigabeatfx: "POWER per a cancelar"
   </dest>
   <voice>
     *: ""
@@ -8629,19 +8629,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batería: Top-Off Chg"
+    archosrecorder: "Batería: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Batería: Top-Off Chg"
+    archosrecorder: "Batería: Top-Off Chg"
   </voice>
 </phrase>
 <phrase>
@@ -10458,7 +10458,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11669,15 +11669,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilitat de Touchpad"
+    gigabeatfx: "Sensibilitat de Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilitat de Touchpad"
+    gigabeatfx: "Sensibilitat de Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11686,15 +11686,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Alta"
+    gigabeatfx: "Alta"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Alta"
+    gigabeatfx: "Alta"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 6cd45e15e5..07aaa13e5a 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -2192,15 +2192,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "线路输入"
+    recording,archosplayer: "线路输入"
   </dest>
   <voice>
     *: none
-    recording,player: "线路输入"
+    recording,archosplayer: "线路输入"
   </voice>
 </phrase>
 <phrase>
@@ -2446,17 +2446,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "麦克风"
-    h100,h120,h300: "内置麦克风"
+    iriverh100,iriverh120,iriverh300: "内置麦克风"
   </dest>
   <voice>
     *: none
     recording: "麦克风"
-    h100,h120,h300: "内置麦克风"
+    iriverh100,iriverh120,iriverh300: "内置麦克风"
   </voice>
 </phrase>
 <phrase>
@@ -3308,7 +3308,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3322,7 +3322,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3336,7 +3336,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4341,19 +4341,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "电池:恒流快速充电"
+    archosrecorder: "电池:恒流快速充电"
   </dest>
   <voice>
     *: none
-    recorder: "电池 恒流快速充电"
+    archosrecorder: "电池 恒流快速充电"
   </voice>
 </phrase>
 <phrase>
@@ -4379,13 +4379,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "剩余电量:%d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "电量:%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm"
   </dest>
   <voice>
     *: "剩余电量"
@@ -4443,19 +4443,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盘1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盘1"
-    e200*,c200*,fuze*: "mSD卡"
+    sansae200*,sansac200*,sansafuze*: "mSD卡"
     ondio*: "MMC卡"
   </voice>
 </phrase>
@@ -4587,22 +4587,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF=放弃"
-    h100,h120,h300: "STOP=放弃"
-    ipod*,c200*,sa9200: "MENU=放弃"
-    x5,m5: "RECORD=放弃"
-    h10,h10_5gb,e200*,fuze*: "PREV=放弃"
-    gigabeatf: "POWER=放弃"
+    iriverh100,iriverh120,iriverh300: "STOP=放弃"
+    ipod*,sansac200*,gogearsa9200: "MENU=放弃"
+    iaudiox5,iaudiom5: "RECORD=放弃"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV=放弃"
+    gigabeatfx: "POWER=放弃"
     mrobe100: "DISPLAY=放弃"
     gigabeats: "BACK=放弃"
   </dest>
@@ -4685,16 +4685,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "磁盘已满，按下OFF继续."
-    h100,h120,h300: "磁盘已满，按下STOP继续."
-    m5,x5: "磁盘已满，按下POWER继续."
-    e200*,c200*: "磁盘，按下PREV继续."
+    iriverh100,iriverh120,iriverh300: "磁盘已满，按下STOP继续."
+    iaudiom5,iaudiox5: "磁盘已满，按下POWER继续."
+    sansae200*,sansac200*: "磁盘，按下PREV继续."
   </dest>
   <voice>
     *: none
@@ -4861,21 +4861,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=设置 OFF=取消"
     ipod*: "SELECT=设置 MENU=取消"
-    h10,h10_5gb: "SELECT=设置 PREV=取消"
+    iriverh10,iriverh10_5gb: "SELECT=设置 PREV=取消"
     gigabeats: "SELECT=设置 POWER=取消"
   </dest>
   <voice>
    *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -7390,25 +7390,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "按OFF键取消"
-    player,h100,h120,h300: "按STOP键取消"
+    archosplayer,iriverh100,iriverh120,iriverh300: "按STOP键取消"
     ipod*: "按PLAY/PAUSE键取消"
-    x5,m5: "长按PLAY键取消"
-    h10,h10_5gb,e200*,c200*: "按PREV键取消"
+    iaudiox5,iaudiom5: "长按PLAY键取消"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "按PREV键取消"
     gigabeats: "按BACK键取消"
-    gigabeatf: "按POWER键取消"
+    gigabeatfx: "按POWER键取消"
   </dest>
   <voice>
     *: ""
@@ -8501,7 +8501,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8776,24 +8776,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "数据库更新中...已找到%d个(按OFF返回)"
-    h100,h120,h300: "数据库更新中...已找到%d个(按STOP返回)"
+    iriverh100,iriverh120,iriverh300: "数据库更新中...已找到%d个(按STOP返回)"
     ipod*: "数据库更新中...已找到%d个(按PREV返回)"
-    x5,m5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)"
-    h10,h10_5gb,e200*,c200*,sa9200: "数据库更新中...已找到%d个(按PREV返回)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "数据库更新中...已找到%d个(按PREV返回)"
   </dest>
   <voice>
     *: "数据库更新中"
-    h100,h120,h300: ""
+    iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5,gigabeat*,mrobe100: ""
-    h10,h10_5gb,e200*,c200*,sa9200: ""
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9287,11 +9287,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "缓冲区:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "缓冲区大小为"
@@ -9351,15 +9351,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY=是"
-    h100,h120,h300: "NAVI=是"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT=是"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI=是"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT=是"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -9372,14 +9372,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON=设置"
-    h100,h120,h300: "NAVI=设置"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT=设置"
+    iriverh100,iriverh120,iriverh300: "NAVI=设置"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT=设置"
   </dest>
   <voice>
     *: none
@@ -9391,11 +9391,11 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Any Other=否"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
@@ -9584,15 +9584,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "曲目列表结束"
-    player: "列表结束"
+    archosplayer: "列表结束"
   </dest>
   <voice>
     *: "曲目列表结束"
-    player: "列表结束"
+    archosplayer: "列表结束"
   </voice>
 </phrase>
 <phrase>
@@ -10687,17 +10687,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "按键背光自动关闭时滞"
-    fuze*,e200*: "转盘背光自动关闭时滞"
+    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
   </dest>
   <voice>
     *: none
     button_light: "按键背光自动关闭时滞"
-    fuze*,e200*: "转盘背光自动关闭时滞"
+    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
   </voice>
 </phrase>
 <phrase>
@@ -11630,15 +11630,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "触摸板灵敏度"
+    gigabeatfx: "触摸板灵敏度"
   </dest>
   <voice>
     *: none
-    gigabeatf: "触摸板灵敏度"
+    gigabeatfx: "触摸板灵敏度"
   </voice>
 </phrase>
 <phrase>
@@ -11951,15 +11951,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "高"
+    gigabeatfx: "高"
   </dest>
   <voice>
     *: none
-    gigabeatf: "高"
+    gigabeatfx: "高"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index a43eaa2cdd..be2f80832e 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -2191,15 +2191,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "聲音輸入"
+    recording,archosplayer: "聲音輸入"
   </dest>
   <voice>
     *: none
-    recording,player: ""
+    recording,archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -2445,17 +2445,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "麥克風"
-    h100,h120,h300: "內置麥克風"
+    iriverh100,iriverh120,iriverh300: "內置麥克風"
   </dest>
   <voice>
     *: none
     recording: ""
-    h100,h120,h300: ""
+    iriverh100,iriverh120,iriverh300: ""
   </voice>
 </phrase>
 <phrase>
@@ -3307,7 +3307,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3321,7 +3321,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3335,7 +3335,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4340,19 +4340,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "電池: 完成充電"
+    archosrecorder: "電池: 完成充電"
   </dest>
   <voice>
     *: none
-    recorder: ""
+    archosrecorder: ""
   </voice>
 </phrase>
 <phrase>
@@ -4378,18 +4378,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "電池: %d%% %d小時%d分"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "電池: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "電池: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
-    h10,ipodmini,ipodmini2g: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -4444,19 +4444,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盤1"
-    e200*,c200*,fuze*: "Multimedia 卡:"
+    sansae200*,sansac200*,sansafuze*: "Multimedia 卡:"
     ondio*: "MMC卡:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盤1"
-    e200*,c200*,fuze*: "Multimedia 卡"
+    sansae200*,sansac200*,sansafuze*: "Multimedia 卡"
     ondio*: "mmc卡"
   </voice>
 </phrase>
@@ -4588,33 +4588,33 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = 回去"
-    h100,h120,h300: "STOP = 回去"
-    ipod*,c200*,sa9200: "MENU = 回去"
-    x5,m5: "RECORD = 回去"
-    h10,h10_5gb,e200*,fuze*: "PREV = 回去"
-    gigabeatf: "POWER = 回去"
+    iriverh100,iriverh120,iriverh300: "STOP = 回去"
+    ipod*,sansac200*,gogearsa9200: "MENU = 回去"
+    iaudiox5,iaudiom5: "RECORD = 回去"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 回去"
+    gigabeatfx: "POWER = 回去"
     mrobe100: "DISPLAY = 回去"
     gigabeats: "BACK = 回去"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,e200*,c200*,sa9200: ""
-    x5,m5: ""
-    h10,h10_5gb: ""
-    gigabeatf: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,sansae200*,sansac200*,gogearsa9200: ""
+    iaudiox5,iaudiom5: ""
+    iriverh10,iriverh10_5gb: ""
+    gigabeatfx: ""
     mrobe100: ""
     gigabeats: ""
   </voice>
@@ -4694,23 +4694,23 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "硬碟已滿，按下OFF繼續。"
-    h100,h120,h300: "硬碟已滿，按下STOP繼續。"
-    m5,x5: "硬碟已滿，按下POWER繼續。"
-    e200*,c200*: "硬碟已滿，按下PREV繼續。"
+    iriverh100,iriverh120,iriverh300: "硬碟已滿，按下STOP繼續。"
+    iaudiom5,iaudiox5: "硬碟已滿，按下POWER繼續。"
+    sansae200*,sansac200*: "硬碟已滿，按下PREV繼續。"
   </dest>
   <voice>
     *: none
     recording: ""
-    h100,h120,h300: ""
-    m5,x5: ""
-    e200*,c200*: ""
+    iriverh100,iriverh120,iriverh300: ""
+    iaudiom5,iaudiox5: ""
+    sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4874,21 +4874,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=取消"
     ipod*: "SELECT=設定 MENU=取消"
-    h10,h10_5gb: "SELECT=設定 PREV=取消"
+    iriverh10,iriverh10_5gb: "SELECT=設定 PREV=取消"
     gigabeats: "SELECT=設定 POWER=取消"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -7403,25 +7403,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF: 離開"
-    player,h100,h120,h300: "STOP: 離開"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: 離開"
     ipod*: "PLAY/PAUSE: 離開"
-    x5,m5: "長按PLAY: 離開"
-    h10,h10_5gb,e200*,c200*: "PREV: 離開"
+    iaudiox5,iaudiom5: "長按PLAY: 離開"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: 離開"
     gigabeats: "BACK: 離開"
-    gigabeatf: "POWER: 離開"
+    gigabeatfx: "POWER: 離開"
   </dest>
   <voice>
     *: ""
@@ -8480,7 +8480,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8755,24 +8755,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "建立資料庫... 找到%d項 (OFF: 回上一畫面)"
-    h100,h120,h300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)"
+    iriverh100,iriverh120,iriverh300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)"
     ipod*: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
-    x5,m5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)"
-    h10,h10_5gb,e200*,c200*,sa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)"
   </dest>
   <voice>
     *: "entries found for database"
-    h100,h120,h300: ""
+    iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5,gigabeat*,mrobe100: ""
-    h10,h10_5gb,e200*,c200*,sa9200: ""
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9266,15 +9266,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "緩沖:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: ""
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -9331,21 +9331,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = 是"
-    h100,h120,h300: "NAVI = 是"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = 是"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = 是"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = 是"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    h100,h120,h300: ""
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
-    player: ""
+    iriverh100,iriverh120,iriverh300: ""
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -9355,20 +9355,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = 設定"
-    h100,h120,h300: "NAVI = 設定"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = 設定"
+    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = 設定"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9377,15 +9377,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Any Other = 否"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -9571,15 +9571,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "列表結束"
-    player: "列表結束"
+    archosplayer: "列表結束"
   </dest>
   <voice>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -10674,17 +10674,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "轉盤燈自動關時間"
+    sansafuze*,sansae200*: "轉盤燈自動關時間"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -11648,15 +11648,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "觸摸板靈敏度"
+    gigabeatfx: "觸摸板靈敏度"
   </dest>
   <voice>
     *: none
-    gigabeatf: "觸摸板靈敏度"
+    gigabeatfx: "觸摸板靈敏度"
   </voice>
 </phrase>
 <phrase>
@@ -12291,15 +12291,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "高"
+    gigabeatfx: "高"
   </dest>
   <voice>
     *: none
-    gigabeatf: "高"
+    gigabeatfx: "高"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index f614cde4d9..b4c2982428 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -263,16 +263,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ano"
     cowond2*: "MENU = Ano"
-    h100,h120,h300: "NAVI = Ano"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Ano"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ano"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Ano"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -284,15 +284,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Vše ostatní = Ne"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2368,19 +2368,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Vytvářím databázi... %d found (OFF pro návrat)"
-    h100,h120,h300: "Vytvářím databázi... %d found (STOP pro návrat)"
+    iriverh100,iriverh120,iriverh300: "Vytvářím databázi... %d found (STOP pro návrat)"
     ipod*: "Vytvářím databázi... %d found (PREV pro návrat)"
-    x5,m5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Vytvářím databázi... %d found (PREV pro návrat)"
-    sa9200: "Vytvářím databázi... %d found (REW pro návrat)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Vytvářím databázi... %d found (PREV pro návrat)"
+    gogearsa9200: "Vytvářím databázi... %d found (REW pro návrat)"
   </dest>
   <voice>
     *: "záznamy nalezené v databázi"
@@ -3180,7 +3180,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3194,7 +3194,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3208,7 +3208,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3840,17 +3840,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Časový limit osvětlení tlačítka"
-    fuze*,e200*: "Časový limit osvětlení kolečka"
+    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
   </dest>
   <voice>
     *: none
     button_light: "Časový limit osvětlení tlačítka"
-    fuze*,e200*: "Časový limit osvětlení kolečka"
+    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
   </voice>
 </phrase>
 <phrase>
@@ -4115,17 +4115,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Nastavit"
     mrobe500: "HEART = Nastavit"
-    h100,h120,h300: "NAVI = Nastavit"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Nastavit"
-    sa9200: "PLAY = Nastavit"
+    iriverh100,iriverh120,iriverh300: "NAVI = Nastavit"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Nastavit"
+    gogearsa9200: "PLAY = Nastavit"
   </dest>
   <voice>
     *: none
@@ -4139,27 +4139,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Vrátit zpět"
     mrobe500: "POWER = Vrátit zpět"
-    h100,h120,h300: "STOP = Vrátit zpět"
-    ipod*,c200*: "MENU = Vrátit zpět"
-    x5,m5: "RECORD = Vrátit zpět"
-    h10,h10_5gb,e200*,fuze*: "PREV = Vrátit zpět"
-    gigabeatf: "POWER = Vrátit zpět"
+    iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět"
+    ipod*,sansac200*: "MENU = Vrátit zpět"
+    iaudiox5,iaudiom5: "RECORD = Vrátit zpět"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátit zpět"
+    gigabeatfx: "POWER = Vrátit zpět"
     mrobe100: "DISPLAY = Vrátit zpět"
     gigabeats: "BACK = Vrátit zpět"
-    sa9200: "LEFT = Vrátit zpět"
+    gogearsa9200: "LEFT = Vrátit zpět"
   </dest>
   <voice>
     *: none
@@ -4685,14 +4685,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nastavit OFF=Storno"
     ipod*: "SELECT=Nastavit MENU=Storno"
-    h10,h10_5gb: "SELECT=Nastavit PREV=Storno"
+    iriverh10,iriverh10_5gb: "SELECT=Nastavit PREV=Storno"
     gigabeats: "SELECT=Nastavit POWER=Storno"
   </dest>
   <voice>
@@ -5866,17 +5866,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofón"
-    h100,h120,h300: "Interní mikrofón"
+    iriverh100,iriverh120,iriverh300: "Interní mikrofón"
   </dest>
   <voice>
     *: none
     recording: "Mikrofón"
-    h100,h120,h300: "Interní mikrofón"
+    iriverh100,iriverh120,iriverh300: "Interní mikrofón"
   </voice>
 </phrase>
 <phrase>
@@ -5902,15 +5902,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linkový vstup"
+    recording,archosplayer: "Linkový vstup"
   </dest>
   <voice>
     *: none
-    recording,player: "Linkový vstup"
+    recording,archosplayer: "Linkový vstup"
   </voice>
 </phrase>
 <phrase>
@@ -6840,11 +6840,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Vyrovnávací paměť"
@@ -6856,13 +6856,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Baterie: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Stav baterie"
@@ -6920,19 +6920,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8044,15 +8044,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Konec seznamu skladeb"
-    player: "Konec seznamu"
+    archosplayer: "Konec seznamu"
   </dest>
   <voice>
     *: "Konec seznamu skladeb"
-    player: "Konec seznamu"
+    archosplayer: "Konec seznamu"
   </voice>
 </phrase>
 <phrase>
@@ -8292,20 +8292,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disk je plný. Pro pokračování stiskněte OFF."
-    h100,h120,h300: "Disk je plný. Pro pokračování stiskněte STOP."
-    m5,x5: "Disk je plný. Pro pokračování stiskněte POWER."
-    e200*,c200*: "Disk je plný. Pro pokračování stiskněte PREV."
+    iriverh100,iriverh120,iriverh300: "Disk je plný. Pro pokračování stiskněte STOP."
+    iaudiom5,iaudiox5: "Disk je plný. Pro pokračování stiskněte POWER."
+    sansae200*,sansac200*: "Disk je plný. Pro pokračování stiskněte PREV."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8389,25 +8389,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF pro zrušit"
-    player,h100,h120,h300: "STOP pro zrušit"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pro zrušit"
     ipod*: "PLAY/PAUSE pro zrušit"
-    x5,m5: "Long PLAY pro zrušit"
-    h10,h10_5gb,e200*,c200*: "PREV pro zrušit"
+    iaudiox5,iaudiom5: "Long PLAY pro zrušit"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pro zrušit"
     gigabeats: "BACK pro zrušit"
-    gigabeatf: "POWER pro zrušit"
+    gigabeatfx: "POWER pro zrušit"
   </dest>
   <voice>
     *: ""
@@ -8631,19 +8631,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Baterie: Donabíjení"
+    archosrecorder: "Baterie: Donabíjení"
   </dest>
   <voice>
     *: none
-    recorder: "Donabíjení"
+    archosrecorder: "Donabíjení"
   </voice>
 </phrase>
 <phrase>
@@ -10460,7 +10460,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11618,15 +11618,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Citlivost touchpadu"
+    gigabeatfx: "Citlivost touchpadu"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Citlivost touchpadu"
+    gigabeatfx: "Citlivost touchpadu"
   </voice>
 </phrase>
 <phrase>
@@ -12631,15 +12631,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Vysoký"
+    gigabeatfx: "Vysoký"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Vysoký"
+    gigabeatfx: "Vysoký"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 9d91daa2fe..dd71bae950 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -1832,15 +1832,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linje indgang"
+    recording,archosplayer: "Linje indgang"
   </dest>
   <voice>
     *: none
-    recording,player: "Linje indgang"
+    recording,archosplayer: "Linje indgang"
   </voice>
 </phrase>
 <phrase>
@@ -2086,17 +2086,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2781,7 +2781,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -2795,7 +2795,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2809,7 +2809,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3640,19 +3640,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batteri: Fyld ladning"
+    archosrecorder: "Batteri: Fyld ladning"
   </dest>
   <voice>
     *: none
-    recorder: "Batteri fyld-lader"
+    archosrecorder: "Batteri fyld-lader"
   </voice>
 </phrase>
 <phrase>
@@ -3678,18 +3678,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dt %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dt %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Batteri niveau"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
-    h10,ipodmini,ipodmini2g: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -3744,19 +3744,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Hard disk 1"
-    e200*,c200*,fuze*: "Mikro SD kort"
+    sansae200*,sansac200*,sansafuze*: "Mikro SD kort"
     ondio*: "Multimedie kort"
   </voice>
 </phrase>
@@ -3889,27 +3889,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "SLUK = Fortryd"
     mrobe500: "TÆND/SLUK = Fortryd"
-    h100,h120,h300: "STOP = Fortryd"
-    ipod*,c200*: "MENU = Fortryd"
-    x5,m5: "OPTAG = Fortryd"
-    h10,h10_5gb,e200*,fuze*: "FORRIGE = Fortryd"
-    gigabeatf: "TÆND/SLUK = Fortryd"
+    iriverh100,iriverh120,iriverh300: "STOP = Fortryd"
+    ipod*,sansac200*: "MENU = Fortryd"
+    iaudiox5,iaudiom5: "OPTAG = Fortryd"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd"
+    gigabeatfx: "TÆND/SLUK = Fortryd"
     mrobe100: "VIS = Fortryd"
     gigabeats: "TILBAGE = Fortryd"
-    sa9200: "VENSTRE = Fortryd"
+    gogearsa9200: "VENSTRE = Fortryd"
   </dest>
   <voice>
     *: none
@@ -3990,23 +3990,23 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disken er fuld. Tryk SLUK for at fortsætte."
-    h100,h120,h300: "Disken er fuld. Tryk STOP for at fortsætte."
-    m5,x5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte."
-    e200*,c200*: "Disken er fuld. Tryk FORRIGE for at fortsætte."
+    iriverh100,iriverh120,iriverh300: "Disken er fuld. Tryk STOP for at fortsætte."
+    iaudiom5,iaudiox5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte."
+    sansae200*,sansac200*: "Disken er fuld. Tryk FORRIGE for at fortsætte."
   </dest>
   <voice>
     *: none
     recording: ""
-    h100,h120,h300: ""
-    m5,x5: ""
-    e200*,c200*: ""
+    iriverh100,iriverh120,iriverh300: ""
+    iaudiom5,iaudiox5: ""
+    sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4170,21 +4170,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPIL=Sæt SLUK=Annuller"
     ipod*: "VÆLG=Sæt MENU=Annuller"
-    h10,h10_5gb: "VÆLG=Sæt FORRIGE=Annuller"
+    iriverh10,iriverh10_5gb: "VÆLG=Sæt FORRIGE=Annuller"
     gigabeats: "VÆLG=Sæt TÆND/SLUK=Annuller"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6606,25 +6606,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "SLUK for at afbryde"
-    player,h100,h120,h300: "STOP for at afbryde"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for at afbryde"
     ipod*: "SPIL/PAUSE for at afbryde"
-    x5,m5: "Lang SPIL for at afbryde"
-    h10,h10_5gb,e200*,c200*: "FORRIGE for at afbryde"
+    iaudiox5,iaudiom5: "Lang SPIL for at afbryde"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FORRIGE for at afbryde"
     gigabeats: "TILBAGE for at afbryde"
-    gigabeatf: "TÆND/SLUK for at afbryde"
+    gigabeatfx: "TÆND/SLUK for at afbryde"
   </dest>
   <voice>
     *: ""
@@ -8741,7 +8741,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9316,26 +9316,26 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Bygger database... %d fundet (SLUK for at stoppe)"
-    h100,h120,h300: "Bygger database... %d fundet (STOP for at stoppe)"
+    iriverh100,iriverh120,iriverh300: "Bygger database... %d fundet (STOP for at stoppe)"
     ipod*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    x5,m5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    sa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
+    gogearsa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
   </dest>
   <voice>
     *: "filer fundet til databasen"
-    h100,h120,h300: ""
+    iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5,gigabeat*,mrobe100: ""
-    h10,h10_5gb,e200*,c200*,sa9200: ""
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9931,17 +9931,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knap-lys sluk"
-    fuze*,e200*: "Hjul-lys sluk"
+    sansafuze*,sansae200*: "Hjul-lys sluk"
   </dest>
   <voice>
     *: none
     button_light: "Knap-lys sluk"
-    fuze*,e200*: "Hjul-lys sluk"
+    sansafuze*,sansae200*: "Hjul-lys sluk"
   </voice>
 </phrase>
 <phrase>
@@ -10507,11 +10507,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffer størrelse"
@@ -10555,16 +10555,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPIL = Ja"
     cowond2*: "MENU = Ja"
-    h100,h120,h300: "NAVI = Ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÆLG = Ja"
-    player: "(SPIL/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÆLG = Ja"
+    archosplayer: "(SPIL/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10578,17 +10578,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "Tænd = Indstil"
     mrobe500: "HJERTE = Indstil"
-    h100,h120,h300: "NAVI = Indstil"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÆLG = Indstil"
-    sa9200: "SPIL = Indstil"
+    iriverh100,iriverh120,iriverh300: "NAVI = Indstil"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÆLG = Indstil"
+    gogearsa9200: "SPIL = Indstil"
   </dest>
   <voice>
     *: none
@@ -10600,15 +10600,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Alle andre = Nej"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10690,11 +10690,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Slut på sætliste"
-    player: "Liste slut"
+    archosplayer: "Liste slut"
   </dest>
   <voice>
     *: "Slut på sætliste"
@@ -11596,15 +11596,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Touchpad følsomhed"
+    gigabeatfx: "Touchpad følsomhed"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad følsomhed"
+    gigabeatfx: "Touchpad følsomhed"
   </voice>
 </phrase>
 <phrase>
@@ -11731,15 +11731,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Høj"
+    gigabeatfx: "Høj"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Høj"
+    gigabeatfx: "Høj"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index ed2690e066..89d37f5d95 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -280,16 +280,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
     cowond2*: "MENU = Ja"
-    h100,h120,h300: "NAVI = Ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Ja"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Ja"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -301,15 +301,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Andere = Nein"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2385,19 +2385,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Erstelle Datenbank... %d gefunden (OFF zum Abbrechen)"
-    h100,h120,h300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
+    iriverh100,iriverh120,iriverh300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
     ipod*: "Erstelle Datenbank... %d gefunden (PLAY/PAUSE zum Abbrechen)"
-    x5,m5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
-    sa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
+    gogearsa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
   </dest>
   <voice>
     *: "Erstelle Datenbank"
@@ -3197,7 +3197,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3211,7 +3211,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3225,7 +3225,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3857,17 +3857,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    fuze*,e200*: "Scrollradbeleuchtungsdauer"
+    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
   </dest>
   <voice>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    fuze*,e200*: "Scrollradbeleuchtungsdauer"
+    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
   </voice>
 </phrase>
 <phrase>
@@ -4151,21 +4151,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Speichern"
     mrobe500: "HEART = Speichern"
-    h100,h120,h300: "NAVI = Speichern"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Speichern"
-    sa9200: "PLAY = Speichern"
+    iriverh100,iriverh120,iriverh300: "NAVI = Speichern"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Speichern"
+    gogearsa9200: "PLAY = Speichern"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4176,31 +4176,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Abbrechen"
     mrobe500: "POWER = Abbrechen"
-    h100,h120,h300: "STOP = Abbrechen"
-    ipod*,c200*: "MENU = Abbrechen"
-    x5,m5: "RECORD = Abbrechen"
-    h10,h10_5gb,e200*,fuze*: "PREV = Abbrechen"
-    gigabeatf: "POWER = Abbrechen"
+    iriverh100,iriverh120,iriverh300: "STOP = Abbrechen"
+    ipod*,sansac200*: "MENU = Abbrechen"
+    iaudiox5,iaudiom5: "RECORD = Abbrechen"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Abbrechen"
+    gigabeatfx: "POWER = Abbrechen"
     mrobe100: "DISPLAY = Abbrechen"
     gigabeats: "BACK = Abbrechen"
-    sa9200: "LEFT = Abbrechen"
+    gogearsa9200: "LEFT = Abbrechen"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4723,14 +4723,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK OFF=Abbruch"
     ipod*: "SELECT=OK MENU=Abbruch"
-    h10,h10_5gb: "SELECT=OK PREV=Abbruch"
+    iriverh10,iriverh10_5gb: "SELECT=OK PREV=Abbruch"
     gigabeats: "SELECT=OK POWER=Abbruch"
   </dest>
   <voice>
@@ -5905,17 +5905,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Internes Mikrofon"
+    iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Internes Mikrofon"
+    iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5941,15 +5941,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Analogeingang"
+    recording,archosplayer: "Analogeingang"
   </voice>
 </phrase>
 <phrase>
@@ -6879,11 +6879,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Puffer:"
-    player: "Puf:"
+    archosplayer: "Puf:"
   </dest>
   <voice>
     *: "Puffergröße"
@@ -6895,13 +6895,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %d Std %d Min"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterieladung"
@@ -6959,19 +6959,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Festplatte"
-    e200*,c200*,fuze*: "Micro-SD-Karte"
+    sansae200*,sansac200*,sansafuze*: "Micro-SD-Karte"
     ondio*: "Multimediakarte"
   </voice>
 </phrase>
@@ -8083,11 +8083,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Wiedergabeliste zu Ende"
-    player: "Liste zu Ende"
+    archosplayer: "Liste zu Ende"
   </dest>
   <voice>
     *: "Wiedergabeliste zu Ende"
@@ -8330,16 +8330,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Kein Speicherplatz mehr vorhanden. Drücke OFF zum fortfahren."
-    h100,h120,h300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
-    m5,x5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren."
-    e200*,c200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
+    iriverh100,iriverh120,iriverh300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
+    iaudiom5,iaudiox5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren."
+    sansae200*,sansac200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
   </dest>
   <voice>
     *: none
@@ -8427,25 +8427,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF zum Abbrechen"
-    player,h100,h120,h300: "STOP zum Abbrechen"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen"
     ipod*: "PLAY/PAUSE zum Abbrechen"
-    x5,m5: "Long PLAY zum Abbrechen"
-    h10,h10_5gb,e200*,c200*: "PREV zum Abbrechen"
+    iaudiox5,iaudiom5: "Long PLAY zum Abbrechen"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV zum Abbrechen"
     gigabeats: "BACK zum Abbrechen"
-    gigabeatf: "POWER zum Abbrechen"
+    gigabeatfx: "POWER zum Abbrechen"
   </dest>
   <voice>
     *: ""
@@ -8669,19 +8669,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Akku: Übergangsladen"
+    archosrecorder: "Akku: Übergangsladen"
   </dest>
   <voice>
     *: none
-    recorder: "Übergangsladen"
+    archosrecorder: "Übergangsladen"
   </voice>
 </phrase>
 <phrase>
@@ -11608,15 +11608,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Touchpad-Empfindlichkeit"
+    gigabeatfx: "Touchpad-Empfindlichkeit"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad-Empfindlichkeit"
+    gigabeatfx: "Touchpad-Empfindlichkeit"
   </voice>
 </phrase>
 <phrase>
@@ -11782,15 +11782,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Hoch"
+    gigabeatfx: "Hoch"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Hoch"
+    gigabeatfx: "Hoch"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 23676b9e0d..5f1200e235 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -844,25 +844,25 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     ipod*: "SELECT = Yes"
-    x5: "SELECT = Yes"
-    h10,h10_5gb: "SELECT = Yes"
-    gigabeatf: "SELECT = Yes"
-    e200*,c200*: "SELECT = Yes"
+    iaudiox5: "SELECT = Yes"
+    iriverh10,iriverh10_5gb: "SELECT = Yes"
+    gigabeatfx: "SELECT = Yes"
+    sansae200*,sansac200*: "SELECT = Yes"
   </source>
   <dest>
     *: "PLAY = Jah"
-    h100,h120,h300: "NAVI = Jah"
+    iriverh100,iriverh120,iriverh300: "NAVI = Jah"
     ipod*: "SELECT = Jah"
-    x5: "SELECT = Jah"
-    h10,h10_5gb: "SELECT = Jah"
-    gigabeatf: "SELECT = Jah"
-    e200*,c200*: "SELECT = Jah"
+    iaudiox5: "SELECT = Jah"
+    iriverh10,iriverh10_5gb: "SELECT = Jah"
+    gigabeatfx: "SELECT = Jah"
+    sansae200*,sansac200*: "SELECT = Jah"
   </dest>
   <voice>
     *: ""
@@ -870,7 +870,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -3446,7 +3446,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3460,7 +3460,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3474,7 +3474,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4440,7 +4440,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -4454,7 +4454,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -4514,13 +4514,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Aku"
@@ -4868,21 +4868,21 @@
   user: core
   <source>
     *: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     ipod*: "SELECT = Set"
-    x5: "SELECT = Set"
-    h10,h10_5gb: "SELECT = Set"
-    gigabeatf: "SELECT = Set"
-    e200*,c200*: "SELECT = Set"
+    iaudiox5: "SELECT = Set"
+    iriverh10,iriverh10_5gb: "SELECT = Set"
+    gigabeatfx: "SELECT = Set"
+    sansae200*,sansac200*: "SELECT = Set"
   </source>
   <dest>
     *: "ON muutmiseks"
-    h100,h120,h300: "NAVI muutmiseks"
+    iriverh100,iriverh120,iriverh300: "NAVI muutmiseks"
     ipod*: "SELECT muutmiseks"
-    x5: "SELECT muutmiseks"
-    h10,h10_5gb: "SELECT muutmiseks"
-    gigabeatf: "SELECT muutmiseks"
-    e200*,c200*: "SELECT muutmiseks"
+    iaudiox5: "SELECT muutmiseks"
+    iriverh10,iriverh10_5gb: "SELECT muutmiseks"
+    gigabeatfx: "SELECT muutmiseks"
+    sansae200*,sansac200*: "SELECT muutmiseks"
   </dest>
   <voice>
     *: ""
@@ -4894,19 +4894,19 @@
   user: core
   <source>
     *: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
   </source>
   <dest>
     *: "OFF tagasi pöördumiseks"
-    h100,h120,h300: "STOP tagasi pöördumiseks"
-    ipod*,c200*: "MENU tagasi pöördumiseks"
-    x5: "RECORD tagasi pöördumiseks"
-    h10,h10_5gb,e200*,fuze*: "PREV tagasi pöördumiseks"
-    gigabeatf: "POWER tagasi pöördumiseks"
+    iriverh100,iriverh120,iriverh300: "STOP tagasi pöördumiseks"
+    ipod*,sansac200*: "MENU tagasi pöördumiseks"
+    iaudiox5: "RECORD tagasi pöördumiseks"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV tagasi pöördumiseks"
+    gigabeatfx: "POWER tagasi pöördumiseks"
   </dest>
   <voice>
     *: ""
@@ -5100,11 +5100,11 @@
   user: core
   <source>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
   </source>
   <dest>
     *: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
   </dest>
   <voice>
     *: ""
@@ -7872,23 +7872,23 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    h100,h120,h300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5: "Long PLAY to abort"
-    h10,h10_5gb: "PREV to abort"
-    e200*,c200*: "PREV to abort"
+    iaudiox5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb: "PREV to abort"
+    sansae200*,sansac200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF katkestamiseks"
-    h100,h120,h300: "STOP katkestamiseks"
+    iriverh100,iriverh120,iriverh300: "STOP katkestamiseks"
     ipod*: "PLAY/PAUSE katkestamiseks"
-    x5: "Long PLAY katkestamiseks"
-    h10,h10_5gb: "PREV katkestamiseks"
-    e200*,c200*: "PREV katkestamiseks"
+    iaudiox5: "Long PLAY katkestamiseks"
+    iriverh10,iriverh10_5gb: "PREV katkestamiseks"
+    sansae200*,sansac200*: "PREV katkestamiseks"
   </dest>
   <voice>
     *: ""
@@ -7896,7 +7896,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index ce72a52a84..5f080ab45d 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -39,8 +39,8 @@
 #
 # All phrases have a default string like: *: "default" that will be used if no
 # other string matches for the particular model you build the language for. If
-# you want a particular string for the iriver h300 series you'd write it like:
-# h300: "h300-specific string" (below the default line). If your string isn't
+# you want a particular string for the iriver iriverh300 series you'd write it like:
+# iriverh300: "iriverh300-specific string" (below the default line). If your string isn't
 # used for all targets set the default to none like: *: none (no quotes!) this
 # will not include the string for target that will not need it, see
 # apps/features.txt for available categories that can be used instead of the
@@ -51,43 +51,43 @@
 # MODELNAME variable in the root makefile. Currently, they are:
 # Target        Target string
 # Archos
-# Player/Studio     player
-# Recorder          recorder
-# FM Recorder       fmrecorder
-# Recorder V2       recorderv2
-# Ondio SP          ondiosp
-# Ondio FM          ondiofm
+# Player/Studio     archosplayer
+# Recorder          archosrecorder
+# FM Recorder       archosfmrecorder
+# Recorder V2       archosrecorderv2
+# Ondio SP          archosondiosp
+# Ondio FM          archosondiofm
 # iriver
-# H100/H110/H115    h100
-# H120/H140         h120
-# H320/H340         h300
-# H10               h10
-# IFP 7XX           ifp7xx
+# H100/H110/H115    iriverh100
+# H120/H140         iriverh120
+# H320/H340         iriverh300
+# H10               iriverh10
+# IFP 7XX           iriverifp7xx
 # iaudio
-# X5                x5
-# M5                m5
+# X5                iaudiox5
+# M5                iaudiom5
 # ipod
 # All iPods         ipod*
 # 4G Color/Photo    ipodcolor
-# Nano              ipodnano
+# Nano              ipodnano1g
 # Video (5G)        ipodvideo
 # 3G                ipod3g
 # 4G gray           ipod4g
-# mini              ipodmini
+# mini              ipodmini1g
 # mini 2G           ipodmini2g
 # Toshiba
-# Gigabeat Fxx      gigabeatf
+# Gigabeat Fxx      gigabeatfx
 # Gigabeat Sxx      gigabeats
 #
 # Sandisk
-# Sansa E200        e200
-# Sansa C200        c200*
+# Sansa E200        sansae200
+# Sansa C200        sansac200*
 #
 # Olympus
 # m:robe 100        mrobe100
 #
 # Philips
-# GoGear SA9200     sa9200
+# GoGear SA9200     gogearsa9200
 
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -334,18 +334,18 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU, or top-right = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Yes"
     cowond2*: "MENU, or top-right = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -357,15 +357,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2458,19 +2458,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3270,7 +3270,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3284,7 +3284,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3298,7 +3298,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3930,17 +3930,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4222,21 +4222,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4247,31 +4247,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4794,14 +4794,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </dest>
   <voice>
@@ -5976,17 +5976,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -6012,15 +6012,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6950,11 +6950,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
@@ -6966,13 +6966,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -7030,19 +7030,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8154,11 +8154,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </dest>
   <voice>
     *: "End of Song List"
@@ -8403,20 +8403,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8500,25 +8500,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </dest>
   <voice>
     *: ""
@@ -8742,19 +8742,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Top off charge"
+    archosrecorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10571,7 +10571,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11782,15 +11782,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11799,15 +11799,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </dest>
   <voice>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index d1fec20154..732708c434 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -1350,15 +1350,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Entrada de línea"
+    recording,archosplayer: "Entrada de línea"
   </dest>
   <voice>
     *: none
-    recording,player: "Entrada de línea"
+    recording,archosplayer: "Entrada de línea"
   </voice>
 </phrase>
 <phrase>
@@ -1604,17 +1604,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micrófono"
-    h100,h120,h300: "Micrófono interno"
+    iriverh100,iriverh120,iriverh300: "Micrófono interno"
   </dest>
   <voice>
     *: none
     recording: "Micrófono"
-    h100,h120,h300: "Micrófono interno"
+    iriverh100,iriverh120,iriverh300: "Micrófono interno"
   </voice>
 </phrase>
 <phrase>
@@ -1977,7 +1977,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -1991,7 +1991,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2005,7 +2005,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -2777,19 +2777,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batería: carga completa"
+    archosrecorder: "Batería: carga completa"
   </dest>
   <voice>
     *: none
-    recorder: "Batería carga completa"
+    archosrecorder: "Batería carga completa"
   </voice>
 </phrase>
 <phrase>
@@ -2815,13 +2815,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batería: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivel y tiempo de batería"
@@ -2983,28 +2983,28 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Cancelar"
-    h100,h120,h300: "STOP = Cancelar"
-    ipod*,c200*,sa9200: "MENU = Cancelar"
-    x5,m5: "RECORD = Cancelar"
-    h10,h10_5gb,e200*,fuze*: "PREV = Cancelar"
-    gigabeatf: "POWER = Cancelar"
+    iriverh100,iriverh120,iriverh300: "STOP = Cancelar"
+    ipod*,sansac200*,gogearsa9200: "MENU = Cancelar"
+    iaudiox5,iaudiom5: "RECORD = Cancelar"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancelar"
+    gigabeatfx: "POWER = Cancelar"
     mrobe100: "DISPLAY = Cancelar"
     gigabeats: "BACK = Cancelar"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3065,20 +3065,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disco duro lleno. Pulse OFF para continuar"
-    h100,h120,h300: "Disco duro lleno. Pulse STOP para continuar"
-    m5,x5: "Disco duro lleno. Pulse POWER para continuar"
-    e200*,c200*: "Disco duro lleno. Pulse PREV para continuar"
+    iriverh100,iriverh120,iriverh300: "Disco duro lleno. Pulse STOP para continuar"
+    iaudiom5,iaudiox5: "Disco duro lleno. Pulse POWER para continuar"
+    sansae200*,sansac200*: "Disco duro lleno. Pulse PREV para continuar"
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3157,14 +3157,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aceptar OFF=Cancelar"
     ipod*: "SELECT=Aceptar MENU=Cancelar"
-    h10,h10_5gb: "SELECT=Aceptar PREV=Cancelar"
+    iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar"
     gigabeats: "SELECT=Aceptar POWER=Cancelar"
   </dest>
   <voice>
@@ -5398,25 +5398,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF para cancelar"
-    player,h100,h120,h300: "STOP para cancelar"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para cancelar"
     ipod*: "PLAY/PAUSE para cancelar"
-    x5,m5: "Pulsación larga de PLAY para cancelar"
-    h10,h10_5gb,e200*,c200*: "PREV para cancelar"
+    iaudiox5,iaudiom5: "Pulsación larga de PLAY para cancelar"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para cancelar"
     gigabeats: "BACK para cancelar"
-    gigabeatf: "POWER para cancelar"
+    gigabeatfx: "POWER para cancelar"
   </dest>
   <voice>
     *: ""
@@ -6122,7 +6122,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8002,19 +8002,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "m S D"
+    sansae200*,sansac200*,sansafuze*: "m S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -9203,17 +9203,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construyendo base de datos... %d encontrados (OFF para volver)"
-    h100,h120,h300: "Construyendo base de datos... %d encontrados (STOP para volver)"
+    iriverh100,iriverh120,iriverh300: "Construyendo base de datos... %d encontrados (STOP para volver)"
     ipod*: "Construyendo base de datos... %d encontrados (PREV para volver)"
-    x5,m5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Construyendo base de datos... %d encontrados (PREV para volver)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construyendo base de datos... %d encontrados (PREV para volver)"
   </dest>
   <voice>
     *: "elementos encontrados para la base de datos"
@@ -9854,11 +9854,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Búfer:"
-    player: "Búf:"
+    archosplayer: "Búf:"
   </dest>
   <voice>
     *: "Tamaño de búfer"
@@ -9932,15 +9932,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sí"
-    h100,h120,h300: "NAVI = Sí"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sí"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sí"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sí"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -9953,18 +9953,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Fijar"
-    h100,h120,h300: "NAVI = Fijar"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Fijar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Fijar"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Fijar"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9973,11 +9973,11 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Otro = No"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
@@ -10214,11 +10214,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fin de la lista de canciones"
-    player: "Fin de la lista"
+    archosplayer: "Fin de la lista"
   </dest>
   <voice>
     *: "Fin de la lista de canciones"
@@ -11142,17 +11142,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    fuze*,e200*: "Tiempo de espera en la luz de la rueda"
+    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
   </dest>
   <voice>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    fuze*,e200*: "Tiempo de espera en la luz de la rueda"
+    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
   </voice>
 </phrase>
 <phrase>
@@ -11561,15 +11561,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilidad de la superficie táctil"
+    gigabeatfx: "Sensibilidad de la superficie táctil"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilidad de la superficie táctil"
+    gigabeatfx: "Sensibilidad de la superficie táctil"
   </voice>
 </phrase>
 <phrase>
@@ -11794,15 +11794,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index e3c1a21029..629d03f751 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -850,14 +850,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "LEGI = Jes"
-    h100,h120,h300: "NAVI = Jes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Jes"
   </dest>
   <voice>
     *: ""
@@ -865,7 +865,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -3441,7 +3441,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3455,7 +3455,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3469,7 +3469,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4435,7 +4435,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -4449,7 +4449,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -4764,7 +4764,7 @@
   </source>
   <dest>
     *: "LEGI = Elekti"
-    h100,h120,h300: "NAVI = Elekti"
+    iriverh100,iriverh120,iriverh300: "NAVI = Elekti"
   </dest>
   <voice>
     *: ""
@@ -4779,7 +4779,7 @@
   </source>
   <dest>
     *: "ON+LEGI = Elpreni"
-    h100,h120,h300: "ON+NAVI = Elpreni"
+    iriverh100,iriverh120,iriverh300: "ON+NAVI = Elpreni"
   </dest>
   <voice>
     *: ""
@@ -7839,7 +7839,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -7853,7 +7853,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index db3b150467..b7b2cf55fe 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -2192,15 +2192,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linjatulo"
+    recording,archosplayer: "Linjatulo"
 </dest>
   <voice>
     *: none
-    recording,player: "Linjatulo"
+    recording,archosplayer: "Linjatulo"
   </voice>
 </phrase>
 <phrase>
@@ -2446,17 +2446,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofoni"
-    h100,h120,h300: "Sis. mikrofoni"
+    iriverh100,iriverh120,iriverh300: "Sis. mikrofoni"
   </dest>
   <voice>
     *: none
     recording: "Mikrofoni"
-    h100,h120,h300: "Sisäinen mikrofoni"
+    iriverh100,iriverh120,iriverh300: "Sisäinen mikrofoni"
   </voice>
 </phrase>
 <phrase>
@@ -3308,7 +3308,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3322,7 +3322,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3336,7 +3336,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4341,19 +4341,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Akku: huippulataus"
+    archosrecorder: "Akku: huippulataus"
   </dest>
   <voice>
     *: none
-    recorder: "Akku täynnä"
+    archosrecorder: "Akku täynnä"
   </voice>
 </phrase>
 <phrase>
@@ -4379,13 +4379,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %dt %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm"
-    h10,ipodmini,ipodmini2g: "Akku: %d%% %dt %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Akun varauksen taso"
@@ -4443,19 +4443,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Kiintolevy1"
-    e200*,c200*,fuze*: "micro s d muistikortti"
+    sansae200*,sansac200*,sansafuze*: "micro s d muistikortti"
     ondio*: "m m c muistikortti"
   </voice>
 </phrase>
@@ -4588,27 +4588,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Peruuta"
     mrobe500: "POWER = Peruuta"
-    h100,h120,h300: "STOP = Peruuta"
-    ipod*,c200*: "MENU = Peruuta"
-    x5,m5: "RECORD = Peruuta"
-    h10,h10_5gb,e200*,fuze*: "PREV = Peruuta"
-    gigabeatf: "POWER = Peruuta"
+    iriverh100,iriverh120,iriverh300: "STOP = Peruuta"
+    ipod*,sansac200*: "MENU = Peruuta"
+    iaudiox5,iaudiom5: "RECORD = Peruuta"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Peruuta"
+    gigabeatfx: "POWER = Peruuta"
     mrobe100: "DISPLAY = Peruuta"
     gigabeats: "BACK = Peruuta"
-    sa9200: "VASEN = Revert"
+    gogearsa9200: "VASEN = Revert"
   </dest>
   <voice>
     *: none
@@ -4689,23 +4689,23 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Levy täynnä. Jatka painamalla OFF."
-    h100,h120,h300: "Levy täynnä. Jatka painamalla STOP."
-    m5,x5: "Levy täynnä. Jatka painamalla POWER."
-    e200*,c200*: "Levy täynnä. Jatka painamalla PREV."
+    iriverh100,iriverh120,iriverh300: "Levy täynnä. Jatka painamalla STOP."
+    iaudiom5,iaudiox5: "Levy täynnä. Jatka painamalla POWER."
+    sansae200*,sansac200*: "Levy täynnä. Jatka painamalla PREV."
   </dest>
   <voice>
     *: none
     recording: ""
-    h100,h120,h300: ""
-    m5,x5: ""
-    e200*,c200*: ""
+    iriverh100,iriverh120,iriverh300: ""
+    iaudiom5,iaudiox5: ""
+    sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4869,14 +4869,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aseta OFF=Peruuta"
     ipod*: "SELECT=Aseta MENU=Peruuta"
-    h10,h10_5gb: "SELECT=Aseta PREV=Peruuta"
+    iriverh10,iriverh10_5gb: "SELECT=Aseta PREV=Peruuta"
     gigabeats: "SELECT=Aseta POWER=Peruuta"
   </dest>
   <voice>
@@ -7395,34 +7395,34 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF keskeyttää"
-    player,h100,h120,h300: "STOP keskeyttää"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
     ipod*: "PLAY/PAUSE keskeyttää"
-    x5,m5: "Pitkä PLAY keskeyttää"
-    h10,h10_5gb,e200*,c200*: "PREV keskeyttää"
+    iaudiox5,iaudiom5: "Pitkä PLAY keskeyttää"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV keskeyttää"
     gigabeats: "BACK keskeyttää"
-    gigabeatf: "POWER keskeyttää"
+    gigabeatfx: "POWER keskeyttää"
   </dest>
   <voice>
     *: ""
-    player,h100,h120,h300: ""
+    archosplayer,iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5: ""
-    h10,h10_5gb,e200*,c200*: ""
+    iaudiox5,iaudiom5: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
     gigabeats: ""
-    gigabeatf: ""
+    gigabeatfx: ""
   </voice>
 </phrase>
 <phrase>
@@ -8814,7 +8814,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9782,11 +9782,11 @@
   </source>
   <dest>
     *: none
-    usb_charging: "Lataa USB-yhteyden aikana"
+    usb_charging: "Lataa USB-samsungyhteyden aikana"
   </dest>
   <voice>
     *: none
-    usb_charging: "Lataa u s b yhteyden aikana"
+    usb_charging: "Lataa u s b samsungyhteyden aikana"
   </voice>
 </phrase>
 <phrase>
@@ -9969,19 +9969,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Luodaan tietokantaa... %d löytyi (OFF = palaa)"
-    h100,h120,h300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
+    iriverh100,iriverh120,iriverh300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
     ipod*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
-    x5,m5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (VASEN = palaa)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
-    sa9200: "Luodaan tietokantaa... %d löytyi (REW = palaa)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (VASEN = palaa)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
+    gogearsa9200: "Luodaan tietokantaa... %d löytyi (REW = palaa)"
   </dest>
   <voice>
     *: "tietokantaa varten löytyi merkintöjä"
@@ -10008,17 +10008,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    fuze*,e200*: "Rullavalon aikakatkaisu"
+    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
   </dest>
   <voice>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    fuze*,e200*: "Rullavalon aikakatkaisu"
+    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -10477,11 +10477,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Puskuri:"
-    player: "Puskuri:"
+    archosplayer: "Puskuri:"
   </dest>
   <voice>
     *: "Puskurin koko"
@@ -10525,16 +10525,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Kyllä"
     cowond2*: "MENU = Kyllä"
-    h100,h120,h300: "NAVI = Kyllä"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Kyllä"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Kyllä"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Kyllä"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10548,17 +10548,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Aseta"
     mrobe500: "HEART = Aseta"
-    h100,h120,h300: "NAVI = Aseta"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Aseta"
-    sa9200: "PLAY = Aseta"
+    iriverh100,iriverh120,iriverh300: "NAVI = Aseta"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Aseta"
+    gogearsa9200: "PLAY = Aseta"
   </dest>
   <voice>
     *: none
@@ -10570,15 +10570,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Muu = Ei"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10632,15 +10632,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Kappalelistan loppu"
-    player: "Listan loppu"
+    archosplayer: "Listan loppu"
   </dest>
   <voice>
     *: "Kappalelistan loppu"
-    player: "Listan loppu"
+    archosplayer: "Listan loppu"
   </voice>
 </phrase>
 <phrase>
@@ -11699,15 +11699,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Kosketuslevyn herkkyys"
+    gigabeatfx: "Kosketuslevyn herkkyys"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Kosketuslevyn herkkyys"
+    gigabeatfx: "Kosketuslevyn herkkyys"
   </voice>
 </phrase>
 <phrase>
@@ -11716,15 +11716,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Suuri"
+    gigabeatfx: "Suuri"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Suuri"
+    gigabeatfx: "Suuri"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 61a0c2cf63..673f8691cc 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -292,17 +292,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Oui"
     cowond2*: "MENU = Oui"
-    h100,h120,h300: "NAVI = Oui"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oui"
+    iriverh100,iriverh120,iriverh300: "NAVI = Oui"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oui"
     mrobe500: "PLAY ou POWER = Oui"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -314,15 +314,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Autres = Non"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2415,19 +2415,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Création base de données... %d trouvés (OFF = retour)"
-    h100,h120,h300: "Création base de données... %d trouvés (STOP = retour)"
+    iriverh100,iriverh120,iriverh300: "Création base de données... %d trouvés (STOP = retour)"
     ipod*: "Création base de données... %d trouvés (PREV = retour)"
-    x5,m5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Création base de données... %d trouvés (PREV = retour)"
-    sa9200: "Création base de données... %d trouvés (REW = retour)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Création base de données... %d trouvés (PREV = retour)"
+    gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
   </dest>
   <voice>
     *: "entrées trouvées pour base de données"
@@ -3227,7 +3227,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3241,7 +3241,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3255,7 +3255,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3887,17 +3887,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    fuze*,e200*: "Durée de l'éclairage de la molette"
+    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
   </dest>
   <voice>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    fuze*,e200*: "Durée de l'éclairage de la molette"
+    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
   </voice>
 </phrase>
 <phrase>
@@ -4179,21 +4179,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Valider"
     mrobe500: "HEART = Valider"
-    h100,h120,h300: "NAVI = Valider"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Valider"
-    sa9200: "PLAY = Valider"
+    iriverh100,iriverh120,iriverh300: "NAVI = Valider"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Valider"
+    gogearsa9200: "PLAY = Valider"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4204,31 +4204,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Annuler"
     mrobe500: "POWER = Annuler"
-    h100,h120,h300: "STOP = Annuler"
-    ipod*,c200*: "MENU = Annuler"
-    x5,m5: "RECORD = Annuler"
-    h10,h10_5gb,e200*,fuze*: "PREV = Annuler"
-    gigabeatf: "POWER = Annuler"
+    iriverh100,iriverh120,iriverh300: "STOP = Annuler"
+    ipod*,sansac200*: "MENU = Annuler"
+    iaudiox5,iaudiom5: "RECORD = Annuler"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler"
+    gigabeatfx: "POWER = Annuler"
     mrobe100: "DISPLAY = Annuler"
     gigabeats: "BACK = Annuler"
-    sa9200: "LEFT = Annuler"
+    gogearsa9200: "LEFT = Annuler"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4751,14 +4751,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Annuler"
     ipod*: "SELECT=Set MENU=Annuler"
-    h10,h10_5gb: "SELECT=Valider PREV=Annuler"
+    iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler"
     gigabeats: "SELECT=Valider POWER=Annuler"
   </dest>
   <voice>
@@ -5933,17 +5933,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micro intégré"
-    h100,h120,h300: "Micro intégré"
+    iriverh100,iriverh120,iriverh300: "Micro intégré"
   </dest>
   <voice>
     *: none
     recording: "Micro intégré"
-    h100,h120,h300: "Micro intégré"
+    iriverh100,iriverh120,iriverh300: "Micro intégré"
   </voice>
 </phrase>
 <phrase>
@@ -5969,15 +5969,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Entrée ligne"
+    recording,archosplayer: "Entrée ligne"
   </dest>
   <voice>
     *: none
-    recording,player: "Entrée ligne"
+    recording,archosplayer: "Entrée ligne"
   </voice>
 </phrase>
 <phrase>
@@ -6907,11 +6907,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Tampon:"
-    player: "Tamp.:"
+    archosplayer: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6923,13 +6923,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Niveau de la batterie"
@@ -6987,19 +6987,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8111,11 +8111,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fin de la liste de lecture"
-    player: "Fin de la liste"
+    archosplayer: "Fin de la liste"
   </dest>
   <voice>
     *: "Fin de la liste de lecture"
@@ -8358,20 +8358,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disque plein. Presser OFF pour continuer."
-    h100,h120,h300: "Disque plein. Presser STOP pour continuer."
-    m5,x5: "Disque plein. Presser POWER pour continuer."
-    e200*,c200*: "Disque plein. Presser PREV pour continuer."
+    iriverh100,iriverh120,iriverh300: "Disque plein. Presser STOP pour continuer."
+    iaudiom5,iaudiox5: "Disque plein. Presser POWER pour continuer."
+    sansae200*,sansac200*: "Disque plein. Presser PREV pour continuer."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8455,25 +8455,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF pour Annuler"
-    player,h100,h120,h300: "STOP pour Annuler"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
     ipod*: "PLAY/PAUSE pour Annuler"
-    x5,m5: "Long PLAY pour Annuler"
-    h10,h10_5gb,e200*,c200*: "PREV pour Annuler"
+    iaudiox5,iaudiom5: "Long PLAY pour Annuler"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pour Annuler"
     gigabeats: "BACK pour Annuler"
-    gigabeatf: "POWER pour Annuler"
+    gigabeatfx: "POWER pour Annuler"
   </dest>
   <voice>
     *: ""
@@ -8697,19 +8697,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batterie: charge max."
+    archosrecorder: "Batterie: charge max."
   </dest>
   <voice>
     *: none
-    recorder: "Charge maximale de la batterie"
+    archosrecorder: "Charge maximale de la batterie"
   </voice>
 </phrase>
 <phrase>
@@ -10526,7 +10526,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11737,15 +11737,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilité du pavé tactile"
+    gigabeatfx: "Sensibilité du pavé tactile"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilité du pavé tactile"
+    gigabeatfx: "Sensibilité du pavé tactile"
   </voice>
 </phrase>
 <phrase>
@@ -11754,15 +11754,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Haute"
+    gigabeatfx: "Haute"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Haute"
+    gigabeatfx: "Haute"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 8336c492cb..4d31c40093 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -89,7 +89,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (player) the jump scroll shall be done "always
+  desc: (archosplayer) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -775,14 +775,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = SI"
-    h100,h120,h300: "NAVI = SI"
+    iriverh100,iriverh120,iriverh300: "NAVI = SI"
   </dest>
   <voice>
     *: ""
@@ -790,7 +790,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2372,7 +2372,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2386,7 +2386,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time
+  desc: (archosplayer) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2400,7 +2400,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3156,7 +3156,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -3170,7 +3170,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3485,7 +3485,7 @@
   </source>
   <dest>
     *: "PLAY = Seleccionar"
-    h100,h120,h300: "NAVI = Seleccionar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Seleccionar"
   </dest>
   <voice>
     *: ""
@@ -3500,7 +3500,7 @@
   </source>
   <dest>
     *: "ON+PLAY = Borrar"
-    h100,h120,h300: "ON+NAVI = Borrar"
+    iriverh100,iriverh120,iriverh300: "ON+NAVI = Borrar"
   </dest>
   <voice>
     *: ""
@@ -6252,7 +6252,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -6266,7 +6266,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 200833f07f..7993235e80 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -264,15 +264,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Επικύρωση"
-    h100,h120,h300: "NAVI = Επικύρωση"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Επικύρωση"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Επικύρωση"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Επικύρωση"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -284,15 +284,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Any Other = Άκυρο"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2368,17 +2368,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (OFF για επιστροφή)"
-    h100,h120,h300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
+    iriverh100,iriverh120,iriverh300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
     ipod*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
-    x5,m5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
   </dest>
   <voice>
     *: "Kαταχωρήσεις βρέθηκαν για τη βάση δεδομένων"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) 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: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    fuze*,e200*: "Χρόνος σβησίματος τροχού"
+    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
   </dest>
   <voice>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    fuze*,e200*: "Χρόνος σβησίματος τροχού"
+    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
   </voice>
 </phrase>
 <phrase>
@@ -4129,14 +4129,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ρύθμιση"
-    h100,h120,h300: "NAVI = Ρύθμιση"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Ρύθμιση"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Ρύθμιση"
   </dest>
   <voice>
     *: none
@@ -4149,22 +4149,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Ακύρωση"
-    h100,h120,h300: "STOP = Ακύρωση"
-    ipod*,c200*,sa9200: "MENU = Ακύρωση"
-    x5,m5: "RECORD = Ακύρωση"
-    h10,h10_5gb,e200*,fuze*: "PREV = Ακύρωση"
-    gigabeatf: "POWER = Ακύρωση"
+    iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση"
+    ipod*,sansac200*,gogearsa9200: "MENU = Ακύρωση"
+    iaudiox5,iaudiom5: "RECORD = Ακύρωση"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Ακύρωση"
+    gigabeatfx: "POWER = Ακύρωση"
     mrobe100: "DISPLAY = Ακύρωση"
     gigabeats: "BACK = Ακύρωση"
   </dest>
@@ -4692,14 +4692,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Όρισε ΟFF=Ακύρωση"
     ipod*: "SELECT=Όρισε MENU=Ακύρωση"
-    h10,h10_5gb: "SELECT=Όρισε PREV=Ακύρωση"
+    iriverh10,iriverh10_5gb: "SELECT=Όρισε PREV=Ακύρωση"
     gigabeats: "SELECT=Όρισε POWER=Ακύρωση"
   </dest>
   <voice>
@@ -5873,17 +5873,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Μικρόφωνο"
-    h100,h120,h300: "Εσωτερικό Μικρόφωνο"
+    iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
   </dest>
   <voice>
     *: none
     recording: "Μικρόφωνο"
-    h100,h120,h300: "Εσωτερικό Μικρόφωνο"
+    iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
   </voice>
 </phrase>
 <phrase>
@@ -5909,15 +5909,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Eίσοδος"
+    recording,archosplayer: "Eίσοδος"
   </dest>
   <voice>
     *: none
-    recording,player: "Eίσοδος"
+    recording,archosplayer: "Eίσοδος"
   </voice>
 </phrase>
 <phrase>
@@ -6847,11 +6847,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Μνήμη:"
-    player: "Μνη:"
+    archosplayer: "Μνη:"
   </dest>
   <voice>
     *: "Μέγεθος μνήμης"
@@ -6863,13 +6863,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Μπάτ: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Επίπεδο μπαταρίας"
@@ -6927,19 +6927,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Έιτς Ντι 1"
-    e200*,c200*,fuze*: "μάικρο Ες Ντι"
+    sansae200*,sansac200*,sansafuze*: "μάικρο Ες Ντι"
     ondio*: "Εμ Εμ Σι"
   </voice>
 </phrase>
@@ -8051,11 +8051,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Τέλος λίστας κομματιών"
-    player: "Τέλος λίστας"
+    archosplayer: "Τέλος λίστας"
   </dest>
   <voice>
     *: "Τέλος λίστας κομματιών"
@@ -8298,20 +8298,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Ο δίσκος είναι γεμάτος. Πατήστε OFF για συνέχεια."
-    h100,h120,h300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
-    m5,x5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.."
-    e200*,c200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
+    iriverh100,iriverh120,iriverh300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
+    iaudiom5,iaudiox5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.."
+    sansae200*,sansac200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8395,25 +8395,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF για ακύρωση"
-    player,h100,h120,h300: "STOP για ακύρωση"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
     ipod*: "PLAY/PAUSE για ακύρωση"
-    x5,m5: "Long PLAY για ακύρωση"
-    h10,h10_5gb,e200*,c200*: "PREV για ακύρωση"
+    iaudiox5,iaudiom5: "Long PLAY για ακύρωση"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV για ακύρωση"
     gigabeats: "BACK για ακύρωση"
-    gigabeatf: "POWER για ακύρωση"
+    gigabeatfx: "POWER για ακύρωση"
   </dest>
   <voice>
     *: ""
@@ -8637,19 +8637,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Μπαταρία: Μέγιστη φόρτιση"
+    archosrecorder: "Μπαταρία: Μέγιστη φόρτιση"
   </dest>
   <voice>
     *: none
-    recorder: "Μπαταρία: Μέγιστη φόρτιση"
+    archosrecorder: "Μπαταρία: Μέγιστη φόρτιση"
   </voice>
 </phrase>
 <phrase>
@@ -10466,7 +10466,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11531,15 +11531,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Ευαισθησία πινακίδας αφής"
+    gigabeatfx: "Ευαισθησία πινακίδας αφής"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Ευαισθησία πινακίδας αφής"
+    gigabeatfx: "Ευαισθησία πινακίδας αφής"
   </voice>
 </phrase>
 <phrase>
@@ -11945,15 +11945,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Ψηλά"
+    gigabeatfx: "Ψηλά"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Ψηλά"
+    gigabeatfx: "Ψηλά"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 97093fa1f7..173806db58 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -269,18 +269,18 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU, or top-right = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "כן = PLAY"
     cowond2*: "או פינה ימנית-עליונה = כן MENU"
-    h100,h120,h300: "כן = NAVI"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "כן = SELECT"
+    iriverh100,iriverh120,iriverh300: "כן = NAVI"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "כן = SELECT"
     mrobe500: "או פינה ימנית-עליונה = כן Power, Play"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -292,15 +292,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "כל כפתור אחר = לא"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2393,19 +2393,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "בונה מסד נתונים... %d נמצאו (OFF כדי לחזור)"
-    h100,h120,h300: "בונה מסד נתונים... %d נמצאו (STOP כדי לחזור)"
+    iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d נמצאו (STOP כדי לחזור)"
     ipod*: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
-    x5,m5,gigabeat*,mrobe100: "בונה מסד נתונים... %d נמצאו (LEFT כדי לחזור)"
-    h10,h10_5gb,e200*,c200*,fuze*: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
-    sa9200: "בונה מסד נתונים... %d נמצאו (REW כדי לחזור)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "בונה מסד נתונים... %d נמצאו (LEFT כדי לחזור)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
+    gogearsa9200: "בונה מסד נתונים... %d נמצאו (REW כדי לחזור)"
   </dest>
   <voice>
     *: "רשומות נמצאו עבור מסד הנתונים"
@@ -3205,7 +3205,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3219,7 +3219,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3233,7 +3233,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3865,17 +3865,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "זמן תאורת כפתורים"
-    fuze*,e200*: "זמן תאורת גלגל"
+    sansafuze*,sansae200*: "זמן תאורת גלגל"
   </dest>
   <voice>
     *: none
     button_light: "זמן תאורת כפתורים"
-    fuze*,e200*: "זמן תאורת גלגל"
+    sansafuze*,sansae200*: "זמן תאורת גלגל"
   </voice>
 </phrase>
 <phrase>
@@ -4157,21 +4157,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "קבע = ON"
     mrobe500: "קבע = HEART"
-    h100,h120,h300: "קבע = NAVI"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "קבע = SELECT"
-    sa9200: "קבע = PLAY"
+    iriverh100,iriverh120,iriverh300: "קבע = NAVI"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "קבע = SELECT"
+    gogearsa9200: "קבע = PLAY"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4182,31 +4182,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "החזר = OFF"
     mrobe500: "החזר = POWER"
-    h100,h120,h300: "החזר = STOP"
-    ipod*,c200*: "החזר = MENU"
-    x5,m5: "החזר = RECORD"
-    h10,h10_5gb,e200*,fuze*: "החזר = PREV"
-    gigabeatf: "החזר = POWER"
+    iriverh100,iriverh120,iriverh300: "החזר = STOP"
+    ipod*,sansac200*: "החזר = MENU"
+    iaudiox5,iaudiom5: "החזר = RECORD"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "החזר = PREV"
+    gigabeatfx: "החזר = POWER"
     mrobe100: "החזר = DISPLAY"
     gigabeats: "החזר = BACK"
-    sa9200: "החזר = LEFT"
+    gogearsa9200: "החזר = LEFT"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4729,14 +4729,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ביטול=OFF קבע=PLAY"
     ipod*: "ביטול=MENU קבע=SELECT"
-    h10,h10_5gb: "ביטול=PREV קבע=SELECT"
+    iriverh10,iriverh10_5gb: "ביטול=PREV קבע=SELECT"
     gigabeats: "ביטול=POWER קבע=SELECT"
   </dest>
   <voice>
@@ -5911,17 +5911,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "מיקרופון"
-    h100,h120,h300: "מיקרופון פנימי"
+    iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
   </dest>
   <voice>
     *: none
     recording: "מיקרופון"
-    h100,h120,h300: "מיקרופון פנימי"
+    iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
   </voice>
 </phrase>
 <phrase>
@@ -5947,15 +5947,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6885,11 +6885,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "חוצץ:"
-    player: "חצץ:"
+    archosplayer: "חצץ:"
   </dest>
   <voice>
     *: "גודל חוצץ"
@@ -6901,13 +6901,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "סולל: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
     *: "רמת סוללה"
@@ -6965,19 +6965,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8089,11 +8089,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "סוף רשימת השירים"
-    player: "סוף הרשימה"
+    archosplayer: "סוף הרשימה"
   </dest>
   <voice>
     *: "סוף רשימת השירים"
@@ -8338,20 +8338,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "הכונן מלא. לחץ על OFF כדי להמשיך"
-    h100,h120,h300: "הכונן מלא. לחץ על STOP כדי להמשיך"
-    m5,x5: "הכונן מלא. לחץ על POWER כדי להמשיך"
-    e200*,c200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
+    iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך"
+    iaudiom5,iaudiox5: "הכונן מלא. לחץ על POWER כדי להמשיך"
+    sansae200*,sansac200*: "הכונן מלא. לחץ על PREV כדי להמשיך"
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8435,25 +8435,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "כדי לבטל OFF"
-    player,h100,h120,h300: "כדי לבטל STOP"
+    archosplayer,iriverh100,iriverh120,iriverh300: "כדי לבטל STOP"
     ipod*: "כדי לבטל PLAY/PAUSE"
-    x5,m5: "PLAY ארוך כדי לבטל"
-    h10,h10_5gb,e200*,c200*: "כדי לבטל PREV"
+    iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "כדי לבטל PREV"
     gigabeats: "כדי לבטל BACK"
-    gigabeatf: "כדי לבטל POWER"
+    gigabeatfx: "כדי לבטל POWER"
   </dest>
   <voice>
     *: ""
@@ -8677,19 +8677,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "סוללה: Top-Off Chg"
+    archosrecorder: "סוללה: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Top off charge"
+    archosrecorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10506,7 +10506,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11717,15 +11717,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "רגישות משטח מגע"
+    gigabeatfx: "רגישות משטח מגע"
   </dest>
   <voice>
     *: none
-    gigabeatf: "רגישות משטח מגע"
+    gigabeatfx: "רגישות משטח מגע"
   </voice>
 </phrase>
 <phrase>
@@ -11734,15 +11734,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "גבוה"
+    gigabeatfx: "גבוה"
   </dest>
   <voice>
     *: none
-    gigabeatf: "גבוה"
+    gigabeatfx: "גבוה"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index fdafb438a6..10be2907de 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -232,15 +232,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "बजाना = हां"
-    h100,h120,h300: "NAVI = हां"
-    ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "चुन = हां"
-    player: "(बजाना/रोक)"
+    iriverh100,iriverh120,iriverh300: "NAVI = हां"
+    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "चुन = हां"
+    archosplayer: "(बजाना/रोक)"
   </dest>
   <voice>
     *: ""
@@ -252,15 +252,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "दूसरों = नहीं"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -1267,17 +1267,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    iaudiox5,iaudiom5: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "डाटाबेस बन रहा है... %d मिले (OFF to बढ़)"
-    h100,h120,h300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)"
+    iriverh100,iriverh120,iriverh300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)"
     ipod*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
-    x5,m5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
-    h10,h10_5gb,e200*,c200*,fuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
+    iaudiox5,iaudiom5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -1620,7 +1620,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2132,13 +2132,13 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=लगा OFF=बंद"
     ipod*: "SELECT=लगा MENU=बंद"
-    h10,h10_5gb: "SELECT=लगा PREV=बंद"
+    iriverh10,iriverh10_5gb: "SELECT=लगा PREV=बंद"
   </dest>
   <voice>
     *: none
@@ -3867,15 +3867,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "गाने खतम हो गये"
-    player: "खतम हो गये"
+    archosplayer: "खतम हो गये"
   </dest>
   <voice>
     *: "गाने खतम हो गये"
-    player: "खतम हो गये"
+    archosplayer: "खतम हो गये"
   </voice>
 </phrase>
 <phrase>
@@ -3982,11 +3982,11 @@
   user: core
   <source>
     *: "No partition?"
-    player: "Partition?"
+    archosplayer: "Partition?"
   </source>
   <dest>
     *: "पारटिशन नहीं है?"
-    player: "पारटिशन?"
+    archosplayer: "पारटिशन?"
   </dest>
   <voice>
     *: ""
@@ -4044,20 +4044,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "दिसक भरी ह. Press OFF to continue."
-    h100,h120,h300: "दिसक भरी ह. Press STOP to continue."
-    m5,x5: "दिसक भरी ह. Press POWER to continue."
-    e200*,c200*: "दिसक भरी ह. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
+    iaudiom5,iaudiox5: "दिसक भरी ह. Press POWER to continue."
+    sansae200*,sansac200*: "दिसक भरी ह. Press PREV to continue."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5058,18 +5058,18 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    h100,h120,h300: "The disk is full. Press STOP to continue."
-    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "The disk is full. Press LEFT to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "The disk is full. Press LEFT to continue."
   </source>
   <dest>
     *: none
     recording: "दिसक भरी ह. Press OFF to continue."
-    h100,h120,h300: "दिसक भरी ह. Press STOP to continue."
-    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "दिसक भरी ह. Press LEFT to continue."
+    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
+    iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "दिसक भरी ह. Press LEFT to continue."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 109055a596..c6465b5578 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (player) the jump scroll shall be done "always
+  desc: (archosplayer) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -788,14 +788,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Já"
-    h100,h120,h300: "NAVI = Já"
+    iriverh100,iriverh120,iriverh300: "NAVI = Já"
   </dest>
   <voice>
     *: ""
@@ -803,7 +803,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2567,7 +2567,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2581,7 +2581,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time
+  desc: (archosplayer) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2595,7 +2595,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3351,7 +3351,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -3365,7 +3365,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3680,7 +3680,7 @@
   </source>
   <dest>
     *: "Spila = Velja"
-    h100,h120,h300: "NAVI = Velja"
+    iriverh100,iriverh120,iriverh300: "NAVI = Velja"
   </dest>
   <voice>
     *: ""
@@ -3695,7 +3695,7 @@
   </source>
   <dest>
     *: "Á+Spila = Eyða"
-    h100,h120,h300: "Á+NAVI = Eyða"
+    iriverh100,iriverh120,iriverh300: "Á+NAVI = Eyða"
   </dest>
   <voice>
     *: ""
@@ -6503,7 +6503,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -6517,7 +6517,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index d91b10e5aa..51324a418d 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -263,17 +263,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sì"
     cowond2*: "MENU = Sì"
-    h100,h120,h300: "NAVI = Sì"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Sì"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sì"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Sì"
     mrobe500: "PLAY o POWER = Sì"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -285,15 +285,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Altro Tasto = No"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2386,19 +2386,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Costruzione database... %d trovato (OFF per uscire)"
-    h100,h120,h300: "Costruzione database... %d trovato (STOP per uscire)"
+    iriverh100,iriverh120,iriverh300: "Costruzione database... %d trovato (STOP per uscire)"
     ipod*: "Costruzione database... %d trovato (PREV per uscire)"
-    x5,m5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Costruzione database... %d trovato (PREV per uscire)"
-    sa9200: "Costruzione database... %d trovato (REW per uscire)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Costruzione database... %d trovato (PREV per uscire)"
+    gogearsa9200: "Costruzione database... %d trovato (REW per uscire)"
   </dest>
   <voice>
     *: "Elementi trovati per il database"
@@ -3198,7 +3198,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3212,7 +3212,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3226,7 +3226,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3858,17 +3858,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tempo di spegnimento illuminazione tasti"
-    fuze*,e200*: "Tempo di spegnimento illuminazione rotella"
+    sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella"
   </dest>
   <voice>
     *: none
     button_light: "Tempo di spegnimento illuminazione tasti"
-    fuze*,e200*: "Tempo di spegnimento illuminazione rotella"
+    sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella"
   </voice>
 </phrase>
 <phrase>
@@ -4150,21 +4150,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Imposta"
     mrobe500: "HEART = Imposta"
-    h100,h120,h300: "NAVI = Imposta"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Imposta"
-    sa9200: "PLAY = Imposta"
+    iriverh100,iriverh120,iriverh300: "NAVI = Imposta"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Imposta"
+    gogearsa9200: "PLAY = Imposta"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4175,31 +4175,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Annulla"
     mrobe500: "POWER = Annulla"
-    h100,h120,h300: "STOP = Annulla"
-    ipod*,c200*: "MENU = Annulla"
-    x5,m5: "RECORD = Annulla"
-    h10,h10_5gb,e200*,fuze*: "PREV = Annulla"
-    gigabeatf: "POWER = Annulla"
+    iriverh100,iriverh120,iriverh300: "STOP = Annulla"
+    ipod*,sansac200*: "MENU = Annulla"
+    iaudiox5,iaudiom5: "RECORD = Annulla"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annulla"
+    gigabeatfx: "POWER = Annulla"
     mrobe100: "DISPLAY = Annulla"
     gigabeats: "BACK = Annulla"
-    sa9200: "LEFT = Annulla"
+    gogearsa9200: "LEFT = Annulla"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4722,14 +4722,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Imposta OFF=Annulla"
     ipod*: "SELECT=Imposta MENU=Annulla"
-    h10,h10_5gb: "SELECT=Imposta PREV=Annulla"
+    iriverh10,iriverh10_5gb: "SELECT=Imposta PREV=Annulla"
     gigabeats: "SELECT=Imposta POWER=Annulla"
   </dest>
   <voice>
@@ -5904,17 +5904,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfono"
-    h100,h120,h300: "Microfono interno"
+    iriverh100,iriverh120,iriverh300: "Microfono interno"
   </dest>
   <voice>
     *: none
     recording: "Microfono"
-    h100,h120,h300: "Microfono interno"
+    iriverh100,iriverh120,iriverh300: "Microfono interno"
   </voice>
 </phrase>
 <phrase>
@@ -5940,15 +5940,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linea in ingresso"
+    recording,archosplayer: "Linea in ingresso"
   </dest>
   <voice>
     *: none
-    recording,player: "Linea in ingresso"
+    recording,archosplayer: "Linea in ingresso"
   </voice>
 </phrase>
 <phrase>
@@ -6878,11 +6878,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Dimensione buffer"
@@ -6894,13 +6894,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteria: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"   
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"   
   </dest>
   <voice>
     *: "Livello Batteria"
@@ -6958,19 +6958,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD 1"
-    e200*,c200*,fuze*: "Micro SD"
+    sansae200*,sansac200*,sansafuze*: "Micro SD"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8082,11 +8082,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fine della Lista dei Brani"
-    player: "Fine della lista"
+    archosplayer: "Fine della lista"
   </dest>
   <voice>
     *: "Fine della Lista dei Brani"
@@ -8331,20 +8331,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disco pieno. Premi STOP per continuare."
-    h100,h120,h300: "Disco pieno. Premi stop per continuare."
-    m5,x5: "Disco pieno. Premi POWER per continuare."
-    e200*,c200*: "Disco pieno. Premi PREV per continuare."
+    iriverh100,iriverh120,iriverh300: "Disco pieno. Premi stop per continuare."
+    iaudiom5,iaudiox5: "Disco pieno. Premi POWER per continuare."
+    sansae200*,sansac200*: "Disco pieno. Premi PREV per continuare."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8428,25 +8428,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF = Annulla"
-    player,h100,h120,h300: "STOP = Annulla"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Annulla"
     ipod*: "PLAY/PAUSA = Annulla"
-    x5,m5: "PLAY LUNGO = Annulla"
-    h10,h10_5gb,e200*,c200*: "PREV = Annulla"
+    iaudiox5,iaudiom5: "PLAY LUNGO = Annulla"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Annulla"
     gigabeats: "BACK = Annulla"
-    gigabeatf: "POWER = Annulla"
+    gigabeatfx: "POWER = Annulla"
   </dest>
   <voice>
     *: ""
@@ -8670,19 +8670,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batteria: Carica completa"
+    archosrecorder: "Batteria: Carica completa"
   </dest>
   <voice>
     *: none
-    recorder: "Carica completa"
+    archosrecorder: "Carica completa"
   </voice>
 </phrase>
 <phrase>
@@ -10499,7 +10499,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11710,15 +11710,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilità Touchpad"
+    gigabeatfx: "Sensibilità Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilità Touchpad"
+    gigabeatfx: "Sensibilità Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11727,15 +11727,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Alta"
+    gigabeatfx: "Alta"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Alta"
+    gigabeatfx: "Alta"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 58103dc84e..3f2c119850 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -267,17 +267,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = はい"
     cowond2*: "MENU = はい"
-    h100,h120,h300: "NAVI = はい"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = はい"
+    iriverh100,iriverh120,iriverh300: "NAVI = はい"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = はい"
     mrobe500: "PLAY or POWER = はい"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -289,15 +289,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "[それ以外] = いいえ"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2390,19 +2390,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "データベース構築中... %d 件 (OFFで戻る)"
-    h100,h120,h300: "データベース構築中... %d 件 (STOPで戻る)"
+    iriverh100,iriverh120,iriverh300: "データベース構築中... %d 件 (STOPで戻る)"
     ipod*: "データベース構築中... %d 件 (PLAY/PAUSEで戻る)"
-    x5,m5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)"
-    h10,h10_5gb,e200*,c200*,fuze*: "データベース構築中... %d 件 (PREVで戻る)"
-    sa9200: "データベース構築中... %d 件 (REWで戻る)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "データベース構築中... %d 件 (PREVで戻る)"
+    gogearsa9200: "データベース構築中... %d 件 (REWで戻る)"
   </dest>
   <voice>
     *: "データベースに登録"
@@ -3202,7 +3202,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3216,7 +3216,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3230,7 +3230,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3862,17 +3862,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    fuze*,e200*: "ホイールライトのタイムアウト"
+    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
   </dest>
   <voice>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    fuze*,e200*: "ホイールライトのタイムアウト"
+    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
   </voice>
 </phrase>
 <phrase>
@@ -4154,21 +4154,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = 設定"
     mrobe500: "HEART = 設定"
-    h100,h120,h300: "NAVI = 設定"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = 設定"
-    sa9200: "PLAY = 設定"
+    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = 設定"
+    gogearsa9200: "PLAY = 設定"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4179,31 +4179,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = 元に戻す"
     mrobe500: "POWER = 元に戻す"
-    h100,h120,h300: "STOP = 元に戻す"
-    ipod*,c200*: "MENU = 元に戻す"
-    x5,m5: "RECORD = 元に戻す"
-    h10,h10_5gb,e200*,fuze*: "PREV = 元に戻す"
-    gigabeatf: "POWER = 元に戻す"
+    iriverh100,iriverh120,iriverh300: "STOP = 元に戻す"
+    ipod*,sansac200*: "MENU = 元に戻す"
+    iaudiox5,iaudiom5: "RECORD = 元に戻す"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 元に戻す"
+    gigabeatfx: "POWER = 元に戻す"
     mrobe100: "DISPLAY = 元に戻す"
     gigabeats: "BACK = 元に戻す"
-    sa9200: "LEFT = 元に戻す"
+    gogearsa9200: "LEFT = 元に戻す"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4726,14 +4726,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=キャンセル"
     ipod*: "SELECT=設定 MENU=キャンセル"
-    h10,h10_5gb: "SELECT=設定 PREV=キャンセル"
+    iriverh10,iriverh10_5gb: "SELECT=設定 PREV=キャンセル"
     gigabeats: "SELECT=設定 POWER=キャンセル"
   </dest>
   <voice>
@@ -5908,17 +5908,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "マイク"
-    h100,h120,h300: "内蔵のマイク"
+    iriverh100,iriverh120,iriverh300: "内蔵のマイク"
   </dest>
   <voice>
     *: none
     recording: "マイク"
-    h100,h120,h300: "内蔵のマイク"
+    iriverh100,iriverh120,iriverh300: "内蔵のマイク"
   </voice>
 </phrase>
 <phrase>
@@ -5944,15 +5944,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "ライン入力"
+    recording,archosplayer: "ライン入力"
   </dest>
   <voice>
     *: none
-    recording,player: "ライン入力"
+    recording,archosplayer: "ライン入力"
   </voice>
 </phrase>
 <phrase>
@@ -6882,11 +6882,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "バッファ:"
-    player: "バッファ:"
+    archosplayer: "バッファ:"
   </dest>
   <voice>
     *: "バッファサイズ"
@@ -6898,13 +6898,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "バッテリー: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "バッテリー容量"
@@ -6962,19 +6962,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "マイクロSD"
+    sansae200*,sansac200*,sansafuze*: "マイクロSD"
     ondio*: "マルチメディアカード"
   </voice>
 </phrase>
@@ -8086,11 +8086,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "プレイリストの終端です"
-    player: "プレイリストの終端です"
+    archosplayer: "プレイリストの終端です"
   </dest>
   <voice>
     *: "プレイリストの終端です"
@@ -8333,20 +8333,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "ディスクが一杯です．停止ボタンを押してください"
-    h100,h120,h300: "ディスクが一杯です．停止ボタンを押してください"
-    m5,x5: "ディスクが一杯です．電源ボタンを押してください"
-    e200*,c200*: "ディスクが一杯です．PREVボタンを押してください"
+    iriverh100,iriverh120,iriverh300: "ディスクが一杯です．停止ボタンを押してください"
+    iaudiom5,iaudiox5: "ディスクが一杯です．電源ボタンを押してください"
+    sansae200*,sansac200*: "ディスクが一杯です．PREVボタンを押してください"
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8430,25 +8430,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF: キャンセル"
-    player,h100,h120,h300: "STOP: キャンセル"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: キャンセル"
     ipod*: "PLAY/PAUSE: キャンセル"
-    x5,m5: "Long PLAY: キャンセル"
-    h10,h10_5gb,e200*,c200*: "PREV: キャンセル"
+    iaudiox5,iaudiom5: "Long PLAY: キャンセル"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: キャンセル"
     gigabeats: "BACK: キャンセル"
-    gigabeatf: "POWER: キャンセル"
+    gigabeatfx: "POWER: キャンセル"
   </dest>
   <voice>
     *: ""
@@ -8672,19 +8672,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "バッテリー: 最終充電"
+    archosrecorder: "バッテリー: 最終充電"
   </dest>
   <voice>
     *: none
-    recorder: "バッテリー 最終充電"
+    archosrecorder: "バッテリー 最終充電"
   </voice>
 </phrase>
 <phrase>
@@ -10501,7 +10501,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11712,15 +11712,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "タッチパッド感度"
+    gigabeatfx: "タッチパッド感度"
   </dest>
   <voice>
     *: none
-    gigabeatf: "タッチパッド感度"
+    gigabeatfx: "タッチパッド感度"
   </voice>
 </phrase>
 <phrase>
@@ -11729,15 +11729,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "高"
+    gigabeatfx: "高"
   </dest>
   <voice>
     *: none
-    gigabeatf: "こう"
+    gigabeatfx: "こう"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 168789f803..3b5ea714d1 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -2203,15 +2203,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "라인 인"
+    recording,archosplayer: "라인 인"
   </dest>
   <voice>
     *: none
-    recording,player: "라인 인"
+    recording,archosplayer: "라인 인"
   </voice>
 </phrase>
 <phrase>
@@ -2457,17 +2457,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "외부 마이크"
-    h100,h120,h300: "내장 마이크"
+    iriverh100,iriverh120,iriverh300: "내장 마이크"
   </dest>
   <voice>
     *: none
     recording: "외부 마이크"
-    h100,h120,h300: "내장 마이크"
+    iriverh100,iriverh120,iriverh300: "내장 마이크"
   </voice>
 </phrase>
 <phrase>
@@ -3319,7 +3319,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3333,7 +3333,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3347,7 +3347,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4352,19 +4352,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "배터리: Top-Off Chg"
+    archosrecorder: "배터리: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "배터리: Top-Off Chg"
+    archosrecorder: "배터리: Top-Off Chg"
   </voice>
 </phrase>
 <phrase>
@@ -4390,13 +4390,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "배터리: %d%% (%d시간 %d분)"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %d시간 %d분"
-    h10,ipodmini,ipodmini2g: "배터리: %d%% %d시간 %d분"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %d시간 %d분"
+    iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분"
   </dest>
   <voice>
     *: "배터리 레벨"
@@ -4454,19 +4454,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1 "
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -4598,22 +4598,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*,sa9200: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "A = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "A = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "[끔]: 원상태 복구"
-    h100,h120,h300: "[정지]: 원상태 복구"
-    ipod*,c200*,sa9200: "[메뉴]: 원상태 복구"
-    x5,m5: "[녹음]: 원상태 복구"
-    h10,h10_5gb,e200*,fuze*: "[이전]: 원상태 복구"
-    gigabeatf: "[전원]: 원상태 복구"
+    iriverh100,iriverh120,iriverh300: "[정지]: 원상태 복구"
+    ipod*,sansac200*,gogearsa9200: "[메뉴]: 원상태 복구"
+    iaudiox5,iaudiom5: "[녹음]: 원상태 복구"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[이전]: 원상태 복구"
+    gigabeatfx: "[전원]: 원상태 복구"
     mrobe100: "[화면]: 원상태 복구"
     gigabeats: "[뒤]: 원상태 복구"
   </dest>
@@ -4713,16 +4713,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press UP 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 UP to continue."
   </source>
   <dest>
     *: none
     recording: "디스크 공간이 부족합니다. [끔] 버튼을 누르세요."
-    h100,h120,h300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
-    m5,x5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요."
-    e200*,c200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
+    iriverh100,iriverh120,iriverh300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
+    iaudiom5,iaudiox5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요."
+    sansae200*,sansac200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
   </dest>
   <voice>
     *: none
@@ -4889,14 +4889,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "[재생]: 설정   [꺼짐]: 취소"
     ipod*: "[선택]: 설정   [메뉴]: 취소"
-    h10,h10_5gb: "[선택]: 설정   [이전]: 취소"
+    iriverh10,iriverh10_5gb: "[선택]: 설정   [이전]: 취소"
     gigabeats: "[선택]: 설정   [꺼짐]: 취소"
   </dest>
   <voice>
@@ -7400,25 +7400,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "[꺼짐]: 중지"
-    player,h100,h120,h300: "[정지]: 중지"
+    archosplayer,iriverh100,iriverh120,iriverh300: "[정지]: 중지"
     ipod*: "[재생/일시정지]: 중지"
-    x5,m5: "[재생 길게누름]: 중지"
-    h10,h10_5gb,e200*,c200*: "[이전]: 중지"
+    iaudiox5,iaudiom5: "[재생 길게누름]: 중지"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "[이전]: 중지"
     gigabeats: "[뒤]: 중지"
-    gigabeatf: "[전원]: 중지"
+    gigabeatfx: "[전원]: 중지"
   </dest>
   <voice>
     *: ""
@@ -8813,7 +8813,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9985,17 +9985,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "음악 DB 생성 중... %d개 완료 ([꺼짐]: 돌아가기)"
-    h100,h120,h300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)"
+    iriverh100,iriverh120,iriverh300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)"
     ipod*: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
-    x5,m5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
-    h10,h10_5gb,e200*,c200*,sa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
   </dest>
   <voice>
     *: "음악 DB의 요소를 찾음"
@@ -10022,17 +10022,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "버튼 조명 시간"
-    fuze*,e200*: "휠 조명 시간"
+    sansafuze*,sansae200*: "휠 조명 시간"
   </dest>
   <voice>
     *: none
     button_light: "버튼 조명 시간"
-    fuze*,e200*: "휠 조명 시간"
+    sansafuze*,sansae200*: "휠 조명 시간"
   </voice>
 </phrase>
 <phrase>
@@ -10373,15 +10373,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "터치패드 감도"
+    gigabeatfx: "터치패드 감도"
   </dest>
   <voice>
     *: none
-    gigabeatf: "터치패드 감도"
+    gigabeatfx: "터치패드 감도"
   </voice>
 </phrase>
 <phrase>
@@ -10587,11 +10587,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "버퍼:"
-    player: "버퍼:"
+    archosplayer: "버퍼:"
   </dest>
   <voice>
     *: "버퍼 크기"
@@ -10727,15 +10727,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "[재생] = 예"
-    h100,h120,h300: "[네비] = 예"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "[선택] = 예"
-    player: "(재생/정지)"
+    iriverh100,iriverh120,iriverh300: "[네비] = 예"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "[선택] = 예"
+    archosplayer: "(재생/정지)"
   </dest>
   <voice>
     *: ""
@@ -10748,14 +10748,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "[켬] = 설정"
-    h100,h120,h300: "[네비] = 설정"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "[선택] = 설정"
+    iriverh100,iriverh120,iriverh300: "[네비] = 설정"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "[선택] = 설정"
   </dest>
   <voice>
     *: none
@@ -10767,15 +10767,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "다른 버튼 = 아니오"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10981,15 +10981,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "노래 목록의 마지막"
-    player: "목록의 마지막"
+    archosplayer: "목록의 마지막"
   </dest>
   <voice>
     *: "노래 목록의 마지막"
-    player: "목록의 마지막"
+    archosplayer: "목록의 마지막"
   </voice>
 </phrase>
 <phrase>
@@ -12071,15 +12071,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "높음"
+    gigabeatfx: "높음"
   </dest>
   <voice>
     *: none
-    gigabeatf: "높음"
+    gigabeatfx: "높음"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index e2c96e65c2..abc194c7fc 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -39,8 +39,8 @@
 #
 # All phrases have a default string like: *: "default" that will be used if no
 # other string matches for the particular model you build the language for. If
-# you want a particular string for the iriver h300 series you'd write it like:
-# h300: "h300-specific string" (below the default line). If your string isn't
+# you want a particular string for the iriver iriverh300 series you'd write it like:
+# iriverh300: "iriverh300-specific string" (below the default line). If your string isn't
 # used for all targets set the default to none like: *: none (no quotes!) this
 # will not include the string for target that will not need it, see
 # apps/features.txt for available categories that can be used instead of the
@@ -51,43 +51,43 @@
 # MODELNAME variable in the root makefile. Currently, they are:
 # Target        Target string
 # Archos
-# Player/Studio     player
-# Recorder          recorder
-# FM Recorder       fmrecorder
-# Recorder V2       recorderv2
-# Ondio SP          ondiosp
-# Ondio FM          ondiofm
+# Player/Studio     archosplayer
+# Recorder          archosrecorder
+# FM Recorder       archosfmrecorder
+# Recorder V2       archosrecorderv2
+# Ondio SP          archosondiosp
+# Ondio FM          archosondiofm
 # iriver
-# H100/H110/H115    h100
-# H120/H140         h120
-# H320/H340         h300
-# H10               h10
-# IFP 7XX           ifp7xx
+# H100/H110/H115    iriverh100
+# H120/H140         iriverh120
+# H320/H340         iriverh300
+# H10               iriverh10
+# IFP 7XX           iriverifp7xx
 # iaudio
-# X5                x5
-# M5                m5
+# X5                iaudiox5
+# M5                iaudiom5
 # ipod
 # All iPods         ipod*
 # 4G Color/Photo    ipodcolor
-# Nano              ipodnano
+# Nano              ipodnano1g
 # Video (5G)        ipodvideo
 # 3G                ipod3g
 # 4G gray           ipod4g
-# mini              ipodmini
+# mini              ipodmini1g
 # mini 2G           ipodmini2g
 # Toshiba
-# Gigabeat Fxx      gigabeatf
+# Gigabeat Fxx      gigabeatfx
 # Gigabeat Sxx      gigabeats
 #
 # Sandisk
-# Sansa E200        e200
-# Sansa C200        c200*
+# Sansa E200        sansae200
+# Sansa C200        sansac200*
 #
 # Olympus
 # m:robe 100        mrobe100
 #
 # Philips
-# GoGear SA9200     sa9200
+# GoGear SA9200     gogearsa9200
 
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -333,15 +333,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Taip"
-    h100,h120,h300: "NAVI = Taip"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Taip"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Taip"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Taip"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -353,15 +353,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Bet koks kitas = Ne"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2454,17 +2454,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Kuriama duomenų bazė... %d rasta (OFF grįžimui)"
-    h100,h120,h300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
+    iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
     ipod*: "Kuriama duomenų bazė... %d rasta (PREV grįžimui)"
-    x5,m5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3264,7 +3264,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3278,7 +3278,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3292,7 +3292,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3924,17 +3924,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    fuze*,e200*: "Rato apšvietimo laikas"
+    sansafuze*,sansae200*: "Rato apšvietimo laikas"
   </dest>
   <voice>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    fuze*,e200*: "Rato apšvietimo laikas"
+    sansafuze*,sansae200*: "Rato apšvietimo laikas"
   </voice>
 </phrase>
 <phrase>
@@ -4215,18 +4215,18 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Nustatyti"
-    h100,h120,h300: "NAVI = Nustatyti"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nustatyti"
+    iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nustatyti"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4236,22 +4236,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Atstatyti"
-    h100,h120,h300: "STOP = Atstatyti"
-    ipod*,c200*,sa9200: "MENU = Atstatyti"
-    x5,m5: "RECORD = Atstatyti"
-    h10,h10_5gb,e200*,fuze*: "PREV = Atstatyti"
-    gigabeatf: "POWER = Atstatyti"
+    iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
+    ipod*,sansac200*,gogearsa9200: "MENU = Atstatyti"
+    iaudiox5,iaudiom5: "RECORD = Atstatyti"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
+    gigabeatfx: "POWER = Atstatyti"
     mrobe100: "DISPLAY = Atstatyti"
     gigabeats: "BACK = Atstatyti"
   </dest>
@@ -4779,14 +4779,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nustatyti OFF=Atšaukti"
     ipod*: "SELECT=Nustatyti MENU=Atšaukti"
-    h10,h10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
+    iriverh10,iriverh10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
     gigabeats: "SELECT=Nustatyti POWER=Atšaukti"
   </dest>
   <voice>
@@ -5961,17 +5961,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofonas"
-    h100,h120,h300: "Vidinis mikrofonas"
+    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
   </dest>
   <voice>
     *: none
     recording: "Mikrofonas"
-    h100,h120,h300: "Vidinis mikrofonas"
+    iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
   </voice>
 </phrase>
 <phrase>
@@ -5997,15 +5997,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6935,11 +6935,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buferis:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buferio dydis"
@@ -6951,13 +6951,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Baterijos lygis"
@@ -7015,19 +7015,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8139,11 +8139,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Dainų sąrašo pabaiga"
-    player: "Sąrašo pabaiga"
+    archosplayer: "Sąrašo pabaiga"
   </dest>
   <voice>
     *: "Dainų sąrašo pabaiga"
@@ -8386,20 +8386,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Diskas pilnas. Spauskite OFF."
-    h100,h120,h300: "Diskas pilnas. Spauskite STOP."
-    m5,x5: "Diskas pilnas. Spauskite POWER."
-    e200*,c200*: "Diskas pilnas. Spauskite PREV."
+    iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP."
+    iaudiom5,iaudiox5: "Diskas pilnas. Spauskite POWER."
+    sansae200*,sansac200*: "Diskas pilnas. Spauskite PREV."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8483,25 +8483,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF atšaukimui"
-    player,h100,h120,h300: "STOP atšaukimui"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
     ipod*: "PLAY/PAUSE atšaukimui"
-    x5,m5: "Ilgas PLAY atšaukimui"
-    h10,h10_5gb,e200*,c200*: "PREV atšaukimui"
+    iaudiox5,iaudiom5: "Ilgas PLAY atšaukimui"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV atšaukimui"
     gigabeats: "BACK atšaukimui"
-    gigabeatf: "POWER atšaukimui"
+    gigabeatfx: "POWER atšaukimui"
   </dest>
   <voice>
     *: ""
@@ -8725,19 +8725,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Baterija: Pilna"
+    archosrecorder: "Baterija: Pilna"
   </dest>
   <voice>
     *: none
-    recorder: "Pilanas pakrovimas"
+    archosrecorder: "Pilanas pakrovimas"
   </voice>
 </phrase>
 <phrase>
@@ -10554,7 +10554,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11765,15 +11765,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Jautrumas lietimui"
+    gigabeatfx: "Jautrumas lietimui"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Jautrumas lietimui"
+    gigabeatfx: "Jautrumas lietimui"
   </voice>
 </phrase>
 <phrase>
@@ -11782,15 +11782,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Aukštas"
+    gigabeatfx: "Aukštas"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Aukštas"
+    gigabeatfx: "Aukštas"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index e1d4fa4ed2..2a814b9f74 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -261,16 +261,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Igen"
     cowond2*: "MENU = Igen"
-    h100,h120,h300: "NAVI = Igen"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Igen"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Igen"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Igen"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -282,15 +282,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Egyéb = Mégsem"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2365,19 +2365,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Készítem az adatbázist... %d-t találtam (OFF - vissza)"
-    h100,h120,h300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
+    iriverh100,iriverh120,iriverh300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
     ipod*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
-    x5,m5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
-    sa9200: "Készítem az adatbázist... %d-t találtam (REW - vissza)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
+    gogearsa9200: "Készítem az adatbázist... %d-t találtam (REW - vissza)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3176,7 +3176,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3190,7 +3190,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3204,7 +3204,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3836,17 +3836,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Gomb világításának hossza"
-    fuze*,e200*: "Kerék világításának hossza"
+    sansafuze*,sansae200*: "Kerék világításának hossza"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3863,7 +3863,7 @@
   </dest>
   <voice>
     *: none
-    gigabeatf: "Button Light Brightness"
+    gigabeatfx: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
@@ -4128,17 +4128,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Beállít"
     mrobe500: "SZÍV = Beállít"
-    h100,h120,h300: "NAVI = Beállít"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Beállít"
-    sa9200: "PLAY = Beállít"
+    iriverh100,iriverh120,iriverh300: "NAVI = Beállít"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Beállít"
+    gogearsa9200: "PLAY = Beállít"
   </dest>
   <voice>
     *: none
@@ -4152,27 +4152,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "KI = mégsem"
     mrobe500: "POWER = mégsem"
-    h100,h120,h300: "STOP = mégsem"
-    ipod*,c200*: "MENU = mégsem"
-    x5,m5: "RECORD = mégsem"
-    h10,h10_5gb,e200*,fuze*: "PREV = mégsem"
-    gigabeatf: "POWER = mégsem"
+    iriverh100,iriverh120,iriverh300: "STOP = mégsem"
+    ipod*,sansac200*: "MENU = mégsem"
+    iaudiox5,iaudiom5: "RECORD = mégsem"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = mégsem"
+    gigabeatfx: "POWER = mégsem"
     mrobe100: "DISPLAY = mégsem"
     gigabeats: "VISSZA = mégsem"
-    sa9200: "BAL = mégsem"
+    gogearsa9200: "BAL = mégsem"
   </dest>
   <voice>
     *: none
@@ -4698,14 +4698,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK KI=Mégsem"
     ipod*: "SELECT=OK MENU=Mégsem"
-    h10,h10_5gb: "SELECT=OK PREV=Mégsem"
+    iriverh10,iriverh10_5gb: "SELECT=OK PREV=Mégsem"
     gigabeats: "SELECT=OK POWER=Mégsem"
   </dest>
   <voice>
@@ -5879,17 +5879,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Belső mikrofon"
+    iriverh100,iriverh120,iriverh300: "Belső mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5915,15 +5915,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6853,11 +6853,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Puffer:"
-    player: "Puf:"
+    archosplayer: "Puf:"
   </dest>
   <voice>
     *: ""
@@ -6869,13 +6869,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %d óra %d perc"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Akku: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6933,18 +6933,18 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD"
+    sansae200*,sansac200*,sansafuze*: "mSD"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    e200*,c200*,fuze*: "micro Secure Digital card:"
+    sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
     ondio*: "Multimedia card"
   </voice>
 </phrase>
@@ -8056,15 +8056,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Vége a számok listájának"
-    player: "Lista vége"
+    archosplayer: "Lista vége"
   </dest>
   <voice>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8304,20 +8304,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "A merevlemez tele van. Folytatáshoz nyomj OFF-ot."
-    h100,h120,h300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
-    m5,x5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot."
-    e200*,c200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
+    iriverh100,iriverh120,iriverh300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
+    iaudiom5,iaudiox5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot."
+    sansae200*,sansac200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8401,25 +8401,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF - megszakít"
-    player,h100,h120,h300: "STOP - megszakít"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP - megszakít"
     ipod*: "PLAY/PAUSE - megszakít"
-    x5,m5: "PLAY hosszan - megszakít"
-    h10,h10_5gb,e200*,c200*: "PREV - megszakít"
+    iaudiox5,iaudiom5: "PLAY hosszan - megszakít"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV - megszakít"
     gigabeats: "VISSZA - megszakít"
-    gigabeatf: "POWER - megszakít"
+    gigabeatfx: "POWER - megszakít"
   </dest>
   <voice>
     *: ""
@@ -8643,19 +8643,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Top off charge"
+    archosrecorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10471,7 +10471,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11395,15 +11395,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Érintőpad érzékenysége"
+    gigabeatfx: "Érintőpad érzékenysége"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -12210,15 +12210,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Magas"
+    gigabeatfx: "Magas"
   </dest>
   <voice>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 012e7a670e..da99edb918 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -2193,15 +2193,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Lijn ingang"
+    recording,archosplayer: "Lijn ingang"
   </dest>
   <voice>
     *: none
-    recording,player: "Lijn ingang"
+    recording,archosplayer: "Lijn ingang"
   </voice>
 </phrase>
 <phrase>
@@ -2447,17 +2447,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfoon"
-    h100,h120,h300: "Interne microfoon"
+    iriverh100,iriverh120,iriverh300: "Interne microfoon"
   </dest>
   <voice>
     *: none
     recording: "Microfoon"
-    h100,h120,h300: "Interne microfoon"
+    iriverh100,iriverh120,iriverh300: "Interne microfoon"
   </voice>
 </phrase>
 <phrase>
@@ -3309,7 +3309,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3323,7 +3323,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3337,7 +3337,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4342,19 +4342,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batterij: Vol Laden"
+    archosrecorder: "Batterij: Vol Laden"
   </dest>
   <voice>
     *: none
-    recorder: "Batterij vol laden"
+    archosrecorder: "Batterij vol laden"
   </voice>
 </phrase>
 <phrase>
@@ -4380,13 +4380,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterij niveau"
@@ -4444,19 +4444,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "Multimedia kaart"
   </voice>
 </phrase>
@@ -4589,27 +4589,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = terugzetten"
     mrobe500: "POWER = terugzetten"
-    h100,h120,h300: "STOP = terugzetten"
-    ipod*,c200*: "MENU = terugzetten"
-    x5,m5: "RECORD = terugzetten"
-    h10,h10_5gb,e200*,fuze*: "PREV = terugzetten"
-    gigabeatf: "POWER = terugzetten"
+    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
+    ipod*,sansac200*: "MENU = terugzetten"
+    iaudiox5,iaudiom5: "RECORD = terugzetten"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
+    gigabeatfx: "POWER = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
     gigabeats: "BACK = terugzetten"
-    sa9200: "LINKS = terugzetten"
+    gogearsa9200: "LINKS = terugzetten"
   </dest>
   <voice>
     *: ""
@@ -4690,16 +4690,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "De schijf is vol. Druk OFF om door te gaan."
-    h100,h120,h300: "De schijf is vol. Druk STOP om door te gaan."
-    m5,x5: "De schijf is vol. Druk POWER om door te gaan."
-    e200*,c200*: "De schijf is vol. Druk PREV om door te gaan."
+    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk STOP om door te gaan."
+    iaudiom5,iaudiox5: "De schijf is vol. Druk POWER om door te gaan."
+    sansae200*,sansac200*: "De schijf is vol. Druk PREV om door te gaan."
   </dest>
   <voice>
     *: ""
@@ -4866,21 +4866,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Instellen OFF=Afbreken"
     ipod*: "SELECT=Instellen MENU=Afbreken"
-    h10,h10_5gb: "SELECT=Instellen PREV=Afbreken"
+    iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken"
     gigabeats: "SELECT=Instellen POWER=Afbreken"
   </dest>
   <voice>
     *: none
     alarm: "PLAY=Instellen OFF=Afbreken"
     ipod*: "SELECT=Instellen MENU=Afbreken"
-    h10,h10_5gb: "SELECT=Instellen PREV=Afbreken"
+    iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken"
     gigabeats: "SELECT=Instellen POWER=Afbreken"
   </voice>
 </phrase>
@@ -7395,25 +7395,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF om af te breken"
-    player,h100,h120,h300: "STOP om af te breken"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP om af te breken"
     ipod*: "PLAY/PAUSE om af te breken"
-    x5,m5: "Long PLAY om af te breken"
-    h10,h10_5gb,e200*,c200*: "PREV om af te breken"
+    iaudiox5,iaudiom5: "Long PLAY om af te breken"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV om af te breken"
     gigabeats: "BACK om af te breken"
-    gigabeatf: "POWER om af te breken"
+    gigabeatfx: "POWER om af te breken"
   </dest>
   <voice>
     *: ""
@@ -8808,7 +8808,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9963,19 +9963,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Aanmaken van database... %d gevonden (OFF = terug)"
-    h100,h120,h300: "Aanmaken van database... %d gevonden (STOP = terug)"
+    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
     ipod*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    x5,m5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    sa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Aanmaken van database... %d gevonden (PREV = terug)"
+    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
   </dest>
   <voice>
     *: "Aanmaken van database"
@@ -10283,17 +10283,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    fuze*,e200*: "Wiel Licht Vertraging"
+    sansafuze*,sansae200*: "Wiel Licht Vertraging"
   </dest>
   <voice>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    fuze*,e200*: "Wiel Licht Vertraging"
+    sansafuze*,sansae200*: "Wiel Licht Vertraging"
   </voice>
 </phrase>
 <phrase>
@@ -10485,11 +10485,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffergrootte"
@@ -10533,16 +10533,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
     cowond2*: "MENU = Ja"
-    h100,h120,h300: "NAVI = Ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip,fuze*: "SELECT = Ja"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip,sansafuze*: "SELECT = Ja"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -10556,20 +10556,20 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Instellen"
     mrobe500: "HEART = Instellen"
-    h100,h120,h300: "NAVI = Instellen"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Instellen"
+    iriverh100,iriverh120,iriverh300: "NAVI = Instellen"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Instellen"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,gigabeatf: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,gigabeatfx: ""
   </voice>
 </phrase>
 <phrase>
@@ -10578,15 +10578,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Elke andere = Nee"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10640,11 +10640,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Einde van de titellijst"
-    player: "Einde lijst"
+    archosplayer: "Einde lijst"
   </dest>
   <voice>
     *: "Einde lijst"
@@ -11692,15 +11692,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Touchpad gevoeligheid"
+    gigabeatfx: "Touchpad gevoeligheid"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad gevoeligheid"
+    gigabeatfx: "Touchpad gevoeligheid"
   </voice>
 </phrase>
 <phrase>
@@ -11709,15 +11709,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Hoog"
+    gigabeatfx: "Hoog"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Hoog"
+    gigabeatfx: "Hoog"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index c9771161da..65b7d5905f 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -2145,15 +2145,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linje inn"
+    recording,archosplayer: "Linje inn"
   </dest>
   <voice>
     *: none
-    recording,player: "Linje inn"
+    recording,archosplayer: "Linje inn"
   </voice>
 </phrase>
 <phrase>
@@ -2399,17 +2399,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -3256,7 +3256,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3270,7 +3270,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3284,7 +3284,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4285,15 +4285,15 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batteri: Top-off-lading"
+    archosrecorder: "Batteri: Top-off-lading"
   </dest>
   <voice>
     *: none
@@ -4321,12 +4321,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -4382,12 +4382,12 @@
   user: core
   <source>
     *: none
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
   </dest>
   <voice>
     *: none
@@ -4518,22 +4518,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*,sa9200: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "A = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "A = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "AV = tilbakestill"
-    h100,h120,h300: "STOPP = tilbakestill"
-    ipod*,c200*,sa9200: "MENY = tilbakestill"
-    x5,m5: "OPPTAK = tilbakestill"
-    h10,h10_5gb,e200*,fuze*: "TILBAKE = tilbakestill"
-    gigabeatf: "A = tilbakestill"
+    iriverh100,iriverh120,iriverh300: "STOPP = tilbakestill"
+    ipod*,sansac200*,gogearsa9200: "MENY = tilbakestill"
+    iaudiox5,iaudiom5: "OPPTAK = tilbakestill"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "TILBAKE = tilbakestill"
+    gigabeatfx: "A = tilbakestill"
     mrobe100: "VIS = tilbakestill"
     gigabeats: "TILBAKE = tilbakestill"
   </dest>
@@ -4614,14 +4614,14 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press UP 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 UP to continue."
   </source>
   <dest>
     *: none
     recording: "Disken er full. Trykk AV for å halda fram."
-    h100,h120,h300: "Disken er full. Trykk STOPP for å halda fram."
+    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOPP for å halda fram."
   </dest>
   <voice>
     *: none
@@ -4784,14 +4784,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPEL = vel – AV = avbryt"
     ipod*: "VEL = vel  – MENY = avbryt"
-    h10,h10_5gb: "VEL = vel – TILBAKE = avbryt"
+    iriverh10,iriverh10_5gb: "VEL = vel – TILBAKE = avbryt"
     gigabeats: "VEL = vel – PÅ/AV = avbryt"
   </dest>
   <voice>
@@ -7277,21 +7277,21 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
   </source>
   <dest>
     *: "AV for å avbryta"
-    player,h100,h120,h300: "STOPP for å avbryta"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOPP for å avbryta"
     ipod*: "SPEL/PAUSE for å avbryta"
-    x5,m5: "SPEL (lenge) for å avbryta"
-    h10,h10_5gb,e200*,c200*: "TILBAKE for å avbryta"
+    iaudiox5,iaudiom5: "SPEL (lenge) for å avbryta"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "TILBAKE for å avbryta"
   </dest>
   <voice>
     *: ""
@@ -8591,7 +8591,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9688,17 +9688,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Byggjer database … Fann %d. (AV for å gå tilbake.)"
-    h100,h120,h300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)"
+    iriverh100,iriverh120,iriverh300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)"
     ipod*: "Byggjer database … Fann %d. (SPEL/PAUSE for å gå tilbake.)"
-    x5,m5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)"
   </dest>
   <voice>
     *: "oppføringar funne til databasen"
@@ -9871,17 +9871,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Avbrotstid for knappelys"
-    fuze*,e200*: "Avbrotstid for hjullys"
+    sansafuze*,sansae200*: "Avbrotstid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Avbrotstid for knappelys"
-    fuze*,e200*: "Avbrotstid for hjullys"
+    sansafuze*,sansae200*: "Avbrotstid for hjullys"
   </voice>
 </phrase>
 <phrase>
@@ -10149,11 +10149,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: ""
@@ -10227,15 +10227,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPEL = ja"
-    h100,h120,h300: "NAVI = ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "VEL = ja"
-    player: "(SPEL/STOPP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "VEL = ja"
+    archosplayer: "(SPEL/STOPP)"
   </dest>
   <voice>
     *: ""
@@ -10248,14 +10248,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "PÅ = vel"
-    h100,h120,h300: "NAVI = vel"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "VEL = ja"
+    iriverh100,iriverh120,iriverh300: "NAVI = vel"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "VEL = ja"
   </dest>
   <voice>
     *: none
@@ -10267,15 +10267,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Andre = nei"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10416,15 +10416,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Slutt på songliste"
-    player: "Slutt på liste"
+    archosplayer: "Slutt på liste"
   </dest>
   <voice>
     *: "Slutt på songliste"
-    player: "Slutt på liste"
+    archosplayer: "Slutt på liste"
   </voice>
 </phrase>
 <phrase>
@@ -11413,15 +11413,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Styreputefølsemd"
+    gigabeatfx: "Styreputefølsemd"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Styreputefølsemd"
+    gigabeatfx: "Styreputefølsemd"
   </voice>
 </phrase>
 <phrase>
@@ -11827,14 +11827,14 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Høg"
+    gigabeatfx: "Høg"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Høg"
+    gigabeatfx: "Høg"
   </voice>
 </phrase>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index e55ab1488a..e1074e8001 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -1836,15 +1836,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linjeinngang"
+    recording,archosplayer: "Linjeinngang"
   </dest>
   <voice>
     *: none
-    recording,player: "Linjeinngang"
+    recording,archosplayer: "Linjeinngang"
   </voice>
 </phrase>
 <phrase>
@@ -2090,17 +2090,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2785,7 +2785,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -2799,7 +2799,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -2813,7 +2813,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3644,19 +3644,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batteri: top-off-lading"
+    archosrecorder: "Batteri: top-off-lading"
   </dest>
   <voice>
     *: none
-    recorder: "Batteri top-off-lading"
+    archosrecorder: "Batteri top-off-lading"
   </voice>
 </phrase>
 <phrase>
@@ -3682,18 +3682,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: ""
-    h10,ipodmini,ipodmini2g: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
 <phrase>
@@ -3748,19 +3748,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "mikro S D"
+    sansae200*,sansac200*,sansafuze*: "mikro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -3892,28 +3892,28 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Tilbakestill"
-    h100,h120,h300: "STOP = Tilbakestill"
-    ipod*,c200*,sa9200: "MENU = Tilbakestill"
-    x5,m5: "RECORD = Tilbakestill"
-    h10,h10_5gb,e200*,fuze*: "PREV = Tilbakestill"
-    gigabeatf: "POWER = Tilbakestill"
+    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
+    ipod*,sansac200*,gogearsa9200: "MENU = Tilbakestill"
+    iaudiox5,iaudiom5: "RECORD = Tilbakestill"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
+    gigabeatfx: "POWER = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
     gigabeats: "BACK = Tilbakestill"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3991,20 +3991,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disken er full. Trykk OFF for å fortsette."
-    h100,h120,h300: "Disken er full. Trykk STOP for å fortsette."
-    m5,x5: "Disken er full. Trykk POWER for å fortsette."
-    e200*,c200*: "Disken er full. Trykk PREV for å fortsette."
+    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å fortsette."
+    iaudiom5,iaudiox5: "Disken er full. Trykk POWER for å fortsette."
+    sansae200*,sansac200*: "Disken er full. Trykk PREV for å fortsette."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4168,21 +4168,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Sett OFF=Avbryt"
     ipod*: "SELECT=Sett MENU=Avbryt"
-    h10,h10_5gb: "SELECT=Sett PREV=Avbryt"
+    iriverh10,iriverh10_5gb: "SELECT=Sett PREV=Avbryt"
     gigabeats: "SELECT=Sett POWER=Avbryt"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6604,25 +6604,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF for å avbryte"
-    player,h100,h120,h300: "STOP for å avbryte"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
     ipod*: "PLAY/PAUSE for å avbryte"
-    x5,m5: "Hold PLAY for å avbryte"
-    h10,h10_5gb,e200*,c200*: "PREV for å avbryte"
+    iaudiox5,iaudiom5: "Hold PLAY for å avbryte"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV for å avbryte"
     gigabeats: "BACK for å avbryte"
-    gigabeatf: "POWER for å avbryte"
+    gigabeatfx: "POWER for å avbryte"
   </dest>
   <voice>
     *: "" 
@@ -8398,7 +8398,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9757,17 +9757,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Bygger database... %d funnet (OFF for å gå tilbake)"
-    h100,h120,h300: "Bygger database... %d funnet (STOP for å gå tilbake)"
+    iriverh100,iriverh120,iriverh300: "Bygger database... %d funnet (STOP for å gå tilbake)"
     ipod*: "Bygger database... %d funnet (PREV for å gå tilbake)"
-    x5,m5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Bygger database... %d funnet (PREV for å gå tilbake)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Bygger database... %d funnet (PREV for å gå tilbake)"
   </dest>
   <voice>
     *: "filer funnet for database"
@@ -10030,17 +10030,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Slukketid for knapplys"
-    fuze*,e200*: "Slukketid for hjullys"
+    sansafuze*,sansae200*: "Slukketid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Tid før lys på knapper slukker"
-    fuze*,e200*: "Tid før lys på hjul slukker"
+    sansafuze*,sansae200*: "Tid før lys på hjul slukker"
   </voice>
 </phrase>
 <phrase>
@@ -10432,15 +10432,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Bufferstørrelse"
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -10511,21 +10511,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Ja"
-    h100,h120,h300: "NAVI = Ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Ja"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Ja"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    h100,h120,h300: ""
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
-    player: ""
+    iriverh100,iriverh120,iriverh300: ""
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -10535,20 +10535,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Sett"
-    h100,h120,h300: "NAVI = Sett"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Sett"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sett"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Sett"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -10557,15 +10557,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Andre = Nei"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -10737,15 +10737,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Slutt på sporliste"
-    player: "Slutt på liste"
+    archosplayer: "Slutt på liste"
   </dest>
   <voice>
     *: "Slutt på sporliste"
-    player: "Slutt på liste"
+    archosplayer: "Slutt på liste"
   </voice>
 </phrase>
 <phrase>
@@ -11511,15 +11511,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Styreflatefølsomhet"
+    gigabeatfx: "Styreflatefølsomhet"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -11792,15 +11792,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Høy"
+    gigabeatfx: "Høy"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Høy"
+    gigabeatfx: "Høy"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 2a72aa36e8..23f3d12111 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -269,17 +269,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Tak"
     covond2*: "MENU = Tak"
-    h100,h120,h300: "NAVI = Tak"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Tak"
+    iriverh100,iriverh120,iriverh300: "NAVI = Tak"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Tak"
     mrobe500: "PLAY lub POWER = Tak"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -291,15 +291,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Każdy inny = Nie"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2392,19 +2392,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Budowanie biblioteki... %d znalezionych (OFF żeby wrócić)"
-    h100,h120,h300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)"
+    iriverh100,iriverh120,iriverh300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)"
     ipod*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
-    x5,m5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
-    sa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)"
+    gogearsa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)"
   </dest>
   <voice>
     *: "Znaleziono wpisy do biblioteki"
@@ -3204,7 +3204,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3218,7 +3218,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3232,7 +3232,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3864,17 +3864,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Wygaszanie klawiszy"
-    fuze*,e200*: "Wygaszanie koła sterującego"
+    sansafuze*,sansae200*: "Wygaszanie koła sterującego"
   </dest>
   <voice>
     *: none
     button_light: "Wygaszanie klawiszy"
-    fuze*,e200*: "Wygaszanie koła sterującego"
+    sansafuze*,sansae200*: "Wygaszanie koła sterującego"
   </voice>
 </phrase>
 <phrase>
@@ -4156,21 +4156,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ustaw"
     mrobe500: "HEART = Ustaw"
-    h100,h120,h300: "NAVI = Ustaw"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ustaw"
-    sa9200:"PLAY = Ustaw"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ustaw"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ustaw"
+    gogearsa9200:"PLAY = Ustaw"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4181,31 +4181,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Przywróć"
     mrobe500: "POWER = Przywróć"
-    h100,h120,h300: "STOP = Przywróć"
-    ipod*,c200*: "MENU = Przywróć"
-    x5,m5: "RECORD = Przywróć"
-    h10,h10_5gb,e200*,fuze*: "PREV = Przywróć"
-    gigabeatf: "POWER = Przywróć"
+    iriverh100,iriverh120,iriverh300: "STOP = Przywróć"
+    ipod*,sansac200*: "MENU = Przywróć"
+    iaudiox5,iaudiom5: "RECORD = Przywróć"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Przywróć"
+    gigabeatfx: "POWER = Przywróć"
     mrobe100: "DISPLAY = Przywróć"
     gigabeats: "BACK = Przywróć"
-    sa9200: "LEFT = Przywróć"
+    gogearsa9200: "LEFT = Przywróć"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4728,21 +4728,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Ustaw OFF=Anuluj"
     ipod*: "WYBIERZ=Ustaw MENU=Anuluj"
-    h10,h10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj"
+    iriverh10,iriverh10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj"
     gigabeats: "WYBIERZ=Ustaw POWER=Anuluj"
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -5913,17 +5913,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Wewnętrzny mikrofon"
+    iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Wewnętrzny mikrofon"
+    iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5949,15 +5949,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Wejście liniowe"
+    recording,archosplayer: "Wejście liniowe"
   </dest>
   <voice>
     *: none
-    recording,player: "Wejście liniowe"
+    recording,archosplayer: "Wejście liniowe"
   </voice>
 </phrase>
 <phrase>
@@ -6887,11 +6887,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Bufor:"
-    player: "Bufor:"
+    archosplayer: "Bufor:"
   </dest>
   <voice>
     *: "Rozmiar bufora"
@@ -6903,13 +6903,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bateria: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bateria: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Poziom baterii"
@@ -6967,19 +6967,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "microSD:"
+    sansae200*,sansac200*,sansafuze*: "microSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "ha de 1"
-    e200*,c200*,fuze*: "mikro es di"
+    sansae200*,sansac200*,sansafuze*: "mikro es di"
     ondio*: "em em ce"
   </voice>
 </phrase>
@@ -8091,15 +8091,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Koniec listy piosenek"
-    player: "Koniec listy"
+    archosplayer: "Koniec listy"
   </dest>
   <voice>
     *: "Koniec listy piosenek"
-    player: "Koniec listy"
+    archosplayer: "Koniec listy"
   </voice>
 </phrase>
 <phrase>
@@ -8339,16 +8339,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Pamięć jest pełna. Wciśnij OFF żeby kontynuować."
-    h100,h120,h300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować."
-    m5,x5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować."
-    e200*,c200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować."
+    iriverh100,iriverh120,iriverh300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować."
+    iaudiom5,iaudiox5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować."
+    sansae200*,sansac200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować."
   </dest>
   <voice>
     *: none
@@ -8435,25 +8435,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF = Anuluj"
-    player,h100,h120,h300: "STOP = Anuluj"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Anuluj"
     ipod*: "PLAY/PAUSE = Anuluj"
-    x5,m5: "Przytrzymaj PLAY = Anuluj"
-    h10,h10_5gb,e200*,c200*: "PREV = Anuluj"
+    iaudiox5,iaudiom5: "Przytrzymaj PLAY = Anuluj"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Anuluj"
     gigabeats: "BACK = Anuluj"
-    gigabeatf: "POWER = Anuluj"
+    gigabeatfx: "POWER = Anuluj"
   </dest>
   <voice>
     *: ""
@@ -8677,19 +8677,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Bateria: doładowywanie"
+    archosrecorder: "Bateria: doładowywanie"
   </dest>
   <voice>
     *: none
-    recorder: "Doładowywanie baterii"
+    archosrecorder: "Doładowywanie baterii"
   </voice>
 </phrase>
 <phrase>
@@ -10506,7 +10506,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11717,15 +11717,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Czułość panelu dotykowego"
+    gigabeatfx: "Czułość panelu dotykowego"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Czułość panelu dotykowego"
+    gigabeatfx: "Czułość panelu dotykowego"
   </voice>
 </phrase>
 <phrase>
@@ -11734,15 +11734,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Wysoka"
+    gigabeatfx: "Wysoka"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Wysoka"
+    gigabeatfx: "Wysoka"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 1a13983770..4d50102383 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -261,16 +261,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sim"
     cowond2*: "MENU = Sim"
-    h100,h120,h300: "NAVI = Sim"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sim"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -282,15 +282,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Algum Outro = Não"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2383,17 +2383,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construindo Base de Dados... %d encontrados (OFF para retornar)"
-    h100,h120,h300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
+    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
     ipod*: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
-    x5,m5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
   </dest>
   <voice>
     *: "entradas encontradas para a base de dados"
@@ -3193,7 +3193,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3207,7 +3207,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3221,7 +3221,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3853,17 +3853,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Duração da Luz do Botão"
-    fuze*,e200*: "Duração da Luz da Roda"
+    sansafuze*,sansae200*: "Duração da Luz da Roda"
   </dest>
   <voice>
     *: none
     button_light: "Duração da Luz do Botão"
-    fuze*,e200*: "Duração da Luz da Roda"
+    sansafuze*,sansae200*: "Duração da Luz da Roda"
   </voice>
 </phrase>
 <phrase>
@@ -4145,21 +4145,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Ajustar"
     mrobe500: "HEART = Ajustar"
-    h100,h120,h300: "NAVI = Ajustar"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ajustar"
-    sa9200: "PLAY = Ajustar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ajustar"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ajustar"
+    gogearsa9200: "PLAY = Ajustar"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4170,31 +4170,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Reverter"
     mrobe500: "POWER = Reverter"
-    h100,h120,h300: "STOP = Reverter"
-    ipod*,c200*: "MENU = Reverter"
-    x5,m5: "RECORD = Reverter"
-    h10,h10_5gb,e200*,fuze*: "PREV = Reverter"
-    gigabeatf: "POWER = Reverter"
+    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
+    ipod*,sansac200*: "MENU = Reverter"
+    iaudiox5,iaudiom5: "RECORD = Reverter"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter"
+    gigabeatfx: "POWER = Reverter"
     mrobe100: "DISPLAY = Reverter"
     gigabeats: "BACK = Reverter"
-    sa9200: "LEFT = Reverter"
+    gogearsa9200: "LEFT = Reverter"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4717,14 +4717,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
-    h10,h10_5gb: "SELECT=Alterar PREV=Cancelar"
+    iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
     gigabeats: "SELECT=Alterar POWER=Cancelar"
   </dest>
   <voice>
@@ -5899,17 +5899,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfone"
-    h100,h120,h300: "Microfone Interno"
+    iriverh100,iriverh120,iriverh300: "Microfone Interno"
   </dest>
   <voice>
     *: none
     recording: "Microfone"
-    h100,h120,h300: "Microfone Interno"
+    iriverh100,iriverh120,iriverh300: "Microfone Interno"
   </voice>
 </phrase>
 <phrase>
@@ -5935,15 +5935,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Entrada de Linha"
+    recording,archosplayer: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,player: "Entrada de Linha"
+    recording,archosplayer: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -6873,11 +6873,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Tamanho do buffer"
@@ -6889,13 +6889,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível da bateria"
@@ -6953,19 +6953,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8077,11 +8077,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fim da Lista de Músicas"
-    player: "Fim da Lista"
+    archosplayer: "Fim da Lista"
   </dest>
   <voice>
     *: "Fim da Lista de Músicas"
@@ -8324,20 +8324,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "O disco está cheio. Pressione OFF para continuar."
-    h100,h120,h300: "O disco está cheio. Pressione STOP para continuar."
-    m5,x5: "O disco está cheio. Pressione POWER para continuar."
-    e200*,c200*: "O disco está cheio. Pressione PREV para continuar."
+    iriverh100,iriverh120,iriverh300: "O disco está cheio. Pressione STOP para continuar."
+    iaudiom5,iaudiox5: "O disco está cheio. Pressione POWER para continuar."
+    sansae200*,sansac200*: "O disco está cheio. Pressione PREV para continuar."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8421,25 +8421,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF para abortar"
-    player,h100,h120,h300: "STOP para abortar"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar"
     ipod*: "PLAY/PAUSE para abortar"
-    x5,m5: "PLAY Longo para abortar"
-    h10,h10_5gb,e200*,c200*: "PREV para abortar"
+    iaudiox5,iaudiom5: "PLAY Longo para abortar"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para abortar"
     gigabeats: "BACK para abortar"
-    gigabeatf: "POWER para abortar"
+    gigabeatfx: "POWER para abortar"
   </dest>
   <voice>
     *: ""
@@ -8663,19 +8663,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Bateria: Carregamento Completado"
+    archosrecorder: "Bateria: Carregamento Completado"
   </dest>
   <voice>
     *: none
-    recorder: "Máximo da carga"
+    archosrecorder: "Máximo da carga"
   </voice>
 </phrase>
 <phrase>
@@ -10492,7 +10492,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11703,15 +11703,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilidade do Touchpad"
+    gigabeatfx: "Sensibilidade do Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilidade do Touchpad"
+    gigabeatfx: "Sensibilidade do Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11720,15 +11720,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 35a3552a2f..3544f1c3c1 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -2073,15 +2073,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Entrada de Linha"
+    recording,archosplayer: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,player: "Entrada de Linha"
+    recording,archosplayer: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -2299,17 +2299,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfone"
-    h100,h120,h300: "Microfone Interno"
+    iriverh100,iriverh120,iriverh300: "Microfone Interno"
   </dest>
   <voice>
     *: none
     recording: "Microfone"
-    h100,h120,h300: "Microfone Interno"
+    iriverh100,iriverh120,iriverh300: "Microfone Interno"
   </voice>
 </phrase>
 <phrase>
@@ -3113,7 +3113,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3127,7 +3127,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3141,7 +3141,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -4028,19 +4028,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Bateria: Carregamento Completo"
+    archosrecorder: "Bateria: Carregamento Completo"
   </dest>
   <voice>
     *: none
-    recorder: "Bateria: Carregamento Completado"
+    archosrecorder: "Bateria: Carregamento Completado"
   </voice>
 </phrase>
 <phrase>
@@ -4066,13 +4066,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível de bateria"
@@ -4130,19 +4130,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -4257,22 +4257,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF Para Reverter"
-    h100,h120,h300: "STOP Para Reverter"
-    ipod*,c200*,sa9200: "MENU Para Reverter"
-    x5,m5: "RECORD Para Reverter"
-    h10,h10_5gb,e200*,fuze*: "PREV Para Reverter"
-    gigabeatf: "POWER Para Reverter"
+    iriverh100,iriverh120,iriverh300: "STOP Para Reverter"
+    ipod*,sansac200*,gogearsa9200: "MENU Para Reverter"
+    iaudiox5,iaudiom5: "RECORD Para Reverter"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV Para Reverter"
+    gigabeatfx: "POWER Para Reverter"
     mrobe100: "DISPLAY Para Reverter"
     gigabeats: "BACK Para Reverter"
   </dest>
@@ -4372,16 +4372,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "O Disco Está Cheio. Carregue OFF Para Continuar"
-    h100,h120,h300: "O Disco Está Cheio. Carregue STOP Para Continuar"
-    m5,x5: "O Disco Está Cheio. Carregue POWER Para Continuar"
-    e200*,c200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
+    iriverh100,iriverh120,iriverh300: "O Disco Está Cheio. Carregue STOP Para Continuar"
+    iaudiom5,iaudiox5: "O Disco Está Cheio. Carregue POWER Para Continuar"
+    sansae200*,sansac200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
   </dest>
   <voice>
     *: none
@@ -4566,14 +4566,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
-    h10,h10_5gb: "SELECT=Alterar PREV=Cancelar"
+    iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
     gigabeats: "SELECT=Alterar POWER=Cancelar"
   </dest>
   <voice>
@@ -7001,24 +7001,24 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF para Abortar"
-    player,h100,h120,h300: "STOP para Abortar"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para Abortar"
     ipod*: "PLAY/PAUSE para Abortar"
-    h10,h10_5gb,e200*,c200*: "PREV para Abortar"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para Abortar"
     gigabeats: "BACK para Abortar"
-    gigabeatf: "POWER para Abortar"
+    gigabeatfx: "POWER para Abortar"
   </dest>
   <voice>
     *: ""
@@ -7809,7 +7809,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8258,11 +8258,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "tamanho do buffer"
@@ -8367,15 +8367,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sim"
-    h100,h120,h300: "NAVI = Sim"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sim"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -8388,14 +8388,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Definir"
-    h100,h120,h300: "NAVI = Definir"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Definir"
+    iriverh100,iriverh120,iriverh300: "NAVI = Definir"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Definir"
   </dest>
   <voice>
     *: none
@@ -8407,15 +8407,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Any Other = Não"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -8703,15 +8703,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Fim da Lista de Músicas"
-    player: "Fim da Lista"
+    archosplayer: "Fim da Lista"
   </dest>
   <voice>
     *: "Fim da Lista de Músicas"
-    player: "Fim da Lista"
+    archosplayer: "Fim da Lista"
   </voice>
 </phrase>
 <phrase>
@@ -10731,17 +10731,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construindo Base da Dados... %d encontrado (OFF para voltar)"
-    h100,h120,h300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
+    iriverh100,iriverh120,iriverh300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
     ipod*: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
-    x5,m5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -10936,15 +10936,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensitividade do Touchpad"
+    gigabeatfx: "Sensitividade do Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensitividade do Touchpad"
+    gigabeatfx: "Sensitividade do Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11460,15 +11460,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Alto"
+    gigabeatfx: "Alto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index bccb52f73f..a558eea42d 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -759,17 +759,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfon"
-    h100,h120,h300: "Microfon intern"
+    iriverh100,iriverh120,iriverh300: "Microfon intern"
   </dest>
   <voice>
     *: none
     recording: "Microfon"
-    h100,h120,h300: "Microfon intern"
+    iriverh100,iriverh120,iriverh300: "Microfon intern"
   </voice>
 </phrase>
 <phrase>
@@ -1411,19 +1411,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Nivel maxim de incarcare"
+    archosrecorder: "Nivel maxim de incarcare"
   </dest>
   <voice>
     *: none
-    recorder: ""
+    archosrecorder: ""
   </voice>
 </phrase>
 <phrase>
@@ -1449,13 +1449,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: ""
@@ -1516,22 +1516,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF pentru anulare"
-    h100,h120,h300: "STOP pentru anulare"
-    ipod*,c200*,sa9200: "MENU pentru anulare"
-    x5,m5: "RECORD pentru anulare"
-    h10,h10_5gb,e200*,fuze*: "PREV pentru anulare"
-    gigabeatf: "POWER pentru anulare"
+    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
+    ipod*,sansac200*,gogearsa9200: "MENU pentru anulare"
+    iaudiox5,iaudiom5: "RECORD pentru anulare"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV pentru anulare"
+    gigabeatfx: "POWER pentru anulare"
     mrobe100: "DISPLAY pentru anulare"
     gigabeats: "BACK  pentru anulare"
   </dest>
@@ -1666,14 +1666,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Setat OFF=Anulare"
     ipod*: "SELECT=Setat MENU=Anulare"
-    h10,h10_5gb: "SELECT=Setat PREV=Anulare"
+    iriverh10,iriverh10_5gb: "SELECT=Setat PREV=Anulare"
     gigabeats: "SELECT=Setat POWER=Anulare"
   </dest>
   <voice>
@@ -3226,17 +3226,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Creare bază de date... %d găsite (OFF pentru revenire)"
-    h100,h120,h300: "Creare bază de date... %d găsite (STOP pentru revenire)"
+    iriverh100,iriverh120,iriverh300: "Creare bază de date... %d găsite (STOP pentru revenire)"
     ipod*: "Creare bază de date... %d găsite (PREV pentru revenire)"
-    x5,m5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Creare bază de date... %d găsite (PREV pentru revenire)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Creare bază de date... %d găsite (PREV pentru revenire)"
   </dest>
   <voice>
     *: "intrări găsite pentru baza de date"
@@ -3757,7 +3757,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4905,23 +4905,23 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Discul este plin. Apasati OFF pentru a continua."
-    h100,h120,h300: "Discul este plin. Apasati STOP pentru a continua."
-    m5,x5: "Discul este plin. Apasati POWER pentru a continua."
-    e200*,c200*: "Discul este plin. Apasati PREV pentru a continua."
+    iriverh100,iriverh120,iriverh300: "Discul este plin. Apasati STOP pentru a continua."
+    iaudiom5,iaudiox5: "Discul este plin. Apasati POWER pentru a continua."
+    sansae200*,sansac200*: "Discul este plin. Apasati PREV pentru a continua."
   </dest>
   <voice>
     *: none
     recording: ""
-    h100,h120,h300: ""
-    m5,x5: ""
-    e200*,c200*: ""
+    iriverh100,iriverh120,iriverh300: ""
+    iaudiom5,iaudiox5: ""
+    sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5012,15 +5012,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -5243,15 +5243,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Da"
-    h100,h120,h300: "NAVI = Da"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Da"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Da"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Da"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -5278,14 +5278,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Setat"
-    h100,h120,h300: "NAVI = Setat"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Setat"
+    iriverh100,iriverh120,iriverh300: "NAVI = Setat"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Setat"
   </dest>
   <voice>
     *: none
@@ -5297,15 +5297,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Oricare altul = Nu"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -5668,25 +5668,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF pentru anulare"
-    player,h100,h120,h300: "STOP pentru anulare"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
     ipod*: "PLAY/PAUSE pentru anulare"
-    x5,m5: "PLAY (apasare lunga) pentru anulare"
-    h10,h10_5gb,e200*,c200*: "PREV pentru anulare"
+    iaudiox5,iaudiom5: "PLAY (apasare lunga) pentru anulare"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pentru anulare"
     gigabeats: "BACK pentru anulare"
-    gigabeatf: "POWER pentru anulare"
+    gigabeatfx: "POWER pentru anulare"
   </dest>
   <voice>
     *: ""
@@ -5965,11 +5965,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Sfarsit lista melodii"
-    player: "Sfarsit lista"
+    archosplayer: "Sfarsit lista"
   </dest>
   <voice>
     *: "End of Song List"
@@ -6827,7 +6827,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -6872,7 +6872,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -7885,15 +7885,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Intrare"
+    recording,archosplayer: "Intrare"
   </dest>
   <voice>
     *: none
-    recording,player: "Intrare"
+    recording,archosplayer: "Intrare"
   </voice>
 </phrase>
 <phrase>
@@ -8982,19 +8982,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -10287,17 +10287,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Timp iluminare butoane"
-    fuze*,e200*: "Timp iluminare rotita"
+    sansafuze*,sansae200*: "Timp iluminare rotita"
   </dest>
   <voice>
     *: none
     button_light: "Timp iluminare butoane"
-    fuze*,e200*: "Timp iluminare rotita"
+    sansafuze*,sansae200*: "Timp iluminare rotita"
   </voice>
 </phrase>
 <phrase>
@@ -10547,7 +10547,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -11544,15 +11544,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensibilitate Touchpad"
+    gigabeatfx: "Sensibilitate Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensibilitate Touchpad"
+    gigabeatfx: "Sensibilitate Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11947,15 +11947,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Mare"
+    gigabeatfx: "Mare"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Mare"
+    gigabeatfx: "Mare"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index d045a19621..bb1447385f 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -2051,15 +2051,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Линейный вход"
+    recording,archosplayer: "Линейный вход"
   </dest>
   <voice>
     *: none
-    recording,player: "Линейный вход"
+    recording,archosplayer: "Линейный вход"
   </voice>
 </phrase>
 <phrase>
@@ -2305,17 +2305,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрофон"
-    h100,h120,h300: "Внутренний микрофон"
+    iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
   </dest>
   <voice>
     *: none
     recording: "Микрофон"
-    h100,h120,h300: "Внутренний микрофон"
+    iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -3068,7 +3068,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3082,7 +3082,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3096,7 +3096,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3986,19 +3986,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Аккумулятор: Выше возможного"
+    archosrecorder: "Аккумулятор: Выше возможного"
   </dest>
   <voice>
     *: none
-    recorder: "Аккумулятор: Выше возможного"
+    archosrecorder: "Аккумулятор: Выше возможного"
   </voice>
 </phrase>
 <phrase>
@@ -4024,13 +4024,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм"
-    h10,ipodmini,ipodmini2g: "%d%% %dч %dм"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
+    iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм"
   </dest>
   <voice>
     *: "Заряд аккумулятора"
@@ -4088,19 +4088,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Эйч Ди 1"
-    e200*,c200*,fuze*: "микро Эс Ди"
+    sansae200*,sansac200*,sansafuze*: "микро Эс Ди"
     ondio*: "Эм Эм Си"
   </voice>
 </phrase>
@@ -4232,22 +4232,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "ВЫКЛ. = Отмена"
-    h100,h120,h300: "СТОП = Отмена"
-    ipod*,c200*,sa9200: "МЕНЮ = Отмена"
-    x5,m5: "ЗАПИСЬ = Отмена"
-    h10,h10_5gb,e200*,fuze*: "ПРЕД. = Отмена"
-    gigabeatf: "ВЫКЛ. = Отмена"
+    iriverh100,iriverh120,iriverh300: "СТОП = Отмена"
+    ipod*,sansac200*,gogearsa9200: "МЕНЮ = Отмена"
+    iaudiox5,iaudiom5: "ЗАПИСЬ = Отмена"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПРЕД. = Отмена"
+    gigabeatfx: "ВЫКЛ. = Отмена"
     mrobe100: "ПОКАЗ. = Отмена"
     gigabeats: "НАЗАД = Отмена"
   </dest>
@@ -4330,16 +4330,16 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
-    h100,h120,h300: "Диск заполнен. Нажмите СТОП для продолжения."
-    m5,x5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
-    e200*,c200*: "Диск заполнен. Нажмите ПРЕД. для продолжения."
+    iriverh100,iriverh120,iriverh300: "Диск заполнен. Нажмите СТОП для продолжения."
+    iaudiom5,iaudiox5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
+    sansae200*,sansac200*: "Диск заполнен. Нажмите ПРЕД. для продолжения."
   </dest>
   <voice>
     *: none
@@ -4506,21 +4506,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ВОСПР.=Уст., ВЫКЛ.=Отм."
     ipod*: "ВЫБОР=Уст., МЕНЮ=Отм."
-    h10,h10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм."
+    iriverh10,iriverh10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм."
     gigabeats: "ВЫБОР=Уст., ВЫКЛ.=Отм."
   </dest>
   <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
   </voice>
 </phrase>
@@ -6942,25 +6942,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "ВЫКЛ. для отмены"
-    player,h100,h120,h300: "СТОП для отмены"
+    archosplayer,iriverh100,iriverh120,iriverh300: "СТОП для отмены"
     ipod*: "ПАУЗА для отмены"
-    x5,m5: "ВОСПР. для отмены"
-    h10,h10_5gb,e200*,c200*: "ПРЕД. для отмены"
+    iaudiox5,iaudiom5: "ВОСПР. для отмены"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "ПРЕД. для отмены"
     gigabeats: "НАЗАД для отмены"
-    gigabeatf: "ВЫКЛ. для отмены"
+    gigabeatfx: "ВЫКЛ. для отмены"
   </dest>
   <voice>
     *: ""
@@ -7768,7 +7768,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8136,17 +8136,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Построение базы... %d найдено (ВЫКЛ. для отмены)"
-    h100,h120,h300: "Построение базы... %d найдено (СТОП для отмены)"
+    iriverh100,iriverh120,iriverh300: "Построение базы... %d найдено (СТОП для отмены)"
     ipod*: "Построение базы... %d найдено (ПРЕД. для отмены)"
-    x5,m5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Построение базы... %d найдено (ПРЕД. для отмены)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Построение базы... %d найдено (ПРЕД. для отмены)"
   </dest>
   <voice>
     *: "найдено записей в базе"
@@ -8826,11 +8826,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    player: "Буф:"
+    archosplayer: "Буф:"
   </dest>
   <voice>
     *: "Буфер:"
@@ -8918,21 +8918,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "ВОСПР. = Да"
-    h100,h120,h300: "НАВИГ. = Да"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "ВЫБОР = Да"
-    player: "(ВОСПР./СТОП)"
+    iriverh100,iriverh120,iriverh300: "НАВИГ. = Да"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "ВЫБОР = Да"
+    archosplayer: "(ВОСПР./СТОП)"
   </dest>
   <voice>
     *: ""
-    h100,h120,h300: ""
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
-    player: ""
+    iriverh100,iriverh120,iriverh300: ""
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -8942,20 +8942,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ВКЛ. = Установить"
-    h100,h120,h300: "НАВИГ. = Установить"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "ВЫБОР = Установить"
+    iriverh100,iriverh120,iriverh300: "НАВИГ. = Установить"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "ВЫБОР = Установить"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -8964,15 +8964,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Любая другая = Нет"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -9296,11 +9296,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Конец списка"
-    player: "Конец списка"
+    archosplayer: "Конец списка"
   </dest>
   <voice>
     *: "Конец списка"
@@ -10928,17 +10928,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    fuze*,e200*: "Таймаут подсветки колёсика"
+    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
   </dest>
   <voice>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    fuze*,e200*: "Таймаут подсветки колёсика"
+    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
   </voice>
 </phrase>
 <phrase>
@@ -11589,15 +11589,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Чувствительность тачпада"
+    gigabeatfx: "Чувствительность тачпада"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Чувствительность тачпада"
+    gigabeatfx: "Чувствительность тачпада"
   </voice>
 </phrase>
 <phrase>
@@ -11805,15 +11805,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Высокий"
+    gigabeatfx: "Высокий"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Высокий"
+    gigabeatfx: "Высокий"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index e9688172c5..0badbaa0fe 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (player) the jump scroll shall be done "always
+  desc: (archosplayer) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -480,14 +480,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Da"
-    h100,h120,h300: "NAVI = Da"
+    iriverh100,iriverh120,iriverh300: "NAVI = Da"
   </dest>
   <voice>
     *: ""
@@ -495,7 +495,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -1391,7 +1391,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -1405,7 +1405,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time
+  desc: (archosplayer) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -1419,7 +1419,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -1951,7 +1951,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -1965,7 +1965,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3099,7 +3099,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -3113,7 +3113,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index d5ceaaad2b..c2c49a28b4 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -260,21 +260,21 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Да"
-    h100,h120,h300: "NAVI = Да"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Да"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
-    h100,h120,h300: ""
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: ""
-    player: ""
+    iriverh100,iriverh120,iriverh300: ""
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -283,15 +283,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Било које друго = Не"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2367,24 +2367,24 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Креирам базу података... %d пронађено (OFF за повратак)"
-    h100,h120,h300: "Креирам базу података... %d пронађено (STOP за повратак)"
+    iriverh100,iriverh120,iriverh300: "Креирам базу података... %d пронађено (STOP за повратак)"
     ipod*: "Креирам базу података... %d пронађено (PREV за повратак)"
-    x5,m5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
-    h10,h10_5gb,e200*,c200*,sa9200: "Креирам базу података... %d пронађено (PREV за повратак)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Креирам базу података... %d пронађено (PREV за повратак)"
   </dest>
   <voice>
     *: "улази за базу података"
-    h100,h120,h300: ""
+    iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
-    x5,m5,gigabeat*,mrobe100: ""
-    h10,h10_5gb,e200*,c200*,sa9200: ""
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: ""
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -3181,7 +3181,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3195,7 +3195,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3209,7 +3209,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3841,17 +3841,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Тајмаут светла за дугмиће"
-    fuze*,e200*: "Тајмаут светла за точак"
+    sansafuze*,sansae200*: "Тајмаут светла за точак"
   </dest>
   <voice>
     *: none
     button_light: "Тајмаут светла за дугмиће"
-    fuze*,e200*: "Тајмаут светла за точак"
+    sansafuze*,sansae200*: "Тајмаут светла за точак"
   </voice>
 </phrase>
 <phrase>
@@ -4132,20 +4132,20 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Постави"
-    h100,h120,h300: "NAVI = Постави"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Постави"
+    iriverh100,iriverh120,iriverh300: "NAVI = Постави"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Постави"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4155,33 +4155,33 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Врати на старо"
-    h100,h120,h300: "STOP = Врати на старо"
-    ipod*,c200*,sa9200: "MENU = Врати на старо"
-    x5,m5: "RECORD = Врати на старо"
-    h10,h10_5gb,e200*,fuze*: "PREV = Врати на старо"
-    gigabeatf: "POWER = Врати на старо"
+    iriverh100,iriverh120,iriverh300: "STOP = Врати на старо"
+    ipod*,sansac200*,gogearsa9200: "MENU = Врати на старо"
+    iaudiox5,iaudiom5: "RECORD = Врати на старо"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Врати на старо"
+    gigabeatfx: "POWER = Врати на старо"
     mrobe100: "DISPLAY = Врати на старо"
     gigabeats: "BACK = Врати на старо"
   </dest>
   <voice>
     *: none
     rtc: ""
-    h100,h120,h300: ""
-    ipod*,e200*,c200*,sa9200: ""
-    x5,m5: ""
-    h10,h10_5gb: ""
-    gigabeatf: ""
+    iriverh100,iriverh120,iriverh300: ""
+    ipod*,sansae200*,sansac200*,gogearsa9200: ""
+    iaudiox5,iaudiom5: ""
+    iriverh10,iriverh10_5gb: ""
+    gigabeatfx: ""
     mrobe100: ""
     gigabeats: ""
   </voice>
@@ -4706,14 +4706,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Постави OFF=Одустани"
     ipod*: "SELECT=Постави MENU=Одустани"
-    h10,h10_5gb: "SELECT=Постави PREV=Одустани"
+    iriverh10,iriverh10_5gb: "SELECT=Постави PREV=Одустани"
     gigabeats: "SELECT=Постави POWER=Одустани"
   </dest>
   <voice>
@@ -5888,17 +5888,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Микрофон"
-    h100,h120,h300: "Уграђени микрофон"
+    iriverh100,iriverh120,iriverh300: "Уграђени микрофон"
   </dest>
   <voice>
     *: none
     recording: "Микрофон"
-    h100,h120,h300: "Уграђени микрофон"
+    iriverh100,iriverh120,iriverh300: "Уграђени микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -5924,15 +5924,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Линијски улаз"
+    recording,archosplayer: "Линијски улаз"
   </dest>
   <voice>
     *: none
-    recording,player: "Линијски улаз"
+    recording,archosplayer: "Линијски улаз"
   </voice>
 </phrase>
 <phrase>
@@ -6862,11 +6862,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Бафер:"
-    player: "Баф:"
+    archosplayer: "Баф:"
   </dest>
   <voice>
     *: "Величина бафера"
@@ -6878,13 +6878,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерија: %d%% %dч %dм"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм"
-    h10,ipodmini,ipodmini2g: "Бат: %d%% %dч %dм"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
+    iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dч %dм"
   </dest>
   <voice>
     *: "Ниво батерије"
@@ -6942,19 +6942,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "мајкро Ес Де"
+    sansae200*,sansac200*,sansafuze*: "мајкро Ес Де"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8066,15 +8066,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Крај листе песама"
-    player: "Крај листе"
+    archosplayer: "Крај листе"
   </dest>
   <voice>
     *: "Крај листе песама"
-    player: "Крај листе"
+    archosplayer: "Крај листе"
   </voice>
 </phrase>
 <phrase>
@@ -8314,20 +8314,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Диск је пун. Притисните OFF за наставак."
-    h100,h120,h300: "Диск је пун. Притисните STOP за наставак."
-    m5,x5: "Диск је пун. Притисните POWER за наставак."
-    e200*,c200*: "Диск је пун. Притисните PREV за наставак."
+    iriverh100,iriverh120,iriverh300: "Диск је пун. Притисните STOP за наставак."
+    iaudiom5,iaudiox5: "Диск је пун. Притисните POWER за наставак."
+    sansae200*,sansac200*: "Диск је пун. Притисните PREV за наставак."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8411,25 +8411,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP за прекид"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за прекид"
     ipod*: "PLAY/PAUSE за прекид"
-    x5,m5: "Long PLAY за прекид"
-    h10,h10_5gb,e200*,c200*: "PREV за прекид"
+    iaudiox5,iaudiom5: "Long PLAY за прекид"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за прекид"
     gigabeats: "BACK за прекид"
-    gigabeatf: "POWER за прекид"
+    gigabeatfx: "POWER за прекид"
   </dest>
   <voice>
     *: ""
@@ -8653,19 +8653,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Батерија: Top-Off Chg"
+    archosrecorder: "Батерија: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Top off пуњење"
+    archosrecorder: "Top off пуњење"
   </voice>
 </phrase>
 <phrase>
@@ -10482,7 +10482,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11727,15 +11727,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Осетљивост Touchpad-а"
+    gigabeatfx: "Осетљивост Touchpad-а"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Осетљивост Touchpad-а"
+    gigabeatfx: "Осетљивост Touchpad-а"
   </voice>
 </phrase>
 <phrase>
@@ -11961,15 +11961,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Високо"
+    gigabeatfx: "Високо"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Високо"
+    gigabeatfx: "Високо"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index aa1668331a..08ade4b10c 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -267,16 +267,16 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "SPELA = Ja"
     cowond2*: "MENY = Ja"
-    h100,h120,h300: "NAVI = Ja"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÄLJ = Ja"
-    player: "SPELA/STOPP"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ja"
+    archosplayer: "SPELA/STOPP"
   </dest>
   <voice>
     *: ""
@@ -288,15 +288,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Annan = Nej"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2389,19 +2389,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Skapar databas... %d hittade (AV = Återgå)"
-    h100,h120,h300: "Skapar databas... %d hittade (STOPP = Återgå)"
+    iriverh100,iriverh120,iriverh300: "Skapar databas... %d hittade (STOPP = Återgå)"
     ipod*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    x5,m5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    sa9200: "Skapar databas... %d hittade (REW = Återgå)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
+    gogearsa9200: "Skapar databas... %d hittade (REW = Återgå)"
   </dest>
   <voice>
     *: "objekt hittade för databasen"
@@ -3201,7 +3201,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3215,7 +3215,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3229,7 +3229,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3861,17 +3861,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knappbelysning"
-    fuze*,e200*: "Hjulbelysning"
+    sansafuze*,sansae200*: "Hjulbelysning"
   </dest>
   <voice>
     *: none
     button_light: "Knappbelysning"
-    fuze*,e200*: "Hjulbelysning"
+    sansafuze*,sansae200*: "Hjulbelysning"
   </voice>
 </phrase>
 <phrase>
@@ -4153,21 +4153,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "PÅ = Ställ"
     mrobe500: "HJÄRTA = Ställ"
-    h100,h120,h300: "NAVI = Ställ"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÄLJ = Ställ"
-    sa9200: "SPELA = Ställ"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ställ"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ställ"
+    gogearsa9200: "SPELA = Ställ"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4178,31 +4178,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "AV = Avbryt"
     mrobe500: "PÅ/AV = Avbryt"
-    h100,h120,h300: "STOPP = Avbryt"
-    ipod*,c200*: "MENY = Avbryt"
-    x5,m5: "SPELA IN = Avbryt"
-    h10,h10_5gb,e200*,fuze*: "FÖREGÅENDE = Avbryt"
-    gigabeatf: "PÅ/AV = Avbryt"
+    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
+    ipod*,sansac200*: "MENY = Avbryt"
+    iaudiox5,iaudiom5: "SPELA IN = Avbryt"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FÖREGÅENDE = Avbryt"
+    gigabeatfx: "PÅ/AV = Avbryt"
     mrobe100: "VISA = Avbryt"
     gigabeats: "BAKÅT = Avbryt"
-    sa9200: "VÄNSTER = Avbryt"
+    gogearsa9200: "VÄNSTER = Avbryt"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4725,14 +4725,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPELA=Sätt AV=Avbryt"
     ipod*: "VÄLJ=Sätt MENY=Avbryt"
-    h10,h10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt"
+    iriverh10,iriverh10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt"
     gigabeats: "VÄLJ=Sätt PÅ/AV=Avbryt"
   </dest>
   <voice>
@@ -5907,17 +5907,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </dest>
   <voice>
     *: none
     recording: "Mikrofon"
-    h100,h120,h300: "Intern mikrofon"
+    iriverh100,iriverh120,iriverh300: "Intern mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -5943,15 +5943,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Linjeingång"
+    recording,archosplayer: "Linjeingång"
   </dest>
   <voice>
     *: none
-    recording,player: "Linjeingång"
+    recording,archosplayer: "Linjeingång"
   </voice>
 </phrase>
 <phrase>
@@ -6881,11 +6881,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffert:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffertstorlek"
@@ -6897,13 +6897,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -6961,19 +6961,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "mikro S D"
+    sansae200*,sansac200*,sansafuze*: "mikro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8085,11 +8085,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Slut på spellistan"
-    player: "Listan slut"
+    archosplayer: "Listan slut"
   </dest>
   <voice>
     *: "Slut på spellistan"
@@ -8332,20 +8332,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Disken är full. Tryck AV för att fortsätta."
-    h100,h120,h300: "Disken är full. Tryck STOPP för att fortsätta."
-    m5,x5: "Disken är full. Tryck PÅ/AV för att fortsätta."
-    e200*,c200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
+    iriverh100,iriverh120,iriverh300: "Disken är full. Tryck STOPP för att fortsätta."
+    iaudiom5,iaudiox5: "Disken är full. Tryck PÅ/AV för att fortsätta."
+    sansae200*,sansac200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8429,25 +8429,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "AV = avbryt"
-    player,h100,h120,h300: "STOPP = Avbryt"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
     ipod*: "SPELA/PAUSA = Avbryt"
-    x5,m5: "Lång SPELA = Avbryt"
-    h10,h10_5gb,e200*,c200*: "FÖREGÅENDE = Avbryt"
+    iaudiox5,iaudiom5: "Lång SPELA = Avbryt"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FÖREGÅENDE = Avbryt"
     gigabeats: "BAKÅT = Avbryt"
-    gigabeatf: "PÅ/AV = Avbryt"
+    gigabeatfx: "PÅ/AV = Avbryt"
   </dest>
   <voice>
     *: ""
@@ -8671,19 +8671,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batteri: Toppladdning"
+    archosrecorder: "Batteri: Toppladdning"
   </dest>
   <voice>
     *: none
-    recorder: "Toppladdning"
+    archosrecorder: "Toppladdning"
   </voice>
 </phrase>
 <phrase>
@@ -10500,7 +10500,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11711,15 +11711,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Pekskärmskänslighet"
+    gigabeatfx: "Pekskärmskänslighet"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Pekskärmskänslighet"
+    gigabeatfx: "Pekskärmskänslighet"
   </voice>
 </phrase>
 <phrase>
@@ -11728,15 +11728,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Hög"
+    gigabeatfx: "Hög"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Hög"
+    gigabeatfx: "Hög"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 03b5a61ba2..cf3cdc5328 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -261,16 +261,16 @@
  <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
     *: "PLAY = Oo"
     cowond2*: "MENU = Oo"
-    h100,h120,h300: "NAVI = Oo"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oo"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Oo"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oo"
+    archosplayer: "(PLAY/STOP)"
  </dest>
  <voice>
     *: ""
@@ -282,15 +282,15 @@
  user: core
  <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
  </source>
  <dest>
     *: "Ibang wala = Hindi"
-    player: none
+    archosplayer: none
  </dest>
  <voice>
     *: ""
-    player: none
+    archosplayer: none
  </voice>
 </phrase>
 <phrase>
@@ -2366,19 +2366,19 @@
  user: core
  <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
  </source>
  <dest>
     *: "Gumawa database... %d found (OFF sa pagbalik)"
-    h100,h120,h300: "Gumawa database... %d found (STOP sa pagbalik)"
+    iriverh100,iriverh120,iriverh300: "Gumawa database... %d found (STOP sa pagbalik)"
     ipod*: "Gumawa database... %d found (PLAY/PAUSE sa pagbalik)"
-    x5,m5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Gumawa database... %d found (PREV sa pagbalik)"
-    sa9200: "Gumawa database... %d found (REW sa pagbalik)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Gumawa database... %d found (PREV sa pagbalik)"
+    gogearsa9200: "Gumawa database... %d found (REW sa pagbalik)"
  </dest>
  <voice>
     *: "entries found for database"
@@ -3178,7 +3178,7 @@
 </phrase>
 <phrase>
  id: LANG_JUMP_SCROLL
- desc: (player) menu alternative for jump scroll
+ desc: (archosplayer) menu alternative for jump scroll
  user: core
  <source>
     *: "Jump Scroll"
@@ -3192,7 +3192,7 @@
 </phrase>
 <phrase>
  id: LANG_ONE_TIME
- desc: (player) the jump scroll shall be done "one time"
+ desc: (archosplayer) 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: (player) Delay before making a jump scroll
+ desc: (archosplayer) Delay before making a jump scroll
  user: core
  <source>
     *: "Jump Scroll Delay"
@@ -3838,17 +3838,17 @@
  <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
  </source>
  <dest>
     *: none
     button_light: "Pahintuin buttones sa ilaw"
-    fuze*,e200*: "Pahintuin gulong sa ilaw"
+    sansafuze*,sansae200*: "Pahintuin gulong sa ilaw"
  </dest>
  <voice>
     *: none
     button_light: ""
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
  </voice>
 </phrase>
 <phrase>
@@ -4130,17 +4130,17 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
  </source>
  <dest>
     *: none
     rtc: "ON = Ilagay"
     mrobe500: "HEART =Ilagay"
-    h100,h120,h300: "NAVI = Ilagay"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ilagay"
-    sa9200: "PLAY = Ilagay"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ilagay"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ilagay"
+    gogearsa9200: "PLAY = Ilagay"
  </dest>
  <voice>
     *: none
@@ -4154,27 +4154,27 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
  </source>
  <dest>
     *: none
     rtc: "OFF = Mabalik"
     mrobe500: "POWER = Mabalik"
-    h100,h120,h300: "STOP = Mabalik"
-    ipod*,c200*: "MENU = Mabalik"
-    x5,m5: "RECORD = Mabalik"
-    h10,h10_5gb,e200*,fuze*: "PREV = Mabalik"
-    gigabeatf: "POWER = Mabalik"
+    iriverh100,iriverh120,iriverh300: "STOP = Mabalik"
+    ipod*,sansac200*: "MENU = Mabalik"
+    iaudiox5,iaudiom5: "RECORD = Mabalik"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Mabalik"
+    gigabeatfx: "POWER = Mabalik"
     mrobe100: "DISPLAY = Mabalik"
     gigabeats: "BACK = Mabalik"
-    sa9200: "LEFT = Mabalik"
+    gogearsa9200: "LEFT = Mabalik"
  </dest>
  <voice>
     *: none
@@ -4700,21 +4700,21 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
  </source>
  <dest>
     *: none
     alarm: "PLAY=Ilagay OFF=Kanselahin"
     ipod*: "SELECT=Ilagay MENU=Kanselahin"
-    h10,h10_5gb: "SELECT = Ilagay MENU = Kanselahin"
+    iriverh10,iriverh10_5gb: "SELECT = Ilagay MENU = Kanselahin"
     gigabeats: "SELECT = Ilagay POWER = Kanselahin"
  </dest>
  <voice>
     *: none
     alarm: ""
     ipod*: ""
-    h10,h10_5gb: ""
+    iriverh10,iriverh10_5gb: ""
     gigabeats: ""
  </voice>
 </phrase>
@@ -5885,17 +5885,17 @@
  <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
  </source>
  <dest>
     *: none
     recording: "Mikropono"
-    h100,h120,h300: "Panloob mikropono"
+    iriverh100,iriverh120,iriverh300: "Panloob mikropono"
  </dest>
  <voice>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
  </voice>
 </phrase>
 <phrase>
@@ -5921,15 +5921,15 @@
  user: core
  <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
  </source>
  <dest>
     *: none
-    recording,player: "Sa Guhit"
+    recording,archosplayer: "Sa Guhit"
  </dest>
  <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
  </voice>
 </phrase>
 <phrase>
@@ -7021,7 +7021,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7609,20 +7609,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Puno disk. Magpatuloy Pindutin OFF."
-    h100,h120,h300: "Puno disk. Magpatuloy Pindutin STOP."
-    m5,x5: "Puno disk. Magpatuloy Pindutin POWER."
-    e200*,c200*: "Puno disk. Magpatuloy Pindutin PREV."
+    iriverh100,iriverh120,iriverh300: "Puno disk. Magpatuloy Pindutin STOP."
+    iaudiom5,iaudiox5: "Puno disk. Magpatuloy Pindutin POWER."
+    sansae200*,sansac200*: "Puno disk. Magpatuloy Pindutin PREV."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7682,15 +7682,15 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </dest>
   <voice>
     *: "Buffer size"
-    player: ""
+    archosplayer: ""
   </voice>
 </phrase>
 <phrase>
@@ -8066,25 +8066,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF sa agas"
-    player,h100,h120,h300: "STOP sa agas"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP sa agas"
     ipod*: "PLAY/PAUSE sa agas"
-    x5,m5: "Long PLAY sa agas"
-    h10,h10_5gb,e200*,c200*: "PREV sa agas"
+    iaudiox5,iaudiom5: "Long PLAY sa agas"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV sa agas"
     gigabeats: "BACK sa agas"
-    gigabeatf: "POWER sa agas"
+    gigabeatfx: "POWER sa agas"
   </dest>
   <voice>
     *: ""
@@ -8138,13 +8138,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -8333,15 +8333,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Magtapos kanta listahan"
-    player: "Magtapos listahan"
+    archosplayer: "Magtapos listahan"
   </dest>
   <voice>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -9664,19 +9664,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batirya: Top-Off Chg"
+    archosrecorder: "Batirya: Top-Off Chg"
   </dest>
   <voice>
     *: none
-    recorder: "Top off charge"
+    archosrecorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10111,19 +10111,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1:"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D Isa"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -11508,15 +11508,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Sensitibo Touchpad"
+    gigabeatfx: "Sensitibo Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Sensitibo Touchpad"
+    gigabeatfx: "Sensitibo Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11806,15 +11806,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Mataas"
+    gigabeatfx: "Mataas"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Mataas"
+    gigabeatfx: "Mataas"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index be470d6d32..c8fa483671 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -261,15 +261,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = ใช่"
-    h100,h120,h300: "NAVI = ใช่"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = ใช่"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = ใช่"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = ใช่"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -281,15 +281,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "ปุ่มอื่นๆ = ไม่ใช่"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2365,17 +2365,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (OFF เพื่อย้อนกลับ)"
-    h100,h120,h300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
+    iriverh100,iriverh120,iriverh300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
     ipod*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
-    x5,m5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
-    h10,h10_5gb,e200*,c200*,sa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -3175,7 +3175,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3189,7 +3189,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3203,7 +3203,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3835,17 +3835,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "เวลาเปิดไฟปุ่ม"
-    fuze*,e200*: "เวลาเปิดไฟล้อหมุน"
+    sansafuze*,sansae200*: "เวลาเปิดไฟล้อหมุน"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -4109,14 +4109,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = ตั้งค่า"
-    h100,h120,h300: "NAVI = ตั้งค่า"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = ตั้งค่า"
+    iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = ตั้งค่า"
   </dest>
   <voice>
     *: none
@@ -4129,22 +4129,22 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = ยกเลิก"
-    h100,h120,h300: "STOP = ยกเลิก"
-    ipod*,c200*,sa9200: "MENU = ยกเลิก"
-    x5,m5: "RECORD = ยกเลิก"
-    h10,h10_5gb,e200*,fuze*: "PREV = ยกเลิก"
-    gigabeatf: "POWER = ยกเลิก"
+    iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก"
+    ipod*,sansac200*,gogearsa9200: "MENU = ยกเลิก"
+    iaudiox5,iaudiom5: "RECORD = ยกเลิก"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ยกเลิก"
+    gigabeatfx: "POWER = ยกเลิก"
     mrobe100: "DISPLAY = ยกเลิก"
     gigabeats: "BACK = ยกเลิก"
   </dest>
@@ -4672,14 +4672,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=ตั้งเวลา OFF=ยกเลิก"
     ipod*: "SELECT=ตั้งเวลา MENU=ยกเลิก"
-    h10,h10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก"
+    iriverh10,iriverh10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก"
     gigabeats: "SELECT=ตั้งเวลา POWER=ยกเลิก"
   </dest>
   <voice>
@@ -5853,17 +5853,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "ไมโครโฟน"
-    h100,h120,h300: "ไมโครโฟนภายใน"
+    iriverh100,iriverh120,iriverh300: "ไมโครโฟนภายใน"
   </dest>
   <voice>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -5889,15 +5889,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </dest>
   <voice>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6827,11 +6827,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "บัฟเฟอร์:"
-    player: "บัฟเฟอร์:"
+    archosplayer: "บัฟเฟอร์:"
   </dest>
   <voice>
     *: ""
@@ -6843,13 +6843,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "แบตเตอรี่: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "แบต: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6907,19 +6907,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
-    e200*,c200*,fuze*: "micro Secure Digital card:"
+    sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
     ondio*: "Multimedia card"
   </voice>
 </phrase>
@@ -8031,15 +8031,15 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "สิ้นสุดรายการเพลง"
-    player: "สิ้นสุดรายการ"
+    archosplayer: "สิ้นสุดรายการ"
   </dest>
   <voice>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </voice>
 </phrase>
 <phrase>
@@ -8279,20 +8279,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "ดีสก์เต็ม กดปุ่ม OFF เพื่อทำงานต่อ"
-    h100,h120,h300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
-    m5,x5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ"
-    e200*,c200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
+    iriverh100,iriverh120,iriverh300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
+    iaudiom5,iaudiox5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ"
+    sansae200*,sansac200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8376,25 +8376,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF เพื่อยกเลิก"
-    player,h100,h120,h300: "STOP เพื่อยกเลิก"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
     ipod*: "PLAY/PAUSE เพื่อยกเลิก"
-    x5,m5: "Long PLAY เพื่อยกเลิก"
-    h10,h10_5gb,e200*,c200*: "PREV เพื่อยกเลิก"
+    iaudiox5,iaudiom5: "Long PLAY เพื่อยกเลิก"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV เพื่อยกเลิก"
     gigabeats: "BACK เพื่อยกเลิก"
-    gigabeatf: "POWER เพื่อยกเลิก"
+    gigabeatfx: "POWER เพื่อยกเลิก"
   </dest>
   <voice>
     *: ""
@@ -8618,19 +8618,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "แบตเตอรี่: ชาร์จสูงสุด"
+    archosrecorder: "แบตเตอรี่: ชาร์จสูงสุด"
   </dest>
   <voice>
     *: none
-    recorder: "Top off charge"
+    archosrecorder: "Top off charge"
   </voice>
 </phrase>
 <phrase>
@@ -10447,7 +10447,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11571,15 +11571,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "ความไวแผ่นสัมผัส"
+    gigabeatfx: "ความไวแผ่นสัมผัส"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </voice>
 </phrase>
 <phrase>
@@ -12104,14 +12104,14 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "สูง"
+    gigabeatfx: "สูง"
   </dest>
   <voice>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </voice>
 </phrase>
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 8dee6bf688..dcf8515acc 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -248,15 +248,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Devam et"
-    h100,h120,h300: "NAVI = Devam et"
-    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Devam et"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Devam et"
+    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Devam et"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -268,17 +268,17 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Herhangi PLAY'dan başka = İptal et"
-    h100,h120,h300: "Herhangi NAVI'den başka = İptal et"
-    ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "Herhangi SELECT'ten başka = İptal et"
-    player: none
+    iriverh100,iriverh120,iriverh300: "Herhangi NAVI'den başka = İptal et"
+    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "Herhangi SELECT'ten başka = İptal et"
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -1554,17 +1554,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "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)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "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)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -1996,18 +1996,18 @@
   user: core
   <source>
     *: none
-    e200: "Wheel Light Timeout"
-    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
+    sansae200: "Wheel Light Timeout"
+    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
   </source>
   <dest>
     *: none
-    e200: "Wheel Light Timeout"
-    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
+    sansae200: "Wheel Light Timeout"
+    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
   </dest>
   <voice>
     *: none
-    e200: "Wheel Light Timeout"
-    c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout"
+    sansae200: "Wheel Light Timeout"
+    sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -2016,15 +2016,15 @@
   user: core
   <source>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    gigabeatfx,mrobe100: "Button Light Brightness"
   </source>
   <dest>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    gigabeatfx,mrobe100: "Button Light Brightness"
   </dest>
   <voice>
     *: none
-    gigabeatf,mrobe100: "Button Light Brightness"
+    gigabeatfx,mrobe100: "Button Light Brightness"
   </voice>
 </phrase>
 <phrase>
@@ -2093,19 +2093,19 @@
   <source>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200,c200*,gigabeat*,mrobe100,sa9200: ""
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -2115,29 +2115,29 @@
   <source>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = 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"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -2624,11 +2624,11 @@
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    archosplayer: "Buf: %d.%03dMB"
   </source>
   <dest>
     *: "Buffer: %d.%03dMB"
-    player: "Buf: %d.%03dMB"
+    archosplayer: "Buf: %d.%03dMB"
   </dest>
   <voice>
     *: "Buffer size"
@@ -2640,17 +2640,17 @@
   user: core
   <source>
     *: none
-    e200,c200*: "mSD:"
+    sansae200,sansac200*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    e200,c200*: "MSD:"
+    sansae200,sansac200*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    e200,c200*: "micro S D"
+    sansae200,sansac200*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -2887,40 +2887,40 @@
   <source>
     *: none
     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,c200*: "The disk is full. Press UP 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 UP to continue."
   </source>
   <dest>
     *: none
     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,c200*: "The disk is full. Press UP 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 UP to continue."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200,c200*: ""
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200,sansac200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort"
   </dest>
   <voice>
     *: ""
@@ -3032,19 +3032,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Pil en son yüklemeler yapıyor"
+    archosrecorder: "Pil en son yüklemeler yapıyor"
   </dest>
   <voice>
     *: none
-    recorder: "Pil en son yüklemeler yapıyor"
+    archosrecorder: "Pil en son yüklemeler yapıyor"
   </voice>
 </phrase>
 <phrase>
@@ -3524,7 +3524,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4342,15 +4342,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Touchpad Duyarlık"
+    gigabeatfx: "Touchpad Duyarlık"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Touchpad Duyarlık"
+    gigabeatfx: "Touchpad Duyarlık"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 0cc3ed8e1d..530f378c8c 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -261,15 +261,15 @@
   user: core

   <source>

     *: "PLAY = Yes"

-    h100,h120,h300: "NAVI = Yes"

-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"

-    player: "(PLAY/STOP)"

+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"

+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"

+    archosplayer: "(PLAY/STOP)"

   </source>

   <dest>

     *: "ВIДТВОР. = Так"

-    h100,h120,h300: "НАВIГ. = Так"

-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "ВИБIР = Так"

-    player: "(ВIДТВОР./СТОП)"

+    iriverh100,iriverh120,iriverh300: "НАВIГ. = Так"

+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Так"

+    archosplayer: "(ВIДТВОР./СТОП)"

   </dest>

   <voice>

     *: ""

@@ -281,15 +281,15 @@
   user: core

   <source>

     *: "Any Other = No"

-    player: none

+    archosplayer: none

   </source>

   <dest>

     *: "Будь-яка Iнша Кнопка = Нi"

-    player: none

+    archosplayer: none

   </dest>

   <voice>

     *: ""

-    player: none

+    archosplayer: none

   </voice>

 </phrase>

 <phrase>

@@ -2382,19 +2382,19 @@
   user: core

   <source>

     *: "Building database... %d found (OFF to return)"

-    h100,h120,h300: "Building database... %d found (STOP to return)"

+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"

     ipod*: "Building database... %d found (PREV to return)"

-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"

-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"

-    sa9200: "Building database... %d found (REW to return)"

+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"

+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"

+    gogearsa9200: "Building database... %d found (REW to return)"

   </source>

   <dest>

     *: "Створення Бази Даних ... %d знайдено (ВИМК. для вiдмiни)"

-    h100,h120,h300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)"

+    iriverh100,iriverh120,iriverh300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)"

     ipod*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

-    x5,m5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)"

-    h10,h10_5gb,e200*,c200*,fuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

-    sa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)"

+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)"

+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)"

+    gogearsa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)"

   </dest>

   <voice>

     *: "Знайдено записiв в базi даних"

@@ -3194,7 +3194,7 @@
 </phrase>

 <phrase>

   id: LANG_JUMP_SCROLL

-  desc: (player) menu alternative for jump scroll

+  desc: (archosplayer) menu alternative for jump scroll

   user: core

   <source>

     *: "Jump Scroll"

@@ -3208,7 +3208,7 @@
 </phrase>

 <phrase>

   id: LANG_ONE_TIME

-  desc: (player) the jump scroll shall be done "one time"

+  desc: (archosplayer) the jump scroll shall be done "one time"

   user: core

   <source>

     *: "One time"

@@ -3222,7 +3222,7 @@
 </phrase>

 <phrase>

   id: LANG_JUMP_SCROLL_DELAY

-  desc: (player) Delay before making a jump scroll

+  desc: (archosplayer) Delay before making a jump scroll

   user: core

   <source>

     *: "Jump Scroll Delay"

@@ -3854,17 +3854,17 @@
   <source>

     *: none

     button_light: "Button Light Timeout"

-    fuze*,e200*: "Wheel Light Timeout"

+    sansafuze*,sansae200*: "Wheel Light Timeout"

   </source>

   <dest>

     *: none

     button_light: "Таймаут Пiдсвiтки Кнопок"

-    fuze*,e200*: "Таймаут Пiдсвiтки Колеса"

+    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"

   </dest>

   <voice>

     *: none

     button_light: "Таймаут Пiдсвiтки Кнопок"

-    fuze*,e200*: "Таймаут Пiдсвiтки Колеса"

+    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"

   </voice>

 </phrase>

 <phrase>

@@ -4145,20 +4145,20 @@
   <source>

     *: none

     rtc: "ON = Set"

-    h100,h120,h300: "NAVI = Set"

-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"

-    sa9200: "PLAY = Set"

+    iriverh100,iriverh120,iriverh300: "NAVI = Set"

+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"

+    gogearsa9200: "PLAY = Set"

   </source>

   <dest>

     *: none

     rtc: "ВВIМК. = Встановити"

-    h100,h120,h300: "НАВIГ. = Встановити"

-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "ВИБIР = Встановити"

-    sa9200: "ПРОГРАВ. = Встановити"

+    iriverh100,iriverh120,iriverh300: "НАВIГ. = Встановити"

+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Встановити"

+    gogearsa9200: "ПРОГРАВ. = Встановити"

   </dest>

   <voice>

     *: none

-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""

+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""

   </voice>

 </phrase>

 <phrase>

@@ -4168,30 +4168,30 @@
   <source>

     *: none

     rtc: "OFF = Revert"

-    h100,h120,h300: "STOP = Revert"

-    ipod*,c200*: "MENU = Revert"

-    x5,m5: "RECORD = Revert"

-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"

-    gigabeatf: "POWER = Revert"

+    iriverh100,iriverh120,iriverh300: "STOP = Revert"

+    ipod*,sansac200*: "MENU = Revert"

+    iaudiox5,iaudiom5: "RECORD = Revert"

+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"

+    gigabeatfx: "POWER = Revert"

     mrobe100: "DISPLAY = Revert"

     gigabeats: "BACK = Revert"

-    sa9200: "LEFT = Revert"

+    gogearsa9200: "LEFT = Revert"

   </source>

   <dest>

     *: none

     rtc: "ВИМК. = Вiдмiнити"

-    h100,h120,h300: "СТОП = Вiдмiнити"

-    ipod*,c200*: "МЕНЮ = Вiдмiнити"

-    x5,m5: "ЗАПИС = Вiдмiнити"

-    h10,h10_5gb,e200*,fuze*: "ПОПЕРЕД. = Вiдмiнити"

-    gigabeatf: "ЖИВЛЕННЯ = Вiдмiнити"

+    iriverh100,iriverh120,iriverh300: "СТОП = Вiдмiнити"

+    ipod*,sansac200*: "МЕНЮ = Вiдмiнити"

+    iaudiox5,iaudiom5: "ЗАПИС = Вiдмiнити"

+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПОПЕРЕД. = Вiдмiнити"

+    gigabeatfx: "ЖИВЛЕННЯ = Вiдмiнити"

     mrobe100: "ДИСПЛЕЙ = Вiдмiнити"

     gigabeats: "НАЗАД = Вiдмiнити"

-    sa9200: "ВЛIВО = Вiдмiнити"

+    gogearsa9200: "ВЛIВО = Вiдмiнити"

   </dest>

   <voice>

     *: none

-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""

+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""

   </voice>

 </phrase>

 <phrase>

@@ -4714,14 +4714,14 @@
     *: none

     alarm: "PLAY=Set OFF=Cancel"

     ipod*: "SELECT=Set MENU=Cancel"

-    h10,h10_5gb: "SELECT=Set PREV=Cancel"

+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"

     gigabeats: "SELECT=Set POWER=Cancel"

   </source>

   <dest>

     *: none

     alarm: "ВIДТВОР.=Встановити ВИМК.=Вiдмiнити"

     ipod*: "ВИБIР=Встановити МЕНЮ=Вiдмiнити"

-    h10,h10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити"

+    iriverh10,iriverh10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити"

     gigabeats: "ВИБIР=Встановити ЖИВЛ.=Вiдмiнити"

   </dest>

   <voice>

@@ -5896,17 +5896,17 @@
   <source>

     *: none

     recording: "Microphone"

-    h100,h120,h300: "Internal Microphone"

+    iriverh100,iriverh120,iriverh300: "Internal Microphone"

   </source>

   <dest>

     *: none

     recording: "Мiкрофон"

-    h100,h120,h300: "Вбудований Мiкрофон"

+    iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"

   </dest>

   <voice>

     *: none

     recording: "Мiкрофон"

-    h100,h120,h300: "Вбудований Мiкрофон"

+    iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"

   </voice>

 </phrase>

 <phrase>

@@ -5932,15 +5932,15 @@
   user: core

   <source>

     *: none

-    recording,player: "Line In"

+    recording,archosplayer: "Line In"

   </source>

   <dest>

     *: none

-    recording,player: "Лiнiйний Вхiд"

+    recording,archosplayer: "Лiнiйний Вхiд"

   </dest>

   <voice>

     *: none

-    recording,player: "Лiнiйний Вхiд"

+    recording,archosplayer: "Лiнiйний Вхiд"

   </voice>

 </phrase>

 <phrase>

@@ -6870,11 +6870,11 @@
   user: core

   <source>

     *: "Buffer:"

-    player: "Buf:"

+    archosplayer: "Buf:"

   </source>

   <dest>

     *: "Буфер:"

-    player: "Буф:"

+    archosplayer: "Буф:"

   </dest>

   <voice>

     *: "Розмiр буферу"

@@ -6886,13 +6886,13 @@
   user: core

   <source>

     *: "Battery: %d%% %dh %dm"

-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"

-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"

+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"

+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"

   </source>

   <dest>

     *: "Акумулятор: %d%% %dh %dm"

-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"

-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"

+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"

+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"

   </dest>

   <voice>

     *: "Рiвень Заряду Акумулятору"

@@ -6950,19 +6950,19 @@
   <source>

     *: none

     multivolume: "HD1"

-    e200*,c200*,fuze*: "mSD:"

+    sansae200*,sansac200*,sansafuze*: "mSD:"

     ondio*: "MMC:"

   </source>

   <dest>

     *: none

     multivolume: "HD1"

-    e200*,c200*,fuze*: "microSD:"

+    sansae200*,sansac200*,sansafuze*: "microSD:"

     ondio*: "MMC:"

   </dest>

   <voice>

     *: none

     multivolume: "H D 1"

-    e200*,c200*,fuze*: "micro S D"

+    sansae200*,sansac200*,sansafuze*: "micro S D"

     ondio*: "M M C"

   </voice>

 </phrase>

@@ -8074,11 +8074,11 @@
   user: core

   <source>

     *: "End of Song List"

-    player: "End of List"

+    archosplayer: "End of List"

   </source>

   <dest>

     *: "Кiнець Списку Пiсень"

-    player: "Кiнець Списку"

+    archosplayer: "Кiнець Списку"

   </dest>

   <voice>

     *: "Кiнець Списку Пiсень"

@@ -8323,20 +8323,20 @@
   <source>

     *: none

     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*,c200*: "The disk is full. Press PREV 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."

   </source>

   <dest>

     *: none

     recording: "Диск повний. Натичнiть OFF для продовження."

-    h100,h120,h300: "Диск повний. Натичнiть STOP для продовження."

-    m5,x5: "Диск повний. Натичнiть POWER для продовження."

-    e200*,c200*: "Диск повний. Натичнiть PREV для продовження."

+    iriverh100,iriverh120,iriverh300: "Диск повний. Натичнiть STOP для продовження."

+    iaudiom5,iaudiox5: "Диск повний. Натичнiть POWER для продовження."

+    sansae200*,sansac200*: "Диск повний. Натичнiть PREV для продовження."

   </dest>

   <voice>

     *: none

-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""

+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""

   </voice>

 </phrase>

 <phrase>

@@ -8420,25 +8420,25 @@
 </phrase>

 <phrase>

   id: LANG_OFF_ABORT

-  desc: Used on recorder models

+  desc: Used on archosrecorder models

   user: core

   <source>

     *: "OFF to abort"

-    player,h100,h120,h300: "STOP to abort"

+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"

     ipod*: "PLAY/PAUSE to abort"

-    x5,m5: "Long PLAY to abort"

-    h10,h10_5gb,e200*,c200*: "PREV to abort"

+    iaudiox5,iaudiom5: "Long PLAY to abort"

+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"

     gigabeats: "BACK to abort"

-    gigabeatf: "POWER to abort"

+    gigabeatfx: "POWER to abort"

   </source>

   <dest>

     *: "OFF для вiдмiни"

-    player,h100,h120,h300: "STOP для вiдмiни"

+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP для вiдмiни"

     ipod*: "PLAY/PAUSE для вiдмiни"

-    x5,m5: "Довге натискання PLAY для вiдмiни"

-    h10,h10_5gb,e200*,c200*: "PREV для вiдмiни"

+    iaudiox5,iaudiom5: "Довге натискання PLAY для вiдмiни"

+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV для вiдмiни"

     gigabeats: "BACK для вiдмiни"

-    gigabeatf: "POWER для вiдмiни"

+    gigabeatfx: "POWER для вiдмiни"

   </dest>

   <voice>

     *: ""

@@ -8662,19 +8662,19 @@
 </phrase>

 <phrase>

   id: LANG_BATTERY_TOPOFF_CHARGE

-  desc: in info display, shows that top off charge is running Only for V1 recorder

+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder

   user: core

   <source>

     *: none

-    recorder: "Battery: Top-Off Chg"

+    archosrecorder: "Battery: Top-Off Chg"

   </source>

   <dest>

     *: none

-    recorder: "Акумулятор: Більше Можливого"

+    archosrecorder: "Акумулятор: Більше Можливого"

   </dest>

   <voice>

     *: none

-    recorder: "Акумулятор: Більше Можливого"

+    archosrecorder: "Акумулятор: Більше Можливого"

   </voice>

 </phrase>

 <phrase>

@@ -10491,7 +10491,7 @@
   </dest>

   <voice>

     *: none

-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""

+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""

   </voice>

 </phrase>

 <phrase>

@@ -11702,15 +11702,15 @@
   user: core

   <source>

     *: none

-    gigabeatf: "Touchpad Sensitivity"

+    gigabeatfx: "Touchpad Sensitivity"

   </source>

   <dest>

     *: none

-    gigabeatf: "Чутливiсть Тачпаду"

+    gigabeatfx: "Чутливiсть Тачпаду"

   </dest>

   <voice>

     *: none

-    gigabeatf: "Чутливiсть Тачпаду"

+    gigabeatfx: "Чутливiсть Тачпаду"

   </voice>

 </phrase>

 <phrase>

@@ -11719,15 +11719,15 @@
   user: core

   <source>

     *: none

-    gigabeatf: "High"

+    gigabeatfx: "High"

   </source>

   <dest>

     *: none

-    gigabeatf: "Висока"

+    gigabeatfx: "Висока"

   </dest>

   <voice>

     *: none

-    gigabeatf: "Висока"

+    gigabeatfx: "Висока"

   </voice>

 </phrase>

 <phrase>

diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index 1c58220b10..af997c9715 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -88,7 +88,7 @@
 </phrase>
 <phrase>
   id: LANG_ALWAYS
-  desc: (player) the jump scroll shall be done "always
+  desc: (archosplayer) the jump scroll shall be done "always
   user: core
   <source>
     *: "Always"
@@ -746,14 +746,14 @@
 </phrase>
 <phrase>
   id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic recorder string to use to confirm
+  desc: Generic archosrecorder string to use to confirm
   user: core
   <source>
     *: "PLAY = Yes"
   </source>
   <dest>
     *: "PLAY = Ja"
-    h100,h120,h300: "NAVI = Ja"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
   </dest>
   <voice>
     *: ""
@@ -761,7 +761,7 @@
 </phrase>
 <phrase>
   id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic recorder string to use to cancel
+  desc: Generic archosrecorder string to use to cancel
   user: core
   <source>
     *: "Any Other = No"
@@ -2203,7 +2203,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu altarnative for jump scroll
+  desc: (archosplayer) menu altarnative for jump scroll
   user: core
   <source>
     *: "Jump scroll"
@@ -2217,7 +2217,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time
+  desc: (archosplayer) the jump scroll shall be done "one time
   user: core
   <source>
     *: "One time"
@@ -2231,7 +2231,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -2875,7 +2875,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_PLAYER
-  desc: the buffer size player-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buf: %d.%03dMB"
@@ -2889,7 +2889,7 @@
 </phrase>
 <phrase>
   id: LANG_BUFFER_STAT_RECORDER
-  desc: the buffer size recorder-screen width, %d MB %d fraction of MB
+  desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB
   user: core
   <source>
     *: "Buffer: %d.%03dMB"
@@ -3148,7 +3148,7 @@
   </source>
   <dest>
     *: "PLAY = üswählu"
-    h100,h120,h300: "NAVI = üswählu"
+    iriverh100,iriverh120,iriverh300: "NAVI = üswählu"
   </dest>
   <voice>
     *: ""
@@ -3163,7 +3163,7 @@
   </source>
   <dest>
     *: "ON+PLAY = leschu"
-    h100,h120,h300: "ON+NAVI = leschu"
+    iriverh100,iriverh120,iriverh300: "ON+NAVI = leschu"
   </dest>
   <voice>
     *: ""
@@ -5663,7 +5663,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
@@ -5677,7 +5677,7 @@
 </phrase>
 <phrase>
   id: LANG_STOP_ABORT
-  desc: Used on player models
+  desc: Used on archosplayer models
   user: core
   <source>
     *: "STOP to abort"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index a0ac409ea8..ed1c556926 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -266,17 +266,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    h100,h120,h300: "NAVI = Yes"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
-    player: "(PLAY/STOP)"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    archosplayer: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Oyi"
     cowond2*: "MENU = Oyi"
-    h100,h120,h300: "NAVI = Oyi"
-    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oyi"
+    iriverh100,iriverh120,iriverh300: "NAVI = Oyi"
+    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oyi"
     mrobe500: "PLAY or POWER = Oyi"
-    player: "(PLAY/STOP)"
+    archosplayer: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -288,15 +288,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    player: none
+    archosplayer: none
   </source>
   <dest>
     *: "Tolminme kés ôtes = Neni"
-    player: none
+    archosplayer: none
   </dest>
   <voice>
     *: ""
-    player: none
+    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -2389,19 +2389,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
-    sa9200: "Building database... %d found (REW to return)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Bastixhaedje del båze di dnêyes... %d di trovés (OFF po-z eraler en erî)"
-    h100,h120,h300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
+    iriverh100,iriverh120,iriverh300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
     ipod*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
-    x5,m5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
-    h10,h10_5gb,e200*,c200*,fuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
-    sa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)"
+    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
+    gogearsa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)"
   </dest>
   <voice>
     *: "intrêyes trovêyes pol båze di dnêyes"
@@ -3201,7 +3201,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (player) menu alternative for jump scroll
+  desc: (archosplayer) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3215,7 +3215,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (player) the jump scroll shall be done "one time"
+  desc: (archosplayer) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3229,7 +3229,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (player) Delay before making a jump scroll
+  desc: (archosplayer) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3861,17 +3861,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    fuze*,e200*: "Wheel Light Timeout"
+    sansafuze*,sansae200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    fuze*,e200*: "Tins ki l' rôlete si loume"
+    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
   </dest>
   <voice>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    fuze*,e200*: "Tins ki l' rôlete si loume"
+    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
   </voice>
 </phrase>
 <phrase>
@@ -4153,21 +4153,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
-    sa9200: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
+    gogearsa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Eployî"
     mrobe500: "HEART = Eployî"
-    h100,h120,h300: "NAVI = Eployî"
-    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Eployî"
-    sa9200: "PLAY = Eployî"
+    iriverh100,iriverh120,iriverh300: "NAVI = Eployî"
+    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Eployî"
+    gogearsa9200: "PLAY = Eployî"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4178,31 +4178,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    h100,h120,h300: "STOP = Revert"
-    ipod*,c200*: "MENU = Revert"
-    x5,m5: "RECORD = Revert"
-    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
-    gigabeatf: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    ipod*,sansac200*: "MENU = Revert"
+    iaudiox5,iaudiom5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    gigabeatfx: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    sa9200: "LEFT = Revert"
+    gogearsa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Rinoncî"
     mrobe500: "POWER = Rinoncî"
-    h100,h120,h300: "STOP = Rinoncî"
-    ipod*,c200*: "MENU = Rinoncî"
-    x5,m5: "RECORD = Rinoncî"
-    h10,h10_5gb,e200*,fuze*: "PREV = Rinoncî"
-    gigabeatf: "POWER = Rinoncî"
+    iriverh100,iriverh120,iriverh300: "STOP = Rinoncî"
+    ipod*,sansac200*: "MENU = Rinoncî"
+    iaudiox5,iaudiom5: "RECORD = Rinoncî"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Rinoncî"
+    gigabeatfx: "POWER = Rinoncî"
     mrobe100: "DISPLAY = Rinoncî"
     gigabeats: "BACK = Rinoncî"
-    sa9200: "LEFT = Rinoncî"
+    gogearsa9200: "LEFT = Rinoncî"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
+    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4725,14 +4725,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    h10,h10_5gb: "SELECT=Set PREV=Cancel"
+    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Rinoncî"
     ipod*: "SELECT=Set MENU=Rinoncî"
-    h10,h10_5gb: "SELECT=Defini PREV=Rinoncî"
+    iriverh10,iriverh10_5gb: "SELECT=Defini PREV=Rinoncî"
     gigabeats: "SELECT=Defini POWER=Rinoncî"
   </dest>
   <voice>
@@ -5907,17 +5907,17 @@
   <source>
     *: none
     recording: "Microphone"
-    h100,h120,h300: "Internal Microphone"
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Dvintrin micro"
-    h100,h120,h300: "Dvintrin micro"
+    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
   </dest>
   <voice>
     *: none
     recording: "Dvintrin micro"
-    h100,h120,h300: "Dvintrin micro"
+    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
   </voice>
 </phrase>
 <phrase>
@@ -5943,15 +5943,15 @@
   user: core
   <source>
     *: none
-    recording,player: "Line In"
+    recording,archosplayer: "Line In"
   </source>
   <dest>
     *: none
-    recording,player: "Intrêye"
+    recording,archosplayer: "Intrêye"
   </dest>
   <voice>
     *: none
-    recording,player: "intrêye"
+    recording,archosplayer: "intrêye"
   </voice>
 </phrase>
 <phrase>
@@ -6881,11 +6881,11 @@
   user: core
   <source>
     *: "Buffer:"
-    player: "Buf:"
+    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Tampon:"
-    player: "Tamp.:"
+    archosplayer: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6897,13 +6897,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batreye: %d%% %dh %dm"
-    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batr: %d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Livea del batreye"
@@ -6961,19 +6961,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    e200*,c200*,fuze*: "mSD:"
+    sansae200*,sansac200*,sansafuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DP1"
-    e200*,c200*,fuze*: "MSD:"
+    sansae200*,sansac200*,sansafuze*: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D P 1"
-    e200*,c200*,fuze*: "micro S D"
+    sansae200*,sansac200*,sansafuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8085,11 +8085,11 @@
   user: core
   <source>
     *: "End of Song List"
-    player: "End of List"
+    archosplayer: "End of List"
   </source>
   <dest>
     *: "Coron del djivêye di boket"
-    player: "Coron del djivêye"
+    archosplayer: "Coron del djivêye"
   </dest>
   <voice>
     *: "Coron del djivêye di boket"
@@ -8332,20 +8332,20 @@
   <source>
     *: none
     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*,c200*: "The disk is full. Press PREV 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."
   </source>
   <dest>
     *: none
     recording: "Li plake est plinne. Tchôkîz OFF et tcheryî pus lon."
-    h100,h120,h300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
-    m5,x5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon."
-    e200*,c200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
+    iriverh100,iriverh120,iriverh300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
+    iaudiom5,iaudiox5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon."
+    sansae200*,sansac200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8429,25 +8429,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on recorder models
+  desc: Used on archosrecorder models
   user: core
   <source>
     *: "OFF to abort"
-    player,h100,h120,h300: "STOP to abort"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    x5,m5: "Long PLAY to abort"
-    h10,h10_5gb,e200*,c200*: "PREV to abort"
+    iaudiox5,iaudiom5: "Long PLAY to abort"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatf: "POWER to abort"
+    gigabeatfx: "POWER to abort"
   </source>
   <dest>
     *: "OFF po-z abandner"
-    player,h100,h120,h300: "STOP po-z abandner"
+    archosplayer,iriverh100,iriverh120,iriverh300: "STOP po-z abandner"
     ipod*: "PLAY/PAUSE po-z abandner"
-    x5,m5: "Long PLAY po-z abandner"
-    h10,h10_5gb,e200*,c200*: "PREV po-z abandner"
+    iaudiox5,iaudiom5: "Long PLAY po-z abandner"
+    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV po-z abandner"
     gigabeats: "BACK po-z abandner"
-    gigabeatf:"POWER po-z abandner"
+    gigabeatfx:"POWER po-z abandner"
   </dest>
   <voice>
     *: ""
@@ -8671,19 +8671,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 recorder
+  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
   user: core
   <source>
     *: none
-    recorder: "Battery: Top-Off Chg"
+    archosrecorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    recorder: "Batreye: pår ritcherdjeye"
+    archosrecorder: "Batreye: pår ritcherdjeye"
   </dest>
   <voice>
     *: none
-    recorder: "Batreye: pår ritcherdjeye"
+    archosrecorder: "Batreye: pår ritcherdjeye"
   </voice>
 </phrase>
 <phrase>
@@ -10500,7 +10500,7 @@
   </dest>
   <voice>
     *: none
-    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
+    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11711,15 +11711,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "Touchpad Sensitivity"
+    gigabeatfx: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatf: "Tinrûlisté do pavé-taprece"
+    gigabeatfx: "Tinrûlisté do pavé-taprece"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Tinrûlisté do pavé-taprece"
+    gigabeatfx: "Tinrûlisté do pavé-taprece"
   </voice>
 </phrase>
 <phrase>
@@ -11728,15 +11728,15 @@
   user: core
   <source>
     *: none
-    gigabeatf: "High"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    gigabeatf: "Hôte"
+    gigabeatfx: "Hôte"
   </dest>
   <voice>
     *: none
-    gigabeatf: "Hôte"
+    gigabeatfx: "Hôte"
   </voice>
 </phrase>
 <phrase>
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 088cab7212..438d98116f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -278,130 +278,130 @@ Lyre prototype 1 */
 
 /* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
-#include "config-player.h"
+#include "config/archosplayer.h"
 #elif defined(ARCHOS_RECORDER)
-#include "config-recorder.h"
+#include "config/archosrecorder.h"
 #elif defined(ARCHOS_FMRECORDER)
-#include "config-fmrecorder.h"
+#include "config/archosfmrecorder.h"
 #elif defined(ARCHOS_RECORDERV2)
-#include "config-recorderv2.h"
+#include "config/archosrecorderv2.h"
 #elif defined(ARCHOS_ONDIOSP)
-#include "config-ondiosp.h"
+#include "config/archosondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
-#include "config-ondiofm.h"
+#include "config/archosondiofm.h"
 #elif defined(ARCHOS_AV300)
-#include "config-av300.h"
+#include "config/archosav300.h"
 #elif defined(IRIVER_H100)
-#include "config-h100.h"
+#include "config/iriverh100.h"
 #elif defined(IRIVER_H120)
-#include "config-h120.h"
+#include "config/iriverh120.h"
 #elif defined(IRIVER_H300)
-#include "config-h300.h"
+#include "config/iriverh300.h"
 #elif defined(IAUDIO_X5)
-#include "config-iaudiox5.h"
+#include "config/iaudiox5.h"
 #elif defined(IAUDIO_M5)
-#include "config-iaudiom5.h"
+#include "config/iaudiom5.h"
 #elif defined(IAUDIO_M3)
-#include "config-iaudiom3.h"
+#include "config/iaudiom3.h"
 #elif defined(IPOD_COLOR)
-#include "config-ipodcolor.h"
+#include "config/ipodcolor.h"
 #elif defined(IPOD_NANO)
-#include "config-ipodnano.h"
+#include "config/ipodnano1g.h"
 #elif defined(IPOD_VIDEO)
-#include "config-ipodvideo.h"
+#include "config/ipodvideo.h"
 #elif defined(IPOD_1G2G)
-#include "config-ipod1g2g.h"
+#include "config/ipod1g2g.h"
 #elif defined(IPOD_3G)
-#include "config-ipod3g.h"
+#include "config/ipod3g.h"
 #elif defined(IPOD_4G)
-#include "config-ipod4g.h"
+#include "config/ipod4g.h"
 #elif defined(IPOD_NANO2G)
-#include "config-ipodnano2g.h"
+#include "config/ipodnano2g.h"
 #elif defined(IRIVER_IFP7XX)
-#include "config-ifp7xx.h"
+#include "config/iriverifp7xx.h"
 #elif defined(GIGABEAT_F)
-#include "config-gigabeat.h"
+#include "config/gigabeatfx.h"
 #elif defined(GIGABEAT_S)
-#include "config-gigabeat-s.h"
+#include "config/gigabeats.h"
 #elif defined(IPOD_MINI)
-#include "config-ipodmini.h"
+#include "config/ipodmini1g.h"
 #elif defined(IPOD_MINI2G)
-#include "config-ipodmini2g.h"
+#include "config/ipodmini2g.h"
 #elif defined(IRIVER_H10)
-#include "config-h10.h"
+#include "config/iriverh10.h"
 #elif defined(IRIVER_H10_5GB)
-#include "config-h10_5gb.h"
+#include "config/iriverh10_5gb.h"
 #elif defined(SANSA_E200)
-#include "config-e200.h"
+#include "config/sansae200.h"
 #elif defined(SANSA_C200)
-#include "config-c200.h"
+#include "config/sansac200.h"
 #elif defined(SANSA_M200)
-#include "config-m200.h"
+#include "config/sansam200.h"
 #elif defined(ELIO_TPJ1022)
-#include "config-tpj1022.h"
+#include "config/tatungtpj1022.h"
 #elif defined(MROBE_100)
-#include "config-mrobe100.h"
+#include "config/mrobe100.h"
 #elif defined(MROBE_500)
-#include "config-mrobe500.h"
+#include "config/mrobe500.h"
 #elif defined(LOGIK_DAX)
-#include "config-logikdax.h"
+#include "config/logikdax.h"
 #elif defined(IAUDIO_7)
-#include "config-iaudio7.h"
+#include "config/iaudio7.h"
 #elif defined(COWON_D2)
-#include "config-cowond2.h"
+#include "config/cowond2.h"
 #elif defined(CREATIVE_ZVM)
-#include "config-creativezvm.h"
+#include "config/zenvisionm.h"
 #elif defined(CREATIVE_ZVM60GB)
-#include "config-creativezvm60gb.h"
+#include "config/zenvisionm60gb.h"
 #elif defined(CREATIVE_ZV)
-#include "config-creativezv.h"
+#include "config/zenvisionm.h"
 #elif defined(PHILIPS_SA9200)
-#include "config-sa9200.h"
+#include "config/gogearsa9200.h"
 #elif defined(PHILIPS_HDD1630)
-#include "config-hdd1630.h"
+#include "config/gogearhdd1630.h"
 #elif defined(SANSA_C100)
-#include "config-c100.h"
+#include "config/sansac100.h"
 #elif defined(MEIZU_M6SL)
-#include "config-meizu-m6sl.h"
+#include "config/meizum6sl.h"
 #elif defined(MEIZU_M6SP)
-#include "config-meizu-m6sp.h"
+#include "config/meizum6sp.h"
 #elif defined(MEIZU_M3)
-#include "config-meizu-m3.h"
+#include "config/meizum3.h"
 #elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777)
-#include "config-ondavx747.h"
+#include "config/ondavx747.h"
 #elif defined(ONDA_VX767)
-#include "config-ondavx767.h"
+#include "config/ondavx767.h"
 #elif defined(SANSA_CLIP)
-#include "config-clip.h"
+#include "config/sansaclip.h"
 #elif defined(SANSA_E200V2)
-#include "config-e200v2.h"
+#include "config/sansae200v2.h"
 #elif defined(SANSA_M200V4)
-#include "config-m200v4.h"
+#include "config/sansam200v4.h"
 #elif defined(SANSA_FUZE)
-#include "config-fuze.h"
+#include "config/sansafuze.h"
 #elif defined(SANSA_C200V2)
-#include "config-c200v2.h"
+#include "config/sansac200v2.h"
 #elif defined(SANSA_VIEW)
-#include "config-view.h"
+#include "config/sansaview.h"
 #elif defined(LYRE_PROTO1)
-#include "config-lyre_proto1.h"
+#include "config/lyreproto1.h"
 #elif defined(MINI2440)
-#include "config-mini2440.h"
+#include "config/mini2440.h"
 #elif defined(SAMSUNG_YH820)
-#include "config-yh820.h"
+#include "config/samsungyh820.h"
 #elif defined(SAMSUNG_YH920)
-#include "config-yh920.h"
+#include "config/samsungyh920.h"
 #elif defined(SAMSUNG_YH925)
-#include "config-yh925.h"
+#include "config/samsungyh925.h"
 #elif defined(SAMSUNG_YPS3)
-#include "config-yps3.h"
+#include "config/samsungyps3.h"
 #else
 /* no known platform */
 #endif
 
 /* keep this include after the target configs */
 #ifdef SIMULATOR
-#include "config-sim.h"
+#include "config/sim.h"
 #endif
 
 /* setup basic macros from capability masks */
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config/archosfmrecorder.h
index d9f3a95f3e..d9f3a95f3e 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config/archosfmrecorder.h
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config/archosondiofm.h
index b14f113244..b14f113244 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config/archosondiofm.h
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config/archosondiosp.h
index 452b47b78e..452b47b78e 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config/archosondiosp.h
diff --git a/firmware/export/config-player.h b/firmware/export/config/archosplayer.h
index c60ee6a071..c60ee6a071 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config/archosplayer.h
diff --git a/firmware/export/config-recorder.h b/firmware/export/config/archosrecorder.h
index ef9f523c49..ef9f523c49 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config/archosrecorder.h
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config/archosrecorderv2.h
index c530fa5815..c530fa5815 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config/archosrecorderv2.h
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config/cowond2.h
index 88c7ce5b8f..88c7ce5b8f 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config/cowond2.h
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config/creativezv.h
index eff5a506c0..eff5a506c0 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config/creativezv.h
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config/gigabeatfx.h
index 363312a415..363312a415 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config/gigabeatfx.h
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config/gigabeats.h
index 7f55797a07..7f55797a07 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config/gigabeats.h
diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config/gogearhdd1630.h
index c9a3b035ca..c9a3b035ca 100644
--- a/firmware/export/config-hdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config/gogearsa9200.h
index d9b9462880..d9b9462880 100644
--- a/firmware/export/config-sa9200.h
+++ b/firmware/export/config/gogearsa9200.h
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config/iaudio7.h
index 44a6f84b0a..44a6f84b0a 100644
--- a/firmware/export/config-iaudio7.h
+++ b/firmware/export/config/iaudio7.h
diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config/iaudiom3.h
index 99c4605be0..99c4605be0 100644
--- a/firmware/export/config-iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config/iaudiom5.h
index 03add43dbf..03add43dbf 100644
--- a/firmware/export/config-iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config/iaudiox5.h
index bafe51f12d..bafe51f12d 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index cde745e874..cde745e874 100644
--- a/firmware/export/config-ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config/ipod3g.h
index e82cc92f56..e82cc92f56 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config/ipod3g.h
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config/ipod4g.h
index e6bdc35bd8..e6bdc35bd8 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config/ipod4g.h
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config/ipodcolor.h
index 0f1de4fdba..0f1de4fdba 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config/ipodmini1g.h
index 129829ffbb..129829ffbb 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config/ipodmini1g.h
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 8087269485..8087269485 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config/ipodnano1g.h
index e1ec1afa86..e1ec1afa86 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config/ipodnano1g.h
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index be7129b690..be7129b690 100644
--- a/firmware/export/config-ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config/ipodvideo.h
index 59ac6466e5..59ac6466e5 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
diff --git a/firmware/export/config-h10.h b/firmware/export/config/iriverh10.h
index cde1b6075e..cde1b6075e 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config/iriverh10.h
diff --git a/firmware/export/config-h100.h b/firmware/export/config/iriverh100.h
index d01ee1f3f9..d01ee1f3f9 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config/iriverh100.h
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index e69f6c2b20..e69f6c2b20 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
diff --git a/firmware/export/config-h120.h b/firmware/export/config/iriverh120.h
index 8751c121cc..8751c121cc 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config/iriverh120.h
diff --git a/firmware/export/config-h300.h b/firmware/export/config/iriverh300.h
index d2348397d2..d2348397d2 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config/iriverh300.h
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config/iriverifp7xx.h
index 48a53f8c9d..48a53f8c9d 100644
--- a/firmware/export/config-ifp7xx.h
+++ b/firmware/export/config/iriverifp7xx.h
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config/logikdax.h
index 8fbd064306..8fbd064306 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config/logikdax.h
diff --git a/firmware/export/config-lyre_proto1.h b/firmware/export/config/lyreproto1.h
index 250b8e2c00..250b8e2c00 100644
--- a/firmware/export/config-lyre_proto1.h
+++ b/firmware/export/config/lyreproto1.h
diff --git a/firmware/export/config-meizu-m3.h b/firmware/export/config/meizuiaudiom3.h
index 06720695eb..06720695eb 100644
--- a/firmware/export/config-meizu-m3.h
+++ b/firmware/export/config/meizuiaudiom3.h
diff --git a/firmware/export/config-meizu-m6sl.h b/firmware/export/config/meizum6sl.h
index ffa8903526..ffa8903526 100644
--- a/firmware/export/config-meizu-m6sl.h
+++ b/firmware/export/config/meizum6sl.h
diff --git a/firmware/export/config-meizu-m6sp.h b/firmware/export/config/meizum6sp.h
index 0fc7264192..0fc7264192 100644
--- a/firmware/export/config-meizu-m6sp.h
+++ b/firmware/export/config/meizum6sp.h
diff --git a/firmware/export/config-mini2440.h b/firmware/export/config/mini2440.h
index 5dad250930..5dad250930 100644
--- a/firmware/export/config-mini2440.h
+++ b/firmware/export/config/mini2440.h
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config/mrobe100.h
index 90419914b2..90419914b2 100644
--- a/firmware/export/config-mrobe100.h
+++ b/firmware/export/config/mrobe100.h
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config/mrobe500.h
index 96e25c9247..96e25c9247 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config/mrobe500.h
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config/ondavx747.h
index ac2032587a..ac2032587a 100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config/ondavx747.h
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config/ondavx767.h
index 661d3e9e5e..661d3e9e5e 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config/ondavx767.h
diff --git a/firmware/export/config-yh820.h b/firmware/export/config/samsungyh820.h
index 4968960803..4968960803 100644
--- a/firmware/export/config-yh820.h
+++ b/firmware/export/config/samsungyh820.h
diff --git a/firmware/export/config-yh920.h b/firmware/export/config/samsungyh920.h
index 310fa1374c..310fa1374c 100644
--- a/firmware/export/config-yh920.h
+++ b/firmware/export/config/samsungyh920.h
diff --git a/firmware/export/config-yh925.h b/firmware/export/config/samsungyh925.h
index 55d46ae1e1..55d46ae1e1 100644
--- a/firmware/export/config-yh925.h
+++ b/firmware/export/config/samsungyh925.h
diff --git a/firmware/export/config-yps3.h b/firmware/export/config/samsungyps3.h
index fd8fde6f6c..fd8fde6f6c 100644
--- a/firmware/export/config-yps3.h
+++ b/firmware/export/config/samsungyps3.h
diff --git a/firmware/export/config-c100.h b/firmware/export/config/sansac100.h
index a332bf5670..a332bf5670 100644
--- a/firmware/export/config-c100.h
+++ b/firmware/export/config/sansac100.h
diff --git a/firmware/export/config-c200.h b/firmware/export/config/sansac200.h
index 45cfb8aee9..45cfb8aee9 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config/sansac200.h
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config/sansac200v2.h
index 65aebf245b..65aebf245b 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config/sansac200v2.h
diff --git a/firmware/export/config-clip.h b/firmware/export/config/sansaclip.h
index 4fa5f94598..4fa5f94598 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config/sansaclip.h
diff --git a/firmware/export/config-e200.h b/firmware/export/config/sansae200.h
index 687878ce06..687878ce06 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config/sansae200.h
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config/sansae200v2.h
index 110555aec5..110555aec5 100644
--- a/firmware/export/config-e200v2.h
+++ b/firmware/export/config/sansae200v2.h
diff --git a/firmware/export/config-fuze.h b/firmware/export/config/sansafuze.h
index 4370aef42e..4370aef42e 100644
--- a/firmware/export/config-fuze.h
+++ b/firmware/export/config/sansafuze.h
diff --git a/firmware/export/config-m200.h b/firmware/export/config/sansam200.h
index 0f071e18ab..0f071e18ab 100644
--- a/firmware/export/config-m200.h
+++ b/firmware/export/config/sansam200.h
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config/sansam200v4.h
index af9f1aedc6..af9f1aedc6 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config/sansam200v4.h
diff --git a/firmware/export/config-view.h b/firmware/export/config/sansaview.h
index 4111b8380a..4111b8380a 100644
--- a/firmware/export/config-view.h
+++ b/firmware/export/config/sansaview.h
diff --git a/firmware/export/config-sim.h b/firmware/export/config/sim.h
index ec398c8b2d..ec398c8b2d 100644
--- a/firmware/export/config-sim.h
+++ b/firmware/export/config/sim.h
diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config/tatungtpj1022.h
index 89e3d6dff1..89e3d6dff1 100644
--- a/firmware/export/config-tpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config/zenvisionm.h
index d8005bb83d..d8005bb83d 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config/zenvisionm.h
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config/zenvisionm60gb.h
index 3e95ae7be7..3e95ae7be7 100644
--- a/firmware/export/config-creativezvm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
diff --git a/manual/platform/ondiofm.tex b/manual/platform/archosondiofm.tex
index c49a1363d7..cad2757923 100644
--- a/manual/platform/ondiofm.tex
+++ b/manual/platform/archosondiofm.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-ondio.tex}
+\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/ondiosp.tex b/manual/platform/archosondiosp.tex
index 43d74e76fd..db05569744 100644
--- a/manual/platform/ondiosp.tex
+++ b/manual/platform/archosondiosp.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-ondio.tex}
+\input{platform/keymap-archosondio.tex}
diff --git a/manual/platform/player.tex b/manual/platform/archosplayer.tex
index eddd5eddfc..f384639681 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/archosplayer.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-player.tex}
+\input{platform/keymap-archosplayer.tex}
diff --git a/manual/platform/recorder.tex b/manual/platform/archosrecorder.tex
index 9eaf9091d8..d1293c7403 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/archosrecorder.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-recorder.tex}
+\input{platform/keymap-archosrecorder.tex}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/archosrecorderv2fm.tex
index 99b829d8a5..c7ecc84374 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/archosrecorderv2fm.tex
@@ -21,4 +21,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-recorder.tex}
+\input{platform/keymap-archosrecorder.tex}
diff --git a/manual/platform/gigabeatf.tex b/manual/platform/gigabeatfx.tex
index e49f1593c8..e9dc01bd18 100644
--- a/manual/platform/gigabeatf.tex
+++ b/manual/platform/gigabeatfx.tex
@@ -25,5 +25,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-gigabeatf.tex}
+\input{platform/keymap-gigabeatfx.tex}
 \input{platform/remote-keymap-gigabeat.tex}
diff --git a/manual/platform/m3.tex b/manual/platform/iaudiom3.tex
index bbdd255299..37b7825bbc 100644
--- a/manual/platform/m3.tex
+++ b/manual/platform/iaudiom3.tex
@@ -22,5 +22,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap files
-\input{platform/keymap-m3.tex}
+\input{platform/keymap-iaudiom3.tex}
 \input{platform/remote-keymap-iaudio.tex}
diff --git a/manual/platform/m5.tex b/manual/platform/iaudiom5.tex
index c7233b11f2..60cd1f590f 100644
--- a/manual/platform/m5.tex
+++ b/manual/platform/iaudiom5.tex
@@ -23,4 +23,4 @@
 \newcommand{\disk}{hard disk}
 
 % link to external keymap file
-\input{platform/keymap-mx5.tex}
+\input{platform/keymap-iaudiomx5.tex}
diff --git a/manual/platform/x5.tex b/manual/platform/iaudiox5.tex
index df8473c602..5b5a2122f5 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/iaudiox5.tex
@@ -23,4 +23,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-mx5.tex}
+\input{platform/keymap-iaudiomx5.tex}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini1g.tex
index 7671a4fb1a..7671a4fb1a 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini1g.tex
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano1g.tex
index 974fe687ec..974fe687ec 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano1g.tex
diff --git a/manual/platform/h10.tex b/manual/platform/iriverh10.tex
index 4b99b1ba51..eae5e5c4b9 100644
--- a/manual/platform/h10.tex
+++ b/manual/platform/iriverh10.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h10.tex}
+\input{platform/keymap-iriverh10.tex}
diff --git a/manual/platform/h100.tex b/manual/platform/iriverh100.tex
index 19e4ef0677..336f68489d 100644
--- a/manual/platform/h100.tex
+++ b/manual/platform/iriverh100.tex
@@ -25,6 +25,6 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h100_h300.tex}
-\input{platform/remote-keymap-h100.tex}
+\input{platform/keymap-iriverh100_h300.tex}
+\input{platform/remote-keymap-iriverh100.tex}
 
diff --git a/manual/platform/h10_5gb.tex b/manual/platform/iriverh10_5gb.tex
index d89e1eabcd..0cb0376dfe 100644
--- a/manual/platform/h10_5gb.tex
+++ b/manual/platform/iriverh10_5gb.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h10.tex}
+\input{platform/keymap-iriverh10.tex}
diff --git a/manual/platform/h300.tex b/manual/platform/iriverh300.tex
index 211bc1a9b0..ba66fac13c 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/iriverh300.tex
@@ -23,5 +23,5 @@
 \newcommand{\disk}{hard disk}
 
 % link external keymap file
-\input{platform/keymap-h100_h300.tex}
+\input{platform/keymap-iriverh100_h300.tex}
 
diff --git a/manual/platform/keymap-player.tex b/manual/platform/keymap-archosplayer.tex
index 651239b4d9..651239b4d9 100644
--- a/manual/platform/keymap-player.tex
+++ b/manual/platform/keymap-archosplayer.tex
diff --git a/manual/platform/keymap-recorder.tex b/manual/platform/keymap-archosrecorder.tex
index ac194a4422..ac194a4422 100644
--- a/manual/platform/keymap-recorder.tex
+++ b/manual/platform/keymap-archosrecorder.tex
diff --git a/manual/platform/keymap-gigabeatf.tex b/manual/platform/keymap-gigabeatfx.tex
index 39d51b0dd5..39d51b0dd5 100644
--- a/manual/platform/keymap-gigabeatf.tex
+++ b/manual/platform/keymap-gigabeatfx.tex
diff --git a/manual/platform/keymap-m3.tex b/manual/platform/keymap-iaudiom3.tex
index 098422b21d..098422b21d 100644
--- a/manual/platform/keymap-m3.tex
+++ b/manual/platform/keymap-iaudiom3.tex
diff --git a/manual/platform/keymap-h10.tex b/manual/platform/keymap-iriverh10.tex
index 364504fcd7..364504fcd7 100644
--- a/manual/platform/keymap-h10.tex
+++ b/manual/platform/keymap-iriverh10.tex
diff --git a/manual/platform/keymap-h100_h300.tex b/manual/platform/keymap-iriverh100_h300.tex
index 419dc0bfcf..419dc0bfcf 100644
--- a/manual/platform/keymap-h100_h300.tex
+++ b/manual/platform/keymap-iriverh100_h300.tex
diff --git a/manual/platform/keymap-c200.tex b/manual/platform/keymap-sansac200.tex
index 8fbed84de3..8fbed84de3 100644
--- a/manual/platform/keymap-c200.tex
+++ b/manual/platform/keymap-sansac200.tex
diff --git a/manual/platform/keymap-clip.tex b/manual/platform/keymap-sansaclip.tex
index 1ddc718e44..1ddc718e44 100644
--- a/manual/platform/keymap-clip.tex
+++ b/manual/platform/keymap-sansaclip.tex
diff --git a/manual/platform/keymap-e200.tex b/manual/platform/keymap-sansae200.tex
index 253e8898eb..253e8898eb 100644
--- a/manual/platform/keymap-e200.tex
+++ b/manual/platform/keymap-sansae200.tex
diff --git a/manual/platform/keymap-fuze.tex b/manual/platform/keymap-sansafuze.tex
index 8c4935c013..8c4935c013 100644
--- a/manual/platform/keymap-fuze.tex
+++ b/manual/platform/keymap-sansafuze.tex
diff --git a/manual/platform/remote-keymap-h100.tex b/manual/platform/remote-keymap-iriverh100.tex
index cc0537047b..cc0537047b 100644
--- a/manual/platform/remote-keymap-h100.tex
+++ b/manual/platform/remote-keymap-iriverh100.tex
diff --git a/manual/platform/c200.tex b/manual/platform/sansac200.tex
index 0c7473ee18..0db90eac40 100644
--- a/manual/platform/c200.tex
+++ b/manual/platform/sansac200.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-c200.tex}
+\input{platform/keymap-sansac200.tex}
diff --git a/manual/platform/clip.tex b/manual/platform/sansaclip.tex
index 018ef40b25..24a004597c 100644
--- a/manual/platform/clip.tex
+++ b/manual/platform/sansaclip.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-clip.tex}
+\input{platform/keymap-sansaclip.tex}
diff --git a/manual/platform/e200.tex b/manual/platform/sansae200.tex
index d20d34f2d7..2bdc3f562d 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/sansae200.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-e200.tex}
+\input{platform/keymap-sanse200.tex}
diff --git a/manual/platform/e200v2.tex b/manual/platform/sansae200v2.tex
index 25ce3a7311..a5001cc89d 100644
--- a/manual/platform/e200v2.tex
+++ b/manual/platform/sansae200v2.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-e200.tex}
+\input{platform/keymap-sansae200.tex}
diff --git a/manual/platform/fuze.tex b/manual/platform/sansafuze.tex
index 1c76948ee6..0020e2e01b 100644
--- a/manual/platform/fuze.tex
+++ b/manual/platform/sansafuze.tex
@@ -22,4 +22,4 @@
 \newcommand{\disk}{flash storage}
 
 % link external keymap file
-\input{platform/keymap-fuze.tex}
+\input{platform/keymap-sansafuze.tex}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index ab7593c893..a4aade54d0 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -23,7 +23,7 @@ you resume the game. The menu also allows the user to reload the last game
 saved, save the current position and start a new game without having to quit
 the game.
 
-\opt{recorder,recorderv2fm,ondio}{
+\opt{archosrecorder,archosrecorderv2fm,ondio}{
 \note{This plugin will stop playback.}
 }
 
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 292327046f..1974c65eef 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -16,7 +16,7 @@ text files%
 \section{Games}
 \opt{lcd_bitmap}
     {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator}
-    \opt{recorder,recorderv2fm,h100,m5,lcd_color}
+    \opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}
     {and Rockboy in \reference{ref:Rockboy}}.}
 
 \opt{lcd_bitmap}{\input{plugins/blackjack.tex}}
@@ -41,7 +41,7 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/goban.tex}}
 
-\opt{lcd_non-mono}{\nopt{h10_5gb,ipodmini,c200}{
+\opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,sansac200}{
   \input{plugins/invadrox.tex}}}
 
 {\input{plugins/jackpot.tex}}
@@ -52,9 +52,9 @@ text files%
 
 \opt{lcd_bitmap}{\input{plugins/minesweeper.tex}}
 
-\opt{player}{\input{plugins/nim.tex}}
+\opt{archosplayer}{\input{plugins/nim.tex}}
 
-\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}}
+\opt{iriverh100,iaudiom5,lcd_color}{\nopt{sansac200}{\input{plugins/pacbox.tex}}}
 
 \opt{lcd_bitmap}{\input{plugins/pegbox.tex}}
 
@@ -166,7 +166,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{swcodec}{\input{plugins/midiplay.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/movieplayer.tex}}
 
 \opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}}
 
@@ -174,9 +174,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{lcd_color}{\input{plugins/ppmviewer.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}}
 
-\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}}
+\opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}{\input{plugins/rockboy.tex}}
 
 {\input{plugins/search.tex}}
 
@@ -188,13 +188,13 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/vbrfix.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/wavplay.tex}}
 
 \opt{lcd_bitmap}{\input{plugins/zxbox.tex}}
 
 \section{Applications}
 
-\opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}}
+\opt{archosplayer,archosrecorder,archosrecorderv2fm}{\input{plugins/alpinecdc.tex}}
 
 {\input{plugins/batterybenchmark.tex}}
 
@@ -208,9 +208,9 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 {\input{plugins/disktidy.tex}}
 
-\opt{player}{\input{plugins/euro_converter.tex}}
+\opt{archosplayer}{\input{plugins/euro_converter.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/firmware_flash.tex}}
 
 {\input{plugins/keybox.tex}}
 
@@ -226,7 +226,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \opt{lcd_color}{\input{plugins/rockpaint.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/split_editor.tex}}
+\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/split_editor.tex}}
 
 {\input{plugins/stats.tex}}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 90a5bc0015..73a042d725 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,7 +1,7 @@
 \subsection{Mandelbrot}
 \screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
 This demonstration draws fractal images from the Mandelbrot set
-\opt{archos,h100}{using the greyscale engine}.
+\opt{archos,iriverh100}{using the greyscale engine}.
 \begin{table}
   \begin{btnmap}{}{}
     Direction keys
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index 015622be1d..a838debcad 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -9,7 +9,7 @@ containing several \fname{.pat} files and two \fname {.cfg} files. Just
 select a MIDI file with either the \fname{.mid} or \fname{.midi} extension
 in the file browser to start playback.
 % portalplayer targets
-\opt{ipod,sansa,h10,h10_5gb,mrobe100}{
+\opt{ipod,sansa,iriverh10,iriverh10_5gb,mrobe100}{
 \note{Currently playing MIDI files is still in its early stages and you
 might experience ``Buffer miss!'' with many files, except simple ones.}
 }
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index bfa61110a0..33f19821c6 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -66,7 +66,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
         & Select\\
         %
     }
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5}{
         \opt{RECORDER_PAD}{\ButtonOn}
         \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch}
               \opt{HAVEREMOTEKEYMAP}{& }
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 3e2cfca56c..e4e9ce872a 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -3,7 +3,7 @@
 This demo replicates snow falling on your screen. If you love winter,
 you will love this demo.  Or maybe not.
 %
-\opt{player}{Press \ButtonStop\ to quit.}%
+\opt{archosplayer}{Press \ButtonStop\ to quit.}%
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}%
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}%
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}%
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index 442a86c9ff..8e9fe9c16b 100644
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -2,7 +2,7 @@
 \screenshot{plugins/images/ss-stats}{The stats-plugin}{}
 
 The stats-plugin simply counts the number of files%
-\nopt{player}{, music files }%
+\nopt{archosplayer}{, music files }%
 and directories on your \dap.
 Press %
 \opt{PLAYER_PAD}{\ButtonStop}%
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 713c21b546..908cc110f2 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -82,14 +82,14 @@ ipod4g.c: bootloader-ipod4g.ipod ipod2c
 ipodcolor.c: bootloader-ipodcolor.ipod ipod2c
 	./ipod2c bootloader-ipodcolor.ipod ipodcolor
 
-ipodmini.c: bootloader-ipodmini.ipod ipod2c
-	./ipod2c bootloader-ipodmini.ipod ipodmini
+ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c
+	./ipod2c bootloader-ipodmini1g.ipod ipodmini1g
 
 ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c
 	./ipod2c bootloader-ipodmini2g.ipod ipodmini2g
 
-ipodnano.c: bootloader-ipodnano.ipod ipod2c
-	./ipod2c bootloader-ipodnano.ipod ipodnano
+ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c
+	./ipod2c bootloader-ipodnano1g.ipod ipodnano1g
 
 ipodvideo.c: bootloader-ipodvideo.ipod ipod2c
 	./ipod2c bootloader-ipodvideo.ipod ipodvideo
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index e7872c0978..26202fb253 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -37,10 +37,10 @@
 #include "ipod1g2g.h"
 #include "ipod3g.h"
 #include "ipod4g.h"
-#include "ipodmini.h"
+#include "ipodmini1g.h"
 #include "ipodmini2g.h"
 #include "ipodcolor.h"
-#include "ipodnano.h"
+#include "ipodnano1g.h"
 #include "ipodvideo.h"
 #include "ipodnano2g.h"
 #endif
@@ -1686,7 +1686,7 @@ int getmodel(struct ipod_t* ipod, int ipod_version)
             ipod->modelstr="1st Generation Nano";
             ipod->modelnum = 4;
             ipod->modelname = "nano";
-            ipod->targetname = "ipodnano";
+            ipod->targetname = "ipodnano1g";
 #ifdef WITH_BOOTOBJS
             ipod->bootloader = ipodnano;
             ipod->bootloader_len = LEN_ipodnano;
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 0c5dd40e39..c8f02b2cf8 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -16,20 +16,20 @@ genlang_url=http://www.rockbox.org/genlang/
 rbutil_url=http://download.rockbox.org/rbutil/
 
 [platforms]
-platform01=player
-platform02=recorder
-platform03=recorder8mb
-platform04=recorderv2
-platform05=fmrecorder
-platform06=fmrecorder8mb
-platform07=ondiosp
-platform08=ondiofm
-platform10=h100
-platform11=h120
-platform12=h300
-platform13=h10_5gbums
-platform14=h10_5gbmtp
-platform15=h10
+platform01=archosplayer
+platform02=archosrecorder
+platform03=archosrecorder8mb
+platform04=archosrecorderv2
+platform05=archosfmrecorder
+platform06=archosfmrecorder8mb
+platform07=archosondiosp
+platform08=archosondiofm
+platform10=iriverh100
+platform11=iriverh120
+platform12=iriverh300
+platform13=iriverh10_5gbums
+platform14=iriverh10_5gbmtp
+platform15=iriverh10
 platform20=ipod1g2g
 platform21=ipod3g
 platform22=ipod4gray
@@ -210,7 +210,7 @@ manualname=
 brand=Iriver
 usbid=0x0b7000ba
 usberror=0x41022101
-configure_modelname=h10
+configure_modelname=iriverh10
 encoder=rbspeex
 
 [ipod1g2g]
@@ -233,14 +233,14 @@ brand=Apple
 configure_modelname=ipodcolor
 encoder=rbspeex
 
-[ipodnano]
+[ipodnano1g]
 name="Ipod Nano (1st gen)"
-buildserver_modelname=ipodnano
+buildserver_modelname=ipodnano1g
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodnano.ipod
+bootloadername=/ipod/bootloader-ipodnano1g.ipod
 manualname=
 brand=Apple
-configure_modelname=ipodnano
+configure_modelname=ipodnano1g
 encoder=rbspeex
 
 [ipodnano2g]
@@ -298,7 +298,7 @@ encoder=rbspeex
 name="Ipod Mini (1st gen)"
 buildserver_modelname=ipodmini1g
 bootloadermethod=ipod
-bootloadername=/ipod/bootloader-ipodmini.ipod
+bootloadername=/ipod/bootloader-ipodmini1g.ipod
 manualname=rockbox-ipodmini2g
 brand=Apple
 configure_modelname=ipodmini
@@ -323,7 +323,7 @@ bootloaderfile=/FIRMWARE/x5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210510, 0x0e210513
-configure_modelname=x5
+configure_modelname=iaudiox5
 encoder=rbspeex
 
 [iaudiox5v]
@@ -334,7 +334,7 @@ bootloadername=/iaudio/x5v_fw.bin
 bootloaderfile=/FIRMWARE/x5v_fw.bin
 manualname=
 brand=Cowon
-configure_modelname=x5
+configure_modelname=iaudiox5
 encoder=rbspeex
 
 [iaudiom5]
@@ -346,7 +346,7 @@ bootloaderfile=/FIRMWARE/m5_fw.bin
 manualname=
 brand=Cowon
 usbid=0x0e210520
-configure_modelname=m5
+configure_modelname=iaudiom5
 encoder=rbspeex
 
 [iaudiom3]
@@ -382,7 +382,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
-configure_modelname=e200
+configure_modelname=sansae200
 encoder=rbspeex
 
 [sansac200]
@@ -393,7 +393,7 @@ bootloadername=/sandisk-sansa/c200/firmware.mi4
 manualname=
 brand=Sandisk
 usbid=0x07817450, 0x07817451
-configure_modelname=c200
+configure_modelname=sansac200
 encoder=rbspeex
 
 [sansae200v2]
@@ -406,7 +406,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817423
 usberror=0x07817422
-configure_modelname=e200v2
+configure_modelname=sansae200v2
 encoder=rbspeex
 
 [sansafuze]
@@ -419,7 +419,7 @@ manualname=
 brand=Sandisk
 usbid=0x078174c1
 usberror=0x078174c0
-configure_modelname=fuze
+configure_modelname=sansafuze
 encoder=rbspeex
 
 [sansam200v4]
@@ -432,7 +432,7 @@ manualname=
 brand=Sandisk
 usbid=
 usberror=
-configure_modelname=m200v4
+configure_modelname=sansam200v4
 encoder=rbspeex
 status=disabled
 
@@ -446,7 +446,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817433
 usberror=0x07817432
-configure_modelname=clip
+configure_modelname=sansaclip
 encoder=rbspeex
 
 [mrobe100]
diff --git a/tools/configure b/tools/configure
index 50b89dc4fa..bdea279c3e 100755
--- a/tools/configure
+++ b/tools/configure
@@ -354,16 +354,16 @@ whichadvanced () {
     if [ "$memory" = "2" ]; then
       printf ", (8)MB MOD"
     fi
-    if [ "$modelname" = "player" ]; then
+    if [ "$modelname" = "archosplayer" ]; then
       printf ", Use (A)TA poweroff"
     fi
     if [ "$t_model" = "ondio" ]; then
       printf ", (B)acklight MOD"
     fi
-    if [ "$modelname" = "m5" ]; then
+    if [ "$modelname" = "iaudiom5" ]; then
       printf ", (F)M radio MOD"
     fi
-    if [ "$modelname" = "h120" ]; then
+    if [ "$modelname" = "iriverh120" ]; then
       printf ", (R)TC MOD"
     fi
     echo ""
@@ -414,7 +414,7 @@ whichadvanced () {
         fi
         ;;
       [Aa])
-        if [ "$modelname" = "player" ]; then
+        if [ "$modelname" = "archosplayer" ]; then
           have_ata_poweroff="#define HAVE_ATA_POWEROFF"
           echo "ATA poweroff enabled"
         fi
@@ -426,13 +426,13 @@ whichadvanced () {
         fi
         ;;
       [Ff])
-        if [ "$modelname" = "m5" ]; then
+        if [ "$modelname" = "iaudiom5" ]; then
           have_fmradio_in="#define HAVE_FMRADIO_IN"
           echo "FM radio functions enabled"
         fi
         ;;
       [Rr])
-        if [ "$modelname" = "h120" ]; then
+        if [ "$modelname" = "iriverh120" ]; then
           config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231"
           have_rtc_alarm="#define HAVE_RTC_ALARM"
           echo "RTC functions enabled (DS1339/DS3231)"
@@ -889,7 +889,7 @@ else
 cat <<EOF
  ==Archos==               ==iriver==             ==Apple iPod==
   0) Player/Studio        10) H120/H140          20) Color/Photo
-  1) Recorder             11) H320/H340          21) Nano
+  1) Recorder             11) H320/H340          21) Nano 1G
   2) FM Recorder          12) iHP-100/110/115    22) Video
   3) Recorder v2          13) iFP-790            23) 3G
   4) Ondio SP             14) H10 20Gb           24) 4G Grayscale
@@ -978,9 +978,9 @@ fi
 
   case $buildfor in
 
-   0|player)
+   0|archosplayer)
     target_id=1
-    modelname="player"
+    modelname="archosplayer"
     target="-DARCHOS_PLAYER"
     shcc
     tool="$rootdir/tools/scramble"
@@ -1004,9 +1004,9 @@ fi
     t_model="player"
     ;;
 
-   1|recorder)
+   1|archosrecorder)
     target_id=2
-    modelname="recorder"
+    modelname="archosrecorder"
     target="-DARCHOS_RECORDER"
     shcc
     tool="$rootdir/tools/scramble"
@@ -1026,9 +1026,9 @@ fi
     t_model="recorder"
     ;;
 
-   2|fmrecorder)
+   2|archosfmrecorder)
     target_id=3
-    modelname="fmrecorder"
+    modelname="archosfmrecorder"
     target="-DARCHOS_FMRECORDER"
     shcc
     tool="$rootdir/tools/scramble -fm"
@@ -1048,9 +1048,9 @@ fi
     t_model="fm_v2"
     ;;
 
-   3|recorderv2)
+   3|archosrecorderv2)
     target_id=4
-    modelname="recorderv2"
+    modelname="archosrecorderv2"
     target="-DARCHOS_RECORDERV2"
     shcc
     tool="$rootdir/tools/scramble -v2"
@@ -1070,9 +1070,9 @@ fi
     t_model="fm_v2"
     ;;
 
-   4|ondiosp)
+   4|archosondiosp)
     target_id=7
-    modelname="ondiosp"
+    modelname="archosondiosp"
     target="-DARCHOS_ONDIOSP"
     shcc
     tool="$rootdir/tools/scramble -osp"
@@ -1092,9 +1092,9 @@ fi
     t_model="ondio"
     ;;
 
-   5|ondiofm)
+   5|archosondiofm)
     target_id=8
-    modelname="ondiofm"
+    modelname="archosondiofm"
     target="-DARCHOS_ONDIOFM"
     shcc
     tool="$rootdir/tools/scramble -ofm"
@@ -1112,9 +1112,9 @@ fi
     t_model="ondio"
     ;;
 
-   6|av300)
+   6|archosav300)
     target_id=38
-    modelname="av300"
+    modelname="archosav300"
     target="-DARCHOS_AV300"
     memory=16 # always
     arm7tdmicc
@@ -1134,9 +1134,9 @@ fi
     t_model="av300"
     ;;
 
-  10|h120)
+  10|iriverh120)
     target_id=9
-    modelname="h120"
+    modelname="iriverh120"
     target="-DIRIVER_H120"
     memory=32 # always
     coldfirecc
@@ -1159,9 +1159,9 @@ fi
     t_model="h100"
     ;;
 
-   11|h300)
+   11|iriverh300)
     target_id=10
-    modelname="h300"
+    modelname="iriverh300"
     target="-DIRIVER_H300"
     memory=32 # always
     coldfirecc
@@ -1182,9 +1182,9 @@ fi
     t_model="h300"
     ;;
 
-   12|h100)
+   12|iriverh100)
     target_id=11
-    modelname="h100"
+    modelname="iriverh100"
     target="-DIRIVER_H100"
     memory=16 # always
     coldfirecc
@@ -1207,9 +1207,9 @@ fi
     t_model="h100"
     ;;
 
-   13|ifp7xx)
+   13|iriverifp7xx)
     target_id=19
-    modelname="ifp7xx"
+    modelname="iriverifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
     arm7tdmicc short
@@ -1228,9 +1228,9 @@ fi
     t_model="iriver-ifp7xx"
     ;;
 
-   14|h10)
+   14|iriverh10)
     target_id=22
-    modelname="h10"
+    modelname="iriverh10"
     target="-DIRIVER_H10"
     memory=32 # always
     arm7tdmicc
@@ -1252,9 +1252,9 @@ fi
     t_model="h10"
     ;;
 
-   15|h10_5gb)
+   15|iriverh10_5gb)
     target_id=24
-    modelname="h10_5gb"
+    modelname="iriverh10_5gb"
     target="-DIRIVER_H10_5GB"
     memory=32 # always
     arm7tdmicc
@@ -1299,9 +1299,9 @@ fi
     t_model="color"
     ;;
 
-   21|ipodnano)
+   21|ipodnano1g)
     target_id=14
-    modelname="ipodnano"
+    modelname="ipodnano1g"
     target="-DIPOD_NANO"
     memory=32 # always
     arm7tdmicc
@@ -1390,9 +1390,9 @@ fi
     t_model="4g"
     ;;
 
-   25|ipodmini)
+   25|ipodmini1g)
     target_id=18
-    modelname="ipodmini"
+    modelname="ipodmini1g"
     target="-DIPOD_MINI"
     memory=32 # always
     arm7tdmicc
@@ -1482,9 +1482,9 @@ fi
     t_model="ipodnano2g"
     ;;
 
-   30|x5)
+   30|iaudiox5)
     target_id=12
-    modelname="x5"
+    modelname="iaudiox5"
     target="-DIAUDIO_X5"
     memory=16 # always
     coldfirecc
@@ -1506,9 +1506,9 @@ fi
     t_model="x5"
     ;;
 
-   31|m5)
+   31|iaudiom5)
     target_id=28
-    modelname="m5"
+    modelname="iaudiom5"
     target="-DIAUDIO_M5"
     memory=16 # always
     coldfirecc
@@ -1576,9 +1576,9 @@ fi
     t_model="cowond2"
     ;;
     
-   34|m3)
+   34|iaudiom3)
     target_id=37
-    modelname="m3"
+    modelname="iaudiom3"
     target="-DIAUDIO_M3"
     memory=16 # always
     coldfirecc
@@ -1598,9 +1598,9 @@ fi
     t_model="m3"
     ;;
 
-   40|gigabeatf)
+   40|gigabeatfx)
     target_id=20
-    modelname="gigabeatf"
+    modelname="gigabeatfx"
     target="-DGIGABEAT_F"
     memory=32 # always
     arm9tdmicc
@@ -1785,9 +1785,9 @@ fi
     t_model="creative-zvm"
     ;;
 
-   50|e200)
+   50|sansae200)
     target_id=23
-    modelname="e200"
+    modelname="sansae200"
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1809,12 +1809,12 @@ fi
     t_model="sansa-e200"
     ;;
 
-   51|e200r)
+   51|sansae200r)
     # the e200R model is pretty much identical to the e200, it only has a
     # different option to the scramble tool when building a bootloader and
     # makes the bootloader output file name in all lower case.
     target_id=27
-    modelname="e200r"
+    modelname="sansae200r"
     target="-DSANSA_E200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1836,9 +1836,9 @@ fi
     t_model="sansa-e200"
     ;;
 
-   52|c200)
+   52|sansac200)
     target_id=30
-    modelname="c200"
+    modelname="sansac200"
     target="-DSANSA_C200"
     memory=32 # supposedly
     arm7tdmicc
@@ -1860,9 +1860,9 @@ fi
     t_model="sansa-c200"
     ;;
 
-   53|m200)
+   53|sansam200)
     target_id=48
-    modelname="m200"
+    modelname="sansam200"
     target="-DSANSA_M200"
     memory=1 # always
     arm946cc
@@ -1884,9 +1884,9 @@ fi
     t_model="m200"
     ;;
 
-   54|c100)
+   54|sansac100)
     target_id=42 
-    modelname="c100" 
+    modelname="sansac100" 
     target="-DSANSA_C100"     
     memory=2
     arm946cc
@@ -1908,9 +1908,9 @@ fi
     t_model="c100"
     ;;
 
-   55|Clip|clip)
+   55|sansaclip)
     target_id=50
-    modelname="clip"
+    modelname="sansaclip"
     target="-DSANSA_CLIP"
     memory=2
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1929,9 +1929,9 @@ fi
     ;;
 
 
-   56|e200v2)
+   56|sansae200v2)
     target_id=51
-    modelname="e200v2"
+    modelname="sansae200v2"
     target="-DSANSA_E200V2"
     memory=8
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1950,9 +1950,9 @@ fi
     ;;
 
 
-   57|m200v4)
+   57|sansam200v4)
     target_id=52
-    modelname="m200v4"
+    modelname="sansam200v4"
     target="-DSANSA_M200V4"
     memory=2
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1971,9 +1971,9 @@ fi
     ;;
 
 
-   58|fuze)
+   58|sansafuze)
     target_id=53
-    modelname="fuze"
+    modelname="sansafuze"
     target="-DSANSA_FUZE"
     memory=8
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -1992,9 +1992,9 @@ fi
     ;;
 
 
-   59|c200v2)
+   59|sansac200v2)
     target_id=55
-    modelname="c200v2"
+    modelname="sansac200v2"
     target="-DSANSA_C200V2"
     memory=2 # as per OF diagnosis mode
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
@@ -2015,11 +2015,11 @@ fi
     arm9tdmicc
     ;;
 
-   60|Clipv2|clipv2)
+   60|sansaclipv2)
     echo "Sansa Clipv2 is not yet supported !"
     exit 1
     target_id=60
-    modelname="clipv2"
+    modelname="sansaclipv2"
     target="-DSANSA_CLIPV2"
     memory=8
     arm926ejscc
@@ -2037,11 +2037,11 @@ fi
     t_model="sansa-clipv2"
     ;;
 
-   61|view)
+   61|sansaview)
     echo "Sansa View is not yet supported!"
     exit 1
     target_id=63
-    modelname="view"
+    modelname="sansaview"
     target="-DSANSA_VIEW"
     memory=32
     arm1176jzscc
@@ -2061,10 +2061,10 @@ fi
     t_model="sansa-view"
     ;;
 
-   150|tpj1022)
+   150|tatungtpj1022)
     target_id=25
-    modelname="tpj1022"
-    target="-DELIO_TPJ1022"
+    modelname="tatungtpj1022"
+    target="-DTATUNG_TPJ1022"
     memory=32 # always
     arm7tdmicc
     tool="$rootdir/tools/scramble -add tpj2"
@@ -2085,9 +2085,9 @@ fi
     t_model="tpj1022"
     ;;
 
-   100|sa9200)
+   100|gogearsa9200)
     target_id=41
-    modelname="sa9200"
+    modelname="gogearsa9200"
     target="-DPHILIPS_SA9200"
     memory=32 # supposedly
     arm7tdmicc
@@ -2109,9 +2109,9 @@ fi
     t_model="sa9200"
     ;;
 
-   101|hdd1630)
+   101|gogearhdd1630)
     target_id=43
-    modelname="hdd1630"
+    modelname="gogearhdd1630"
     target="-DPHILIPS_HDD1630"
     memory=32 # supposedly
     arm7tdmicc
@@ -2287,9 +2287,9 @@ fi
     t_model="onda_vx747"
     ;;
     
-    130|lyre_proto1)
+    130|lyreproto1)
     target_id=56
-    modelname="lyre_proto1"
+    modelname="lyreproto1"
     target="-DLYRE_PROTO1"
     memory=64
     arm926ejscc
@@ -2331,9 +2331,9 @@ fi
     t_model="mini2440"
     ;;
 
-   140|yh820)
+   140|samsungyh820)
     target_id=57
-    modelname="yh820"
+    modelname="samsungyh820"
     target="-DSAMSUNG_YH820"
     memory=32 # always
     arm7tdmicc
@@ -2355,9 +2355,9 @@ fi
     t_model="yh820"
     ;;
 
-   141|yh920)
+   141|samsungyh920)
     target_id=58
-    modelname="yh920"
+    modelname="samsungyh920"
     target="-DSAMSUNG_YH920"
     memory=32 # always
     arm7tdmicc
@@ -2379,9 +2379,9 @@ fi
     t_model="yh920"
     ;;
 
-   142|yh925)
+   142|samsungyh925)
     target_id=59
-    modelname="yh925"
+    modelname="samsungyh925"
     target="-DSAMSUNG_YH925"
     memory=32 # always
     arm7tdmicc
@@ -2403,9 +2403,9 @@ fi
     t_model="yh925"
     ;;
 
-   143|yps3)
+   143|samsungyps3)
     target_id=60
-    modelname="yps3"
+    modelname="samsungyps3"
     target="-DSAMSUNG_YPS3"
     memory=16 # always
     arm940tbecc
@@ -2489,13 +2489,13 @@ fi
   # the ifp7x0 is the only platform that supports building a gdb stub like
   # this
 case $modelname in
-  ifp7xx)
+  iriverifp7xx)
      gdbstub="(G)DB stub, "
      ;;
-  e200r|e200)
+  sansae200r|sansae200)
      gdbstub="(I)nstaller, "
      ;;
-  c200)
+  sansac200)
      gdbstub="(E)raser, "
      ;;
   *)
@@ -2572,7 +2572,7 @@ fi
       appsdir='\$(ROOTDIR)/gdb'
       apps="stub"
       case $modelname in
-          ifp7xx)
+          iriverifp7xx)
               output="stub.wma"
               ;;
           *)
@@ -2608,7 +2608,7 @@ fi
       echo "Database tool build selected"
       ;;
     *)
-      if [ "$modelname" = "e200r" ]; then
+      if [ "$modelname" = "sansae200r" ]; then
           echo "Do not use the e200R target for regular builds.  Use e200 instead."
           exit 8
       fi
@@ -2620,17 +2620,17 @@ fi
   esac
   # to be able running "make manual" from non-manual configuration
   case $modelname in
-      fmrecorder)
-          manualdev="recorderv2fm"
+      archosfmrecorder)
+          manualdev="archosrecorderv2fm"
           ;;
-      recorderv2)
-          manualdev="recorderv2fm"
+      archosrecorderv2)
+          manualdev="archosrecorderv2fm"
           ;;
-      h1??)
-          manualdev="h100"
+      iriverh1??)
+          manualdev="iriverh100"
           ;;
       ipodmini2g)
-          manualdev="ipodmini"
+          manualdev="ipodmini1g"
           ;;
       *)
           manualdev=$modelname
diff --git a/tools/release/bins.pl b/tools/release/bins.pl
index 9dc282410c..5cc92b1e94 100755
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@@ -73,7 +73,7 @@ sub fonts {
     chdir "build-$dir";
     print "Build fonts in build-$dir\n" if($verbose);
 
-    # build the manual(s)
+    # build the fonts
     $a = buildfonts($dir, $confnum, $newl);
 
     chdir "..";
@@ -98,8 +98,8 @@ sub buildit {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure',
-                    $confnum, $extra);
+    my $ram = $extra ? $extra : -1;
+    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -119,8 +119,8 @@ sub buildfonts {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure",
-                    $confnum, $newl?'\n':'');
+    my $ram = $extra ? $extra : -1;
+    my $c = "../tools/configure --type=n --target=$confnum --ram=$ram";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -133,37 +133,10 @@ sub buildfonts {
 print "cd tools && make\n" if($verbose);
 `(cd tools && make ) >/dev/null 2>&1`;
 
-runone("player", "player", '\n');
-runone("recorder", "recorder", '\n');
-runone("recorder8mb", "recorder", '8\n');
-runone("fmrecorder", "fmrecorder", '\n');
-runone("fmrecorder8mb", "fmrecorder", '8\n');
-runone("recorderv2", "recorderv2", '\n');
-runone("ondiosp", "ondiosp", '\n');
-runone("ondiofm", "ondiofm", '\n');
-runone("h100", "h100");
-runone("h120", "h120");
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", '32\n');
-runone("ipodvideo64mb", "ipodvideo", '64\n');
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("iaudiom3", "m3");
-runone("ipodmini1g", "ipodmini");
-runone("ipodmini2g", "ipodmini2g");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-#runone("mrobe500", "mrobe500");
-runone("mrobe100", "mrobe100");
-runone("cowond2", "cowond2");
-fonts("fonts", "x5");
+for my $b (&stablebuilds) {
+    my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b;
+    runone($b, $configname, $builds{b}{ram});
+}
 
+fonts("fonts", "iaudiox5");
 
diff --git a/tools/release/manuals.pl b/tools/release/manuals.pl
index b3c6976da8..368d31ac0b 100755
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@@ -16,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $conf, $nl)=@_;
+    my ($dir)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -28,7 +28,7 @@ sub runone {
     print "Build in buildm-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir, $conf, $nl);
+    $a = buildit($dir);
 
     chdir "..";
 
@@ -53,12 +53,11 @@ sub runone {
 };
 
 sub buildit {
-    my ($target, $confnum, $newl)=@_;
+    my ($target)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure',
-                    $confnum, $newl?'\n':'');
+    my $c = "../tools/configure --target=$target --type=m";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -73,27 +72,8 @@ sub buildit {
 # run make in tools first to make sure they're up-to-date
 `(cd tools && make ) >/dev/null 2>&1`;
 
-runone("player", "player", 1);
-runone("recorder", "recorder", 1);
-runone("fmrecorder", "fmrecorder", 1);
-runone("recorderv2", "recorderv2", 1);
-runone("ondiosp", "ondiosp", 1);
-runone("ondiofm", "ondiofm", 1);
-runone("h100", "h100");
-#runone("h120", 9);
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", 1);
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("ipodmini2g", "ipodmini2g");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-runone("mrobe100", "mrobe100");
+for my $b (&stablebuilds) {
+    next if ($builds{$b}{configname} < 3); # no variants
+
+    runone($b);
+}
diff --git a/tools/release/sims.pl b/tools/release/sims.pl
index 80e3bc2e74..abf652b312 100755
--- a/tools/release/sims.pl
+++ b/tools/release/sims.pl
@@ -4,6 +4,8 @@ use File::Basename;
 use File::Path;
 use Cwd;
 
+require "../builds.pm";
+
 my $verbose, $strip, $update, $doonly, $version;
 my @doonly;
 
@@ -92,7 +94,7 @@ if (!defined($version)) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $confnum, $extra)=@_;
+    my ($dir)=@_;
     my $a;
 
     if(@doonly > 0 && !grep(/^$dir$/, @doonly)) {
@@ -104,7 +106,7 @@ sub runone {
     print "Build in build-$dir\n" if($verbose);
 
     # build the target
-    $a = buildit($dir, $confnum, $extra);
+    $a = buildit($dir);
 
     # Do not continue if the rockboxui executable is not created. This will
     #    prevent a good build getting overwritten by a bad build when
diff --git a/tools/release/voices.pl b/tools/release/voices.pl
index 8ad3b2aa88..a5349618bb 100755
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@@ -16,7 +16,7 @@ if($ARGV[0]) {
 
 # made once for all targets
 sub runone {
-    my ($dir, $select, $newl)=@_;
+    my ($dir)=@_;
     my $a;
 
     if($doonly && ($doonly ne $dir)) {
@@ -28,7 +28,7 @@ sub runone {
     print "Build in buildv-$dir\n" if($verbose);
 
     # build the manual(s)
-    $a = buildit($dir, $select, $newl);
+    $a = buildit($dir);
 
     chdir "..";
 
@@ -50,13 +50,11 @@ sub runone {
 };
 
 sub buildit {
-    my ($dir, $select, $newl)=@_;
+    my ($model)=@_;
 
     `rm -rf * >/dev/null 2>&1`;
 
-    # V (voice), F (festival), L (lame), [blank] (English)
-    my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure',
-                    $select, $newl?'\n':"");
+    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -75,31 +73,8 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
 `rm -f $pool/*`;
 $ENV{'POOL'}="$pool";
 
-runone("player", "player", 1);
-runone("recorder", "recorder", 1);
-runone("fmrecorder", "fmrecorder", 1);
-runone("recorderv2", "recorderv2", 1);
-runone("ondiosp", "ondiosp", 1);
-runone("ondiofm", "ondiofm", 1);
-runone("h100", "h100");
-runone("h120", "h120");
-runone("h300", "h300");
-runone("ipodcolor", "ipodcolor");
-runone("ipodnano", "ipodnano");
-runone("ipod4gray", "ipod4g");
-runone("ipodvideo", "ipodvideo", 1);
-runone("ipod3g", "ipod3g");
-runone("ipod1g2g", "ipod1g2g");
-runone("iaudiox5", "x5");
-runone("iaudiom5", "m5");
-runone("iaudiom3", "m3");
-runone("ipodmini2g", "ipodmini2g");
-runone("ipodmini1g", "ipodmini");
-runone("h10", "h10");
-runone("h10_5gb", "h10_5gb");
-runone("gigabeatf", "gigabeatf");
-runone("sansae200", "e200");
-runone("sansac200", "c200");
-runone("mrobe100", "mrobe100");
-#runone("cowond2", "cowond2");
+for my $b (&stablebuilds) {
+    next if ($builds{$b}{configname} < 3); # no variants
 
+    runone($b);
+}