1 files changed, 89 insertions, 89 deletions

diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 8806944905..43fe7561f2 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -292,17 +292,17 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Oui"
     cowond2*: "MENU = Oui"
-    iriverh100,iriverh120,iriverh300: "NAVI = Oui"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oui"
+    h100,h120,h300: "NAVI = Oui"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oui"
     mrobe500: "PLAY ou POWER = Oui"
-    archosplayer: "(PLAY/STOP)"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -314,15 +314,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Autres = Non"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -2415,19 +2415,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)"
+    sa9200: "Building database... %d found (REW to return)"
   </source>
   <dest>
     *: "Création base de données... %d trouvés (OFF = retour)"
-    iriverh100,iriverh120,iriverh300: "Création base de données... %d trouvés (STOP = retour)"
+    h100,h120,h300: "Création base de données... %d trouvés (STOP = retour)"
     ipod*: "Création base de données... %d trouvés (PREV = retour)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Création base de données... %d trouvés (PREV = retour)"
-    gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
+    x5,m5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)"
+    h10,h10_5gb,e200*,c200*,fuze*: "Création base de données... %d trouvés (PREV = retour)"
+    sa9200: "Création base de données... %d trouvés (REW = retour)"
   </dest>
   <voice>
     *: "entrées trouvées pour base de données"
@@ -3227,7 +3227,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL
-  desc: (archosplayer) menu alternative for jump scroll
+  desc: (player) menu alternative for jump scroll
   user: core
   <source>
     *: "Jump Scroll"
@@ -3241,7 +3241,7 @@
 </phrase>
 <phrase>
   id: LANG_ONE_TIME
-  desc: (archosplayer) the jump scroll shall be done "one time"
+  desc: (player) the jump scroll shall be done "one time"
   user: core
   <source>
     *: "One time"
@@ -3255,7 +3255,7 @@
 </phrase>
 <phrase>
   id: LANG_JUMP_SCROLL_DELAY
-  desc: (archosplayer) Delay before making a jump scroll
+  desc: (player) Delay before making a jump scroll
   user: core
   <source>
     *: "Jump Scroll Delay"
@@ -3887,17 +3887,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    fuze*,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
+    fuze*,e200*: "Durée de l'éclairage de la molette"
   </dest>
   <voice>
     *: none
     button_light: "Durée de l'éclairage des touches"
-    sansafuze*,sansae200*: "Durée de l'éclairage de la molette"
+    fuze*,e200*: "Durée de l'éclairage de la molette"
   </voice>
 </phrase>
 <phrase>
@@ -4179,21 +4179,21 @@
     *: none
     rtc: "ON = Set"
     mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set"
-    gogearsa9200: "PLAY = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
+    sa9200: "PLAY = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Valider"
     mrobe500: "HEART = Valider"
-    iriverh100,iriverh120,iriverh300: "NAVI = Valider"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Valider"
-    gogearsa9200: "PLAY = Valider"
+    h100,h120,h300: "NAVI = Valider"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Valider"
+    sa9200: "PLAY = Valider"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4204,31 +4204,31 @@
     *: none
     rtc: "OFF = Revert"
     mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
+    sa9200: "LEFT = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF = Annuler"
     mrobe500: "POWER = Annuler"
-    iriverh100,iriverh120,iriverh300: "STOP = Annuler"
-    ipod*,sansac200*: "MENU = Annuler"
-    iaudiox5,iaudiom5: "RECORD = Annuler"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler"
-    gigabeatfx: "POWER = Annuler"
+    h100,h120,h300: "STOP = Annuler"
+    ipod*,c200*: "MENU = Annuler"
+    x5,m5: "RECORD = Annuler"
+    h10,h10_5gb,e200*,fuze*: "PREV = Annuler"
+    gigabeatf: "POWER = Annuler"
     mrobe100: "DISPLAY = Annuler"
     gigabeats: "BACK = Annuler"
-    gogearsa9200: "LEFT = Annuler"
+    sa9200: "LEFT = Annuler"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -4751,14 +4751,14 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
     gigabeats: "SELECT=Set POWER=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Annuler"
     ipod*: "SELECT=Set MENU=Annuler"
-    iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler"
+    h10,h10_5gb: "SELECT=Valider PREV=Annuler"
     gigabeats: "SELECT=Valider POWER=Annuler"
   </dest>
   <voice>
@@ -5933,17 +5933,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    h100,h120,h300: "Micro intégré"
   </dest>
   <voice>
     *: none
     recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    h100,h120,h300: "Micro intégré"
   </voice>
 </phrase>
 <phrase>
@@ -5969,15 +5969,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording,player: "Entrée ligne"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrée ligne"
+    recording,player: "Entrée ligne"
   </voice>
 </phrase>
 <phrase>
@@ -6907,11 +6907,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Tampon:"
-    archosplayer: "Tamp.:"
+    player: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6923,13 +6923,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Niveau de la batterie"
@@ -6987,19 +6987,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "DD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "D D 1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -8111,11 +8111,11 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fin de la liste de lecture"
-    archosplayer: "Fin de la liste"
+    player: "Fin de la liste"
   </dest>
   <voice>
     *: "Fin de la liste de lecture"
@@ -8358,20 +8358,20 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "Disque plein. Presser OFF pour continuer."
-    iriverh100,iriverh120,iriverh300: "Disque plein. Presser STOP pour continuer."
-    iaudiom5,iaudiox5: "Disque plein. Presser POWER pour continuer."
-    sansae200*,sansac200*: "Disque plein. Presser PREV pour continuer."
+    h100,h120,h300: "Disque plein. Presser STOP pour continuer."
+    m5,x5: "Disque plein. Presser POWER pour continuer."
+    e200*,c200*: "Disque plein. Presser PREV pour continuer."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8455,25 +8455,25 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on recorder models
   user: core
   <source>
     *: "OFF to abort"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort"
+    player,h100,h120,h300: "STOP to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort"
+    x5,m5: "Long PLAY to abort"
+    h10,h10_5gb,e200*,c200*: "PREV to abort"
     gigabeats: "BACK to abort"
-    gigabeatfx: "POWER to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF pour Annuler"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
+    player,h100,h120,h300: "STOP pour Annuler"
     ipod*: "PLAY/PAUSE pour Annuler"
-    iaudiox5,iaudiom5: "Long PLAY pour Annuler"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pour Annuler"
+    x5,m5: "Long PLAY pour Annuler"
+    h10,h10_5gb,e200*,c200*: "PREV pour Annuler"
     gigabeats: "BACK pour Annuler"
-    gigabeatfx: "POWER pour Annuler"
+    gigabeatf: "POWER pour Annuler"
   </dest>
   <voice>
     *: ""
@@ -8697,19 +8697,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  desc: in info display, shows that top off charge is running Only for V1 recorder
   user: core
   <source>
     *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    recorder: "Battery: Top-Off Chg"
   </source>
   <dest>
     *: none
-    archosrecorder: "Batterie: charge max."
+    recorder: "Batterie: charge max."
   </dest>
   <voice>
     *: none
-    archosrecorder: "Charge maximale de la batterie"
+    recorder: "Charge maximale de la batterie"
   </voice>
 </phrase>
 <phrase>
@@ -10526,7 +10526,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: ""
+    recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -11737,15 +11737,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensibilité du pavé tactile"
+    gigabeatf: "Sensibilité du pavé tactile"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensibilité du pavé tactile"
+    gigabeatf: "Sensibilité du pavé tactile"
   </voice>
 </phrase>
 <phrase>
@@ -11754,15 +11754,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Haute"
+    gigabeatf: "Haute"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Haute"
+    gigabeatf: "Haute"
   </voice>
 </phrase>
 <phrase>