35 files changed, 264 insertions, 264 deletions

diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index 76bb135676..24a91613cb 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -5626,15 +5626,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "من فضلك أخرج كارت الـMMC المدخل"
+    archosondio*: "من فضلك أخرج كارت الـMMC المدخل"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ffbe06e625..75e49de588 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -1280,17 +1280,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерия: %d%% %dч %dмин"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dмин"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dч %dмин"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dч %dмин"
   </dest>
   <voice>
     *: ""
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -4863,15 +4863,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Моля извадете MMC картата"
+    archosondio*: "Моля извадете MMC картата"
   </dest>
   <voice>
     *: ""
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -8845,17 +8845,17 @@
   <source>
     *: none
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: ""
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index e6a0fbede4..f565d1b584 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -6856,12 +6856,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6921,19 +6921,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8346,15 +8346,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Sisplau retiri la tarjeta MMC insertada"
+    archosondio*: "Sisplau retiri la tarjeta MMC insertada"
   </dest>
   <voice>
     *: none
-    ondio*: "Sisplau retiri la tarjeta MMC insertada"
+    archosondio*: "Sisplau retiri la tarjeta MMC insertada"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 07aaa13e5a..ffb8e8cc9c 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -157,15 +157,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "请取出MMC卡"
+    archosondio*: "请取出MMC卡"
   </dest>
   <voice>
     *: none
-    ondio*: "请取出MMC卡"
+    archosondio*: "请取出MMC卡"
   </voice>
 </phrase>
 <phrase>
@@ -4379,12 +4379,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "剩余电量:%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm"
   </dest>
   <voice>
@@ -4444,19 +4444,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盘1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盘1"
     sansae200*,sansac200*,sansafuze*: "mSD卡"
-    ondio*: "MMC卡"
+    archosondio*: "MMC卡"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index be2f80832e..89057a590f 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -156,15 +156,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "請移除插入的MMC卡"
+    archosondio*: "請移除插入的MMC卡"
   </dest>
   <voice>
     *: "Please remove multimedia card"
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -4378,7 +4378,7 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
@@ -4388,7 +4388,7 @@
   </dest>
   <voice>
     *: "Battery level"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -4445,19 +4445,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "磁盤1"
     sansae200*,sansac200*,sansafuze*: "Multimedia 卡:"
-    ondio*: "MMC卡:"
+    archosondio*: "MMC卡:"
   </dest>
   <voice>
     *: none
     multivolume: "磁盤1"
     sansae200*,sansac200*,sansafuze*: "Multimedia 卡"
-    ondio*: "mmc卡"
+    archosondio*: "mmc卡"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index b4c2982428..0d74e36057 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -6856,12 +6856,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6921,19 +6921,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8348,15 +8348,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Vyjměte prosím paměťovou kartu"
+    archosondio*: "Vyjměte prosím paměťovou kartu"
   </dest>
   <voice>
     *: none
-    ondio*: "Vyjměte prosím paměťovou kartu"
+    archosondio*: "Vyjměte prosím paměťovou kartu"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index dd71bae950..0340ba4b9f 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -170,15 +170,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Fjern venligst MMC"
+    archosondio*: "Fjern venligst MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Fjern venligst multimedia card"
+    archosondio*: "Fjern venligst multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -3678,17 +3678,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dt %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Batteri niveau"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -3745,19 +3745,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Hard disk 1"
     sansae200*,sansac200*,sansafuze*: "Mikro SD kort"
-    ondio*: "Multimedie kort"
+    archosondio*: "Multimedie kort"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 89d37f5d95..0fbac7693c 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -6895,12 +6895,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %d Std %d Min"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6960,19 +6960,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Festplatte"
     sansae200*,sansac200*,sansafuze*: "Micro-SD-Karte"
-    ondio*: "Multimediakarte"
+    archosondio*: "Multimediakarte"
   </voice>
 </phrase>
 <phrase>
@@ -8386,15 +8386,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Bitte eingelegte MMC entfernen"
+    archosondio*: "Bitte eingelegte MMC entfernen"
   </dest>
   <voice>
     *: none
-    ondio*: "Bitte Multimediakarte entfernen"
+    archosondio*: "Bitte Multimediakarte entfernen"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5f080ab45d..4d73592983 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -6966,12 +6966,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -7031,19 +7031,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8459,15 +8459,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 732708c434..9b67237452 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -128,15 +128,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Por favor retire la tarjeta MMC"
+    archosondio*: "Por favor retire la tarjeta MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Por favor retire la tarjeta multimedia"
+    archosondio*: "Por favor retire la tarjeta multimedia"
   </voice>
 </phrase>
 <phrase>
@@ -2815,12 +2815,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8003,19 +8003,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "m S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index b7b2cf55fe..d871874667 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -157,15 +157,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Poista muistikortti"
+    archosondio*: "Poista muistikortti"
   </dest>
   <voice>
     *: none
-    ondio*: ""
+    archosondio*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4379,12 +4379,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dt %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm"
   </dest>
   <voice>
@@ -4444,19 +4444,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Kiintolevy1"
     sansae200*,sansac200*,sansafuze*: "micro s d muistikortti"
-    ondio*: "m m c muistikortti"
+    archosondio*: "m m c muistikortti"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 673f8691cc..467d50c3b2 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -6923,12 +6923,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6988,19 +6988,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8414,15 +8414,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Retirez la carte MMC insérée"
+    archosondio*: "Retirez la carte MMC insérée"
   </dest>
   <voice>
     *: none
-    ondio*: "Retirez la carte mémoire multimédia"
+    archosondio*: "Retirez la carte mémoire multimédia"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 7993235e80..2ce2ccc81e 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -6863,12 +6863,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6928,19 +6928,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Έιτς Ντι 1"
     sansae200*,sansac200*,sansafuze*: "μάικρο Ες Ντι"
-    ondio*: "Εμ Εμ Σι"
+    archosondio*: "Εμ Εμ Σι"
   </voice>
 </phrase>
 <phrase>
@@ -8354,15 +8354,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Παρακαλώ αφαιρέστε την κάρτα MMC"
+    archosondio*: "Παρακαλώ αφαιρέστε την κάρτα MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Παρακαλώ αφαιρέστε την κάρτα Εμ Εμ Σι"
+    archosondio*: "Παρακαλώ αφαιρέστε την κάρτα Εμ Εμ Σι"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 173806db58..91738a80ea 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -6901,12 +6901,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6966,19 +6966,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8394,15 +8394,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "MMC אנא הסר כרטיס"
+    archosondio*: "MMC אנא הסר כרטיס"
   </dest>
   <voice>
     *: none
-    ondio*: "אנא הסר כרטיס מולטימדיה"
+    archosondio*: "אנא הסר כרטיס מולטימדיה"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index 10be2907de..03bf222d41 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -4083,15 +4083,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "ैूनिकालो MMC"
+    archosondio*: "ैूनिकालो MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "multimedia card ैूनिकालो"
+    archosondio*: "multimedia card ैूनिकालो"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 51324a418d..180b488dbe 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -6894,7 +6894,7 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
@@ -6959,19 +6959,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD 1"
     sansae200*,sansac200*,sansafuze*: "Micro SD"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8387,15 +8387,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Rimuovere la MMC"
+    archosondio*: "Rimuovere la MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Rimuovere la MMC"
+    archosondio*: "Rimuovere la MMC"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 3f2c119850..2a19b56349 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -6898,12 +6898,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "バッテリー: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6963,19 +6963,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "マイクロSD"
-    ondio*: "マルチメディアカード"
+    archosondio*: "マルチメディアカード"
   </voice>
 </phrase>
 <phrase>
@@ -8389,15 +8389,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "マルチメディアカードを抜いてください"
+    archosondio*: "マルチメディアカードを抜いてください"
   </dest>
   <voice>
     *: none
-    ondio*: "マルチメディアカードを抜いてください"
+    archosondio*: "マルチメディアカードを抜いてください"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 3b5ea714d1..e059c67fc5 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -168,15 +168,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "삽입된 MMC를 제거해주세요"
+    archosondio*: "삽입된 MMC를 제거해주세요"
   </dest>
   <voice>
     *: none
-    ondio*: "삽입된 MMC를 제거해주세요"
+    archosondio*: "삽입된 MMC를 제거해주세요"
   </voice>
 </phrase>
 <phrase>
@@ -4390,12 +4390,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "배터리: %d%% (%d시간 %d분)"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %d시간 %d분"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %d시간 %d분"
     iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분"
   </dest>
   <voice>
@@ -4455,19 +4455,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1 "
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index abc194c7fc..4f88a480d2 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -6951,12 +6951,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -7016,19 +7016,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8442,15 +8442,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Ištraukite MMC"
+    archosondio*: "Ištraukite MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Ištraukite multimedia card"
+    archosondio*: "Ištraukite multimedia card"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 2a814b9f74..6166409d6d 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -6869,12 +6869,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %d óra %d perc"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6934,18 +6934,18 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
-    ondio*: "Multimedia card"
+    archosondio*: "Multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -8360,15 +8360,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Vedd ki a multimédia kártyát"
+    archosondio*: "Vedd ki a multimédia kártyát"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index da99edb918..d976f30139 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -160,15 +160,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Verwijder ingestoken MMC AUB"
+    archosondio*: "Verwijder ingestoken MMC AUB"
   </dest>
   <voice>
     *: none
-    ondio*: "Verwijder ingestoken multimedia kaart AUB"
+    archosondio*: "Verwijder ingestoken multimedia kaart AUB"
   </voice>
 </phrase>
 <phrase>
@@ -4380,12 +4380,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -4445,19 +4445,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "Multimedia kaart"
+    archosondio*: "Multimedia kaart"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 65b7d5905f..580463c6f9 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -152,11 +152,11 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Fjern minnekortet"
+    archosondio*: "Fjern minnekortet"
   </dest>
   <voice>
     *: none
@@ -4321,12 +4321,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -4383,7 +4383,7 @@
   <source>
     *: none
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index e1074e8001..21d7322083 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -157,15 +157,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Vennligst fjern minnekort"
+    archosondio*: "Vennligst fjern minnekort"
   </dest>
   <voice>
     *: none
-    ondio*: "Vennligst fjern minnekort"
+    archosondio*: "Vennligst fjern minnekort"
   </voice>
 </phrase>
 <phrase>
@@ -3682,17 +3682,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: ""
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -3749,19 +3749,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "mikro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 23f3d12111..7c80f9a373 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -6903,12 +6903,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bateria: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6968,19 +6968,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "microSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "ha de 1"
     sansae200*,sansac200*,sansafuze*: "mikro es di"
-    ondio*: "em em ce"
+    archosondio*: "em em ce"
   </voice>
 </phrase>
 <phrase>
@@ -8394,15 +8394,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Proszę wyjąć kartę MMC"
+    archosondio*: "Proszę wyjąć kartę MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Proszę wyjąć kartę em em ce"
+    archosondio*: "Proszę wyjąć kartę em em ce"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 4d50102383..3ff99b13db 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -6889,12 +6889,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6954,19 +6954,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8380,15 +8380,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Por Favor Remova o Cartão MMC Inserido"
+    archosondio*: "Por Favor Remova o Cartão MMC Inserido"
   </dest>
   <voice>
     *: none
-    ondio*: "Por favor remova o cartão multimédia"
+    archosondio*: "Por favor remova o cartão multimédia"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 3544f1c3c1..125cf38612 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -156,15 +156,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Por favor remova o MMC inserido"
+    archosondio*: "Por favor remova o MMC inserido"
   </dest>
   <voice>
     *: none
-    ondio*: "Por favor remova o M M C inserido"
+    archosondio*: "Por favor remova o M M C inserido"
   </voice>
 </phrase>
 <phrase>
@@ -4066,12 +4066,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -4131,19 +4131,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index a558eea42d..83b8189a03 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -1449,12 +1449,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -5102,15 +5102,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Indepartati cardul MMC"
+    archosondio*: "Indepartati cardul MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -8983,19 +8983,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index bb1447385f..933a6af72c 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -162,15 +162,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Пожалуйста, выньте карту MMC"
+    archosondio*: "Пожалуйста, выньте карту MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Пожалуйста, выньте карту"
+    archosondio*: "Пожалуйста, выньте карту"
   </voice>
 </phrase>
 <phrase>
@@ -4024,12 +4024,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dч %dм"
     iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм"
   </dest>
   <voice>
@@ -4089,19 +4089,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "Эйч Ди 1"
     sansae200*,sansac200*,sansafuze*: "микро Эс Ди"
-    ondio*: "Эм Эм Си"
+    archosondio*: "Эм Эм Си"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index c2c49a28b4..db405d6ccf 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -6878,12 +6878,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерија: %d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dч %dм"
     iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dч %dм"
   </dest>
   <voice>
@@ -6943,19 +6943,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "мајкро Ес Де"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8370,15 +8370,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Молим уклоните уметнуту MMC"
+    archosondio*: "Молим уклоните уметнуту MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Молим уклоните мултимедија картицу"
+    archosondio*: "Молим уклоните мултимедија картицу"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 08ade4b10c..d7a28cc34b 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -6897,12 +6897,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6962,19 +6962,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "mikro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8388,15 +8388,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Var vänlig ta bort MMC-kort"
+    archosondio*: "Var vänlig ta bort MMC-kort"
   </dest>
   <voice>
     *: none
-    ondio*: "Var vänlig ta bort MMC-kort"
+    archosondio*: "Var vänlig ta bort MMC-kort"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index cf3cdc5328..9266c2c21a 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -7713,15 +7713,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Alisin MMC"
+    archosondio*: "Alisin MMC"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -8138,12 +8138,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -10112,19 +10112,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1:"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D Isa"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index c8fa483671..3a6bba25cd 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -6843,12 +6843,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "แบตเตอรี่: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6908,19 +6908,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "H D 1"
     sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:"
-    ondio*: "Multimedia card"
+    archosondio*: "Multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -8335,15 +8335,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "กรุณาเอาการ์ด MMC ออก"
+    archosondio*: "กรุณาเอาการ์ด MMC ออก"
   </dest>
   <voice>
     *: none
-    ondio*: "Please remove multimedia card"
+    archosondio*: "Please remove multimedia card"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index dcf8515acc..991252213e 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -2641,17 +2641,17 @@
   <source>
     *: none
     sansae200,sansac200*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     sansae200,sansac200*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     sansae200,sansac200*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 530f378c8c..0b01787e3c 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -6886,12 +6886,12 @@
   user: core

   <source>

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

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

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

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

   </source>

   <dest>

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

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

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

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

   </dest>

   <voice>

@@ -6951,19 +6951,19 @@
     *: none

     multivolume: "HD1"

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

-    ondio*: "MMC:"

+    archosondio*: "MMC:"

   </source>

   <dest>

     *: none

     multivolume: "HD1"

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

-    ondio*: "MMC:"

+    archosondio*: "MMC:"

   </dest>

   <voice>

     *: none

     multivolume: "H D 1"

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

-    ondio*: "M M C"

+    archosondio*: "M M C"

   </voice>

 </phrase>

 <phrase>

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

   <source>

     *: none

-    ondio*: "Please remove inserted MMC"

+    archosondio*: "Please remove inserted MMC"

   </source>

   <dest>

     *: none

-    ondio*: "Будьласк витягнiть вставлену MMC"

+    archosondio*: "Будьласк витягнiть вставлену MMC"

   </dest>

   <voice>

     *: none

-    ondio*: "Будьласк витягнiть вставлену multimedia card"

+    archosondio*: "Будьласк витягнiть вставлену multimedia card"

   </voice>

 </phrase>

 <phrase>

diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index ed1c556926..1c0b0242fe 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -6897,12 +6897,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batreye: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
+    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6962,19 +6962,19 @@
     *: none
     multivolume: "HD1"
     sansae200*,sansac200*,sansafuze*: "mSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DP1"
     sansae200*,sansac200*,sansafuze*: "MSD:"
-    ondio*: "MMC:"
+    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D P 1"
     sansae200*,sansac200*,sansafuze*: "micro S D"
-    ondio*: "M M C"
+    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8388,15 +8388,15 @@
   user: core
   <source>
     *: none
-    ondio*: "Please remove inserted MMC"
+    archosondio*: "Please remove inserted MMC"
   </source>
   <dest>
     *: none
-    ondio*: "Distitchîz l' cwåte MMC, s'i vs plait"
+    archosondio*: "Distitchîz l' cwåte MMC, s'i vs plait"
   </dest>
   <voice>
     *: none
-    ondio*: "Distitchîz l' cwåte memwere, s'i vs plait"
+    archosondio*: "Distitchîz l' cwåte memwere, s'i vs plait"
   </voice>
 </phrase>
 <phrase>