--- esperanto_original.lang	2010-01-05 18:59:11.000000000 +0000
+++ esperanto.lang	2010-01-05 19:10:17.000000000 +0000
@@ -16,6 +16,7 @@
 #
 # Esperanto language file, translated by:
 # - Marc-André Moreau (aghaster@hotmail.com)
+# updated by Wilfred Hughes (yowilfred+rockbox@gmail.com)
 #
 # Original Release: 04/06/06
 # Last Update: 04/06/06
@@ -79,20 +80,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME_SETTING_ASK
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Ask"
-  </source>
-  <dest>
-    *: "Demandi"
-  </dest>
-  <voice>
-    *: "Demandi"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALWAYS
   desc: used in various places
   user: core
@@ -125,13 +112,16 @@
   desc: in shutdown screen
   user: core
   <source>
-    *: "Press OFF to shut down"
+    *: none
+    soft_shutdown: "Press OFF to shut down"
   </source>
   <dest>
-    *: "Pesu OFF por malŝalti"
+    *: none
+    soft_shutdown: "Pesu OFF por malŝalti"
   </dest>
   <voice>
-    *: ""
+    *: none
+    soft_shutdown: "Pesu OFF por malŝalti"
   </voice>
 </phrase>
 <phrase>
@@ -150,16 +140,19 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user: core
   <source>
-    *: "Restarting playback..."
+    *: none
+    swcodec: ""
   </source>
   <dest>
-    *: "Restartanta la legon..."
+    *: none
+    swcodec: ""
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: ""
   </voice>
 </phrase>
 <phrase>
@@ -167,27 +160,16 @@
   desc: before acknowledging usb in case an MMC is inserted (Ondio)
   user: core
   <source>
-    *: "Please remove inserted MMC"
-  </source>
-  <dest>
-    *: "Retiru enmetata MMCan karton"
-  </dest>
-  <voice>
-    *: "Retiru enmetata MMCan karton"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MENU_SETTING_CANCEL
-  desc: Visual confirmation of canceling a changed setting
-  user: core
-  <source>
-    *: "Canceled"
+    *: none
+    ondio*: "Please remove inserted MMC"
   </source>
   <dest>
-    *: "Malvalidigita"
+    *: none
+    ondio*: "Retiru enmetata MMCan karton"
   </dest>
   <voice>
-    *: ""
+    *: none
+    ondio*: "Retiru enmetata MMCan karton"
   </voice>
 </phrase>
 <phrase>
@@ -265,13 +247,13 @@
   desc: in the main menu
   user: core
   <source>
-    *: "Browse Themes"
+    *: "Browse Theme Files"
   </source>
   <dest>
-    *: "Foliumi Temojn"
+    *: "Foliumi Temajn Dosierojn"
   </dest>
   <voice>
-    *: "Foliumi Temojn"
+    *: "Foliumi Temojn Dosierojn"
   </voice>
 </phrase>
 <phrase>
@@ -279,13 +261,16 @@
   desc: in the main menu
   user: core
   <source>
-    *: "FM Radio"
+    *: none
+    radio: "FM Radio"
   </source>
   <dest>
-    *: "FMa Radio"
+    *: none
+    radio: "FMa Radio"
   </dest>
   <voice>
-    *: "FMa Radio"
+    *: none
+    radio: "FMa Radio"
   </voice>
 </phrase>
 <phrase>
@@ -293,27 +278,16 @@
   desc: in the main menu
   user: core
   <source>
-    *: "Recording"
-  </source>
-  <dest>
-    *: "Rikordanta"
-  </dest>
-  <voice>
-    *: "Rikordanta"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PLAYLIST_MENU
-  desc: in the main menu
-  user: core
-  <source>
-    *: "Playlist Options"
+    *: none
+    recording: "Recording"
   </source>
   <dest>
-    *: "Leglista Opcioj"
+    *: none
+    recording: "Rikordanta"
   </dest>
   <voice>
-    *: "Leglista Opcioj"
+    *: none
+    recording: "Rikordanta"
   </voice>
 </phrase>
 <phrase>
@@ -321,27 +295,13 @@
   desc: in the main menu
   user: core
   <source>
-    *: "Browse Plugins"
-  </source>
-  <dest>
-    *: "Foliumi Kromprogramojn"
-  </dest>
-  <voice>
-    *: "Foliumi Kromprogramojn"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INFO
-  desc: in the main menu
-  user: core
-  <source>
-    *: "Info"
+    *: "Plugins"
   </source>
   <dest>
-    *: "Informoj"
+    *: "Kromprogramojn"
   </dest>
   <voice>
-    *: "Informoj"
+    *: "Kromprogramojn"
   </voice>
 </phrase>
 <phrase>
@@ -349,13 +309,16 @@
   desc: in main menu
   user: core
   <source>
-    *: "Shut down"
+    *: none
+    soft_shutdown: "Shut down"
   </source>
   <dest>
-    *: "Malŝalti"
+    *: none
+    soft_shutdown: "Malŝalti"
   </dest>
   <voice>
-    *: "Malŝalti"
+    *: none
+    soft_shutdown: "Malŝalti"
   </voice>
 </phrase>
 <phrase>
@@ -415,34 +378,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_MENU
-  desc: in sound_settings
-  user: core
-  <source>
-    *: "Channels"
-  </source>
-  <dest>
-    *: "Kanaloj"
-  </dest>
-  <voice>
-    *: "Kanaloj"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHANNEL
-  desc: in sound_settings
-  user: core
-  <source>
-    *: "Channel Configuration"
-  </source>
-  <dest>
-    *: "Kanala Formo"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CHANNEL_STEREO
   desc: in sound_settings
   user: core
@@ -545,13 +480,16 @@
   desc: in sound_settings
   user: core
   <source>
-    *: "Loudness"
+    *: none
+    masf: "Loudness"
   </source>
   <dest>
-    *: "Laŭto"
+    *: none
+    masf: "Laŭto"
   </dest>
   <voice>
-    *: "Laŭto"
+    *: none
+    masf: "Laŭto"
   </voice>
 </phrase>
 <phrase>
@@ -559,13 +497,16 @@
   desc: in sound_settings
   user: core
   <source>
-    *: "Auto Volume"
+    *: none
+    masf: "Auto Volume"
   </source>
   <dest>
-    *: "Aŭtomata Volumeno"
+    *: none
+    masf: "Aŭtomata Volumeno"
   </dest>
   <voice>
-    *: "Aŭtomata Volumeno"
+    *: none
+    masf: "Aŭtomata Volumeno"
   </voice>
 </phrase>
 <phrase>
@@ -573,13 +514,16 @@
   desc: in sound_settings
   user: core
   <source>
-    *: "AV Decay Time"
+    *: none
+    masf: "AV Decay Time"
   </source>
   <dest>
-    *: "Averaĝa Kadukiĝa Tempo"
+    *: none
+    masf: "Aŭtomata Sonforteco Kadukiĝa Tempo"
   </dest>
   <voice>
-    *: ""
+    *: none
+    masf: "Aŭtomata Sonforteco Kadukiĝa Tempo"
   </voice>
 </phrase>
 <phrase>
@@ -587,13 +531,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "Super Bass"
+    *: none
+    masf: "Super Bass"
   </source>
   <dest>
-    *: "Supra Baso"
+    *: none
+    masf: "Supra Baso"
   </dest>
   <voice>
-    *: "Supra Baso"
+    *: none
+    masf: "Supra Baso"
   </voice>
 </phrase>
 <phrase>
@@ -601,13 +548,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "MDB Enable"
+    *: none
+    masf: "MDB Enable"
   </source>
   <dest>
-    *: "MDB Ebligi"
+    *: none
+    masf: "MDB Ebligi"
   </dest>
   <voice>
-    *: "MDB Ebligi"
+    *: none
+    masf: "MDB Ebligi"
   </voice>
 </phrase>
 <phrase>
@@ -615,13 +565,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "MDB Strength"
+    *: none
+    masf: "MDB Strength"
   </source>
   <dest>
-    *: "MDB Forto"
+    *: none
+    masf: "MDB Forto"
   </dest>
   <voice>
-    *: "MDB Forto"
+    *: none
+    masf: "MDB Forto"
   </voice>
 </phrase>
 <phrase>
@@ -629,13 +582,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "MDB Harmonics"
+    *: none
+    masf: "MDB Harmonics"
   </source>
   <dest>
-    *: "MDB Harmonoj"
+    *: none
+    masf: "MDB Harmonoj"
   </dest>
   <voice>
-    *: "MDB Harmonoj"
+    *: none
+    masf: "MDB Harmonoj"
   </voice>
 </phrase>
 <phrase>
@@ -643,13 +599,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "MDB Center Frequency"
+    *: none
+    masf: "MDB Centre Frequency"
   </source>
   <dest>
-    *: "MDB Centra Frekvenco"
+    *: none
+    masf: "MDB Centra Frekvenco"
   </dest>
   <voice>
-    *: "MDB Center Frekvenco"
+    *: none
+    masf: "MDB Center Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -657,13 +616,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "MDB Shape"
+    *: none
+    masf: "MDB Shape"
   </source>
   <dest>
-    *: "MDB Formo"
+    *: none
+    masf: "MDB Formo"
   </dest>
   <voice>
-    *: "MDB Formo"
+    *: none
+    masf: "MDB Formo"
   </voice>
 </phrase>
 <phrase>
@@ -671,13 +633,16 @@
   desc: in sound settings
   user: core
   <source>
-    *: "Crossfeed"
+    *: none
+    swcodec: "Crossfeed"
   </source>
   <dest>
-    *: "Transmikso"
+    *: none
+    swcodec: "Transmikso"
   </dest>
   <voice>
-    *: "Transmikso"
+    *: none
+    swcodec: "Transmikso"
   </voice>
 </phrase>
 <phrase>
@@ -685,13 +650,16 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: "Equalizer"
+    *: none
+    swcodec: "Equalizer"
   </source>
   <dest>
-    *: "Egalilo"
+    *: none
+    swcodec: "Egalilo"
   </dest>
   <voice>
-    *: "Egalilo"
+    *: none
+    swcodec: "Egalilo"
   </voice>
 </phrase>
 <phrase>
@@ -699,13 +667,13 @@
   desc: in settings_menu()
   user: core
   <source>
-    *: "Playback"
+    *: "Playback Settings"
   </source>
   <dest>
-    *: "Lego"
+    *: "Agordoj de Lego"
   </dest>
   <voice>
-    *: "Lego"
+    *: "Agordoj de Lego"
   </voice>
 </phrase>
 <phrase>
@@ -738,7 +706,7 @@
 </phrase>
 <phrase>
   id: LANG_SYSTEM
-  desc: in settings_menu()
+  desc: in the main menu and settings menu
   user: core
   <source>
     *: "System"
@@ -807,20 +775,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FIRMWARE
-  desc: in the main menu
-  user: core
-  <source>
-    *: "Browse Firmwares"
-  </source>
-  <dest>
-    *: "Foliumi Firmvarojn"
-  </dest>
-  <voice>
-    *: "Foliumi Firmvarojn"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESET
   desc: in system_settings_menu()
   user: core
@@ -835,63 +789,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK_RECORDER
-  desc: confirm to reset settings
-  user: core
-  <source>
-    *: "Are You Sure?"
-  </source>
-  <dest>
-    *: "Ĉu vi estas certa?"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CONFIRM_WITH_PLAY_RECORDER
-  desc: Generic archosrecorder string to use to confirm
-  user: core
-  <source>
-    *: "PLAY = Yes"
-  </source>
-  <dest>
-    *: "LEGI = Jes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Jes"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CANCEL_WITH_ANY_RECORDER
-  desc: Generic archosrecorder string to use to cancel
-  user: core
-  <source>
-    *: "Any Other = No"
-  </source>
-  <dest>
-    *: "Alia Ajn = Ne"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RESET_DONE_SETTING
-  desc: visual confirmation after settings reset
-  user: core
-  <source>
-    *: "Settings"
-  </source>
-  <dest>
-    *: "Agordaĵoj"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESET_DONE_CLEAR
   desc: visual confirmation after settings reset
   user: core
@@ -906,20 +803,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_DONE_CANCEL
-  desc: Visual confirmation of cancelation
-  user: core
-  <source>
-    *: "Canceled"
-  </source>
-  <dest>
-    *: "Malvalidigita"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SAVE_SETTINGS
   desc: in system_settings_menu()
   user: core
@@ -934,87 +817,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_SAVE_PLAYER
-  desc: displayed if save settings has failed
-  user: core
-  <source>
-    *: "Save Failed"
-  </source>
-  <dest>
-    *: "Surdiskigo Malsukcesis"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SETTINGS_BATTERY_PLAYER
-  desc: if save settings has failed
-  user: core
-  <source>
-    *: "Partition?"
-  </source>
-  <dest>
-    *: "Apartigi?"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SETTINGS_SAVE_RECORDER
-  desc: displayed if save settings has failed
-  user: core
-  <source>
-    *: "Save Failed"
-  </source>
-  <dest>
-    *: "Surdiskigo Malsukcesis"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SETTINGS_BATTERY_RECORDER
-  desc: if save settings has failed
-  user: core
-  <source>
-    *: "No partition?"
-  </source>
-  <dest>
-    *: "Neniu apartigo?"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_RECORDING_MENU
-  desc: in the recording sub menu
-  user: core
-  <source>
-    *: "Recording Screen"
-  </source>
-  <dest>
-    *: "Rikordanta Ekrano"
-  </dest>
-  <voice>
-    *: "Rikordanta Ekrano"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RECORDING_SETTINGS
   desc: in the main menu
   user: core
   <source>
-    *: "Recording Settings"
+    *: none
+    recording: "Recording Settings"
   </source>
   <dest>
-    *: "Registranta Agordaĵojn"
+    *: none
+    recording: "Registranta Agordaĵojn"
   </dest>
   <voice>
-    *: "Registranta Agordaĵojn"
+    *: none
+    recording: "Registranta Agordaĵojn"
   </voice>
 </phrase>
 <phrase>
@@ -1022,13 +838,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Enable EQ"
+    *: none
+    swcodec: "Enable EQ"
   </source>
   <dest>
-    *: "Ebligi EQ"
+    *: none
+    swcodec: "Ebligi EQ"
   </dest>
   <voice>
-    *: "Ebligi egalilon"
+    *: none
+    swcodec: "Ebligi egalilon"
   </voice>
 </phrase>
 <phrase>
@@ -1036,13 +855,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Graphical EQ"
+    *: none
+    swcodec: "Graphical EQ"
   </source>
   <dest>
-    *: "Grafika EQ"
+    *: none
+    swcodec: "Grafika EQ"
   </dest>
   <voice>
-    *: "Grafika egalilo"
+    *: none
+    swcodec: "Grafika egalilo"
   </voice>
 </phrase>
 <phrase>
@@ -1050,13 +872,16 @@
   desc: in eq settings
   user: core
   <source>
-    *: "Precut"
+    *: none
+    swcodec: "Precut"
   </source>
   <dest>
-    *: "Antaŭtranĉo"
+    *: none
+    swcodec: "Antaŭtranĉo"
   </dest>
   <voice>
-    *: "Antaŭtranĉo"
+    *: none
+    swcodec: "Antaŭtranĉo"
   </voice>
 </phrase>
 <phrase>
@@ -1064,13 +889,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Simple EQ Settings"
+    *: none
+    swcodec: "Simple EQ Settings"
   </source>
   <dest>
-    *: "Simpla EQ Agordaĵoj"
+    *: none
+    swcodec: "Simpla EQ Agordaĵoj"
   </dest>
   <voice>
-    *: "Simpla egalilo Agordaĵoj"
+    *: none
+    swcodec: "Simpla egalilo Agordaĵoj"
   </voice>
 </phrase>
 <phrase>
@@ -1078,13 +906,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Advanced EQ Settings"
+    *: none
+    swcodec: "Advanced EQ Settings"
   </source>
   <dest>
-    *: "Progresinta EQ Agordaĵoj"
+    *: none
+    swcodec: "Progresinta EQ Agordaĵoj"
   </dest>
   <voice>
-    *: "Progresinta EQ Agordaĵoj"
+    *: none
+    swcodec: "Progresinta EQ Agordaĵoj"
   </voice>
 </phrase>
 <phrase>
@@ -1092,13 +923,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Save EQ Preset"
+    *: none
+    swcodec: "Save EQ Preset"
   </source>
   <dest>
-    *: "Surdiskigi EQ Agordaĵojn"
+    *: none
+    swcodec: "Surdiskigi EQ Agordaĵojn"
   </dest>
   <voice>
-    *: "Surdiskigi egalilon Agordaĵojn"
+    *: none
+    swcodec: "Surdiskigi egalilon Agordaĵojn"
   </voice>
 </phrase>
 <phrase>
@@ -1106,13 +940,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Browse EQ Presets"
+    *: none
+    swcodec: "Browse EQ Presets"
   </source>
   <dest>
-    *: "Foliumi EQ Agordaĵojn"
+    *: none
+    swcodec: "Foliumi EQ Agordaĵojn"
   </dest>
   <voice>
-    *: "Foliumi EQ Agordaĵojn"
+    *: none
+    swcodec: "Foliumi EQ Agordaĵojn"
   </voice>
 </phrase>
 <phrase>
@@ -1120,13 +957,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Edit mode: %s"
+    *: none
+    swcodec: "Edit mode: %s"
   </source>
   <dest>
-    *: "Eldona Reĝimo: %s"
+    *: none
+    swcodec: "Eldona Reĝimo: %s"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "Eldona Reĝimo: %s"
   </voice>
 </phrase>
 <phrase>
@@ -1134,13 +974,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "%d Hz Band Gain"
+    *: none
+    swcodec: "%d Hz Band Gain"
   </source>
   <dest>
-    *: "%d Hz Strio Gajno"
+    *: none
+    swcodec: "%d Hz Strio Gajno"
   </dest>
   <voice>
-    *: ""
+    *: none
+    swcodec: "herco strio gajno"
   </voice>
 </phrase>
 <phrase>
@@ -1148,13 +991,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Low Shelf Filter"
+    *: none
+    swcodec: "Low Shelf Filter"
   </source>
   <dest>
-    *: "Malakuta Filtrilo"
+    *: none
+    swcodec: "Malakuta Filtrilo"
   </dest>
   <voice>
-    *: "Malakuta Filtrilo"
+    *: none
+    swcodec: "Malakuta Filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -1162,13 +1008,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Peak Filter %d"
+    *: none
+    swcodec: "Peak Filter %d"
   </source>
   <dest>
-    *: "Pinta Filtrilo %d"
+    *: none
+    swcodec: "Pinta Filtrilo %d"
   </dest>
   <voice>
-    *: "Pinta filtrilo"
+    *: none
+    swcodec: "Pinta filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -1176,13 +1025,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "High Shelf Filter"
+    *: none
+    swcodec: "High Shelf Filter"
   </source>
   <dest>
-    *: "Akuta Filtrilo"
+    *: none
+    swcodec: "Akuta Filtrilo"
   </dest>
   <voice>
-    *: "Akuta Filtrilo"
+    *: none
+    swcodec: "Akuta Filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -1190,13 +1042,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Cutoff Frequency"
+    *: none
+    swcodec: "Cutoff Frequency"
   </source>
   <dest>
-    *: "Tranĉa Frekvenco"
+    *: none
+    swcodec: "Tranĉa Frekvenco"
   </dest>
   <voice>
-    *: "Tranĉa Frekvenco"
+    *: none
+    swcodec: "Tranĉa Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -1204,13 +1059,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Center Frequency"
+    *: none
+    swcodec: "Center Frequency"
   </source>
   <dest>
-    *: "Centro Frekvenco"
+    *: none
+    swcodec: "Centro Frekvenco"
   </dest>
   <voice>
-    *: "Centro Frekvenco"
+    *: none
+    swcodec: "Centro Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -1218,27 +1076,16 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Q"
-  </source>
-  <dest>
-    *: "Q"
-  </dest>
-  <voice>
-    *: "Q"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_EQUALIZER_BAND_GAIN
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Gain"
+    *: none
+    swcodec: "Q"
   </source>
   <dest>
-    *: "Gajno"
+    *: none
+    swcodec: "Q"
   </dest>
   <voice>
-    *: "Gajno"
+    *: none
+    swcodec: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1312,22 +1159,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INFO_MENU
-  desc: in the info menu
-  user: core
-  <source>
-    *: "Rockbox Info"
-  </source>
-  <dest>
-    *: "Rockbox Informoj"
-  </dest>
-  <voice>
-    *: "Rockbox Informoj"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_VERSION
-  desc: in the info menu
+  desc: in the Rockbox Info screen
   user: core
   <source>
     *: "Version"
@@ -1354,20 +1187,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_USB
-  desc: deprecated
-  user:
-  <source>
-    *: none
-  </source>
-  <dest>
-    *: none
-  </dest>
-  <voice>
-    *: none
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SHUFFLE
   desc: in settings_menu
   user: core
@@ -1396,20 +1215,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPEAT_ALL
-  desc: repeat playlist once all songs have completed
-  user: core
-  <source>
-    *: "All"
-  </source>
-  <dest>
-    *: "Ĉiuj"
-  </dest>
-  <voice>
-    *: "Ĉiuj"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_REPEAT_ONE
   desc: repeat one song
   user: core
@@ -1425,7 +1230,7 @@
 </phrase>
 <phrase>
   id: LANG_REPEAT_AB
-  desc: repeat one song
+  desc: repeat range from point A to B
   user: core
   <source>
     *: "A-B"
@@ -1452,20 +1257,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Resume on Startup"
-  </source>
-  <dest>
-    *: "Aŭtomata Lega Rekomenco Dum Starto"
-  </dest>
-  <voice>
-    *: "Aŭtomata Lega Rekomenco Dum Starto"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_WIND_MENU
   desc: in the playback sub menu
   user: core
@@ -1485,12 +1276,15 @@
   user: core
   <source>
     *: "Anti-Skip Buffer"
+    flash_storage: none
   </source>
   <dest>
     *: "Anti-Salta Bufro"
+    flash_storage: none
   </dest>
   <voice>
     *: "Anti-Salta Bufro"
+    flash_storage: none
   </voice>
 </phrase>
 <phrase>
@@ -1526,13 +1320,16 @@
   desc: in playback settings
   user: core
   <source>
-    *: "Crossfade"
+    *: none
+    crossfade: "Crossfade"
   </source>
   <dest>
-    *: "Transfado"
+    *: none
+    crossfade: "Transfado"
   </dest>
   <voice>
-    *: "Transfado"
+    *: none
+    crossfade: "Transfado"
   </voice>
 </phrase>
 <phrase>
@@ -1568,13 +1365,16 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: "Weak"
+    *: none
+    swcodec: "Weak"
   </source>
   <dest>
-    *: "Malforta"
+    *: none
+    swcodec: "Malforta"
   </dest>
   <voice>
-    *: "Malforta"
+    *: none
+    swcodec: "Malforta"
   </voice>
 </phrase>
 <phrase>
@@ -1582,13 +1382,16 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: "Moderate"
+    *: none
+    swcodec: "Moderate"
   </source>
   <dest>
-    *: "Meza"
+    *: none
+    swcodec: "Meza"
   </dest>
   <voice>
-    *: "Meza"
+    *: none
+    swcodec: "Meza"
   </voice>
 </phrase>
 <phrase>
@@ -1596,13 +1399,16 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: "Strong"
+    *: none
+    swcodec: "Strong"
   </source>
   <dest>
-    *: "Forta"
+    *: none
+    swcodec: "Forta"
   </dest>
   <voice>
-    *: "Forta"
+    *: none
+    swcodec: "Forta"
   </voice>
 </phrase>
 <phrase>