Strip out archos from common strings

Change-Id: I078d5a6887fd14650fe89d7b4d8850166ae19efc

41 files changed, 281 insertions, 281 deletions

diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index ae73278a41..04617a0a6c 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -5689,15 +5689,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Sarrera"
+    recording: "Sarrera"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Sarrera"
+    recording: "Sarrera"
   </voice>
 </phrase>
 <phrase>
@@ -6541,12 +6541,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8040,7 +8040,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8050,7 +8050,7 @@
   </source>
   <dest>
     *: "OFF uzteko"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP uzteko"
+    iriverh100,iriverh120,iriverh300: "STOP uzteko"
     ipod*: "PLAY/PAUSE uzteko"
     iaudiox5,iaudiom5: "PLAY luzea uzteko"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV uzteko"
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 6eb29dbcef..de4d399042 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -5695,15 +5695,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Линеен вход"
+    recording: "Линеен вход"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Линеен вход"
+    recording: "Линеен вход"
   </voice>
 </phrase>
 <phrase>
@@ -6547,12 +6547,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерия: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8046,7 +8046,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8056,7 +8056,7 @@
   </source>
   <dest>
     *: "OFF за отказ"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за отказ"
+    iriverh100,iriverh120,iriverh300: "STOP за отказ"
     ipod*: "PLAY/PAUSE за отказ"
     iaudiox5,iaudiom5: "Long PLAY за отказ"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV за отказ"
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 10d8987453..7f074082fc 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -5682,15 +5682,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none  
-    recording,archosplayer: "Línia d'entrada"
+    recording: "Línia d'entrada"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Línia d'entrada"
+    recording: "Línia d'entrada"
   </voice>
 </phrase>
 <phrase>
@@ -6535,12 +6535,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8033,7 +8033,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8043,7 +8043,7 @@
   </source>
   <dest>
     *: "OFF per cancel·lar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP per cancel·lar"
+    iriverh100,iriverh120,iriverh300: "STOP per cancel·lar"
     ipod*: "PLAY/PAUSE per cancel·lar"
     iaudiox5,iaudiom5: "Long PLAY per cancel·lar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV per cancel·lar"
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 39c1036f69..29715a1914 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -2134,15 +2134,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "线路输入"
+    recording: "线路输入"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "线路输入"
+    recording: "线路输入"
   </voice>
 </phrase>
 <phrase>
@@ -4231,12 +4231,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "剩余电量:%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm"
   </dest>
   <voice>
@@ -7152,7 +7152,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7162,7 +7162,7 @@
   </source>
   <dest>
     *: "按OFF键取消"
-    archosplayer,iriverh100,iriverh120,iriverh300: "按STOP键取消"
+    iriverh100,iriverh120,iriverh300: "按STOP键取消"
     ipod*: "按PLAY/PAUSE键取消"
     iaudiox5,iaudiom5: "长按PLAY键取消"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "按PREV键取消"
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 65e9169ef9..21a4379362 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -2133,15 +2133,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "聲音輸入"
+    recording: "聲音輸入"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: ""
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -4230,17 +4230,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "電池: %d%% %d小時 %d分"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    archosondiofm,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "電池: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
+    iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -7157,7 +7157,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7167,7 +7167,7 @@
   </source>
   <dest>
     *: "OFF: 離開"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: 離開"
+    iriverh100,iriverh120,iriverh300: "STOP: 離開"
     ipod*: "PLAY/PAUSE: 離開"
     iaudiox5,iaudiom5: "長按PLAY: 離開"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV: 離開"
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 2d102b623f..34f6a9f566 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -5715,15 +5715,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linkový vstup"
+    recording: "Linkový vstup"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linkový vstup"
+    recording: "Linkový vstup"
   </voice>
 </phrase>
 <phrase>
@@ -6584,12 +6584,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8134,7 +8134,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8144,7 +8144,7 @@
   </source>
   <dest>
     *: "OFF pro zrušení"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pro zrušení"
+    iriverh100,iriverh120,iriverh300: "STOP pro zrušení"
     ipod*: "PLAY/PAUSE pro zrušení"
     iaudiox5,iaudiom5: "Dlouhé PLAY pro zrušení"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV pro zrušení"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index c0233fe3f4..40b3d9b9d1 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -1773,15 +1773,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linje indgang"
+    recording: "Linje indgang"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linje indgang"
+    recording: "Linje indgang"
   </voice>
 </phrase>
 <phrase>
@@ -3523,17 +3523,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dt %dm"
+    iriverifp7xx: "%d%% %dt %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Batteri niveau"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
+    iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -6356,7 +6356,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -6366,7 +6366,7 @@
   </source>
   <dest>
     *: "SLUK for at afbryde"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for at afbryde"
+    iriverh100,iriverh120,iriverh300: "STOP for at afbryde"
     ipod*: "SPIL/PAUSE for at afbryde"
     iaudiox5,iaudiom5: "Lang SPIL for at afbryde"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "FORRIGE for at afbryde"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 16316baecc..d421bc5405 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -5700,15 +5700,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Analogeingang"
+    recording: "Analogeingang"
   </voice>
 </phrase>
 <phrase>
@@ -6552,12 +6552,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %d Std %d Min"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8051,7 +8051,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8061,7 +8061,7 @@
   </source>
   <dest>
     *: "OFF zum Abbrechen"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen"
+    iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen"
     ipod*: "PLAY/PAUSE zum Abbrechen"
     iaudiox5,iaudiom5: "Long PLAY zum Abbrechen"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV zum Abbrechen"
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index dd63096139..e914329564 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -3906,12 +3906,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    archosondiofm,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm"
+    archosondiofm,iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index ba91ddf734..a55fbc20b3 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -1308,15 +1308,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de línea"
+    recording: "Entrada de línea"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de línea"
+    recording: "Entrada de línea"
   </voice>
 </phrase>
 <phrase>
@@ -2708,12 +2708,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm"
   </dest>
   <voice>
@@ -5214,7 +5214,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -5224,7 +5224,7 @@
   </source>
   <dest>
     *: "OFF para cancelar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para cancelar"
+    iriverh100,iriverh120,iriverh300: "STOP para cancelar"
     ipod*: "PLAY/PAUSE para cancelar"
     iaudiox5,iaudiom5: "Pulsación larga de PLAY para cancelar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV para cancelar"
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 7ca17c40f2..5760b08abf 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -2130,15 +2130,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Analoga Enigaĵo"
+    recording: "Analoga Enigaĵo"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Analoga Enigaĵo"
+    recording: "Analoga Enigaĵo"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index f9ed45505e..0081a3c113 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -2133,15 +2133,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjatulo"
+    recording: "Linjatulo"
 </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjatulo"
+    recording: "Linjatulo"
   </voice>
 </phrase>
 <phrase>
@@ -4230,12 +4230,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %dt %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dt %dm"
+    iriverifp7xx: "%d%% %dt %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm"
   </dest>
   <voice>
@@ -7152,7 +7152,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7162,7 +7162,7 @@
   </source>
   <dest>
     *: "OFF keskeyttää"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
+    iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
     ipod*: "PLAY/PAUSE keskeyttää"
     iaudiox5,iaudiom5: "Pitkä PLAY keskeyttää"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV keskeyttää"
@@ -7172,7 +7172,7 @@
   </dest>
   <voice>
     *: ""
-    archosplayer,iriverh100,iriverh120,iriverh300: ""
+    iriverh100,iriverh120,iriverh300: ""
     ipod*: ""
     iaudiox5,iaudiom5: ""
     iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 784e24323d..280f8ce6b3 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -5442,11 +5442,11 @@
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording: "Entrée ligne"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording: "Entrée ligne"
   </voice>
 </phrase>
 <phrase>
@@ -6260,7 +6260,7 @@
   </source>
   <dest>
     *: "Batterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -7728,7 +7728,7 @@
   </source>
   <dest>
     *: "OFF pour Annuler"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
+    iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
     ipod*: "PLAY/PAUSE pour Annuler"
     iaudiox5,iaudiom5: "Long PLAY pour Annuler"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV pour Annuler"
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index c643a3fb10..3b03dfb2ec 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -1265,15 +1265,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Liña de entrada"
+    recording: "Liña de entrada"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Liña de entrada"
+    recording: "Liña de entrada"
   </voice>
 </phrase>
 <phrase>
@@ -2727,18 +2727,18 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,
+
 iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batería: %d%% %dh %dm"
-archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,
+
 iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </voice>
@@ -5402,7 +5402,7 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -5412,7 +5412,7 @@ iriverifp7xx: "%d%% %dh %dm"
   </source>
   <dest>
     *: "OFF para abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
     ipod*: "PLAY/PAUSE para abortar"
     iaudiox5,iaudiom5: "Manter pulsado PLAY para abortar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV para abortar"
@@ -5422,7 +5422,7 @@ iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "OFF para abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
     ipod*: "PLAY/PAUSE para abortar"
     iaudiox5,iaudiom5: "Manter pulsado PLAY para abortar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV para abortar"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 08ca8dc750..397c63d883 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -5678,15 +5678,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Eίσοδος"
+    recording: "Eίσοδος"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Eίσοδος"
+    recording: "Eίσοδος"
   </voice>
 </phrase>
 <phrase>
@@ -6530,12 +6530,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8029,7 +8029,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8039,7 +8039,7 @@
   </source>
   <dest>
     *: "OFF για ακύρωση"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
+    iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
     ipod*: "PLAY/PAUSE για ακύρωση"
     iaudiox5,iaudiom5: "Long PLAY για ακύρωση"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV για ακύρωση"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index cf2ac5d19c..fedb439486 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -5695,15 +5695,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6547,12 +6547,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8046,7 +8046,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8056,7 +8056,7 @@
   </source>
   <dest>
     *: "כדי לבטל OFF"
-    archosplayer,iriverh100,iriverh120,iriverh300: "כדי לבטל STOP"
+    iriverh100,iriverh120,iriverh300: "כדי לבטל STOP"
     ipod*: "כדי לבטל PLAY/PAUSE"
     iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "כדי לבטל PREV"
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index a3d687c52b..0d5de2ec5d 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -5687,15 +5687,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linija"
+    recording: "Linija"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linija"
+    recording: "Linija"
   </voice>
 </phrase>
 <phrase>
@@ -6539,12 +6539,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8038,7 +8038,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8048,7 +8048,7 @@
   </source>
   <dest>
     *: "OFF za prekid"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP za prekid"
+    iriverh100,iriverh120,iriverh300: "STOP za prekid"
     ipod*: "PLAY/PAUSE za prekid"
     iaudiox5,iaudiom5: "Dugo PLAY za prekid"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV za prekid"
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 073feb4c20..d85652c1f5 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -1478,15 +1478,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Lína inn"
+    recording: "Lína inn"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -3061,12 +3061,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Rafhlaða: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Rafhl.: %d%% %dh %dm"
   </dest>
   <voice>
@@ -5769,7 +5769,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -5779,7 +5779,7 @@
     *: "OFF to abort"
   <dest>
     *: "OFF til að slíta vinnslu"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP til að slíta vinnslu"
+    iriverh100,iriverh120,iriverh300: "STOP til að slíta vinnslu"
     ipod*: "PLAY/PAUSE til að slíta vinnslu"
     iaudiox5,iaudiom5: "Long PLAY til að slíta vinnslu"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV til að slíta vinnslu"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index dbece04ef4..16957cd142 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -5696,15 +5696,15 @@ desc: deprecated
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Ingresso Line"
+    recording: "Ingresso Line"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Ingresso Line"
+    recording: "Ingresso Line"
   </voice>
 </phrase>
 <phrase>
@@ -6548,12 +6548,12 @@ desc: deprecated
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh"
+    archosondiofm,iriverifp7xx: "%d%% %dh"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"   
   </dest>
   <voice>
@@ -8047,7 +8047,7 @@ desc: deprecated
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8057,7 +8057,7 @@ desc: deprecated
   </source>
   <dest>
     *: "OFF = Annulla"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Annulla"
+    iriverh100,iriverh120,iriverh300: "STOP = Annulla"
     ipod*: "PLAY/PAUSA = Annulla"
     iaudiox5,iaudiom5: "PLAY LUNGO = Annulla"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV = Annulla"
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 55ed2a2456..acb3281197 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -5697,15 +5697,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "ライン入力"
+    recording: "ライン入力"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "ライン入力"
+    recording: "ライン入力"
   </voice>
 </phrase>
 <phrase>
@@ -6549,12 +6549,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "バッテリー: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8048,7 +8048,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8058,7 +8058,7 @@
   </source>
   <dest>
     *: "OFF: 取り消し"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP: 取り消し"
+    iriverh100,iriverh120,iriverh300: "STOP: 取り消し"
     ipod*: "PLAY/PAUSE: 取り消し"
     iaudiox5,iaudiom5: "Long PLAY: 取り消し"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV: 取り消し"
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index b186448867..203fef6037 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -2144,15 +2144,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "라인 인"
+    recording: "라인 인"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "라인 인"
+    recording: "라인 인"
   </voice>
 </phrase>
 <phrase>
@@ -4241,12 +4241,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "배터리: %d%% (%d시간 %d분)"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %d시간 %d분"
+    iriverifp7xx: "%d%% %d시간 %d분"
     iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분"
   </dest>
   <voice>
@@ -7154,7 +7154,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7164,7 +7164,7 @@
   </source>
   <dest>
     *: "[꺼짐]: 중지"
-    archosplayer,iriverh100,iriverh120,iriverh300: "[정지]: 중지"
+    iriverh100,iriverh120,iriverh300: "[정지]: 중지"
     ipod*: "[재생/일시정지]: 중지"
     iaudiox5,iaudiom5: "[재생 길게누름]: 중지"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "[이전]: 중지"
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index f5af7c7042..57538dd449 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -5691,15 +5691,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Lineārā Ieeja"
+    recording: "Lineārā Ieeja"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "lineaaraa ieeja"
+    recording: "lineaaraa ieeja"
   </voice>
 </phrase>
 <phrase>
@@ -6543,12 +6543,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %ds %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %ds %dm"
+    iriverifp7xx: "%d%% %ds %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %ds %dm"
   </dest>
   <voice>
@@ -8044,7 +8044,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8054,7 +8054,7 @@
   </source>
   <dest>
     *: "OFF lai pārtrauktu"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP lai pārtrauktu"
+    iriverh100,iriverh120,iriverh300: "STOP lai pārtrauktu"
     ipod*: "PLAY/PAUSE lai pārtrauktu"
     iaudiox5,iaudiom5: "Long PLAY lai pārtrauktu"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV lai pārtrauktu"
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index baa7ec28ed..dba6d36037 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -5748,15 +5748,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6600,12 +6600,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8099,7 +8099,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8109,7 +8109,7 @@
   </source>
   <dest>
     *: "OFF atšaukimui"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
+    iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
     ipod*: "PLAY/PAUSE atšaukimui"
     iaudiox5,iaudiom5: "Ilgas PLAY atšaukimui"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV atšaukimui"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index f0392510a4..ca21d952fb 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -5664,15 +5664,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6516,12 +6516,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %d óra %d perc"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8015,7 +8015,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8025,7 +8025,7 @@
   </source>
   <dest>
     *: "OFF - megszakít"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP - megszakít"
+    iriverh100,iriverh120,iriverh300: "STOP - megszakít"
     ipod*: "PLAY/PAUSE - megszakít"
     iaudiox5,iaudiom5: "PLAY hosszan - megszakít"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV - megszakít"
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 21d3fdf6ef..ac0119334a 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -2139,15 +2139,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Analoge invoer"
+    recording: "Analoge invoer"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Analoge invoer"
+    recording: "Analoge invoer"
   </voice>
 </phrase>
 <phrase>
@@ -4242,12 +4242,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -7202,7 +7202,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7212,7 +7212,7 @@
   </source>
   <dest>
     *: "OFF om af te breken"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP om af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP om af te breken"
     ipod*: "PLAY/PAUSE om af te breken"
     iaudiox5,iaudiom5: "Lang PLAY om af te breken"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV om af te breken"
@@ -7222,7 +7222,7 @@
   </dest>
   <voice>
     *: "OFF om af te breken"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP om af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP om af te breken"
     ipod*: "PLAY/PAUSE om af te breken"
     iaudiox5,iaudiom5: "Lang PLAY om af te breken"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV om af te breken"
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 9ec82400bc..e3b66b87c5 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -2088,15 +2088,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linje inn"
+    recording: "Linje inn"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linje inn"
+    recording: "Linje inn"
   </voice>
 </phrase>
 <phrase>
@@ -4174,12 +4174,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -7060,7 +7060,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7070,7 +7070,7 @@
   </source>
   <dest>
     *: "OFF for å avbryte"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
+    iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
     ipod*: "PLAY/PAUSE for å avbryte"
     iaudiox5,iaudiom5: "PLAY (langt trykk) for å avbryte"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV for å avbryte"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 552b400671..99e4de7faf 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -1778,15 +1778,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjeinngang"
+    recording: "Linjeinngang"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjeinngang"
+    recording: "Linjeinngang"
   </voice>
 </phrase>
 <phrase>
@@ -3528,17 +3528,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: ""
+    iriverifp7xx: ""
     iriverh10,ipodmini1g,ipodmini2g: ""
   </voice>
 </phrase>
@@ -6359,7 +6359,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -6369,7 +6369,7 @@
   </source>
   <dest>
     *: "OFF for å avbryte"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
+    iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
     ipod*: "PLAY/PAUSE for å avbryte"
     iaudiox5,iaudiom5: "Hold PLAY for å avbryte"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV for å avbryte"
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 1e60c610e5..500ecb8454 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -5689,15 +5689,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -6541,12 +6541,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8040,7 +8040,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8050,7 +8050,7 @@
   </source>
   <dest>
     *: "OFF para abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
     ipod*: "PLAY/PAUSE para abortar"
     iaudiox5,iaudiom5: "PLAY Longo para abortar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV para abortar"
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index ebda38c9ed..f627c38da0 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -2015,15 +2015,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -3918,12 +3918,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -6762,7 +6762,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -6772,7 +6772,7 @@
   </source>
   <dest>
     *: "OFF para Abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para Abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para Abortar"
     ipod*: "PLAY/PAUSE para Abortar"
     iaudiox5,iaudiom5: "PLAY longo para abortar"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV para abortar"
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index e0553a35a2..fece7bd2e1 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -1429,12 +1429,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -5040,7 +5040,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -5050,7 +5050,7 @@
   </source>
   <dest>
     *: "OFF pentru anulare"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
+    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
     ipod*: "RULARE/PAUZĂ pentru anulare"
     iaudiox5,iaudiom5: "RULARE (apăsare lungă) pentru anulare"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV pentru anulare"
@@ -7078,15 +7078,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Intrare"
+    recording: "Intrare"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Intrare"
+    recording: "Intrare"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index d4197ee711..e5079e3e2d 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -2040,15 +2040,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Линейный вход"
+    recording: "Линейный вход"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Линейный вход"
+    recording: "Линейный вход"
   </voice>
 </phrase>
 <phrase>
@@ -3954,12 +3954,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dч %dм"
+    iriverifp7xx: "%d%% %dч %dм"
     iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм"
   </dest>
   <voice>
@@ -6795,7 +6795,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -6805,7 +6805,7 @@
   </source>
   <dest>
     *: "ВЫКЛ. для отмены"
-    archosplayer,iriverh100,iriverh120,iriverh300: "СТОП для отмены"
+    iriverh100,iriverh120,iriverh300: "СТОП для отмены"
     ipod*: "ПАУЗА для отмены"
     iaudiox5,iaudiom5: "ВОСПР. для отмены"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "ПРЕД. для отмены"
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 01058fa2bd..d0464690da 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -5694,15 +5694,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linkový Vstup"
+    recording: "Linkový Vstup"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linkový vstup"
+    recording: "Linkový vstup"
   </voice>
 </phrase>
 <phrase>
@@ -6546,12 +6546,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batéria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8045,7 +8045,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8055,7 +8055,7 @@
   </source>
   <dest>
     *: "OFF Pre prerušenie"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pre prerušenie"
+    iriverh100,iriverh120,iriverh300: "STOP pre prerušenie"
     ipod*: "PLAY/PAUSE pre prerušenie"
     iaudiox5,iaudiom5: "Long PLAY pre prerušenie"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV pre prerušenie"
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index 67b36586ed..b4c6ecb6c2 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -1551,7 +1551,7 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
@@ -2441,7 +2441,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8088,15 +8088,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 2761fb5dec..0b11e4ab91 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -5677,15 +5677,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Линијски улаз"
+    recording: "Линијски улаз"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Линијски улаз"
+    recording: "Линијски улаз"
   </voice>
 </phrase>
 <phrase>
@@ -6529,12 +6529,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерија: %d%% %dч %dм"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dч %dм"
+    iriverifp7xx: "%d%% %dч %dм"
     iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dч %dм"
   </dest>
   <voice>
@@ -8028,7 +8028,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8038,7 +8038,7 @@
   </source>
   <dest>
     *: "OFF за прекид"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP за прекид"
+    iriverh100,iriverh120,iriverh300: "STOP за прекид"
     ipod*: "PLAY/PAUSE за прекид"
     iaudiox5,iaudiom5: "Long PLAY за прекид"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV за прекид"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 620a11a5e4..eb992e58d4 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -5696,15 +5696,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Linjeingång"
+    recording: "Linjeingång"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Linjeingång"
+    recording: "Linjeingång"
   </voice>
 </phrase>
 <phrase>
@@ -6548,12 +6548,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8047,7 +8047,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8057,7 +8057,7 @@
   </source>
   <dest>
     *: "AV = avbryt"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
+    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
     ipod*: "SPELA/PAUSA = Avbryt"
     iaudiox5,iaudiom5: "Lång SPELA = Avbryt"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "FÖREGÅENDE = Avbryt"
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 457b84ca8b..2b48f7873f 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -5674,15 +5674,15 @@
  user: core
  <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
  </source>
  <dest>
     *: none
-    recording,archosplayer: "Sa Guhit"
+    recording: "Sa Guhit"
  </dest>
  <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
  </voice>
 </phrase>
 <phrase>
@@ -7477,7 +7477,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7487,7 +7487,7 @@
   </source>
   <dest>
     *: "OFF sa agas"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP sa agas"
+    iriverh100,iriverh120,iriverh300: "STOP sa agas"
     ipod*: "PLAY/PAUSE sa agas"
     iaudiox5,iaudiom5: "Long PLAY sa agas"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV sa agas"
@@ -7547,12 +7547,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index dcb6f7a629..c03a5f1c01 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -5654,15 +5654,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -6506,12 +6506,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "แบตเตอรี่: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8006,7 +8006,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8016,7 +8016,7 @@
   </source>
   <dest>
     *: "OFF เพื่อยกเลิก"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
+    iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
     ipod*: "PLAY/PAUSE เพื่อยกเลิก"
     iaudiox5,iaudiom5: "Long PLAY เพื่อยกเลิก"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV เพื่อยกเลิก"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 73088c7466..01edc921b1 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -2633,7 +2633,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -2643,7 +2643,7 @@
   </source>
   <dest>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200,sansac200*,vibe500: "PREV to abort"
@@ -5456,15 +5456,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </voice>
 </phrase>
 <phrase>
@@ -11760,12 +11760,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index dc5ef91389..8f1d9f135d 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -5686,15 +5686,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Лiнiйний Вхiд"
+    recording: "Лiнiйний Вхiд"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Лiнiйний Вхiд"
+    recording: "Лiнiйний Вхiд"
   </voice>
 </phrase>
 <phrase>
@@ -6538,12 +6538,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Акумулятор: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8037,7 +8037,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8047,7 +8047,7 @@
   </source>
   <dest>
     *: "OFF для вiдмiни"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP для вiдмiни"
+    iriverh100,iriverh120,iriverh300: "STOP для вiдмiни"
     ipod*: "PLAY/PAUSE для вiдмiни"
     iaudiox5,iaudiom5: "Довге натискання PLAY для вiдмiни"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV для вiдмiни"
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index 1085d2e886..11038d2813 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -2141,15 +2141,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Analoge invoer"
+    recording: "Analoge invoer"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Analoge invoer"
+    recording: "Analoge invoer"
   </voice>
 </phrase>
 <phrase>
@@ -4238,12 +4238,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
@@ -7180,7 +7180,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -7190,7 +7190,7 @@
   </source>
   <dest>
     *: "OFF voor af te breken"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
     ipod*: "PLAY/PAUSE voor af te breken"
     iaudiox5,iaudiom5: "Lang PLAY voor af te breken"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV voor af te breken"
@@ -7200,7 +7200,7 @@
   </dest>
   <voice>
     *: "OFF voor af te breken"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
     ipod*: "PLAY/PAUSE voor af te breken"
     iaudiox5,iaudiom5: "Lang PLAY voor af te breken"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV voor af te breken"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index a84c9e1848..f508f44fba 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -5694,15 +5694,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Intrêye"
+    recording: "Intrêye"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "intrêye"
+    recording: "intrêye"
   </voice>
 </phrase>
 <phrase>
@@ -6546,12 +6546,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batreye: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondio*,iriverifp7xx: "%d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
     iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm"
   </dest>
   <voice>
@@ -8045,7 +8045,7 @@
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
     iaudiox5,iaudiom5: "Long PLAY to abort"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV to abort"
@@ -8055,7 +8055,7 @@
   </source>
   <dest>
     *: "OFF po-z abandner"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP po-z abandner"
+    iriverh100,iriverh120,iriverh300: "STOP po-z abandner"
     ipod*: "PLAY/PAUSE po-z abandner"
     iaudiox5,iaudiom5: "Long PLAY po-z abandner"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV po-z abandner"