1 files changed, 77 insertions, 77 deletions

diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 914cf64527..8f5a4dd0cc 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -2073,15 +2073,15 @@
   user: core
   <source>
     *: none
-    recording,archosplayer: "Line In"
+    recording,player: "Line In"
   </source>
   <dest>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </dest>
   <voice>
     *: none
-    recording,archosplayer: "Entrada de Linha"
+    recording,player: "Entrada de Linha"
   </voice>
 </phrase>
 <phrase>
@@ -2299,17 +2299,17 @@
   <source>
     *: none
     recording: "Microphone"
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    h100,h120,h300: "Internal Microphone"
   </source>
   <dest>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </dest>
   <voice>
     *: none
     recording: "Microfone"
-    iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    h100,h120,h300: "Microfone Interno"
   </voice>
 </phrase>
 <phrase>
@@ -3113,7 +3113,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"
@@ -3127,7 +3127,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"
@@ -3141,7 +3141,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"
@@ -4028,19 +4028,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 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: "Bateria: Carregamento Completo"
+    recorder: "Bateria: Carregamento Completo"
   </dest>
   <voice>
     *: none
-    archosrecorder: "Bateria: Carregamento Completado"
+    recorder: "Bateria: Carregamento Completado"
   </voice>
 </phrase>
 <phrase>
@@ -4066,13 +4066,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>
     *: "Bateria: %d%% %dh %dm"
-    archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível de bateria"
@@ -4130,19 +4130,19 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "mSD:"
+    e200*,c200*,fuze*: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*: "micro S D"
+    e200*,c200*,fuze*: "micro S D"
     ondio*: "M M C"
   </voice>
 </phrase>
@@ -4257,22 +4257,22 @@
   <source>
     *: none
     rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    h100,h120,h300: "STOP = Revert"
+    ipod*,c200*,sa9200: "MENU = Revert"
+    x5,m5: "RECORD = Revert"
+    h10,h10_5gb,e200*,fuze*: "PREV = Revert"
+    gigabeatf: "POWER = Revert"
     mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
   </source>
   <dest>
     *: none
     rtc: "OFF Para Reverter"
-    iriverh100,iriverh120,iriverh300: "STOP Para Reverter"
-    ipod*,sansac200*,gogearsa9200: "MENU Para Reverter"
-    iaudiox5,iaudiom5: "RECORD Para Reverter"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV Para Reverter"
-    gigabeatfx: "POWER Para Reverter"
+    h100,h120,h300: "STOP Para Reverter"
+    ipod*,c200*,sa9200: "MENU Para Reverter"
+    x5,m5: "RECORD Para Reverter"
+    h10,h10_5gb,e200*,fuze*: "PREV Para Reverter"
+    gigabeatf: "POWER Para Reverter"
     mrobe100: "DISPLAY Para Reverter"
     gigabeats: "BACK Para Reverter"
   </dest>
@@ -4372,16 +4372,16 @@
   <source>
     *: none
     recording: "The disk is full. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    sansae200*,sansac200*: "The disk is full. Press PREV to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200*,c200*: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
     recording: "O Disco Está Cheio. Carregue OFF Para Continuar"
-    iriverh100,iriverh120,iriverh300: "O Disco Está Cheio. Carregue STOP Para Continuar"
-    iaudiom5,iaudiox5: "O Disco Está Cheio. Carregue POWER Para Continuar"
-    sansae200*,sansac200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
+    h100,h120,h300: "O Disco Está Cheio. Carregue STOP Para Continuar"
+    m5,x5: "O Disco Está Cheio. Carregue POWER Para Continuar"
+    e200*,c200*: "O Disco Está Cheio. Carregue PREV Para Continuar"
   </dest>
   <voice>
     *: none
@@ -4566,14 +4566,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=Alterar OFF=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
-    iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
+    h10,h10_5gb: "SELECT=Alterar PREV=Cancelar"
     gigabeats: "SELECT=Alterar POWER=Cancelar"
   </dest>
   <voice>
@@ -7001,24 +7001,24 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on 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 para Abortar"
-    archosplayer,iriverh100,iriverh120,iriverh300: "STOP para Abortar"
+    player,h100,h120,h300: "STOP para Abortar"
     ipod*: "PLAY/PAUSE para Abortar"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para Abortar"
+    h10,h10_5gb,e200*,c200*: "PREV para Abortar"
     gigabeats: "BACK para Abortar"
-    gigabeatfx: "POWER para Abortar"
+    gigabeatf: "POWER para Abortar"
   </dest>
   <voice>
     *: ""
@@ -7809,7 +7809,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>
@@ -8258,11 +8258,11 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </source>
   <dest>
     *: "Buffer:"
-    archosplayer: "Buf:"
+    player: "Buf:"
   </dest>
   <voice>
     *: "tamanho do buffer"
@@ -8367,15 +8367,15 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Yes"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes"
+    player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = Sim"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sim"
-    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim"
-    archosplayer: "(PLAY/STOP)"
+    h100,h120,h300: "NAVI = Sim"
+    yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim"
+    player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
@@ -8388,14 +8388,14 @@
   <source>
     *: none
     rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set"
+    h100,h120,h300: "NAVI = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = Definir"
-    iriverh100,iriverh120,iriverh300: "NAVI = Definir"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Definir"
+    h100,h120,h300: "NAVI = Definir"
+    ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Definir"
   </dest>
   <voice>
     *: none
@@ -8407,15 +8407,15 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
+    player: none
   </source>
   <dest>
     *: "Any Other = Não"
-    archosplayer: none
+    player: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
+    player: none
   </voice>
 </phrase>
 <phrase>
@@ -8703,15 +8703,15 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
+    player: "End of List"
   </source>
   <dest>
     *: "Fim da Lista de Músicas"
-    archosplayer: "Fim da Lista"
+    player: "Fim da Lista"
   </dest>
   <voice>
     *: "Fim da Lista de Músicas"
-    archosplayer: "Fim da Lista"
+    player: "Fim da Lista"
   </voice>
 </phrase>
 <phrase>
@@ -10731,17 +10731,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Construindo Base da Dados... %d encontrado (OFF para voltar)"
-    iriverh100,iriverh120,iriverh300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
+    h100,h120,h300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
     ipod*: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
+    x5,m5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
+    h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -10936,15 +10936,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "Touchpad Sensitivity"
+    gigabeatf: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Sensitividade do Touchpad"
+    gigabeatf: "Sensitividade do Touchpad"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Sensitividade do Touchpad"
+    gigabeatf: "Sensitividade do Touchpad"
   </voice>
 </phrase>
 <phrase>
@@ -11460,15 +11460,15 @@
   user: core
   <source>
     *: none
-    gigabeatfx: "High"
+    gigabeatf: "High"
   </source>
   <dest>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "Alto"
+    gigabeatf: "Alto"
   </voice>
 </phrase>
 <phrase>