49 files changed, 21030 insertions, 35493 deletions

diff --git a/apps/lang/afrikaans.lang b/apps/lang/afrikaans.lang
index 96feb3a7c6..e744c06443 100644
--- a/apps/lang/afrikaans.lang
+++ b/apps/lang/afrikaans.lang
@@ -830,7 +830,7 @@
 </phrase>
 <phrase>
   id: LANG_ID3_ARTIST
-  desc: in wps 
+  desc: in wps
   user: core
   <source>
     *: "Artist"
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index 4e0819018e..9d79d563ba 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -17,9 +17,6 @@
 # Arabic language file, translated by:
 # - Mohamed Tarek
 # - Raafat Akkad
-<options>
-  rtl: 1
-</options>
 <phrase>
   id: LANG_LOUDNESS
   desc: in sound_settings
@@ -70,16 +67,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "نوع خط الاختيار"
+    *: "نوع خط الاختيار"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -115,16 +109,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "إعدادات المعادل المتقدمة"
+    *: "إعدادات المعادل المتقدمة"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -264,16 +255,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "معادل تصويرى"
+    *: "معادل تصويرى"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical equalizer"
+    *: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -424,16 +412,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "متوسط"
+    *: "متوسط"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -500,16 +485,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "تردد الانقطاع"
+    *: "تردد الانقطاع"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -632,16 +614,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "قوى"
+    *: "قوى"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -1369,16 +1348,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "الانقطاع عند التردد العالى"
+    *: "الانقطاع عند التردد العالى"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -1473,16 +1449,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "ضغط المفتاح"
+    *: "ضغط المفتاح"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -1630,16 +1603,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "مؤشر"
+    *: "مؤشر"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -1681,16 +1651,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "شريط الحالة"
+    *: "شريط الحالة"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -1726,16 +1693,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "تردد الانقطاع"
+    *: "تردد الانقطاع"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1975,15 +1939,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "التردد"
+    play_frequency,recording: "التردد"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -2022,16 +1986,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "تردد المركز"
+    *: "تردد المركز"
   </dest>
   <voice>
-    *: none
-    swcodec: "Center frequency"
+    *: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -2261,16 +2222,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "الكسب المستعرض"
+    *: "الكسب المستعرض"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -2323,16 +2281,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "الارتجاف"
+    *: "الارتجاف"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -2385,16 +2340,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "إعدادات المعادل البسيطة"
+    *: "إعدادات المعادل البسيطة"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -2402,16 +2354,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "خافت"
+    *: "خافت"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -2461,16 +2410,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "%s : وضع التحرير"
+    *: "%s : وضع التحرير"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2478,16 +2424,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "تخفيف التردد العالي"
+    *: "تخفيف التردد العالي"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -2509,21 +2452,18 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "تفعيل المعادل"
+    *: "تفعيل المعادل"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
   id: VOICE_EXT_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: ""
@@ -2633,16 +2573,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "مقلوبة"
+    *: "مقلوبة"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2771,16 +2708,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "عرض إعدادات المعادل المسبقة"
+    *: "عرض إعدادات المعادل المسبقة"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -2914,16 +2848,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "(الشريط(معكوس"
+    *: "(الشريط(معكوس"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3007,16 +2938,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "المعادل"
+    *: "المعادل"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -3156,16 +3084,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "الكسب المباشر"
+    *: "الكسب المباشر"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -3316,16 +3241,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Browse Fonts"
+    *: "Browse Fonts"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "عرض الخطوط"
+    *: "عرض الخطوط"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Browse Fonts"
+    *: "Browse Fonts"
   </voice>
 </phrase>
 <phrase>
@@ -3477,16 +3399,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "وضع التحرير : s %s%"
+    *: "وضع التحرير : s %s%"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -3647,19 +3566,16 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
-    iriverh100,iriverh120,iriverh300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,iriverh10,iriverh10_5gb,mrobe100,samsungyh*,sansac200*,sansae200*,sansafuze*,vibe500: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
     ipod*: "جاري بناء قاعدة البيانات...  عثر على d% (السابق للعودة)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
-    gogearsa9200: "جاري بناء قاعدة البيانات...  عثر على d% (يسار للعودة)"
+    iriverh100,iriverh120,iriverh300: "جاري بناء قاعدة البيانات...  عثر على d% (إيقاف للعودة)"
   </dest>
   <voice>
     *: "المدخلات التي عثر عليها لفاعدة البيانات"
@@ -4174,16 +4090,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -4284,16 +4197,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "تايلاندي (ISO-8859-11)"
+    *: "تايلاندي (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -4422,16 +4332,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ياباني (SJIS)"
+    *: "ياباني (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -4526,16 +4433,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "عبري (ISO-8859-8)"
+    *: "عبري (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -4602,16 +4506,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "امنع القص"
+    *: "امنع القص"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -4619,16 +4520,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "كوري (KSX1001)"
+    *: "كوري (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -4727,17 +4625,16 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "القرص مملوء. اضغط إيقاف للاستمرار."
-    iriverh100,iriverh120,iriverh300: "القرص مملوء. اضغط إيقاف للاستمرار."
     iaudiom5,iaudiox5: "القرص مملوء. اضغط زر التشغيل للاستمرار."
-    sansae200*,sansac200*,vibe500: "القرص مملوء. اضغط السابق للاستمرار."
+    iriverh100,iriverh120,iriverh300,recording: "القرص مملوء. اضغط إيقاف للاستمرار."
+    sansac200*,sansae200*,vibe500: "القرص مملوء. اضغط السابق للاستمرار."
   </dest>
   <voice>
     *: none
@@ -4796,16 +4693,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "صينية مبسطة (GB2312)"
+    *: "صينية مبسطة (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -5139,16 +5033,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "الصينية التقليدية"
+    *: "الصينية التقليدية"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "الصينية التقليدية"
+    *: "الصينية التقليدية"
   </voice>
 </phrase>
 <phrase>
@@ -5413,18 +5304,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "ميكروفون"
     iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
+    recording: "ميكروفون"
   </dest>
   <voice>
     *: none
-    recording: "ميكروفون"
     iriverh100,iriverh120,iriverh300: "ميكروفون داخلي"
+    recording: "ميكروفون"
   </voice>
 </phrase>
 <phrase>
@@ -6506,32 +6397,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    gigabeatfx: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,sansac200*: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر"
-    ipod*,sansac200*: "قائمة = إاغاء الأمر"
-    iaudiox5,iaudiom5: "سجل = إاغاء الأمر"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر"
     gigabeatfx: "طاقة = إاغاء الأمر"
-    mrobe100: "DISPLAY = Revert"
     gigabeats: "خلف = إاغاء الأمر"
     gogearsa9200: "يسار = إاغاء الأمر"
-    vibe500: "CANCEL = Revert"
+    iaudiom5,iaudiox5: "سجل = إاغاء الأمر"
+    ipod*,sansac200*: "قائمة = إاغاء الأمر"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر"
+    iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر"
+    mrobe100: "DISPLAY = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </dest>
   <voice>
     *: none
@@ -6542,16 +6432,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "الرسوم البيانية"
+    *: "الرسوم البيانية"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "الرسوم البيانية"
+    *: "الرسوم البيانية"
   </voice>
 </phrase>
 <phrase>
@@ -6736,16 +6623,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "العربية (CP1256)"
+    *: "العربية (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "العربية"
+    *: "العربية"
   </voice>
 </phrase>
 <phrase>
@@ -6812,16 +6696,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "رقمي"
+    *: "رقمي"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "رقمي"
+    *: "رقمي"
   </voice>
 </phrase>
 <phrase>
@@ -6961,7 +6842,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index 8fa185081c..5f189aad07 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -246,20 +246,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Bai"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, edo goi-eskuin = Bai"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Bai"
     iriverh100,iriverh120,iriverh300: "NAVI = Bai"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Bai"
     mrobe500: "PLAY, POWER, or top-right = Bai"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Bai"
   </dest>
   <voice>
@@ -622,7 +622,7 @@
     *: "Soinu Aukerak"
   </dest>
   <voice>
-        *: "Soinu Aukerak"
+    *: "Soinu Aukerak"
   </voice>
 </phrase>
 <phrase>
@@ -815,16 +815,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Erreproduzioa Iraungipenarekin"
+    *: "Erreproduzioa Iraungipenarekin"
   </dest>
   <voice>
-    *: none
-    swcodec: "Erreproduzioa Iraungipenarekin"
+    *: "Erreproduzioa Iraungipenarekin"
   </voice>
 </phrase>
 <phrase>
@@ -832,16 +829,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Irabazi Zuzena"
+    *: "Irabazi Zuzena"
   </dest>
   <voice>
-    *: none
-    swcodec: "Irabazi zuzena"
+    *: "Irabazi zuzena"
   </voice>
 </phrase>
 <phrase>
@@ -849,16 +843,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zeharkako Irabazia"
+    *: "Zeharkako Irabazia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zeharkako irabazia"
+    *: "Zeharkako irabazia"
   </voice>
 </phrase>
 <phrase>
@@ -866,16 +857,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain-Frekuentzia Atenuazioa"
+    *: "Gain-Frekuentzia Atenuazioa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain-frekuentzia atenuazioa"
+    *: "Gain-frekuentzia atenuazioa"
   </voice>
 </phrase>
 <phrase>
@@ -883,16 +871,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain-Frekuentzia Mozketa"
+    *: "Gain-Frekuentzia Mozketa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain-frekuentzia mozketa"
+    *: "Gain-frekuentzia mozketa"
   </voice>
 </phrase>
 <phrase>
@@ -900,16 +885,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ekualizatzailea"
+    *: "Ekualizatzailea"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekualizatzailea"
+    *: "Ekualizatzailea"
   </voice>
 </phrase>
 <phrase>
@@ -917,16 +899,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EK Gaitu"
+    *: "EK Gaitu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekualizatzailea gaitu"
+    *: "Ekualizatzailea gaitu"
   </voice>
 </phrase>
 <phrase>
@@ -934,16 +913,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EK Grafikoa"
+    *: "EK Grafikoa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekualizatzaile grafikoa"
+    *: "Ekualizatzaile grafikoa"
   </voice>
 </phrase>
 <phrase>
@@ -951,16 +927,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Aurremozketa"
+    *: "Aurremozketa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aurremozketa"
+    *: "Aurremozketa"
   </voice>
 </phrase>
 <phrase>
@@ -968,16 +941,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "EK Arrunt Aukerak"
+    *: "EK Arrunt Aukerak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekualizatzaile arrunt aukerak"
+    *: "Ekualizatzaile arrunt aukerak"
   </voice>
 </phrase>
 <phrase>
@@ -985,16 +955,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "EK Aurreratu Aukerak"
+    *: "EK Aurreratu Aukerak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekualizatzaile aurreratu aukerak"
+    *: "Ekualizatzaile aurreratu aukerak"
   </voice>
 </phrase>
 <phrase>
@@ -1002,16 +969,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Gorde EK Ezarpenak"
+    *: "Gorde EK Ezarpenak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gorde ekualizatzaile ezarpenak"
+    *: "Gorde ekualizatzaile ezarpenak"
   </voice>
 </phrase>
 <phrase>
@@ -1019,16 +983,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Arakatu EK Ezarpenak"
+    *: "Arakatu EK Ezarpenak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Arakatu ekualizatzaile ezarpenak"
+    *: "Arakatu ekualizatzaile ezarpenak"
   </voice>
 </phrase>
 <phrase>
@@ -1036,16 +997,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edizio modua: %s"
+    *: "Edizio modua: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1053,16 +1011,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Banda Irabazia"
+    *: "%d Hz Banda Irabazia"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertzio banda irabazia"
+    *: "hertzio banda irabazia"
   </voice>
 </phrase>
 <phrase>
@@ -1070,16 +1025,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Maila Baxuko Iragazkia"
+    *: "Maila Baxuko Iragazkia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Maila Baxuko Iragazkia"
+    *: "Maila Baxuko Iragazkia"
   </voice>
 </phrase>
 <phrase>
@@ -1087,16 +1039,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Piko Iragazkia %d"
+    *: "Piko Iragazkia %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Piko iragazkia"
+    *: "Piko iragazkia"
   </voice>
 </phrase>
 <phrase>
@@ -1104,16 +1053,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Maila Altuko Iragazkia"
+    *: "Maila Altuko Iragazkia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Maila Altuko Iragazkia"
+    *: "Maila Altuko Iragazkia"
   </voice>
 </phrase>
 <phrase>
@@ -1121,16 +1067,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Mozketa Frekuentzia"
+    *: "Mozketa Frekuentzia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mozketa Frekuentzia"
+    *: "Mozketa Frekuentzia"
   </voice>
 </phrase>
 <phrase>
@@ -1138,16 +1081,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frekuentzia Ertaina"
+    *: "Frekuentzia Ertaina"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekuentzia ertaina"
+    *: "Frekuentzia ertaina"
   </voice>
 </phrase>
 <phrase>
@@ -1155,16 +1095,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1172,16 +1109,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Bilbea"
+    *: "Bilbea"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bilbea"
+    *: "Bilbea"
   </voice>
 </phrase>
 <phrase>
@@ -1725,16 +1659,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Mozketak Saihestu"
+    *: "Mozketak Saihestu"
   </dest>
   <voice>
-    *: none
-        swcodec: "Mozketak Saihestu"
+    *: "Mozketak Saihestu"
   </voice>
 </phrase>
 <phrase>
@@ -1812,16 +1743,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Abesti Aldatze Soinua"
+    *: "Abesti Aldatze Soinua"
   </dest>
   <voice>
-    *: none
-    swcodec: "Abesti Aldatze Soinua"
+    *: "Abesti Aldatze Soinua"
   </voice>
 </phrase>
 <phrase>
@@ -1829,16 +1757,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Isila"
+    *: "Isila"
   </dest>
   <voice>
-    *: none
-    swcodec: "Isila"
+    *: "Isila"
   </voice>
 </phrase>
 <phrase>
@@ -1846,16 +1771,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Ertaina"
+    *: "Ertaina"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ertaina"
+    *: "Ertaina"
   </voice>
 </phrase>
 <phrase>
@@ -1863,16 +1785,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Zaratatsua"
+    *: "Zaratatsua"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zaratatsua"
+    *: "Zaratatsua"
   </voice>
 </phrase>
 <phrase>
@@ -2229,21 +2148,20 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Datubasea eraikitzen... %d aurkituak (OFF itzultzeko)"
-    iriverh100,iriverh120,iriverh300: "Datubasea eraikitzen... %d aurkituak (STOP itzultzeko)"
-    ipod*: "Datubasea eraikitzen... %d aurkituak ( |<< itzultzeko)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Datubasea eraikitzen... %d aurkituak (EZKER itzultzeko)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Datubasea eraikitzen... %d aurkituak (AURR itzultzeko)"
-    gogearsa9200: "Datubasea Eraikitzen... %d aurkituak (REW itzultzeko)"
     archosplayer: "Datubasea Eraikitzen %d aurkituak"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Datubasea eraikitzen... %d aurkituak (EZKER itzultzeko)"
+    gogearsa9200: "Datubasea Eraikitzen... %d aurkituak (REW itzultzeko)"
+    ipod*: "Datubasea eraikitzen... %d aurkituak ( |<< itzultzeko)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Datubasea eraikitzen... %d aurkituak (AURR itzultzeko)"
+    iriverh100,iriverh120,iriverh300: "Datubasea eraikitzen... %d aurkituak (STOP itzultzeko)"
   </dest>
   <voice>
     *: "sarrera aurkiturik datubaserako"
@@ -2425,16 +2343,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fuentea"
+    *: "Fuentea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fuentea"
+    *: "Fuentea"
   </voice>
 </phrase>
 <phrase>
@@ -2696,16 +2611,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Goitik Behera"
+    *: "Goitik Behera"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Goitik Behera"
+    *: "Goitik Behera"
   </voice>
 </phrase>
 <phrase>
@@ -2713,16 +2625,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aukera Lerro Moeta"
+    *: "Aukera Lerro Moeta"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aukera Lerro Moeta"
+    *: "Aukera Lerro Moeta"
   </voice>
 </phrase>
 <phrase>
@@ -2730,16 +2639,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Erakuslea"
+    *: "Erakuslea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Erakuslea"
+    *: "Erakuslea"
   </voice>
 </phrase>
 <phrase>
@@ -2747,16 +2653,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra (Alderantziz)"
+    *: "Barra (Alderantziz)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra Alderantziz"
+    *: "Barra Alderantziz"
   </voice>
 </phrase>
 <phrase>
@@ -3046,16 +2949,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pantailatik Kanpoko Korritzea"
+    *: "Pantailatik Kanpoko Korritzea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pantailatik Kanpoko Korritzea"
+    *: "Pantailatik Kanpoko Korritzea"
   </voice>
 </phrase>
 <phrase>
@@ -3063,16 +2963,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pantaila Korritze Pausu Tamaina"
+    *: "Pantaila Korritze Pausu Tamaina"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pantaila Korritze Pausu Tamaina"
+    *: "Pantaila Korritze Pausu Tamaina"
   </voice>
 </phrase>
 <phrase>
@@ -3128,16 +3025,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Egoera-/Korritze-barra"
+    *: "Egoera-/Korritze-barra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Egoera-/Korritze-barra"
+    *: "Egoera-/Korritze-barra"
   </voice>
 </phrase>
 <phrase>
@@ -3145,16 +3039,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korritze Barra"
+    *: "Korritze Barra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korritze Barra"
+    *: "Korritze Barra"
   </voice>
 </phrase>
 <phrase>
@@ -3162,16 +3053,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Egoera Barra"
+    *: "Egoera Barra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Egoera Barra"
+    *: "Egoera Barra"
   </voice>
 </phrase>
 <phrase>
@@ -3196,16 +3084,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bolumena Bistaratzea"
+    *: "Bolumena Bistaratzea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bolumena Bistaratzea"
+    *: "Bolumena Bistaratzea"
   </voice>
 </phrase>
 <phrase>
@@ -3213,16 +3098,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bateria Bistaratzea"
+    *: "Bateria Bistaratzea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bateria Bistaratzea"
+    *: "Bateria Bistaratzea"
   </voice>
 </phrase>
 <phrase>
@@ -3230,16 +3112,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafikoa"
+    *: "Grafikoa"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafikoa"
+    *: "Grafikoa"
   </voice>
 </phrase>
 <phrase>
@@ -3247,16 +3126,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zenbakizkoa"
+    *: "Zenbakizkoa"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zenbakizkoa"
+    *: "Zenbakizkoa"
   </voice>
 </phrase>
 <phrase>
@@ -3476,16 +3352,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreera (ISO-8859-8)"
+    *: "Hebreera (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreera"
+    *: "Hebreera"
   </voice>
 </phrase>
 <phrase>
@@ -3507,16 +3380,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thailandarra (ISO-8859-11)"
+    *: "Thailandarra (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thailandarra"
+    *: "Thailandarra"
   </voice>
 </phrase>
 <phrase>
@@ -3524,16 +3394,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabiarra (CP1256)"
+    *: "Arabiarra (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabiarra"
+    *: "Arabiarra"
   </voice>
 </phrase>
 <phrase>
@@ -3569,16 +3436,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japoniarra (SJIS)"
+    *: "Japoniarra (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japoniarra"
+    *: "Japoniarra"
   </voice>
 </phrase>
 <phrase>
@@ -3586,16 +3450,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Txinatar Arrunta (GB2312)"
+    *: "Txinatar Arrunta (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Txinatar Arrunta"
+    *: "Txinatar Arrunta"
   </voice>
 </phrase>
 <phrase>
@@ -3603,16 +3464,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korearra (KSX1001)"
+    *: "Korearra (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korearra"
+    *: "Korearra"
   </voice>
 </phrase>
 <phrase>
@@ -3620,16 +3478,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Txinatar Tradizionala (BIG5)"
+    *: "Txinatar Tradizionala (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Txinatar Tradizionala"
+    *: "Txinatar Tradizionala"
   </voice>
 </phrase>
 <phrase>
@@ -3653,17 +3508,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Errubera Argia Itzaltzen"
+    sansae200*,sansafuze*: "Errubera Argia Itzaltzen"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Errubera Argia Itzaltzen"
+    sansae200*,sansafuze*: "Errubera Argia Itzaltzen"
   </voice>
 </phrase>
 <phrase>
@@ -3934,27 +3789,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Ezarri"
-    mrobe500: "HEART = Ezarri"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ezarri"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ezarri"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ezarri"
     gogearsa9200,samsungyh*: "PLAY = Ezarri"
-    vibe500: "OK = Ezarri"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ezarri"
     mpiohd300: "ENTER = Ezarri"
+    mrobe500: "HEART = Ezarri"
+    rtc: "ON = Ezarri"
+    vibe500: "OK = Ezarri"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3963,39 +3818,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Itzuli"
-    mrobe500: "POWER = Itzuli"
-    iriverh100,iriverh120,iriverh300: "STOP = Itzuli"
-    ipod*,sansac200*,mpiohd300: "MENU = Itzuli"
-    iaudiox5,iaudiom5: "RECORD = Itzuli"
+    gigabeatfx,mrobe500: "POWER = Itzuli"
+    gigabeats,sansafuzeplus: "BACK = Itzuli"
+    gogearsa9200: "LEFT = Itzuli"
+    iaudiom5,iaudiox5: "RECORD = Itzuli"
+    ipod*,mpiohd300,sansac200*: "MENU = Itzuli"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Itzuli"
-    gigabeatfx: "POWER = Itzuli"
-    sansafuzeplus: "BACK = Itzuli"
+    iriverh100,iriverh120,iriverh300: "STOP = Itzuli"
     mrobe100: "DISPLAY = Itzuli"
-    gigabeats: "BACK = Itzuli"
-    gogearsa9200: "LEFT = Itzuli"
-    vibe500: "CANCEL = Itzuli"
+    rtc: "OFF = Itzuli"
     samsungyh*: "REW = Itzuli"
+    vibe500: "CANCEL = Itzuli"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4481,22 +4332,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Ezarri OFF=Ezeztatu"
+    gigabeats: "SELECT=Ezarri POWER=Ezeztatu"
     ipod*: "SELECT=Ezarri MENU=Ezeztatu"
     iriverh10,iriverh10_5gb: "SELECT=Ezarri PREV=Ezeztatu"
-    gigabeats: "SELECT=Ezarri POWER=Ezeztatu"
-    vibe500: "OK=Ezarri C=Ezeztatu"
     mpiohd300: "ENTER=Ezarri MENU=Ezeztatu"
     sansafuzeplus: "SELECT=Ezarri  BACK=Ezeztatu"
+    vibe500: "OK=Ezarri C=Ezeztatu"
   </dest>
   <voice>
     *: none
@@ -4797,7 +4648,7 @@
     *: "Arakatu .cfg Fitxategiak"
   </dest>
   <voice>
-        *: "Arakatu konfigurazio fitxategiak"
+    *: "Arakatu konfigurazio fitxategiak"
   </voice>
 </phrase>
 <phrase>
@@ -5601,15 +5452,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekuentzia"
+    play_frequency,recording: "Frekuentzia"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekuentzia"
+    play_frequency,recording: "Frekuentzia"
   </voice>
 </phrase>
 <phrase>
@@ -5652,18 +5503,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofonoa"
     iriverh100,iriverh120,iriverh300: "Barne Mikrofonoa"
+    recording: "Mikrofonoa"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofonoa"
     iriverh100,iriverh120,iriverh300: "Barne Mikrofonoa"
+    recording: "Mikrofonoa"
   </voice>
 </phrase>
 <phrase>
@@ -6541,13 +6392,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Bateria maila"
@@ -6604,24 +6455,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mikro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mikro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7936,23 +7787,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Diskoa beterik. Sakatu OFF jarraitzeko."
-    iriverh100,iriverh120,iriverh300: "Diskoa beterik. Sakatu STOP jarraitzeko."
     iaudiom5,iaudiox5: "Diskoa beterik. Sakatu POWER jarraitzeko."
-    sansae200*,sansac200*,vibe500: "Diskoa beterik. Sakatu AUR jarraitzeko."
+    iriverh100,iriverh120,iriverh300: "Diskoa beterik. Sakatu STOP jarraitzeko."
+    recording: "Diskoa beterik. Sakatu OFF jarraitzeko."
     samsungyh*: "Diskoa beterik. Sakatu LEFT jarraitzeko."
+    sansac200*,sansae200*,vibe500: "Diskoa beterik. Sakatu AUR jarraitzeko."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8040,23 +7891,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF uzteko"
-    iriverh100,iriverh120,iriverh300: "STOP uzteko"
-    ipod*: "PLAY/PAUSE uzteko"
-    iaudiox5,iaudiom5: "PLAY luzea uzteko"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV uzteko"
-    gigabeats: "BACK uzteko"
     gigabeatfx: "POWER uzteko"
-    sansafuzeplus: "BACK uzteko"
+    gigabeats,sansafuzeplus: "BACK uzteko"
+    iaudiom5,iaudiox5: "PLAY luzea uzteko"
+    ipod*: "PLAY/PAUSE uzteko"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV uzteko"
+    iriverh100,iriverh120,iriverh300: "STOP uzteko"
   </dest>
   <voice>
     *: ""
@@ -9608,7 +9457,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9650,16 +9499,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editatu modua: %s %s"
+    *: "Editatu modua: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9667,16 +9513,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Mozketa"
+    *: "Mozketa"
   </dest>
   <voice>
-    *: none
-    swcodec: " Mozketa Frekuentzia"
+    *: " Mozketa Frekuentzia"
   </voice>
 </phrase>
 <phrase>
@@ -9684,16 +9527,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Irabazia"
+    *: "Irabazia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Irabazia"
+    *: "Irabazia"
   </voice>
 </phrase>
 <phrase>
@@ -9701,16 +9541,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modua:"
+    *: "Modua:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10373,15 +10210,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Baxuen Mozketa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Baxuen Mozketa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Baxuen Mozketa"
   </voice>
 </phrase>
 <phrase>
@@ -10390,15 +10227,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Altuen Mozketa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Altuen Mozketa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Altuen Mozketa"
   </voice>
 </phrase>
 <phrase>
@@ -10434,16 +10271,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclicka"
+    *: "Keyclicka"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclicka"
+    *: "Keyclicka"
   </voice>
 </phrase>
 <phrase>
@@ -10451,16 +10285,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Klicken Errepikapena"
+    *: "Klicken Errepikapena"
   </dest>
   <voice>
-    *: none
-    swcodec: "Klicken Errepikapena"
+    *: "Klicken Errepikapena"
   </voice>
 </phrase>
 <phrase>
@@ -11193,16 +11024,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Denbora-luzatzea"
+    *: "Denbora-luzatzea"
   </dest>
   <voice>
-    *: none
-    swcodec: "Denbora-luzatzea"
+    *: "Denbora-luzatzea"
   </voice>
 </phrase>
 <phrase>
@@ -11210,16 +11038,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Abiadura"
+    *: "Abiadura"
   </dest>
   <voice>
-    *: none
-    swcodec: "Abiadura"
+    *: "Abiadura"
   </voice>
 </phrase>
 <phrase>
@@ -11473,16 +11298,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korritze Barraren Zabalera"
+    *: "Korritze Barraren Zabalera"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korritze Barraren Zabalera"
+    *: "Korritze Barraren Zabalera"
   </voice>
 </phrase>
 <phrase>
@@ -11490,16 +11312,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korritze Barraren Posizioa"
+    *: "Korritze Barraren Posizioa"
   </dest>
   <voice>
-    *: none
-        lcd_bitmap: "Korritze Barraren Posizioa"
+    *: "Korritze Barraren Posizioa"
   </voice>
 </phrase>
 <phrase>
@@ -11507,16 +11326,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Konpresorea"
+    *: "Konpresorea"
   </dest>
   <voice>
-    *: none
-    swcodec: "Konpresorea"
+    *: "Konpresorea"
   </voice>
 </phrase>
 <phrase>
@@ -11575,16 +11391,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Atalasea"
+    *: "Atalasea"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atalasea"
+    *: "Atalasea"
   </voice>
 </phrase>
 <phrase>
@@ -11592,16 +11405,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratioa"
+    *: "Ratioa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratioa"
+    *: "Ratioa"
   </voice>
 </phrase>
 <phrase>
@@ -11609,16 +11419,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 1"
+    *: "2 1"
   </voice>
 </phrase>
 <phrase>
@@ -11626,16 +11433,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 1"
+    *: "4 1"
   </voice>
 </phrase>
 <phrase>
@@ -11643,16 +11447,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 1"
+    *: "6 1"
   </voice>
 </phrase>
 <phrase>
@@ -11660,16 +11461,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 1"
+    *: "10 1"
   </voice>
 </phrase>
 <phrase>
@@ -11677,16 +11475,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Muga"
+    *: "Muga"
   </dest>
   <voice>
-    *: none
-    swcodec: "Muga"
+    *: "Muga"
   </voice>
 </phrase>
 <phrase>
@@ -11694,16 +11489,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Konpentsazio Irabazia"
+    *: "Konpentsazio Irabazia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Konpentsazio Irabazia"
+    *: "Konpentsazio Irabazia"
   </voice>
 </phrase>
 <phrase>
@@ -11711,16 +11503,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11728,16 +11517,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ertza"
+    *: "Ertza"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ertza"
+    *: "Ertza"
   </voice>
 </phrase>
 <phrase>
@@ -11745,16 +11531,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ertz Gogorra"
+    *: "Ertz Gogorra"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ertz Gogorra"
+    *: "Ertz Gogorra"
   </voice>
 </phrase>
 <phrase>
@@ -11762,16 +11545,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ertz Leuna"
+    *: "Ertz Leuna"
   </dest>
   <voice>
-    *: none
-        swcodec: "Ertz Leuna"
+    *: "Ertz Leuna"
   </voice>
 </phrase>
 <phrase>
@@ -11779,16 +11559,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Bertsio Data"
+    *: "Bertsio Data"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bertsio Data"
+    *: "Bertsio Data"
   </voice>
 </phrase>
 <phrase>
@@ -11976,16 +11753,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Azala"
+    *: "Azala"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Azala"
+    *: "Azala"
   </voice>
 </phrase>
 <phrase>
@@ -11993,16 +11767,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Urruneko Azala"
+    *: "Urruneko Azala"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Urruneko Azala"
+    *: "Urruneko Azala"
   </voice>
 </phrase>
 <phrase>
@@ -12129,16 +11900,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Atzeratu Berrekin Aurretik"
+    *: "Atzeratu Berrekin Aurretik"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atzeratu berrekin aurretik"
+    *: "Atzeratu berrekin aurretik"
   </voice>
 </phrase>
 <phrase>
@@ -12334,15 +12102,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D nabarmentzea"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D nabarmentzea"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D nabarmentzea"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D nabarmentzea"
   </voice>
 </phrase>
 <phrase>
@@ -12867,16 +12635,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </voice>
 </phrase>
 <phrase>
@@ -12912,16 +12677,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Pertsonalizatua"
+    *: "Pertsonalizatua"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pertsonalizatua"
+    *: "Pertsonalizatua"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ad65efd7e7..47717cb95a 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -250,23 +250,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Да"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU или горе ляво = Да"
+    creativezen*: "Select = Да"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Да"
     iriverh100,iriverh120,iriverh300: "NAVI = Да"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Да"
     mrobe500: "PLAY, POWER или горе дясно = Да"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Да"
-    creativezen*: "Select = Да"
   </dest>
   <voice>
     *: ""
@@ -821,16 +821,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Кросфийд"
+    *: "Кросфийд"
   </dest>
   <voice>
-    *: none
-    swcodec: "Кросфийд"
+    *: "Кросфийд"
   </voice>
 </phrase>
 <phrase>
@@ -838,16 +835,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Директно усилване"
+    *: "Директно усилване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Директно усилване"
+    *: "Директно усилване"
   </voice>
 </phrase>
 <phrase>
@@ -855,16 +849,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Кръстосано усилване"
+    *: "Кръстосано усилване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Кръстосано усилване"
+    *: "Кръстосано усилване"
   </voice>
 </phrase>
 <phrase>
@@ -872,16 +863,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Намаляване на високите честоти"
+    *: "Намаляване на високите честоти"
   </dest>
   <voice>
-    *: none
-    swcodec: "Намаляване на високите честоти"
+    *: "Намаляване на високите честоти"
   </voice>
 </phrase>
 <phrase>
@@ -889,16 +877,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Горна честота на подрязване"
+    *: "Горна честота на подрязване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Горна честота на подрязване"
+    *: "Горна честота на подрязване"
   </voice>
 </phrase>
 <phrase>
@@ -906,16 +891,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Еквалайзер"
+    *: "Еквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Еквалайзер"
+    *: "Еквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -923,16 +905,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Включване на EQ"
+    *: "Включване на EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Включване на еквалайзера"
+    *: "Включване на еквалайзера"
   </voice>
 </phrase>
 <phrase>
@@ -940,16 +919,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Графичен еквалайзер"
+    *: "Графичен еквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Графичен еквалайзер"
+    *: "Графичен еквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -957,16 +933,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Преподрязване"
+    *: "Преподрязване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Преподрязване"
+    *: "Преподрязване"
   </voice>
 </phrase>
 <phrase>
@@ -974,16 +947,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Прости настройки на EQ"
+    *: "Прости настройки на EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Прости настройки на еквалайзера"
+    *: "Прости настройки на еквалайзера"
   </voice>
 </phrase>
 <phrase>
@@ -991,16 +961,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Разширени настройки на EQ"
+    *: "Разширени настройки на EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Разширени настройки на еквалайзера"
+    *: "Разширени настройки на еквалайзера"
   </voice>
 </phrase>
 <phrase>
@@ -1008,16 +975,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Запазване на настройките на EQ"
+    *: "Запазване на настройките на EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Запазване на настройките на еквалайзера"
+    *: "Запазване на настройките на еквалайзера"
   </voice>
 </phrase>
 <phrase>
@@ -1025,16 +989,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Разглеждане на EQ конфигурации"
+    *: "Разглеждане на EQ конфигурации"
   </dest>
   <voice>
-    *: none
-    swcodec: "Разглеждане на EQ конфигурации"
+    *: "Разглеждане на EQ конфигурации"
   </voice>
 </phrase>
 <phrase>
@@ -1042,16 +1003,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим на редактиране: %s"
+    *: "Режим на редактиране: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1059,16 +1017,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Усилване на лента %d Hz"
+    *: "Усилване на лента %d Hz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Усилване на лента"
+    *: "Усилване на лента"
   </voice>
 </phrase>
 <phrase>
@@ -1076,16 +1031,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Филтър за ниски честоти"
+    *: "Филтър за ниски честоти"
   </dest>
   <voice>
-    *: none
-    swcodec: "Филтър за ниски честоти"
+    *: "Филтър за ниски честоти"
   </voice>
 </phrase>
 <phrase>
@@ -1093,16 +1045,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Пиков филтър %d"
+    *: "Пиков филтър %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Пиков филтър"
+    *: "Пиков филтър"
   </voice>
 </phrase>
 <phrase>
@@ -1110,16 +1059,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Филтър за високи честоти"
+    *: "Филтър за високи честоти"
   </dest>
   <voice>
-    *: none
-    swcodec: "Филтър за високи честоти"
+    *: "Филтър за високи честоти"
   </voice>
 </phrase>
 <phrase>
@@ -1127,16 +1073,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Честота на отрязване"
+    *: "Честота на отрязване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Честота на отрязване"
+    *: "Честота на отрязване"
   </voice>
 </phrase>
 <phrase>
@@ -1144,16 +1087,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Централна честота"
+    *: "Централна честота"
   </dest>
   <voice>
-    *: none
-    swcodec: "Централна честота"
+    *: "Централна честота"
   </voice>
 </phrase>
 <phrase>
@@ -1161,16 +1101,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1178,16 +1115,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Колебание"
+    *: "Колебание"
   </dest>
   <voice>
-    *: none
-    swcodec: "Колебание"
+    *: "Колебание"
   </voice>
 </phrase>
 <phrase>
@@ -1731,16 +1665,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Предотвратяване на смущения"
+    *: "Предотвратяване на смущения"
   </dest>
   <voice>
-    *: none
-    swcodec: "Предотвратяване на смущения"
+    *: "Предотвратяване на смущения"
   </voice>
 </phrase>
 <phrase>
@@ -1818,16 +1749,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Пиукане при смяна на песен"
+    *: "Пиукане при смяна на песен"
   </dest>
   <voice>
-    *: none
-    swcodec: "Пиукане при смяна на песен"
+    *: "Пиукане при смяна на песен"
   </voice>
 </phrase>
 <phrase>
@@ -1835,16 +1763,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Слабо"
+    *: "Слабо"
   </dest>
   <voice>
-    *: none
-    swcodec: "Слабо"
+    *: "Слабо"
   </voice>
 </phrase>
 <phrase>
@@ -1852,16 +1777,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Средно"
+    *: "Средно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Средно"
+    *: "Средно"
   </voice>
 </phrase>
 <phrase>
@@ -1869,16 +1791,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Силно"
+    *: "Силно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Силно"
+    *: "Силно"
   </voice>
 </phrase>
 <phrase>
@@ -2235,21 +2154,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Изграждане на базата данни...  намерени %d (OFF за връщане)"
-    iriverh100,iriverh120,iriverh300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
-    ipod*: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
-    gogearsa9200: "Изграждане на базата данни...  намерени %d (REW за връщане)"
     archosplayer: "Изгр. на БД %d файла"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
+    gogearsa9200: "Изграждане на базата данни...  намерени %d (REW за връщане)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
+    iriverh100,iriverh120,iriverh300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
   </dest>
   <voice>
     *: "Изграждане на базата данни...  намерени записи..."
@@ -2431,16 +2348,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шрифт"
+    *: "Шрифт"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шрифт"
+    *: "Шрифт"
   </voice>
 </phrase>
 <phrase>
@@ -2702,16 +2616,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Отгоре надолу"
+    *: "Отгоре надолу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Отгоре надолу"
+    *: "Отгоре надолу"
   </voice>
 </phrase>
 <phrase>
@@ -2719,16 +2630,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Вид показалец на реда"
+    *: "Вид показалец на реда"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Вид показалец на реда"
+    *: "Вид показалец на реда"
   </voice>
 </phrase>
 <phrase>
@@ -2736,16 +2644,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Стрелка"
+    *: "Стрелка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Стрелка"
+    *: "Стрелка"
   </voice>
 </phrase>
 <phrase>
@@ -2753,16 +2658,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Лента (инвертирана)"
+    *: "Лента (инвертирана)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Лента (инвертирана)"
+    *: "Лента (инвертирана)"
   </voice>
 </phrase>
 <phrase>
@@ -3052,16 +2954,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Скролиране на екрана извън изгледа"
+    *: "Скролиране на екрана извън изгледа"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Скролиране на екрана извън изгледа"
+    *: "Скролиране на екрана извън изгледа"
   </voice>
 </phrase>
 <phrase>
@@ -3069,16 +2968,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Стъпка при скролиране на екрана"
+    *: "Стъпка при скролиране на екрана"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Стъпка при скролиране на екрана"
+    *: "Стъпка при скролиране на екрана"
   </voice>
 </phrase>
 <phrase>
@@ -3134,16 +3030,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Лента на състоянието-/за позициониране"
+    *: "Лента на състоянието-/за позициониране"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ленти на състоянието и за позициониране"
+    *: "Ленти на състоянието и за позициониране"
   </voice>
 </phrase>
 <phrase>
@@ -3151,16 +3044,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Лента за позициониране"
+    *: "Лента за позициониране"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Лента за позициониране"
+    *: "Лента за позициониране"
   </voice>
 </phrase>
 <phrase>
@@ -3168,16 +3058,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Лента на състоянието"
+    *: "Лента на състоянието"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Лента на състоянието"
+    *: "Лента на състоянието"
   </voice>
 </phrase>
 <phrase>
@@ -3202,16 +3089,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показване на сила на звука"
+    *: "Показване на сила на звука"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показване на сила на звука"
+    *: "Показване на сила на звука"
   </voice>
 </phrase>
 <phrase>
@@ -3219,16 +3103,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показване на батерията"
+    *: "Показване на батерията"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показване на батерията"
+    *: "Показване на батерията"
   </voice>
 </phrase>
 <phrase>
@@ -3236,16 +3117,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Изображение"
+    *: "Изображение"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Изображение"
+    *: "Изображение"
   </voice>
 </phrase>
 <phrase>
@@ -3253,16 +3131,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Цифров"
+    *: "Цифров"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Цифров"
+    *: "Цифров"
   </voice>
 </phrase>
 <phrase>
@@ -3482,16 +3357,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Иврит (ISO-8859-8)"
+    *: "Иврит (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Иврит (ISO-8859-8)"
+    *: "Иврит (ISO-8859-8)"
   </voice>
 </phrase>
 <phrase>
@@ -3513,16 +3385,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Тайландски (ISO-8859-11)"
+    *: "Тайландски (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Тайландски (ISO-8859-11)"
+    *: "Тайландски (ISO-8859-11)"
   </voice>
 </phrase>
 <phrase>
@@ -3530,16 +3399,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Арабски (CP1256)"
+    *: "Арабски (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Арабски (CP1256)"
+    *: "Арабски (CP1256)"
   </voice>
 </phrase>
 <phrase>
@@ -3575,16 +3441,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Японски (SJIS)"
+    *: "Японски (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Японски (SJIS)"
+    *: "Японски (SJIS)"
   </voice>
 </phrase>
 <phrase>
@@ -3592,16 +3455,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Опростен китайски (GB2312)"
+    *: "Опростен китайски (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Опростен китайски (GB2312)"
+    *: "Опростен китайски (GB2312)"
   </voice>
 </phrase>
 <phrase>
@@ -3609,16 +3469,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Корейски (KSX1001)"
+    *: "Корейски (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Корейски (KSX1001)"
+    *: "Корейски (KSX1001)"
   </voice>
 </phrase>
 <phrase>
@@ -3626,16 +3483,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Традиционен китайски (BIG5)"
+    *: "Традиционен китайски (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Традиционен китайски (BIG5)"
+    *: "Традиционен китайски (BIG5)"
   </voice>
 </phrase>
 <phrase>
@@ -3659,17 +3513,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Изключване на осветяването на бутоните"
-    sansafuze*,sansae200*: "Изключване на осветяването на колелото"
+    sansae200*,sansafuze*: "Изключване на осветяването на колелото"
   </dest>
   <voice>
     *: none
     button_light: "Изключване на осветяването на бутоните"
-    sansafuze*,sansae200*: "Изключване на осветяването на колелото"
+    sansae200*,sansafuze*: "Изключване на осветяването на колелото"
   </voice>
 </phrase>
 <phrase>
@@ -3940,27 +3794,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Запази"
-    mrobe500: "HEART = Запази"
-    iriverh100,iriverh120,iriverh300: "NAVI = Запази"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Запази"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Запази"
     gogearsa9200,samsungyh*: "PLAY = Запази"
-    vibe500: "OK = Запази"
+    iriverh100,iriverh120,iriverh300: "NAVI = Запази"
     mpiohd300: "ENTER = Запази"
+    mrobe500: "HEART = Запази"
+    rtc: "ON = Запази"
+    vibe500: "OK = Запази"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3969,39 +3823,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = отказ"
-    mrobe500: "POWER = отказ"
-    iriverh100,iriverh120,iriverh300: "STOP = отказ"
-    ipod*,sansac200*,mpiohd300: "MENU = отказ"
-    iaudiox5,iaudiom5: "RECORD = отказ"
+    gigabeatfx,mrobe500: "POWER = отказ"
+    gigabeats,sansafuzeplus: "BACK = отказ"
+    gogearsa9200: "LEFT = отказ"
+    iaudiom5,iaudiox5: "RECORD = отказ"
+    ipod*,mpiohd300,sansac200*: "MENU = отказ"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = отказ"
-    gigabeatfx: "POWER = отказ"
-    sansafuzeplus: "BACK = отказ"
+    iriverh100,iriverh120,iriverh300: "STOP = отказ"
     mrobe100: "DISPLAY = отказ"
-    gigabeats: "BACK = отказ"
-    gogearsa9200: "LEFT = отказ"
-    vibe500: "CANCEL = отказ"
+    rtc: "OFF = отказ"
     samsungyh*: "REW = отказ"
+    vibe500: "CANCEL = отказ"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4487,22 +4337,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Установяване OFF=Отказ"
+    gigabeats: "SELECT=Установяване POWER=Отказ"
     ipod*: "SELECT=Установяване MENU=Отказ"
     iriverh10,iriverh10_5gb: "SELECT=Установяване PREV=Отказ"
-    gigabeats: "SELECT=Установяване POWER=Отказ"
-    vibe500: "OK=Установяване C=Отказ"
     mpiohd300: "ENTER=Установяване MENU=Отказ"
     sansafuzeplus: "SELECT=Установяване  BACK=Отказ"
+    vibe500: "OK=Установяване C=Отказ"
   </dest>
   <voice>
     *: none
@@ -5607,15 +5457,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Честота"
+    play_frequency,recording: "Честота"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Честота"
+    play_frequency,recording: "Честота"
   </voice>
 </phrase>
 <phrase>
@@ -5658,18 +5508,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Микрофон"
     iriverh100,iriverh120,iriverh300: "Вграден микрофон"
+    recording: "Микрофон"
   </dest>
   <voice>
     *: none
-    recording: "Микрофон"
     iriverh100,iriverh120,iriverh300: "Вграден микрофон"
+    recording: "Микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -6547,13 +6397,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Батерия: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Бат: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Зареденост на батерията"
@@ -6610,24 +6460,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7942,23 +7792,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Дискът е пълен. Натиснете OFF за да продължите."
-    iriverh100,iriverh120,iriverh300: "Дискът е пълен. Натиснете stop за да продължите."
     iaudiom5,iaudiox5: "Дискът е пълен. Натиснете Power за да продължите."
-    sansae200*,sansac200*,vibe500: "Дискът е пълен. Натиснете PREV за да продължите."
+    iriverh100,iriverh120,iriverh300: "Дискът е пълен. Натиснете stop за да продължите."
+    recording: "Дискът е пълен. Натиснете OFF за да продължите."
     samsungyh*: "Дискът е пълен. Натиснете LEFT за да продължите."
+    sansac200*,sansae200*,vibe500: "Дискът е пълен. Натиснете PREV за да продължите."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8046,23 +7896,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF за отказ"
-    iriverh100,iriverh120,iriverh300: "STOP за отказ"
-    ipod*: "PLAY/PAUSE за отказ"
-    iaudiox5,iaudiom5: "Long PLAY за отказ"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV за отказ"
-    gigabeats: "BACK за отказ"
     gigabeatfx: "POWER за отказ"
-    sansafuzeplus: "BACK за отказ"
+    gigabeats,sansafuzeplus: "BACK за отказ"
+    iaudiom5,iaudiox5: "Long PLAY за отказ"
+    ipod*: "PLAY/PAUSE за отказ"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV за отказ"
+    iriverh100,iriverh120,iriverh300: "STOP за отказ"
   </dest>
   <voice>
     *: ""
@@ -9614,7 +9462,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9656,16 +9504,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим на редактиране: %s %s"
+    *: "Режим на редактиране: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9673,16 +9518,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Отрязване"
+    *: "Отрязване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Честота на отрязване"
+    *: "Честота на отрязване"
   </voice>
 </phrase>
 <phrase>
@@ -9690,16 +9532,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Усилване"
+    *: "Усилване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Усилване"
+    *: "Усилване"
   </voice>
 </phrase>
 <phrase>
@@ -9707,16 +9546,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Режим:"
+    *: "Режим:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10379,15 +10215,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отрязване на баса"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отрязване на баса"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на баса"
   </voice>
 </phrase>
 <phrase>
@@ -10396,15 +10232,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отрязване на високите"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отрязване на високите"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отрязване на високите"
   </voice>
 </phrase>
 <phrase>
@@ -10440,16 +10276,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Цъкане на бутоните"
+    *: "Цъкане на бутоните"
   </dest>
   <voice>
-    *: none
-    swcodec: "Цъкане на бутоните"
+    *: "Цъкане на бутоните"
   </voice>
 </phrase>
 <phrase>
@@ -10457,16 +10290,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Повтаряне на цъканията на бутоните"
+    *: "Повтаряне на цъканията на бутоните"
   </dest>
   <voice>
-    *: none
-    swcodec: "Повтаряне на цъканията на бутоните"
+    *: "Повтаряне на цъканията на бутоните"
   </voice>
 </phrase>
 <phrase>
@@ -11199,16 +11029,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Сгъстяване на времето"
+    *: "Сгъстяване на времето"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сгъстяване на времето"
+    *: "Сгъстяване на времето"
   </voice>
 </phrase>
 <phrase>
@@ -11216,16 +11043,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Скорост"
+    *: "Скорост"
   </dest>
   <voice>
-    *: none
-    swcodec: "Скорост"
+    *: "Скорост"
   </voice>
 </phrase>
 <phrase>
@@ -11479,16 +11303,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ширина на лентата за позициониране"
+    *: "Ширина на лентата за позициониране"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ширина на лентата за позициониране"
+    *: "Ширина на лентата за позициониране"
   </voice>
 </phrase>
 <phrase>
@@ -11496,16 +11317,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Позиция на лентата за позициониране"
+    *: "Позиция на лентата за позициониране"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Позиция на лентата за позициониране"
+    *: "Позиция на лентата за позициониране"
   </voice>
 </phrase>
 <phrase>
@@ -11513,16 +11331,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </dest>
   <voice>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </voice>
 </phrase>
 <phrase>
@@ -11581,16 +11396,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Праг"
+    *: "Праг"
   </dest>
   <voice>
-    *: none
-    swcodec: "Праг"
+    *: "Праг"
   </voice>
 </phrase>
 <phrase>
@@ -11598,16 +11410,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Коефициент"
+    *: "Коефициент"
   </dest>
   <voice>
-    *: none
-    swcodec: "Коефициент"
+    *: "Коефициент"
   </voice>
 </phrase>
 <phrase>
@@ -11615,16 +11424,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 към 1"
+    *: "2 към 1"
   </voice>
 </phrase>
 <phrase>
@@ -11632,16 +11438,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 към 1"
+    *: "4 към 1"
   </voice>
 </phrase>
 <phrase>
@@ -11649,16 +11452,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 към 1"
+    *: "6 към 1"
   </voice>
 </phrase>
 <phrase>
@@ -11666,16 +11466,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 към 1"
+    *: "10 към 1"
   </voice>
 </phrase>
 <phrase>
@@ -11683,16 +11480,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Ограничение"
+    *: "Ограничение"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ограничение"
+    *: "Ограничение"
   </voice>
 </phrase>
 <phrase>
@@ -11700,16 +11494,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Усилване"
+    *: "Усилване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Усилване"
+    *: "Усилване"
   </voice>
 </phrase>
 <phrase>
@@ -11717,16 +11508,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Автоматично"
+    *: "Автоматично"
   </dest>
   <voice>
-    *: none
-    swcodec: "Автоматично"
+    *: "Автоматично"
   </voice>
 </phrase>
 <phrase>
@@ -11734,16 +11522,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Рязкост"
+    *: "Рязкост"
   </dest>
   <voice>
-    *: none
-    swcodec: "Рязкост"
+    *: "Рязкост"
   </voice>
 </phrase>
 <phrase>
@@ -11751,16 +11536,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Рязко"
+    *: "Рязко"
   </dest>
   <voice>
-    *: none
-    swcodec: "Рязко"
+    *: "Рязко"
   </voice>
 </phrase>
 <phrase>
@@ -11768,16 +11550,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Плавно"
+    *: "Плавно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Плавно"
+    *: "Плавно"
   </voice>
 </phrase>
 <phrase>
@@ -11785,16 +11564,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Време на освобождаване"
+    *: "Време на освобождаване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Време на освобождаване"
+    *: "Време на освобождаване"
   </voice>
 </phrase>
 <phrase>
@@ -11982,16 +11758,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основна кожа"
+    *: "Основна кожа"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основна кожа"
+    *: "Основна кожа"
   </voice>
 </phrase>
 <phrase>
@@ -11999,16 +11772,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основна кожа на дистанционното"
+    *: "Основна кожа на дистанционното"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основна кожа на дистанционното"
+    *: "Основна кожа на дистанционното"
   </voice>
 </phrase>
 <phrase>
@@ -12135,16 +11905,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Превъртане преди възобновяване"
+    *: "Превъртане преди възобновяване"
   </dest>
   <voice>
-    *: none
-    swcodec: "Превъртане преди възобновяване"
+    *: "Превъртане преди възобновяване"
   </voice>
 </phrase>
 <phrase>
@@ -12932,16 +12699,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Прост (главен)"
+    *: "Прост (главен)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Прост (главен)"
+    *: "Прост (главен)"
   </voice>
 </phrase>
 <phrase>
@@ -12949,16 +12713,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Потребителски"
+    *: "Потребителски"
   </dest>
   <voice>
-    *: none
-    swcodec: "Потребителски"
+    *: "Потребителски"
   </voice>
 </phrase>
 <phrase>
@@ -12994,16 +12755,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Време за нападение"
+    *: "Време за нападение"
   </dest>
   <voice>
-    *: none
-    swcodec: "Време за нападение"
+    *: "Време за нападение"
   </voice>
 </phrase>
 <phrase>
@@ -13011,16 +12769,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13139,18 +12894,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13158,16 +12910,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "САМО СТРАНИЧНО"
+    *: "САМО СТРАНИЧНО"
   </dest>
   <voice>
-    *: none
-    swcodec: "САМО СТРАНИЧНО"
+    *: "САМО СТРАНИЧНО"
   </voice>
 </phrase>
 <phrase>
@@ -13175,16 +12924,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Сух / Мокър Mix"
+    *: "Сух / Мокър Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сух / Мокър Mix"
+    *: "Сух / Мокър Mix"
   </voice>
 </phrase>
 <phrase>
@@ -13192,16 +12938,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13210,18 +12953,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Само зареждане"
-    ibassodx90: "Само зареждане"
+    ibassodx50,ibassodx90: "Само зареждане"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Само зареждане"
-    ibassodx90: "Само зареждане"
+    ibassodx50,ibassodx90: "Само зареждане"
   </voice>
 </phrase>
 <phrase>
@@ -13229,16 +12969,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13246,16 +12983,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Осезаемо подобрение на баса"
+    *: "Осезаемо подобрение на баса"
   </dest>
   <voice>
-    *: none
-    swcodec: "Осезаемо подобрение на баса"
+    *: "Осезаемо подобрение на баса"
   </voice>
 </phrase>
 <phrase>
@@ -13264,18 +12998,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB Режим"
-    ibassodx90: "USB Режим"
+    ibassodx50,ibassodx90: "USB Режим"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Ю Ес Би Режим"
-    ibassodx90: "Ю Ес Би Режим"
+    ibassodx50,ibassodx90: "Ю Ес Би Режим"
   </voice>
 </phrase>
 <phrase>
@@ -13284,18 +13015,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Управление на мащабирането на честотите"
-    ibassodx90: "Управление на мащабирането на честотите"
+    ibassodx50,ibassodx90: "Управление на мащабирането на честотите"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Управление на мащабирането на честотите"
-    ibassodx90: "Управление на мащабирането на честотите"
+    ibassodx50,ibassodx90: "Управление на мащабирането на честотите"
   </voice>
 </phrase>
 <phrase>
@@ -13304,18 +13032,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Масова памет"
-    ibassodx90: "Масова памет"
+    ibassodx50,ibassodx90: "Масова памет"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Масова памет"
-    ibassodx90: "Масова памет"
+    ibassodx50,ibassodx90: "Масова памет"
   </voice>
 </phrase>
 <phrase>
@@ -13323,16 +13048,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Намаляване на слуховата умора"
+    *: "Намаляване на слуховата умора"
   </dest>
   <voice>
-    *: none
-    swcodec: "Намаляване на слуховата умора"
+    *: "Намаляване на слуховата умора"
   </voice>
 </phrase>
 <phrase>
@@ -13340,15 +13062,12 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index b76f4f5acc..7448d60178 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -248,20 +248,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Sí"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, o  a dalt a la dreta = Sí"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Sí"
     iriverh100,iriverh120,iriverh300: "NAVI = Sí"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Sí"
     mrobe500: "PLAY, POWER, o a dalt a la dreta = Sí"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Sí"
   </dest>
   <voice>
@@ -817,16 +817,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -834,33 +831,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guany directe"
+    *: "Guany directe"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guany directe"
+    *: "Guany directe"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
-  <dest>  
-    *: none
-    swcodec: "Guany creuat"
+  <dest>
+    *: "Guany creuat"
   </dest>
-  <voice>  
-    *: none
-    swcodec: "Guany creuat"
+  <voice>
+    *: "Guany creuat"
   </voice>
 </phrase>
 <phrase>
@@ -868,16 +859,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuació d'alta freqüència"
+    *: "Atenuació d'alta freqüència"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuació d'alta freqüència"
+    *: "Atenuació d'alta freqüència"
   </voice>
 </phrase>
 <phrase>
@@ -885,16 +873,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Tall d'alta freqüència"
+    *: "Tall d'alta freqüència"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tall d'alta freqüència"
+    *: "Tall d'alta freqüència"
   </voice>
 </phrase>
 <phrase>
@@ -902,16 +887,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalitzador"
+    *: "Equalitzador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalitzador"
+    *: "Equalitzador"
   </voice>
 </phrase>
 <phrase>
@@ -919,16 +901,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Activa EQ"
+    *: "Activa EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Activa equalitzador"
+    *: "Activa equalitzador"
   </voice>
 </phrase>
 <phrase>
@@ -936,16 +915,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Gràfic"
+    *: "EQ Gràfic"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalitzador Gràfic"
+    *: "Equalitzador Gràfic"
   </voice>
 </phrase>
 <phrase>
@@ -953,16 +929,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pretall"
+    *: "Pretall"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pretall"
+    *: "Pretall"
   </voice>
 </phrase>
 <phrase>
@@ -970,16 +943,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ senzill"
+    *: "EQ senzill"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalitzador senzill"
+    *: "Equalitzador senzill"
   </voice>
 </phrase>
 <phrase>
@@ -987,16 +957,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Opcions d'EQ avançades"
+    *: "Opcions d'EQ avançades"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opcions d'equalitzador avançades"
+    *: "Opcions d'equalitzador avançades"
   </voice>
 </phrase>
 <phrase>
@@ -1004,16 +971,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Desa EQ"
+    *: "Desa EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Desa equalitzador"
+    *: "Desa equalitzador"
   </voice>
 </phrase>
 <phrase>
@@ -1021,16 +985,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Veure EQ desats"
+    *: "Veure EQ desats"
   </dest>
   <voice>
-    *: none
-    swcodec: "Veure equalitzadors desats"
+    *: "Veure equalitzadors desats"
   </voice>
 </phrase>
 <phrase>
@@ -1038,12 +999,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editar mode: %s"
+    *: "Editar mode: %s"
   </dest>
   <voice>
     *: none
@@ -1054,16 +1013,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guany de banda %d Hz"
+    *: "Guany de banda %d Hz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz Guany de banda"
+    *: "Hertz Guany de banda"
   </voice>
 </phrase>
 <phrase>
@@ -1071,16 +1027,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre de nivell baix"
+    *: "Filtre de nivell baix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre de nivell baix"
+    *: "Filtre de nivell baix"
   </voice>
 </phrase>
 <phrase>
@@ -1088,16 +1041,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre passabanda %d"
+    *: "Filtre passabanda %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre passabanda"
+    *: "Filtre passabanda"
   </voice>
 </phrase>
 <phrase>
@@ -1105,16 +1055,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre de nivell alt"
+    *: "Filtre de nivell alt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre de nivell alt"
+    *: "Filtre de nivell alt"
   </voice>
 </phrase>
 <phrase>
@@ -1122,16 +1069,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Freqüència de tall"
+    *: "Freqüència de tall"
   </dest>
   <voice>
-    *: none
-    swcodec: "Freqüència de Tall"
+    *: "Freqüència de Tall"
   </voice>
 </phrase>
 <phrase>
@@ -1139,16 +1083,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Freqüència central"
+    *: "Freqüència central"
   </dest>
   <voice>
-    *: none
-    swcodec: "Freqüència central"
+    *: "Freqüència central"
   </voice>
 </phrase>
 <phrase>
@@ -1156,16 +1097,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1173,16 +1111,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Suavitzat de quantitzat"
+    *: "Suavitzat de quantitzat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suavitzat de quantitzat"
+    *: "Suavitzat de quantitzat"
   </voice>
 </phrase>
 <phrase>
@@ -1724,16 +1659,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Evitar saturació"
+    *: "Evitar saturació"
   </dest>
   <voice>
-    *: none
-    swcodec: "Evitar saturació"
+    *: "Evitar saturació"
   </voice>
 </phrase>
 <phrase>
@@ -1811,16 +1743,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Volum de bip"
+    *: "Volum de bip"
   </dest>
   <voice>
-    *: none
-    swcodec: "Volum de bip"
+    *: "Volum de bip"
   </voice>
 </phrase>
 <phrase>
@@ -1828,16 +1757,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Feble"
+    *: "Feble"
   </dest>
   <voice>
-    *: none
-    swcodec: "Feble"
+    *: "Feble"
   </voice>
 </phrase>
 <phrase>
@@ -1845,16 +1771,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderat"
+    *: "Moderat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderat"
+    *: "Moderat"
   </voice>
 </phrase>
 <phrase>
@@ -1862,16 +1785,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Fort"
+    *: "Fort"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fort"
+    *: "Fort"
   </voice>
 </phrase>
 <phrase>
@@ -2228,21 +2148,20 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Construint la base de dades... %d trobats (OFF per tornar)"
-    iriverh100,iriverh120,iriverh300: "Construint la base de dades.... %d trobats (STOP per tornar)"
-    ipod*: "Construint la base de dades...Construint base de dades... %d trobats (PREV per tornar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Construint la base de dades... %d trobats (LEFT per tornar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construint la base de dades... %d trobats (PREV per tornar)"
-    gogearsa9200: "Construint la base de dades... %d trobats (REW per tornar)"
     archosplayer: "Construint la base de dades... %d trobats"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Construint la base de dades... %d trobats (LEFT per tornar)"
+    gogearsa9200: "Construint la base de dades... %d trobats (REW per tornar)"
+    ipod*: "Construint la base de dades...Construint base de dades... %d trobats (PREV per tornar)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Construint la base de dades... %d trobats (PREV per tornar)"
+    iriverh100,iriverh120,iriverh300: "Construint la base de dades.... %d trobats (STOP per tornar)"
   </dest>
   <voice>
     *: "entrades trobades per la base de dades"
@@ -2424,16 +2343,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipus de lletra"
+    *: "Tipus de lletra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostra els tipus de lletra"
+    *: "Mostra els tipus de lletra"
   </voice>
 </phrase>
 <phrase>
@@ -2695,16 +2611,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cap per avall"
+    *: "Cap per avall"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cap per avall"
+    *: "Cap per avall"
   </voice>
 </phrase>
 <phrase>
@@ -2712,16 +2625,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-  *: none
-    lcd_bitmap: "Tipus de selector de línia"
+    *: "Tipus de selector de línia"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipus de selector de línia"
+    *: "Tipus de selector de línia"
   </voice>
 </phrase>
 <phrase>
@@ -2729,16 +2639,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Punter"
+    *: "Punter"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Punter"
+    *: "Punter"
   </voice>
 </phrase>
 <phrase>
@@ -2746,16 +2653,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-  *: none
-    lcd_bitmap: "Barra (inversa)"
+    *: "Barra (inversa)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra inversa"
+    *: "Barra inversa"
   </voice>
 </phrase>
 <phrase>
@@ -2888,7 +2792,7 @@
   <dest>
     *: none
     remote: "Opcions de LCD remota"
-    </dest>
+  </dest>
   <voice>
     *: none
     remote: "Opcions de LCD remota"
@@ -3045,16 +2949,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Desplaçament fora de la pantalla"
+    *: "Desplaçament fora de la pantalla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Desplaçament fora de la pantalla"
+    *: "Desplaçament fora de la pantalla"
   </voice>
 </phrase>
 <phrase>
@@ -3062,16 +2963,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mida del pas de desplaçament"
+    *: "Mida del pas de desplaçament"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mida del pas de desplaçament"
+    *: "Mida del pas de desplaçament"
   </voice>
 </phrase>
 <phrase>
@@ -3127,16 +3025,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barres d'Estat/Desplaçament"
+    *: "Barres d'Estat/Desplaçament"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barres d'Estat i Desplaçament"
+    *: "Barres d'Estat i Desplaçament"
   </voice>
 </phrase>
 <phrase>
@@ -3144,16 +3039,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de Desplaçament"
+    *: "Barra de Desplaçament"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de Desplaçament"
+    *: "Barra de Desplaçament"
   </voice>
 </phrase>
 <phrase>
@@ -3161,16 +3053,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra d'Estat"
+    *: "Barra d'Estat"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra d'Estat"
+    *: "Barra d'Estat"
   </voice>
 </phrase>
 <phrase>
@@ -3195,16 +3084,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Indicador de volum"
+    *: "Indicador de volum"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Indicador de volum"
+    *: "Indicador de volum"
   </voice>
 </phrase>
 <phrase>
@@ -3212,16 +3098,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-   *: none
-    lcd_bitmap: "Indicador de bateria"
+    *: "Indicador de bateria"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Indicador de bateria"
+    *: "Indicador de bateria"
   </voice>
 </phrase>
 <phrase>
@@ -3229,16 +3112,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gràfic"
+    *: "Gràfic"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gràfic"
+    *: "Gràfic"
   </voice>
 </phrase>
 <phrase>
@@ -3246,16 +3126,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numèric"
+    *: "Numèric"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numèric"
+    *: "Numèric"
   </voice>
 </phrase>
 <phrase>
@@ -3473,16 +3350,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreu (ISO-8859-8)"
+    *: "Hebreu (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreu"
+    *: "Hebreu"
   </voice>
 </phrase>
 <phrase>
@@ -3504,16 +3378,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tailandès (ISO-8859-11)"
+    *: "Tailandès (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tailandès"
+    *: "Tailandès"
   </voice>
 </phrase>
 <phrase>
@@ -3521,16 +3392,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Àrab (CP1256)"
+    *: "Àrab (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Àrab"
+    *: "Àrab"
   </voice>
 </phrase>
 <phrase>
@@ -3566,16 +3434,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonés (SJIS)"
+    *: "Japonés (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonés"
+    *: "Japonés"
   </voice>
 </phrase>
 <phrase>
@@ -3583,16 +3448,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Xinès Simp. (GB2312)"
+    *: "Xinès Simp. (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Xinès Simplificat"
+    *: "Xinès Simplificat"
   </voice>
 </phrase>
 <phrase>
@@ -3600,16 +3462,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreà (KSX1001)"
+    *: "Koreà (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreà"
+    *: "Koreà"
   </voice>
 </phrase>
 <phrase>
@@ -3617,16 +3476,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Xinès Trad. (BIG5)"
+    *: "Xinès Trad. (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Xinès Tradicional"
+    *: "Xinès Tradicional"
   </voice>
 </phrase>
 <phrase>
@@ -3650,17 +3506,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Apagat de llum de botons"
-    sansafuze*,sansae200*: "Apagat de llum de roda"
+    sansae200*,sansafuze*: "Apagat de llum de roda"
   </dest>
   <voice>
     *: none
     button_light: "Apagat de la llum de botons"
-    sansafuze*,sansae200*: "Apagat de llum de la roda"
+    sansae200*,sansafuze*: "Apagat de llum de la roda"
   </voice>
 </phrase>
 <phrase>
@@ -3759,7 +3615,7 @@
     battery_types: "Battery Type"
   </source>
   <dest>
-  *: none
+    *: none
     battery_types: "Tipus de bateria"
   </dest>
   <voice>
@@ -3931,23 +3787,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Desa"
-    mrobe500: "HEART = Desa"
-    iriverh100,iriverh120,iriverh300: "NAVI = Desa"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: " SELECT = Desa"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: " SELECT = Desa"
     gogearsa9200,samsungyh*: "PLAY = Desa"
-    vibe500: "OK = Desa"
+    iriverh100,iriverh120,iriverh300: "NAVI = Desa"
     mpiohd300: "ENTER = Desa"
+    mrobe500: "HEART = Desa"
+    rtc: "ON = Desa"
+    vibe500: "OK = Desa"
   </dest>
   <voice>
     *: none
@@ -3959,35 +3815,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Cancel·la"
-    mrobe500: "POWER = Cancel·la"
-    iriverh100,iriverh120,iriverh300: "STOP = Cancel·la"
-    ipod*,sansac200*,mpiohd300: "MENU = Cancel·la"
-    iaudiox5,iaudiom5: "RECORD = Cancel·la"
+    gigabeatfx,mrobe500: "POWER = Cancel·la"
+    gigabeats,sansafuzeplus: "BACK = Cancel·la"
+    gogearsa9200: "LEFT = Cancel·la"
+    iaudiom5,iaudiox5: "RECORD = Cancel·la"
+    ipod*,mpiohd300,sansac200*: "MENU = Cancel·la"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancel·la"
-    gigabeatfx: "POWER = Cancel·la"
-    sansafuzeplus: "BACK = Cancel·la"
+    iriverh100,iriverh120,iriverh300: "STOP = Cancel·la"
     mrobe100: "DISPLAY = Cancel·la"
-    gigabeats: "BACK = Cancel·la"
-    gogearsa9200: "LEFT = Cancel·la"
-    vibe500: "CANCEL = Cancel·la"
+    rtc: "OFF = Cancel·la"
     samsungyh*: "REW = Cancel·la"
+    vibe500: "CANCEL = Cancel·la"
   </dest>
   <voice>
     *: none
@@ -4475,22 +4327,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Accepta OFF=Cancel·la"
+    gigabeats: "SELECT=Accepta POWER=Cancel·la"
     ipod*: "SELECT=Accepta MENU=Cancel·la"
     iriverh10,iriverh10_5gb: "SELECT=Accepta PREV=Cancel·la"
-    gigabeats: "SELECT=Accepta POWER=Cancel·la"
-    vibe500: "OK=Accepta C=Cancel·la"
     mpiohd300: "ENTER=Accepta MENU=Cancel·la"
     sansafuzeplus: "SELECT=Accepta  BACK=Cancel·la"
+    vibe500: "OK=Accepta C=Cancel·la"
   </dest>
   <voice>
     *: none
@@ -4902,11 +4754,11 @@
   </source>
   <dest>
     *: none
-     recording: "Opcions de Grabació"
+    recording: "Opcions de Grabació"
   </dest>
   <voice>
     *: none
-     recording: "Opcions de Grabació"
+    recording: "Opcions de Grabació"
   </voice>
 </phrase>
 <phrase>
@@ -4935,7 +4787,7 @@
     radio: "No presets"
   </source>
   <dest>
-   *: none
+    *: none
     radio: "Cap presintonia"
   </dest>
   <voice>
@@ -4952,7 +4804,7 @@
     radio: "Add Preset"
   </source>
   <dest>
-  *: none
+    *: none
     radio: "Afegir presintonia"
   </dest>
   <voice>
@@ -5276,7 +5128,7 @@
   <dest>
     *: none
     radio: "Desa Llista de presintonies"
-    </dest>
+  </dest>
   <voice>
     *: none
     radio: "Desa Llista de presintonies"
@@ -5325,7 +5177,7 @@
     radio: "No settings found. Autoscan?"
   </source>
   <dest>
-   *: none
+    *: none
     radio: "No s'han trobat presintoníes, escaneig auto.?"
   </dest>
   <voice>
@@ -5594,15 +5446,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Freqüència"
+    play_frequency,recording: "Freqüència"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Freqüència"
+    play_frequency,recording: "Freqüència"
   </voice>
 </phrase>
 <phrase>
@@ -5631,7 +5483,7 @@
     recording: "Source"
   </source>
   <dest>
-  *: none
+    *: none
     recording: "Font"
   </dest>
   <voice>
@@ -5645,18 +5497,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Micròfon"
     iriverh100,iriverh120,iriverh300: "Micròfon intern"
+    recording: "Micròfon"
   </dest>
   <voice>
     *: none
-    recording: "Micròfon"
     iriverh100,iriverh120,iriverh300: "Micròfon intern"
+    recording: "Micròfon"
   </voice>
 </phrase>
 <phrase>
@@ -5685,7 +5537,7 @@
     recording: "Line In"
   </source>
   <dest>
-    *: none  
+    *: none
     recording: "Línia d'entrada"
   </dest>
   <voice>
@@ -6535,13 +6387,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivell de bateria"
@@ -6598,24 +6450,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "µSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "µSD:"
     xduoox3: "µSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7588,7 +7440,7 @@
   </source>
   <dest>
     *: "Propietats"
-    </dest>
+  </dest>
   <voice>
     *: "Propietats"
   </voice>
@@ -7929,23 +7781,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disc ple. Prem OFF per continuar"
-    iriverh100,iriverh120,iriverh300: "Disc ple. Prem STOP per continuar"
     iaudiom5,iaudiox5: "Disc ple. Prem POWER per continuar"
-    sansae200*,sansac200*,vibe500: "Disc ple. Prem PREV per continuar"
+    iriverh100,iriverh120,iriverh300: "Disc ple. Prem STOP per continuar"
+    recording: "Disc ple. Prem OFF per continuar"
     samsungyh*: "Disc ple. Prem LEFT per continuar"
+    sansac200*,sansae200*,vibe500: "Disc ple. Prem PREV per continuar"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8033,23 +7885,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK per cancel·lar"
     gigabeatfx: "POWER per cancel·lar"
-    sansafuzeplus: "BACK per cancel·lar"
+    gigabeats,sansafuzeplus: "BACK per cancel·lar"
+    iaudiom5,iaudiox5: "Long PLAY per cancel·lar"
+    ipod*: "PLAY/PAUSE per cancel·lar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV per cancel·lar"
+    iriverh100,iriverh120,iriverh300: "STOP per cancel·lar"
   </dest>
   <voice>
     *: ""
@@ -9643,16 +9493,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editar mode: %s"
+    *: "Editar mode: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9660,16 +9507,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Freqüència de tall"
+    *: "Freqüència de tall"
   </dest>
   <voice>
-    *: none
-    swcodec: "Freqüència de tall"
+    *: "Freqüència de tall"
   </voice>
 </phrase>
 <phrase>
@@ -9677,16 +9521,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guany"
+    *: "Guany"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guany"
+    *: "Guany"
   </voice>
 </phrase>
 <phrase>
@@ -9694,16 +9535,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10366,15 +10204,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Freq. de tall de baixos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall de baixos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frequència de tall de baix"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall de baix"
   </voice>
 </phrase>
 <phrase>
@@ -10383,15 +10221,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Freq. de tall d'aguts"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Freq. de tall d'aguts"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frequència de tall d'aguts"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frequència de tall d'aguts"
   </voice>
 </phrase>
 <phrase>
@@ -10427,16 +10265,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Clic de tecles"
+    *: "Clic de tecles"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clic de tecles"
+    *: "Clic de tecles"
   </voice>
 </phrase>
 <phrase>
@@ -10444,16 +10279,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repeticions de clic de tecles"
+    *: "Repeticions de clic de tecles"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repeticions de Clic de tecles"
+    *: "Repeticions de Clic de tecles"
   </voice>
 </phrase>
 <phrase>
@@ -11186,16 +11018,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11203,16 +11032,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocitat"
+    *: "Velocitat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocitat"
+    *: "Velocitat"
   </voice>
 </phrase>
 <phrase>
@@ -11466,16 +11292,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Amplada de la barra de desplaçament"
+    *: "Amplada de la barra de desplaçament"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Amplada de la barra de desplaçament"
+    *: "Amplada de la barra de desplaçament"
   </voice>
 </phrase>
 <phrase>
@@ -11483,16 +11306,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posició de la barra de desplaçament"
+    *: "Posició de la barra de desplaçament"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posició de la barra de desplaçament"
+    *: "Posició de la barra de desplaçament"
   </voice>
 </phrase>
 <phrase>
@@ -11500,16 +11320,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11568,16 +11385,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Llindar"
+    *: "Llindar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Llindar"
+    *: "Llindar"
   </voice>
 </phrase>
 <phrase>
@@ -11585,16 +11399,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ràtio"
+    *: "Ràtio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ràtio"
+    *: "Ràtio"
   </voice>
 </phrase>
 <phrase>
@@ -11602,16 +11413,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 a 1"
+    *: "2 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11619,16 +11427,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 a 1"
+    *: "4 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11636,16 +11441,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 a 1"
+    *: "6 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11653,16 +11455,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 a 1"
+    *: "10 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11670,16 +11469,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Límit"
+    *: "Límit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Límit"
+    *: "Límit"
   </voice>
 </phrase>
 <phrase>
@@ -11687,16 +11483,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guany de maquillatge"
+    *: "Guany de maquillatge"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guany de maquillatge"
+    *: "Guany de maquillatge"
   </voice>
 </phrase>
 <phrase>
@@ -11704,16 +11497,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11721,16 +11511,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Genoll"
+    *: "Genoll"
   </dest>
   <voice>
-    *: none
-    swcodec: "Genoll"
+    *: "Genoll"
   </voice>
 </phrase>
 <phrase>
@@ -11738,16 +11525,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Genoll dur"
+    *: "Genoll dur"
   </dest>
   <voice>
-    *: none
-    swcodec: "Genoll dur"
+    *: "Genoll dur"
   </voice>
 </phrase>
 <phrase>
@@ -11755,16 +11539,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Genoll tou"
+    *: "Genoll tou"
   </dest>
   <voice>
-    *: none
-    swcodec: "Genoll tou"
+    *: "Genoll tou"
   </voice>
 </phrase>
 <phrase>
@@ -11772,16 +11553,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Temps d'alliberament"
+    *: "Temps d'alliberament"
   </dest>
   <voice>
-    *: none
-    swcodec: "Temps d'alliberament"
+    *: "Temps d'alliberament"
   </voice>
 </phrase>
 <phrase>
@@ -11969,16 +11747,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tema base"
+    *: "Tema base"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tema base"
+    *: "Tema base"
   </voice>
 </phrase>
 <phrase>
@@ -11986,16 +11761,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tema base remot"
+    *: "Tema base remot"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tema base remot"
+    *: "Tema base remot"
   </voice>
 </phrase>
 <phrase>
@@ -12122,16 +11894,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rebobina abans de reprendre"
+    *: "Rebobina abans de reprendre"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rebobina abans de reprendre"
+    *: "Rebobina abans de reprendre"
   </voice>
 </phrase>
 <phrase>
@@ -12413,7 +12182,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12489,16 +12258,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -12734,16 +12500,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Personalitzat"
+    *: "Personalitzat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Personalitzat"
+    *: "Personalitzat"
   </voice>
 </phrase>
 <phrase>
@@ -12998,16 +12761,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Interval d'atac"
+    *: "Interval d'atac"
   </dest>
   <voice>
-    *: none
-    swcodec: "Interval d'atac"
+    *: "Interval d'atac"
   </voice>
 </phrase>
 <phrase>
@@ -13015,16 +12775,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index e3de41e636..7e8c77c36f 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -1,4 +1,3 @@
-#             __________               __   ___.
 #   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 #   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
@@ -613,16 +612,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "交叉馈音"
+    *: "交叉馈音"
   </dest>
   <voice>
-    *: none
-    swcodec: "交叉馈音"
+    *: "交叉馈音"
   </voice>
 </phrase>
 <phrase>
@@ -630,16 +626,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "均衡器"
+    *: "均衡器"
   </dest>
   <voice>
-    *: none
-    swcodec: "均衡器"
+    *: "均衡器"
   </voice>
 </phrase>
 <phrase>
@@ -818,16 +811,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "开启均衡器"
+    *: "开启均衡器"
   </dest>
   <voice>
-    *: none
-    swcodec: "开启均衡器"
+    *: "开启均衡器"
   </voice>
 </phrase>
 <phrase>
@@ -835,16 +825,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "图形化均衡器"
+    *: "图形化均衡器"
   </dest>
   <voice>
-    *: none
-    swcodec: "图形化均衡器"
+    *: "图形化均衡器"
   </voice>
 </phrase>
 <phrase>
@@ -852,16 +839,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "预增益"
+    *: "预增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "预增益"
+    *: "预增益"
   </voice>
 </phrase>
 <phrase>
@@ -869,16 +853,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "简易均衡器设置"
+    *: "简易均衡器设置"
   </dest>
   <voice>
-    *: none
-    swcodec: "简易均衡器设置"
+    *: "简易均衡器设置"
   </voice>
 </phrase>
 <phrase>
@@ -886,16 +867,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "高级均衡器设置"
+    *: "高级均衡器设置"
   </dest>
   <voice>
-    *: none
-    swcodec: "高级均衡器设置"
+    *: "高级均衡器设置"
   </voice>
 </phrase>
 <phrase>
@@ -903,16 +881,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "保存均衡器设置"
+    *: "保存均衡器设置"
   </dest>
   <voice>
-    *: none
-    swcodec: "保存均衡器设置"
+    *: "保存均衡器设置"
   </voice>
 </phrase>
 <phrase>
@@ -920,16 +895,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "浏览均衡器设置"
+    *: "浏览均衡器设置"
   </dest>
   <voice>
-    *: none
-    swcodec: "浏览均衡器设置"
+    *: "浏览均衡器设置"
   </voice>
 </phrase>
 <phrase>
@@ -937,16 +909,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "编辑:%s"
+    *: "编辑:%s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -954,16 +923,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%dHz频段增益"
+    *: "%dHz频段增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "赫兹频段增益"
+    *: "赫兹频段增益"
   </voice>
 </phrase>
 <phrase>
@@ -971,16 +937,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "低架滤波器"
+    *: "低架滤波器"
   </dest>
   <voice>
-    *: none
-    swcodec: "低架滤波器"
+    *: "低架滤波器"
   </voice>
 </phrase>
 <phrase>
@@ -988,16 +951,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "带通滤波器%d"
+    *: "带通滤波器%d"
   </dest>
   <voice>
-    *: none
-    swcodec: "带通滤波器"
+    *: "带通滤波器"
   </voice>
 </phrase>
 <phrase>
@@ -1005,16 +965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "高架滤波器"
+    *: "高架滤波器"
   </dest>
   <voice>
-    *: none
-    swcodec: "高架滤波器"
+    *: "高架滤波器"
   </voice>
 </phrase>
 <phrase>
@@ -1022,16 +979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "截止频率"
+    *: "截止频率"
   </dest>
   <voice>
-    *: none
-    swcodec: "截止频率"
+    *: "截止频率"
   </voice>
 </phrase>
 <phrase>
@@ -1039,16 +993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "中心频率"
+    *: "中心频率"
   </dest>
   <voice>
-    *: none
-    swcodec: "中心频率"
+    *: "中心频率"
   </voice>
 </phrase>
 <phrase>
@@ -1056,16 +1007,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q值(品质因素)"
+    *: "Q值(品质因素)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q值(品质因素)"
+    *: "Q值(品质因素)"
   </voice>
 </phrase>
 <phrase>
@@ -1331,16 +1279,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "曲目更换提示音"
+    *: "曲目更换提示音"
   </dest>
   <voice>
-    *: none
-    swcodec: "曲目更换时发出提示音"
+    *: "曲目更换时发出提示音"
   </voice>
 </phrase>
 <phrase>
@@ -1348,16 +1293,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "弱"
+    *: "弱"
   </dest>
   <voice>
-    *: none
-    swcodec: "弱"
+    *: "弱"
   </voice>
 </phrase>
 <phrase>
@@ -1365,16 +1307,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "适中"
+    *: "适中"
   </dest>
   <voice>
-    *: none
-    swcodec: "适中"
+    *: "适中"
   </voice>
 </phrase>
 <phrase>
@@ -1382,16 +1321,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "强"
+    *: "强"
   </dest>
   <voice>
-    *: none
-    swcodec: "强"
+    *: "强"
   </voice>
 </phrase>
 <phrase>
@@ -1685,16 +1621,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "字体"
+    *: "字体"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "字体"
+    *: "字体"
   </voice>
 </phrase>
 <phrase>
@@ -1778,16 +1711,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "状态栏/滚动条"
+    *: "状态栏/滚动条"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "状态栏与滚动条"
+    *: "状态栏与滚动条"
   </voice>
 </phrase>
 <phrase>
@@ -1854,16 +1784,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "希伯来文(ISO-8859-8)"
+    *: "希伯来文(ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "希伯来文"
+    *: "希伯来文"
   </voice>
 </phrase>
 <phrase>
@@ -1885,16 +1812,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "泰语(ISO-8859-11)"
+    *: "泰语(ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "泰语"
+    *: "泰语"
   </voice>
 </phrase>
 <phrase>
@@ -1902,16 +1826,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "阿拉伯文(CP1256)"
+    *: "阿拉伯文(CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "阿拉伯文"
+    *: "阿拉伯文"
   </voice>
 </phrase>
 <phrase>
@@ -1947,16 +1868,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "日文(SJIS)"
+    *: "日文(SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "日文"
+    *: "日文"
   </voice>
 </phrase>
 <phrase>
@@ -1964,16 +1882,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "简体中文(GB2312)"
+    *: "简体中文(GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "简体中文"
+    *: "简体中文"
   </voice>
 </phrase>
 <phrase>
@@ -1981,16 +1896,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "韩文(KSX1001)"
+    *: "韩文(KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "韩文"
+    *: "韩文"
   </voice>
 </phrase>
 <phrase>
@@ -1998,16 +1910,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "繁体中文(BIG5)"
+    *: "繁体中文(BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "繁体中文"
+    *: "繁体中文"
   </voice>
 </phrase>
 <phrase>
@@ -2353,15 +2262,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "频率"
+    play_frequency,recording: "频率"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "频率"
+    play_frequency,recording: "频率"
   </voice>
 </phrase>
 <phrase>
@@ -2387,18 +2296,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "麦克风"
     iriverh100,iriverh120,iriverh300: "内置麦克风"
+    recording: "麦克风"
   </dest>
   <voice>
     *: none
-    recording: "麦克风"
     iriverh100,iriverh120,iriverh300: "内置麦克风"
+    recording: "麦克风"
   </voice>
 </phrase>
 <phrase>
@@ -2740,16 +2649,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "防止削波"
+    *: "防止削波"
   </dest>
   <voice>
-    *: none
-    swcodec: "防止削波"
+    *: "防止削波"
   </voice>
 </phrase>
 <phrase>
@@ -2985,16 +2891,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "上下翻转"
+    *: "上下翻转"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "上下翻转"
+    *: "上下翻转"
   </voice>
 </phrase>
 <phrase>
@@ -3002,16 +2905,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "选择条类型"
+    *: "选择条类型"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "选择条类型"
+    *: "选择条类型"
   </voice>
 </phrase>
 <phrase>
@@ -3019,16 +2919,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "指示符"
+    *: "指示符"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "指示符"
+    *: "指示符"
   </voice>
 </phrase>
 <phrase>
@@ -3036,16 +2933,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "反色条"
+    *: "反色条"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "反色条"
+    *: "反色条"
   </voice>
 </phrase>
 <phrase>
@@ -3222,16 +3116,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "允许列表查看时滚动全屏"
+    *: "允许列表查看时滚动全屏"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "允许列表查看时滚动整个屏幕"
+    *: "允许列表查看时滚动整个屏幕"
   </voice>
 </phrase>
 <phrase>
@@ -3239,16 +3130,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "屏幕滚动步长"
+    *: "屏幕滚动步长"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "屏幕滚动步长"
+    *: "屏幕滚动步长"
   </voice>
 </phrase>
 <phrase>
@@ -3270,16 +3158,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "滚动条"
+    *: "滚动条"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "滚动条"
+    *: "滚动条"
   </voice>
 </phrase>
 <phrase>
@@ -3287,16 +3172,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "状态栏"
+    *: "状态栏"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "状态栏"
+    *: "状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -3321,16 +3203,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "音量显示"
+    *: "音量显示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "音量显示"
+    *: "音量显示"
   </voice>
 </phrase>
 <phrase>
@@ -3338,16 +3217,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "电量显示"
+    *: "电量显示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "电量显示"
+    *: "电量显示"
   </voice>
 </phrase>
 <phrase>
@@ -3355,16 +3231,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "图形式"
+    *: "图形式"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "图形式"
+    *: "图形式"
   </voice>
 </phrase>
 <phrase>
@@ -3372,16 +3245,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "数值式"
+    *: "数值式"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "数值式"
+    *: "数值式"
   </voice>
 </phrase>
 <phrase>
@@ -4231,13 +4101,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "剩余电量:%d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "电量:%d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm"
   </dest>
   <voice>
     *: "剩余电量"
@@ -4294,24 +4164,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "磁盘1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "MMC卡"
     multivolume: "磁盘1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD卡"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD卡"
     xduoox3: "mSD卡2"
-    archosondio*: "MMC卡"
   </voice>
 </phrase>
 <phrase>
@@ -4441,35 +4311,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF:取消"
-    mrobe500: "电源:取消"
-    iriverh100,iriverh120,iriverh300: "STOP:取消"
-    ipod*,sansac200*,mpiohd300: "MENU:取消"
-    iaudiox5,iaudiom5: "RECORD:取消"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV:取消"
     gigabeatfx: "POWER:取消"
-    sansafuzeplus: "BACK:取消"
-    mrobe100: "DISPLAY:取消"
-    gigabeats: "BACK:取消"
+    gigabeats,sansafuzeplus: "BACK:取消"
     gogearsa9200: "LEFT:取消"
-    vibe500: "CANCEL:取消"
+    iaudiom5,iaudiox5: "RECORD:取消"
+    ipod*,mpiohd300,sansac200*: "MENU:取消"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV:取消"
+    iriverh100,iriverh120,iriverh300: "STOP:取消"
+    mrobe100: "DISPLAY:取消"
+    mrobe500: "电源:取消"
+    rtc: "OFF:取消"
     samsungyh*: "REW:取消"
+    vibe500: "CANCEL:取消"
   </dest>
   <voice>
     *: none
@@ -4515,19 +4382,19 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "磁盘已满，按下OFF继续."
-    iriverh100,iriverh120,iriverh300: "磁盘已满，按下STOP继续."
     iaudiom5,iaudiox5: "磁盘已满，按下POWER继续."
-    sansae200*,sansac200*,vibe500: "磁盘，按下PREV继续."
+    iriverh100,iriverh120,iriverh300: "磁盘已满，按下STOP继续."
+    recording: "磁盘已满，按下OFF继续."
     samsungyh*: "磁盘，按下LEFT继续."
+    sansac200*,sansae200*,vibe500: "磁盘，按下PREV继续."
   </dest>
   <voice>
     *: none
@@ -4693,29 +4560,26 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=设置 OFF=取消"
+    gigabeats: "SELECT=设置 POWER=取消"
     ipod*: "SELECT=设置 MENU=取消"
     iriverh10,iriverh10_5gb: "SELECT=设置 PREV=取消"
-    gigabeats: "SELECT=设置 POWER=取消"
-    vibe500: "OK=设置 C=取消"
     mpiohd300: "ENTER=设置 MENU=取消"
     sansafuzeplus: "SELECT=设置  BACK=取消"
+    vibe500: "OK=设置 C=取消"
   </dest>
   <voice>
-   *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
+    *: none
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -7152,22 +7016,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "按OFF键取消"
-    iriverh100,iriverh120,iriverh300: "按STOP键取消"
-    ipod*: "按PLAY/PAUSE键取消"
-    iaudiox5,iaudiom5: "长按PLAY键取消"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "按PREV键取消"
-    gigabeats: "按BACK键取消"
     gigabeatfx: "按POWER键取消"
+    gigabeats: "按BACK键取消"
+    iaudiom5,iaudiox5: "长按PLAY键取消"
+    ipod*: "按PLAY/PAUSE键取消"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "按PREV键取消"
+    iriverh100,iriverh120,iriverh300: "按STOP键取消"
   </dest>
   <voice>
     *: ""
@@ -7510,16 +7373,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "直接增益"
+    *: "直接增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "直接增益"
+    *: "直接增益"
   </voice>
 </phrase>
 <phrase>
@@ -7527,16 +7387,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "交叉增益"
+    *: "交叉增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "交叉增益"
+    *: "交叉增益"
   </voice>
 </phrase>
 <phrase>
@@ -7544,16 +7401,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "高频衰减"
+    *: "高频衰减"
   </dest>
   <voice>
-    *: none
-    swcodec: "高频衰减"
+    *: "高频衰减"
   </voice>
 </phrase>
 <phrase>
@@ -7561,16 +7415,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "高频截止频率"
+    *: "高频截止频率"
   </dest>
   <voice>
-    *: none
-    swcodec: "高频截止频率"
+    *: "高频截止频率"
   </voice>
 </phrase>
 <phrase>
@@ -7912,21 +7763,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "数据库更新中...已找到%d个(按OFF键返回)"
-    iriverh100,iriverh120,iriverh300: "数据库更新中...已找到%d个(按STOP键返回)"
-    ipod*: "数据库更新中...已找到%d个(按PREV键返回)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "数据库更新中...已找到%d个(按LEFT键返回)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "数据库更新中...已找到%d个(按PREV键返回)"
-    gogearsa9200: "数据库更新中...已找到%d个(按REW键返回)"
     archosplayer: "数据库更新中...已找到%d个"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "数据库更新中...已找到%d个(按LEFT键返回)"
+    gogearsa9200: "数据库更新中...已找到%d个(按REW键返回)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "数据库更新中...已找到%d个(按PREV键返回)"
+    iriverh100,iriverh120,iriverh300: "数据库更新中...已找到%d个(按STOP键返回)"
   </dest>
   <voice>
     *: "数据库更新中"
@@ -8055,7 +7904,7 @@
 </phrase>
 <phrase>
   id: LANG_DELETING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Deleting..."
@@ -8373,7 +8222,7 @@
 </phrase>
 <phrase>
   id: LANG_REC_DIR_NOT_WRITABLE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -8408,20 +8257,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY:是"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU或TOP-RIGHT:是"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT:是"
     iriverh100,iriverh120,iriverh300: "NAVI=是"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT:是"
     mrobe500: "PLAY,POWER或TOP-RIGHT:是"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK:是"
   </dest>
   <voice>
@@ -8434,23 +8283,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON:设置"
-    mrobe500: "HEART:设置"
-    iriverh100,iriverh120,iriverh300: "NAVI=设置"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT:设置"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT:设置"
     gogearsa9200,samsungyh*: "PLAY:设置"
-    vibe500: "OK:设置"
+    iriverh100,iriverh120,iriverh300: "NAVI=设置"
     mpiohd300: "ENTER:设置"
+    mrobe500: "HEART:设置"
+    rtc: "ON:设置"
+    vibe500: "OK:设置"
   </dest>
   <voice>
     *: none
@@ -8474,7 +8323,7 @@
 </phrase>
 <phrase>
   id: LANG_BROWSE_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: "Browse Cuesheet"
@@ -8592,7 +8441,7 @@
 </phrase>
 <phrase>
   id: LANG_ADD_TO_FAVES
-  desc: 
+  desc:
   user: core
   <source>
     *: "Add to Shortcuts"
@@ -8685,7 +8534,7 @@
 </phrase>
 <phrase>
   id: LANG_CLEAR_REC_DIR
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -8767,16 +8616,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "模式:"
+    *: "模式:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9488,16 +9334,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "高频抖动"
+    *: "高频抖动"
   </dest>
   <voice>
-    *: none
-    swcodec: "高频抖动"
+    *: "高频抖动"
   </voice>
 </phrase>
 <phrase>
@@ -9533,7 +9376,7 @@
 </phrase>
 <phrase>
   id: LANG_MOVING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Moving..."
@@ -9589,7 +9432,7 @@
 </phrase>
 <phrase>
   id: VOICE_EXT_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: ""
@@ -9636,17 +9479,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "按键背光自动关闭时滞"
-    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
+    sansae200*,sansafuze*: "转盘背光自动关闭时滞"
   </dest>
   <voice>
     *: none
     button_light: "按键背光自动关闭时滞"
-    sansafuze*,sansae200*: "转盘背光自动关闭时滞"
+    sansae200*,sansafuze*: "转盘背光自动关闭时滞"
   </voice>
 </phrase>
 <phrase>
@@ -9898,7 +9741,7 @@
 </phrase>
 <phrase>
   id: LANG_COPYING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Copying..."
@@ -10071,15 +9914,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "低频截止频率"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "低频截止频率"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低频截止频率"
   </voice>
 </phrase>
 <phrase>
@@ -10277,15 +10120,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "高频截止频率"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "高频截止频率"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高频截止频率"
   </voice>
 </phrase>
 <phrase>
@@ -10335,16 +10178,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "按键声"
+    *: "按键声"
   </dest>
   <voice>
-    *: none
-    swcodec: "按键声"
+    *: "按键声"
   </voice>
 </phrase>
 <phrase>
@@ -10352,16 +10192,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "重复按键声"
+    *: "重复按键声"
   </dest>
   <voice>
-    *: none
-    swcodec: "重复按键声"
+    *: "重复按键声"
   </voice>
 </phrase>
 <phrase>
@@ -11111,16 +10948,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "启动时间"
+    *: "启动时间"
   </dest>
   <voice>
-    *: none
-    swcodec: "启动时间"
+    *: "启动时间"
   </voice>
 </phrase>
 <phrase>
@@ -11128,16 +10962,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "恢复时间"
+    *: "恢复时间"
   </dest>
   <voice>
-    *: none
-    swcodec: "恢复时间"
+    *: "恢复时间"
   </voice>
 </phrase>
 <phrase>
@@ -11145,16 +10976,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "阀值"
+    *: "阀值"
   </dest>
   <voice>
-    *: none
-    swcodec: "阀值"
+    *: "阀值"
   </voice>
 </phrase>
 <phrase>
@@ -11162,16 +10990,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "增益"
+    *: "增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "增益"
+    *: "增益"
   </voice>
 </phrase>
 <phrase>
@@ -11179,16 +11004,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "状态栏"
+    *: "状态栏"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "状态栏"
+    *: "状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -11196,16 +11018,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "滚动栏位置"
+    *: "滚动栏位置"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "滚动栏位置"
+    *: "滚动栏位置"
   </voice>
 </phrase>
 <phrase>
@@ -11247,16 +11066,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "柔和度"
+    *: "柔和度"
   </dest>
   <voice>
-    *: none
-    swcodec: "柔和度"
+    *: "柔和度"
   </voice>
 </phrase>
 <phrase>
@@ -11264,16 +11080,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "自动"
+    *: "自动"
   </dest>
   <voice>
-    *: none
-    swcodec: "自动"
+    *: "自动"
   </voice>
 </phrase>
 <phrase>
@@ -11295,16 +11108,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "柔和"
+    *: "柔和"
   </dest>
   <voice>
-    *: none
-    swcodec: "柔和"
+    *: "柔和"
   </voice>
 </phrase>
 <phrase>
@@ -11326,16 +11136,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "压缩比"
+    *: "压缩比"
   </dest>
   <voice>
-    *: none
-    swcodec: "压缩比例"
+    *: "压缩比例"
   </voice>
 </phrase>
 <phrase>
@@ -11360,16 +11167,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "锐利"
+    *: "锐利"
   </dest>
   <voice>
-    *: none
-    swcodec: "锐利"
+    *: "锐利"
   </voice>
 </phrase>
 <phrase>
@@ -11411,16 +11215,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "线控状态栏"
+    *: "线控状态栏"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "线控状态栏"
+    *: "线控状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -11561,16 +11362,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11612,16 +11410,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11646,16 +11441,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "极限(Limit)"
+    *: "极限(Limit)"
   </dest>
   <voice>
-    *: none
-    swcodec: "极限 Limit"
+    *: "极限 Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11694,16 +11486,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "滚动栏宽度"
+    *: "滚动栏宽度"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "滚动栏宽度"
+    *: "滚动栏宽度"
   </voice>
 </phrase>
 <phrase>
@@ -11770,16 +11559,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "音调/音速"
+    *: "音调/音速"
   </dest>
   <voice>
-    *: none
-    swcodec: "音调/音速"
+    *: "音调/音速"
   </voice>
 </phrase>
 <phrase>
@@ -11787,16 +11573,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11804,16 +11587,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "压限器"
+    *: "压限器"
   </dest>
   <voice>
-    *: none
-    swcodec: "压限器"
+    *: "压限器"
   </voice>
 </phrase>
 <phrase>
@@ -11866,16 +11646,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "速度"
+    *: "速度"
   </dest>
   <voice>
-    *: none
-    swcodec: "速度"
+    *: "速度"
   </voice>
 </phrase>
 <phrase>
@@ -11897,16 +11674,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12146,16 +11920,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "恢复播放时自动快退时长"
+    *: "恢复播放时自动快退时长"
   </dest>
   <voice>
-    *: none
-    swcodec: "恢复播放时自动快退时长"
+    *: "恢复播放时自动快退时长"
   </voice>
 </phrase>
 <phrase>
@@ -12178,15 +11949,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D增强"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D增强"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "三维增强"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "三维增强"
   </voice>
 </phrase>
 <phrase>
@@ -12321,7 +12092,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12594,16 +12365,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "简单 (Meier)"
+    *: "简单 (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "简单"
+    *: "简单"
   </voice>
 </phrase>
 <phrase>
@@ -12749,16 +12517,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "定制"
+    *: "定制"
   </dest>
   <voice>
-    *: none
-    swcodec: "定制"
+    *: "定制"
   </voice>
 </phrase>
 <phrase>
@@ -12974,16 +12739,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "感知性低音增强"
+    *: "感知性低音增强"
   </dest>
   <voice>
-    *: none
-    swcodec: "感知性低音增强音效"
+    *: "感知性低音增强音效"
   </voice>
 </phrase>
 <phrase>
@@ -12991,16 +12753,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "声学抗疲劳"
+    *: "声学抗疲劳"
   </dest>
   <voice>
-    *: none
-    swcodec: "声学抗疲劳音效"
+    *: "声学抗疲劳音效"
   </voice>
 </phrase>
 <phrase>
@@ -13008,16 +12767,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "哈斯环绕"
+    *: "哈斯环绕"
   </dest>
   <voice>
-    *: none
-    swcodec: "哈斯环绕音效"
+    *: "哈斯环绕音效"
   </voice>
 </phrase>
 <phrase>
@@ -13025,16 +12781,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13042,16 +12795,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13059,16 +12809,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -13076,16 +12823,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "干湿混合度"
+    *: "干湿混合度"
   </dest>
   <voice>
-    *: none
-    swcodec: "干湿混合度"
+    *: "干湿混合度"
   </voice>
 </phrase>
 <phrase>
@@ -13094,18 +12838,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "CPU频率管理器"
-    ibassodx90: "CPU频率管理器"
+    ibassodx50,ibassodx90: "CPU频率管理器"
   </dest>
   <voice>
     *: none
-    ibassodx50: "CPU频率管理器"
-    ibassodx90: "CPU频率管理器"
+    ibassodx50,ibassodx90: "CPU频率管理器"
   </voice>
 </phrase>
 <phrase>
@@ -13114,18 +12855,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB模式"
-    ibassodx90: "USB模式"
+    ibassodx50,ibassodx90: "USB模式"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB模式"
-    ibassodx90: "USB模式"
+    ibassodx50,ibassodx90: "USB模式"
   </voice>
 </phrase>
 <phrase>
@@ -13134,18 +12872,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "大容量存储"
-    ibassodx90: "大容量存储"
+    ibassodx50,ibassodx90: "大容量存储"
   </dest>
   <voice>
     *: none
-    ibassodx50: "大容量存储"
-    ibassodx90: "大容量存储"
+    ibassodx50,ibassodx90: "大容量存储"
   </voice>
 </phrase>
 <phrase>
@@ -13154,18 +12889,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "仅充电"
-    ibassodx90: "仅充电"
+    ibassodx50,ibassodx90: "仅充电"
   </dest>
   <voice>
     *: none
-    ibassodx50: "仅充电"
-    ibassodx90: "仅充电"
+    ibassodx50,ibassodx90: "仅充电"
   </voice>
 </phrase>
 <phrase>
@@ -13174,18 +12906,14 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "ADB调试"
-    ibassodx90: "ADB调试"
+    ibassodx50,ibassodx90: "ADB调试"
   </dest>
   <voice>
     *: none
-    ibassodx50: "ADB调试"
-    ibassodx90: "ADB调试"
+    ibassodx50,ibassodx90: "ADB调试"
   </voice>
 </phrase>
-
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 6b8faee6a5..ae51254fde 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -1,4 +1,3 @@
-#             __________               __   ___.
 #   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 #   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
@@ -612,16 +611,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "交叉供音"
+    *: "交叉供音"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -629,16 +625,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "等化器"
+    *: "等化器"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -817,16 +810,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "開啟等化器"
+    *: "開啟等化器"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -834,16 +824,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "圖解等化器"
+    *: "圖解等化器"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -851,16 +838,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "預切"
+    *: "預切"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -868,16 +852,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "簡易等化器設定"
+    *: "簡易等化器設定"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -885,16 +866,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "進階等化器設定"
+    *: "進階等化器設定"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -902,16 +880,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "儲存等化器設定"
+    *: "儲存等化器設定"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -919,16 +894,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "瀏覽等化器設定"
+    *: "瀏覽等化器設定"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -936,16 +908,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "編輯模式: %s"
+    *: "編輯模式: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -953,16 +922,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz 頻帶增益"
+    *: "%d Hz 頻帶增益"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -970,16 +936,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "低峰值過濾"
+    *: "低峰值過濾"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -987,16 +950,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "峰值過濾 %d"
+    *: "峰值過濾 %d"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1004,16 +964,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "高峰值過濾"
+    *: "高峰值過濾"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1021,16 +978,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "截斷頻率"
+    *: "截斷頻率"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1038,16 +992,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "中心頻率"
+    *: "中心頻率"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1055,16 +1006,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1330,16 +1278,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "換曲提示音"
+    *: "換曲提示音"
   </dest>
   <voice>
-    *: none
-    swcodec: "換曲提示音"
+    *: "換曲提示音"
   </voice>
 </phrase>
 <phrase>
@@ -1347,16 +1292,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "弱"
+    *: "弱"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1364,16 +1306,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "中"
+    *: "中"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1381,16 +1320,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "強"
+    *: "強"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1684,16 +1620,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "瀏覽字形"
+    *: "瀏覽字形"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "字形"
+    *: "字形"
   </voice>
 </phrase>
 <phrase>
@@ -1777,16 +1710,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "狀態列/捲動軸"
+    *: "狀態列/捲動軸"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1853,16 +1783,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -1884,16 +1811,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -1901,16 +1825,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -1946,16 +1867,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "日文(SJIS)"
+    *: "日文(SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -1963,16 +1881,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "簡體中文 (GB2312)"
+    *: "簡體中文 (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1980,16 +1895,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "韓文 (KSX1001)"
+    *: "韓文 (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1997,16 +1909,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "正體中文 (BIG5)"
+    *: "正體中文 (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2352,15 +2261,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "頻率"
+    play_frequency,recording: "頻率"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: ""
+    play_frequency,recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -2386,18 +2295,17 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "麥克風"
     iriverh100,iriverh120,iriverh300: "內置麥克風"
+    recording: "麥克風"
   </dest>
   <voice>
     *: none
-    recording: ""
-    iriverh100,iriverh120,iriverh300: ""
+    iriverh100,iriverh120,iriverh300,recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -2739,16 +2647,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "防止削波"
+    *: "防止削波"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -2984,16 +2889,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "上下反轉"
+    *: "上下反轉"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -3001,16 +2903,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "項目選擇方式"
+    *: "項目選擇方式"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector"
+    *: "Line Selector"
   </voice>
 </phrase>
 <phrase>
@@ -3018,16 +2917,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "指示器"
+    *: "指示器"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -3035,16 +2931,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "整行反白"
+    *: "整行反白"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3221,16 +3114,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "畫面範圍外捲動"
+    *: "畫面範圍外捲動"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -3238,16 +3128,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "畫面捲動間隔"
+    *: "畫面捲動間隔"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -3269,16 +3156,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "捲動軸"
+    *: "捲動軸"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3286,16 +3170,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "狀態列"
+    *: "狀態列"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3320,16 +3201,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "音量顯示"
+    *: "音量顯示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3337,16 +3215,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "電池顯示"
+    *: "電池顯示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3354,16 +3229,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "圖形"
+    *: "圖形"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3371,16 +3243,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "數值"
+    *: "數值"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -4230,18 +4099,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "電池: %d%% %d小時 %d分"
     archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "電池: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "電池: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
-    iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    ipodmini1g,ipodmini2g,iriverh10,iriverifp7xx: ""
   </voice>
 </phrase>
 <phrase>
@@ -4295,24 +4163,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC 卡:"
     multivolume: "磁盤1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Multimedia 卡:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Multimedia 卡:"
     xduoox3: "Multimedia 卡2:"
-    archosondio*: "MMC 卡:"
   </dest>
   <voice>
     *: none
+    archosondio*: "MMC 卡"
     multivolume: "磁盤1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Multimedia 卡"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Multimedia 卡"
     xduoox3: "Multimedia 卡2"
-    archosondio*: "MMC 卡"
   </voice>
 </phrase>
 <phrase>
@@ -4442,35 +4310,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = 返回"
-    mrobe500: "POWER = 回去"
-    iriverh100,iriverh120,iriverh300: "STOP = 返回"
-    ipod*,sansac200*,mpiohd300: "MENU = 回去"
-    iaudiox5,iaudiom5: "RECORD = 回去"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 返回"
     gigabeatfx: "POWER = 返回"
-    sansafuzeplus: "BACK = 返回"
-    mrobe100: "DISPLAY = 返回"
-    gigabeats: "BACK = 返回"
+    gigabeats,sansafuzeplus: "BACK = 返回"
     gogearsa9200: "LEFT = 返回"
-    vibe500: "CANCEL = 返回"
+    iaudiom5,iaudiox5: "RECORD = 回去"
+    ipod*,mpiohd300,sansac200*: "MENU = 回去"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 返回"
+    iriverh100,iriverh120,iriverh300: "STOP = 返回"
+    mrobe100: "DISPLAY = 返回"
+    mrobe500: "POWER = 回去"
+    rtc: "OFF = 返回"
     samsungyh*: "REW = 返回"
+    vibe500: "CANCEL = 返回"
   </dest>
   <voice>
     *: none
@@ -4516,26 +4381,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "硬碟已滿, 按下 OFF 繼續."
-    iriverh100,iriverh120,iriverh300: "硬碟已滿, 按下 STOP 繼續."
     iaudiom5,iaudiox5: "硬碟已滿, 按下 POWER 繼續."
-    sansae200*,sansac200*,vibe500: "硬碟已滿, 按下 PREV 繼續."
+    iriverh100,iriverh120,iriverh300: "硬碟已滿, 按下 STOP 繼續."
+    recording: "硬碟已滿, 按下 OFF 繼續."
     samsungyh*: "硬碟已滿, 按下 LEFT 繼續."
+    sansac200*,sansae200*,vibe500: "硬碟已滿, 按下 PREV 繼續."
   </dest>
   <voice>
     *: none
-    recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4698,29 +4560,26 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=取消"
+    gigabeats: "SELECT=設定 POWER=取消"
     ipod*: "SELECT=設定 MENU=取消"
     iriverh10,iriverh10_5gb: "SELECT=設定 PREV=取消"
-    gigabeats: "SELECT=設定 POWER=取消"
-    vibe500: "OK=設定 C=取消"
     mpiohd300: "ENTER=設定 MENU=取消"
     sansafuzeplus: "SELECT=設定  BACK=取消"
+    vibe500: "OK=設定 C=取消"
   </dest>
   <voice>
     *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -7157,23 +7016,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF: 離開"
-    iriverh100,iriverh120,iriverh300: "STOP: 離開"
-    ipod*: "PLAY/PAUSE: 離開"
-    iaudiox5,iaudiom5: "長按PLAY: 離開"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV: 離開"
-    gigabeats: "BACK: 離開"
     gigabeatfx: "POWER: 離開"
-    sansafuzeplus: "BACK: 離開"
+    gigabeats,sansafuzeplus: "BACK: 離開"
+    iaudiom5,iaudiox5: "長按PLAY: 離開"
+    ipod*: "PLAY/PAUSE: 離開"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV: 離開"
+    iriverh100,iriverh120,iriverh300: "STOP: 離開"
   </dest>
   <voice>
     *: ""
@@ -7516,16 +7373,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "直接增加"
+    *: "直接增加"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -7533,16 +7387,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "交叉增加"
+    *: "交叉增加"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -7550,16 +7401,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "高頻衰減"
+    *: "高頻衰減"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -7567,16 +7415,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "高頻截斷"
+    *: "高頻截斷"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -7952,21 +7797,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "建立資料庫... 找到 %d 項 (OFF: 回上一畫面)"
-    iriverh100,iriverh120,iriverh300: "建立資料庫... 找到 %d 項 (STOP: 回上一畫面)"
-    ipod*: "建立資料庫... 找到 %d 項 (PREV: 回上一畫面)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "建立資料庫... 找到 %d 項 (LEFT: 回上一畫面)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "建立資料庫... 找到 %d 項 (PREV: 回上一畫面)"
-    gogearsa9200: "建立資料庫... 找到 %d 項 (REW: 回上一畫面)"
     archosplayer: "建立資料庫... 找到 %d"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "建立資料庫... 找到 %d 項 (LEFT: 回上一畫面)"
+    gogearsa9200: "建立資料庫... 找到 %d 項 (REW: 回上一畫面)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "建立資料庫... 找到 %d 項 (PREV: 回上一畫面)"
+    iriverh100,iriverh120,iriverh300: "建立資料庫... 找到 %d 項 (STOP: 回上一畫面)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -8449,23 +8292,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = 是"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = 是"
+    creativezen*: "Select = 是"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = 是"
     iriverh100,iriverh120,iriverh300: "NAVI = 是"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = 是"
     mrobe500: "PLAY, POWER, or top-right = 是"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = 是"
-    creativezen*: "Select = 是"
   </dest>
   <voice>
     *: ""
@@ -8477,23 +8320,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = 設定"
-    mrobe500: "HEART = 設定"
-    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = 設定"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = 設定"
     gogearsa9200,samsungyh*: "PLAY = 設定"
-    vibe500: "OK = 設定"
+    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
     mpiohd300: "ENTER = 設定"
+    mrobe500: "HEART = 設定"
+    rtc: "ON = 設定"
+    vibe500: "OK = 設定"
   </dest>
   <voice>
     *: none
@@ -8811,16 +8654,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9532,16 +9372,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "添加抖動"
+    *: "添加抖動"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -9680,17 +9517,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "轉盤燈自動關時間"
+    sansae200*,sansafuze*: "轉盤燈自動關時間"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -10115,15 +9952,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "低音截斷"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音截斷"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10321,15 +10158,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "高聲截斷"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高聲截斷"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10379,16 +10216,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "關鍵點"
+    *: "關鍵點"
   </dest>
   <voice>
-    *: none
-    swcodec: "關鍵點"
+    *: "關鍵點"
   </voice>
 </phrase>
 <phrase>
@@ -10396,16 +10230,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "關鍵點擊重"
+    *: "關鍵點擊重"
   </dest>
   <voice>
-    *: none
-    swcodec: "關鍵點擊重"
+    *: "關鍵點擊重"
   </voice>
 </phrase>
 <phrase>
@@ -11357,16 +11188,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "狀態列佈景主題"
+    *: "狀態列佈景主題"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "狀態列佈景主題"
+    *: "狀態列佈景主題"
   </voice>
 </phrase>
 <phrase>
@@ -11374,16 +11202,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "捲動軸寬度"
+    *: "捲動軸寬度"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "捲動軸寬度"
+    *: "捲動軸寬度"
   </voice>
 </phrase>
 <phrase>
@@ -11405,16 +11230,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "暫停時自動倒退長度"
+    *: "暫停時自動倒退長度"
   </dest>
   <voice>
-    *: none
-    swcodec: "暫停時自動倒退長度"
+    *: "暫停時自動倒退長度"
   </voice>
 </phrase>
 <phrase>
@@ -11473,16 +11295,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "感知性低音增強"
+    *: "感知性低音增強"
   </dest>
   <voice>
-    *: none
-    swcodec: "感知性低音增強音效"
+    *: "感知性低音增強音效"
   </voice>
 </phrase>
 <phrase>
@@ -11490,16 +11309,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "聲學抗疲勞"
+    *: "聲學抗疲勞"
   </dest>
   <voice>
-    *: none
-    swcodec: "聲學抗疲勞音效"
+    *: "聲學抗疲勞音效"
   </voice>
 </phrase>
 <phrase>
@@ -11507,16 +11323,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "哈斯環繞"
+    *: "哈斯環繞"
   </dest>
   <voice>
-    *: none
-    swcodec: "哈斯環繞音效"
+    *: "哈斯環繞音效"
   </voice>
 </phrase>
 <phrase>
@@ -11524,16 +11337,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -11541,16 +11351,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -11558,16 +11365,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -11575,16 +11379,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "乾濕混合度"
+    *: "乾濕混合度"
   </dest>
   <voice>
-    *: none
-    swcodec: "乾濕混合度"
+    *: "乾濕混合度"
   </voice>
 </phrase>
 <phrase>
@@ -11593,18 +11394,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "CPU頻率管理器"
-    ibassodx90: "CPU頻率管理器"
+    ibassodx50,ibassodx90: "CPU頻率管理器"
   </dest>
   <voice>
     *: none
-    ibassodx50: "CPU頻率管理器"
-    ibassodx90: "CPU頻率管理器"
+    ibassodx50,ibassodx90: "CPU頻率管理器"
   </voice>
 </phrase>
 <phrase>
@@ -11613,18 +11411,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB模式"
-    ibassodx90: "USB模式"
+    ibassodx50,ibassodx90: "USB模式"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB模式"
-    ibassodx90: "USB模式"
+    ibassodx50,ibassodx90: "USB模式"
   </voice>
 </phrase>
 <phrase>
@@ -11633,18 +11428,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "大容量存儲"
-    ibassodx90: "大容量存儲"
+    ibassodx50,ibassodx90: "大容量存儲"
   </dest>
   <voice>
     *: none
-    ibassodx50: "大容量存儲"
-    ibassodx90: "大容量存儲"
+    ibassodx50,ibassodx90: "大容量存儲"
   </voice>
 </phrase>
 <phrase>
@@ -11653,18 +11445,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "僅充電"
-    ibassodx90: "僅充電"
+    ibassodx50,ibassodx90: "僅充電"
   </dest>
   <voice>
     *: none
-    ibassodx50: "僅充電"
-    ibassodx90: "僅充電"
+    ibassodx50,ibassodx90: "僅充電"
   </voice>
 </phrase>
 <phrase>
@@ -11673,18 +11462,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "ADB偵錯"
-    ibassodx90: "ADB偵錯"
+    ibassodx50,ibassodx90: "ADB偵錯"
   </dest>
   <voice>
     *: none
-    ibassodx50: "ADB偵錯"
-    ibassodx90: "ADB偵錯"
+    ibassodx50,ibassodx90: "ADB偵錯"
   </voice>
 </phrase>
 <phrase>
@@ -11748,16 +11534,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "閾"
+    *: "閾"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -11878,16 +11661,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11974,16 +11754,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11991,16 +11768,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "品質因數"
+    *: "品質因數"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12008,16 +11782,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "壓縮"
+    *: "壓縮"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -12025,16 +11796,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -12093,16 +11861,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12110,16 +11875,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "滾動條位置"
+    *: "滾動條位置"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -12127,16 +11889,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -12158,16 +11917,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12192,16 +11948,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "軟拐點"
+    *: "軟拐點"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -12257,16 +12010,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -12387,16 +12137,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12463,16 +12210,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "硬拐點"
+    *: "硬拐點"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -12579,16 +12323,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </voice>
 </phrase>
 <phrase>
@@ -12630,16 +12371,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "釋放時間"
+    *: "釋放時間"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -12808,16 +12546,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "速度"
+    *: "速度"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12825,16 +12560,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -12949,16 +12681,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "增益"
+    *: "增益"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -12966,16 +12695,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "編輯設定: %s %s"
+    *: "編輯設定: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12997,16 +12723,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -13031,16 +12754,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "自訂"
+    *: "自訂"
   </dest>
   <voice>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </voice>
 </phrase>
 <phrase>
@@ -13096,16 +12816,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -13113,16 +12830,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "比率"
+    *: "比率"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -13265,16 +12979,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "自動"
+    *: "自動"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index fb7b945562..22bc49a940 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -250,23 +250,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
-  *: "PLAY = Ano"
+    *: "PLAY = Ano"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, nebo vpravo nahoře = Ano"
+    creativezen*: "Select = Ano"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ano"
     iriverh100,iriverh120,iriverh300: "NAVI = Ano"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ano"
     mrobe500: "PLAY, POWER, nebo vpravo nahoře = Ano"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Ano"
-    creativezen*: "Select = Ano"
   </dest>
   <voice>
     *: ""
@@ -821,16 +821,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Křížení kanálů"
+    *: "Křížení kanálů"
   </dest>
   <voice>
-    *: none
-    swcodec: "Křížení kanálů"
+    *: "Křížení kanálů"
   </voice>
 </phrase>
 <phrase>
@@ -838,16 +835,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Přímé zesílení"
+    *: "Přímé zesílení"
   </dest>
   <voice>
-    *: none
-    swcodec: "Přímé zesílení"
+    *: "Přímé zesílení"
   </voice>
 </phrase>
 <phrase>
@@ -855,16 +849,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Překřížené zesílení"
+    *: "Překřížené zesílení"
   </dest>
   <voice>
-    *: none
-    swcodec: "Překřížené zesílení"
+    *: "Překřížené zesílení"
   </voice>
 </phrase>
 <phrase>
@@ -872,16 +863,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Zeslabení výšek"
+    *: "Zeslabení výšek"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zeslabení výšek"
+    *: "Zeslabení výšek"
   </voice>
 </phrase>
 <phrase>
@@ -889,16 +877,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Oříznutí výšek"
+    *: "Oříznutí výšek"
   </dest>
   <voice>
-    *: none
-    swcodec: "Oříznutí výšek"
+    *: "Oříznutí výšek"
   </voice>
 </phrase>
 <phrase>
@@ -906,16 +891,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ekvalizér"
+    *: "Ekvalizér"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekvalizér"
+    *: "Ekvalizér"
   </voice>
 </phrase>
 <phrase>
@@ -923,16 +905,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Zapnutí EQ"
+    *: "Zapnutí EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zapnutí ekvalizéru"
+    *: "Zapnutí ekvalizéru"
   </voice>
 </phrase>
 <phrase>
@@ -940,16 +919,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafický EQ"
+    *: "Grafický EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafický ekvalizér, neozvučitelné"
+    *: "Grafický ekvalizér, neozvučitelné"
   </voice>
 </phrase>
 <phrase>
@@ -957,16 +933,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Předoříznutí"
+    *: "Předoříznutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Předoříznutí"
+    *: "Předoříznutí"
   </voice>
 </phrase>
 <phrase>
@@ -974,16 +947,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Základní nastavení EQ"
+    *: "Základní nastavení EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Základní nastavení ekvalizéru"
+    *: "Základní nastavení ekvalizéru"
   </voice>
 </phrase>
 <phrase>
@@ -991,16 +961,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Rozšířené nastavení EQ"
+    *: "Rozšířené nastavení EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rozšířené nastavení ekvalizéru"
+    *: "Rozšířené nastavení ekvalizéru"
   </voice>
 </phrase>
 <phrase>
@@ -1008,16 +975,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Uložit konfiguraci EQ"
+    *: "Uložit konfiguraci EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Uložit konfiguraci ekvalizéru"
+    *: "Uložit konfiguraci ekvalizéru"
   </voice>
 </phrase>
 <phrase>
@@ -1025,16 +989,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Procházet konfigurační soubory EQ"
+    *: "Procházet konfigurační soubory EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Procházet konfigurační soubory ekvalizéru"
+    *: "Procházet konfigurační soubory ekvalizéru"
   </voice>
 </phrase>
 <phrase>
@@ -1042,16 +1003,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Režim: %s"
+    *: "Režim: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1059,16 +1017,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz rozsah zesílení"
+    *: "%d Hz rozsah zesílení"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz rozsah zesílení"
+    *: "hertz rozsah zesílení"
   </voice>
 </phrase>
 <phrase>
@@ -1076,16 +1031,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr nižších frekvencí"
+    *: "Filtr nižších frekvencí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr nižších frekvencí"
+    *: "Filtr nižších frekvencí"
   </voice>
 </phrase>
 <phrase>
@@ -1093,16 +1045,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr špiček %d"
+    *: "Filtr špiček %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr špiček"
+    *: "Filtr špiček"
   </voice>
 </phrase>
 <phrase>
@@ -1110,16 +1059,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr vyšších frekvencí"
+    *: "Filtr vyšších frekvencí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr vyšších frekvencí"
+    *: "Filtr vyšších frekvencí"
   </voice>
 </phrase>
 <phrase>
@@ -1127,16 +1073,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Ořezová frekvence"
+    *: "Ořezová frekvence"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ořezová frekvence"
+    *: "Ořezová frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -1144,16 +1087,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centrální frekvence"
+    *: "Centrální frekvence"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centrální frekvence"
+    *: "Centrální frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -1161,16 +1101,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1178,19 +1115,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Kolísání"
-    lcd_bitmap: "Kolísání"
+    *: "Kolísání"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kolísání"
-    : "Kolísání"
+    *: "Kolísání"
   </voice>
 </phrase>
 <phrase>
@@ -1734,16 +1665,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Odstranit lupání"
+    *: "Odstranit lupání"
   </dest>
   <voice>
-    *: none
-    swcodec: "Odstranit lupání"
+    *: "Odstranit lupání"
   </voice>
 </phrase>
 <phrase>
@@ -1821,16 +1749,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pípnutí při posunu po skladbách"
+    *: "Pípnutí při posunu po skladbách"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pípnutí při posunu po skladbách"
+    *: "Pípnutí při posunu po skladbách"
   </voice>
 </phrase>
 <phrase>
@@ -1838,16 +1763,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Nízká"
+    *: "Nízká"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nízká"
+    *: "Nízká"
   </voice>
 </phrase>
 <phrase>
@@ -1855,16 +1777,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Střední"
+    *: "Střední"
   </dest>
   <voice>
-    *: none
-    swcodec: "Střední"
+    *: "Střední"
   </voice>
 </phrase>
 <phrase>
@@ -1872,16 +1791,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Vysoká"
+    *: "Vysoká"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vysoká"
+    *: "Vysoká"
   </voice>
 </phrase>
 <phrase>
@@ -2238,21 +2154,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Vytvářím databázi... %d nalezeno (OFF pro návrat)"
-    iriverh100,iriverh120,iriverh300: "Vytvářím databázi... %d nalezeno (STOP pro návrat)"
-    ipod*: "Vytvářím databázi... %d nalezeno (PREV pro návrat)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Vytvářím databázi... %d nalezeno (LEFT pro návrat)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Vytvářím databázi... %d nalezeno (PREV pro návrat)"
-    gogearsa9200: "Vytvářím databázi.. %d nalezeno (REW pro návrat)"
     archosplayer: "Vytvář. DB %d nalez."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Vytvářím databázi... %d nalezeno (LEFT pro návrat)"
+    gogearsa9200: "Vytvářím databázi.. %d nalezeno (REW pro návrat)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Vytvářím databázi... %d nalezeno (PREV pro návrat)"
+    iriverh100,iriverh120,iriverh300: "Vytvářím databázi... %d nalezeno (STOP pro návrat)"
   </dest>
   <voice>
     *: "Vytváření záznamů do databáze"
@@ -2434,16 +2348,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -2599,7 +2510,7 @@
   </dest>
   <voice>
     *: "První stisk klávesy pouze zapne podsvícení"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
@@ -2705,16 +2616,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vzhůru nohama"
+    *: "Vzhůru nohama"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vzhůru nohama"
+    *: "Vzhůru nohama"
   </voice>
 </phrase>
 <phrase>
@@ -2722,16 +2630,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kurzor"
+    *: "Kurzor"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kurzor"
+    *: "Kurzor"
   </voice>
 </phrase>
 <phrase>
@@ -2739,16 +2644,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Šipka"
+    *: "Šipka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šipka"
+    *: "Šipka"
   </voice>
 </phrase>
 <phrase>
@@ -2756,16 +2658,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Inverzní kurzor"
+    *: "Inverzní kurzor"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverzní kurzor"
+    *: "Inverzní kurzor"
   </voice>
 </phrase>
 <phrase>
@@ -3055,16 +2954,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rolování obrazovky mimo"
+    *: "Rolování obrazovky mimo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rolování obrazovky mimo"
+    *: "Rolování obrazovky mimo"
   </voice>
 </phrase>
 <phrase>
@@ -3072,16 +2968,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Krok rolování obrazovky"
+    *: "Krok rolování obrazovky"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Krok rolování obrazovky"
+    *: "Krok rolování obrazovky"
   </voice>
 </phrase>
 <phrase>
@@ -3137,16 +3030,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stavový panel/Posuvník"
+    *: "Stavový panel/Posuvník"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stavový panel a posuvník"
+    *: "Stavový panel a posuvník"
   </voice>
 </phrase>
 <phrase>
@@ -3154,16 +3044,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posuvník"
+    *: "Posuvník"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posuvník"
+    *: "Posuvník"
   </voice>
 </phrase>
 <phrase>
@@ -3171,16 +3058,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stavový panel"
+    *: "Stavový panel"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stavový panel"
+    *: "Stavový panel"
   </voice>
 </phrase>
 <phrase>
@@ -3205,16 +3089,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukazatel hlasitosti"
+    *: "Ukazatel hlasitosti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukazatel hlasitosti"
+    *: "Ukazatel hlasitosti"
   </voice>
 </phrase>
 <phrase>
@@ -3222,16 +3103,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukazatel baterie"
+    *: "Ukazatel baterie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukazatel baterie"
+    *: "Ukazatel baterie"
   </voice>
 </phrase>
 <phrase>
@@ -3239,16 +3117,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafický"
+    *: "Grafický"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafický"
+    *: "Grafický"
   </voice>
 </phrase>
 <phrase>
@@ -3256,16 +3131,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerický"
+    *: "Numerický"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerický"
+    *: "Numerický"
   </voice>
 </phrase>
 <phrase>
@@ -3485,16 +3357,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrejské (ISO-8859-8)"
+    *: "Hebrejské (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrejské"
+    *: "Hebrejské"
   </voice>
 </phrase>
 <phrase>
@@ -3516,16 +3385,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thajské (ISO-8859-11)"
+    *: "Thajské (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thajské"
+    *: "Thajské"
   </voice>
 </phrase>
 <phrase>
@@ -3533,16 +3399,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabské (CP1256)"
+    *: "Arabské (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabské"
+    *: "Arabské"
   </voice>
 </phrase>
 <phrase>
@@ -3578,16 +3441,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonské (SJIS)"
+    *: "Japonské (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonské"
+    *: "Japonské"
   </voice>
 </phrase>
 <phrase>
@@ -3595,16 +3455,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zjednodušená čínština (GB2312)"
+    *: "Zjednodušená čínština (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zjednodušená čínština"
+    *: "Zjednodušená čínština"
   </voice>
 </phrase>
 <phrase>
@@ -3612,16 +3469,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korejské (KSX1001)"
+    *: "Korejské (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korejské"
+    *: "Korejské"
   </voice>
 </phrase>
 <phrase>
@@ -3629,16 +3483,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tradiční čínština (BIG5)"
+    *: "Tradiční čínština (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tradiční čínština"
+    *: "Tradiční čínština"
   </voice>
 </phrase>
 <phrase>
@@ -3662,17 +3513,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Časový limit osvětlení tlačítka"
-    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
+    sansae200*,sansafuze*: "Časový limit osvětlení kolečka"
   </dest>
   <voice>
     *: none
     button_light: "Časový limit osvětlení tlačítka"
-    sansafuze*,sansae200*: "Časový limit osvětlení kolečka"
+    sansae200*,sansafuze*: "Časový limit osvětlení kolečka"
   </voice>
 </phrase>
 <phrase>
@@ -3943,27 +3794,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Nastavit"
-    mrobe500: "HEART = Nastavit"
-    iriverh100,iriverh120,iriverh300: "NAVI = Nastavit"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Nastavit"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Nastavit"
     gogearsa9200,samsungyh*: "PLAY = Nastavit"
-    vibe500: "OK = Nastavit"
+    iriverh100,iriverh120,iriverh300: "NAVI = Nastavit"
     mpiohd300: "ENTER = Nastavit"
+    mrobe500: "HEART = Nastavit"
+    rtc: "ON = Nastavit"
+    vibe500: "OK = Nastavit"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3972,39 +3823,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Vrátit zpět"
-    mrobe500: "POWER = Vrátit zpět"
-    iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět"
-    ipod*,sansac200*,mpiohd300: "MENU = Vrátit zpět"
-    iaudiox5,iaudiom5: "RECORD = Vrátit zpět"
+    gigabeatfx,mrobe500: "POWER = Vrátit zpět"
+    gigabeats,sansafuzeplus: "BACK = Vrátit zpět"
+    gogearsa9200: "LEFT = Vrátit zpět"
+    iaudiom5,iaudiox5: "RECORD = Vrátit zpět"
+    ipod*,mpiohd300,sansac200*: "MENU = Vrátit zpět"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátit zpět"
-    gigabeatfx: "POWER = Vrátit zpět"
-    sansafuzeplus: "BACK = Vrátit zpět"
+    iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět"
     mrobe100: "DISPLAY = Vrátit zpět"
-    gigabeats: "BACK = Vrátit zpět"
-    gogearsa9200: "LEFT = Vrátit zpět"
-    vibe500: "CANCEL = Vrátit zpět"
+    rtc: "OFF = Vrátit zpět"
     samsungyh*: "REW = Vrátit zpět"
+    vibe500: "CANCEL = Vrátit zpět"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4507,22 +4354,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nastavit OFF=Storno"
+    gigabeats: "SELECT=Nastavit POWER=Storno"
     ipod*: "SELECT=Nastavit MENU=Storno"
     iriverh10,iriverh10_5gb: "SELECT=Nastavit PREV=Storno"
-    gigabeats: "SELECT=Nastavit POWER=Storno"
-    vibe500: "OK=Nastavit C=Storno"
     mpiohd300: "ENTER=Nastavit MENU=Storno"
     sansafuzeplus: "SELECT=Nastavit  BACK=Storno"
+    vibe500: "OK=Nastavit C=Storno"
   </dest>
   <voice>
     *: none
@@ -5627,15 +5474,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvence"
+    play_frequency,recording: "Frekvence"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvence"
+    play_frequency,recording: "Frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -5678,18 +5525,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofón"
     iriverh100,iriverh120,iriverh300: "Interní mikrofón"
+    recording: "Mikrofón"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofón"
     iriverh100,iriverh120,iriverh300: "Interní mikrofón"
+    recording: "Mikrofón"
   </voice>
 </phrase>
 <phrase>
@@ -6584,13 +6431,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Baterie: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Stav baterie"
@@ -6647,24 +6494,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "paměťová karta em em cé"
     multivolume: "hárdisk há dé 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "paměťová karta mikro es dé"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "paměťová karta mikro es dé"
     xduoox3: "paměťová karta mikro es dé 2"
-    archosondio*: "paměťová karta em em cé"
   </voice>
 </phrase>
 <phrase>
@@ -7671,7 +7518,7 @@
   <voice>
     *: none
     pitchscreen: "Rychlost"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: VOICE_PITCH_ABSOLUTE_MODE
@@ -8030,23 +7877,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disk je plný. Pro pokračování stiskněte OFF."
-    iriverh100,iriverh120,iriverh300: "Disk je plný. Pro pokračování stiskněte STOP."
     iaudiom5,iaudiox5: "Disk je plný. Pro pokračování stiskněte POWER."
-    sansae200*,sansac200*,vibe500: "Disk je plný. Pro pokračování stiskněte PREV."
+    iriverh100,iriverh120,iriverh300: "Disk je plný. Pro pokračování stiskněte STOP."
+    recording: "Disk je plný. Pro pokračování stiskněte OFF."
     samsungyh*: "Disk je plný. Pro pokračování stiskněte LEFT."
+    sansac200*,sansae200*,vibe500: "Disk je plný. Pro pokračování stiskněte PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8134,23 +7981,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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í"
-    gigabeats: "BACK pro zrušení"
     gigabeatfx: "POWER pro zrušení"
-    sansafuzeplus: "BACK pro zrušení"
+    gigabeats,sansafuzeplus: "BACK pro zrušení"
+    iaudiom5,iaudiox5: "Dlouhé PLAY pro zrušení"
+    ipod*: "PLAY/PAUSE pro zrušení"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV pro zrušení"
+    iriverh100,iriverh120,iriverh300: "STOP pro zrušení"
   </dest>
   <voice>
     *: ""
@@ -9702,7 +9547,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "soubor kjůšít, "
@@ -9744,16 +9589,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Režim: %s %s"
+    *: "Režim: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9761,16 +9603,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Oříznutí"
+    *: "Oříznutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Oříznutí frekvence"
+    *: "Oříznutí frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -9778,16 +9617,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zesílení"
+    *: "Zesílení"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zesílení"
+    *: "Zesílení"
   </voice>
 </phrase>
 <phrase>
@@ -9795,16 +9631,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Režim:"
+    *: "Režim:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10433,7 +10266,7 @@
     multivolume: "Není"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10467,15 +10300,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Oříznutí basů"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Oříznutí basů"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí basů"
   </voice>
 </phrase>
 <phrase>
@@ -10484,15 +10317,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Oříznutí výšek"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Oříznutí výšek"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Oříznutí výšek"
   </voice>
 </phrase>
 <phrase>
@@ -10528,16 +10361,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Kliknutí"
+    *: "Kliknutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kliknutí"
+    *: "Kliknutí"
   </voice>
 </phrase>
 <phrase>
@@ -10545,16 +10375,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Opakování kliknutí"
+    *: "Opakování kliknutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opakování kliknutí"
+    *: "Opakování kliknutí"
   </voice>
 </phrase>
 <phrase>
@@ -10675,11 +10502,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Bitrate sériového portu"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Bitrejt sériového portu"
   </voice>
@@ -10692,11 +10519,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatycký"
   </voice>
@@ -10709,11 +10536,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10726,11 +10553,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10743,11 +10570,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10760,11 +10587,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11287,16 +11114,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Čas úseku"
+    *: "Čas úseku"
   </dest>
   <voice>
-    *: none
-    swcodec: "Čas úseku"
+    *: "Čas úseku"
   </voice>
 </phrase>
 <phrase>
@@ -11304,16 +11128,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Rychlost"
+    *: "Rychlost"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rychlost"
+    *: "Rychlost"
   </voice>
 </phrase>
 <phrase>
@@ -11414,7 +11235,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11461,7 +11282,7 @@
   <voice>
     *: none
     pitchscreen: "Rychlost"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_USB_KEYPAD_MODE
@@ -11567,16 +11388,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Šířka přetáčecí lišty"
+    *: "Šířka přetáčecí lišty"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šířka přetáčecí lišty"
+    *: "Šířka přetáčecí lišty"
   </voice>
 </phrase>
 <phrase>
@@ -11584,16 +11402,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pozice přetáčecí lišty"
+    *: "Pozice přetáčecí lišty"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pozice přetáčecí lišty"
+    *: "Pozice přetáčecí lišty"
   </voice>
 </phrase>
 <phrase>
@@ -11601,16 +11416,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </voice>
 </phrase>
 <phrase>
@@ -11669,16 +11481,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Prahová hodnota"
+    *: "Prahová hodnota"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prahová hodnota"
+    *: "Prahová hodnota"
   </voice>
 </phrase>
 <phrase>
@@ -11686,16 +11495,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Poměr"
+    *: "Poměr"
   </dest>
   <voice>
-    *: none
-    swcodec: "Poměr"
+    *: "Poměr"
   </voice>
 </phrase>
 <phrase>
@@ -11703,16 +11509,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "dvě ku jedné"
+    *: "dvě ku jedné"
   </voice>
 </phrase>
 <phrase>
@@ -11720,16 +11523,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "čtyři ku jedné"
+    *: "čtyři ku jedné"
   </voice>
 </phrase>
 <phrase>
@@ -11737,16 +11537,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "šest ku jedné"
+    *: "šest ku jedné"
   </voice>
 </phrase>
 <phrase>
@@ -11754,16 +11551,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "deset ku jedné"
+    *: "deset ku jedné"
   </voice>
 </phrase>
 <phrase>
@@ -11771,16 +11565,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11788,16 +11579,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Úprava zesílení"
+    *: "Úprava zesílení"
   </dest>
   <voice>
-    *: none
-    swcodec: "Úprava zesílení"
+    *: "Úprava zesílení"
   </voice>
 </phrase>
 <phrase>
@@ -11805,16 +11593,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automaticky"
+    *: "Automaticky"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatycky"
+    *: "Automatycky"
   </voice>
 </phrase>
 <phrase>
@@ -11822,16 +11607,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ohnutí"
+    *: "Ohnutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ohnutí"
+    *: "Ohnutí"
   </voice>
 </phrase>
 <phrase>
@@ -11839,16 +11621,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Tvrdé ohnutí"
+    *: "Tvrdé ohnutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tvrdé ohnutí"
+    *: "Tvrdé ohnutí"
   </voice>
 </phrase>
 <phrase>
@@ -11856,16 +11635,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Měkké ohnutí"
+    *: "Měkké ohnutí"
   </dest>
   <voice>
-    *: none
-    swcodec: "Měkké ohnutí"
+    *: "Měkké ohnutí"
   </voice>
 </phrase>
 <phrase>
@@ -11873,16 +11649,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Uvolnit čas"
+    *: "Uvolnit čas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Uvolnit čas"
+    *: "Uvolnit čas"
   </voice>
 </phrase>
 <phrase>
@@ -12004,7 +11777,7 @@
   <voice>
     *: none
     morse_input: "Používat vstup morseovkou"
-</voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_AUTOTRACKSKIP
@@ -12070,16 +11843,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Základní vzhled"
+    *: "Základní vzhled"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Základní vzhled"
+    *: "Základní vzhled"
   </voice>
 </phrase>
 <phrase>
@@ -12087,16 +11857,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Základní dálkový vzhled"
+    *: "Základní dálkový vzhled"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Základní dálkový vzhled"
+    *: "Základní dálkový vzhled"
   </voice>
 </phrase>
 <phrase>
@@ -12223,16 +11990,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Přetočit zpět před pokračováním v přehrávání"
+    *: "Přetočit zpět před pokračováním v přehrávání"
   </dest>
   <voice>
-    *: none
-    swcodec: "Přetočit zpět před pokračováním v přehrávání"
+    *: "Přetočit zpět před pokračováním v přehrávání"
   </voice>
 </phrase>
 <phrase>
@@ -12624,7 +12388,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12992,16 +12756,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Jednoduchý (Meier)"
+    *: "Jednoduchý (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Jednoduchý"
+    *: "Jednoduchý"
   </voice>
 </phrase>
 <phrase>
@@ -13037,16 +12798,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Vlastní"
+    *: "Vlastní"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vlastní"
+    *: "Vlastní"
   </voice>
 </phrase>
 <phrase>
@@ -13429,7 +13187,7 @@
   </dest>
   <voice>
     *: "Pauza mezi skladbami"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_BTN_LONG_PRESS_DURATION
@@ -13520,16 +13278,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hrát Wormlet!"
+    *: "Hrát Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hrát Wormlet"
+    *: "Hrát Wormlet"
   </voice>
 </phrase>
 <phrase>
@@ -13537,16 +13292,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Počet červů"
+    *: "Počet červů"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Počet červů"
+    *: "Počet červů"
   </voice>
 </phrase>
 <phrase>
@@ -13554,16 +13306,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Růst červa podle jídla"
+    *: "Růst červa podle jídla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Růst červa podle jídla"
+    *: "Růst červa podle jídla"
   </voice>
 </phrase>
 <phrase>
@@ -13571,16 +13320,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rychlost červa"
+    *: "Rychlost červa"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rychlost červa"
+    *: "Rychlost červa"
   </voice>
 </phrase>
 <phrase>
@@ -13588,16 +13334,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hněv podle jídla"
+    *: "Hněv podle jídla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hněv podle jídla"
+    *: "Hněv podle jídla"
   </voice>
 </phrase>
 <phrase>
@@ -13605,16 +13348,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Velikost hněvu"
+    *: "Velikost hněvu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Velikost hněvu"
+    *: "Velikost hněvu"
   </voice>
 </phrase>
 <phrase>
@@ -13622,16 +13362,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Velikost jídla"
+    *: "Velikost jídla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Velikost jídla"
+    *: "Velikost jídla"
   </voice>
 </phrase>
 <phrase>
@@ -13681,16 +13418,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Šachmat !"
+    *: "Šachmat !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šachmat"
+    *: "Šachmat"
   </voice>
 </phrase>
 <phrase>
@@ -13698,16 +13432,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nedovolený tah !"
+    *: "Nedovolený tah !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nedovolený tah"
+    *: "Nedovolený tah"
   </voice>
 </phrase>
 <phrase>
@@ -13715,16 +13446,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nová hra"
+    *: "Nová hra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nová hra"
+    *: "Nová hra"
   </voice>
 </phrase>
 <phrase>
@@ -13732,16 +13460,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pozastavit hru"
+    *: "Pozastavit hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pozastavit hru"
+    *: "Pozastavit hru"
   </voice>
 </phrase>
 <phrase>
@@ -13749,16 +13474,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Uložit hru"
+    *: "Uložit hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Uložit hru"
+    *: "Uložit hru"
   </voice>
 </phrase>
 <phrase>
@@ -13766,16 +13488,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Obnovit hru"
+    *: "Obnovit hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obnovit hru"
+    *: "Obnovit hru"
   </voice>
 </phrase>
 <phrase>
@@ -13783,16 +13502,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobrazit již hrané hry"
+    *: "Zobrazit již hrané hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobrazit již hrané hry"
+    *: "Zobrazit již hrané hry"
   </voice>
 </phrase>
 <phrase>
@@ -13800,16 +13516,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restartovat hru"
+    *: "Restartovat hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restartovat hru"
+    *: "Restartovat hru"
   </voice>
 </phrase>
 <phrase>
@@ -13817,16 +13530,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zvolit jinou hru"
+    *: "Zvolit jinou hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zvolit jinou hru"
+    *: "Zvolit jinou hru"
   </voice>
 </phrase>
 <phrase>
@@ -13834,16 +13544,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 1: 60 tahů / 5 minut"
+    *: "Úroveň 1: 60 tahů / 5 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 1, 60 tahů za 5 minut"
+    *: "Úroveň 1, 60 tahů za 5 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13851,16 +13558,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 2: 60 tahů / 15 minut"
+    *: "Úroveň 2: 60 tahů / 15 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 2, 60 tahů za 15 minut"
+    *: "Úroveň 2, 60 tahů za 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13868,16 +13572,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 3: 60 tahů / 30 minut"
+    *: "Úroveň 3: 60 tahů / 30 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 3, 60 tahů za 30 minut"
+    *: "Úroveň 3, 60 tahů za 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13885,16 +13586,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 4: 40 tahů / 30 minut"
+    *: "Úroveň 4: 40 tahů / 30 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 4, 40 tahů za 30 minut"
+    *: "Úroveň 4, 40 tahů za 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13902,16 +13600,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 5: 40 tahů / 60 minut"
+    *: "Úroveň 5: 40 tahů / 60 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 5, 40 tahů za 60 minut"
+    *: "Úroveň 5, 40 tahů za 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13919,16 +13614,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 6: 40 tahů / 120 minut"
+    *: "Úroveň 6: 40 tahů / 120 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 6, 40 tahů za 120 minut"
+    *: "Úroveň 6, 40 tahů za 120 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13936,16 +13628,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 7: 40 tahů / 240 minut"
+    *: "Úroveň 7: 40 tahů / 240 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 7, 40 tahů za 240 minut"
+    *: "Úroveň 7, 40 tahů za 240 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13953,16 +13642,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 8: 1 tah / 15 minut"
+    *: "Úroveň 8: 1 tah / 15 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 8, jeden tah za 15 minut"
+    *: "Úroveň 8, jeden tah za 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13970,16 +13656,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 9: 1 tah / 60 minut"
+    *: "Úroveň 9: 1 tah / 60 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 9, jeden tah za 60 minut"
+    *: "Úroveň 9, jeden tah za 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13987,16 +13670,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 10: 1 tah / 600 minut"
+    *: "Úroveň 10: 1 tah / 600 minut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 10, jeden tah za 600 minut"
+    *: "Úroveň 10, jeden tah za 600 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14004,16 +13684,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chyba při analýze hry !"
+    *: "Chyba při analýze hry !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chyba při analýze hry"
+    *: "Chyba při analýze hry"
   </voice>
 </phrase>
 <phrase>
@@ -14021,16 +13698,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nenalezeny žádné hry !"
+    *: "Nenalezeny žádné hry !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nenalezeny žádné hry"
+    *: "Nenalezeny žádné hry"
   </voice>
 </phrase>
 <phrase>
@@ -14038,16 +13712,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Na začátku hry"
+    *: "Na začátku hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Na začátku hry"
+    *: "Na začátku hry"
   </voice>
 </phrase>
 <phrase>
@@ -14055,16 +13726,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Na konci hry"
+    *: "Na konci hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Na konci hry"
+    *: "Na konci hry"
   </voice>
 </phrase>
 <phrase>
@@ -14072,16 +13740,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hráč"
+    *: "Hráč"
   </voice>
 </phrase>
 <phrase>
@@ -14089,16 +13754,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gé eN ú šachy"
+    *: "Gé eN ú šachy"
   </voice>
 </phrase>
 <phrase>
@@ -14106,16 +13768,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Označeno"
+    *: "Označeno"
   </voice>
 </phrase>
 <phrase>
@@ -14123,16 +13782,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Neoznačeno"
+    *: "Neoznačeno"
   </voice>
 </phrase>
 <phrase>
@@ -14140,16 +13796,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bílý"
+    *: "Bílý"
   </voice>
 </phrase>
 <phrase>
@@ -14157,16 +13810,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Černý"
+    *: "Černý"
   </voice>
 </phrase>
 <phrase>
@@ -14174,16 +13824,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šach"
+    *: "Šach"
   </voice>
 </phrase>
 <phrase>
@@ -14191,16 +13838,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "sebrání"
+    *: "sebrání"
   </voice>
 </phrase>
 <phrase>
@@ -14208,16 +13852,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rošáda"
+    *: "Rošáda"
   </voice>
 </phrase>
 <phrase>
@@ -14225,16 +13866,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Strana krále"
+    *: "Strana krále"
   </voice>
 </phrase>
 <phrase>
@@ -14242,16 +13880,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Strana královny"
+    *: "Strana královny"
   </voice>
 </phrase>
 <phrase>
@@ -14259,16 +13894,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pěšec"
+    *: "Pěšec"
   </voice>
 </phrase>
 <phrase>
@@ -14276,16 +13908,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Jezdec"
+    *: "Jezdec"
   </voice>
 </phrase>
 <phrase>
@@ -14293,16 +13922,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Střelec"
+    *: "Střelec"
   </voice>
 </phrase>
 <phrase>
@@ -14310,16 +13936,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Věž"
+    *: "Věž"
   </voice>
 </phrase>
 <phrase>
@@ -14327,16 +13950,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Královna"
+    *: "Královna"
   </voice>
 </phrase>
 <phrase>
@@ -14344,16 +13964,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Král"
+    *: "Král"
   </voice>
 </phrase>
 <phrase>
@@ -14371,7 +13988,7 @@
   </voice>
 </phrase>
 <phrase>
-id: VOICE_BAT_BENCH_KEYS
+  id: VOICE_BAT_BENCH_KEYS
   desc: Battery bench start up message
   user: core
   <source>
@@ -14431,19 +14048,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Možnosti audia"
+    *: "Možnosti audia"
     lowmem: none
   </dest>
   <voice>
-    *: none
+    *: "Možnosti audia"
     lowmem: none
-    swcodec: "Možnosti audia"
   </voice>
 </phrase>
 <phrase>
@@ -14451,18 +14065,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Možnosti pokračování v přehrávání"
+    *: "Možnosti pokračování v přehrávání"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Možnosti pokračování v přehrávání"
+    *: "Možnosti pokračování v přehrávání"
     lowmem: none
   </voice>
 </phrase>
@@ -14471,18 +14082,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Režim přehrávání"
+    *: "Režim přehrávání"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Režim přehrávání"
+    *: "Režim přehrávání"
     lowmem: none
   </voice>
 </phrase>
@@ -14491,18 +14099,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Jednou"
+    *: "Jednou"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Jednou"
+    *: "Jednou"
     lowmem: none
   </voice>
 </phrase>
@@ -14511,18 +14116,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Použít nastavení zvuku"
+    *: "Použít nastavení zvuku"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Použít nastavení zvuku"
+    *: "Použít nastavení zvuku"
     lowmem: none
   </voice>
 </phrase>
@@ -14531,18 +14133,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Přehrávat od začátku"
+    *: "Přehrávat od začátku"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Přehrávat od začátku"
+    *: "Přehrávat od začátku"
     lowmem: none
   </voice>
 </phrase>
@@ -14551,18 +14150,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Čas pro pokračování v přehr.(min)"
+    *: "Čas pro pokračování v přehr.(min)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Čas pro pokračování v přehrávání"
+    *: "Čas pro pokračování v přehrávání"
     lowmem: none
   </voice>
 </phrase>
@@ -14571,18 +14167,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
+    *: "Display FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Zobrazit FPS"
+    *: "Zobrazit FPS"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Zobrazit eF Pé eS"
+    *: "Zobrazit eF Pé eS"
     lowmem: none
   </voice>
 </phrase>
@@ -14591,18 +14184,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit eF Pé eS"
+    *: "Limit eF Pé eS"
     lowmem: none
   </voice>
 </phrase>
@@ -14611,18 +14201,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Přeskakovat frejmy"
+    *: "Přeskakovat frejmy"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Přeskakovat frejmy"
+    *: "Přeskakovat frejmy"
     lowmem: none
   </voice>
 </phrase>
@@ -14631,18 +14218,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Jas podsvícení"
+    *: "Jas podsvícení"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Jas podsvícení"
+    *: "Jas podsvícení"
     lowmem: none
   </voice>
 </phrase>
@@ -14651,18 +14235,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Použít výchozí nastavení"
+    *: "Použít výchozí nastavení"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Použít výchozí nastavení"
+    *: "Použít výchozí nastavení"
     lowmem: none
   </voice>
 </phrase>
@@ -14671,18 +14252,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Regulace tónu"
+    *: "Regulace tónu"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Regulace tónu"
+    *: "Regulace tónu"
     lowmem: none
   </voice>
 </phrase>
@@ -14691,18 +14269,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Zapnout menu"
+    *: "Zapnout menu"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Zapnout menu"
+    *: "Zapnout menu"
     lowmem: none
   </voice>
 </phrase>
@@ -14711,18 +14286,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Pokud není dokončeno tak zapnout menu"
+    *: "Pokud není dokončeno tak zapnout menu"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Pokud není dokončeno tak zapnout menu"
+    *: "Pokud není dokončeno tak zapnout menu"
     lowmem: none
   </voice>
 </phrase>
@@ -14731,18 +14303,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Automatické pokračování v přehrávání"
+    *: "Automatické pokračování v přehrávání"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatické pokračování v přehrávání"
+    *: "Automatické pokračování v přehrávání"
     lowmem: none
   </voice>
 </phrase>
@@ -14751,18 +14320,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Smazat všechny pokračování v přehrávání"
+    *: "Smazat všechny pokračování v přehrávání"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Smazat všechny pokračování v přehrávání"
+    *: "Smazat všechny pokračování v přehrávání"
     lowmem: none
   </voice>
 </phrase>
@@ -14771,18 +14337,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Nedostupné"
+    *: "Nedostupné"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Nedostupné"
+    *: "Nedostupné"
     lowmem: none
   </voice>
 </phrase>
@@ -14791,16 +14354,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nelze spustit přehrávání"
+    *: "Nelze spustit přehrávání"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nelze spustit přehrávání"
+    *: "Nelze spustit přehrávání"
   </voice>
 </phrase>
 <phrase>
@@ -14808,16 +14368,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Uspořádaný"
+    *: "Uspořádaný"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Uspořádaný"
+    *: "Uspořádaný"
   </voice>
 </phrase>
 <phrase>
@@ -14825,16 +14382,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rozházený"
+    *: "Rozházený"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rozházený"
+    *: "Rozházený"
   </voice>
 </phrase>
 <phrase>
@@ -14842,16 +14396,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "V odstínech šedi"
+    *: "V odstínech šedi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "V odstínech šedi"
+    *: "V odstínech šedi"
   </voice>
 </phrase>
 <phrase>
@@ -14859,16 +14410,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Přepnout na režim prezentace"
+    *: "Přepnout na režim prezentace"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Přepnout na režim prezentace"
+    *: "Přepnout na režim prezentace"
   </voice>
 </phrase>
 <phrase>
@@ -14876,16 +14424,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Čas prezentace"
+    *: "Čas prezentace"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Čas prezentace"
+    *: "Čas prezentace"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 11efc7e9f6..f215e897b9 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -625,16 +625,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Sammenbland højre og venstre kanal"
+    *: "Sammenbland højre og venstre kanal"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sammenbland højre og venstre kanal"
+    *: "Sammenbland højre og venstre kanal"
   </voice>
 </phrase>
 <phrase>
@@ -1043,16 +1040,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Bip ved sangskift"
+    *: "Bip ved sangskift"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bip ved sangskift"
+    *: "Bip ved sangskift"
   </voice>
 </phrase>
 <phrase>
@@ -1060,16 +1054,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Svag"
+    *: "Svag"
   </dest>
   <voice>
-    *: none
-    swcodec: "Svag"
+    *: "Svag"
   </voice>
 </phrase>
 <phrase>
@@ -1077,16 +1068,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Middel"
+    *: "Middel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Middel"
+    *: "Middel"
   </voice>
 </phrase>
 <phrase>
@@ -1094,16 +1082,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Høj"
+    *: "Høj"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høj"
+    *: "Høj"
   </voice>
 </phrase>
 <phrase>
@@ -1324,16 +1309,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skrifttype"
+    *: "Skrifttype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skrifttype"
+    *: "Skrifttype"
   </voice>
 </phrase>
 <phrase>
@@ -1417,16 +1399,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status- og rulle-bjælke"
+    *: "Status- og rulle-bjælke"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- og rulle-bjælke"
+    *: "Status- og rulle-bjælke"
   </voice>
 </phrase>
 <phrase>
@@ -1493,16 +1472,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebræisk (ISO-8859-8)"
+    *: "Hebræisk (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebræisk"
+    *: "Hebræisk"
   </voice>
 </phrase>
 <phrase>
@@ -1524,16 +1500,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -1541,16 +1514,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisk (CP1256)"
+    *: "Arabisk (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabisk"
+    *: "Arabisk"
   </voice>
 </phrase>
 <phrase>
@@ -1586,16 +1556,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japansk (SJIS)"
+    *: "Japansk (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japansk"
+    *: "Japansk"
   </voice>
 </phrase>
 <phrase>
@@ -1603,16 +1570,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simplificeret kinesisk (GB2312)"
+    *: "Simplificeret kinesisk (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplificeret kinesisk"
+    *: "Simplificeret kinesisk"
   </voice>
 </phrase>
 <phrase>
@@ -1620,16 +1584,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreansk (KSX1001)"
+    *: "Koreansk (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreansk"
+    *: "Koreansk"
   </voice>
 </phrase>
 <phrase>
@@ -1637,16 +1598,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tradiotionel kinesisk (BIG5)"
+    *: "Tradiotionel kinesisk (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditionel kinesisk"
+    *: "Traditionel kinesisk"
   </voice>
 </phrase>
 <phrase>
@@ -1992,15 +1950,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </voice>
 </phrase>
 <phrase>
@@ -2026,18 +1984,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2294,16 +2252,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Undgå klipning"
+    *: "Undgå klipning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Undgå klipning"
+    *: "Undgå klipning"
   </voice>
 </phrase>
 <phrase>
@@ -2525,16 +2480,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "På hovedet"
+    *: "På hovedet"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "På hovedet"
+    *: "På hovedet"
   </voice>
 </phrase>
 <phrase>
@@ -2542,16 +2494,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Linjevælger"
+    *: "Linjevælger"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Linjevælger"
+    *: "Linjevælger"
   </voice>
 </phrase>
 <phrase>
@@ -2559,16 +2508,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Markør"
+    *: "Markør"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Markør"
+    *: "Markør"
   </voice>
 </phrase>
 <phrase>
@@ -2576,16 +2522,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Inverteret bjælke"
+    *: "Inverteret bjælke"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverteret bjælke"
+    *: "Inverteret bjælke"
   </voice>
 </phrase>
 <phrase>
@@ -2694,16 +2637,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullebjælke"
+    *: "Rullebjælke"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullebjælke"
+    *: "Rullebjælke"
   </voice>
 </phrase>
 <phrase>
@@ -2711,16 +2651,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status bjælke"
+    *: "Status bjælke"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status bjælke"
+    *: "Status bjælke"
   </voice>
 </phrase>
 <phrase>
@@ -2745,16 +2682,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lydstyrkevisning"
+    *: "Lydstyrkevisning"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lydstyrkevisning"
+    *: "Lydstyrkevisning"
   </voice>
 </phrase>
 <phrase>
@@ -2762,16 +2696,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batteriindikator"
+    *: "Batteriindikator"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batteriindikator"
+    *: "Batteriindikator"
   </voice>
 </phrase>
 <phrase>
@@ -2779,16 +2710,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </voice>
 </phrase>
 <phrase>
@@ -2796,16 +2724,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </voice>
 </phrase>
 <phrase>
@@ -3523,18 +3448,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dt %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dt %dm"
     iriverifp7xx: "%d%% %dt %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Batteri niveau"
-    iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    ipodmini1g,ipodmini2g,iriverh10,iriverifp7xx: ""
   </voice>
 </phrase>
 <phrase>
@@ -3588,24 +3512,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimedie kort"
     multivolume: "Hard disk 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Mikro SD kort"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Mikro SD kort"
     xduoox3: "Mikro SD kort 2"
-    archosondio*: "Multimedie kort"
   </voice>
 </phrase>
 <phrase>
@@ -3735,34 +3659,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "SLUK = Fortryd"
-    mrobe500: "TÆND/SLUK = Fortryd"
-    iriverh100,iriverh120,iriverh300: "STOP = Fortryd"
-    ipod*,sansac200*,mpiohd300: "MENU = Fortryd"
-    iaudiox5,iaudiom5: "OPTAG = Fortryd"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd"
-    gigabeatfx: "TÆND/SLUK = Fortryd"
-    mrobe100: "VIS = Fortryd"
+    gigabeatfx,mrobe500: "TÆND/SLUK = Fortryd"
     gigabeats: "TILBAGE = Fortryd"
     gogearsa9200: "VENSTRE = Fortryd"
-    vibe500: "C = Fortryd"
+    iaudiom5,iaudiox5: "OPTAG = Fortryd"
+    ipod*,mpiohd300,sansac200*: "MENU = Fortryd"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd"
+    iriverh100,iriverh120,iriverh300: "STOP = Fortryd"
+    mrobe100: "VIS = Fortryd"
+    rtc: "SLUK = Fortryd"
     samsungyh*: "REW = Fortryd"
+    vibe500: "C = Fortryd"
   </dest>
   <voice>
     *: none
@@ -3808,26 +3729,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disken er fuld. Tryk SLUK for at fortsætte."
-    iriverh100,iriverh120,iriverh300: "Disken er fuld. Tryk STOP for at fortsætte."
     iaudiom5,iaudiox5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte."
-    sansae200*,sansac200*,vibe500: "Disken er fuld. Tryk FORRIGE for at fortsætte."
+    iriverh100,iriverh120,iriverh300: "Disken er fuld. Tryk STOP for at fortsætte."
+    recording: "Disken er fuld. Tryk SLUK for at fortsætte."
     samsungyh*: "Disken er fuld. Tryk LEFT for at fortsætte."
+    sansac200*,sansae200*,vibe500: "Disken er fuld. Tryk FORRIGE for at fortsætte."
   </dest>
   <voice>
     *: none
-    recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3990,29 +3908,26 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPIL=Sæt SLUK=Annuller"
+    gigabeats: "VÆLG=Sæt TÆND/SLUK=Annuller"
     ipod*: "VÆLG=Sæt MENU=Annuller"
     iriverh10,iriverh10_5gb: "VÆLG=Sæt FORRIGE=Annuller"
-    gigabeats: "VÆLG=Sæt TÆND/SLUK=Annuller"
-    vibe500: "OK=Sæt C=Annuller"
     mpiohd300: "ENTER=Sæt MENU=Annuller"
     sansafuzeplus: "SELECT=Sæt  BACK=Annuller"
+    vibe500: "OK=Sæt C=Annuller"
   </dest>
   <voice>
     *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -6356,22 +6271,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "SLUK 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"
-    gigabeats: "TILBAGE for at afbryde"
     gigabeatfx: "TÆND/SLUK for at afbryde"
+    gigabeats: "TILBAGE for at afbryde"
+    iaudiom5,iaudiox5: "Lang SPIL for at afbryde"
+    ipod*: "SPIL/PAUSE for at afbryde"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "FORRIGE for at afbryde"
+    iriverh100,iriverh120,iriverh300: "STOP for at afbryde"
   </dest>
   <voice>
     *: ""
@@ -6581,16 +6495,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Avancerede EQ indstillinger"
+    *: "Avancerede EQ indstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Avancerede equalizer indstillinger"
+    *: "Avancerede equalizer indstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -6626,16 +6537,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafisk EQ"
+    *: "Grafisk EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafisk equalizer"
+    *: "Grafisk equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -6677,16 +6585,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -6722,16 +6627,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "For-dæmpning"
+    *: "For-dæmpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "For-dæmpning"
+    *: "For-dæmpning"
   </voice>
 </phrase>
 <phrase>
@@ -6815,16 +6717,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Gem EQ indstillinger"
+    *: "Gem EQ indstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gem equalizer indstillinger"
+    *: "Gem equalizer indstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -6914,16 +6813,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skærmrulnings trinstørrelse"
+    *: "Skærmrulnings trinstørrelse"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skærmrulnings trinstørrelse"
+    *: "Skærmrulnings trinstørrelse"
   </voice>
 </phrase>
 <phrase>
@@ -6962,16 +6858,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skærm ruller ud"
+    *: "Skærm ruller ud"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skærm ruller ud"
+    *: "Skærm ruller ud"
   </voice>
 </phrase>
 <phrase>
@@ -7100,16 +6993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Grænse frekvens"
+    *: "Grænse frekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grænse frekvens"
+    *: "Grænse frekvens"
   </voice>
 </phrase>
 <phrase>
@@ -7199,16 +7089,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz bånd forstærkning"
+    *: "%d Hz bånd forstærkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz bånd forstærkning"
+    *: "hertz bånd forstærkning"
   </voice>
 </phrase>
 <phrase>
@@ -7233,16 +7120,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Midterfrekvens"
+    *: "Midterfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Midterfrekvens"
+    *: "Midterfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -7329,16 +7213,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple EQ indstillinger"
+    *: "Simple EQ indstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer indstillinger"
+    *: "Simple equalizer indstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -7346,16 +7227,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -7363,16 +7241,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Indstil: %s"
+    *: "Indstil: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7380,16 +7255,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Aktiver EQ"
+    *: "Aktiver EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aktiver equalizer"
+    *: "Aktiver equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -7411,16 +7283,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -7428,16 +7297,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Gennemse EQ indstillinger"
+    *: "Gennemse EQ indstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gennemse equalizer indstillinger"
+    *: "Gennemse equalizer indstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -7445,16 +7311,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -7496,16 +7359,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Top filter %d"
+    *: "Top filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Top filter"
+    *: "Top filter"
   </voice>
 </phrase>
 <phrase>
@@ -7572,16 +7432,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Højfrekvensgrænse"
+    *: "Højfrekvensgrænse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Højfrekvensgrænse"
+    *: "Højfrekvensgrænse"
   </voice>
 </phrase>
 <phrase>
@@ -7603,16 +7460,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Krydsforstærkning"
+    *: "Krydsforstærkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Krydsforstærkning"
+    *: "Krydsforstærkning"
   </voice>
 </phrase>
 <phrase>
@@ -7620,16 +7474,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Højfrekvensdæmpning"
+    *: "Højfrekvensdæmpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Højfrekvensdæmpning"
+    *: "Højfrekvensdæmpning"
   </voice>
 </phrase>
 <phrase>
@@ -7637,16 +7488,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direkte forstærkning"
+    *: "Direkte forstærkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direkte forstærkning"
+    *: "Direkte forstærkning"
   </voice>
 </phrase>
 <phrase>
@@ -8117,16 +7965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </voice>
 </phrase>
 <phrase>
@@ -8134,16 +7979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Indstil: %s %s"
+    *: "Indstil: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8361,21 +8203,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Bygger database... %d fundet (SLUK for at stoppe)"
-    iriverh100,iriverh120,iriverh300: "Bygger database... %d fundet (STOP for at stoppe)"
-    ipod*: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Bygger database... %d fundet (VENSTRE for at stoppe)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Bygger database... %d fundet (FORRIGE for at stoppe)"
-    gogearsa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
     archosplayer: "Bygger DB %d fundet"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Bygger database... %d fundet (VENSTRE for at stoppe)"
+    gogearsa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Bygger database... %d fundet (FORRIGE for at stoppe)"
+    iriverh100,iriverh120,iriverh300: "Bygger database... %d fundet (STOP for at stoppe)"
   </dest>
   <voice>
     *: "filer fundet til databasen"
@@ -8941,16 +8781,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -8974,17 +8811,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knap-lys sluk"
-    sansafuze*,sansae200*: "Hjul-lys sluk"
+    sansae200*,sansafuze*: "Hjul-lys sluk"
   </dest>
   <voice>
     *: none
     button_light: "Knap-lys sluk"
-    sansafuze*,sansae200*: "Hjul-lys sluk"
+    sansae200*,sansafuze*: "Hjul-lys sluk"
   </voice>
 </phrase>
 <phrase>
@@ -9538,20 +9375,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "SPIL = Ja"
+    archosplayer: "(SPIL/STOP)"
     cowond2*: "MENU eller top-højre = Ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "VÆLG = Ja"
     iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÆLG = Ja"
     mrobe500: "SPIL, TÆND/SLUK eller top-højre = Ja"
-    archosplayer: "(SPIL/STOP)"
     vibe500: "OK = Ja"
   </dest>
   <voice>
@@ -9564,23 +9401,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "Tænd = Indstil"
-    mrobe500: "HJERTE = Indstil"
-    iriverh100,iriverh120,iriverh300: "NAVI = Indstil"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÆLG = Indstil"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "VÆLG = Indstil"
     gogearsa9200,samsungyh*: "SPIL = Indstil"
-    vibe500: "OK = Indstil"
+    iriverh100,iriverh120,iriverh300: "NAVI = Indstil"
     mpiohd300: "ENTER = Indstil"
+    mrobe500: "HJERTE = Indstil"
+    rtc: "Tænd = Indstil"
+    vibe500: "OK = Indstil"
   </dest>
   <voice>
     *: none
@@ -9697,16 +9534,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Forstærkning"
+    *: "Forstærkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forstærkning"
+    *: "Forstærkning"
   </voice>
 </phrase>
 <phrase>
@@ -9728,16 +9562,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tilstand:"
+    *: "Tilstand:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10173,15 +10004,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basgrænse"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basgrænse"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgrænse"
   </voice>
 </phrase>
 <phrase>
@@ -10379,15 +10210,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgrænse"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgrænse"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrænse"
   </voice>
 </phrase>
 <phrase>
@@ -10437,16 +10268,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastaturtoner"
+    *: "Tastaturtoner"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastaturtoner"
+    *: "Tastaturtoner"
   </voice>
 </phrase>
 <phrase>
@@ -10454,16 +10282,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastaturtonegentagelser"
+    *: "Tastaturtonegentagelser"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastaturtonegentagelser"
+    *: "Tastaturtonegentagelser"
   </voice>
 </phrase>
 <phrase>
@@ -10948,11 +10773,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10965,11 +10790,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Seriel Bitrate"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Seriel Bitrate"
   </voice>
@@ -10982,11 +10807,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10999,11 +10824,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -11016,11 +10841,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11047,11 +10872,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Automatisk"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatisk"
   </voice>
@@ -11219,16 +11044,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Afspilningshastighed"
+    *: "Afspilningshastighed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afspilningshastighed"
+    *: "Afspilningshastighed"
   </voice>
 </phrase>
 <phrase>
@@ -11253,16 +11075,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Hastighed"
+    *: "Hastighed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hastighed"
+    *: "Hastighed"
   </voice>
 </phrase>
 <phrase>
@@ -11270,16 +11089,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullebjælkens position"
+    *: "Rullebjælkens position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullebjælkens position"
+    *: "Rullebjælkens position"
   </voice>
 </phrase>
 <phrase>
@@ -11386,16 +11202,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullebjælkens bredde"
+    *: "Rullebjælkens bredde"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullebjælkens bredde"
+    *: "Rullebjælkens bredde"
   </voice>
 </phrase>
 <phrase>
@@ -11431,16 +11244,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Lydstyrkekompressor"
+    *: "Lydstyrkekompressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lydstyrkekompressor"
+    *: "Lydstyrkekompressor"
   </voice>
 </phrase>
 <phrase>
@@ -11504,16 +11314,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Slip efter"
+    *: "Slip efter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Slip efter"
+    *: "Slip efter"
   </voice>
 </phrase>
 <phrase>
@@ -11521,16 +11328,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </voice>
 </phrase>
 <phrase>
@@ -11538,16 +11342,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Efterforstærkning"
+    *: "Efterforstærkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Efterforstærkning"
+    *: "Efterforstærkning"
   </voice>
 </phrase>
 <phrase>
@@ -11555,16 +11356,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Basis skin"
+    *: "Basis skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Basis skin"
+    *: "Basis skin"
   </voice>
 </phrase>
 <phrase>
@@ -11589,16 +11387,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ændringshastighed"
+    *: "Ændringshastighed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ændringshastighed"
+    *: "Ændringshastighed"
   </voice>
 </phrase>
 <phrase>
@@ -11606,16 +11401,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatisk"
+    *: "Automatisk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisk"
+    *: "Automatisk"
   </voice>
 </phrase>
 <phrase>
@@ -11637,16 +11429,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Langsom"
+    *: "Langsom"
   </dest>
   <voice>
-    *: none
-    swcodec: "Langsom"
+    *: "Langsom"
   </voice>
 </phrase>
 <phrase>
@@ -11668,16 +11457,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Forhold"
+    *: "Forhold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forhold"
+    *: "Forhold"
   </voice>
 </phrase>
 <phrase>
@@ -11702,16 +11488,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hurtig"
+    *: "Hurtig"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hurtig"
+    *: "Hurtig"
   </voice>
 </phrase>
 <phrase>
@@ -11719,16 +11502,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fjernbetjenings basis skin"
+    *: "Fjernbetjenings basis skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fjernbetjenings basis skin"
+    *: "Fjernbetjenings basis skin"
   </voice>
 </phrase>
 <phrase>
@@ -11804,16 +11584,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 til 1"
+    *: "10 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -11838,16 +11615,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 til 1"
+    *: "2 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -11872,16 +11646,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grænse"
+    *: "Grænse"
   </voice>
 </phrase>
 <phrase>
@@ -11951,16 +11722,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 til 1"
+    *: "6 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -11982,16 +11750,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 til 1"
+    *: "4 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -12248,16 +12013,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Spol tilbage før genoptagning"
+    *: "Spol tilbage før genoptagning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spol tilbage før genoptagning"
+    *: "Spol tilbage før genoptagning"
   </voice>
 </phrase>
 <phrase>
@@ -12297,15 +12059,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D forbedring"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D forbedring"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D forbedring"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D forbedring"
   </voice>
 </phrase>
 <phrase>
@@ -12533,7 +12295,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12693,16 +12455,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simpel (Meier)"
+    *: "Simpel (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simpel"
+    *: "Simpel"
   </voice>
 </phrase>
 <phrase>
@@ -12862,16 +12621,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Brugerdefineret"
+    *: "Brugerdefineret"
   </dest>
   <voice>
-    *: none
-    swcodec: "Brugerdefineret"
+    *: "Brugerdefineret"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index a21b2811d4..fbfe051999 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -267,23 +267,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "WIEDERGABE = Ja"
+    archosplayer: "(WIEDERGABE/STOP)"
     cowond2*: "MENÜ oder rechts oben= Ja"
+    creativezen*: "Select = Ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ja"
     iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ja"
     mrobe500: "WIEDERGABE, POWER oder rechts oben = Ja"
-    archosplayer: "(WIEDERGABE/STOP)"
     vibe500: "OK = Ja"
-    creativezen*: "Select = Ja"
   </dest>
   <voice>
     *: ""
@@ -821,16 +821,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -838,16 +835,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direkter Pegel"
+    *: "Direkter Pegel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direkter Pegel"
+    *: "Direkter Pegel"
   </voice>
 </phrase>
 <phrase>
@@ -855,16 +849,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -872,16 +863,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Hochfrequenz-Abschwächung"
+    *: "Hochfrequenz-Abschwächung"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hochfrequenz-Abschwächung"
+    *: "Hochfrequenz-Abschwächung"
   </voice>
 </phrase>
 <phrase>
@@ -889,16 +877,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Hochfrequenz-Abschnitt"
+    *: "Hochfrequenz-Abschnitt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hochfrequenz-Abschnitt"
+    *: "Hochfrequenz-Abschnitt"
   </voice>
 </phrase>
 <phrase>
@@ -906,16 +891,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -923,16 +905,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ aktivieren"
+    *: "EQ aktivieren"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer aktivieren"
+    *: "Equalizer aktivieren"
   </voice>
 </phrase>
 <phrase>
@@ -940,16 +919,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafischer EQ"
+    *: "Grafischer EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafischer Equalizer"
+    *: "Grafischer Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -957,16 +933,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Vorverstärkung"
+    *: "Vorverstärkung"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vorverstärkung"
+    *: "Vorverstärkung"
   </voice>
 </phrase>
 <phrase>
@@ -974,16 +947,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Einfache EQ-Einstellungen"
+    *: "Einfache EQ-Einstellungen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Einfache Equalizer-Einstellungen"
+    *: "Einfache Equalizer-Einstellungen"
   </voice>
 </phrase>
 <phrase>
@@ -991,16 +961,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Erweiterte EQ-Einstellungen"
+    *: "Erweiterte EQ-Einstellungen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Erweiterte Equalizer-Einstellungen"
+    *: "Erweiterte Equalizer-Einstellungen"
   </voice>
 </phrase>
 <phrase>
@@ -1008,16 +975,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ-Konfiguration speichern"
+    *: "EQ-Konfiguration speichern"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer-Konfiguration speichern"
+    *: "Equalizer-Konfiguration speichern"
   </voice>
 </phrase>
 <phrase>
@@ -1025,16 +989,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Zeige EQ-Konfigurationen"
+    *: "Zeige EQ-Konfigurationen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zeige Equalizer-Konfigurationen"
+    *: "Zeige Equalizer-Konfigurationen"
   </voice>
 </phrase>
 <phrase>
@@ -1042,16 +1003,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editiermodus: %s"
+    *: "Editiermodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1059,16 +1017,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz-Band Verstärkung"
+    *: "%d Hz-Band Verstärkung"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz-Band Verstärkung"
+    *: "Hertz-Band Verstärkung"
   </voice>
 </phrase>
 <phrase>
@@ -1076,16 +1031,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Tiefpass"
+    *: "Tiefpass"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tiefpass"
+    *: "Tiefpass"
   </voice>
 </phrase>
 <phrase>
@@ -1093,16 +1045,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Bandfilter %d"
+    *: "Bandfilter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bandfilter"
+    *: "Bandfilter"
   </voice>
 </phrase>
 <phrase>
@@ -1110,16 +1059,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Hochpass"
+    *: "Hochpass"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hochpass"
+    *: "Hochpass"
   </voice>
 </phrase>
 <phrase>
@@ -1127,16 +1073,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Grenzfrequenz"
+    *: "Grenzfrequenz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grenzfrequenz"
+    *: "Grenzfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -1144,16 +1087,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Mittenfrequenz"
+    *: "Mittenfrequenz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mittenfrequenz"
+    *: "Mittenfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -1161,16 +1101,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Güte"
+    *: "Güte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Güte"
+    *: "Güte"
   </voice>
 </phrase>
 <phrase>
@@ -1178,19 +1115,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1734,16 +1665,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Übersteuerung verhindern"
+    *: "Übersteuerung verhindern"
   </dest>
   <voice>
-    *: none
-    swcodec: "Übersteuerung verhindern"
+    *: "Übersteuerung verhindern"
   </voice>
 </phrase>
 <phrase>
@@ -1821,16 +1749,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Piepen bei Titelwechsel"
+    *: "Piepen bei Titelwechsel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Piepen bei Titelwechsel"
+    *: "Piepen bei Titelwechsel"
   </voice>
 </phrase>
 <phrase>
@@ -1838,16 +1763,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Leise"
+    *: "Leise"
   </dest>
   <voice>
-    *: none
-    swcodec: "Leise"
+    *: "Leise"
   </voice>
 </phrase>
 <phrase>
@@ -1855,16 +1777,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Mittel"
+    *: "Mittel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mittel"
+    *: "Mittel"
   </voice>
 </phrase>
 <phrase>
@@ -1872,16 +1791,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Laut"
+    *: "Laut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Laut"
+    *: "Laut"
   </voice>
 </phrase>
 <phrase>
@@ -2238,21 +2154,20 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Erstelle Datenbank... %d gefunden (OFF zum Abbrechen)"
-    iriverh100,iriverh120,iriverh300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
-    ipod*: "Erstelle Datenbank... %d gefunden (PLAY/PAUSE zum Abbrechen)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
-    gogearsa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
     archosplayer: "Erstelle DB %d gefu."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)"
+    gogearsa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)"
+    ipod*: "Erstelle Datenbank... %d gefunden (PLAY/PAUSE zum Abbrechen)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)"
+    iriverh100,iriverh120,iriverh300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)"
   </dest>
   <voice>
     *: "Erstelle Datenbank"
@@ -2434,16 +2349,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Schriftart"
+    *: "Schriftart"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Schriftart"
+    *: "Schriftart"
   </voice>
 </phrase>
 <phrase>
@@ -2705,16 +2617,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Umgedreht"
+    *: "Umgedreht"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Umgedreht"
+    *: "Umgedreht"
   </voice>
 </phrase>
 <phrase>
@@ -2722,16 +2631,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zeilenauswahltyp"
+    *: "Zeilenauswahltyp"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zeilenauswahltyp"
+    *: "Zeilenauswahltyp"
   </voice>
 </phrase>
 <phrase>
@@ -2739,16 +2645,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zeiger"
+    *: "Zeiger"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zeiger"
+    *: "Zeiger"
   </voice>
 </phrase>
 <phrase>
@@ -2756,16 +2659,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Balken (invertiert)"
+    *: "Balken (invertiert)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Balken"
+    *: "Balken"
   </voice>
 </phrase>
 <phrase>
@@ -3055,16 +2955,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Über Bildschirmrand scrollen"
+    *: "Über Bildschirmrand scrollen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Über Bildschirmrand scrollen"
+    *: "Über Bildschirmrand scrollen"
   </voice>
 </phrase>
 <phrase>
@@ -3072,16 +2969,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bildschirmscroll-Schrittweite"
+    *: "Bildschirmscroll-Schrittweite"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bildschirmscroll-Schrittweite"
+    *: "Bildschirmscroll-Schrittweite"
   </voice>
 </phrase>
 <phrase>
@@ -3137,16 +3031,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/Bildlaufleiste"
+    *: "Status-/Bildlaufleiste"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- und Bildlaufleiste"
+    *: "Status- und Bildlaufleiste"
   </voice>
 </phrase>
 <phrase>
@@ -3154,16 +3045,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bildlaufleiste"
+    *: "Bildlaufleiste"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bildlaufleiste"
+    *: "Bildlaufleiste"
   </voice>
 </phrase>
 <phrase>
@@ -3171,16 +3059,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusleiste"
+    *: "Statusleiste"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statusleiste"
+    *: "Statusleiste"
   </voice>
 </phrase>
 <phrase>
@@ -3205,16 +3090,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lautstärkeanzeige"
+    *: "Lautstärkeanzeige"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lautstärkeanzeige"
+    *: "Lautstärkeanzeige"
   </voice>
 </phrase>
 <phrase>
@@ -3222,16 +3104,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterieanzeige"
+    *: "Batterieanzeige"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterieanzeige"
+    *: "Batterieanzeige"
   </voice>
 </phrase>
 <phrase>
@@ -3239,16 +3118,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "grafisch"
+    *: "grafisch"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "grafisch"
+    *: "grafisch"
   </voice>
 </phrase>
 <phrase>
@@ -3256,16 +3132,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "numerisch"
+    *: "numerisch"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "numerisch"
+    *: "numerisch"
   </voice>
 </phrase>
 <phrase>
@@ -3485,16 +3358,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebräisch (ISO-8859-8)"
+    *: "Hebräisch (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebräisch"
+    *: "Hebräisch"
   </voice>
 </phrase>
 <phrase>
@@ -3516,16 +3386,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thailändisch (ISO-8859-11)"
+    *: "Thailändisch (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thailändisch"
+    *: "Thailändisch"
   </voice>
 </phrase>
 <phrase>
@@ -3533,16 +3400,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisch (CP1256)"
+    *: "Arabisch (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabisch"
+    *: "Arabisch"
   </voice>
 </phrase>
 <phrase>
@@ -3578,16 +3442,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanisch (SJIS)"
+    *: "Japanisch (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanisch"
+    *: "Japanisch"
   </voice>
 </phrase>
 <phrase>
@@ -3595,16 +3456,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vereinf. Chinesisch (GB2312)"
+    *: "Vereinf. Chinesisch (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vereinfachtes Chinesisch"
+    *: "Vereinfachtes Chinesisch"
   </voice>
 </phrase>
 <phrase>
@@ -3612,16 +3470,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreanisch (KSX1001)"
+    *: "Koreanisch (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreanisch"
+    *: "Koreanisch"
   </voice>
 </phrase>
 <phrase>
@@ -3629,16 +3484,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinesisch (BIG5)"
+    *: "Trad. Chinesisch (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditionelles Chinesisch"
+    *: "Traditionelles Chinesisch"
   </voice>
 </phrase>
 <phrase>
@@ -3662,17 +3514,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
+    sansae200*,sansafuze*: "Scrollradbeleuchtungsdauer"
   </dest>
   <voice>
     *: none
     button_light: "Tastenbeleuchtungsdauer"
-    sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer"
+    sansae200*,sansafuze*: "Scrollradbeleuchtungsdauer"
   </voice>
 </phrase>
 <phrase>
@@ -3945,27 +3797,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Speichern"
-    mrobe500: "HEART = Speichern"
-    iriverh100,iriverh120,iriverh300: "NAVI = Speichern"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Speichern"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Speichern"
     gogearsa9200,samsungyh*: "PLAY = Speichern"
-    vibe500: "OK = Speichern"
+    iriverh100,iriverh120,iriverh300: "NAVI = Speichern"
     mpiohd300: "ENTER = Speichern"
+    mrobe500: "HEART = Speichern"
+    rtc: "ON = Speichern"
+    vibe500: "OK = Speichern"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3974,39 +3826,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Abbrechen"
-    mrobe500: "POWER = Abbrechen"
-    iriverh100,iriverh120,iriverh300: "STOP = Abbrechen"
-    ipod*,sansac200*,mpiohd300: "MENU = Abbrechen"
-    iaudiox5,iaudiom5: "RECORD = Abbrechen"
+    gigabeatfx,mrobe500: "POWER = Abbrechen"
+    gigabeats,sansafuzeplus: "BACK = Abbrechen"
+    gogearsa9200: "LEFT = Abbrechen"
+    iaudiom5,iaudiox5: "RECORD = Abbrechen"
+    ipod*,mpiohd300,sansac200*: "MENU = Abbrechen"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Abbrechen"
-    gigabeatfx: "POWER = Abbrechen"
-    sansafuzeplus: "BACK = Abbrechen"
+    iriverh100,iriverh120,iriverh300: "STOP = Abbrechen"
     mrobe100: "DISPLAY = Abbrechen"
-    gigabeats: "BACK = Abbrechen"
-    gogearsa9200: "LEFT = Abbrechen"
-    vibe500: "CANCEL = Abbrechen"
+    rtc: "OFF = Abbrechen"
     samsungyh*: "REW = Abbrechen"
+    vibe500: "CANCEL = Abbrechen"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,h10_gb,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4492,22 +4340,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK OFF=Abbruch"
+    gigabeats: "SELECT=OK POWER=Abbruch"
     ipod*: "SELECT=OK MENU=Abbruch"
     iriverh10,iriverh10_5gb: "SELECT=OK PREV=Abbruch"
-    gigabeats: "SELECT=OK POWER=Abbruch"
-    vibe500: "OK=OK C=Abbruch"
     mpiohd300: "ENTER=OK MENU=Abbruch"
     sansafuzeplus: "SELECT=OK  BACK=Abbruch"
+    vibe500: "OK=OK C=Abbruch"
   </dest>
   <voice>
     *: none
@@ -5612,15 +5460,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Abtastrate"
+    play_frequency,recording: "Abtastrate"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Abtastrate"
+    play_frequency,recording: "Abtastrate"
   </voice>
 </phrase>
 <phrase>
@@ -5663,18 +5511,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Internes Mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -6552,13 +6400,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %d Std %d Min"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterieladung"
@@ -6615,24 +6463,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimediakarte"
     multivolume: "Festplatte"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Micro-SD-Karte"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Micro-SD-Karte"
     xduoox3: "Micro-SD-Karte 2"
-    archosondio*: "Multimediakarte"
   </voice>
 </phrase>
 <phrase>
@@ -7947,19 +7795,19 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Kein Speicherplatz mehr vorhanden. Drücke OFF zum fortfahren."
-    iriverh100,iriverh120,iriverh300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
     iaudiom5,iaudiox5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren."
-    sansae200*,sansac200*,vibe500: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
+    iriverh100,iriverh120,iriverh300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren."
+    recording: "Kein Speicherplatz mehr vorhanden. Drücke OFF zum fortfahren."
     samsungyh*: "Kein Speicherplatz mehr vorhanden. Drücke LEFT zum fortfahren."
+    sansac200*,sansae200*,vibe500: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren."
   </dest>
   <voice>
     *: none
@@ -8051,23 +7899,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK zum Abbrechen"
     gigabeatfx: "POWER zum Abbrechen"
-    sansafuzeplus: "BACK zum Abbrechen"
+    gigabeats,sansafuzeplus: "BACK zum Abbrechen"
+    iaudiom5,iaudiox5: "Long PLAY zum Abbrechen"
+    ipod*: "PLAY/PAUSE zum Abbrechen"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV zum Abbrechen"
+    iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen"
   </dest>
   <voice>
     *: ""
@@ -9661,16 +9507,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editiermodus: %s %s"
+    *: "Editiermodus: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9678,16 +9521,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Grenzfrequenz"
+    *: "Grenzfrequenz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grenzfrequenz"
+    *: "Grenzfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -9695,16 +9535,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Verstärkg."
+    *: "Verstärkg."
   </dest>
   <voice>
-    *: none
-    swcodec: "Verstärkung"
+    *: "Verstärkung"
   </voice>
 </phrase>
 <phrase>
@@ -9712,16 +9549,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modus:"
+    *: "Modus:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10384,15 +10218,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Tiefengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Tiefengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tiefengrenzfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -10401,15 +10235,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Höhengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Höhengrenzfrequenz"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Höhengrenzfrequenz"
   </voice>
 </phrase>
 <phrase>
@@ -10445,16 +10279,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastentöne"
+    *: "Tastentöne"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastentöne"
+    *: "Tastentöne"
   </voice>
 </phrase>
 <phrase>
@@ -10462,16 +10293,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastentonwiederholung"
+    *: "Tastentonwiederholung"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastentonwiederholung"
+    *: "Tastentonwiederholung"
   </voice>
 </phrase>
 <phrase>
@@ -11227,16 +11055,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Abspielgeschwindigkeit"
+    *: "Abspielgeschwindigkeit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Abspielgeschwindigkeit"
+    *: "Abspielgeschwindigkeit"
   </voice>
 </phrase>
 <phrase>
@@ -11261,16 +11086,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Geschwindigkeit"
+    *: "Geschwindigkeit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Geschwindigkeit"
+    *: "Geschwindigkeit"
   </voice>
 </phrase>
 <phrase>
@@ -11295,16 +11117,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bildlaufleisten-Position"
+    *: "Bildlaufleisten-Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bildlaufleisten-Position"
+    *: "Bildlaufleisten-Position"
   </voice>
 </phrase>
 <phrase>
@@ -11357,7 +11176,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11394,16 +11213,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bildlaufleisten-Breite"
+    *: "Bildlaufleisten-Breite"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bildlaufleisten-Breite"
+    *: "Bildlaufleisten-Breite"
   </voice>
 </phrase>
 <phrase>
@@ -11439,16 +11255,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </voice>
 </phrase>
 <phrase>
@@ -11512,16 +11325,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Abklingzeit"
+    *: "Abklingzeit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Abklingzeit"
+    *: "Abklingzeit"
   </voice>
 </phrase>
 <phrase>
@@ -11529,16 +11339,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Schwellwert"
+    *: "Schwellwert"
   </dest>
   <voice>
-    *: none
-    swcodec: "Schwellwert"
+    *: "Schwellwert"
   </voice>
 </phrase>
 <phrase>
@@ -11546,16 +11353,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Endverstärkung"
+    *: "Endverstärkung"
   </dest>
   <voice>
-    *: none
-    swcodec: "Endverstärkung"
+    *: "Endverstärkung"
   </voice>
 </phrase>
 <phrase>
@@ -11580,16 +11384,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Übergang"
+    *: "Übergang"
   </dest>
   <voice>
-    *: none
-    swcodec: "Übergang"
+    *: "Übergang"
   </voice>
 </phrase>
 <phrase>
@@ -11597,16 +11398,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatik"
+    *: "Automatik"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatik"
+    *: "Automatik"
   </voice>
 </phrase>
 <phrase>
@@ -11628,16 +11426,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Weicher Übergang"
+    *: "Weicher Übergang"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weicher Übergang"
+    *: "Weicher Übergang"
   </voice>
 </phrase>
 <phrase>
@@ -11659,16 +11454,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Verhältnis"
+    *: "Verhältnis"
   </dest>
   <voice>
-    *: none
-    swcodec: "Verhältnis"
+    *: "Verhältnis"
   </voice>
 </phrase>
 <phrase>
@@ -11693,16 +11485,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Harter Übergang"
+    *: "Harter Übergang"
   </dest>
   <voice>
-    *: none
-    swcodec: "Harter Übergang"
+    *: "Harter Übergang"
   </voice>
 </phrase>
 <phrase>
@@ -11778,16 +11567,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 zu 1"
+    *: "10 zu 1"
   </voice>
 </phrase>
 <phrase>
@@ -11812,16 +11598,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 zu 1"
+    *: "2 zu 1"
   </voice>
 </phrase>
 <phrase>
@@ -11846,16 +11629,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Grenze"
+    *: "Grenze"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grenze"
+    *: "Grenze"
   </voice>
 </phrase>
 <phrase>
@@ -11925,16 +11705,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 zu 1"
+    *: "6 zu 1"
   </voice>
 </phrase>
 <phrase>
@@ -11956,16 +11733,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 zu 1"
+    *: "4 zu 1"
   </voice>
 </phrase>
 <phrase>
@@ -12004,16 +11778,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Basisskin (SBS)"
+    *: "Basisskin (SBS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Basisskin"
+    *: "Basisskin"
   </voice>
 </phrase>
 <phrase>
@@ -12021,16 +11792,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fernbedienungs-SBS"
+    *: "Fernbedienungs-SBS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fernbedienungs-SBS"
+    *: "Fernbedienungs-SBS"
   </voice>
 </phrase>
 <phrase>
@@ -12225,16 +11993,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Zurückspulen vor dem Fortsetzen"
+    *: "Zurückspulen vor dem Fortsetzen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zurückspulen vor dem Fortsetzen"
+    *: "Zurückspulen vor dem Fortsetzen"
   </voice>
 </phrase>
 <phrase>
@@ -12541,7 +12306,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12909,16 +12674,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Einfach (Meier)"
+    *: "Einfach (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Einfach"
+    *: "Einfach"
   </voice>
 </phrase>
 <phrase>
@@ -12968,16 +12730,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Manuell"
+    *: "Manuell"
   </dest>
   <voice>
-    *: none
-    swcodec: "Manuell"
+    *: "Manuell"
   </voice>
 </phrase>
 <phrase>
@@ -13017,18 +12776,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </voice>
 </phrase>
 <phrase>
@@ -13037,18 +12793,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB Modus"
-    ibassodx90: "USB Modus"
+    ibassodx50,ibassodx90: "USB Modus"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB Modus"
-    ibassodx90: "USB Modus"
+    ibassodx50,ibassodx90: "USB Modus"
   </voice>
 </phrase>
 <phrase>
@@ -13057,18 +12810,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Massenspeicher"
-    ibassodx90: "Massenspeicher"
+    ibassodx50,ibassodx90: "Massenspeicher"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Massenspeicher"
-    ibassodx90: "Massenspeicher"
+    ibassodx50,ibassodx90: "Massenspeicher"
   </voice>
 </phrase>
 <phrase>
@@ -13077,18 +12827,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Nur laden"
-    ibassodx90: "Nur laden"
+    ibassodx50,ibassodx90: "Nur laden"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Nur laden"
-    ibassodx90: "Nur laden"
+    ibassodx50,ibassodx90: "Nur laden"
   </voice>
 </phrase>
 <phrase>
@@ -13097,18 +12844,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13209,16 +12953,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Einschwingzeit"
+    *: "Einschwingzeit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Einschwingzeit"
+    *: "Einschwingzeit"
   </voice>
 </phrase>
 <phrase>
@@ -13226,16 +12967,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13260,16 +12998,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Reduzierung der Gehörermüdung"
+    *: "Reduzierung der Gehörermüdung"
   </voice>
 </phrase>
 <phrase>
@@ -13277,16 +13012,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -13294,16 +13026,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Verhältnis Original / Geändertes Signal"
+    *: "Verhältnis Original / Geändertes Signal"
   </voice>
 </phrase>
 <phrase>
@@ -13311,16 +13040,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </dest>
   <voice>
-    *: none
-    swcodec: "Anhebung der Basswahrnehmung"
+    *: "Anhebung der Basswahrnehmung"
   </voice>
 </phrase>
 <phrase>
@@ -13328,16 +13054,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13345,16 +13068,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "NUR SEITE"
+    *: "NUR SEITE"
   </voice>
 </phrase>
 <phrase>
@@ -13362,16 +13082,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13547,16 +13264,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 5: 40 Züge/ 60 min"
+    *: "Level 5: 40 Züge/ 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 5: 40 Züge pro 60 Minuten"
+    *: "Level 5: 40 Züge pro 60 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -13665,16 +13379,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Direkt"
+    *: "Direkt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Direkt"
+    *: "Direkt"
   </voice>
 </phrase>
 <phrase>
@@ -13682,16 +13393,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Königseite"
+    *: "Königseite"
   </voice>
 </phrase>
 <phrase>
@@ -13741,16 +13449,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Covergröße ändern"
+    *: "Covergröße ändern"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Covergröße ändern"
+    *: "Covergröße ändern"
   </voice>
 </phrase>
 <phrase>
@@ -13758,16 +13463,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Unerlaubter Zug!"
+    *: "Unerlaubter Zug!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Unerlaubter Zug!"
+    *: "Unerlaubter Zug!"
   </voice>
 </phrase>
 <phrase>
@@ -13775,18 +13477,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Trennung Panoramaregler"
+    *: "Trennung Panoramaregler"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Trennung Panoramaregler"
+    *: "Trennung Panoramaregler"
     lowmem: none
   </voice>
 </phrase>
@@ -13809,16 +13508,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spiel fortsetzen"
+    *: "Spiel fortsetzen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spiel fortsetzen"
+    *: "Spiel fortsetzen"
   </voice>
 </phrase>
 <phrase>
@@ -13826,16 +13522,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Titelliste"
+    *: "Via Titelliste"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Titelliste"
+    *: "Via Titelliste"
   </voice>
 </phrase>
 <phrase>
@@ -13857,16 +13550,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Anzahl der Slides"
+    *: "Anzahl der Slides"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Anzahl der Slides"
+    *: "Anzahl der Slides"
   </voice>
 </phrase>
 <phrase>
@@ -13874,16 +13564,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 1: 60 Züge/ 5 min"
+    *: "Level 1: 60 Züge/ 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 1: 60 Züge pro 5 Minuten"
+    *: "Level 1: 60 Züge pro 5 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -13891,16 +13578,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spieler"
+    *: "Spieler"
   </voice>
 </phrase>
 <phrase>
@@ -13908,18 +13592,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Starte Menü, wenn nicht abgeschlossen"
+    *: "Starte Menü, wenn nicht abgeschlossen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Starte Menü, wenn nicht abgeschlossen"
+    *: "Starte Menü, wenn nicht abgeschlossen"
     lowmem: none
   </voice>
 </phrase>
@@ -13959,16 +13640,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bauer"
+    *: "Bauer"
   </voice>
 </phrase>
 <phrase>
@@ -13990,16 +13668,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Schach"
+    *: "GNU Schach"
   </voice>
 </phrase>
 <phrase>
@@ -14007,16 +13682,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Markiert"
+    *: "Markiert"
   </voice>
 </phrase>
 <phrase>
@@ -14024,16 +13696,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Damenseite"
+    *: "Damenseite"
   </voice>
 </phrase>
 <phrase>
@@ -14041,16 +13710,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Am Ende des Spiels"
+    *: "Am Ende des Spiels"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Am Ende des Spiels"
+    *: "Am Ende des Spiels"
   </voice>
 </phrase>
 <phrase>
@@ -14058,16 +13724,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Schwarz"
+    *: "Schwarz"
   </voice>
 </phrase>
 <phrase>
@@ -14089,16 +13752,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 2: 60 Züge / 15 min"
+    *: "Level 2: 60 Züge / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 2: 60 Züge pro 15 Minuten"
+    *: "Level 2: 60 Züge pro 15 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14137,16 +13797,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kein Album gefunden"
+    *: "Kein Album gefunden"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kein Album gefunden"
+    *: "Kein Album gefunden"
   </voice>
 </phrase>
 <phrase>
@@ -14168,18 +13825,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Audiooptionen"
+    *: "Audiooptionen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Audiooptionen"
+    *: "Audiooptionen"
     lowmem: none
   </voice>
 </phrase>
@@ -14188,16 +13842,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Albumtitel anzeigen"
+    *: "Albumtitel anzeigen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Albumtitel anzeigen"
+    *: "Albumtitel anzeigen"
   </voice>
 </phrase>
 <phrase>
@@ -14205,16 +13856,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Weiß"
+    *: "Weiß"
   </voice>
 </phrase>
 <phrase>
@@ -14222,16 +13870,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Geschwindigkeit Wurm"
+    *: "Geschwindigkeit Wurm"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Geschwindigkeit Wurm"
+    *: "Geschwindigkeit Wurm"
   </voice>
 </phrase>
 <phrase>
@@ -14253,18 +13898,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Frames überspringen"
+    *: "Frames überspringen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Frames überspringen"
+    *: "Frames überspringen"
     lowmem: none
   </voice>
 </phrase>
@@ -14287,18 +13929,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Wiedergabe Modus"
+    *: "Wiedergabe Modus"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Wiedergabe Modus"
+    *: "Wiedergabe Modus"
     lowmem: none
   </voice>
 </phrase>
@@ -14307,16 +13946,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spiele"
+    *: "Spiele"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14338,16 +13974,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 7: 40 Züge / 240 min"
+    *: "Level 7: 40 Züge / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 7: 40 Züge pro 240 Minuten"
+    *: "Level 7: 40 Züge pro 240 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14383,16 +14016,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wiedergabe kann nicht neu gestartet werden"
+    *: "Wiedergabe kann nicht neu gestartet werden"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wiedergabe kann nicht neu gestartet werden"
+    *: "Wiedergabe kann nicht neu gestartet werden"
   </voice>
 </phrase>
 <phrase>
@@ -14400,16 +14030,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Anzahl Würmer"
+    *: "Anzahl Würmer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Anzahl Würmer"
+    *: "Anzahl Würmer"
   </voice>
 </phrase>
 <phrase>
@@ -14417,16 +14044,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Größe der Nahrung"
+    *: "Größe der Nahrung"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Größe der Nahrung"
+    *: "Größe der Nahrung"
   </voice>
 </phrase>
 <phrase>
@@ -14462,16 +14086,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Schachmatt!"
+    *: "Schachmatt!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Schachmatt!"
+    *: "Schachmatt!"
   </voice>
 </phrase>
 <phrase>
@@ -14479,18 +14100,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Klangeinstellung verwenden"
+    *: "Klangeinstellung verwenden"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Klangeinstellung verwenden"
+    *: "Klangeinstellung verwenden"
     lowmem: none
   </voice>
 </phrase>
@@ -14499,16 +14117,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </voice>
 </phrase>
 <phrase>
@@ -14516,16 +14131,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lade Position"
+    *: "Lade Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lade Position"
+    *: "Lade Position"
   </voice>
 </phrase>
 <phrase>
@@ -14533,16 +14145,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Läufer"
+    *: "Läufer"
   </voice>
 </phrase>
 <phrase>
@@ -14550,18 +14159,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Nachhall"
+    *: "Nachhall"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Nachhall"
+    *: "Nachhall"
     lowmem: none
   </voice>
 </phrase>
@@ -14587,16 +14193,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Springer"
+    *: "Springer"
   </voice>
 </phrase>
 <phrase>
@@ -14604,16 +14207,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Eroberungen"
+    *: "Eroberungen"
   </voice>
 </phrase>
 <phrase>
@@ -14621,16 +14221,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rochade"
+    *: "Rochade"
   </voice>
 </phrase>
 <phrase>
@@ -14638,18 +14235,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Leere alle Wiederaufnahmen"
+    *: "Leere alle Wiederaufnahmen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Leere alle Wiederaufnahmen"
+    *: "Leere alle Wiederaufnahmen"
     lowmem: none
   </voice>
 </phrase>
@@ -14675,16 +14269,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 9: 1 Züge / 60 min"
+    *: "Level 9: 1 Züge / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 9: 1 Züge pro 60 Minuten"
+    *: "Level 9: 1 Züge pro 60 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14706,16 +14297,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spiel wiederherstellen"
+    *: "Spiel wiederherstellen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spiel wiederherstellen"
+    *: "Spiel wiederherstellen"
   </voice>
 </phrase>
 <phrase>
@@ -14751,16 +14339,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Abstand"
+    *: "Abstand"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Abstand"
+    *: "Abstand"
   </voice>
 </phrase>
 <phrase>
@@ -14799,16 +14384,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 3: 60 Züge / 30 min"
+    *: "Level 3: 60 Züge / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 3: 60 Züge pro 30 Minuten"
+    *: "Level 3: 60 Züge pro 30 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14816,19 +14398,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "FPS anzeigen"
-    lcd_bitmap: "FPS anzeigen"
+    *: "FPS anzeigen"
   </dest>
   <voice>
-    *: none
-    swcodec: "FPS anzeigen"
-    lcd_bitmap: "FPS anzeigen"
+    *: "FPS anzeigen"
   </voice>
 </phrase>
 <phrase>
@@ -14850,16 +14426,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fehler beim Parsen des Spiels!"
+    *: "Fehler beim Parsen des Spiels!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fehler beim Parsen des Spiels!"
+    *: "Fehler beim Parsen des Spiels!"
   </voice>
 </phrase>
 <phrase>
@@ -14881,16 +14454,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spiel speichern"
+    *: "Spiel speichern"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spiel speichern"
+    *: "Spiel speichern"
   </voice>
 </phrase>
 <phrase>
@@ -14898,16 +14468,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Immer an"
+    *: "Immer an"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Immer an"
+    *: "Immer an"
   </voice>
 </phrase>
 <phrase>
@@ -14929,16 +14496,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Argh Größe"
+    *: "Argh Größe"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Argh Größe"
+    *: "Argh Größe"
   </voice>
 </phrase>
 <phrase>
@@ -14946,16 +14510,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </voice>
 </phrase>
 <phrase>
@@ -14963,16 +14524,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gehe zum WPS"
+    *: "Gehe zum WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gehe zum WPS"
+    *: "Gehe zum WPS"
   </voice>
 </phrase>
 <phrase>
@@ -14980,16 +14538,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graustufe"
+    *: "Graustufe"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graustufe"
+    *: "Graustufe"
   </voice>
 </phrase>
 <phrase>
@@ -15025,16 +14580,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Anderes Spiel wählen"
+    *: "Anderes Spiel wählen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Anderes Spiel wählen"
+    *: "Anderes Spiel wählen"
   </voice>
 </phrase>
 <phrase>
@@ -15129,16 +14681,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zur Wiedergabeliste hinzugefügt"
+    *: "Zur Wiedergabeliste hinzugefügt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zur Wiedergabeliste hinzugefügt"
+    *: "Zur Wiedergabeliste hinzugefügt"
   </voice>
 </phrase>
 <phrase>
@@ -15146,18 +14695,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Automatisch fortsetzen"
+    *: "Automatisch fortsetzen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisch fortsetzen"
+    *: "Automatisch fortsetzen"
     lowmem: none
   </voice>
 </phrase>
@@ -15180,16 +14726,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mittelrand"
+    *: "Mittelrand"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mittelrand"
+    *: "Mittelrand"
   </voice>
 </phrase>
 <phrase>
@@ -15197,16 +14740,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zeige oben"
+    *: "Zeige oben"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zeige oben"
+    *: "Zeige oben"
   </voice>
 </phrase>
 <phrase>
@@ -15214,18 +14754,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Begrenze FPS"
+    *: "Begrenze FPS"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Begrenze FPS"
+    *: "Begrenze FPS"
     lowmem: none
   </voice>
 </phrase>
@@ -15234,18 +14771,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Fortsetzungszeit einstellen (min)"
+    *: "Fortsetzungszeit einstellen (min)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Fortsetzungszeit einstellen (min)"
+    *: "Fortsetzungszeit einstellen (min)"
     lowmem: none
   </voice>
 </phrase>
@@ -15296,18 +14830,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Wiedergabe von Anfang an"
+    *: "Wiedergabe von Anfang an"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Wiedergabe von Anfang an"
+    *: "Wiedergabe von Anfang an"
     lowmem: none
   </voice>
 </phrase>
@@ -15316,18 +14847,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Helligkeit Hintergrundbeleuchtung"
+    *: "Helligkeit Hintergrundbeleuchtung"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Helligkeit Hintergrundbeleuchtung"
+    *: "Helligkeit Hintergrundbeleuchtung"
     lowmem: none
   </voice>
 </phrase>
@@ -15350,16 +14878,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wiedergabeliste löschen"
+    *: "Wiedergabeliste löschen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wiedergabeliste löschen"
+    *: "Wiedergabeliste löschen"
   </voice>
 </phrase>
 <phrase>
@@ -15367,16 +14892,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dame"
+    *: "Dame"
   </voice>
 </phrase>
 <phrase>
@@ -15384,18 +14906,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </voice>
 </phrase>
@@ -15460,16 +14979,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 4: 40 Züge / 30 min"
+    *: "Level 4: 40 Züge / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 4: 40 Züge pro 30 Minuten"
+    *: "Level 4: 40 Züge pro 30 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -15491,16 +15007,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zwischenspeicher wird bei Neustart neu erstellt"
+    *: "Zwischenspeicher wird bei Neustart neu erstellt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zwischenspeicher wird bei Neustart neu erstellt"
+    *: "Zwischenspeicher wird bei Neustart neu erstellt"
   </voice>
 </phrase>
 <phrase>
@@ -15508,16 +15021,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Denke..."
+    *: "Denke..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15525,16 +15035,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zu Beginn des Spiels"
+    *: "Zu Beginn des Spiels"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zu Beginn des Spiels"
+    *: "Zu Beginn des Spiels"
   </voice>
 </phrase>
 <phrase>
@@ -15556,16 +15063,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diashow-Zeit"
+    *: "Diashow-Zeit"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diashow-Zeit"
+    *: "Diashow-Zeit"
   </voice>
 </phrase>
 <phrase>
@@ -15573,16 +15077,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fehler beim Schreiben der Konfiguration"
+    *: "Fehler beim Schreiben der Konfiguration"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fehler beim Schreiben der Konfiguration"
+    *: "Fehler beim Schreiben der Konfiguration"
   </voice>
 </phrase>
 <phrase>
@@ -15590,18 +15091,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Gemeinsame Einstellung verwenden"
+    *: "Gemeinsame Einstellung verwenden"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Gemeinsame Einstellung verwenden"
+    *: "Gemeinsame Einstellung verwenden"
     lowmem: none
   </voice>
 </phrase>
@@ -15610,16 +15108,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs pro Lebensmittel"
+    *: "Arghs pro Lebensmittel"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs pro Lebensmittel"
+    *: "Arghs pro Lebensmittel"
   </voice>
 </phrase>
 <phrase>
@@ -15641,16 +15136,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Albumtitel ausblenden"
+    *: "Albumtitel ausblenden"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Albumtitel ausblenden"
+    *: "Albumtitel ausblenden"
   </voice>
 </phrase>
 <phrase>
@@ -15686,16 +15178,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prüfen!"
+    *: "Prüfen!"
   </voice>
 </phrase>
 <phrase>
@@ -15731,16 +15220,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spiel neustarten"
+    *: "Spiel neustarten"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spiel neustarten"
+    *: "Spiel neustarten"
   </voice>
 </phrase>
 <phrase>
@@ -15748,18 +15234,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Klangregler"
+    *: "Klangregler"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Klangregler"
+    *: "Klangregler"
     lowmem: none
   </voice>
 </phrase>
@@ -15768,18 +15251,15 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Nicht verfügbar"
+    *: "Nicht verfügbar"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Nicht verfügbar"
+    *: "Nicht verfügbar"
     lowmem: none
   </voice>
 </phrase>
@@ -15788,16 +15268,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gespielte Spiele anzeigen"
+    *: "Gespielte Spiele anzeigen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gespielte Spiele anzeigen"
+    *: "Gespielte Spiele anzeigen"
   </voice>
 </phrase>
 <phrase>
@@ -15805,18 +15282,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Startmenü"
+    *: "Startmenü"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Startmenü"
+    *: "Startmenü"
     lowmem: none
   </voice>
 </phrase>
@@ -15839,16 +15313,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wurmwachstum pro Nahrung"
+    *: "Wurmwachstum pro Nahrung"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wurmwachstum pro Nahrung"
+    *: "Wurmwachstum pro Nahrung"
   </voice>
 </phrase>
 <phrase>
@@ -15884,16 +15355,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 6: 40 Züge / 120 min"
+    *: "Level 6: 40 Züge / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 6: 40 Züge pro 120 Minuten"
+    *: "Level 6: 40 Züge pro 120 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -15901,16 +15369,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Geordnet"
+    *: "Geordnet"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Geordnet"
+    *: "Geordnet"
   </voice>
 </phrase>
 <phrase>
@@ -15932,16 +15397,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Turm"
+    *: "Turm"
   </voice>
 </phrase>
 <phrase>
@@ -15949,18 +15411,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </voice>
 </phrase>
@@ -15997,18 +15456,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </voice>
 </phrase>
@@ -16017,18 +15473,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Fortsetzungsoptionen"
+    *: "Fortsetzungsoptionen"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Fortsetzungsoptionen"
+    *: "Fortsetzungsoptionen"
     lowmem: none
   </voice>
 </phrase>
@@ -16065,16 +15518,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Position speichern"
+    *: "Position speichern"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Position speichern"
+    *: "Position speichern"
   </voice>
 </phrase>
 <phrase>
@@ -16082,18 +15532,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "CPU-Boost"
+    *: "CPU-Boost"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "CPU-Boost"
+    *: "CPU-Boost"
     lowmem: none
   </voice>
 </phrase>
@@ -16102,16 +15549,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Keine Spiele gefunden!"
+    *: "Keine Spiele gefunden!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Keine Spiele gefunden!"
+    *: "Keine Spiele gefunden!"
   </voice>
 </phrase>
 <phrase>
@@ -16133,16 +15577,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache neu erstellen"
+    *: "Cache neu erstellen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache neu erstellen"
+    *: "Cache neu erstellen"
   </voice>
 </phrase>
 <phrase>
@@ -16164,16 +15605,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 10: 1 Zug / 600 min"
+    *: "Level 10: 1 Zug / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 10: 1 Zug pro 600 Minuten"
+    *: "Level 10: 1 Zug pro 600 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -16181,16 +15619,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Neues Spiel"
+    *: "Neues Spiel"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Neues Spiel"
+    *: "Neues Spiel"
   </voice>
 </phrase>
 <phrase>
@@ -16226,16 +15661,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wormlet spielen!"
+    *: "Wormlet spielen!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wormlet spielen!"
+    *: "Wormlet spielen!"
   </voice>
 </phrase>
 <phrase>
@@ -16243,16 +15675,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 8: 1 Zug / 15 min"
+    *: "Level 8: 1 Zug / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 8: 1 Zug pro 15 Minuten"
+    *: "Level 8: 1 Zug pro 15 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -16260,16 +15689,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diashow-Modus umschalten"
+    *: "Diashow-Modus umschalten"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diashow-Modus umschalten"
+    *: "Diashow-Modus umschalten"
   </voice>
 </phrase>
 <phrase>
@@ -16277,16 +15703,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Unten anzeigen"
+    *: "Unten anzeigen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Unten anzeigen"
+    *: "Unten anzeigen"
   </voice>
 </phrase>
 <phrase>
@@ -16294,16 +15717,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "König"
+    *: "König"
   </voice>
 </phrase>
 <phrase>
@@ -16311,16 +15731,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wiedergabeliste gelöscht"
+    *: "Wiedergabeliste gelöscht"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wiedergabeliste gelöscht"
+    *: "Wiedergabeliste gelöscht"
   </voice>
 </phrase>
 <phrase>
@@ -16328,16 +15745,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -16345,16 +15759,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nicht markiert"
+    *: "Nicht markiert"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 566b15c004..ec9b989e06 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -1334,7 +1334,7 @@
 </phrase>
 <phrase>
   id: LANG_TAGCACHE_DISK
-  desc: 
+  desc:
   user: core
   <source>
     *: ""
@@ -1973,7 +1973,7 @@
     *: "Äratusalarm"
   </dest>
   <voice>
-    *: "Äratusalarm
+    *: "Äratusalarm"
   </voice>
 </phrase>
 <phrase>
@@ -2057,7 +2057,7 @@
     *: "Küsi - ainult hiljutised"
   </dest>
   <voice>
-    *: "Küsi - ainult hiljutised
+    *: "Küsi - ainult hiljutised"
   </voice>
 </phrase>
 <phrase>
@@ -2170,7 +2170,7 @@
   </dest>
   <voice>
     *: "Veeri"
-  </voice>	
+  </voice>
 </phrase>
 <phrase>
   id: LANG_VOICE_DIR_HOVER
@@ -2961,16 +2961,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kerimiseribad vaateväljast väljas"
+    *: "Kerimiseribad vaateväljast väljas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kerimiseribad vaateväljast väljas"
+    *: "Kerimiseribad vaateväljast väljas"
   </voice>
 </phrase>
 <phrase>
@@ -2978,16 +2975,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekraanikerimise aste pikkus"
+    *: "Ekraanikerimise aste pikkus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekraanikerimise aste pikkus"
+    *: "Ekraanikerimise aste pikkus"
   </voice>
 </phrase>
 <phrase>
@@ -3334,7 +3328,7 @@
     *: "Set Time/Date"
   </source>
   <dest>
-    *: "Sea kella/kuupäeva
+    *: "Sea kella/kuupäeva"
   </dest>
   <voice>
     *: "Sea kella ja kuupäeva"
@@ -3907,12 +3901,12 @@
   <source>
     *: "Battery: %d%% %dh %dm"
     archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
     archosondiofm,iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Aku"
@@ -3969,24 +3963,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMK:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMK:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimeedia kaart"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "Multimeedia kaart"
   </voice>
 </phrase>
 <phrase>
@@ -4107,25 +4101,25 @@
   user: core
   <source>
     *: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
+    gigabeatfx: "POWER = Revert"
     iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    samsungyh*: "REW = Revert"
     sansafuzeplus: "BACK = Revert"
     vibe500: "CANCEL = Revert"
-    samsungyh*: "REW = Revert"
   </source>
   <dest>
     *: "OFF tagasi pöördumiseks"
-    iriverh100,iriverh120,iriverh300: "STOP tagasi pöördumiseks"
-    ipod*,sansac200*,mpiohd300: "MENU tagasi pöördumiseks"
+    gigabeatfx: "POWER tagasi pöördumiseks"
     iaudiox5: "RECORD tagasi pöördumiseks"
+    ipod*,mpiohd300,sansac200*: "MENU tagasi pöördumiseks"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV tagasi pöördumiseks"
-    gigabeatfx: "POWER tagasi pöördumiseks"
+    iriverh100,iriverh120,iriverh300: "STOP tagasi pöördumiseks"
+    samsungyh*: "REW tagasi pöördumiseks"
     sansafuzeplus: "BACK tagasi pöördumiseks"
     vibe500: "C tagasi pöördumiseks"
-    samsungyh*: "REW tagasi pöördumiseks"
   </dest>
   <voice>
     *: ""
@@ -4208,14 +4202,14 @@
   <source>
     *: "The disk is full. Press OFF to continue."
     iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    vibe500: "The disk is full. Press PREV to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: "The disk is full. Press OFF to continue."
     iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    vibe500: "The disk is full. Press PREV to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    vibe500: "The disk is full. Press PREV to continue."
   </dest>
   <voice>
     *: ""
@@ -4354,16 +4348,16 @@
   <source>
     *: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </dest>
   <voice>
     *: ""
@@ -6741,19 +6735,17 @@
   user: core
   <source>
     *: "OFF to abort"
-    iriverh100,iriverh120,iriverh300: "STOP to abort"
-    ipod*: "PLAY/PAUSE to abort"
     iaudiox5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb: "PREV to abort"
-    sansae200*,sansac200*,vibe500: "PREV to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF katkestamiseks"
-    iriverh100,iriverh120,iriverh300: "STOP katkestamiseks"
-    ipod*: "PLAY/PAUSE katkestamiseks"
     iaudiox5: "Long PLAY katkestamiseks"
-    iriverh10,iriverh10_5gb: "PREV katkestamiseks"
-    sansae200*,sansac200*,vibe500: "PREV katkestamiseks"
+    ipod*: "PLAY/PAUSE katkestamiseks"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV katkestamiseks"
+    iriverh100,iriverh120,iriverh300: "STOP katkestamiseks"
   </dest>
   <voice>
     *: ""
@@ -7220,7 +7212,7 @@
   <voice>
     *: "Remote Scrolling Options"
   </voice>
-</phrase>   
+</phrase>
 <phrase>
   id: LANG_SYSFONT_RECORD_TRIGGER
   desc: in recording settings_menu
@@ -7308,6 +7300,7 @@
 <phrase>
   id: LANG_AGC_DJSET
   desc: AGC preset
+  user: core
   <source>
     *: "DJ-Set (slow)"
   </source>
@@ -7922,7 +7915,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 141c148db2..3fb7c9fdf7 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -811,16 +811,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -828,16 +825,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -845,16 +839,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -862,16 +853,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -879,16 +867,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -896,16 +881,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -913,16 +895,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -930,16 +909,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical equalizer"
+    *: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -947,16 +923,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -964,16 +937,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -981,16 +951,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -998,16 +965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -1015,16 +979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -1032,16 +993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1049,16 +1007,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz band gain"
+    *: "hertz band gain"
   </voice>
 </phrase>
 <phrase>
@@ -1066,16 +1021,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1083,16 +1035,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -1100,16 +1049,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1117,16 +1063,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1134,16 +1077,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Center Frequency"
+    *: "Center Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Center frequency"
+    *: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1151,16 +1091,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1168,16 +1105,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1568,16 +1502,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -1655,16 +1586,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -1672,16 +1600,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -1689,16 +1614,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -1706,16 +1628,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -2264,16 +2183,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -2533,16 +2449,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2550,16 +2463,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -2567,16 +2477,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -2584,16 +2491,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2883,16 +2787,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -2900,16 +2801,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -2965,16 +2863,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -2982,16 +2877,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2999,16 +2891,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3016,16 +2905,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3033,16 +2919,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3050,16 +2933,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3067,16 +2947,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -3266,16 +3143,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -3297,16 +3171,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3314,16 +3185,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -3359,16 +3227,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -3376,16 +3241,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3393,16 +3255,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -3410,16 +3269,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -9240,16 +9096,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9257,16 +9110,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -9274,16 +9124,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9786,16 +9633,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -9803,16 +9647,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -10562,16 +10403,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -10579,16 +10417,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </voice>
 </phrase>
 <phrase>
@@ -10842,16 +10677,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbar Width"
+    *: "Scrollbar Width"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbar width"
+    *: "Scrollbar width"
   </voice>
 </phrase>
 <phrase>
@@ -10859,16 +10691,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbar Position"
+    *: "Scrollbar Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbar position"
+    *: "Scrollbar position"
   </voice>
 </phrase>
 <phrase>
@@ -10876,16 +10705,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -10944,16 +10770,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -10961,16 +10784,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -10978,16 +10798,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -10995,16 +10812,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11012,16 +10826,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11029,16 +10840,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11046,16 +10854,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11063,16 +10868,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -11080,16 +10882,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11097,16 +10896,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11114,16 +10910,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11131,16 +10924,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11148,16 +10938,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -11345,16 +11132,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11362,16 +11146,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11498,16 +11279,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind before resume"
+    *: "Rewind before resume"
   </voice>
 </phrase>
 <phrase>
@@ -12236,16 +12014,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -12281,16 +12056,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </dest>
   <voice>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </voice>
 </phrase>
 <phrase>
@@ -12371,16 +12143,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Slide show Time"
+    *: "Slide show Time"
   </voice>
 </phrase>
 <phrase>
@@ -12388,16 +12157,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </voice>
 </phrase>
 <phrase>
@@ -12422,16 +12188,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Black"
+    *: "Black"
   </voice>
 </phrase>
 <phrase>
@@ -12439,16 +12202,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </voice>
 </phrase>
 <phrase>
@@ -12456,16 +12216,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4: 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -12473,16 +12230,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12490,16 +12244,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </voice>
 </phrase>
 <phrase>
@@ -12563,16 +12314,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "king side"
+    *: "king side"
   </voice>
 </phrase>
 <phrase>
@@ -12594,16 +12342,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12611,16 +12356,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 8: 1 move per 15 minutes"
+    *: "Level 8: 1 move per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -12628,16 +12370,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </voice>
 </phrase>
 <phrase>
@@ -12645,16 +12384,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "White"
+    *: "White"
   </voice>
 </phrase>
 <phrase>
@@ -12662,16 +12398,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Check!"
+    *: "Check!"
   </voice>
 </phrase>
 <phrase>
@@ -12679,19 +12412,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </dest>
   <voice>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </voice>
 </phrase>
 <phrase>
@@ -12699,16 +12429,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </voice>
 </phrase>
 <phrase>
@@ -12716,16 +12443,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </voice>
 </phrase>
 <phrase>
@@ -12795,16 +12519,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </voice>
 </phrase>
 <phrase>
@@ -12840,19 +12561,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </dest>
   <voice>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </voice>
 </phrase>
 <phrase>
@@ -12860,16 +12578,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rook"
+    *: "Rook"
   </voice>
 </phrase>
 <phrase>
@@ -12922,19 +12637,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </dest>
   <voice>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </voice>
 </phrase>
 <phrase>
@@ -12942,16 +12654,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -12959,16 +12668,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "castle"
+    *: "castle"
   </voice>
 </phrase>
 <phrase>
@@ -12993,16 +12699,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Knight"
+    *: "Knight"
   </voice>
 </phrase>
 <phrase>
@@ -13024,16 +12727,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </voice>
 </phrase>
 <phrase>
@@ -13069,16 +12769,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </voice>
 </phrase>
 <phrase>
@@ -13086,16 +12783,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </voice>
 </phrase>
 <phrase>
@@ -13103,16 +12797,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Toggle Slide show Mode"
+    *: "Toggle Slide show Mode"
   </voice>
 </phrase>
 <phrase>
@@ -13134,19 +12825,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </dest>
   <voice>
-    *: none
+    *: "Set resume time"
     lowmem: none
-    swcodec: "Set resume time"
   </voice>
 </phrase>
 <phrase>
@@ -13154,16 +12842,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves per 120 minutes"
+    *: "Level 6: 40 moves per 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13171,16 +12856,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Unmarked"
+    *: "Unmarked"
   </voice>
 </phrase>
 <phrase>
@@ -13188,16 +12870,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves per 15 minutes"
+    *: "Level 2: 60 moves per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13205,16 +12884,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </voice>
 </phrase>
 <phrase>
@@ -13222,16 +12898,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -13239,16 +12912,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 10: 1 move per 600 minutes"
+    *: "Level 10: 1 move per 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13256,16 +12926,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </voice>
 </phrase>
 <phrase>
@@ -13273,16 +12940,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves per 240 minutes"
+    *: "Level 7: 40 moves per 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13290,19 +12954,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </dest>
   <voice>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </voice>
 </phrase>
 <phrase>
@@ -13310,16 +12971,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -13327,19 +12985,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </dest>
   <voice>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </voice>
 </phrase>
 <phrase>
@@ -13361,16 +13016,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </voice>
 </phrase>
 <phrase>
@@ -13378,16 +13030,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No games found!"
+    *: "No games found!"
   </voice>
 </phrase>
 <phrase>
@@ -13437,16 +13086,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </voice>
 </phrase>
 <phrase>
@@ -13454,16 +13100,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13485,19 +13128,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </dest>
   <voice>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </voice>
 </phrase>
 <phrase>
@@ -13519,19 +13159,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </dest>
   <voice>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13539,16 +13176,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13584,16 +13218,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pawn"
+    *: "Pawn"
   </voice>
 </phrase>
 <phrase>
@@ -13618,16 +13249,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Queen"
+    *: "Queen"
   </voice>
 </phrase>
 <phrase>
@@ -13635,16 +13263,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "King"
+    *: "King"
   </voice>
 </phrase>
 <phrase>
@@ -13652,16 +13277,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </voice>
 </phrase>
 <phrase>
@@ -13669,16 +13291,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </voice>
 </phrase>
 <phrase>
@@ -13686,19 +13305,16 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </dest>
   <voice>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </voice>
 </phrase>
 <phrase>
@@ -13723,19 +13339,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </dest>
   <voice>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </voice>
 </phrase>
 <phrase>
@@ -13743,16 +13356,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -13819,19 +13429,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </dest>
   <voice>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </voice>
 </phrase>
 <phrase>
@@ -13856,16 +13463,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </voice>
 </phrase>
 <phrase>
@@ -13887,16 +13491,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </voice>
 </phrase>
 <phrase>
@@ -13921,19 +13522,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </dest>
   <voice>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </voice>
 </phrase>
 <phrase>
@@ -13969,16 +13567,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves per 30 minutes"
+    *: "Level 3: 60 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13986,16 +13581,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </voice>
 </phrase>
 <phrase>
@@ -14031,16 +13623,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -14104,16 +13693,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "queen side"
+    *: "queen side"
   </voice>
 </phrase>
 <phrase>
@@ -14138,19 +13724,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </dest>
   <voice>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </voice>
 </phrase>
 <phrase>
@@ -14158,16 +13741,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -14192,16 +13772,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </voice>
 </phrase>
 <phrase>
@@ -14265,16 +13842,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </voice>
 </phrase>
 <phrase>
@@ -14313,16 +13887,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </voice>
 </phrase>
 <phrase>
@@ -14344,16 +13915,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5: 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14361,16 +13929,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Marked"
+    *: "Marked"
   </voice>
 </phrase>
 <phrase>
@@ -14420,16 +13985,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "captures"
+    *: "captures"
   </voice>
 </phrase>
 <phrase>
@@ -14451,19 +14013,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </dest>
   <voice>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </voice>
 </phrase>
 <phrase>
@@ -14505,16 +14064,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -14536,16 +14092,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </voice>
 </phrase>
 <phrase>
@@ -14595,16 +14148,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14612,16 +14162,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bishop"
+    *: "Bishop"
   </voice>
 </phrase>
 <phrase>
@@ -14657,16 +14204,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Player"
+    *: "Player"
   </voice>
 </phrase>
 <phrase>
@@ -14688,16 +14232,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -14705,16 +14246,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 9: 1 move per 60 minutes"
+    *: "Level 9: 1 move per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14736,16 +14274,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </voice>
 </phrase>
 <phrase>
@@ -14753,16 +14288,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves per 5 minutes"
+    *: "Level 1: 60 moves per 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14784,16 +14316,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </voice>
 </phrase>
 <phrase>
@@ -14829,19 +14358,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </dest>
   <voice>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </voice>
 </phrase>
 <phrase>
@@ -14863,19 +14389,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </dest>
   <voice>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </voice>
 </phrase>
 <phrase>
@@ -14883,19 +14406,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </dest>
   <voice>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </voice>
 </phrase>
 <phrase>
@@ -15183,16 +14703,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -15200,16 +14717,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15217,16 +14731,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15234,19 +14745,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </dest>
   <voice>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </voice>
 </phrase>
 <phrase>
@@ -15254,16 +14762,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </voice>
 </phrase>
 <phrase>
@@ -15271,16 +14776,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </voice>
 </phrase>
 <phrase>
@@ -15288,19 +14790,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </dest>
   <voice>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </voice>
 </phrase>
 <phrase>
@@ -15308,19 +14807,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </dest>
   <voice>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </voice>
 </phrase>
 <phrase>
@@ -15328,19 +14824,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </dest>
   <voice>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </voice>
 </phrase>
 <phrase>
@@ -15348,16 +14841,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </voice>
 </phrase>
 <phrase>
@@ -15365,16 +14855,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15382,16 +14869,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </voice>
 </phrase>
 <phrase>
@@ -15399,16 +14883,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </voice>
 </phrase>
 <phrase>
@@ -15416,16 +14897,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -15433,16 +14911,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </voice>
 </phrase>
 <phrase>
@@ -15450,16 +14925,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </voice>
 </phrase>
 <phrase>
@@ -15467,16 +14939,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </voice>
 </phrase>
 <phrase>
@@ -15484,16 +14953,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </voice>
 </phrase>
 <phrase>
@@ -15501,16 +14967,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </voice>
 </phrase>
 <phrase>
@@ -15518,16 +14981,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </voice>
 </phrase>
 <phrase>
@@ -15535,16 +14995,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </voice>
 </phrase>
 <phrase>
@@ -15552,16 +15009,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </voice>
 </phrase>
 <phrase>
@@ -15569,16 +15023,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </voice>
 </phrase>
 <phrase>
@@ -15586,16 +15037,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </voice>
 </phrase>
 <phrase>
@@ -15603,19 +15051,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </dest>
   <voice>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </voice>
 </phrase>
 <phrase>
@@ -15637,16 +15082,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </voice>
 </phrase>
 <phrase>
@@ -15696,16 +15138,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -15713,16 +15152,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </voice>
 </phrase>
 <phrase>
@@ -15730,16 +15166,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15747,16 +15180,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15764,16 +15194,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -16036,19 +15463,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </dest>
   <voice>
-    *: none
+    *: "High Quality Mixer"
     lowmem: none
-    swcodec: "High Quality Mixer"
   </voice>
 </phrase>
 <phrase>
@@ -16056,19 +15480,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </dest>
   <voice>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index d0b088cf76..1c2462fb1a 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -888,16 +888,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -905,16 +902,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -922,16 +916,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -939,16 +930,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -956,16 +944,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -973,16 +958,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -990,16 +972,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1007,16 +986,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical equalizer"
+    *: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1024,16 +1000,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -1041,16 +1014,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -1058,16 +1028,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -1075,16 +1042,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -1092,16 +1056,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -1109,16 +1070,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1126,16 +1084,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz band gain"
+    *: "hertz band gain"
   </voice>
 </phrase>
 <phrase>
@@ -1143,16 +1098,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1160,16 +1112,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -1177,16 +1126,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1194,16 +1140,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1211,16 +1154,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centre frequency"
+    *: "Centre frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1228,16 +1168,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1245,16 +1182,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1645,16 +1579,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -1732,16 +1663,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -1749,16 +1677,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -1766,16 +1691,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -1783,16 +1705,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -2341,16 +2260,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -2612,16 +2528,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2629,16 +2542,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -2646,16 +2556,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -2663,16 +2570,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2962,16 +2866,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -2979,16 +2880,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -3044,16 +2942,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -3061,16 +2956,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3078,16 +2970,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3095,16 +2984,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3112,16 +2998,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3129,16 +3012,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3146,16 +3026,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -3345,16 +3222,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -3376,16 +3250,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3393,16 +3264,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -3438,16 +3306,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -3455,16 +3320,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3472,16 +3334,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -3489,16 +3348,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -9325,16 +9181,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9342,16 +9195,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -9359,16 +9209,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9871,16 +9718,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -9888,16 +9732,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -10647,16 +10488,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Time stretch"
+    *: "Time stretch"
   </voice>
 </phrase>
 <phrase>
@@ -10664,16 +10502,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </voice>
 </phrase>
 <phrase>
@@ -10927,16 +10762,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar width"
+    *: "Scroll bar width"
   </voice>
 </phrase>
 <phrase>
@@ -10944,16 +10776,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -10961,16 +10790,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11029,16 +10855,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -11046,16 +10869,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -11063,16 +10883,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11080,16 +10897,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11097,16 +10911,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11114,16 +10925,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11131,16 +10939,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11148,16 +10953,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -11165,16 +10967,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11182,16 +10981,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11199,16 +10995,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11216,16 +11009,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11233,16 +11023,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </voice>
 </phrase>
 <phrase>
@@ -11250,16 +11037,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -11447,16 +11231,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11464,16 +11245,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11600,16 +11378,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind before resume"
+    *: "Rewind before resume"
   </voice>
 </phrase>
 <phrase>
@@ -12425,16 +12200,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -12442,16 +12214,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </dest>
   <voice>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </voice>
 </phrase>
 <phrase>
@@ -12620,16 +12389,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12637,16 +12403,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </voice>
 </phrase>
 <phrase>
@@ -12654,16 +12417,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </voice>
 </phrase>
 <phrase>
@@ -12671,16 +12431,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12688,16 +12445,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12705,16 +12459,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12722,16 +12473,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -12739,16 +12487,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -13443,16 +13188,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -13460,16 +13202,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </voice>
 </phrase>
 <phrase>
@@ -13477,16 +13216,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -13494,16 +13230,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </voice>
 </phrase>
 <phrase>
@@ -13511,16 +13244,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -13528,16 +13258,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </voice>
 </phrase>
 <phrase>
@@ -13545,16 +13272,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </voice>
 </phrase>
 <phrase>
@@ -13744,16 +13468,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </voice>
 </phrase>
 <phrase>
@@ -13761,16 +13482,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </voice>
 </phrase>
 <phrase>
@@ -13778,16 +13496,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </voice>
 </phrase>
 <phrase>
@@ -13795,16 +13510,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </voice>
 </phrase>
 <phrase>
@@ -13812,16 +13524,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </voice>
 </phrase>
 <phrase>
@@ -13829,16 +13538,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </voice>
 </phrase>
 <phrase>
@@ -13846,16 +13552,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </voice>
 </phrase>
 <phrase>
@@ -13863,16 +13566,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </voice>
 </phrase>
 <phrase>
@@ -13880,16 +13580,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves per 5 minutes"
+    *: "Level 1: 60 moves per 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13897,16 +13594,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves per 15 minutes"
+    *: "Level 2: 60 moves per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13914,16 +13608,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves per 30 minutes"
+    *: "Level 3: 60 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13931,16 +13622,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4: 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13948,16 +13636,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5: 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13965,16 +13650,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves per 120 minutes"
+    *: "Level 6: 40 moves per 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13982,16 +13664,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves per 240 minutes"
+    *: "Level 7: 40 moves per 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13999,16 +13678,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 8: 1 move per 15 minutes"
+    *: "Level 8: 1 move per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14016,16 +13692,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 9: 1 move per 60 minutes"
+    *: "Level 9: 1 move per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14033,16 +13706,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 10: 1 move per 600 minutes"
+    *: "Level 10: 1 move per 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14050,16 +13720,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </voice>
 </phrase>
 <phrase>
@@ -14067,16 +13734,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No games found!"
+    *: "No games found!"
   </voice>
 </phrase>
 <phrase>
@@ -14084,16 +13748,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </voice>
 </phrase>
 <phrase>
@@ -14101,16 +13762,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </voice>
 </phrase>
 <phrase>
@@ -14118,16 +13776,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Player"
+    *: "Player"
   </voice>
 </phrase>
 <phrase>
@@ -14135,16 +13790,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -14152,16 +13804,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Marked"
+    *: "Marked"
   </voice>
 </phrase>
 <phrase>
@@ -14169,16 +13818,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Unmarked"
+    *: "Unmarked"
   </voice>
 </phrase>
 <phrase>
@@ -14186,16 +13832,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "White"
+    *: "White"
   </voice>
 </phrase>
 <phrase>
@@ -14203,16 +13846,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Black"
+    *: "Black"
   </voice>
 </phrase>
 <phrase>
@@ -14220,16 +13860,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Check!"
+    *: "Check!"
   </voice>
 </phrase>
 <phrase>
@@ -14237,16 +13874,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "captures"
+    *: "captures"
   </voice>
 </phrase>
 <phrase>
@@ -14254,16 +13888,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "castle"
+    *: "castle"
   </voice>
 </phrase>
 <phrase>
@@ -14271,16 +13902,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "king side"
+    *: "king side"
   </voice>
 </phrase>
 <phrase>
@@ -14288,16 +13916,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "queen side"
+    *: "queen side"
   </voice>
 </phrase>
 <phrase>
@@ -14305,16 +13930,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pawn"
+    *: "Pawn"
   </voice>
 </phrase>
 <phrase>
@@ -14322,16 +13944,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Knight"
+    *: "Knight"
   </voice>
 </phrase>
 <phrase>
@@ -14339,16 +13958,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bishop"
+    *: "Bishop"
   </voice>
 </phrase>
 <phrase>
@@ -14356,16 +13972,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rook"
+    *: "Rook"
   </voice>
 </phrase>
 <phrase>
@@ -14373,16 +13986,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Queen"
+    *: "Queen"
   </voice>
 </phrase>
 <phrase>
@@ -14390,16 +14000,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "King"
+    *: "King"
   </voice>
 </phrase>
 <phrase>
@@ -14407,16 +14014,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14424,16 +14028,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </voice>
 </phrase>
 <phrase>
@@ -14441,16 +14042,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </voice>
 </phrase>
 <phrase>
@@ -14458,16 +14056,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14503,16 +14098,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </voice>
 </phrase>
 <phrase>
@@ -14520,16 +14112,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </voice>
 </phrase>
 <phrase>
@@ -14537,16 +14126,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </voice>
 </phrase>
 <phrase>
@@ -14554,16 +14140,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </voice>
 </phrase>
 <phrase>
@@ -14571,16 +14154,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Toggle Slide show Mode"
+    *: "Toggle Slide show Mode"
   </voice>
 </phrase>
 <phrase>
@@ -14588,16 +14168,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Slide show Time"
+    *: "Slide show Time"
   </voice>
 </phrase>
 <phrase>
@@ -14636,16 +14213,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </voice>
 </phrase>
 <phrase>
@@ -14653,19 +14227,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </dest>
   <voice>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </voice>
 </phrase>
 <phrase>
@@ -14673,19 +14244,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </dest>
   <voice>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </voice>
 </phrase>
 <phrase>
@@ -14693,19 +14261,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </dest>
   <voice>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </voice>
 </phrase>
 <phrase>
@@ -14713,19 +14278,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </dest>
   <voice>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </voice>
 </phrase>
 <phrase>
@@ -14733,19 +14295,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </dest>
   <voice>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </voice>
 </phrase>
 <phrase>
@@ -14753,19 +14312,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </dest>
   <voice>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </voice>
 </phrase>
 <phrase>
@@ -14773,19 +14329,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </dest>
   <voice>
-    *: none
+    *: "Set resume time"
     lowmem: none
-    swcodec: "Set resume time"
   </voice>
 </phrase>
 <phrase>
@@ -14793,16 +14346,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14810,19 +14360,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </dest>
   <voice>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14830,19 +14377,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </dest>
   <voice>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </voice>
 </phrase>
 <phrase>
@@ -14850,19 +14394,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </dest>
   <voice>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </voice>
 </phrase>
 <phrase>
@@ -14870,19 +14411,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </dest>
   <voice>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </voice>
 </phrase>
 <phrase>
@@ -14890,19 +14428,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </dest>
   <voice>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </voice>
 </phrase>
 <phrase>
@@ -14910,19 +14445,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </dest>
   <voice>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </voice>
 </phrase>
 <phrase>
@@ -14930,19 +14462,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </dest>
   <voice>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </voice>
 </phrase>
 <phrase>
@@ -14950,19 +14479,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </dest>
   <voice>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </voice>
 </phrase>
 <phrase>
@@ -14970,19 +14496,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </dest>
   <voice>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </voice>
 </phrase>
 <phrase>
@@ -14990,19 +14513,16 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </dest>
   <voice>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </voice>
 </phrase>
 <phrase>
@@ -15304,19 +14824,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </dest>
   <voice>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </voice>
 </phrase>
 <phrase>
@@ -15324,19 +14841,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </dest>
   <voice>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </voice>
 </phrase>
 <phrase>
@@ -15344,19 +14858,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </dest>
   <voice>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </voice>
 </phrase>
 <phrase>
@@ -15364,19 +14875,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </dest>
   <voice>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </voice>
 </phrase>
 <phrase>
@@ -15384,19 +14892,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </dest>
   <voice>
-    *: none
+    *: "High Quality Mixer"
     lowmem: none
-    swcodec: "High Quality Mixer"
   </voice>
 </phrase>
 <phrase>
@@ -15404,19 +14909,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </dest>
   <voice>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </voice>
 </phrase>
 <phrase>
@@ -15424,19 +14926,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </dest>
   <voice>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </voice>
 </phrase>
 <phrase>
@@ -15444,16 +14943,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </voice>
 </phrase>
 <phrase>
@@ -15461,16 +14957,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </voice>
 </phrase>
 <phrase>
@@ -15478,16 +14971,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </voice>
 </phrase>
 <phrase>
@@ -15495,16 +14985,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -15512,16 +14999,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </voice>
 </phrase>
 <phrase>
@@ -15529,16 +15013,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </voice>
 </phrase>
 <phrase>
@@ -15546,16 +15027,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </voice>
 </phrase>
 <phrase>
@@ -15563,16 +15041,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </voice>
 </phrase>
 <phrase>
@@ -15580,16 +15055,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </voice>
 </phrase>
 <phrase>
@@ -15597,16 +15069,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15614,16 +15083,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </voice>
 </phrase>
 <phrase>
@@ -15631,16 +15097,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -15648,16 +15111,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15665,16 +15125,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </voice>
 </phrase>
 <phrase>
@@ -15682,16 +15139,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </voice>
 </phrase>
 <phrase>
@@ -15699,16 +15153,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </voice>
 </phrase>
 <phrase>
@@ -15716,16 +15167,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </voice>
 </phrase>
 <phrase>
@@ -15733,16 +15181,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </voice>
 </phrase>
 <phrase>
@@ -15750,16 +15195,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </voice>
 </phrase>
 <phrase>
@@ -15767,16 +15209,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15784,16 +15223,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </voice>
 </phrase>
 <phrase>
@@ -15843,16 +15279,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </voice>
 </phrase>
 <phrase>
@@ -15860,16 +15293,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -15877,16 +15307,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15894,16 +15321,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </voice>
 </phrase>
 <phrase>
@@ -15911,16 +15335,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 596bf54479..7584df2faa 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -1110,16 +1110,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fuente"
+    *: "Fuente"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fuente"
+    *: "Fuente"
   </voice>
 </phrase>
 <phrase>
@@ -1169,16 +1166,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de estado/desplazamiento"
+    *: "Barra de estado/desplazamiento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de estado o desplazamiento"
+    *: "Barra de estado o desplazamiento"
   </voice>
 </phrase>
 <phrase>
@@ -1527,15 +1521,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frecuencia"
+    play_frequency,recording: "Frecuencia"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frecuencia"
+    play_frequency,recording: "Frecuencia"
   </voice>
 </phrase>
 <phrase>
@@ -1561,18 +1555,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Micrófono"
     iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    recording: "Micrófono"
   </dest>
   <voice>
     *: none
-    recording: "Micrófono"
     iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    recording: "Micrófono"
   </voice>
 </phrase>
 <phrase>
@@ -1712,11 +1706,11 @@
   </source>
   <dest>
     *: none
-    charging: "Luz de fondo (mientras está conectado)"	
+    charging: "Luz de fondo (mientras está conectado)"
   </dest>
   <voice>
     *: none
-    charging: "Luz de fondo (mientras está conectado)"	
+    charging: "Luz de fondo (mientras está conectado)"
   </voice>
 </phrase>
 <phrase>
@@ -1786,16 +1780,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cabeza abajo"
+    *: "Cabeza abajo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cabeza abajo"
+    *: "Cabeza abajo"
   </voice>
 </phrase>
 <phrase>
@@ -1803,16 +1794,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipo de selector de línea"
+    *: "Tipo de selector de línea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipo de selector de línea"
+    *: "Tipo de selector de línea"
   </voice>
 </phrase>
 <phrase>
@@ -1820,16 +1808,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Puntero"
+    *: "Puntero"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Puntero"
+    *: "Puntero"
   </voice>
 </phrase>
 <phrase>
@@ -1837,16 +1822,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra (vídeo inverso)"
+    *: "Barra (vídeo inverso)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra, vídeo inverso"
+    *: "Barra, vídeo inverso"
   </voice>
 </phrase>
 <phrase>
@@ -1924,7 +1906,7 @@
   desc: Bidirectional scroll limit
   user: core
   <source>
-    *: "Bidirectional Scroll Limit" 
+    *: "Bidirectional Scroll Limit"
   </source>
   <dest>
     *: "Límite de desplazamiento bidireccional"
@@ -1938,16 +1920,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de desplazamiento"
+    *: "Barra de desplazamiento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de desplazamiento"
+    *: "Barra de desplazamiento"
   </voice>
 </phrase>
 <phrase>
@@ -1955,16 +1934,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de estado"
+    *: "Barra de estado"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de estado"
+    *: "Barra de estado"
   </voice>
 </phrase>
 <phrase>
@@ -1989,16 +1965,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar volumen"
+    *: "Mostrar volumen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar volumen"
+    *: "Mostrar volumen"
   </voice>
 </phrase>
 <phrase>
@@ -2006,16 +1979,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar batería"
+    *: "Mostrar batería"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar batería"
+    *: "Mostrar batería"
   </voice>
 </phrase>
 <phrase>
@@ -2023,16 +1993,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic" 
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -2040,16 +2007,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none 
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </voice>
 </phrase>
 <phrase>
@@ -2061,11 +2025,11 @@
     masd: none
   </source>
   <dest>
-    *: "Caída del analizador de espectro" 
+    *: "Caída del analizador de espectro"
     masd: none
   </dest>
   <voice>
-    *: "Caída del analizador de espectro" 
+    *: "Caída del analizador de espectro"
     masd: none
   </voice>
 </phrase>
@@ -2078,11 +2042,11 @@
     masd: none
   </source>
   <dest>
-    *: "Tiempo de permanencia del medidor de picos" 
+    *: "Tiempo de permanencia del medidor de picos"
     masd: none
   </dest>
   <voice>
-    *: "Tiempo de permanencia del medidor de picos" 
+    *: "Tiempo de permanencia del medidor de picos"
     masd: none
   </voice>
 </phrase>
@@ -2354,7 +2318,7 @@
     *: "Máx. archivos por carpeta"
   </dest>
   <voice>
-    *: "Número máximo de archivos por carpeta" 
+    *: "Número máximo de archivos por carpeta"
   </voice>
 </phrase>
 <phrase>
@@ -2708,13 +2672,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batería: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivel y tiempo de batería"
@@ -2875,35 +2839,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Cancelar"
-    mrobe500: "POWER = Cancelar"
-    iriverh100,iriverh120,iriverh300: "STOP = Cancelar"
-    ipod*,sansac200*,mpiohd300: "MENÚ = Cancelar"
-    iaudiox5,iaudiom5: "RECORD = Cancelar"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancelar"
-    gigabeatfx: "POWER = Cancelar"
-    sansafuzeplus: "BACK = Cancelar"
-    mrobe100: "DISPLAY = Cancelar"
+    gigabeatfx,mrobe500: "POWER = Cancelar"
     gigabeats: "ATRÁS = Cancelar"
     gogearsa9200: "IZQUIERDA = Cancelar"
-    vibe500: "C = Cancelar"
+    iaudiom5,iaudiox5: "RECORD = Cancelar"
+    ipod*,mpiohd300,sansac200*: "MENÚ = Cancelar"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancelar"
+    iriverh100,iriverh120,iriverh300: "STOP = Cancelar"
+    mrobe100: "DISPLAY = Cancelar"
+    rtc: "OFF = Cancelar"
     samsungyh*: "REW = Cancelar"
+    sansafuzeplus: "BACK = Cancelar"
+    vibe500: "C = Cancelar"
   </dest>
   <voice>
     *: none
@@ -2923,7 +2884,7 @@
   </dest>
   <voice>
     *: none
-    recording: ""	
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -2949,23 +2910,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disco duro lleno. Pulse OFF para continuar"
-    iriverh100,iriverh120,iriverh300: "Disco duro lleno. Pulse STOP para continuar"
     iaudiom5,iaudiox5: "Disco duro lleno. Pulse POWER para continuar"
-    sansae200*,sansac200*,vibe500: "Disco duro lleno. Pulse PREV para continuar"
+    iriverh100,iriverh120,iriverh300: "Disco duro lleno. Pulse STOP para continuar"
+    recording: "Disco duro lleno. Pulse OFF para continuar"
     samsungyh*: "Disco duro lleno. Pulse LEFT para continuar"
+    sansac200*,sansae200*,vibe500: "Disco duro lleno. Pulse PREV para continuar"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3043,22 +3004,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aceptar OFF=Cancelar"
+    gigabeats: "SELECT=Aceptar POWER=Cancelar"
     ipod*: "SELECT=Aceptar MENU=Cancelar"
     iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar"
-    gigabeats: "SELECT=Aceptar POWER=Cancelar"
-    vibe500: "OK=Aceptar C=Cancelar"
     mpiohd300: "ENTER=Aceptar MENU=Cancelar"
     sansafuzeplus: "SELECT=Aceptar  BACK=Cancelar"
+    vibe500: "OK=Aceptar C=Cancelar"
   </dest>
   <voice>
     *: none
@@ -5205,7 +5166,7 @@
     *: "¿Reiniciar ahora?"
   </dest>
   <voice>
-    *: "¿Reiniciar ahora?" 
+    *: "¿Reiniciar ahora?"
   </voice>
 </phrase>
 <phrase>
@@ -5214,23 +5175,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK para cancelar"
     gigabeatfx: "POWER para cancelar"
-    sansafuzeplus: "BACK para cancelar"
+    gigabeats,sansafuzeplus: "BACK para cancelar"
+    iaudiom5,iaudiox5: "Pulsación larga de PLAY para cancelar"
+    ipod*: "PLAY/PAUSE para cancelar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV para cancelar"
+    iriverh100,iriverh120,iriverh300: "STOP para cancelar"
   </dest>
   <voice>
     *: ""
@@ -5593,16 +5552,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </voice>
 </phrase>
 <phrase>
@@ -5610,16 +5566,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de edición: %s %s"
+    *: "Modo de edición: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -5661,16 +5614,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Configuración avanzada de ecualizador"
+    *: "Configuración avanzada de ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Configuración avanzada de ecualizador"
+    *: "Configuración avanzada de ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -5779,16 +5729,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ecualizador gráfico"
+    *: "Ecualizador gráfico"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ecualizador gráfico"
+    *: "Ecualizador gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -5827,16 +5774,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </voice>
 </phrase>
 <phrase>
@@ -5926,16 +5870,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -5991,16 +5932,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tailandés (ISO-8859-11)"
+    *: "Tailandés (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tailandés, iso 8859 11"
+    *: "Tailandés, iso 8859 11"
   </voice>
 </phrase>
 <phrase>
@@ -6036,16 +5974,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Alto"
+    *: "Alto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Alto"
+    *: "Alto"
   </voice>
 </phrase>
 <phrase>
@@ -6070,16 +6005,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precorte"
+    *: "Precorte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Precorte"
+    *: "Precorte"
   </voice>
 </phrase>
 <phrase>
@@ -6087,16 +6019,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonés (SJIS)"
+    *: "Japonés (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonés, s j i s"
+    *: "Japonés, s j i s"
   </voice>
 </phrase>
 <phrase>
@@ -6132,16 +6061,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreo (ISO 8859-8)"
+    *: "Hebreo (ISO 8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreo, iso 8859 8"
+    *: "Hebreo, iso 8859 8"
   </voice>
 </phrase>
 <phrase>
@@ -6180,16 +6106,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevenir cortes"
+    *: "Prevenir cortes"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevenir cortes"
+    *: "Prevenir cortes"
   </voice>
 </phrase>
 <phrase>
@@ -6228,16 +6151,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreano (KSX1001)"
+    *: "Coreano (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coreano, k s x 1001"
+    *: "Coreano, k s x 1001"
   </voice>
 </phrase>
 <phrase>
@@ -6276,16 +6196,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chino simplificado (GB2312)"
+    *: "Chino simplificado (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chino simplificado, g b 2312"
+    *: "Chino simplificado, g b 2312"
   </voice>
 </phrase>
 <phrase>
@@ -6352,16 +6269,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Sonido del salto de pista"
+    *: "Sonido del salto de pista"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sonido del salto de pista"
+    *: "Sonido del salto de pista"
   </voice>
 </phrase>
 <phrase>
@@ -6386,16 +6300,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Guardar EQ preestablecido"
+    *: "Guardar EQ preestablecido"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guardar ecualizador preestablecido"
+    *: "Guardar ecualizador preestablecido"
   </voice>
 </phrase>
 <phrase>
@@ -6471,16 +6382,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Reproducción con fundido"
+    *: "Reproducción con fundido"
   </dest>
   <voice>
-    *: none
-    swcodec: "Reproducción con fundido"
+    *: "Reproducción con fundido"
   </voice>
 </phrase>
 <phrase>
@@ -6550,16 +6458,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chino tradicional (BIG5)"
+    *: "Chino tradicional (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chino tradicional, b i g 5"
+    *: "Chino tradicional, b i g 5"
   </voice>
 </phrase>
 <phrase>
@@ -6708,16 +6613,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tamaño del paso de desplazamiento por pantalla"
+    *: "Tamaño del paso de desplazamiento por pantalla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tamaño del paso de desplazamiento por pantalla"
+    *: "Tamaño del paso de desplazamiento por pantalla"
   </voice>
 </phrase>
 <phrase>
@@ -6801,16 +6703,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Recorte de altas frecuencias"
+    *: "Recorte de altas frecuencias"
   </dest>
   <voice>
-    *: none
-    swcodec: "Recorte de altas frecuencias"
+    *: "Recorte de altas frecuencias"
   </voice>
 </phrase>
 <phrase>
@@ -6866,16 +6765,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Desplazamiento fuera de pantalla"
+    *: "Desplazamiento fuera de pantalla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Desplazamiento fuera de pantalla"
+    *: "Desplazamiento fuera de pantalla"
   </voice>
 </phrase>
 <phrase>
@@ -7063,16 +6959,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </voice>
 </phrase>
 <phrase>
@@ -7257,16 +7150,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz ganancia de banda"
+    *: "%d Hz ganancia de banda"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hercios de ganancia de banda"
+    *: "Hercios de ganancia de banda"
   </voice>
 </phrase>
 <phrase>
@@ -7291,16 +7181,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecuencia central"
+    *: "Frecuencia central"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecuencia central"
+    *: "Frecuencia central"
   </voice>
 </phrase>
 <phrase>
@@ -7368,24 +7255,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "m S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "m S D"
     xduoox3: "m S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7528,16 +7415,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Unificación de volumen de cruce"
+    *: "Unificación de volumen de cruce"
   </dest>
   <voice>
-    *: none
-    swcodec: "Unificación de volumen de cruce"
+    *: "Unificación de volumen de cruce"
   </voice>
 </phrase>
 <phrase>
@@ -7545,16 +7429,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Árabe (CP1256)"
+    *: "Árabe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Árabe, c p 1256"
+    *: "Árabe, c p 1256"
   </voice>
 </phrase>
 <phrase>
@@ -7613,16 +7494,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Configuración simple de ecualizador"
+    *: "Configuración simple de ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Configuración simple de ecualizador"
+    *: "Configuración simple de ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -7630,16 +7508,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de nivel bajo"
+    *: "Filtro de nivel bajo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de nivel bajo"
+    *: "Filtro de nivel bajo"
   </voice>
 </phrase>
 <phrase>
@@ -7664,16 +7539,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Débil"
+    *: "Débil"
   </dest>
   <voice>
-    *: none
-    swcodec: "Débil"
+    *: "Débil"
   </voice>
 </phrase>
 <phrase>
@@ -7698,16 +7570,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de edición: %s"
+    *: "Modo de edición: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7715,16 +7584,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuación de altas frecuencias"
+    *: "Atenuación de altas frecuencias"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuación de altas frecuencias"
+    *: "Atenuación de altas frecuencias"
   </voice>
 </phrase>
 <phrase>
@@ -7749,16 +7615,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Habilitar Ecualizador"
+    *: "Habilitar Ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Habilitar Ecualizador"
+    *: "Habilitar Ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -7811,16 +7674,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de nivel alto"
+    *: "Filtro de nivel alto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de nivel alto"
+    *: "Filtro de nivel alto"
   </voice>
 </phrase>
 <phrase>
@@ -7876,16 +7736,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Explorar EQ preestablecidas"
+    *: "Explorar EQ preestablecidas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Explorar Ecualizaciones Preestablecidas"
+    *: "Explorar Ecualizaciones Preestablecidas"
   </voice>
 </phrase>
 <phrase>
@@ -7924,16 +7781,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ecualizador"
+    *: "Ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ecualizador"
+    *: "Ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -8006,16 +7860,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Unificación de volumen directo"
+    *: "Unificación de volumen directo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Unificación de volumen directo"
+    *: "Unificación de volumen directo"
   </voice>
 </phrase>
 <phrase>
@@ -8040,16 +7891,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de pico %d"
+    *: "Filtro de pico %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de pico"
+    *: "Filtro de pico"
   </voice>
 </phrase>
 <phrase>
@@ -8426,21 +8274,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Construyendo base de datos... %d encontrados (OFF para volver)"
-    iriverh100,iriverh120,iriverh300: "Construyendo base de datos... %d encontrados (STOP para volver)"
-    ipod*: "Construyendo base de datos... %d encontrados (PREV para volver)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Construyendo base de datos... %d encontrados (LEFT para volver)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construyendo base de datos... %d encontrados (PREV para volver)"
-    gogearsa9200: "Construyendo base de datos... %d encontrados (REW para volver)"
     archosplayer: "Construyendo BD %d encontrados"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Construyendo base de datos... %d encontrados (LEFT para volver)"
+    gogearsa9200: "Construyendo base de datos... %d encontrados (REW para volver)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Construyendo base de datos... %d encontrados (PREV para volver)"
+    iriverh100,iriverh120,iriverh300: "Construyendo base de datos... %d encontrados (STOP para volver)"
   </dest>
   <voice>
     *: "elementos encontrados en base de datos"
@@ -8528,15 +8374,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frecuencia de corte de bajos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frecuencia de corte de bajos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de bajos"
   </voice>
 </phrase>
 <phrase>
@@ -8702,7 +8548,7 @@
 </phrase>
 <phrase>
   id: LANG_DELETING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Deleting..."
@@ -8997,7 +8843,7 @@
 </phrase>
 <phrase>
   id: LANG_REC_DIR_NOT_WRITABLE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -9032,20 +8878,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Sí"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENÚ o arriba-derecha = Sí"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Sí"
     iriverh100,iriverh120,iriverh300: "NAVI = Sí"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Sí"
     mrobe500: "PLAY, POWER o arriba-derecha = Sí"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Sí"
   </dest>
   <voice>
@@ -9058,23 +8904,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Fijar"
-    mrobe500: "HEART = Fijar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Fijar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Fijar"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Fijar"
     gogearsa9200,samsungyh*: "PLAY = Fijar"
-    vibe500: "OK = Fijar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Fijar"
     mpiohd300: "ENTER = Fijar"
+    mrobe500: "HEART = Fijar"
+    rtc: "ON = Fijar"
+    vibe500: "OK = Fijar"
   </dest>
   <voice>
     *: none
@@ -9098,7 +8944,7 @@
 </phrase>
 <phrase>
   id: LANG_BROWSE_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: "Browse Cuesheet"
@@ -9261,7 +9107,7 @@
 </phrase>
 <phrase>
   id: LANG_ADD_TO_FAVES
-  desc: 
+  desc:
   user: core
   <source>
     *: "Add to Shortcuts"
@@ -9325,21 +9171,18 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganancia"
+    *: "Ganancia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganancia"
+    *: "Ganancia"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CLEAR_REC_DIR
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -9403,15 +9246,15 @@
   id: LANG_AFMT_AIFF
   desc: audio format description
   user: core
-  <source>  
+  <source>
     *: none
     recording: "AIFF"
   </source>
-  <dest>  
+  <dest>
     *: none
     recording: "AIFF"
   </dest>
-  <voice>  
+  <voice>
     *: none
     recording: "a i f f"
   </voice>
@@ -9421,16 +9264,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modo:"
+    *: "Modo:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9962,16 +9802,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Suavizado"
+    *: "Suavizado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suavizado"
+    *: "Suavizado"
   </voice>
 </phrase>
 <phrase>
@@ -10007,7 +9844,7 @@
 </phrase>
 <phrase>
   id: LANG_MOVING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Moving..."
@@ -10035,7 +9872,7 @@
 </phrase>
 <phrase>
   id: VOICE_EXT_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: ""
@@ -10099,17 +9936,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
+    sansae200*,sansafuze*: "Tiempo de espera en la luz de la rueda"
   </dest>
   <voice>
     *: none
     button_light: "Tiempo de espera en la luz del botón"
-    sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda"
+    sansae200*,sansafuze*: "Tiempo de espera en la luz de la rueda"
   </voice>
 </phrase>
 <phrase>
@@ -10166,15 +10003,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frec. de corte de agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frec. de corte de agudos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frecuencia de corte de agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frecuencia de corte de agudos"
   </voice>
 </phrase>
 <phrase>
@@ -10353,7 +10190,7 @@
 </phrase>
 <phrase>
   id: LANG_COPYING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Copying..."
@@ -10418,16 +10255,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Sonido de teclas"
+    *: "Sonido de teclas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sonido de teclas"
+    *: "Sonido de teclas"
   </voice>
 </phrase>
 <phrase>
@@ -10435,16 +10269,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repetición del sonido de las teclas"
+    *: "Repetición del sonido de las teclas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repetición del sonido de las teclas"
+    *: "Repetición del sonido de las teclas"
   </voice>
 </phrase>
 <phrase>
@@ -11194,16 +11025,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tiempo de salida"
+    *: "Tiempo de salida"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tiempo de salida"
+    *: "Tiempo de salida"
   </voice>
 </phrase>
 <phrase>
@@ -11211,16 +11039,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Umbral"
+    *: "Umbral"
   </dest>
   <voice>
-    *: none
-    swcodec: "Umbral"
+    *: "Umbral"
   </voice>
 </phrase>
 <phrase>
@@ -11228,16 +11053,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganancia de compensación"
+    *: "Ganancia de compensación"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganancia de compensación"
+    *: "Ganancia de compensación"
   </voice>
 </phrase>
 <phrase>
@@ -11245,16 +11067,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aspecto predeterminado"
+    *: "Aspecto predeterminado"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aspecto predeterminado"
+    *: "Aspecto predeterminado"
   </voice>
 </phrase>
 <phrase>
@@ -11262,16 +11081,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posición de la barra de desplazamiento"
+    *: "Posición de la barra de desplazamiento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posición de la barra de desplazamiento"
+    *: "Posición de la barra de desplazamiento"
   </voice>
 </phrase>
 <phrase>
@@ -11313,16 +11129,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Codo"
+    *: "Codo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Codo"
+    *: "Codo"
   </voice>
 </phrase>
 <phrase>
@@ -11330,16 +11143,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automático"
+    *: "Automático"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automático"
+    *: "Automático"
   </voice>
 </phrase>
 <phrase>
@@ -11361,16 +11171,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Codo suave"
+    *: "Codo suave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Codo suave"
+    *: "Codo suave"
   </voice>
 </phrase>
 <phrase>
@@ -11392,16 +11199,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Proporción"
+    *: "Proporción"
   </dest>
   <voice>
-    *: none
-    swcodec: "Proporción"
+    *: "Proporción"
   </voice>
 </phrase>
 <phrase>
@@ -11426,16 +11230,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Codo duro"
+    *: "Codo duro"
   </dest>
   <voice>
-    *: none
-    swcodec: "Codo duro"
+    *: "Codo duro"
   </voice>
 </phrase>
 <phrase>
@@ -11477,16 +11278,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aspecto predeterminado del mando"
+    *: "Aspecto predeterminado del mando"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aspecto predeterminado del mando"
+    *: "Aspecto predeterminado del mando"
   </voice>
 </phrase>
 <phrase>
@@ -11627,16 +11425,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 a 1"
+    *: "10 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11678,16 +11473,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 a 1"
+    *: "2 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11712,16 +11504,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Límite"
+    *: "Límite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Límite"
+    *: "Límite"
   </voice>
 </phrase>
 <phrase>
@@ -11760,16 +11549,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ancho de la barra de desplazamiento"
+    *: "Ancho de la barra de desplazamiento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ancho de la barra de desplazamiento"
+    *: "Ancho de la barra de desplazamiento"
   </voice>
 </phrase>
 <phrase>
@@ -11836,16 +11622,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Ajuste de tiempo"
+    *: "Ajuste de tiempo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ajuste de tiempo"
+    *: "Ajuste de tiempo"
   </voice>
 </phrase>
 <phrase>
@@ -11853,16 +11636,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 a 1"
+    *: "6 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11870,16 +11650,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </voice>
 </phrase>
 <phrase>
@@ -11932,16 +11709,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocidad"
+    *: "Velocidad"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocidad"
+    *: "Velocidad"
   </voice>
 </phrase>
 <phrase>
@@ -11963,16 +11737,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 a 1"
+    *: "4 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -12164,16 +11935,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rebobinar antes de continuar"
+    *: "Rebobinar antes de continuar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rebobinar antes de continuar"
+    *: "Rebobinar antes de continuar"
   </voice>
 </phrase>
 <phrase>
@@ -12213,15 +11981,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Mejoras 3D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Mejoras 3D"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Mejoras 3D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Mejoras 3D"
   </voice>
 </phrase>
 <phrase>
@@ -12531,7 +12299,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12792,16 +12560,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </voice>
 </phrase>
 <phrase>
@@ -12871,16 +12636,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </dest>
   <voice>
-    *: none
-    swcodec: "Personalizado"
+    *: "Personalizado"
   </voice>
 </phrase>
 <phrase>
@@ -12989,16 +12751,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ocutar información"
+    *: "Ocutar información"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ocultar información"
+    *: "Ocultar información"
   </voice>
 </phrase>
 <phrase>
@@ -13006,16 +12765,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar album en la parte superior"
+    *: "Mostrar album en la parte superior"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar album en la parte superior"
+    *: "Mostrar album en la parte superior"
   </voice>
 </phrase>
 <phrase>
@@ -13023,16 +12779,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar album y artista en la parte superior"
+    *: "Mostrar album y artista en la parte superior"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar album y artista en la parte superior"
+    *: "Mostrar album y artista en la parte superior"
   </voice>
 </phrase>
 <phrase>
@@ -13040,16 +12793,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar album y artista en la parte inferior"
+    *: "Mostrar album y artista en la parte inferior"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar album y artista en la parte inferior"
+    *: "Mostrar album y artista en la parte inferior"
   </voice>
 </phrase>
 <phrase>
@@ -13057,16 +12807,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Número de carátulas"
+    *: "Número de carátulas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Número de carátulas"
+    *: "Número de carátulas"
   </voice>
 </phrase>
 <phrase>
@@ -13074,16 +12821,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Siempre encendida"
+    *: "Siempre encendida"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Siempre encendida"
+    *: "Siempre encendida"
   </voice>
 </phrase>
 <phrase>
@@ -13091,16 +12835,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -13108,16 +12849,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "A través de la lista de canciones"
+    *: "A través de la lista de canciones"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "A través de la lista de canciones"
+    *: "A través de la lista de canciones"
   </voice>
 </phrase>
 <phrase>
@@ -13125,16 +12863,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar título del album"
+    *: "Mostrar título del album"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar título del album"
+    *: "Mostrar título del album"
   </voice>
 </phrase>
 <phrase>
@@ -13142,16 +12877,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ir a Pantalla de Reproducción"
+    *: "Ir a Pantalla de Reproducción"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ir a Pantalla de Reproducción"
+    *: "Ir a Pantalla de Reproducción"
   </voice>
 </phrase>
 <phrase>
@@ -13159,16 +12891,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "El caché se reconstruirá después de reiniciar"
+    *: "El caché se reconstruirá después de reiniciar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "El caché se reconstruirá después de reiniciar"
+    *: "El caché se reconstruirá después de reiniciar"
   </voice>
 </phrase>
 <phrase>
@@ -13176,16 +12905,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Reconstruir caché"
+    *: "Reconstruir caché"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Reconstruir caché"
+    *: "Reconstruir caché"
   </voice>
 </phrase>
 <phrase>
@@ -13193,16 +12919,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error guardando la configuración"
+    *: "Error guardando la configuración"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error guardando la configuración"
+    *: "Error guardando la configuración"
   </voice>
 </phrase>
 <phrase>
@@ -13210,16 +12933,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lista de Reproducción Borrada"
+    *: "Lista de Reproducción Borrada"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lista de Reproducción Borrada"
+    *: "Lista de Reproducción Borrada"
   </voice>
 </phrase>
 <phrase>
@@ -13227,16 +12947,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Margen central"
+    *: "Margen central"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Margen central"
+    *: "Margen central"
   </voice>
 </phrase>
 <phrase>
@@ -13244,16 +12961,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Separación"
+    *: "Separación"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Separación"
+    *: "Separación"
   </voice>
 </phrase>
 <phrase>
@@ -13261,16 +12975,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Integración en WPS"
+    *: "Integración en WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Integración en WPS"
+    *: "Integración en WPS"
   </voice>
 </phrase>
 <phrase>
@@ -13278,16 +12989,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Directa"
+    *: "Directa"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Directa"
+    *: "Directa"
   </voice>
 </phrase>
 <phrase>
@@ -13295,16 +13003,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Reescalar Carátulas"
+    *: "Reescalar Carátulas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resize Carátulas"
+    *: "Resize Carátulas"
   </voice>
 </phrase>
 <phrase>
@@ -13312,16 +13017,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No se encontró carátula para el album"
+    *: "No se encontró carátula para el album"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No se encontró carátula para el album"
+    *: "No se encontró carátula para el album"
   </voice>
 </phrase>
 <phrase>
@@ -13329,19 +13031,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Mostrar FPS"
+    *: "Mostrar FPS"
   </dest>
   <voice>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Mostrar FPS"
+    *: "Mostrar FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13349,16 +13045,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar album en la parte inferior"
+    *: "Mostrar album en la parte inferior"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar album en la parte inferior"
+    *: "Mostrar album en la parte inferior"
   </voice>
 </phrase>
 <phrase>
@@ -13366,16 +13059,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Añadida a la Lista de Reproducción"
+    *: "Añadida a la Lista de Reproducción"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Añadida a la Lista de Reproducción"
+    *: "Añadida a la Lista de Reproducción"
   </voice>
 </phrase>
 <phrase>
@@ -13383,16 +13073,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Borrar Lista de Reproducción"
+    *: "Borrar Lista de Reproducción"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Borrar Lista de Reproducción"
+    *: "Borrar Lista de Reproducción"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index 8f609b5891..e0084062d6 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -615,16 +615,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Transmikso"
+    *: "Transmikso"
   </dest>
   <voice>
-    *: none
-    swcodec: "Transmikso"
+    *: "Transmikso"
   </voice>
 </phrase>
 <phrase>
@@ -632,16 +629,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Egalilo"
+    *: "Egalilo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Egalilo"
+    *: "Egalilo"
   </voice>
 </phrase>
 <phrase>
@@ -820,16 +814,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ebligi EQ"
+    *: "Ebligi EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ebligi egalilon"
+    *: "Ebligi egalilon"
   </voice>
 </phrase>
 <phrase>
@@ -837,16 +828,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafika EQ"
+    *: "Grafika EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafika egalilo"
+    *: "Grafika egalilo"
   </voice>
 </phrase>
 <phrase>
@@ -854,16 +842,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Antaŭtranĉo"
+    *: "Antaŭtranĉo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Antaŭtranĉo"
+    *: "Antaŭtranĉo"
   </voice>
 </phrase>
 <phrase>
@@ -871,16 +856,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simpla EQ Agordaĵoj"
+    *: "Simpla EQ Agordaĵoj"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simpla egalilo Agordaĵoj"
+    *: "Simpla egalilo Agordaĵoj"
   </voice>
 </phrase>
 <phrase>
@@ -888,16 +870,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Progresinta EQ Agordaĵoj"
+    *: "Progresinta EQ Agordaĵoj"
   </dest>
   <voice>
-    *: none
-    swcodec: "Progresinta EQ Agordaĵoj"
+    *: "Progresinta EQ Agordaĵoj"
   </voice>
 </phrase>
 <phrase>
@@ -905,16 +884,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Surdiskigi EQ Agordaĵojn"
+    *: "Surdiskigi EQ Agordaĵojn"
   </dest>
   <voice>
-    *: none
-    swcodec: "Surdiskigi egalilon Agordaĵojn"
+    *: "Surdiskigi egalilon Agordaĵojn"
   </voice>
 </phrase>
 <phrase>
@@ -922,16 +898,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Foliumi EQ Agordaĵojn"
+    *: "Foliumi EQ Agordaĵojn"
   </dest>
   <voice>
-    *: none
-    swcodec: "Foliumi EQ Agordaĵojn"
+    *: "Foliumi EQ Agordaĵojn"
   </voice>
 </phrase>
 <phrase>
@@ -939,16 +912,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Eldona Reĝimo: %s"
+    *: "Eldona Reĝimo: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -956,16 +926,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Strio Gajno"
+    *: "%d Hz Strio Gajno"
   </dest>
   <voice>
-    *: none
-    swcodec: "herco strio gajno"
+    *: "herco strio gajno"
   </voice>
 </phrase>
 <phrase>
@@ -973,16 +940,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Malakuta Filtrilo"
+    *: "Malakuta Filtrilo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Malakuta Filtrilo"
+    *: "Malakuta Filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -990,16 +954,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Pinta Filtrilo %d"
+    *: "Pinta Filtrilo %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pinta filtrilo"
+    *: "Pinta filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -1007,16 +968,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Akuta Filtrilo"
+    *: "Akuta Filtrilo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Akuta Filtrilo"
+    *: "Akuta Filtrilo"
   </voice>
 </phrase>
 <phrase>
@@ -1024,16 +982,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Tranĉa Frekvenco"
+    *: "Tranĉa Frekvenco"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tranĉa Frekvenco"
+    *: "Tranĉa Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -1041,16 +996,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centro Frekvenco"
+    *: "Centro Frekvenco"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centro Frekvenco"
+    *: "Centro Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -1058,16 +1010,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1347,16 +1296,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Malforta"
+    *: "Malforta"
   </dest>
   <voice>
-    *: none
-    swcodec: "Malforta"
+    *: "Malforta"
   </voice>
 </phrase>
 <phrase>
@@ -1364,16 +1310,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Meza"
+    *: "Meza"
   </dest>
   <voice>
-    *: none
-    swcodec: "Meza"
+    *: "Meza"
   </voice>
 </phrase>
 <phrase>
@@ -1381,16 +1324,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Forta"
+    *: "Forta"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forta"
+    *: "Forta"
   </voice>
 </phrase>
 <phrase>
@@ -1684,16 +1624,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tiparo"
+    *: "Tiparo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tiparo"
+    *: "Tiparo"
   </voice>
 </phrase>
 <phrase>
@@ -1774,16 +1711,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stato-/Rulumskalo"
+    *: "Stato-/Rulumskalo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stato kaj Rulumskalo"
+    *: "Stato kaj Rulumskalo"
   </voice>
 </phrase>
 <phrase>
@@ -1850,16 +1784,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreo (ISO-8859-8)"
+    *: "Hebreo (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreo"
+    *: "Hebreo"
   </voice>
 </phrase>
 <phrase>
@@ -1881,16 +1812,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tajo (ISO-8859-11)"
+    *: "Tajo (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tajo"
+    *: "Tajo"
   </voice>
 </phrase>
 <phrase>
@@ -1898,16 +1826,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabo (CP1256)"
+    *: "Arabo (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabo"
+    *: "Arabo"
   </voice>
 </phrase>
 <phrase>
@@ -1943,16 +1868,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japano (SJIS)"
+    *: "Japano (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japano"
+    *: "Japano"
   </voice>
 </phrase>
 <phrase>
@@ -1960,16 +1882,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simpligata Ĉino (GB2312)"
+    *: "Simpligata Ĉino (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simpligata Ĉino"
+    *: "Simpligata Ĉino"
   </voice>
 </phrase>
 <phrase>
@@ -1977,16 +1896,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreujo (KSX1001)"
+    *: "Koreujo (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreujo"
+    *: "Koreujo"
   </voice>
 </phrase>
 <phrase>
@@ -1994,16 +1910,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tradicia Ĉino (BIG5)"
+    *: "Tradicia Ĉino (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tradicia Ĉino"
+    *: "Tradicia Ĉino"
   </voice>
 </phrase>
 <phrase>
@@ -2349,15 +2262,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvenco"
+    play_frequency,recording: "Frekvenco"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvenco"
+    play_frequency,recording: "Frekvenco"
   </voice>
 </phrase>
 <phrase>
@@ -2727,16 +2640,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Preventi Tromoduladon"
+    *: "Preventi Tromoduladon"
   </dest>
   <voice>
-    *: none
-    swcodec: "Preventi Tromoduladon"
+    *: "Preventi Tromoduladon"
   </voice>
 </phrase>
 <phrase>
@@ -2969,16 +2879,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "180-Gradoja Rotacio"
+    *: "180-Gradoja Rotacio"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "180-Gradoja Rotacio"
+    *: "180-Gradoja Rotacio"
   </voice>
 </phrase>
 <phrase>
@@ -3000,16 +2907,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pintigo"
+    *: "Pintigo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pintigo"
+    *: "Pintigo"
   </voice>
 </phrase>
 <phrase>
@@ -3017,16 +2921,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Substreka Linio"
+    *: "Substreka Linio"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Substreka Linio"
+    *: "Substreka Linio"
   </voice>
 </phrase>
 <phrase>
@@ -3203,16 +3104,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekrano Rulumas Ekster Vido"
+    *: "Ekrano Rulumas Ekster Vido"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekrano Rulumas Ekster Vido"
+    *: "Ekrano Rulumas Ekster Vido"
   </voice>
 </phrase>
 <phrase>
@@ -3220,16 +3118,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekrana Rulumo Ŝtupo Grando"
+    *: "Ekrana Rulumo Ŝtupo Grando"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekrana Rulumo Ŝtupo Grando"
+    *: "Ekrana Rulumo Ŝtupo Grando"
   </voice>
 </phrase>
 <phrase>
@@ -4193,24 +4088,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Aŭdvida karto"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "Aŭdvida karto"
   </voice>
 </phrase>
 <phrase>
@@ -4331,15 +4226,15 @@
   user: core
   <source>
     *: "OFF To Revert"
-    vibe500: "CANCEL To Revert"
     mpiohd300: "MENU To Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL To Revert"
   </source>
   <dest>
     *: "OFF Por Malvalidigi"
-    vibe500: "C Por Malvalidigi"
     mpiohd300: "MENU Por Malvalidigi"
     samsungyh*: "REW Por Malvalidigi"
+    vibe500: "C Por Malvalidigi"
   </dest>
   <voice>
     *: ""
@@ -4563,15 +4458,15 @@
   user: core
   <source>
     *: "PLAY=Set OFF=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: "LEGI=Validigi OFF=Malvalidigi"
-    vibe500: "OK=Validigi C=Malvalidigi"
     mpiohd300: "ENTER=Validigi MENU=Malvalidigi"
     sansafuzeplus: "SELECT=Validigi  BACK=Malvalidigi"
+    vibe500: "OK=Validigi C=Malvalidigi"
   </dest>
   <voice>
     *: ""
@@ -7308,18 +7203,18 @@
   <voice>
     *: "Rekta Gajno"
   </voice>
-</phrase>   
+</phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
+  <source>
     *: "Cross Gain"
   </source>
-  <dest>  
+  <dest>
     *: "Transgajno"
   </dest>
-  <voice>  
+  <voice>
     *: "Transgajno"
   </voice>
 </phrase>
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 5b1c631875..c28232cdda 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -612,16 +612,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Ristisyöttö"
+    *: "Ristisyöttö"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ristisyöttö"
+    *: "Ristisyöttö"
   </voice>
 </phrase>
 <phrase>
@@ -629,16 +626,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Taajuuskorjain"
+    *: "Taajuuskorjain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Taajuuskorjain"
+    *: "Taajuuskorjain"
   </voice>
 </phrase>
 <phrase>
@@ -817,16 +811,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ota käyttöön"
+    *: "Ota käyttöön"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ota käyttöön"
+    *: "Ota käyttöön"
   </voice>
 </phrase>
 <phrase>
@@ -834,16 +825,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Graafinen taajuuskorjain"
+    *: "Graafinen taajuuskorjain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graafinen taajuuskorjain"
+    *: "Graafinen taajuuskorjain"
   </voice>
 </phrase>
 <phrase>
@@ -851,16 +839,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Esikatkaisu"
+    *: "Esikatkaisu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Esikatkaisu"
+    *: "Esikatkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -868,16 +853,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Perusasetukset"
+    *: "Perusasetukset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perusasetukset"
+    *: "Perusasetukset"
   </voice>
 </phrase>
 <phrase>
@@ -885,16 +867,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Lisäasetukset"
+    *: "Lisäasetukset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lisäasetukset"
+    *: "Lisäasetukset"
   </voice>
 </phrase>
 <phrase>
@@ -902,16 +881,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Tallenna asetukset"
+    *: "Tallenna asetukset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tallenna asetukset"
+    *: "Tallenna asetukset"
   </voice>
 </phrase>
 <phrase>
@@ -919,16 +895,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Selaa asetuksia"
+    *: "Selaa asetuksia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Selaa asetuksia"
+    *: "Selaa asetuksia"
   </voice>
 </phrase>
 <phrase>
@@ -936,16 +909,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Muokkaustila: %s"
+    *: "Muokkaustila: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -953,16 +923,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz taajuusvahvistus"
+    *: "%d Hz taajuusvahvistus"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertsin taajuusvahvistus"
+    *: "hertsin taajuusvahvistus"
   </voice>
 </phrase>
 <phrase>
@@ -970,33 +937,27 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Alhainen hyllysuodatin"
+    *: "Alhainen hyllysuodatin"
   </dest>
   <voice>
-    *: none
-      swcodec: "Alhainen hyllysuodatin"
-</voice>
+    *: "Alhainen hyllysuodatin"
+  </voice>
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_BAND_PEAK
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Huippusuodatin %d"
+    *: "Huippusuodatin %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Huippusuodatin"
+    *: "Huippusuodatin"
   </voice>
 </phrase>
 <phrase>
@@ -1004,16 +965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Korkea hyllysuodatin"
+    *: "Korkea hyllysuodatin"
   </dest>
   <voice>
-    *: none
-    swcodec: "Korkea hyllysuodatin"
+    *: "Korkea hyllysuodatin"
   </voice>
 </phrase>
 <phrase>
@@ -1021,16 +979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Katkaisutaajuus"
+    *: "Katkaisutaajuus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Katkaisutaajuus"
+    *: "Katkaisutaajuus"
   </voice>
 </phrase>
 <phrase>
@@ -1038,16 +993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Keskitaajuus"
+    *: "Keskitaajuus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keskitaajuus"
+    *: "Keskitaajuus"
   </voice>
 </phrase>
 <phrase>
@@ -1055,16 +1007,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1330,16 +1279,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Kappaleenvaihtoäänimerkin voimakkuus"
+    *: "Kappaleenvaihtoäänimerkin voimakkuus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kappaleenvaihtoäänimerkin voimakkuus"
+    *: "Kappaleenvaihtoäänimerkin voimakkuus"
   </voice>
 </phrase>
 <phrase>
@@ -1347,16 +1293,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Heikko"
+    *: "Heikko"
   </dest>
   <voice>
-    *: none
-    swcodec: "Heikko"
+    *: "Heikko"
   </voice>
 </phrase>
 <phrase>
@@ -1364,16 +1307,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Keskitaso"
+    *: "Keskitaso"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keskitaso"
+    *: "Keskitaso"
   </voice>
 </phrase>
 <phrase>
@@ -1381,16 +1321,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Voimakas"
+    *: "Voimakas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Voimakas"
+    *: "Voimakas"
   </voice>
 </phrase>
 <phrase>
@@ -1684,16 +1621,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fontti"
+    *: "Fontti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fontti"
+    *: "Fontti"
   </voice>
 </phrase>
 <phrase>
@@ -1777,16 +1711,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tila- ja vierityspalkki"
+    *: "Tila- ja vierityspalkki"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tila ja vierityspalkki"
+    *: "Tila ja vierityspalkki"
   </voice>
 </phrase>
 <phrase>
@@ -1853,16 +1784,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrealainen (ISO-8859-8)"
+    *: "Hebrealainen (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrealainen"
+    *: "Hebrealainen"
   </voice>
 </phrase>
 <phrase>
@@ -1884,16 +1812,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thaimaalainen (ISO-8859-11)"
+    *: "Thaimaalainen (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thaimaalainen"
+    *: "Thaimaalainen"
   </voice>
 </phrase>
 <phrase>
@@ -1901,16 +1826,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabialainen (CP1256)"
+    *: "Arabialainen (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabialainen"
+    *: "Arabialainen"
   </voice>
 </phrase>
 <phrase>
@@ -1946,16 +1868,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanilainen (SJIS)"
+    *: "Japanilainen (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanilainen"
+    *: "Japanilainen"
   </voice>
 </phrase>
 <phrase>
@@ -1963,16 +1882,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Yksink. Kiina (GB2312)"
+    *: "Yksink. Kiina (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Yksinkertaistettu Kiina"
+    *: "Yksinkertaistettu Kiina"
   </voice>
 </phrase>
 <phrase>
@@ -1980,16 +1896,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korealainen (KSX1001)"
+    *: "Korealainen (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korealainen"
+    *: "Korealainen"
   </voice>
 </phrase>
 <phrase>
@@ -1997,16 +1910,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Perint. Kiina (BIG5)"
+    *: "Perint. Kiina (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Perinteinen Kiina"
+    *: "Perinteinen Kiina"
   </voice>
 </phrase>
 <phrase>
@@ -2138,7 +2048,7 @@
   <dest>
     *: none
     recording: "Linjatulo"
-</dest>
+  </dest>
   <voice>
     *: none
     recording: "Linjatulo"
@@ -2352,15 +2262,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Taajuus"
+    play_frequency,recording: "Taajuus"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Taajuus"
+    play_frequency,recording: "Taajuus"
   </voice>
 </phrase>
 <phrase>
@@ -2386,18 +2296,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofoni"
     iriverh100,iriverh120,iriverh300: "Sis. mikrofoni"
+    recording: "Mikrofoni"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofoni"
     iriverh100,iriverh120,iriverh300: "Sisäinen mikrofoni"
+    recording: "Mikrofoni"
   </voice>
 </phrase>
 <phrase>
@@ -2739,16 +2649,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Estä leikkautuminen"
+    *: "Estä leikkautuminen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Estä leikkautuminen"
+    *: "Estä leikkautuminen"
   </voice>
 </phrase>
 <phrase>
@@ -2984,16 +2891,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ylösalaisin"
+    *: "Ylösalaisin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ylösalaisin"
+    *: "Ylösalaisin"
   </voice>
 </phrase>
 <phrase>
@@ -3001,16 +2905,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rivinvalitsijan tyyppi"
+    *: "Rivinvalitsijan tyyppi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rivinvalitsijan tyyppi"
+    *: "Rivinvalitsijan tyyppi"
   </voice>
 </phrase>
 <phrase>
@@ -3018,16 +2919,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Osoitin"
+    *: "Osoitin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Osoitin"
+    *: "Osoitin"
   </voice>
 </phrase>
 <phrase>
@@ -3035,16 +2933,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Käänteinen palkki"
+    *: "Käänteinen palkki"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Käänteinen palkki"
+    *: "Käänteinen palkki"
   </voice>
 </phrase>
 <phrase>
@@ -3061,8 +2956,8 @@
   </dest>
   <voice>
     *: none
-      lcd_non-mono: "Nollaa taustakuva"
-</voice>
+    lcd_non-mono: "Nollaa taustakuva"
+  </voice>
 </phrase>
 <phrase>
   id: LANG_BACKGROUND_COLOR
@@ -3221,16 +3116,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rivien vieritys pois näytöstä"
+    *: "Rivien vieritys pois näytöstä"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rivien vieritys pois näytöstä"
+    *: "Rivien vieritys pois näytöstä"
   </voice>
 </phrase>
 <phrase>
@@ -3238,16 +3130,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Näyttövierityksen askelkoko"
+    *: "Näyttövierityksen askelkoko"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Näyttövierityksen askelkoko"
+    *: "Näyttövierityksen askelkoko"
   </voice>
 </phrase>
 <phrase>
@@ -3269,16 +3158,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vierityspalkki"
+    *: "Vierityspalkki"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vierityspalkki"
+    *: "Vierityspalkki"
   </voice>
 </phrase>
 <phrase>
@@ -3286,16 +3172,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tilapalkki"
+    *: "Tilapalkki"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tilapalkki"
+    *: "Tilapalkki"
   </voice>
 </phrase>
 <phrase>
@@ -3320,16 +3203,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Äänenvoimakkuusnäyttö"
+    *: "Äänenvoimakkuusnäyttö"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Äänenvoimakkuusnäyttö"
+    *: "Äänenvoimakkuusnäyttö"
   </voice>
 </phrase>
 <phrase>
@@ -3337,16 +3217,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Akkunäyttö"
+    *: "Akkunäyttö"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Akkunäyttö"
+    *: "Akkunäyttö"
   </voice>
 </phrase>
 <phrase>
@@ -3354,16 +3231,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graafinen"
+    *: "Graafinen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graafinen"
+    *: "Graafinen"
   </voice>
 </phrase>
 <phrase>
@@ -3371,16 +3245,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeerinen"
+    *: "Numeerinen"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeerinen"
+    *: "Numeerinen"
   </voice>
 </phrase>
 <phrase>
@@ -4230,13 +4101,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %dt %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Akku: %d%% %dt %dm"
     iriverifp7xx: "%d%% %dt %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm"
   </dest>
   <voice>
     *: "Akun varauksen taso"
@@ -4293,24 +4164,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "m m c muistikortti"
     multivolume: "Kiintolevy1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro s d muistikortti"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro s d muistikortti"
     xduoox3: "micro s d muistikortti 2"
-    archosondio*: "m m c muistikortti"
   </voice>
 </phrase>
 <phrase>
@@ -4440,35 +4311,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Peruuta"
-    mrobe500: "POWER = Peruuta"
-    iriverh100,iriverh120,iriverh300: "STOP = Peruuta"
-    ipod*,sansac200*,mpiohd300: "MENU = Peruuta"
-    iaudiox5,iaudiom5: "RECORD = Peruuta"
+    gigabeatfx,mrobe500: "POWER = Peruuta"
+    gigabeats,sansafuzeplus: "BACK = Peruuta"
+    gogearsa9200: "VASEN = Peruuta"
+    iaudiom5,iaudiox5: "RECORD = Peruuta"
+    ipod*,mpiohd300,sansac200*: "MENU = Peruuta"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Peruuta"
-    gigabeatfx: "POWER = Peruuta"
-    sansafuzeplus: "BACK = Peruuta"
+    iriverh100,iriverh120,iriverh300: "STOP = Peruuta"
     mrobe100: "DISPLAY = Peruuta"
-    gigabeats: "BACK = Peruuta"
-    gogearsa9200: "VASEN = Peruuta"
-    vibe500: "CANCEL = Peruuta"
+    rtc: "OFF = Peruuta"
     samsungyh*: "REW = Peruuta"
+    vibe500: "CANCEL = Peruuta"
   </dest>
   <voice>
     *: none
@@ -4514,26 +4381,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Levy täynnä. Jatka painamalla OFF."
-    iriverh100,iriverh120,iriverh300: "Levy täynnä. Jatka painamalla STOP."
     iaudiom5,iaudiox5: "Levy täynnä. Jatka painamalla POWER."
-    sansae200*,sansac200*,vibe500: "Levy täynnä. Jatka painamalla PREV."
+    iriverh100,iriverh120,iriverh300: "Levy täynnä. Jatka painamalla STOP."
+    recording: "Levy täynnä. Jatka painamalla OFF."
     samsungyh*: "Levy täynnä. Jatka painamalla LEFT."
+    sansac200*,sansae200*,vibe500: "Levy täynnä. Jatka painamalla PREV."
   </dest>
   <voice>
     *: none
-    recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4696,22 +4560,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aseta OFF=Peruuta"
+    gigabeats: "SELECT=Aseta POWER=Peruuta"
     ipod*: "SELECT=Aseta MENU=Peruuta"
     iriverh10,iriverh10_5gb: "SELECT=Aseta PREV=Peruuta"
-    gigabeats: "SELECT=Aseta POWER=Peruuta"
-    vibe500: "OK=Aseta C=Peruuta"
     mpiohd300: "ENTER=Aseta MENU=Peruuta"
     sansafuzeplus: "SELECT=Aseta  BACK=Peruuta"
+    vibe500: "OK=Aseta C=Peruuta"
   </dest>
   <voice>
     *: none
@@ -7152,32 +7016,25 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF keskeyttää"
-    iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
-    ipod*: "PLAY/PAUSE keskeyttää"
-    iaudiox5,iaudiom5: "Pitkä PLAY keskeyttää"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV keskeyttää"
-    gigabeats: "BACK keskeyttää"
     gigabeatfx: "POWER keskeyttää"
-    sansafuzeplus: "BACK keskeyttää"
+    gigabeats,sansafuzeplus: "BACK keskeyttää"
+    iaudiom5,iaudiox5: "Pitkä PLAY keskeyttää"
+    ipod*: "PLAY/PAUSE keskeyttää"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV keskeyttää"
+    iriverh100,iriverh120,iriverh300: "STOP keskeyttää"
   </dest>
   <voice>
     *: ""
-    iriverh100,iriverh120,iriverh300: ""
-    ipod*: ""
-    iaudiox5,iaudiom5: ""
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*: ""
-    gigabeats: ""
-    gigabeatfx: ""
+    gigabeatfx,gigabeats,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7517,16 +7374,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Suora vahvistus"
+    *: "Suora vahvistus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suora vahvistus"
+    *: "Suora vahvistus"
   </voice>
 </phrase>
 <phrase>
@@ -7534,16 +7388,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ristivahvistus"
+    *: "Ristivahvistus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ristivahvistus"
+    *: "Ristivahvistus"
   </voice>
 </phrase>
 <phrase>
@@ -7551,16 +7402,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Suurtaajuuksien vaimennus"
+    *: "Suurtaajuuksien vaimennus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suurtaajuuksien vaimennus"
+    *: "Suurtaajuuksien vaimennus"
   </voice>
 </phrase>
 <phrase>
@@ -7568,16 +7416,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Suurtaajuuksien katkaisu"
+    *: "Suurtaajuuksien katkaisu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suurtaajuuksien katkaisu"
+    *: "Suurtaajuuksien katkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -8005,16 +7850,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Muokkaustila: %s %s"
+    *: "Muokkaustila: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8022,16 +7864,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Katkaisu"
+    *: "Katkaisu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Katkaisu"
+    *: "Katkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -8460,16 +8299,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Vapina"
+    *: "Vapina"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vapina"
+    *: "Vapina"
   </voice>
 </phrase>
 <phrase>
@@ -9002,21 +8838,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Luodaan tietokantaa... %d löytyi (OFF = palaa)"
-    iriverh100,iriverh120,iriverh300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
-    ipod*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Luodaan tietokantaa... %d löytyi (VASEN = palaa)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
-    gogearsa9200: "Luodaan tietokantaa... %d löytyi (REW = palaa)"
     archosplayer: "Luodaan tk %d löytyi"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Luodaan tietokantaa... %d löytyi (VASEN = palaa)"
+    gogearsa9200: "Luodaan tietokantaa... %d löytyi (REW = palaa)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Luodaan tietokantaa... %d löytyi (PREV = palaa)"
+    iriverh100,iriverh120,iriverh300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)"
   </dest>
   <voice>
     *: "tietokantaa varten löytyi merkintöjä"
@@ -9043,17 +8877,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
+    sansae200*,sansafuze*: "Rullavalon aikakatkaisu"
   </dest>
   <voice>
     *: none
     button_light: "Painikevalon aikakatkaisu"
-    sansafuze*,sansae200*: "Rullavalon aikakatkaisu"
+    sansae200*,sansafuze*: "Rullavalon aikakatkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -9331,8 +9165,8 @@
   </dest>
   <voice>
     *: none
-      recording: ""
-</voice>
+    recording: ""
+  </voice>
 </phrase>
 <phrase>
   id: LANG_CLEAR_REC_DIR
@@ -9514,20 +9348,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Kyllä"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU tai yläoikea = Kyllä"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Kyllä"
     iriverh100,iriverh120,iriverh300: "NAVI = Kyllä"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Kyllä"
     mrobe500: "PLAY, POWER tai yläoikea = Kyllä"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Kyllä"
   </dest>
   <voice>
@@ -9540,23 +9374,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Aseta"
-    mrobe500: "HEART = Aseta"
-    iriverh100,iriverh120,iriverh300: "NAVI = Aseta"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Aseta"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Aseta"
     gogearsa9200,samsungyh*: "PLAY = Aseta"
-    vibe500: "OK = Aseta"
+    iriverh100,iriverh120,iriverh300: "NAVI = Aseta"
     mpiohd300: "ENTER = Aseta"
+    mrobe500: "HEART = Aseta"
+    rtc: "ON = Aseta"
+    vibe500: "OK = Aseta"
   </dest>
   <voice>
     *: none
@@ -9646,16 +9480,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Vahvistus"
+    *: "Vahvistus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vahvistus"
+    *: "Vahvistus"
   </voice>
 </phrase>
 <phrase>
@@ -9677,16 +9508,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tila:"
+    *: "Tila:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9835,7 +9663,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -10367,15 +10195,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basson katkaisu"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basson katkaisu"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basson katkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -10384,15 +10212,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantin katkaisu"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantin katkaisu"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantin katkaisu"
   </voice>
 </phrase>
 <phrase>
@@ -10428,16 +10256,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Näppäinnapsahdus"
+    *: "Näppäinnapsahdus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Näppäinnapsahdus"
+    *: "Näppäinnapsahdus"
   </voice>
 </phrase>
 <phrase>
@@ -10445,16 +10270,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Toisto"
+    *: "Toisto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Toisto"
+    *: "Toisto"
   </voice>
 </phrase>
 <phrase>
@@ -11176,16 +10998,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vierityspalkin sijainti"
+    *: "Vierityspalkin sijainti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vierityspalkin sijainti"
+    *: "Vierityspalkin sijainti"
   </voice>
 </phrase>
 <phrase>
@@ -11326,16 +11145,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vierityspalkin leveys"
+    *: "Vierityspalkin leveys"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vierityspalkin leveys"
+    *: "Vierityspalkin leveys"
   </voice>
 </phrase>
 <phrase>
@@ -11371,16 +11187,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Ajan venytys"
+    *: "Ajan venytys"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ajan venytys"
+    *: "Ajan venytys"
   </voice>
 </phrase>
 <phrase>
@@ -11388,16 +11201,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompressori"
+    *: "Kompressori"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompressori"
+    *: "Kompressori"
   </voice>
 </phrase>
 <phrase>
@@ -11450,21 +11260,18 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Nopeus"
+    *: "Nopeus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nopeus"
+    *: "Nopeus"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11526,16 +11333,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Vapautusaika"
+    *: "Vapautusaika"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vapautusaika"
+    *: "Vapautusaika"
   </voice>
 </phrase>
 <phrase>
@@ -11591,16 +11395,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Kynnys"
+    *: "Kynnys"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kynnys"
+    *: "Kynnys"
   </voice>
 </phrase>
 <phrase>
@@ -11625,16 +11426,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Pakkausvahvistus"
+    *: "Pakkausvahvistus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pakkausvahvistus"
+    *: "Pakkausvahvistus"
   </voice>
 </phrase>
 <phrase>
@@ -11642,16 +11440,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Perusolemus"
+    *: "Perusolemus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Perusolemus"
+    *: "Perusolemus"
   </voice>
 </phrase>
 <phrase>
@@ -11738,16 +11533,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Yksinkertainen (Meier)"
+    *: "Yksinkertainen (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Yksinkertainen"
+    *: "Yksinkertainen"
   </voice>
 </phrase>
 <phrase>
@@ -11772,16 +11564,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Siirtyminen"
+    *: "Siirtyminen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Siirtyminen"
+    *: "Siirtyminen"
   </voice>
 </phrase>
 <phrase>
@@ -11789,16 +11578,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automaattinen"
+    *: "Automaattinen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automaattinen"
+    *: "Automaattinen"
   </voice>
 </phrase>
 <phrase>
@@ -11848,16 +11634,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Pehmeä"
+    *: "Pehmeä"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pehmeä"
+    *: "Pehmeä"
   </voice>
 </phrase>
 <phrase>
@@ -11879,16 +11662,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Suhde"
+    *: "Suhde"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suhde"
+    *: "Suhde"
   </voice>
 </phrase>
 <phrase>
@@ -11930,16 +11710,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Kova"
+    *: "Kova"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kova"
+    *: "Kova"
   </voice>
 </phrase>
 <phrase>
@@ -11961,16 +11738,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kaukosäätimen perusolemus"
+    *: "Kaukosäätimen perusolemus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kaukosäätimen perusolemus"
+    *: "Kaukosäätimen perusolemus"
   </voice>
 </phrase>
 <phrase>
@@ -12176,16 +11950,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Kelaa taaksepäin ennen jatkamista"
+    *: "Kelaa taaksepäin ennen jatkamista"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kelaa taaksepäin ennen jatkamista"
+    *: "Kelaa taaksepäin ennen jatkamista"
   </voice>
 </phrase>
 <phrase>
@@ -12283,16 +12054,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "kymmenen suhde yhteen"
+    *: "kymmenen suhde yhteen"
   </voice>
 </phrase>
 <phrase>
@@ -12349,15 +12117,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D-parannus"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D-parannus"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D parannus"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D parannus"
   </voice>
 </phrase>
 <phrase>
@@ -12382,16 +12150,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Mukautettu"
+    *: "Mukautettu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mukautettu"
+    *: "Mukautettu"
   </voice>
 </phrase>
 <phrase>
@@ -12455,16 +12220,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "kahden suhde yhteen"
+    *: "kahden suhde yhteen"
   </voice>
 </phrase>
 <phrase>
@@ -12540,16 +12302,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Rajoitus"
+    *: "Rajoitus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rajoitus"
+    *: "Rajoitus"
   </voice>
 </phrase>
 <phrase>
@@ -12695,16 +12454,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "kuuden suhde yhteen"
+    *: "kuuden suhde yhteen"
   </voice>
 </phrase>
 <phrase>
@@ -12895,16 +12651,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "neljän suhde yhteen"
+    *: "neljän suhde yhteen"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 9baf25bee6..c7b326fc11 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -29,7 +29,7 @@
 # - Kevin Ferrare
 # - Simon Descarpentries
 # - Nicolas Pennequin
-# - Clément Pit-Claudel 
+# - Clément Pit-Claudel
 # - Michaël Burtin
 # - Olivier Kaloudoff
 #
@@ -39,10 +39,10 @@
 #
 #    Eric LASSAUGE <lassauge AT users.sourceforge.net> - Juin 2004
 #    Modifié par Mourad Jaber <newbeewan AT users.sourceforge.net> - Octobre 2004
-#    Modifié par Manuel Dejonghe (lImbus) <lImbus AT users.soureforge.net> - February 2005      
-#   (Retour aux minuscules quand nécessaire plus quelques changements mineurs dans 
+#    Modifié par Manuel Dejonghe (lImbus) <lImbus AT users.soureforge.net> - February 2005
+#   (Retour aux minuscules quand nécessaire plus quelques changements mineurs dans
 #    les entrées vocales par Simon Descarpentries (Siltaar) <siltaar chez fdn.fr> Mar 07)
-#    
+#
 #    Refonte totale du fichier par Mustapha Senhaji en 2005 (moos) <moos75 AT gmail.com>
 #
 <phrase>
@@ -276,21 +276,21 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Oui"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU ou en haut à gauche = Oui"
+    creativezen*: "Select = Oui"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Oui"
     iriverh100,iriverh120,iriverh300: "NAVI = Oui"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Oui"
     mrobe500: "PLAY, POWER, ou en haut à gauche = Oui"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Oui"
-    creativezen*: "Select = Oui"
   </dest>
   <voice>
     *: ""
@@ -844,16 +844,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -861,16 +858,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain direct"
+    *: "Gain direct"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain direct"
+    *: "Gain direct"
   </voice>
 </phrase>
 <phrase>
@@ -878,16 +872,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain croisé"
+    *: "Gain croisé"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain croisé"
+    *: "Gain croisé"
   </voice>
 </phrase>
 <phrase>
@@ -895,16 +886,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atténuation haute fréquence"
+    *: "Atténuation haute fréquence"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atténuation haute fréquence"
+    *: "Atténuation haute fréquence"
   </voice>
 </phrase>
 <phrase>
@@ -912,16 +900,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Coupure haute fréquence"
+    *: "Coupure haute fréquence"
   </dest>
   <voice>
-    *: none
-    swcodec: "Coupure haute fréquence"
+    *: "Coupure haute fréquence"
   </voice>
 </phrase>
 <phrase>
@@ -929,16 +914,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Egaliseur"
+    *: "Egaliseur"
   </dest>
   <voice>
-    *: none
-    swcodec: "égaliseur"
+    *: "égaliseur"
   </voice>
 </phrase>
 <phrase>
@@ -946,16 +928,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Activer EQ"
+    *: "Activer EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Activer l'égaliseur"
+    *: "Activer l'égaliseur"
   </voice>
 </phrase>
 <phrase>
@@ -963,16 +942,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ graphique"
+    *: "EQ graphique"
   </dest>
   <voice>
-    *: none
-    swcodec: "égaliseur graphique"
+    *: "égaliseur graphique"
   </voice>
 </phrase>
 <phrase>
@@ -980,33 +956,27 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Précoupe"
+    *: "Précoupe"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pré-coupe"
+    *: "Pré-coupe"
   </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_GAIN
+  id: LANG_EQUALIZER_GAIN
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Options EQ simples"
+    *: "Options EQ simples"
   </dest>
   <voice>
-    *: none
-    swcodec: "Options égaliseur simples"
+    *: "Options égaliseur simples"
   </voice>
 </phrase>
 <phrase>
@@ -1014,16 +984,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Options EQ avancées"
+    *: "Options EQ avancées"
   </dest>
   <voice>
-    *: none
-    swcodec: "Options égaliseur avancées"
+    *: "Options égaliseur avancées"
   </voice>
 </phrase>
 <phrase>
@@ -1031,16 +998,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Sauvegarder la config. EQ"
+    *: "Sauvegarder la config. EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sauvegarder une configuration égaliseur"
+    *: "Sauvegarder une configuration égaliseur"
   </voice>
 </phrase>
 <phrase>
@@ -1048,16 +1012,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Sélectionner une config. EQ"
+    *: "Sélectionner une config. EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sélectionner une configuration égaliseur"
+    *: "Sélectionner une configuration égaliseur"
   </voice>
 </phrase>
 <phrase>
@@ -1065,16 +1026,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mode édition : %s"
+    *: "Mode édition : %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1082,16 +1040,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain bande %d Hz"
+    *: "Gain bande %d Hz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain bande en hertz"
+    *: "Gain bande en hertz"
   </voice>
 </phrase>
 <phrase>
@@ -1099,16 +1054,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre papillon grave"
+    *: "Filtre papillon grave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre papillon grave"
+    *: "Filtre papillon grave"
   </voice>
 </phrase>
 <phrase>
@@ -1116,16 +1068,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre crête %d"
+    *: "Filtre crête %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre crête"
+    *: "Filtre crête"
   </voice>
 </phrase>
 <phrase>
@@ -1133,16 +1082,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtre papillon aigu"
+    *: "Filtre papillon aigu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtre papillon aigu"
+    *: "Filtre papillon aigu"
   </voice>
 </phrase>
 <phrase>
@@ -1150,16 +1096,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Fréquence de coupure"
+    *: "Fréquence de coupure"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fréquence de coupure"
+    *: "Fréquence de coupure"
   </voice>
 </phrase>
 <phrase>
@@ -1167,16 +1110,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Fréquence centrale"
+    *: "Fréquence centrale"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fréquence centrale"
+    *: "Fréquence centrale"
   </voice>
 </phrase>
 <phrase>
@@ -1184,16 +1124,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1201,19 +1138,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Tramage"
-    lcd_bitmap: "Tramage"
+    *: "Tramage"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tramage"
-    lcd_bitmap: "Tramage"
+    *: "Tramage"
   </voice>
 </phrase>
 <phrase>
@@ -1604,16 +1535,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Eviter surmodulations"
+    *: "Eviter surmodulations"
   </dest>
   <voice>
-    *: none
-    swcodec: "éviter les surmodulations"
+    *: "éviter les surmodulations"
   </voice>
 </phrase>
 <phrase>
@@ -1691,16 +1619,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Bip changement de piste"
+    *: "Bip changement de piste"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bip changement de piste"
+    *: "Bip changement de piste"
   </voice>
 </phrase>
 <phrase>
@@ -1708,16 +1633,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Faible"
+    *: "Faible"
   </dest>
   <voice>
-    *: none
-    swcodec: "Faible"
+    *: "Faible"
   </voice>
 </phrase>
 <phrase>
@@ -1725,16 +1647,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moyen"
+    *: "Moyen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moyen"
+    *: "Moyen"
   </voice>
 </phrase>
 <phrase>
@@ -1742,16 +1661,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Fort"
+    *: "Fort"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fort"
+    *: "Fort"
   </voice>
 </phrase>
 <phrase>
@@ -2108,20 +2024,18 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP 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)"
-    ipod*: "Création base de données... %d trouvés (PREV = retour)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Création base de données... %d trouvés (LEFT = retour)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Création base de données... %d trouvés (PREV = retour)"
-    gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
     archosplayer: "Création BD %d trouvés"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Création base de données... %d trouvés (LEFT = retour)"
+    gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Création base de données... %d trouvés (PREV = retour)"
+    iriverh100,iriverh120,iriverh300: "Création base de données... %d trouvés (STOP = retour)"
   </dest>
   <voice>
     *: "entrées trouvées pour base de données"
@@ -2303,16 +2217,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Choisir une police de caractères"
+    *: "Choisir une police de caractères"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Choisir une police de caractères"
+    *: "Choisir une police de caractères"
   </voice>
 </phrase>
 <phrase>
@@ -2574,16 +2485,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rotation LCD à 180°"
+    *: "Rotation LCD à 180°"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rotation de l'écran à 180°"
+    *: "Rotation de l'écran à 180°"
   </voice>
 </phrase>
 <phrase>
@@ -2591,16 +2499,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Type d'indicateur de sélection"
+    *: "Type d'indicateur de sélection"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Type d'indicateur de sélection"
+    *: "Type d'indicateur de sélection"
   </voice>
 </phrase>
 <phrase>
@@ -2608,16 +2513,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pointeur"
+    *: "Pointeur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointeur"
+    *: "Pointeur"
   </voice>
 </phrase>
 <phrase>
@@ -2625,16 +2527,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ligne surlignée"
+    *: "Ligne surlignée"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ligne surlignée"
+    *: "Ligne surlignée"
   </voice>
 </phrase>
 <phrase>
@@ -2903,7 +2802,7 @@
   </voice>
 </phrase>
 <phrase>
- id: LANG_REMOTE_SCROLL_SETS
+  id: LANG_REMOTE_SCROLL_SETS
   desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
   user: core
   <source>
@@ -2924,16 +2823,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Défilement hors de l'écran"
+    *: "Défilement hors de l'écran"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Défilement hors de l'écran"
+    *: "Défilement hors de l'écran"
   </voice>
 </phrase>
 <phrase>
@@ -2941,16 +2837,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Taille du pas de défil. de l'écran"
+    *: "Taille du pas de défil. de l'écran"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Taille du pas de défilement de l'écran"
+    *: "Taille du pas de défilement de l'écran"
   </voice>
 </phrase>
 <phrase>
@@ -3006,16 +2899,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barre d'état/défilement"
+    *: "Barre d'état/défilement"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barre d'état et de défilement"
+    *: "Barre d'état et de défilement"
   </voice>
 </phrase>
 <phrase>
@@ -3023,16 +2913,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barre de défilement"
+    *: "Barre de défilement"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barre de défilement"
+    *: "Barre de défilement"
   </voice>
 </phrase>
 <phrase>
@@ -3040,16 +2927,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barre d'état"
+    *: "Barre d'état"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barre d'état"
+    *: "Barre d'état"
   </voice>
 </phrase>
 <phrase>
@@ -3057,16 +2941,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Affichage du volume"
+    *: "Affichage du volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Affichage du volume"
+    *: "Affichage du volume"
   </voice>
 </phrase>
 <phrase>
@@ -3074,16 +2955,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Affichage de la batterie"
+    *: "Affichage de la batterie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Affichage de la batterie"
+    *: "Affichage de la batterie"
   </voice>
 </phrase>
 <phrase>
@@ -3091,16 +2969,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graphique"
+    *: "Graphique"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphique"
+    *: "Graphique"
   </voice>
 </phrase>
 <phrase>
@@ -3108,16 +2983,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numérique"
+    *: "Numérique"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numérique"
+    *: "Numérique"
   </voice>
 </phrase>
 <phrase>
@@ -3327,16 +3199,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hébreu (ISO-8859-8)"
+    *: "Hébreu (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreu"
+    *: "Hebreu"
   </voice>
 </phrase>
 <phrase>
@@ -3358,16 +3227,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thaï (ISO-8859-11)"
+    *: "Thaï (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thaï"
+    *: "Thaï"
   </voice>
 </phrase>
 <phrase>
@@ -3375,16 +3241,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabe (CP1256)"
+    *: "Arabe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabe"
+    *: "Arabe"
   </voice>
 </phrase>
 <phrase>
@@ -3420,16 +3283,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonais (SJIS)"
+    *: "Japonais (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonais"
+    *: "Japonais"
   </voice>
 </phrase>
 <phrase>
@@ -3437,16 +3297,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinois simplifié (GB2312)"
+    *: "Chinois simplifié (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinois simplifié"
+    *: "Chinois simplifié"
   </voice>
 </phrase>
 <phrase>
@@ -3454,16 +3311,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coréen (KSX1001)"
+    *: "Coréen (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coréen"
+    *: "Coréen"
   </voice>
 </phrase>
 <phrase>
@@ -3471,16 +3325,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinois traditionnel (BIG5)"
+    *: "Chinois traditionnel (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinois traditionnel"
+    *: "Chinois traditionnel"
   </voice>
 </phrase>
 <phrase>
@@ -3504,17 +3355,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "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"
+    sansae200*,sansafuze*: "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"
+    sansae200*,sansafuze*: "Durée de l'éclairage de la molette"
   </voice>
 </phrase>
 <phrase>
@@ -3785,27 +3636,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = 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*,sansaconnect: "SELECT = Valider"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Valider"
     gogearsa9200,samsungyh*: "PLAY = Valider"
-    vibe500: "OK = Valider"
+    iriverh100,iriverh120,iriverh300: "NAVI = Valider"
     mpiohd300: "ENTER = Valider"
+    mrobe500: "HEART = Valider"
+    rtc: "ON = Valider"
+    vibe500: "OK = Valider"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3814,39 +3665,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Annuler"
-    mrobe500: "POWER = Annuler"
-    iriverh100,iriverh120,iriverh300: "STOP = Annuler"
-    ipod*,sansac200*,mpiohd300: "MENU = Annuler"
-    iaudiox5,iaudiom5: "RECORD = Annuler"
+    gigabeatfx,mrobe500: "POWER = Annuler"
+    gigabeats,sansafuzeplus: "BACK = Annuler"
+    gogearsa9200: "LEFT = Annuler"
+    iaudiom5,iaudiox5: "RECORD = Annuler"
+    ipod*,mpiohd300,sansac200*: "MENU = Annuler"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler"
-    gigabeatfx: "POWER = Annuler"
-    sansafuzeplus: "BACK = Annuler"
+    iriverh100,iriverh120,iriverh300: "STOP = Annuler"
     mrobe100: "DISPLAY = Annuler"
-    gigabeats: "BACK = Annuler"
-    gogearsa9200: "LEFT = Annuler"
-    vibe500: "C = Annuler"
+    rtc: "OFF = Annuler"
     samsungyh*: "REW = Annuler"
+    vibe500: "C = Annuler"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4332,22 +4179,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Valider OFF=Annuler"
+    gigabeats: "SELECT=Valider POWER=Annuler"
     ipod*: "SELECT=Valider MENU=Annuler"
     iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler"
-    gigabeats: "SELECT=Valider POWER=Annuler"
-    vibe500: "OK=Valider C=Annuler"
     mpiohd300: "ENTER=Valider MENU=Annuler"
     sansafuzeplus: "SELECT=Valider  BACK=Annuler"
+    vibe500: "OK=Valider C=Annuler"
   </dest>
   <voice>
     *: none
@@ -5350,15 +5197,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Fréquence"
+    play_frequency,recording: "Fréquence"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Fréquence"
+    play_frequency,recording: "Fréquence"
   </voice>
 </phrase>
 <phrase>
@@ -5401,18 +5248,16 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    iriverh100,iriverh120,iriverh300,recording: "Micro intégré"
   </dest>
   <voice>
     *: none
-    recording: "Micro intégré"
-    iriverh100,iriverh120,iriverh300: "Micro intégré"
+    iriverh100,iriverh120,iriverh300,recording: "Micro intégré"
   </voice>
 </phrase>
 <phrase>
@@ -6255,13 +6100,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Niveau de la batterie"
@@ -6319,22 +6164,22 @@
   <source>
     *: none
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "DD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "D D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7648,23 +7493,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "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*,vibe500: "Disque plein. Presser PREV pour continuer."
+    iriverh100,iriverh120,iriverh300: "Disque plein. Presser STOP pour continuer."
+    recording: "Disque plein. Presser OFF pour continuer."
     samsungyh*: "Disque plein. Presser LEFT pour continuer."
+    sansac200*,sansae200*,vibe500: "Disque plein. Presser PREV pour continuer."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7718,23 +7563,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK pour Annuler"
     gigabeatfx: "POWER pour Annuler"
-    sansafuzeplus: "BACK pour Annuler"
+    gigabeats,sansafuzeplus: "BACK pour Annuler"
+    iaudiom5,iaudiox5: "Long PLAY pour Annuler"
+    ipod*: "PLAY/PAUSE pour Annuler"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV pour Annuler"
+    iriverh100,iriverh120,iriverh300: "STOP pour Annuler"
   </dest>
   <voice>
     *: ""
@@ -9269,7 +9112,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9311,16 +9154,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mode édition: %s %s"
+    *: "Mode édition: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9328,16 +9168,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Fréquence de coupure"
+    *: "Fréquence de coupure"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fréquence de coupure"
+    *: "Fréquence de coupure"
   </voice>
 </phrase>
 <phrase>
@@ -9345,16 +9182,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9796,15 +9630,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Fréquence de coupure pour basses"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour basses"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Fréquence de coupure pour les basses"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les basses"
   </voice>
 </phrase>
 <phrase>
@@ -9813,15 +9647,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Fréquence de coupure pour aigus"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour aigus"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Fréquence de coupure pour les aigus"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Fréquence de coupure pour les aigus"
   </voice>
 </phrase>
 <phrase>
@@ -9857,16 +9691,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Clics des touches"
+    *: "Clics des touches"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clics des touches"
+    *: "Clics des touches"
   </voice>
 </phrase>
 <phrase>
@@ -9874,16 +9705,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Répéter les clics"
+    *: "Répéter les clics"
   </dest>
   <voice>
-    *: none
-    swcodec: "Répéter les clics"
+    *: "Répéter les clics"
   </voice>
 </phrase>
 <phrase>
@@ -10379,11 +10207,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Débit série"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Débit série"
   </voice>
@@ -10396,11 +10224,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatique"
   </voice>
@@ -10413,11 +10241,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10430,11 +10258,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10447,11 +10275,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10464,11 +10292,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -10616,16 +10444,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Dilatation/Compression temporelle"
+    *: "Dilatation/Compression temporelle"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dilatation ou compression temporelle"
+    *: "Dilatation ou compression temporelle"
   </voice>
 </phrase>
 <phrase>
@@ -10633,16 +10458,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Vitesse"
+    *: "Vitesse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vitesse"
+    *: "Vitesse"
   </voice>
 </phrase>
 <phrase>
@@ -10743,7 +10565,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -10896,16 +10718,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Largeur barre de défilement"
+    *: "Largeur barre de défilement"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Largeur de la barre de défilement"
+    *: "Largeur de la barre de défilement"
   </voice>
 </phrase>
 <phrase>
@@ -10913,16 +10732,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Position barre de défilement"
+    *: "Position barre de défilement"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Position de la barre de défilement"
+    *: "Position de la barre de défilement"
   </voice>
 </phrase>
 <phrase>
@@ -10930,16 +10746,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compresseur de sons"
+    *: "Compresseur de sons"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compresseur de sons"
+    *: "Compresseur de sons"
   </voice>
 </phrase>
 <phrase>
@@ -10998,16 +10811,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Seuil"
+    *: "Seuil"
   </dest>
   <voice>
-    *: none
-    swcodec: "Seuil"
+    *: "Seuil"
   </voice>
 </phrase>
 <phrase>
@@ -11015,16 +10825,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Rapport"
+    *: "Rapport"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rapport"
+    *: "Rapport"
   </voice>
 </phrase>
 <phrase>
@@ -11032,16 +10839,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 pour 1"
+    *: "2 pour 1"
   </voice>
 </phrase>
 <phrase>
@@ -11049,16 +10853,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 pour 1"
+    *: "4 pour 1"
   </voice>
 </phrase>
 <phrase>
@@ -11066,16 +10867,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 pour 1"
+    *: "6 pour 1"
   </voice>
 </phrase>
 <phrase>
@@ -11083,16 +10881,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 pour 1"
+    *: "10 pour 1"
   </voice>
 </phrase>
 <phrase>
@@ -11100,16 +10895,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </voice>
 </phrase>
 <phrase>
@@ -11117,16 +10909,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain de rattrapage"
+    *: "Gain de rattrapage"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain de rattrapage"
+    *: "Gain de rattrapage"
   </voice>
 </phrase>
 <phrase>
@@ -11134,16 +10923,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11151,16 +10937,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Genou"
+    *: "Genou"
   </dest>
   <voice>
-    *: none
-    swcodec: "Genou"
+    *: "Genou"
   </voice>
 </phrase>
 <phrase>
@@ -11168,16 +10951,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Dur du genou"
+    *: "Dur du genou"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dur du genou"
+    *: "Dur du genou"
   </voice>
 </phrase>
 <phrase>
@@ -11185,16 +10965,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Mou du genou"
+    *: "Mou du genou"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mou du genou"
+    *: "Mou du genou"
   </voice>
 </phrase>
 <phrase>
@@ -11202,16 +10979,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Temps de relâche"
+    *: "Temps de relâche"
   </dest>
   <voice>
-    *: none
-    swcodec: "Temps de relâche"
+    *: "Temps de relâche"
   </voice>
 </phrase>
 <phrase>
@@ -11399,16 +11173,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Habillage"
+    *: "Habillage"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Habillage"
+    *: "Habillage"
   </voice>
 </phrase>
 <phrase>
@@ -11416,16 +11187,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Habillage télécommande"
+    *: "Habillage télécommande"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Habillage télécommande"
+    *: "Habillage télécommande"
   </voice>
 </phrase>
 <phrase>
@@ -11552,16 +11320,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rembobiner avant de reprendre"
+    *: "Rembobiner avant de reprendre"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rembobiner avant de reprendre"
+    *: "Rembobiner avant de reprendre"
   </voice>
 </phrase>
 <phrase>
@@ -11953,7 +11718,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12304,16 +12069,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -12363,16 +12125,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Personnalisé"
+    *: "Personnalisé"
   </dest>
   <voice>
-    *: none
-    swcodec: "Personnalisé"
+    *: "Personnalisé"
   </voice>
 </phrase>
 <phrase>
@@ -12429,18 +12188,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Stratégie d'ajustement de la fréquence"
-    ibassodx90: "Stratégie d'ajustement de la fréquence"
+    ibassodx50,ibassodx90: "Stratégie d'ajustement de la fréquence"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Stratégie d'ajustement de la fréquence"
-    ibassodx90: "Stratégie d'ajustement de la fréquence"
+    ibassodx50,ibassodx90: "Stratégie d'ajustement de la fréquence"
   </voice>
 </phrase>
 <phrase>
@@ -12448,16 +12204,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "Différence seulement"
+    *: "Différence seulement"
   </dest>
   <voice>
-    *: none
-    swcodec: "Différence seulement"
+    *: "Différence seulement"
   </voice>
 </phrase>
 <phrase>
@@ -12466,18 +12219,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Stockage de masse"
-    ibassodx90: "Stockage de masse"
+    ibassodx50,ibassodx90: "Stockage de masse"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Stockage de masse"
-    ibassodx90: "Stockage de masse"
+    ibassodx50,ibassodx90: "Stockage de masse"
   </voice>
 </phrase>
 <phrase>
@@ -12499,16 +12249,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Mixage original / affecté"
+    *: "Mixage original / affecté"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mixage original affecté"
+    *: "Mixage original affecté"
   </voice>
 </phrase>
 <phrase>
@@ -12516,16 +12263,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12533,16 +12277,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12550,16 +12291,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12584,16 +12322,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Amélioration de la perception des basses"
+    *: "Amélioration de la perception des basses"
   </dest>
   <voice>
-    *: none
-    swcodec: "Amélioration de la perception des basses"
+    *: "Amélioration de la perception des basses"
   </voice>
 </phrase>
 <phrase>
@@ -12601,16 +12336,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Temps d'attaque"
+    *: "Temps d'attaque"
   </dest>
   <voice>
-    *: none
-    swcodec: "Temps d'attaque"
+    *: "Temps d'attaque"
   </voice>
 </phrase>
 <phrase>
@@ -12649,16 +12381,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Réduction de la fatigue auditive"
+    *: "Réduction de la fatigue auditive"
   </dest>
   <voice>
-    *: none
-    swcodec: "Réduction de la fatigue auditive"
+    *: "Réduction de la fatigue auditive"
   </voice>
 </phrase>
 <phrase>
@@ -12667,18 +12396,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Charge seulement"
-    ibassodx90: "Charge seulement"
+    ibassodx50,ibassodx90: "Charge seulement"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Charge seulement"
-    ibassodx90: "Charge seulement"
+    ibassodx50,ibassodx90: "Charge seulement"
   </voice>
 </phrase>
 <phrase>
@@ -12687,18 +12413,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Pont de débogage Android"
-    ibassodx90: "Pont de débogage Android"
+    ibassodx50,ibassodx90: "Pont de débogage Android"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Pont de débogage Android"
-    ibassodx90: "Pont de débogage Android"
+    ibassodx50,ibassodx90: "Pont de débogage Android"
   </voice>
 </phrase>
 <phrase>
@@ -12723,16 +12446,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Effet Haas"
+    *: "Effet Haas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Effet Haas"
+    *: "Effet Haas"
   </voice>
 </phrase>
 <phrase>
@@ -12755,18 +12475,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "Mode USB"
-    ibassodx90: "Mode USB"
+    ibassodx50,ibassodx90: "Mode USB"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Mode USB"
-    ibassodx90: "Mode USB"
+    ibassodx50,ibassodx90: "Mode USB"
   </voice>
 </phrase>
 <phrase>
@@ -12942,18 +12659,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Utiliser les réglages sonores"
+    *: "Utiliser les réglages sonores"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Utiliser les réglages sonores"
+    *: "Utiliser les réglages sonores"
     lowmem: none
   </voice>
 </phrase>
@@ -13004,16 +12718,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coup interdit!"
+    *: "Coup interdit!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coup interdit!"
+    *: "Coup interdit!"
   </voice>
 </phrase>
 <phrase>
@@ -13021,16 +12732,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Reconstruire le cache"
+    *: "Reconstruire le cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Reconstruire le cache"
+    *: "Reconstruire le cache"
   </voice>
 </phrase>
 <phrase>
@@ -13038,16 +12746,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </voice>
 </phrase>
 <phrase>
@@ -13055,18 +12760,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Lire depuis le début"
+    *: "Lire depuis le début"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Lire depuis le début"
+    *: "Lire depuis le début"
     lowmem: none
   </voice>
 </phrase>
@@ -13075,16 +12777,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Roi"
+    *: "Roi"
   </voice>
 </phrase>
 <phrase>
@@ -13106,16 +12805,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vitesse du ver"
+    *: "Vitesse du ver"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vitesse du ver"
+    *: "Vitesse du ver"
   </voice>
 </phrase>
 <phrase>
@@ -13123,16 +12819,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </voice>
 </phrase>
 <phrase>
@@ -13140,16 +12833,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pion"
+    *: "Pion"
   </voice>
 </phrase>
 <phrase>
@@ -13171,18 +12861,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Mode de lecture"
+    *: "Mode de lecture"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Mode de lecture"
+    *: "Mode de lecture"
     lowmem: none
   </voice>
 </phrase>
@@ -13205,16 +12892,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Masquer les informations"
+    *: "Masquer les informations"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Masquer les informations"
+    *: "Masquer les informations"
   </voice>
 </phrase>
 <phrase>
@@ -13222,16 +12906,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afficher l'album et l'interprète en bas"
+    *: "Afficher l'album et l'interprète en bas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afficher l'album et l'interprète en bas"
+    *: "Afficher l'album et l'interprète en bas"
   </voice>
 </phrase>
 <phrase>
@@ -13239,16 +12920,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </voice>
 </phrase>
 <phrase>
@@ -13287,18 +12965,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Réglages de tonalité"
+    *: "Réglages de tonalité"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Réglages de tonalité"
+    *: "Réglages de tonalité"
     lowmem: none
   </voice>
 </phrase>
@@ -13307,16 +12982,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Toujours affiché"
+    *: "Toujours affiché"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Toujours affiché"
+    *: "Toujours affiché"
   </voice>
 </phrase>
 <phrase>
@@ -13352,18 +13024,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Utiliser le réglage de base"
+    *: "Utiliser le réglage de base"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Utiliser le réglage de base"
+    *: "Utiliser le réglage de base"
     lowmem: none
   </voice>
 </phrase>
@@ -13372,18 +13041,15 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Introuvable"
+    *: "Introuvable"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Introuvable"
+    *: "Introuvable"
     lowmem: none
   </voice>
 </phrase>
@@ -13392,16 +13058,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cavalier"
+    *: "Cavalier"
   </voice>
 </phrase>
 <phrase>
@@ -13409,16 +13072,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 3: 60 coups / 30 minutes"
+    *: "Niveau 3: 60 coups / 30 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 3: 60 coups en 30 minutes"
+    *: "Niveau 3: 60 coups en 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13426,16 +13086,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Réflexion en cours..."
+    *: "Réflexion en cours..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13443,18 +13100,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Rétablir les options"
+    *: "Rétablir les options"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Rétablir les options"
+    *: "Rétablir les options"
     lowmem: none
   </voice>
 </phrase>
@@ -13463,16 +13117,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Intégration de l'écran de lecture en cours"
+    *: "Intégration de l'écran de lecture en cours"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Intégration de l'écran de lecture en cours"
+    *: "Intégration de l'écran de lecture en cours"
   </voice>
 </phrase>
 <phrase>
@@ -13494,16 +13145,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Redimensionner les pochettes"
+    *: "Redimensionner les pochettes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Redimensionner les pochettes"
+    *: "Redimensionner les pochettes"
   </voice>
 </phrase>
 <phrase>
@@ -13511,16 +13159,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "À la fin de la partie"
+    *: "À la fin de la partie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "À la fin de la partie"
+    *: "À la fin de la partie"
   </voice>
 </phrase>
 <phrase>
@@ -13528,16 +13173,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "échec!"
+    *: "échec!"
   </voice>
 </phrase>
 <phrase>
@@ -13545,19 +13187,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </dest>
   <voice>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13593,16 +13229,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -13638,16 +13271,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Reine"
+    *: "Reine"
   </voice>
 </phrase>
 <phrase>
@@ -13655,18 +13285,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </voice>
 </phrase>
@@ -13675,16 +13302,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Slide show Time"
+    *: "Slide show Time"
   </voice>
 </phrase>
 <phrase>
@@ -13723,16 +13347,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Marked"
+    *: "Marked"
   </voice>
 </phrase>
 <phrase>
@@ -13740,16 +13361,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "castle"
+    *: "castle"
   </voice>
 </phrase>
 <phrase>
@@ -13757,16 +13375,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </voice>
 </phrase>
 <phrase>
@@ -13816,16 +13431,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </voice>
 </phrase>
 <phrase>
@@ -13847,16 +13459,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </voice>
 </phrase>
 <phrase>
@@ -13864,16 +13473,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </voice>
 </phrase>
 <phrase>
@@ -13881,18 +13487,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </voice>
 </phrase>
@@ -13918,16 +13521,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Effacer la liste de lecture"
+    *: "Effacer la liste de lecture"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Effacer la liste de lecture"
+    *: "Effacer la liste de lecture"
   </voice>
 </phrase>
 <phrase>
@@ -13935,16 +13535,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "reine côté"
+    *: "reine côté"
   </voice>
 </phrase>
 <phrase>
@@ -13997,16 +13594,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Blanc"
+    *: "Blanc"
   </voice>
 </phrase>
 <phrase>
@@ -14014,18 +13608,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </voice>
 </phrase>
@@ -14034,16 +13625,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </voice>
 </phrase>
 <phrase>
@@ -14051,16 +13639,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </voice>
 </phrase>
 <phrase>
@@ -14096,16 +13681,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </voice>
 </phrase>
 <phrase>
@@ -14155,18 +13737,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </voice>
 </phrase>
@@ -14203,18 +13782,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </voice>
 </phrase>
@@ -14223,16 +13799,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Roque"
+    *: "Roque"
   </voice>
 </phrase>
 <phrase>
@@ -14240,16 +13813,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -14257,16 +13827,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "démarqué"
+    *: "démarqué"
   </voice>
 </phrase>
 <phrase>
@@ -14274,16 +13841,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </voice>
 </phrase>
 <phrase>
@@ -14322,16 +13886,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </voice>
 </phrase>
 <phrase>
@@ -14339,18 +13900,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Limiter le nombre d'images par seconde"
+    *: "Limiter le nombre d'images par seconde"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiter le nombre d'images par seconde"
+    *: "Limiter le nombre d'images par seconde"
     lowmem: none
   </voice>
 </phrase>
@@ -14359,16 +13917,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Marge centrale"
+    *: "Marge centrale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Marge centrale"
+    *: "Marge centrale"
   </voice>
 </phrase>
 <phrase>
@@ -14390,16 +13945,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </voice>
 </phrase>
 <phrase>
@@ -14407,16 +13959,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 6: 40 coups / 120 minutes"
+    *: "Niveau 6: 40 coups / 120 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 6: 40 coups en 120 minutes"
+    *: "Niveau 6: 40 coups en 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14438,16 +13987,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Toggle Slide show Mode"
+    *: "Toggle Slide show Mode"
   </voice>
 </phrase>
 <phrase>
@@ -14486,16 +14032,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Joueur"
+    *: "Joueur"
   </voice>
 </phrase>
 <phrase>
@@ -14503,16 +14046,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5: 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14520,16 +14060,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -14537,16 +14074,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Black"
+    *: "Black"
   </voice>
 </phrase>
 <phrase>
@@ -14554,18 +14088,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </voice>
 </phrase>
@@ -14574,16 +14105,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4: 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -14591,16 +14119,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ajouté à la liste de lecture"
+    *: "Ajouté à la liste de lecture"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ajouté à la liste de lecture"
+    *: "Ajouté à la liste de lecture"
   </voice>
 </phrase>
 <phrase>
@@ -14625,16 +14150,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Reprendre la partie"
+    *: "Reprendre la partie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Reprendre la partie"
+    *: "Reprendre la partie"
   </voice>
 </phrase>
 <phrase>
@@ -14642,16 +14164,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Taille Argh"
+    *: "Taille Argh"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Taille Argh"
+    *: "Taille Argh"
   </voice>
 </phrase>
 <phrase>
@@ -14659,18 +14178,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Menu démarrage"
+    *: "Menu démarrage"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Menu démarrage"
+    *: "Menu démarrage"
     lowmem: none
   </voice>
 </phrase>
@@ -14693,16 +14209,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </voice>
 </phrase>
 <phrase>
@@ -14724,16 +14237,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </voice>
 </phrase>
 <phrase>
@@ -14741,16 +14251,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restaurer la partie"
+    *: "Restaurer la partie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restaurer la partie"
+    *: "Restaurer la partie"
   </voice>
 </phrase>
 <phrase>
@@ -14786,16 +14293,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Croissance du ver selon nourriture"
+    *: "Croissance du ver selon nourriture"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Croissance du ver selon nourriture"
+    *: "Croissance du ver selon nourriture"
   </voice>
 </phrase>
 <phrase>
@@ -14803,18 +14307,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Options Audio"
+    *: "Options Audio"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Options Audio"
+    *: "Options Audio"
     lowmem: none
   </voice>
 </phrase>
@@ -14823,16 +14324,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Roi côté"
+    *: "Roi côté"
   </voice>
 </phrase>
 <phrase>
@@ -14868,16 +14366,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </voice>
 </phrase>
 <phrase>
@@ -14899,16 +14394,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </voice>
 </phrase>
 <phrase>
@@ -14916,16 +14408,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Démarrer Vermisseau!"
+    *: "Démarrer Vermisseau!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Démarrer Vermisseau!"
+    *: "Démarrer Vermisseau!"
   </voice>
 </phrase>
 <phrase>
@@ -14947,16 +14436,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Parties"
+    *: "Parties"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14964,18 +14450,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Unique"
+    *: "Unique"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Unique"
+    *: "Unique"
     lowmem: none
   </voice>
 </phrase>
@@ -15012,16 +14495,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </voice>
 </phrase>
 <phrase>
@@ -15085,16 +14565,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </voice>
 </phrase>
 <phrase>
@@ -15116,16 +14593,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Erreur d'analyse du jeu !"
+    *: "Erreur d'analyse du jeu !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Erreur d'analyse du jeu !"
+    *: "Erreur d'analyse du jeu !"
   </voice>
 </phrase>
 <phrase>
@@ -15147,16 +14621,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 1: 60 coups / 5 minutes"
+    *: "Niveau 1: 60 coups / 5 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 1: 60 coups en 5 minutes"
+    *: "Niveau 1: 60 coups en 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15220,16 +14691,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Enregistrer la position"
+    *: "Enregistrer la position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Enregistrer la position"
+    *: "Enregistrer la position"
   </voice>
 </phrase>
 <phrase>
@@ -15293,18 +14761,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </voice>
 </phrase>
@@ -15313,18 +14778,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </voice>
 </phrase>
@@ -15333,16 +14795,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 10: 1 coup / 600 minutes"
+    *: "Niveau 10: 1 coup / 600 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 10: 1 coup en 600 minutes"
+    *: "Niveau 10: 1 coup en 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15364,16 +14823,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 8: 1 coup / 15 minutes"
+    *: "Niveau 8: 1 coup / 15 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 8: 1 coup par 15 minutes"
+    *: "Niveau 8: 1 coup par 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15409,16 +14865,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afficher en haut"
+    *: "Afficher en haut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afficher en haut"
+    *: "Afficher en haut"
   </voice>
 </phrase>
 <phrase>
@@ -15426,16 +14879,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aucune partie trouvée !"
+    *: "Aucune partie trouvée !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aucune partie trouvée!"
+    *: "Aucune partie trouvée!"
   </voice>
 </phrase>
 <phrase>
@@ -15457,18 +14907,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Menu démarrage si non renseigné"
+    *: "Menu démarrage si non renseigné"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Menu démarrage si non renseigné"
+    *: "Menu démarrage si non renseigné"
     lowmem: none
   </voice>
 </phrase>
@@ -15491,16 +14938,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fou"
+    *: "Fou"
   </voice>
 </phrase>
 <phrase>
@@ -15522,16 +14966,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 2: 60 coups / 15 minutes"
+    *: "Niveau 2: 60 coups / 15 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 2: 60 coups en 15 minutes"
+    *: "Niveau 2: 60 coups en 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15539,16 +14980,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afficher l'album et l'interprète en haut"
+    *: "Afficher l'album et l'interprète en haut"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afficher l'album et l'interprète en haut"
+    *: "Afficher l'album et l'interprète en haut"
   </voice>
 </phrase>
 <phrase>
@@ -15570,16 +15008,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 7: 40 coups / 240 minutes"
+    *: "Niveau 7: 40 coups / 240 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 7: 40 coups en 240 minutes"
+    *: "Niveau 7: 40 coups en 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15587,18 +15022,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Accélérer le processeur"
+    *: "Accélérer le processeur"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Accélérer le processeur"
+    *: "Accélérer le processeur"
     lowmem: none
   </voice>
 </phrase>
@@ -15607,16 +15039,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Impossible de redémarrer la lecture"
+    *: "Impossible de redémarrer la lecture"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Impossible de redémarrer la lecture"
+    *: "Impossible de redémarrer la lecture"
   </voice>
 </phrase>
 <phrase>
@@ -15624,16 +15053,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </voice>
 </phrase>
 <phrase>
@@ -15655,16 +15081,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aucune pochette d'album trouvée"
+    *: "Aucune pochette d'album trouvée"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aucune pochette d'album trouvée"
+    *: "Aucune pochette d'album trouvée"
   </voice>
 </phrase>
 <phrase>
@@ -15672,16 +15095,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Taille de la nourriture"
+    *: "Taille de la nourriture"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Taille de la nourriture"
+    *: "Taille de la nourriture"
   </voice>
 </phrase>
 <phrase>
@@ -15689,16 +15109,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Niveau 9: 1 coup / 60 minutes"
+    *: "Niveau 9: 1 coup / 60 minutes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Niveau 9: 1 coup en 60 minutes"
+    *: "Niveau 9: 1 coup en 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15706,16 +15123,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Choisir une autre partie"
+    *: "Choisir une autre partie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Choisir une autre partie"
+    *: "Choisir une autre partie"
   </voice>
 </phrase>
 <phrase>
@@ -15737,16 +15151,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </voice>
 </phrase>
 <phrase>
@@ -15754,18 +15165,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Set resume time"
+    *: "Set resume time"
     lowmem: none
   </voice>
 </phrase>
@@ -15774,16 +15182,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "prend"
+    *: "prend"
   </voice>
 </phrase>
 <phrase>
@@ -15791,16 +15196,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afficher l'album en bas"
+    *: "Afficher l'album en bas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afficher l'album en bas"
+    *: "Afficher l'album en bas"
   </voice>
 </phrase>
 <phrase>
@@ -15808,16 +15210,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "échelle de gris"
+    *: "échelle de gris"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "échelle de gris"
+    *: "échelle de gris"
   </voice>
 </phrase>
 <phrase>
@@ -15839,16 +15238,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 3431ec0493..e99f9fb034 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -1067,16 +1067,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipo de letra"
+    *: "Tipo de letra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipo de letra"
+    *: "Tipo de letra"
   </voice>
 </phrase>
 <phrase>
@@ -1484,15 +1481,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frecuencia"
+    play_frequency,recording: "Frecuencia"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frecuencia"
+    play_frequency,recording: "Frecuencia"
   </voice>
 </phrase>
 <phrase>
@@ -1518,18 +1515,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Micrófono"
     iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    recording: "Micrófono"
   </dest>
   <voice>
     *: none
-    recording: "Micrófono"
     iriverh100,iriverh120,iriverh300: "Micrófono interno"
+    recording: "Micrófono"
   </voice>
 </phrase>
 <phrase>
@@ -1763,16 +1760,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Boca abaixo"
+    *: "Boca abaixo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Boca abaixo"
+    *: "Boca abaixo"
   </voice>
 </phrase>
 <phrase>
@@ -1780,16 +1774,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Selector da liña"
+    *: "Selector da liña"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Selector da liña"
+    *: "Selector da liña"
   </voice>
 </phrase>
 <phrase>
@@ -1797,16 +1788,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Punteiro"
+    *: "Punteiro"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Punteiro"
+    *: "Punteiro"
   </voice>
 </phrase>
 <phrase>
@@ -1814,16 +1802,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra (cor invertido)"
+    *: "Barra (cor invertido)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra (cor invertido)"
+    *: "Barra (cor invertido)"
   </voice>
 </phrase>
 <phrase>
@@ -1915,16 +1900,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de desprazamento"
+    *: "Barra de desprazamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de desprazamento"
+    *: "Barra de desprazamento"
   </voice>
 </phrase>
 <phrase>
@@ -1932,16 +1914,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de estado"
+    *: "Barra de estado"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de estado"
+    *: "Barra de estado"
   </voice>
 </phrase>
 <phrase>
@@ -1966,16 +1945,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Amosar volume"
+    *: "Amosar volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Amosar volume"
+    *: "Amosar volume"
   </voice>
 </phrase>
 <phrase>
@@ -1983,16 +1959,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Amosar batería"
+    *: "Amosar batería"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Amosar batería"
+    *: "Amosar batería"
   </voice>
 </phrase>
 <phrase>
@@ -2000,16 +1973,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -2017,16 +1987,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </voice>
 </phrase>
 <phrase>
@@ -2727,14 +2694,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batería: %d%% %dh %dm"
-
-iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
+    iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Nivel da batería"
@@ -2791,24 +2757,24 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "eme eme ce:"
     multivolume: "Disco duro 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Micro ese de:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Micro ese de:"
     xduoox3: "Micro ese de 2:"
-    archosondio*: "eme eme ce:"
   </voice>
 </phrase>
 <phrase>
@@ -2938,51 +2904,45 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = desfacer"
-    mrobe500: "POWER = desfacer"
-    iriverh100,iriverh120,iriverh300: "STOP = desfacer"
-    ipod*,sansac200*,mpiohd300: "MENU = desfacer"
-    iaudiox5,iaudiom5: "RECORD = desfacer"
+    gigabeatfx,mrobe500: "POWER = desfacer"
+    gigabeats,sansafuzeplus: "BACK = desfacer"
+    gogearsa9200: "LEFT = desfacer"
+    iaudiom5,iaudiox5: "RECORD = desfacer"
+    ipod*,mpiohd300,sansac200*: "MENU = desfacer"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = desfacer"
-    gigabeatfx: "POWER = desfacer"
-    sansafuzeplus: "BACK = desfacer"
+    iriverh100,iriverh120,iriverh300: "STOP = desfacer"
     mrobe100: "DISPLAY = desfacer"
-    gigabeats: "BACK = desfacer"
-    gogearsa9200: "LEFT = desfacer"
-    vibe500: "CANCEL = desfacer"
+    rtc: "OFF = desfacer"
     samsungyh*: "REW = desfacer"
+    vibe500: "CANCEL = desfacer"
   </dest>
   <voice>
     *: none
-    rtc: "OFF = desfacer"
-    mrobe500: "POWER = desfacer"
-    iriverh100,iriverh120,iriverh300: "STOP = desfacer"
-    ipod*,sansac200*,mpiohd300: "MENU = desfacer"
-    iaudiox5,iaudiom5: "RECORD = desfacer"
+    gigabeatfx,mrobe500: "POWER = desfacer"
+    gigabeats,sansafuzeplus: "BACK = desfacer"
+    gogearsa9200: "LEFT = desfacer"
+    iaudiom5,iaudiox5: "RECORD = desfacer"
+    ipod*,mpiohd300,sansac200*: "MENU = desfacer"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = desfacer"
-    gigabeatfx: "POWER = desfacer"
-    sansafuzeplus: "BACK = desfacer"
+    iriverh100,iriverh120,iriverh300: "STOP = desfacer"
     mrobe100: "DISPLAY = desfacer"
-    gigabeats: "BACK = desfacer"
-    gogearsa9200: "LEFT = desfacer"
-    vibe500: "CANCEL = desfacer"
+    rtc: "OFF = desfacer"
     samsungyh*: "REW = desfacer"
+    vibe500: "CANCEL = desfacer"
   </voice>
 </phrase>
 <phrase>
@@ -3042,27 +3002,27 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "O disco está cheo. Pulsa OFF para continuar."
-    iriverh100,iriverh120,iriverh300: "O disco está cheo. Pulsa STOP para continuar."
     iaudiom5,iaudiox5: "O disco está cheo. Pulsa POWER para continuar."
-    sansae200*,sansac200*,vibe500: "O disco está cheo. Pulsa PREV para continuar."
+    iriverh100,iriverh120,iriverh300: "O disco está cheo. Pulsa STOP para continuar."
+    recording: "O disco está cheo. Pulsa OFF para continuar."
     samsungyh*: "O disco está cheo. Pulsa LEFT para continuar."
+    sansac200*,sansae200*,vibe500: "O disco está cheo. Pulsa PREV para continuar."
   </dest>
   <voice>
     *: none
-    recording: "O disco está cheo. Pulsa OFF para continuar."
-    iriverh100,iriverh120,iriverh300: "O disco está cheo. Pulsa STOP para continuar."
     iaudiom5,iaudiox5: "O disco está cheo. Pulsa POWER para continuar."
-    sansae200*,sansac200*,vibe500: "O disco está cheo. Pulsa PREV para continuar."
+    iriverh100,iriverh120,iriverh300: "O disco está cheo. Pulsa STOP para continuar."
+    recording: "O disco está cheo. Pulsa OFF para continuar."
     samsungyh*: "O disco está cheo. Pulsa LEFT para continuar."
+    sansac200*,sansae200*,vibe500: "O disco está cheo. Pulsa PREV para continuar."
   </voice>
 </phrase>
 <phrase>
@@ -3095,7 +3055,7 @@ iriverifp7xx: "%d%% %dh %dm"
     recording: "Comezar por arriba"
   </dest>
   <voice>
-     *: none
+    *: none
     recording: "Comezar por arriba"
   </voice>
 </phrase>
@@ -3225,32 +3185,32 @@ iriverifp7xx: "%d%% %dh %dm"
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Aceptar OFF=Cancelar"
+    gigabeats: "SELECT=Aceptar POWER=Cancelar"
     ipod*: "SELECT=Aceptar MENU=Cancelar"
     iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar"
-    gigabeats: "SELECT=Aceptar POWER=Cancelar"
-    vibe500: "OK=Aceptar C=Cancelar"
     mpiohd300: "ENTER=Aceptar MENU=Cancelar"
     sansafuzeplus: "SELECT=Aceptar  BACK=Cancelar"
+    vibe500: "OK=Aceptar C=Cancelar"
   </dest>
   <voice>
     *: none
     alarm: "PLAY=Aceptar OFF=Cancelar"
+    gigabeats: "SELECT=Aceptar POWER=Cancelar"
     ipod*: "SELECT=Aceptar MENU=Cancelar"
     iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar"
-    gigabeats: "SELECT=Aceptar POWER=Cancelar"
-    vibe500: "OK=Aceptar C=Cancelar"
     mpiohd300: "ENTER=Aceptar MENU=Cancelar"
     sansafuzeplus: "SELECT=Aceptar  BACK=Cancelar"
+    vibe500: "OK=Aceptar C=Cancelar"
   </voice>
 </phrase>
 <phrase>
@@ -5399,33 +5359,30 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK para abortar"
     gigabeatfx: "POWER para abortar"
-    sansafuzeplus: "BACK para abortar"
+    gigabeats,sansafuzeplus: "BACK para abortar"
+    iaudiom5,iaudiox5: "Manter pulsado PLAY para abortar"
+    ipod*: "PLAY/PAUSE para abortar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
   </dest>
   <voice>
     *: "OFF 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"
-    gigabeats: "BACK para abortar"
     gigabeatfx: "POWER para abortar"
-    sansafuzeplus: "BACK para abortar"
+    gigabeats,sansafuzeplus: "BACK para abortar"
+    iaudiom5,iaudiox5: "Manter pulsado PLAY para abortar"
+    ipod*: "PLAY/PAUSE para abortar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
   </voice>
 </phrase>
 <phrase>
@@ -5895,16 +5852,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editar modo: %s %s"
+    *: "Editar modo: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -5957,16 +5911,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Axustes avanzados do ecualizador"
+    *: "Axustes avanzados do ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Axustes avanzados do ecualizador"
+    *: "Axustes avanzados do ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -5991,16 +5942,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo de saída"
+    *: "Tempo de saída"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo de saíad"
+    *: "Tempo de saíad"
   </voice>
 </phrase>
 <phrase>
@@ -6054,15 +6002,15 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de baixos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de baixos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de baixos"
   </voice>
 </phrase>
 <phrase>
@@ -6170,21 +6118,19 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Construindo a base de datos... %d atopadas (OFF para volver)"
-    iriverh100,iriverh120,iriverh300: "Construindo a base de datos... %d atopadas (STOP para volver)"
-    ipod*: "Construindo a base de datos... %d atopadas (PREV para volver)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Construindo a base de datos... %d atopadas (LEFT para volver)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construindo a base de datos... %d atopadas (PREV para volver)"
-    gogearsa9200: "Construindo a base de datos... %d atopadas (REW para volver)"
     archosplayer: "Construindo BD %d atop."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Construindo a base de datos... %d atopadas (LEFT para volver)"
+    gogearsa9200: "Construindo a base de datos... %d atopadas (REW para volver)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Construindo a base de datos... %d atopadas (PREV para volver)"
+    iriverh100,iriverh120,iriverh300: "Construindo a base de datos... %d atopadas (STOP para volver)"
   </dest>
   <voice>
     *: "pistas atopadas para a base de datos"
@@ -6254,16 +6200,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ecualizador gráfico"
+    *: "Ecualizador gráfico"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ecualizador gráfico"
+    *: "Ecualizador gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -6285,16 +6228,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Marxe"
+    *: "Marxe"
   </dest>
   <voice>
-    *: none
-    swcodec: "Marxe"
+    *: "Marxe"
   </voice>
 </phrase>
 <phrase>
@@ -6412,16 +6352,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </voice>
 </phrase>
 <phrase>
@@ -6446,16 +6383,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganancia de compensación"
+    *: "Ganancia de compensación"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganancia de compensación"
+    *: "Ganancia de compensación"
   </voice>
 </phrase>
 <phrase>
@@ -6463,16 +6397,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Corte"
+    *: "Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </voice>
 </phrase>
 <phrase>
@@ -6511,16 +6442,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin base"
+    *: "Skin base"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin base"
+    *: "Skin base"
   </voice>
 </phrase>
 <phrase>
@@ -6706,16 +6634,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -6839,16 +6764,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -6946,16 +6868,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </voice>
 </phrase>
 <phrase>
@@ -6980,16 +6899,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precorte"
+    *: "Precorte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-corte"
+    *: "Pre-corte"
   </voice>
 </phrase>
 <phrase>
@@ -6997,16 +6913,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Xaponés (SJIS)"
+    *: "Xaponés (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Xaponés"
+    *: "Xaponés"
   </voice>
 </phrase>
 <phrase>
@@ -7073,16 +6986,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posición da barra de desprazamento"
+    *: "Posición da barra de desprazamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posición da barra de desprazamento"
+    *: "Posición da barra de desprazamento"
   </voice>
 </phrase>
 <phrase>
@@ -7166,16 +7076,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreo (ISO-8859-8)"
+    *: "Hebreo (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreo"
+    *: "Hebreo"
   </voice>
 </phrase>
 <phrase>
@@ -7228,16 +7135,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Evitar cortes"
+    *: "Evitar cortes"
   </dest>
   <voice>
-    *: none
-    swcodec: "Evitar cortes"
+    *: "Evitar cortes"
   </voice>
 </phrase>
 <phrase>
@@ -7276,16 +7180,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreano (KSX1001)"
+    *: "Coreano (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coreano"
+    *: "Coreano"
   </voice>
 </phrase>
 <phrase>
@@ -7437,16 +7338,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Marxe de transición"
+    *: "Marxe de transición"
   </dest>
   <voice>
-    *: none
-    swcodec: "Marxe de transición"
+    *: "Marxe de transición"
   </voice>
 </phrase>
 <phrase>
@@ -7468,16 +7366,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -7499,16 +7394,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinés simplificado (GB2312)"
+    *: "Chinés simplificado (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinés simplificado"
+    *: "Chinés simplificado"
   </voice>
 </phrase>
 <phrase>
@@ -7650,16 +7542,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Suave"
+    *: "Suave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Suave"
+    *: "Suave"
   </voice>
 </phrase>
 <phrase>
@@ -7761,20 +7650,20 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Si"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, ou arriba-dereita = Si"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Si"
     iriverh100,iriverh120,iriverh300: "NAVI = Si"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Si"
     mrobe500: "PLAY, POWER, ou arriba-dereita = Si"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Si"
   </dest>
   <voice>
@@ -7804,27 +7693,27 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Aceptar"
-    mrobe500: "HEART = Aceptar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Aceptar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Aceptar"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Aceptar"
     gogearsa9200,samsungyh*: "PLAY = Aceptar"
-    vibe500: "OK = Aceptar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Aceptar"
     mpiohd300: "ENTER = Aceptar"
+    mrobe500: "HEART = Aceptar"
+    rtc: "ON = Aceptar"
+    vibe500: "OK = Aceptar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7860,16 +7749,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -7877,16 +7763,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Emitir son nos saltos de pista"
+    *: "Emitir son nos saltos de pista"
   </dest>
   <voice>
-    *: none
-    swcodec: "Emitir son nos saltos de pista"
+    *: "Emitir son nos saltos de pista"
   </voice>
 </phrase>
 <phrase>
@@ -7973,16 +7856,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Gardar presintonías de EQ"
+    *: "Gardar presintonías de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gardar presintonías de ecualizador"
+    *: "Gardar presintonías de ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -8148,16 +8028,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Dura"
+    *: "Dura"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dura"
+    *: "Dura"
   </voice>
 </phrase>
 <phrase>
@@ -8210,16 +8087,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -8365,16 +8239,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin base do mando"
+    *: "Skin base do mando"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin base do mando remoto"
+    *: "Skin base do mando remoto"
   </voice>
 </phrase>
 <phrase>
@@ -8415,16 +8286,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganancia"
+    *: "Ganancia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganancia"
+    *: "Ganancia"
   </voice>
 </phrase>
 <phrase>
@@ -8573,16 +8441,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinés trad. (BIG5)"
+    *: "Chinés trad. (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinés tradicional"
+    *: "Chinés tradicional"
   </voice>
 </phrase>
 <phrase>
@@ -8748,16 +8613,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modo:"
+    *: "Modo:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9121,16 +8983,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Retroceder antes de reanudar"
+    *: "Retroceder antes de reanudar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Retroceder antes de reanudar"
+    *: "Retroceder antes de reanudar"
   </voice>
 </phrase>
 <phrase>
@@ -9138,16 +8997,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lonxitude do paso do desprazamento da pantalla"
+    *: "Lonxitude do paso do desprazamento da pantalla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lonxitude do paso do desprazamento da pantalla"
+    *: "Lonxitude do paso do desprazamento da pantalla"
   </voice>
 </phrase>
 <phrase>
@@ -9338,16 +9194,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Corte de frecuencias altas"
+    *: "Corte de frecuencias altas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Corte de frecuencias algas"
+    *: "Corte de frecuencias algas"
   </voice>
 </phrase>
 <phrase>
@@ -9417,16 +9270,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Desprazar a liñas fóra da pantalla"
+    *: "Desprazar a liñas fóra da pantalla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Desprazar a liñas fóra da pantalla"
+    *: "Desprazar a liñas fóra da pantalla"
   </voice>
 </phrase>
 <phrase>
@@ -9482,16 +9332,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Clic de tecla"
+    *: "Clic de tecla"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clic de tecla"
+    *: "Clic de tecla"
   </voice>
 </phrase>
 <phrase>
@@ -9699,16 +9546,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 a 1"
+    *: "10 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -9846,16 +9690,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecuencia de corte"
+    *: "Frecuencia de corte"
   </voice>
 </phrase>
 <phrase>
@@ -10196,16 +10037,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Ganancia de banda"
+    *: "%d Hz Ganancia de banda"
   </dest>
   <voice>
-    *: none
-    swcodec: "hercios ganancia de banda"
+    *: "hercios ganancia de banda"
   </voice>
 </phrase>
 <phrase>
@@ -10269,16 +10107,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 a 1"
+    *: "2 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -10286,16 +10121,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centrar frecuencia"
+    *: "Centrar frecuencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centrar frecuencia"
+    *: "Centrar frecuencia"
   </voice>
 </phrase>
 <phrase>
@@ -10461,16 +10293,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Límite"
+    *: "Límite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Límite"
+    *: "Límite"
   </voice>
 </phrase>
 <phrase>
@@ -10672,16 +10501,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Largo da barra de desprazamento"
+    *: "Largo da barra de desprazamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Largo da barra de desprazamento"
+    *: "Largo da barra de desprazamento"
   </voice>
 </phrase>
 <phrase>
@@ -10886,16 +10712,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -10962,16 +10785,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -10979,16 +10799,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Árabe (CP1256)"
+    *: "Árabe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Árabe"
+    *: "Árabe"
   </voice>
 </phrase>
 <phrase>
@@ -11106,16 +10923,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Axustes de EQ simples"
+    *: "Axustes de EQ simples"
   </dest>
   <voice>
-    *: none
-    swcodec: "Axustes de ecualizador simples"
+    *: "Axustes de ecualizador simples"
   </voice>
 </phrase>
 <phrase>
@@ -11137,16 +10951,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de baixo nivel"
+    *: "Filtro de baixo nivel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de baixo nivel"
+    *: "Filtro de baixo nivel"
   </voice>
 </phrase>
 <phrase>
@@ -11185,16 +10996,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Feble"
+    *: "Feble"
   </dest>
   <voice>
-    *: none
-    swcodec: "Feble"
+    *: "Feble"
   </voice>
 </phrase>
 <phrase>
@@ -11219,16 +11027,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Editar modo: %s"
+    *: "Editar modo: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -11236,16 +11041,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuación de altas frecuencias"
+    *: "Atenuación de altas frecuencias"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuación de altas frecuencias"
+    *: "Atenuación de altas frecuencias"
   </voice>
 </phrase>
 <phrase>
@@ -11253,16 +11055,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Activar ecualizador"
+    *: "Activar ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Activar ecualizador"
+    *: "Activar ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -11326,16 +11125,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Axuste de tempo"
+    *: "Axuste de tempo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Axuste de tempo"
+    *: "Axuste de tempo"
   </voice>
 </phrase>
 <phrase>
@@ -11343,16 +11139,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 a 1"
+    *: "6 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11452,17 +11245,17 @@ iriverifp7xx: "%d%% %dh %dm"
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tempo das luces dos botóns"
-    sansafuze*,sansae200*: "Tempo das luces da roda"
+    sansae200*,sansafuze*: "Tempo das luces da roda"
   </dest>
   <voice>
     *: none
     button_light: "Tempo das luces dos botóns"
-    sansafuze*,sansae200*: "Tempo das luces da roda"
+    sansae200*,sansafuze*: "Tempo das luces da roda"
   </voice>
 </phrase>
 <phrase>
@@ -11484,16 +11277,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de alto nivel"
+    *: "Filtro de alto nivel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de alto nivel"
+    *: "Filtro de alto nivel"
   </voice>
 </phrase>
 <phrase>
@@ -11626,15 +11416,15 @@ iriverifp7xx: "%d%% %dh %dm"
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de agudos"
   </voice>
 </phrase>
 <phrase>
@@ -11676,16 +11466,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </voice>
 </phrase>
 <phrase>
@@ -11724,16 +11511,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Explorar presintonías de EQ"
+    *: "Explorar presintonías de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Explorar presintonías de ecualizador"
+    *: "Explorar presintonías de ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -11952,16 +11736,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ecualizador"
+    *: "Ecualizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ecualizador"
+    *: "Ecualizador"
   </voice>
 </phrase>
 <phrase>
@@ -12090,16 +11871,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repeticións de pulsacións"
+    *: "Repeticións de pulsacións"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repeticións de pulsacións"
+    *: "Repeticións de pulsacións"
   </voice>
 </phrase>
 <phrase>
@@ -12107,16 +11885,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganancia directa"
+    *: "Ganancia directa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganancia directa"
+    *: "Ganancia directa"
   </voice>
 </phrase>
 <phrase>
@@ -12138,16 +11913,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </voice>
 </phrase>
 <phrase>
@@ -12172,16 +11944,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de picos %d"
+    *: "Filtro de picos %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de picos"
+    *: "Filtro de picos"
   </voice>
 </phrase>
 <phrase>
@@ -12234,16 +12003,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 a 1"
+    *: "4 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -12612,16 +12378,13 @@ iriverifp7xx: "%d%% %dh %dm"
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barras de estado e de desprazamento"
+    *: "Barras de estado e de desprazamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barras de estado e de desprazamento"
+    *: "Barras de estado e de desprazamento"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 1a83188592..1890254631 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -17,7 +17,7 @@
 # Greek language file, translated by:
 # - Tony Motakis
 # - Alexander Spyridakis
-# 
+#
 # Basic translation by Tony Motakis Martch 2005
 # Extended translation and voice UI by Alexander Spyridakis (XavierGr) 2006, 2007, 2008
 <phrase>
@@ -250,23 +250,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Επικύρωση"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Επικύρωση"
+    creativezen*: "Select = Επικύρωση"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Επικύρωση"
     iriverh100,iriverh120,iriverh300: "NAVI = Επικύρωση"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Επικύρωση"
     mrobe500: "PLAY, POWER, or top-right = Επικύρωση"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Επικύρωση"
-    creativezen*: "Select = Επικύρωση"
   </dest>
   <voice>
     *: ""
@@ -804,16 +804,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Μίξη καναλιών"
+    *: "Μίξη καναλιών"
   </dest>
   <voice>
-    *: none
-    swcodec: "Μίξη καναλιών"
+    *: "Μίξη καναλιών"
   </voice>
 </phrase>
 <phrase>
@@ -821,33 +818,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Άμεση ενίσχυση"
+    *: "Άμεση ενίσχυση"
   </dest>
   <voice>
-    *: none
-    swcodec: "Άμεση ενίσχυση"
+    *: "Άμεση ενίσχυση"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
-  <dest>  
-    *: none
-    swcodec: "Ενίσχυση μίξης καναλιών"
+  <dest>
+    *: "Ενίσχυση μίξης καναλιών"
   </dest>
-  <voice>  
-    *: none
-    swcodec: "Ενίσχυση μίξης καναλιών"
+  <voice>
+    *: "Ενίσχυση μίξης καναλιών"
   </voice>
 </phrase>
 <phrase>
@@ -855,16 +846,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Απόσβεση υψηλής συχνότητας"
+    *: "Απόσβεση υψηλής συχνότητας"
   </dest>
   <voice>
-    *: none
-    swcodec: "Απόσβεση υψηλής συχνότητας"
+    *: "Απόσβεση υψηλής συχνότητας"
   </voice>
 </phrase>
 <phrase>
@@ -872,16 +860,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Αποκοπή υψηλής συχνότητας"
+    *: "Αποκοπή υψηλής συχνότητας"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αποκοπή υψηλής συχνότητας"
+    *: "Αποκοπή υψηλής συχνότητας"
   </voice>
 </phrase>
 <phrase>
@@ -889,16 +874,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ισοσταθμιστής"
+    *: "Ισοσταθμιστής"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ισοσταθμιστής"
+    *: "Ισοσταθμιστής"
   </voice>
 </phrase>
 <phrase>
@@ -906,16 +888,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ενεργοποίηση Ισοσταθμιστή"
+    *: "Ενεργοποίηση Ισοσταθμιστή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ενεργοποίηση Ισοσταθμιστή"
+    *: "Ενεργοποίηση Ισοσταθμιστή"
   </voice>
 </phrase>
 <phrase>
@@ -923,16 +902,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Γραφικός Ισοσταθμιστής"
+    *: "Γραφικός Ισοσταθμιστής"
   </dest>
   <voice>
-    *: none
-    swcodec: "Γραφικός Ισοσταθμιστής"
+    *: "Γραφικός Ισοσταθμιστής"
   </voice>
 </phrase>
 <phrase>
@@ -940,16 +916,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Προ-αποκοπή"
+    *: "Προ-αποκοπή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Προ-αποκοπή"
+    *: "Προ-αποκοπή"
   </voice>
 </phrase>
 <phrase>
@@ -957,16 +930,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Απλές ρυθμίσεις Ισοσταθμιστή"
+    *: "Απλές ρυθμίσεις Ισοσταθμιστή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Απλές ρυθμίσεις Ισοσταθμιστή"
+    *: "Απλές ρυθμίσεις Ισοσταθμιστή"
   </voice>
 </phrase>
 <phrase>
@@ -974,16 +944,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Προηγμένες ρυθμίσεις Ισοσταθμιστή"
+    *: "Προηγμένες ρυθμίσεις Ισοσταθμιστή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Προηγμένες ρυθμίσεις Ισοσταθμιστή"
+    *: "Προηγμένες ρυθμίσεις Ισοσταθμιστή"
   </voice>
 </phrase>
 <phrase>
@@ -991,16 +958,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Αποθήκευση προεπιλογών Ισοσταθμιστή"
+    *: "Αποθήκευση προεπιλογών Ισοσταθμιστή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αποθήκευση προεπιλογών Ισοσταθμιστή"
+    *: "Αποθήκευση προεπιλογών Ισοσταθμιστή"
   </voice>
 </phrase>
 <phrase>
@@ -1008,16 +972,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Περιήγηση προεπιλογών Ισοσταθμιστή"
+    *: "Περιήγηση προεπιλογών Ισοσταθμιστή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Περιήγηση προεπιλογών Ισοσταθμιστή"
+    *: "Περιήγηση προεπιλογών Ισοσταθμιστή"
   </voice>
 </phrase>
 <phrase>
@@ -1025,16 +986,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Τρόπος επεξεργασίας: %s"
+    *: "Τρόπος επεξεργασίας: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1042,16 +1000,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Ενίσχυση ζώνης"
+    *: "%d Hz Ενίσχυση ζώνης"
   </dest>
   <voice>
-    *: none
-    swcodec: "Χέρτζ Ενίσχυση ζώνης"
+    *: "Χέρτζ Ενίσχυση ζώνης"
   </voice>
 </phrase>
 <phrase>
@@ -1059,16 +1014,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Φίλτρο χαμηλού επιπέδου"
+    *: "Φίλτρο χαμηλού επιπέδου"
   </dest>
   <voice>
-    *: none
-    swcodec: "Φίλτρο χαμηλού επιπέδου"
+    *: "Φίλτρο χαμηλού επιπέδου"
   </voice>
 </phrase>
 <phrase>
@@ -1076,16 +1028,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Φίλτρο κορυφής %d"
+    *: "Φίλτρο κορυφής %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Φίλτρο κορυφής"
+    *: "Φίλτρο κορυφής"
   </voice>
 </phrase>
 <phrase>
@@ -1093,16 +1042,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Φίλτρο υψηλού επιπέδου"
+    *: "Φίλτρο υψηλού επιπέδου"
   </dest>
   <voice>
-    *: none
-    swcodec: "Φίλτρο υψηλού επιπέδου"
+    *: "Φίλτρο υψηλού επιπέδου"
   </voice>
 </phrase>
 <phrase>
@@ -1110,16 +1056,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Συχνότητα αποκοπής"
+    *: "Συχνότητα αποκοπής"
   </dest>
   <voice>
-    *: none
-    swcodec: "Συχνότητα αποκοπής"
+    *: "Συχνότητα αποκοπής"
   </voice>
 </phrase>
 <phrase>
@@ -1127,16 +1070,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Κεντρική συχνότητα"
+    *: "Κεντρική συχνότητα"
   </dest>
   <voice>
-    *: none
-    swcodec: "Κεντρική συχνότητα"
+    *: "Κεντρική συχνότητα"
   </voice>
 </phrase>
 <phrase>
@@ -1144,16 +1084,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Οκτάβα"
+    *: "Οκτάβα"
   </dest>
   <voice>
-    *: none
-    swcodec: "Οκτάβα"
+    *: "Οκτάβα"
   </voice>
 </phrase>
 <phrase>
@@ -1161,19 +1098,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Θορυβοποίηση (Dithering)"
-    lcd_bitmap: "Χρωματική αντιπαράθεση"
+    *: "Χρωματική αντιπαράθεση"
   </dest>
   <voice>
-    *: none
-    swcodec: "Θορυβοποίηση, ντίδερινκγ"
-    lcd_bitmap: "Χρωματική αντιπαράθεση"
+    *: "Χρωματική αντιπαράθεση"
   </voice>
 </phrase>
 <phrase>
@@ -1717,16 +1648,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Αποφυγή ψαλιδίσματος (clipping)"
+    *: "Αποφυγή ψαλιδίσματος (clipping)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αποφυγή ψαλιδίσματος"
+    *: "Αποφυγή ψαλιδίσματος"
   </voice>
 </phrase>
 <phrase>
@@ -1804,16 +1732,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Ένταση ηχητικού σήματος"
+    *: "Ένταση ηχητικού σήματος"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ένταση ηχητικού σήματος"
+    *: "Ένταση ηχητικού σήματος"
   </voice>
 </phrase>
 <phrase>
@@ -1821,16 +1746,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Αδύναμη"
+    *: "Αδύναμη"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αδύναμη"
+    *: "Αδύναμη"
   </voice>
 </phrase>
 <phrase>
@@ -1838,16 +1760,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Μέτρια"
+    *: "Μέτρια"
   </dest>
   <voice>
-    *: none
-    swcodec: "Μέτρια"
+    *: "Μέτρια"
   </voice>
 </phrase>
 <phrase>
@@ -1855,16 +1774,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Δυνατή"
+    *: "Δυνατή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Δυνατή"
+    *: "Δυνατή"
   </voice>
 </phrase>
 <phrase>
@@ -2221,21 +2137,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (OFF για επιστροφή)"
-    iriverh100,iriverh120,iriverh300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
-    ipod*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
-    gogearsa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (REW για επιστροφή)"
     archosplayer: "Δημιουργία ΒΔ βρέθηκαν %d"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)"
+    gogearsa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (REW για επιστροφή)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)"
+    iriverh100,iriverh120,iriverh300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)"
   </dest>
   <voice>
     *: "Καταχωρήσεις βρέθηκαν για τη βάση δεδομένων"
@@ -2417,16 +2331,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Περιήγηση γραμματοσειρών"
+    *: "Περιήγηση γραμματοσειρών"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Περιήγηση γραμματοσειρών"
+    *: "Περιήγηση γραμματοσειρών"
   </voice>
 </phrase>
 <phrase>
@@ -2688,16 +2599,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ανάποδα"
+    *: "Ανάποδα"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ανάποδα"
+    *: "Ανάποδα"
   </voice>
 </phrase>
 <phrase>
@@ -2705,16 +2613,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Τύπος επιλογέα γραμμής"
+    *: "Τύπος επιλογέα γραμμής"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Τύπος επιλογέα γραμμής"
+    *: "Τύπος επιλογέα γραμμής"
   </voice>
 </phrase>
 <phrase>
@@ -2722,16 +2627,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Δείκτης"
+    *: "Δείκτης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Δείκτης"
+    *: "Δείκτης"
   </voice>
 </phrase>
 <phrase>
@@ -2739,16 +2641,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μπάρα (Ανεστραμμένη)"
+    *: "Μπάρα (Ανεστραμμένη)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μπάρα, Ανεστραμμένη"
+    *: "Μπάρα, Ανεστραμμένη"
   </voice>
 </phrase>
 <phrase>
@@ -3038,16 +2937,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Κύλιση εκτός ορίων οθόνης"
+    *: "Κύλιση εκτός ορίων οθόνης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Κύλιση εκτός ορίων οθόνης"
+    *: "Κύλιση εκτός ορίων οθόνης"
   </voice>
 </phrase>
 <phrase>
@@ -3055,16 +2951,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μέγεθος προώθησης πίξελ ανά οθόνη"
+    *: "Μέγεθος προώθησης πίξελ ανά οθόνη"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μέγεθος προώθησης πίξελ ανά οθόνη"
+    *: "Μέγεθος προώθησης πίξελ ανά οθόνη"
   </voice>
 </phrase>
 <phrase>
@@ -3120,16 +3013,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μπάρα κατάστασης/κύλισης"
+    *: "Μπάρα κατάστασης/κύλισης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μπάρα κατάστασης και κύλισης"
+    *: "Μπάρα κατάστασης και κύλισης"
   </voice>
 </phrase>
 <phrase>
@@ -3137,16 +3027,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μπάρα κύλισης"
+    *: "Μπάρα κύλισης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μπάρα κύλισης"
+    *: "Μπάρα κύλισης"
   </voice>
 </phrase>
 <phrase>
@@ -3154,16 +3041,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μπάρα κατάστασης"
+    *: "Μπάρα κατάστασης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μπάρα κατάστασης"
+    *: "Μπάρα κατάστασης"
   </voice>
 </phrase>
 <phrase>
@@ -3188,16 +3072,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ενδειξη έντασης"
+    *: "Ενδειξη έντασης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ενδειξη έντασης"
+    *: "Ενδειξη έντασης"
   </voice>
 </phrase>
 <phrase>
@@ -3205,16 +3086,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ενδειξη μπαταρίας"
+    *: "Ενδειξη μπαταρίας"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ενδειξη μπαταρίας"
+    *: "Ενδειξη μπαταρίας"
   </voice>
 </phrase>
 <phrase>
@@ -3222,16 +3100,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Γραφική"
+    *: "Γραφική"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Γραφική"
+    *: "Γραφική"
   </voice>
 </phrase>
 <phrase>
@@ -3239,16 +3114,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αριθμητική"
+    *: "Αριθμητική"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αριθμητική"
+    *: "Αριθμητική"
   </voice>
 </phrase>
 <phrase>
@@ -3468,16 +3340,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Εβραϊκά (ISO-8859-8)"
+    *: "Εβραϊκά (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Εβραϊκά"
+    *: "Εβραϊκά"
   </voice>
 </phrase>
 <phrase>
@@ -3499,16 +3368,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ταϊλανδικά, (ISO-8859-11)"
+    *: "Ταϊλανδικά, (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ταϊλανδικά,"
+    *: "Ταϊλανδικά,"
   </voice>
 </phrase>
 <phrase>
@@ -3516,16 +3382,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αραβικά (CP1256)"
+    *: "Αραβικά (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αραβικά"
+    *: "Αραβικά"
   </voice>
 </phrase>
 <phrase>
@@ -3561,16 +3424,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ιαπωνικά (SJIS)"
+    *: "Ιαπωνικά (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ιαπωνικά"
+    *: "Ιαπωνικά"
   </voice>
 </phrase>
 <phrase>
@@ -3578,16 +3438,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Απλ. Κινέζικα (GB2312)"
+    *: "Απλ. Κινέζικα (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Απλοποιημένα Κινέζικα"
+    *: "Απλοποιημένα Κινέζικα"
   </voice>
 </phrase>
 <phrase>
@@ -3595,16 +3452,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Κορεάτικα (KSX1001)"
+    *: "Κορεάτικα (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Κορεάτικα"
+    *: "Κορεάτικα"
   </voice>
 </phrase>
 <phrase>
@@ -3612,16 +3466,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Παραδ. Κινέζικα (BIG5)"
+    *: "Παραδ. Κινέζικα (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Παραδοσιακά Κινέζικα"
+    *: "Παραδοσιακά Κινέζικα"
   </voice>
 </phrase>
 <phrase>
@@ -3645,17 +3496,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
+    sansae200*,sansafuze*: "Χρόνος σβησίματος τροχού"
   </dest>
   <voice>
     *: none
     button_light: "Χρόνος σβησίματος πλήκτρων"
-    sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού"
+    sansae200*,sansafuze*: "Χρόνος σβησίματος τροχού"
   </voice>
 </phrase>
 <phrase>
@@ -3926,23 +3777,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Ρύθμιση"
-    mrobe500: "HEART = Ρύθμιση"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ρύθμιση"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ρύθμιση"
     gogearsa9200,samsungyh*: "PLAY = Ρύθμιση"
-    vibe500: "OK = Ρύθμιση"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση"
     mpiohd300: "ENTER = Ρύθμιση"
+    mrobe500: "HEART = Ρύθμιση"
+    rtc: "ON = Ρύθμιση"
+    vibe500: "OK = Ρύθμιση"
   </dest>
   <voice>
     *: none
@@ -3954,35 +3805,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Ακύρωση"
-    mrobe500: "POWER = Ακύρωση"
-    iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση"
-    ipod*,sansac200*,mpiohd300: "MENU = Ακύρωση"
-    iaudiox5,iaudiom5: "RECORD = Ακύρωση"
+    gigabeatfx,mrobe500: "POWER = Ακύρωση"
+    gigabeats,sansafuzeplus: "BACK = Ακύρωση"
+    gogearsa9200: "LEFT = Ακύρωση"
+    iaudiom5,iaudiox5: "RECORD = Ακύρωση"
+    ipod*,mpiohd300,sansac200*: "MENU = Ακύρωση"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Ακύρωση"
-    gigabeatfx: "POWER = Ακύρωση"
-    sansafuzeplus: "BACK = Ακύρωση"
+    iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση"
     mrobe100: "DISPLAY = Ακύρωση"
-    gigabeats: "BACK = Ακύρωση"
-    gogearsa9200: "LEFT = Ακύρωση"
-    vibe500: "C = Ακύρωση"
+    rtc: "OFF = Ακύρωση"
     samsungyh*: "REW = Ακύρωση"
+    vibe500: "C = Ακύρωση"
   </dest>
   <voice>
     *: none
@@ -4389,7 +4236,7 @@
   </source>
   <dest>
     *: none
-    alarm: "Οθόνη αφύπνισης" 
+    alarm: "Οθόνη αφύπνισης"
   </dest>
   <voice>
     *: none
@@ -4471,22 +4318,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Όρισε ΟFF=Ακύρωση"
+    gigabeats: "SELECT=Όρισε POWER=Ακύρωση"
     ipod*: "SELECT=Όρισε MENU=Ακύρωση"
     iriverh10,iriverh10_5gb: "SELECT=Όρισε PREV=Ακύρωση"
-    gigabeats: "SELECT=Όρισε POWER=Ακύρωση"
-    vibe500: "OK=Όρισε C=Ακύρωση"
     mpiohd300: "ENTER=Όρισε MENU=Ακύρωση"
     sansafuzeplus: "SELECT=Όρισε  BACK=Ακύρωση"
+    vibe500: "OK=Όρισε C=Ακύρωση"
   </dest>
   <voice>
     *: none
@@ -5590,15 +5437,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Συχνότητα"
+    play_frequency,recording: "Συχνότητα"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Συχνότητα"
+    play_frequency,recording: "Συχνότητα"
   </voice>
 </phrase>
 <phrase>
@@ -5641,18 +5488,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Μικρόφωνο"
     iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
+    recording: "Μικρόφωνο"
   </dest>
   <voice>
     *: none
-    recording: "Μικρόφωνο"
     iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο"
+    recording: "Μικρόφωνο"
   </voice>
 </phrase>
 <phrase>
@@ -6530,13 +6377,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Μπάτ: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Επίπεδο μπαταρίας"
@@ -6593,24 +6440,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Εμ Εμ Σι"
     multivolume: "Έιτς Ντι 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "μάικρο Ες Ντι"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "μάικρο Ες Ντι"
     xduoox3: "μάικρο Ες Ντι 2"
-    archosondio*: "Εμ Εμ Σι"
   </voice>
 </phrase>
 <phrase>
@@ -7925,23 +7772,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Ο δίσκος είναι γεμάτος. Πατήστε OFF για συνέχεια."
-    iriverh100,iriverh120,iriverh300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
     iaudiom5,iaudiox5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.."
-    sansae200*,sansac200*,vibe500: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
+    iriverh100,iriverh120,iriverh300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια."
+    recording: "Ο δίσκος είναι γεμάτος. Πατήστε OFF για συνέχεια."
     samsungyh*: "Ο δίσκος είναι γεμάτος. Πατήστε LEFT για συνέχεια."
+    sansac200*,sansae200*,vibe500: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8029,23 +7876,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF για ακύρωση"
-    iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
-    ipod*: "PLAY/PAUSE για ακύρωση"
-    iaudiox5,iaudiom5: "Long PLAY για ακύρωση"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV για ακύρωση"
-    gigabeats: "BACK για ακύρωση"
     gigabeatfx: "POWER για ακύρωση"
-    sansafuzeplus: "BACK για ακύρωση"
+    gigabeats,sansafuzeplus: "BACK για ακύρωση"
+    iaudiom5,iaudiox5: "Long PLAY για ακύρωση"
+    ipod*: "PLAY/PAUSE για ακύρωση"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV για ακύρωση"
+    iriverh100,iriverh120,iriverh300: "STOP για ακύρωση"
   </dest>
   <voice>
     *: ""
@@ -9597,7 +9442,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "κιούχιτ"
@@ -9639,16 +9484,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Τρόπος επεξεργασίας: %s %s"
+    *: "Τρόπος επεξεργασίας: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9656,16 +9498,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Αποκοπή"
+    *: "Αποκοπή"
   </dest>
   <voice>
-    *: none
-    swcodec: "Συχνότητα αποκοπής"
+    *: "Συχνότητα αποκοπής"
   </voice>
 </phrase>
 <phrase>
@@ -9673,16 +9512,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ενίσχυση"
+    *: "Ενίσχυση"
   </voice>
 </phrase>
 <phrase>
@@ -9690,16 +9526,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10362,15 +10195,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Αποκοπή μπάσων"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Αποκοπή μπάσων"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή μπάσων"
   </voice>
 </phrase>
 <phrase>
@@ -10379,15 +10212,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Αποκοπή πρίμων"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Αποκοπή πρίμων"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Αποκοπή πρίμων"
   </voice>
 </phrase>
 <phrase>
@@ -10581,16 +10414,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Κλικ κουμπιών"
+    *: "Κλικ κουμπιών"
   </dest>
   <voice>
-    *: none
-    swcodec: "Κλικ κουμπιών"
+    *: "Κλικ κουμπιών"
   </voice>
 </phrase>
 <phrase>
@@ -10784,16 +10614,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Επαναλαμβανόμενο κλικ κουμπιών"
+    *: "Επαναλαμβανόμενο κλικ κουμπιών"
   </dest>
   <voice>
-    *: none
-    swcodec: "Επαναλαμβανόμενο κλικ κουμπιών"
+    *: "Επαναλαμβανόμενο κλικ κουμπιών"
   </voice>
 </phrase>
 <phrase>
@@ -11103,7 +10930,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11120,16 +10947,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Αναλογία"
+    *: "Αναλογία"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αναλογία"
+    *: "Αναλογία"
   </voice>
 </phrase>
 <phrase>
@@ -11151,16 +10975,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Επαναφορά πριν τη συνέχιση"
+    *: "Επαναφορά πριν τη συνέχιση"
   </dest>
   <voice>
-    *: none
-    swcodec: "Επαναφορά πριν τη συνέχιση"
+    *: "Επαναφορά πριν τη συνέχιση"
   </voice>
 </phrase>
 <phrase>
@@ -11199,16 +11020,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -11247,16 +11065,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </voice>
 </phrase>
 <phrase>
@@ -11360,16 +11175,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 σε 1"
+    *: "10 σε 1"
   </voice>
 </phrase>
 <phrase>
@@ -11439,16 +11251,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Προσαρμοσμένο"
+    *: "Προσαρμοσμένο"
   </dest>
   <voice>
-    *: none
-    swcodec: "Προσαρμοσμένο"
+    *: "Προσαρμοσμένο"
   </voice>
 </phrase>
 <phrase>
@@ -11566,16 +11375,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Ενίσχυση μπάσων"
+    *: "Ενίσχυση μπάσων"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ενίσχυση μπάσων"
+    *: "Ενίσχυση μπάσων"
   </voice>
 </phrase>
 <phrase>
@@ -11628,16 +11434,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -11646,18 +11449,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Μόνο φόρτιση"
-    ibassodx90: "Μόνο φόρτιση"
+    ibassodx50,ibassodx90: "Μόνο φόρτιση"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Μόνο φόρτιση"
-    ibassodx90: "Μόνο φόρτιση"
+    ibassodx50,ibassodx90: "Μόνο φόρτιση"
   </voice>
 </phrase>
 <phrase>
@@ -11710,16 +11510,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Αυτόματο"
+    *: "Αυτόματο"
   </dest>
   <voice>
-    *: none
-    swcodec: "Αυτόματο"
+    *: "Αυτόματο"
   </voice>
 </phrase>
 <phrase>
@@ -11772,16 +11569,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11817,16 +11611,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 σε 1"
+    *: "6 σε 1"
   </voice>
 </phrase>
 <phrase>
@@ -11913,16 +11704,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11978,16 +11766,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -12085,16 +11870,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 σε 1"
+    *: "2 σε 1"
   </voice>
 </phrase>
 <phrase>
@@ -12181,16 +11963,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12198,16 +11977,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -12230,18 +12006,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "Λειτουργία USB"
-    ibassodx90: "Λειτουργία USB"
+    ibassodx50,ibassodx90: "Λειτουργία USB"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Λειτουργία USB"
-    ibassodx90: "Λειτουργία USB"
+    ibassodx50,ibassodx90: "Λειτουργία USB"
   </voice>
 </phrase>
 <phrase>
@@ -12266,16 +12039,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Συμπιεστής"
+    *: "Συμπιεστής"
   </dest>
   <voice>
-    *: none
-    swcodec: "Συμπιεστής"
+    *: "Συμπιεστής"
   </voice>
 </phrase>
 <phrase>
@@ -12373,16 +12143,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Πλάτος γραμμής κίλησης"
+    *: "Πλάτος γραμμής κίλησης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Πλάτος γραμμής κίλησης"
+    *: "Πλάτος γραμμής κίλησης"
   </voice>
 </phrase>
 <phrase>
@@ -12407,16 +12174,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Χρόνος κυκλοφορίας"
+    *: "Χρόνος κυκλοφορίας"
   </dest>
   <voice>
-    *: none
-    swcodec: "Χρόνος κυκλοφορίας"
+    *: "Χρόνος κυκλοφορίας"
   </voice>
 </phrase>
 <phrase>
@@ -12480,16 +12244,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -12539,16 +12300,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 σε 1"
+    *: "4 σε 1"
   </voice>
 </phrase>
 <phrase>
@@ -12556,16 +12314,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Εμφάνιση βάσης"
+    *: "Εμφάνιση βάσης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Εμφάνιση βάσης"
+    *: "Εμφάνιση βάσης"
   </voice>
 </phrase>
 <phrase>
@@ -12590,16 +12345,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -12638,16 +12390,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </voice>
 </phrase>
 <phrase>
@@ -12751,16 +12500,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Ταχύτητα"
+    *: "Ταχύτητα"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ταχύτητα"
+    *: "Ταχύτητα"
   </voice>
 </phrase>
 <phrase>
@@ -12785,16 +12531,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -12803,18 +12546,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Εσωτερική μνήμη"
-    ibassodx90: "Εσωτερική μνήμη"
+    ibassodx50,ibassodx90: "Εσωτερική μνήμη"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Εσωτερική μνήμη"
-    ibassodx90: "Εσωτερική μνήμη"
+    ibassodx50,ibassodx90: "Εσωτερική μνήμη"
   </voice>
 </phrase>
 <phrase>
@@ -12960,16 +12700,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13087,16 +12824,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13104,16 +12838,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Όριο"
+    *: "Όριο"
   </dest>
   <voice>
-    *: none
-    swcodec: "Όριο"
+    *: "Όριο"
   </voice>
 </phrase>
 <phrase>
@@ -13121,16 +12852,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -13248,16 +12976,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -13280,18 +13005,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </voice>
 </phrase>
 <phrase>
@@ -13361,16 +13083,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Θέση γραμμής κίλησης"
+    *: "Θέση γραμμής κίλησης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Θέση γραμμής κίλησης"
+    *: "Θέση γραμμής κίλησης"
   </voice>
 </phrase>
 <phrase>
@@ -13441,18 +13160,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13727,16 +13443,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ανάκτηση προσορινής μνήμης"
+    *: "Ανάκτηση προσορινής μνήμης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ανάκτηση προσορινής μνήμης"
+    *: "Ανάκτηση προσορινής μνήμης"
   </voice>
 </phrase>
 <phrase>
@@ -13772,16 +13485,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 6: 40 κινήσεις / 120 λ"
+    *: "Επίπεδο 6: 40 κινήσεις / 120 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 6: 40 κινήσεις ανά 120 λεπτά"
+    *: "Επίπεδο 6: 40 κινήσεις ανά 120 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -13831,16 +13541,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs ανά φαγητό"
+    *: "Arghs ανά φαγητό"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs ανά φαγητό"
+    *: "Arghs ανά φαγητό"
   </voice>
 </phrase>
 <phrase>
@@ -13862,18 +13569,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Χρήση ρύθμισης ήχου"
+    *: "Χρήση ρύθμισης ήχου"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Χρήση ρύθμισης ήχου"
+    *: "Χρήση ρύθμισης ήχου"
     lowmem: none
   </voice>
 </phrase>
@@ -13910,16 +13614,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 5: 40 κινήσεις / 60 λ"
+    *: "Επίπεδο 5: 40 κινήσεις / 60 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 5: 40 κινήσεις ανά 60 λεπτά"
+    *: "Επίπεδο 5: 40 κινήσεις ανά 60 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -13927,16 +13628,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Προβολή στο τέλος"
+    *: "Προβολή στο τέλος"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Προβολή στο τέλος"
+    *: "Προβολή στο τέλος"
   </voice>
 </phrase>
 <phrase>
@@ -13944,16 +13642,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Άμεσο"
+    *: "Άμεσο"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Άμεσο"
+    *: "Άμεσο"
   </voice>
 </phrase>
 <phrase>
@@ -13975,16 +13670,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ανάπτυξη Σκουλικιού ανά Φαγητό"
+    *: "Ανάπτυξη Σκουλικιού ανά Φαγητό"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ανάπτυξη Σκουλικιού ανά Φαγητό"
+    *: "Ανάπτυξη Σκουλικιού ανά Φαγητό"
   </voice>
 </phrase>
 <phrase>
@@ -13992,16 +13684,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ταξινομήθηκαν"
+    *: "Ταξινομήθηκαν"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ταξινομήθηκαν"
+    *: "Ταξινομήθηκαν"
   </voice>
 </phrase>
 <phrase>
@@ -14009,16 +13698,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ταχύτητα Σκουλικιού"
+    *: "Ταχύτητα Σκουλικιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ταχύτητα Σκουλικιού"
+    *: "Ταχύτητα Σκουλικιού"
   </voice>
 </phrase>
 <phrase>
@@ -14026,16 +13712,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Διάχυση"
+    *: "Διάχυση"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Διάχυση"
+    *: "Διάχυση"
   </voice>
 </phrase>
 <phrase>
@@ -14043,18 +13726,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Εκκαθάριση όλων των συνεχίσεων"
+    *: "Εκκαθάριση όλων των συνεχίσεων"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Εκκαθάριση όλων των συνεχίσεων"
+    *: "Εκκαθάριση όλων των συνεχίσεων"
     lowmem: none
   </voice>
 </phrase>
@@ -14091,16 +13771,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Παιχνίδια"
+    *: "Παιχνίδια"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14108,16 +13785,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Παίξτε σκουλίκι!"
+    *: "Παίξτε σκουλίκι!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Παίξτε σκουλίκι!"
+    *: "Παίξτε σκουλίκι!"
   </voice>
 </phrase>
 <phrase>
@@ -14139,16 +13813,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Εναλλαγή λειτουργίας παρουσίασης"
+    *: "Εναλλαγή λειτουργίας παρουσίασης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Εναλλαγή λειτουργίας παρουσίασης"
+    *: "Εναλλαγή λειτουργίας παρουσίασης"
   </voice>
 </phrase>
 <phrase>
@@ -14184,16 +13855,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Νέο Παιχνίδι"
+    *: "Νέο Παιχνίδι"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Νέο Παιχνίδι"
+    *: "Νέο Παιχνίδι"
   </voice>
 </phrase>
 <phrase>
@@ -14201,19 +13869,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "Εμφάνιση FPS"
-    lcd_bitmap: "Εμφάνιση FPS"
+    *: "Εμφάνιση FPS"
   </dest>
   <voice>
-    *: none
-    swcodec: "Εμφάνιση FPS"
-    lcd_bitmap: "Εμφάνιση FPS"
+    *: "Εμφάνιση FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14221,18 +13883,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Φωτεινότητα οθόνης"
+    *: "Φωτεινότητα οθόνης"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Φωτεινότητα οθόνης"
+    *: "Φωτεινότητα οθόνης"
     lowmem: none
   </voice>
 </phrase>
@@ -14269,16 +13928,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Έλεγχος!"
+    *: "Έλεγχος!"
   </voice>
 </phrase>
 <phrase>
@@ -14286,16 +13942,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Δεν βρέθηκε album art"
+    *: "Δεν βρέθηκε album art"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Δεν βρέθηκε album art"
+    *: "Δεν βρέθηκε album art"
   </voice>
 </phrase>
 <phrase>
@@ -14303,16 +13956,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "πλευρά του βασιλιά"
+    *: "πλευρά του βασιλιά"
   </voice>
 </phrase>
 <phrase>
@@ -14320,18 +13970,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Περιβάλλον"
+    *: "Περιβάλλον"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Περιβάλλον"
+    *: "Περιβάλλον"
     lowmem: none
   </voice>
 </phrase>
@@ -14340,16 +13987,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Προβολή στην κορυφή"
+    *: "Προβολή στην κορυφή"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Προβολή στην κορυφή"
+    *: "Προβολή στην κορυφή"
   </voice>
 </phrase>
 <phrase>
@@ -14371,18 +14015,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Επιλογές Συνέχισης"
+    *: "Επιλογές Συνέχισης"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Επιλογές Συνέχισης"
+    *: "Επιλογές Συνέχισης"
     lowmem: none
   </voice>
 </phrase>
@@ -14391,16 +14032,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Πάντα Ενεργοποιημένο"
+    *: "Πάντα Ενεργοποιημένο"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Πάντα Ενεργοποιημένο"
+    *: "Πάντα Ενεργοποιημένο"
   </voice>
 </phrase>
 <phrase>
@@ -14408,16 +14046,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 7: 40 κινήσεις / 240 λ"
+    *: "Επίπεδο 7: 40 κινήσεις / 240 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 7: 40 κινήσεις ανά 240 λεπτά"
+    *: "Επίπεδο 7: 40 κινήσεις ανά 240 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14425,16 +14060,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 9: 1 κίνηση / 60 λ"
+    *: "Επίπεδο 9: 1 κίνηση / 60 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 9: 1 κίνηση ανά 60 λεπτά"
+    *: "Επίπεδο 9: 1 κίνηση ανά 60 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14442,16 +14074,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Η προσορινή μνήμη θ'ανακτιθεί στην επόμενη επανεκίνηση"
+    *: "Η προσορινή μνήμη θ'ανακτιθεί στην επόμενη επανεκίνηση"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Η προσορινή μνήμη θ'ανακτιθεί στην επόμενη επανεκίνηση"
+    *: "Η προσορινή μνήμη θ'ανακτιθεί στην επόμενη επανεκίνηση"
   </voice>
 </phrase>
 <phrase>
@@ -14473,16 +14102,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αριθμός διαφανιών"
+    *: "Αριθμός διαφανιών"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αριθμός διαφανιών"
+    *: "Αριθμός διαφανιών"
   </voice>
 </phrase>
 <phrase>
@@ -14490,18 +14116,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Συνέχιση αυτόματα"
+    *: "Συνέχιση αυτόματα"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Συνέχιση αυτόματα"
+    *: "Συνέχιση αυτόματα"
     lowmem: none
   </voice>
 </phrase>
@@ -14510,18 +14133,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Αναπαραγωγή απ'την αρχή"
+    *: "Αναπαραγωγή απ'την αρχή"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Αναπαραγωγή απ'την αρχή"
+    *: "Αναπαραγωγή απ'την αρχή"
     lowmem: none
   </voice>
 </phrase>
@@ -14530,16 +14150,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μέγεθως Φαγητού"
+    *: "Μέγεθως Φαγητού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μέγεθως Φαγητού"
+    *: "Μέγεθως Φαγητού"
   </voice>
 </phrase>
 <phrase>
@@ -14547,16 +14164,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 1: 60 κινήσεις / 5 λ"
+    *: "Επίπεδο 1: 60 κινήσεις / 5 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 1: 60 κινήσεις ανά 5 λεπτά"
+    *: "Επίπεδο 1: 60 κινήσεις ανά 5 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14564,16 +14178,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Σφάλμα στην ανάλυση του παιχνιδιού !"
+    *: "Σφάλμα στην ανάλυση του παιχνιδιού !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Σφάλμα στην ανάλυση του παιχνιδιού !"
+    *: "Σφάλμα στην ανάλυση του παιχνιδιού !"
   </voice>
 </phrase>
 <phrase>
@@ -14581,16 +14192,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Δεν βρέθηκαν παιχνίδια !"
+    *: "Δεν βρέθηκαν παιχνίδια !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Δεν βρέθηκαν παιχνίδια!"
+    *: "Δεν βρέθηκαν παιχνίδια!"
   </voice>
 </phrase>
 <phrase>
@@ -14626,16 +14234,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 3: 60 κινήσεις / 30 λ"
+    *: "Επίπεδο 3: 60 κινήσεις / 30 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 3: 60 κινήσεις ανά 30 λεπτά"
+    *: "Επίπεδο 3: 60 κινήσεις ανά 30 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14643,16 +14248,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αποθήκευση θέσης"
+    *: "Αποθήκευση θέσης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αποθήκευση θέσης"
+    *: "Αποθήκευση θέσης"
   </voice>
 </phrase>
 <phrase>
@@ -14660,16 +14262,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Προβολή τίτλου άλμπουμ"
+    *: "Προβολή τίτλου άλμπουμ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Προβολή τίτλου άλμπουμ"
+    *: "Προβολή τίτλου άλμπουμ"
   </voice>
 </phrase>
 <phrase>
@@ -14677,16 +14276,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 2: 60 κινήσεις / 15 λ"
+    *: "Επίπεδο 2: 60 κινήσεις / 15 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 2: 60 κινήσεις ανά 15 λεπτά"
+    *: "Επίπεδο 2: 60 κινήσεις ανά 15 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14694,18 +14290,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Ενύσχιση CPU"
+    *: "Ενύσχιση CPU"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Ενύσχιση CPU"
+    *: "Ενύσχιση CPU"
     lowmem: none
   </voice>
 </phrase>
@@ -14714,18 +14307,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Παράβλεψη πλαισίων"
+    *: "Παράβλεψη πλαισίων"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Παράβλεψη πλαισίων"
+    *: "Παράβλεψη πλαισίων"
     lowmem: none
   </voice>
 </phrase>
@@ -14748,16 +14338,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 8: 1 κίνηση / 15 λ"
+    *: "Επίπεδο 8: 1 κίνηση / 15 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 8: 1 κίνηση ανά 15 λεπτά"
+    *: "Επίπεδο 8: 1 κίνηση ανά 15 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -14807,16 +14394,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Προστέθηκε στη λίστα αναπαραγωγής"
+    *: "Προστέθηκε στη λίστα αναπαραγωγής"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Προστέθηκε στη λίστα αναπαραγωγής"
+    *: "Προστέθηκε στη λίστα αναπαραγωγής"
   </voice>
 </phrase>
 <phrase>
@@ -14824,18 +14408,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Χρήση κινής ρύθμισης"
+    *: "Χρήση κινής ρύθμισης"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </voice>
 </phrase>
@@ -14861,18 +14442,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Ρύθμιση χρόνου συνέχισης (λεπτά)"
+    *: "Ρύθμιση χρόνου συνέχισης (λεπτά)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Ρύθμιση χρόνου συνέχισης"
+    *: "Ρύθμιση χρόνου συνέχισης"
     lowmem: none
   </voice>
 </phrase>
@@ -14909,16 +14487,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μέγεθος Argh"
+    *: "Μέγεθος Argh"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μέγεθος Argh"
+    *: "Μέγεθος Argh"
   </voice>
 </phrase>
 <phrase>
@@ -14926,16 +14501,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ύπος"
+    *: "Ύπος"
   </voice>
 </phrase>
 <phrase>
@@ -14943,16 +14515,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αποθήκευση Παιχνιδιού"
+    *: "Αποθήκευση Παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αποθήκευση Παιχνιδιού"
+    *: "Αποθήκευση Παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -14960,16 +14529,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Βασιλιάς"
+    *: "Βασιλιάς"
   </voice>
 </phrase>
 <phrase>
@@ -15019,16 +14585,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αλλαγή Μεγέθους Εξωφύλων"
+    *: "Αλλαγή Μεγέθους Εξωφύλων"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αλλαγή Μεγέθους Εξωφύλων"
+    *: "Αλλαγή Μεγέθους Εξωφύλων"
   </voice>
 </phrase>
 <phrase>
@@ -15036,16 +14599,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Σκάκι"
+    *: "GNU Σκάκι"
   </voice>
 </phrase>
 <phrase>
@@ -15067,16 +14627,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ζουμ"
+    *: "Ζουμ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ζουμ"
+    *: "Ζουμ"
   </voice>
 </phrase>
 <phrase>
@@ -15112,16 +14669,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Η λίστα αναπαραγωγής Άδειασε"
+    *: "Η λίστα αναπαραγωγής Άδειασε"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Η λίστα αναπαραγωγής Άδειασε"
+    *: "Η λίστα αναπαραγωγής Άδειασε"
   </voice>
 </phrase>
 <phrase>
@@ -15129,16 +14683,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Διαχωρισμός"
+    *: "Διαχωρισμός"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Διαχωρισμός"
+    *: "Διαχωρισμός"
   </voice>
 </phrase>
 <phrase>
@@ -15146,16 +14697,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μη επιλεγμένο"
+    *: "Μη επιλεγμένο"
   </voice>
 </phrase>
 <phrase>
@@ -15177,16 +14725,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επαναφορά Παιχνιδιού"
+    *: "Επαναφορά Παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επαναφορά Παιχνιδιού"
+    *: "Επαναφορά Παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -15194,16 +14739,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αξιωματικός"
+    *: "Αξιωματικός"
   </voice>
 </phrase>
 <phrase>
@@ -15225,16 +14767,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Στάση του γκρι"
+    *: "Στάση του γκρι"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Στάση του γκρι"
+    *: "Στάση του γκρι"
   </voice>
 </phrase>
 <phrase>
@@ -15242,16 +14781,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Βασίλισσα"
+    *: "Βασίλισσα"
   </voice>
 </phrase>
 <phrase>
@@ -15276,18 +14812,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Τρόπος Αναπαραγωγής"
+    *: "Τρόπος Αναπαραγωγής"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Τρόπος Αναπαραγωγής"
+    *: "Τρόπος Αναπαραγωγής"
     lowmem: none
   </voice>
 </phrase>
@@ -15296,16 +14829,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επανεκίνηση Παιχνιδιού"
+    *: "Επανεκίνηση Παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επανεκίνηση Παιχνιδιού"
+    *: "Επανεκίνηση Παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -15327,16 +14857,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Φόρτωση θέσης"
+    *: "Φόρτωση θέσης"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Φόρτωση θέσης"
+    *: "Φόρτωση θέσης"
   </voice>
 </phrase>
 <phrase>
@@ -15358,16 +14885,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Player"
+    *: "Player"
   </voice>
 </phrase>
 <phrase>
@@ -15392,16 +14916,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Πιόνι"
+    *: "Πιόνι"
   </voice>
 </phrase>
 <phrase>
@@ -15409,16 +14930,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Απόκρυψη τίτλου άλμπουμ"
+    *: "Απόκρυψη τίτλου άλμπουμ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Απόκρυψη τίτλου άλμπουμ"
+    *: "Απόκρυψη τίτλου άλμπουμ"
   </voice>
 </phrase>
 <phrase>
@@ -15426,18 +14944,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Έλεγχος τόνου"
+    *: "Έλεγχος τόνου"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Έλεγχος τόνου"
+    *: "Έλεγχος τόνου"
     lowmem: none
   </voice>
 </phrase>
@@ -15446,16 +14961,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Κεντρικό περιθώριο"
+    *: "Κεντρικό περιθώριο"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Κεντρικό περιθώριο"
+    *: "Κεντρικό περιθώριο"
   </voice>
 </phrase>
 <phrase>
@@ -15463,16 +14975,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επιλεγμένο"
+    *: "Επιλεγμένο"
   </voice>
 </phrase>
 <phrase>
@@ -15480,16 +14989,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 10: 1 κίνηση / 600 λ"
+    *: "Επίπεδο 10: 1 κίνηση / 600 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 10: 1 κίνηση ανά 600 λεπτά"
+    *: "Επίπεδο 10: 1 κίνηση ανά 600 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -15497,16 +15003,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Στην αρχή του παιχνιδιού"
+    *: "Στην αρχή του παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Στην αρχή του παιχνιδιού"
+    *: "Στην αρχή του παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -15528,16 +15031,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ματ!"
+    *: "Ματ!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ματ!"
+    *: "Ματ!"
   </voice>
 </phrase>
 <phrase>
@@ -15545,16 +15045,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μετάβαση στην οθόνη κατά την αναπαραγωγή"
+    *: "Μετάβαση στην οθόνη κατά την αναπαραγωγή"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μετάβαση στην οθόνη κατά την αναπαραγωγή"
+    *: "Μετάβαση στην οθόνη κατά την αναπαραγωγή"
   </voice>
 </phrase>
 <phrase>
@@ -15562,16 +15059,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Συνέχιση Παιχνιδιού"
+    *: "Συνέχιση Παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Συνέχιση Παιχνιδιού"
+    *: "Συνέχιση Παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -15579,16 +15073,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Μέσω Λίστας κομματιών"
+    *: "Μέσω Λίστας κομματιών"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μέσω Λίστας κομματιών"
+    *: "Μέσω Λίστας κομματιών"
   </voice>
 </phrase>
 <phrase>
@@ -15596,18 +15087,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Μονό"
+    *: "Μονό"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Μονό"
+    *: "Μονό"
     lowmem: none
   </voice>
 </phrase>
@@ -15616,18 +15104,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Παρεμβολή"
+    *: "Παρεμβολή"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Παρεμβολή"
+    *: "Παρεμβολή"
     lowmem: none
   </voice>
 </phrase>
@@ -15636,16 +15121,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αριθμός Σκουλικιών"
+    *: "Αριθμός Σκουλικιών"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αριθμός Σκουλικιών"
+    *: "Αριθμός Σκουλικιών"
   </voice>
 </phrase>
 <phrase>
@@ -15653,16 +15135,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Χρόνος προβολής διαφάνιας"
+    *: "Χρόνος προβολής διαφάνιας"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Χρόνος προβολής διαφάνιας"
+    *: "Χρόνος προβολής διαφάνιας"
   </voice>
 </phrase>
 <phrase>
@@ -15670,16 +15149,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Προβολή παιχνιδιών που έχουν παιχτεί"
+    *: "Προβολή παιχνιδιών που έχουν παιχτεί"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Προβολή παιχνιδιών που έχουν παιχτεί"
+    *: "Προβολή παιχνιδιών που έχουν παιχτεί"
   </voice>
 </phrase>
 <phrase>
@@ -15701,18 +15177,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Μενού έναρξης"
+    *: "Μενού έναρξης"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Μενού έναρξης"
+    *: "Μενού έναρξης"
     lowmem: none
   </voice>
 </phrase>
@@ -15735,16 +15208,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Άσπρο"
+    *: "Άσπρο"
   </voice>
 </phrase>
 <phrase>
@@ -15752,16 +15222,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ενσωμάτωση οθόνης κατά την αναπαραγωγή"
+    *: "Ενσωμάτωση οθόνης κατά την αναπαραγωγή"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ενσωμάτωση οθόνης κατά την αναπαραγωγή"
+    *: "Ενσωμάτωση οθόνης κατά την αναπαραγωγή"
   </voice>
 </phrase>
 <phrase>
@@ -15786,16 +15253,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Αδύνατη η επανεκίνηση της αναπαραγωγής"
+    *: "Αδύνατη η επανεκίνηση της αναπαραγωγής"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Αδύνατη η επανεκίνηση της αναπαραγωγής"
+    *: "Αδύνατη η επανεκίνηση της αναπαραγωγής"
   </voice>
 </phrase>
 <phrase>
@@ -15803,16 +15267,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "πλευρά της βασίλισσας"
+    *: "πλευρά της βασίλισσας"
   </voice>
 </phrase>
 <phrase>
@@ -15820,16 +15281,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Πύργος"
+    *: "Πύργος"
   </voice>
 </phrase>
 <phrase>
@@ -15896,16 +15354,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Λάθως κίνηση!"
+    *: "Λάθως κίνηση!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Λάθως κίνηση!"
+    *: "Λάθως κίνηση!"
   </voice>
 </phrase>
 <phrase>
@@ -15913,16 +15368,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Σκέφτεται..."
+    *: "Σκέφτεται..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15944,18 +15396,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Επιλογές Ήχου"
+    *: "Επιλογές Ήχου"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Επιλογές Ήχου"
+    *: "Επιλογές Ήχου"
     lowmem: none
   </voice>
 </phrase>
@@ -15964,18 +15413,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Όριο FPS"
+    *: "Όριο FPS"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Όριο FPS"
+    *: "Όριο FPS"
     lowmem: none
   </voice>
 </phrase>
@@ -15998,16 +15444,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Σφάλμα κατά τη δημιουργία παραμέτρων"
+    *: "Σφάλμα κατά τη δημιουργία παραμέτρων"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Σφάλμα κατά τη δημιουργία παραμέτρων"
+    *: "Σφάλμα κατά τη δημιουργία παραμέτρων"
   </voice>
 </phrase>
 <phrase>
@@ -16057,16 +15500,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Στο τέλος του παιχνιδιού"
+    *: "Στο τέλος του παιχνιδιού"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Στο τέλος του παιχνιδιού"
+    *: "Στο τέλος του παιχνιδιού"
   </voice>
 </phrase>
 <phrase>
@@ -16102,18 +15542,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Διαχωρισμός διαγράμμισης"
+    *: "Διαχωρισμός διαγράμμισης"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Διαχωρισμός διαγράμμισης"
+    *: "Διαχωρισμός διαγράμμισης"
     lowmem: none
   </voice>
 </phrase>
@@ -16122,16 +15559,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "κάστρο"
+    *: "κάστρο"
   </voice>
 </phrase>
 <phrase>
@@ -16139,18 +15573,15 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Μη διαθέσιμο"
+    *: "Μη διαθέσιμο"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Μη διαθέσιμο"
+    *: "Μη διαθέσιμο"
     lowmem: none
   </voice>
 </phrase>
@@ -16201,16 +15632,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επίπεδο 4: 40 κινήσεις / 30 λ"
+    *: "Επίπεδο 4: 40 κινήσεις / 30 λ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επίπεδο 4: 40 κινήσεις ανά 30 λεπτά"
+    *: "Επίπεδο 4: 40 κινήσεις ανά 30 λεπτά"
   </voice>
 </phrase>
 <phrase>
@@ -16218,18 +15646,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Αντήχηση"
+    *: "Αντήχηση"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Αντήχηση"
+    *: "Αντήχηση"
     lowmem: none
   </voice>
 </phrase>
@@ -16238,18 +15663,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Μενού έναρξης αν δεν ολοκληρώθηκε"
+    *: "Μενού έναρξης αν δεν ολοκληρώθηκε"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Μενού έναρξης αν δεν ολοκληρώθηκε"
+    *: "Μενού έναρξης αν δεν ολοκληρώθηκε"
     lowmem: none
   </voice>
 </phrase>
@@ -16258,16 +15680,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Επιλέξτε Άλλο Παιχνίδι"
+    *: "Επιλέξτε Άλλο Παιχνίδι"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Επιλέξτε Άλλο Παιχνίδι"
+    *: "Επιλέξτε Άλλο Παιχνίδι"
   </voice>
 </phrase>
 <phrase>
@@ -16275,16 +15694,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "συλαμβάνει"
+    *: "συλαμβάνει"
   </voice>
 </phrase>
 <phrase>
@@ -16320,16 +15736,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Μαύρο"
+    *: "Μαύρο"
   </voice>
 </phrase>
 <phrase>
@@ -16337,15 +15750,12 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Καθαρισμός λίστας αναπαραγωγής"
+    *: "Καθαρισμός λίστας αναπαραγωγής"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Καθαρισμός λίστας αναπαραγωγής"
+    *: "Καθαρισμός λίστας αναπαραγωγής"
   </voice>
 </phrase>
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 50cea4fca8..8f40dac6f7 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -20,9 +20,6 @@
 # - Rani Hod
 # - Tomer Shalev
 # - Sasha Khamkov
-<options>
-  rtl: 1
-</options>
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -253,20 +250,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "כן = PLAY"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "או פינה ימנית-עליונה = כן MENU"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "כן = SELECT"
     iriverh100,iriverh120,iriverh300: "כן = NAVI"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "כן = SELECT"
     mrobe500: "או פינה ימנית-עליונה = כן Power, Play"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "כן = OK"
   </dest>
   <voice>
@@ -822,16 +819,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -839,16 +833,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "הגברה ישירה"
+    *: "הגברה ישירה"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגברה ישירה"
+    *: "הגברה ישירה"
   </voice>
 </phrase>
 <phrase>
@@ -856,16 +847,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "הגברה הפוכה"
+    *: "הגברה הפוכה"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגברה הפוכה"
+    *: "הגברה הפוכה"
   </voice>
 </phrase>
 <phrase>
@@ -873,16 +861,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "הנמכת צלילים בתדירות גבוהה"
+    *: "הנמכת צלילים בתדירות גבוהה"
   </dest>
   <voice>
-    *: none
-    swcodec: "הנמכת צלילים בתדירות גבוהה"
+    *: "הנמכת צלילים בתדירות גבוהה"
   </voice>
 </phrase>
 <phrase>
@@ -890,16 +875,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "חיתוך צלילים בתדירות גבוהה"
+    *: "חיתוך צלילים בתדירות גבוהה"
   </dest>
   <voice>
-    *: none
-    swcodec: "חיתוך צלילים בתדירות גבוהה"
+    *: "חיתוך צלילים בתדירות גבוהה"
   </voice>
 </phrase>
 <phrase>
@@ -907,16 +889,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "אקולייזר"
+    *: "אקולייזר"
   </dest>
   <voice>
-    *: none
-    swcodec: "אקולייזר"
+    *: "אקולייזר"
   </voice>
 </phrase>
 <phrase>
@@ -924,16 +903,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "הפעל אקולייזר"
+    *: "הפעל אקולייזר"
   </dest>
   <voice>
-    *: none
-    swcodec: "הפעל אקולייזר"
+    *: "הפעל אקולייזר"
   </voice>
 </phrase>
 <phrase>
@@ -941,16 +917,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "אקולייזר גרפי"
+    *: "אקולייזר גרפי"
   </dest>
   <voice>
-    *: none
-    swcodec: "אקולייזר גרפי"
+    *: "אקולייזר גרפי"
   </voice>
 </phrase>
 <phrase>
@@ -958,16 +931,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "חיתוך מראש"
+    *: "חיתוך מראש"
   </dest>
   <voice>
-    *: none
-    swcodec: "חיתוך מראש"
+    *: "חיתוך מראש"
   </voice>
 </phrase>
 <phrase>
@@ -975,16 +945,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "הגדרות אקולייזר פשוטות"
+    *: "הגדרות אקולייזר פשוטות"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגדרות אקולייזר פשוטות"
+    *: "הגדרות אקולייזר פשוטות"
   </voice>
 </phrase>
 <phrase>
@@ -992,16 +959,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "הגדרות אקולייזר מתקדמות"
+    *: "הגדרות אקולייזר מתקדמות"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגדרות אקולייזר מתקדמות"
+    *: "הגדרות אקולייזר מתקדמות"
   </voice>
 </phrase>
 <phrase>
@@ -1009,16 +973,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "שמור הגדרות אקולייזר"
+    *: "שמור הגדרות אקולייזר"
   </dest>
   <voice>
-    *: none
-    swcodec: "שמור הגדרות אקולייזר"
+    *: "שמור הגדרות אקולייזר"
   </voice>
 </phrase>
 <phrase>
@@ -1026,16 +987,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "דפדף בהגדרות אקולייזר"
+    *: "דפדף בהגדרות אקולייזר"
   </dest>
   <voice>
-    *: none
-    swcodec: "דפדף בהגדרות אקולייזר"
+    *: "דפדף בהגדרות אקולייזר"
   </voice>
 </phrase>
 <phrase>
@@ -1043,16 +1001,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "מצב עריכה: %s"
+    *: "מצב עריכה: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1060,16 +1015,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz רצועה מוגברת"
+    *: "%d Hz רצועה מוגברת"
   </dest>
   <voice>
-    *: none
-    swcodec: "הרץ רצועה מוגברת"
+    *: "הרץ רצועה מוגברת"
   </voice>
 </phrase>
 <phrase>
@@ -1077,16 +1029,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "מסנך רף נמוך"
+    *: "מסנך רף נמוך"
   </dest>
   <voice>
-    *: none
-    swcodec: "מסנך רף נמוך"
+    *: "מסנך רף נמוך"
   </voice>
 </phrase>
 <phrase>
@@ -1094,16 +1043,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "%d מסנן פסגה"
+    *: "%d מסנן פסגה"
   </dest>
   <voice>
-    *: none
-    swcodec: "מסנן פסגה"
+    *: "מסנן פסגה"
   </voice>
 </phrase>
 <phrase>
@@ -1111,16 +1057,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "מסנן רף גבוה"
+    *: "מסנן רף גבוה"
   </dest>
   <voice>
-    *: none
-    swcodec: "מסנן רף גבוה"
+    *: "מסנן רף גבוה"
   </voice>
 </phrase>
 <phrase>
@@ -1128,16 +1071,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "תדירות חיתוך צליל"
+    *: "תדירות חיתוך צליל"
   </dest>
   <voice>
-    *: none
-    swcodec: "תדירות חיתוך צליל"
+    *: "תדירות חיתוך צליל"
   </voice>
 </phrase>
 <phrase>
@@ -1145,16 +1085,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "תדירות מרכזית"
+    *: "תדירות מרכזית"
   </dest>
   <voice>
-    *: none
-    swcodec: "תדירות מרכזית"
+    *: "תדירות מרכזית"
   </voice>
 </phrase>
 <phrase>
@@ -1162,16 +1099,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1179,16 +1113,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1732,16 +1663,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "מנע עיוותים"
+    *: "מנע עיוותים"
   </dest>
   <voice>
-    *: none
-    swcodec: "מנע עיוותים"
+    *: "מנע עיוותים"
   </voice>
 </phrase>
 <phrase>
@@ -1819,16 +1747,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "צפצוף מעבר שיר"
+    *: "צפצוף מעבר שיר"
   </dest>
   <voice>
-    *: none
-    swcodec: "צפצוף מעבר שיר"
+    *: "צפצוף מעבר שיר"
   </voice>
 </phrase>
 <phrase>
@@ -1836,16 +1761,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "חלש"
+    *: "חלש"
   </dest>
   <voice>
-    *: none
-    swcodec: "חלש"
+    *: "חלש"
   </voice>
 </phrase>
 <phrase>
@@ -1853,16 +1775,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "בינוני"
+    *: "בינוני"
   </dest>
   <voice>
-    *: none
-    swcodec: "בינוני"
+    *: "בינוני"
   </voice>
 </phrase>
 <phrase>
@@ -1870,16 +1789,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "חזק"
+    *: "חזק"
   </dest>
   <voice>
-    *: none
-    swcodec: "חזק"
+    *: "חזק"
   </voice>
 </phrase>
 <phrase>
@@ -2239,19 +2155,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "בונה מסד נתונים... %d נמצאו (OFF כדי לחזור)"
-    iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d נמצאו (STOP כדי לחזור)"
-    ipod*: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "בונה מסד נתונים... %d נמצאו (LEFT כדי לחזור)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "בונה מסד נתונים... %d נמצאו (LEFT כדי לחזור)"
     gogearsa9200: "בונה מסד נתונים... %d נמצאו (REW כדי לחזור)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "בונה מסד נתונים... %d נמצאו (PREV כדי לחזור)"
+    iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d נמצאו (STOP כדי לחזור)"
   </dest>
   <voice>
     *: "רשומות נמצאו עבור מסד הנתונים"
@@ -2433,16 +2347,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "גופנים"
+    *: "גופנים"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "גופנים"
+    *: "גופנים"
   </voice>
 </phrase>
 <phrase>
@@ -2704,16 +2615,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "במהופך"
+    *: "במהופך"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "במהופך"
+    *: "במהופך"
   </voice>
 </phrase>
 <phrase>
@@ -2721,16 +2629,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "סוג בורר השורה"
+    *: "סוג בורר השורה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "סוג בורר השורה"
+    *: "סוג בורר השורה"
   </voice>
 </phrase>
 <phrase>
@@ -2738,16 +2643,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "מצביע"
+    *: "מצביע"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "מצביע"
+    *: "מצביע"
   </voice>
 </phrase>
 <phrase>
@@ -2755,16 +2657,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "(שורה (נגדי"
+    *: "(שורה (נגדי"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "שורה נגדית"
+    *: "שורה נגדית"
   </voice>
 </phrase>
 <phrase>
@@ -3054,16 +2953,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "מסך נגלל מחוץ לתצוגה"
+    *: "מסך נגלל מחוץ לתצוגה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "מסך נגלל מחוץ לתצוגה"
+    *: "מסך נגלל מחוץ לתצוגה"
   </voice>
 </phrase>
 <phrase>
@@ -3071,16 +2967,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "גודל צעד בגלילת מסך"
+    *: "גודל צעד בגלילת מסך"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "גודל צעד בגלילת מסך"
+    *: "גודל צעד בגלילת מסך"
   </voice>
 </phrase>
 <phrase>
@@ -3136,16 +3029,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "שורת מצב/פס גלילה"
+    *: "שורת מצב/פס גלילה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "שורת מצב ופס גלילה"
+    *: "שורת מצב ופס גלילה"
   </voice>
 </phrase>
 <phrase>
@@ -3153,16 +3043,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "פס גלילה"
+    *: "פס גלילה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "פס גלילה"
+    *: "פס גלילה"
   </voice>
 </phrase>
 <phrase>
@@ -3170,16 +3057,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "שורת מצב"
+    *: "שורת מצב"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "שורת מצב"
+    *: "שורת מצב"
   </voice>
 </phrase>
 <phrase>
@@ -3204,16 +3088,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "תצוגת עוצמת קול"
+    *: "תצוגת עוצמת קול"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "תצוגת עוצמת קול"
+    *: "תצוגת עוצמת קול"
   </voice>
 </phrase>
 <phrase>
@@ -3221,16 +3102,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "תצוגת סוללה"
+    *: "תצוגת סוללה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "תצוגת סוללה"
+    *: "תצוגת סוללה"
   </voice>
 </phrase>
 <phrase>
@@ -3238,16 +3116,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "גרפית"
+    *: "גרפית"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "גרפית"
+    *: "גרפית"
   </voice>
 </phrase>
 <phrase>
@@ -3255,16 +3130,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "מספרית"
+    *: "מספרית"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "מספרית"
+    *: "מספרית"
   </voice>
 </phrase>
 <phrase>
@@ -3484,16 +3356,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "עברית (ISO-8859-8)"
+    *: "עברית (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "עברית"
+    *: "עברית"
   </voice>
 </phrase>
 <phrase>
@@ -3515,16 +3384,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "תאילנדית (ISO-8859-11)"
+    *: "תאילנדית (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "תאילנדית"
+    *: "תאילנדית"
   </voice>
 </phrase>
 <phrase>
@@ -3532,16 +3398,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ערבית (CP1256)"
+    *: "ערבית (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ערבית"
+    *: "ערבית"
   </voice>
 </phrase>
 <phrase>
@@ -3577,16 +3440,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "יפנית (SJIS)"
+    *: "יפנית (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "יפנית"
+    *: "יפנית"
   </voice>
 </phrase>
 <phrase>
@@ -3594,16 +3454,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "סינית מפושטת (GB2312)"
+    *: "סינית מפושטת (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "סינית מפושטת"
+    *: "סינית מפושטת"
   </voice>
 </phrase>
 <phrase>
@@ -3611,16 +3468,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "קוריאנית (KSX1001)"
+    *: "קוריאנית (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "קוריאנית"
+    *: "קוריאנית"
   </voice>
 </phrase>
 <phrase>
@@ -3628,16 +3482,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "סינית מסורתית (BIG5)"
+    *: "סינית מסורתית (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "סינית מסורתית"
+    *: "סינית מסורתית"
   </voice>
 </phrase>
 <phrase>
@@ -3661,17 +3512,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "זמן תאורת כפתורים"
-    sansafuze*,sansae200*: "זמן תאורת גלגל"
+    sansae200*,sansafuze*: "זמן תאורת גלגל"
   </dest>
   <voice>
     *: none
     button_light: "זמן תאורת כפתורים"
-    sansafuze*,sansae200*: "זמן תאורת גלגל"
+    sansae200*,sansafuze*: "זמן תאורת גלגל"
   </voice>
 </phrase>
 <phrase>
@@ -3942,27 +3793,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "קבע = ON"
-    mrobe500: "קבע = HEART"
-    iriverh100,iriverh120,iriverh300: "קבע = NAVI"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "קבע = SELECT"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "קבע = SELECT"
     gogearsa9200,samsungyh*: "קבע = PLAY"
-    vibe500: "קבע = OK"
+    iriverh100,iriverh120,iriverh300: "קבע = NAVI"
     mpiohd300: "קבע = ENTER"
+    mrobe500: "קבע = HEART"
+    rtc: "קבע = ON"
+    vibe500: "קבע = OK"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3971,38 +3822,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "החזר = OFF"
-    mrobe500: "החזר = POWER"
-    iriverh100,iriverh120,iriverh300: "החזר = STOP"
-    ipod*,sansac200*,mpiohd300: "החזר = MENU"
-    iaudiox5,iaudiom5: "החזר = RECORD"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "החזר = PREV"
-    gigabeatfx: "החזר = POWER"
-    mrobe100: "החזר = DISPLAY"
+    gigabeatfx,mrobe500: "החזר = POWER"
     gigabeats: "החזר = BACK"
     gogearsa9200: "החזר = LEFT"
-    vibe500: "החזר = C"
+    iaudiom5,iaudiox5: "החזר = RECORD"
+    ipod*,mpiohd300,sansac200*: "החזר = MENU"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "החזר = PREV"
+    iriverh100,iriverh120,iriverh300: "החזר = STOP"
+    mrobe100: "החזר = DISPLAY"
+    rtc: "החזר = OFF"
     samsungyh*: "החזר = Revert"
+    vibe500: "החזר = C"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4488,21 +4336,21 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ביטול=OFF קבע=PLAY"
+    gigabeats: "ביטול=POWER קבע=SELECT"
     ipod*: "ביטול=MENU קבע=SELECT"
     iriverh10,iriverh10_5gb: "ביטול=PREV קבע=SELECT"
-    gigabeats: "ביטול=POWER קבע=SELECT"
-    vibe500: "ביטול=C קבע=OK"
     mpiohd300: "ביטול=MENU קבע=ENTER"
+    vibe500: "ביטול=C קבע=OK"
   </dest>
   <voice>
     *: none
@@ -5607,15 +5455,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "תדירות"
+    play_frequency,recording: "תדירות"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "תדירות"
+    play_frequency,recording: "תדירות"
   </voice>
 </phrase>
 <phrase>
@@ -5658,18 +5506,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "מיקרופון"
     iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
+    recording: "מיקרופון"
   </dest>
   <voice>
     *: none
-    recording: "מיקרופון"
     iriverh100,iriverh120,iriverh300: "מיקרופון פנימי"
+    recording: "מיקרופון"
   </voice>
 </phrase>
 <phrase>
@@ -6547,13 +6395,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "סוללה: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "סולל: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
     *: "רמת סוללה"
@@ -6610,24 +6458,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7942,23 +7790,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "הכונן מלא. לחץ על OFF כדי להמשיך"
-    iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך"
     iaudiom5,iaudiox5: "הכונן מלא. לחץ על POWER כדי להמשיך"
-    sansae200*,sansac200*,vibe500: "הכונן מלא. לחץ על PREV כדי להמשיך"
+    iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך"
+    recording: "הכונן מלא. לחץ על OFF כדי להמשיך"
     samsungyh*: "הכונן מלא. לחץ על LEFT כדי להמשיך"
+    sansac200*,sansae200*,vibe500: "הכונן מלא. לחץ על PREV כדי להמשיך"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8046,22 +7894,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "כדי לבטל OFF"
-    iriverh100,iriverh120,iriverh300: "כדי לבטל STOP"
-    ipod*: "כדי לבטל PLAY/PAUSE"
-    iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "כדי לבטל PREV"
-    gigabeats: "כדי לבטל BACK"
     gigabeatfx: "כדי לבטל POWER"
+    gigabeats: "כדי לבטל BACK"
+    iaudiom5,iaudiox5: "PLAY ארוך כדי לבטל"
+    ipod*: "כדי לבטל PLAY/PAUSE"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "כדי לבטל PREV"
+    iriverh100,iriverh120,iriverh300: "כדי לבטל STOP"
   </dest>
   <voice>
     *: ""
@@ -9613,7 +9460,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "גליון סימנים"
@@ -9655,16 +9502,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "מצב עריכה: %s %s"
+    *: "מצב עריכה: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9672,16 +9516,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "חיתוך"
+    *: "חיתוך"
   </dest>
   <voice>
-    *: none
-    swcodec: "תדירות חיתוך"
+    *: "תדירות חיתוך"
   </voice>
 </phrase>
 <phrase>
@@ -9689,16 +9530,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "הגברה"
+    *: "הגברה"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגברה"
+    *: "הגברה"
   </voice>
 </phrase>
 <phrase>
@@ -9706,16 +9544,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ":מצב"
+    *: ":מצב"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10344,7 +10179,7 @@
     multivolume: "לא קיים"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10378,15 +10213,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "חיתוך בס"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "חיתוך בס"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך בס"
   </voice>
 </phrase>
 <phrase>
@@ -10395,15 +10230,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "חיתוך טרבל"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "חיתוך טרבל"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "חיתוך טרבל"
   </voice>
 </phrase>
 <phrase>
@@ -10439,16 +10274,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "קליק לחיצה"
+    *: "קליק לחיצה"
   </dest>
   <voice>
-    *: none
-    swcodec: "קליק לחיצה"
+    *: "קליק לחיצה"
   </voice>
 </phrase>
 <phrase>
@@ -10456,16 +10288,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "חזרה על צליל לחיצה"
+    *: "חזרה על צליל לחיצה"
   </dest>
   <voice>
-    *: none
-    swcodec: "חזרה על צליל לחיצה"
+    *: "חזרה על צליל לחיצה"
   </voice>
 </phrase>
 <phrase>
@@ -10586,11 +10415,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "קצב סיביות טורי"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "קצב סיביות טורי"
   </voice>
@@ -10603,11 +10432,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "אוטו"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "אוטומאטית"
   </voice>
@@ -10620,11 +10449,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10637,11 +10466,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10654,11 +10483,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10671,11 +10500,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11198,16 +11027,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "מתיחת זמן"
+    *: "מתיחת זמן"
   </dest>
   <voice>
-    *: none
-    swcodec: "מתיחת זמן"
+    *: "מתיחת זמן"
   </voice>
 </phrase>
 <phrase>
@@ -11215,16 +11041,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "מהירות"
+    *: "מהירות"
   </dest>
   <voice>
-    *: none
-    swcodec: "מהירות"
+    *: "מהירות"
   </voice>
 </phrase>
 <phrase>
@@ -11325,7 +11148,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11478,16 +11301,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "רוחב פס גלילה"
+    *: "רוחב פס גלילה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "רוחב פס גלילה"
+    *: "רוחב פס גלילה"
   </voice>
 </phrase>
 <phrase>
@@ -11495,16 +11315,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "מיקום פס גלילה"
+    *: "מיקום פס גלילה"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "מיקום פס גלילה"
+    *: "מיקום פס גלילה"
   </voice>
 </phrase>
 <phrase>
@@ -11512,16 +11329,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11580,16 +11394,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "רמת סף"
+    *: "רמת סף"
   </dest>
   <voice>
-    *: none
-    swcodec: "רמת סף"
+    *: "רמת סף"
   </voice>
 </phrase>
 <phrase>
@@ -11597,16 +11408,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "יחס"
+    *: "יחס"
   </dest>
   <voice>
-    *: none
-    swcodec: "יחס"
+    *: "יחס"
   </voice>
 </phrase>
 <phrase>
@@ -11614,16 +11422,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 ל- 1"
+    *: "2 ל- 1"
   </voice>
 </phrase>
 <phrase>
@@ -11631,16 +11436,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 ל- 1"
+    *: "4 ל- 1"
   </voice>
 </phrase>
 <phrase>
@@ -11648,16 +11450,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 ל- 1"
+    *: "6 ל- 1"
   </voice>
 </phrase>
 <phrase>
@@ -11665,16 +11464,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 ל- 1"
+    *: "10 ל- 1"
   </voice>
 </phrase>
 <phrase>
@@ -11682,16 +11478,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "גבול"
+    *: "גבול"
   </dest>
   <voice>
-    *: none
-    swcodec: "גבול"
+    *: "גבול"
   </voice>
 </phrase>
 <phrase>
@@ -11699,16 +11492,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "הגברת פיצוי"
+    *: "הגברת פיצוי"
   </dest>
   <voice>
-    *: none
-    swcodec: "הגברת פיצוי"
+    *: "הגברת פיצוי"
   </voice>
 </phrase>
 <phrase>
@@ -11716,16 +11506,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "אוטו"
+    *: "אוטו"
   </dest>
   <voice>
-    *: none
-    swcodec: "אוטו"
+    *: "אוטו"
   </voice>
 </phrase>
 <phrase>
@@ -11733,16 +11520,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ברך"
+    *: "ברך"
   </dest>
   <voice>
-    *: none
-    swcodec: "ברך"
+    *: "ברך"
   </voice>
 </phrase>
 <phrase>
@@ -11750,16 +11534,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ברך קשה"
+    *: "ברך קשה"
   </dest>
   <voice>
-    *: none
-    swcodec: "ברך קשה"
+    *: "ברך קשה"
   </voice>
 </phrase>
 <phrase>
@@ -11767,16 +11548,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ברך רכה"
+    *: "ברך רכה"
   </dest>
   <voice>
-    *: none
-    swcodec: "ברך רכה"
+    *: "ברך רכה"
   </voice>
 </phrase>
 <phrase>
@@ -11784,16 +11562,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "זמן שחרור"
+    *: "זמן שחרור"
   </dest>
   <voice>
-    *: none
-    swcodec: "זמן שחרור"
+    *: "זמן שחרור"
   </voice>
 </phrase>
 <phrase>
@@ -11981,16 +11756,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11998,16 +11770,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -12233,16 +12002,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind before resume"
+    *: "Rewind before resume"
   </voice>
 </phrase>
 <phrase>
@@ -12518,7 +12284,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index 6ee5800ffc..a35756aea3 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -218,16 +218,16 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "SELECT = Yes"
     archosplayer: "(PLAY/STOP)"
+    gigabeatfx,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "बजाना = हां"
-    iriverh100,iriverh120,iriverh300: "NAVI = हां"
-    ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "चुन = हां"
     archosplayer: "(बजाना/रोक)"
+    gigabeatfx,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*: "चुन = हां"
+    iriverh100,iriverh120,iriverh300: "NAVI = हां"
     vibe500: "OK = हां"
   </dest>
   <voice>
@@ -598,16 +598,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ चालू कर"
+    *: "EQ चालू कर"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer चालू कर"
+    *: "Equalizer चालू कर"
   </voice>
 </phrase>
 <phrase>
@@ -615,16 +612,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "सिमपल EQ सेटिनगस"
+    *: "सिमपल EQ सेटिनगस"
   </dest>
   <voice>
-    *: none
-    swcodec: "सिमपल equalizer सेटिनगस"
+    *: "सिमपल equalizer सेटिनगस"
   </voice>
 </phrase>
 <phrase>
@@ -632,16 +626,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "अडवानसड EQ सेटिनगस"
+    *: "अडवानसड EQ सेटिनगस"
   </dest>
   <voice>
-    *: none
-    swcodec: "अडवानसड equalizer सेटिनगस"
+    *: "अडवानसड equalizer सेटिनगस"
   </voice>
 </phrase>
 <phrase>
@@ -840,16 +831,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Clipping कम करो"
+    *: "Clipping कम करो"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clipping कम करो"
+    *: "Clipping कम करो"
   </voice>
 </phrase>
 <phrase>
@@ -857,16 +845,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "धीमा"
+    *: "धीमा"
   </dest>
   <voice>
-    *: none
-    swcodec: "धीमा"
+    *: "धीमा"
   </voice>
 </phrase>
 <phrase>
@@ -874,16 +859,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "बीच का"
+    *: "बीच का"
   </dest>
   <voice>
-    *: none
-    swcodec: "बीच का"
+    *: "बीच का"
   </voice>
 </phrase>
 <phrase>
@@ -891,16 +873,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "जोरदार"
+    *: "जोरदार"
   </dest>
   <voice>
-    *: none
-    swcodec: "जोरदार"
+    *: "जोरदार"
   </voice>
 </phrase>
 <phrase>
@@ -1114,17 +1093,15 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
     iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "डाटाबेस बन रहा है... %d मिले (OFF to बढ़)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
     iriverh100,iriverh120,iriverh300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)"
-    ipod*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -1323,16 +1300,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ऊलटा"
+    *: "ऊलटा"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ऊलटा"
+    *: "ऊलटा"
   </voice>
 </phrase>
 <phrase>
@@ -1907,18 +1881,18 @@
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=लगा OFF=बंद"
     ipod*: "SELECT=लगा MENU=बंद"
     iriverh10,iriverh10_5gb: "SELECT=लगा PREV=बंद"
-    vibe500: "OK=लगा C=बंद"
     mpiohd300: "ENTER=लगा MENU=बंद"
     sansafuzeplus: "SELECT=लगा  BACK=बंद"
+    vibe500: "OK=लगा C=बंद"
   </dest>
   <voice>
     *: none
@@ -3762,23 +3736,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "दिसक भरी ह. Press OFF to continue."
-    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
     iaudiom5,iaudiox5: "दिसक भरी ह. Press POWER to continue."
-    sansae200*,sansac200*,vibe500: "दिसक भरी ह. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue."
+    recording: "दिसक भरी ह. Press OFF to continue."
     samsungyh*: "दिसक भरी ह. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "दिसक भरी ह. Press PREV to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 0995c3d95d..abd4d5aed1 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -246,20 +246,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Da"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, ili gore desno = Da"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Da"
     iriverh100,iriverh120,iriverh300: "NAVI = Da"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Da"
     mrobe500: "PLAY, POWER, ili gore desno = Da"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = DA"
   </dest>
   <voice>
@@ -815,16 +815,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Pretapanje"
+    *: "Pretapanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pretapanje"
+    *: "Pretapanje"
   </voice>
 </phrase>
 <phrase>
@@ -832,16 +829,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direktno pojačanje"
+    *: "Direktno pojačanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direktno pojačanje"
+    *: "Direktno pojačanje"
   </voice>
 </phrase>
 <phrase>
@@ -849,16 +843,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Pojačanje pretapanja"
+    *: "Pojačanje pretapanja"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pojačanje pretapanja"
+    *: "Pojačanje pretapanja"
   </voice>
 </phrase>
 <phrase>
@@ -866,16 +857,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Visokofrekvencijsko oslabljenje"
+    *: "Visokofrekvencijsko oslabljenje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Visokofrekvencijsko oslabljenje"
+    *: "Visokofrekvencijsko oslabljenje"
   </voice>
 </phrase>
 <phrase>
@@ -883,16 +871,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Visokofrekvencijsko odsijecanje"
+    *: "Visokofrekvencijsko odsijecanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Visokofrekvencijsko odsijecanje"
+    *: "Visokofrekvencijsko odsijecanje"
   </voice>
 </phrase>
 <phrase>
@@ -900,16 +885,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Izjednačivač (EQ)"
+    *: "Izjednačivač (EQ)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Izjednačivač (EQ)"
+    *: "Izjednačivač (EQ)"
   </voice>
 </phrase>
 <phrase>
@@ -917,16 +899,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Omogući EQ"
+    *: "Omogući EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Omogući izjednačivač"
+    *: "Omogući izjednačivač"
   </voice>
 </phrase>
 <phrase>
@@ -934,16 +913,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafički EQ"
+    *: "Grafički EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafički izjednačivač"
+    *: "Grafički izjednačivač"
   </voice>
 </phrase>
 <phrase>
@@ -951,16 +927,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Prednji rez"
+    *: "Prednji rez"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prednji rez"
+    *: "Prednji rez"
   </voice>
 </phrase>
 <phrase>
@@ -968,16 +941,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Jednostavne EQ postavke"
+    *: "Jednostavne EQ postavke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Jednostavne postavke izjednačivača"
+    *: "Jednostavne postavke izjednačivača"
   </voice>
 </phrase>
 <phrase>
@@ -985,16 +955,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Napredne EQ postavke"
+    *: "Napredne EQ postavke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Napredne postavke izjednačivača"
+    *: "Napredne postavke izjednačivača"
   </voice>
 </phrase>
 <phrase>
@@ -1002,16 +969,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Spremi EQ postavke"
+    *: "Spremi EQ postavke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spremi postavke izjednačivača"
+    *: "Spremi postavke izjednačivača"
   </voice>
 </phrase>
 <phrase>
@@ -1019,16 +983,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Pregledaj EQ postavke"
+    *: "Pregledaj EQ postavke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pregledaj postavke izjedačivača"
+    *: "Pregledaj postavke izjedačivača"
   </voice>
 </phrase>
 <phrase>
@@ -1036,16 +997,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Način uređivanja: %s"
+    *: "Način uređivanja: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1053,16 +1011,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz pojasno pojačanje"
+    *: "%d Hz pojasno pojačanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "herca pojasno pojačanje"
+    *: "herca pojasno pojačanje"
   </voice>
 </phrase>
 <phrase>
@@ -1070,16 +1025,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Niskofrekvencijski filter"
+    *: "Niskofrekvencijski filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Niskofrekvencijski filter"
+    *: "Niskofrekvencijski filter"
   </voice>
 </phrase>
 <phrase>
@@ -1087,16 +1039,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filter vršnih frekvencija %d"
+    *: "Filter vršnih frekvencija %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filter vršnih frekvencija"
+    *: "Filter vršnih frekvencija"
   </voice>
 </phrase>
 <phrase>
@@ -1104,16 +1053,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Viskofrekvencijski filter"
+    *: "Viskofrekvencijski filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Viskofrekvencijski filter"
+    *: "Viskofrekvencijski filter"
   </voice>
 </phrase>
 <phrase>
@@ -1121,16 +1067,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frekvencija odsijecanja"
+    *: "Frekvencija odsijecanja"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekvencija odsijecanja"
+    *: "Frekvencija odsijecanja"
   </voice>
 </phrase>
 <phrase>
@@ -1138,16 +1081,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Središnja frekvencija"
+    *: "Središnja frekvencija"
   </dest>
   <voice>
-    *: none
-    swcodec: "Središnja frekvencija"
+    *: "Središnja frekvencija"
   </voice>
 </phrase>
 <phrase>
@@ -1155,16 +1095,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1172,16 +1109,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1724,16 +1658,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Spriječi isijecanje"
+    *: "Spriječi isijecanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spriječi isijecanje"
+    *: "Spriječi isijecanje"
   </voice>
 </phrase>
 <phrase>
@@ -1811,16 +1742,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Signal pri preskakanju pjesme"
+    *: "Signal pri preskakanju pjesme"
   </dest>
   <voice>
-    *: none
-    swcodec: "Signal pri preskakanju pjesme"
+    *: "Signal pri preskakanju pjesme"
   </voice>
 </phrase>
 <phrase>
@@ -1828,16 +1756,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Slab"
+    *: "Slab"
   </dest>
   <voice>
-    *: none
-    swcodec: "Slab"
+    *: "Slab"
   </voice>
 </phrase>
 <phrase>
@@ -1845,16 +1770,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Umjeren"
+    *: "Umjeren"
   </dest>
   <voice>
-    *: none
-    swcodec: "Umjeren"
+    *: "Umjeren"
   </voice>
 </phrase>
 <phrase>
@@ -1862,16 +1784,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Jak"
+    *: "Jak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Jak"
+    *: "Jak"
   </voice>
 </phrase>
 <phrase>
@@ -2228,21 +2147,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Izgrađivanje baze podataka... %d pronađeno (OFF za povratak)"
-    iriverh100,iriverh120,iriverh300: "Izgrađivanje baze podataka... %d pronađeno (STOP za povratak)"
-    ipod*: "Izgrađivanje baze podataka... %d pronađeno (PREV za povratak)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Izgrađivanje baze podataka... %d pronađeno (LEFT za povratak)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Izgrađivanje baze podataka... %d pronađeno (PREV za povratak)"
-    gogearsa9200: "Izgrađivanje baze podataka... %d pronađeno (REW za povratak)"
     archosplayer: "Izgrađivanje DB %d pronađeno"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Izgrađivanje baze podataka... %d pronađeno (LEFT za povratak)"
+    gogearsa9200: "Izgrađivanje baze podataka... %d pronađeno (REW za povratak)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Izgrađivanje baze podataka... %d pronađeno (PREV za povratak)"
+    iriverh100,iriverh120,iriverh300: "Izgrađivanje baze podataka... %d pronađeno (STOP za povratak)"
   </dest>
   <voice>
     *: "pronađeni unosi za bazu podataka"
@@ -2424,16 +2341,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pismo"
+    *: "Pismo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pismo"
+    *: "Pismo"
   </voice>
 </phrase>
 <phrase>
@@ -2695,16 +2609,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Naopako"
+    *: "Naopako"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Naopako"
+    *: "Naopako"
   </voice>
 </phrase>
 <phrase>
@@ -2712,16 +2623,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vrsta birača retka"
+    *: "Vrsta birača retka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vrsta birača retka"
+    *: "Vrsta birača retka"
   </voice>
 </phrase>
 <phrase>
@@ -2729,16 +2637,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokazivač"
+    *: "Pokazivač"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokazivač"
+    *: "Pokazivač"
   </voice>
 </phrase>
 <phrase>
@@ -2746,16 +2651,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traka (obrnuto)"
+    *: "Traka (obrnuto)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obrnuta traka"
+    *: "Obrnuta traka"
   </voice>
 </phrase>
 <phrase>
@@ -3045,16 +2947,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekran se skliže van pogleda"
+    *: "Ekran se skliže van pogleda"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekran se skliže van pogleda"
+    *: "Ekran se skliže van pogleda"
   </voice>
 </phrase>
 <phrase>
@@ -3062,16 +2961,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Veličina koraka sklizanja ekrana"
+    *: "Veličina koraka sklizanja ekrana"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Veličina koraka sklizanja ekrana"
+    *: "Veličina koraka sklizanja ekrana"
   </voice>
 </phrase>
 <phrase>
@@ -3127,16 +3023,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stanje-/Traka sklizanja"
+    *: "Stanje-/Traka sklizanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stanje- i traka sklizanja"
+    *: "Stanje- i traka sklizanja"
   </voice>
 </phrase>
 <phrase>
@@ -3144,16 +3037,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traka sklizanja"
+    *: "Traka sklizanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traka sklizanja"
+    *: "Traka sklizanja"
   </voice>
 </phrase>
 <phrase>
@@ -3161,16 +3051,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traka stanja"
+    *: "Traka stanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traka stanja"
+    *: "Traka stanja"
   </voice>
 </phrase>
 <phrase>
@@ -3195,16 +3082,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prikaz glasnoće"
+    *: "Prikaz glasnoće"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prikaz glasnoće"
+    *: "Prikaz glasnoće"
   </voice>
 </phrase>
 <phrase>
@@ -3212,16 +3096,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prikaz baterije"
+    *: "Prikaz baterije"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prikaz baterije"
+    *: "Prikaz baterije"
   </voice>
 </phrase>
 <phrase>
@@ -3229,16 +3110,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafika"
+    *: "Grafika"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafika"
+    *: "Grafika"
   </voice>
 </phrase>
 <phrase>
@@ -3246,16 +3124,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Broj"
+    *: "Broj"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Broj"
+    *: "Broj"
   </voice>
 </phrase>
 <phrase>
@@ -3475,16 +3350,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrejski (ISO-8859-8)"
+    *: "Hebrejski (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrejski"
+    *: "Hebrejski"
   </voice>
 </phrase>
 <phrase>
@@ -3506,16 +3378,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tajlandski (ISO-8859-11)"
+    *: "Tajlandski (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tajlandski"
+    *: "Tajlandski"
   </voice>
 </phrase>
 <phrase>
@@ -3523,16 +3392,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arapski (CP1256)"
+    *: "Arapski (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arapski"
+    *: "Arapski"
   </voice>
 </phrase>
 <phrase>
@@ -3568,16 +3434,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanski (SJIS)"
+    *: "Japanski (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanski"
+    *: "Japanski"
   </voice>
 </phrase>
 <phrase>
@@ -3585,16 +3448,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Jed. kineski (GB2312)"
+    *: "Jed. kineski (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Jednostavni kineski"
+    *: "Jednostavni kineski"
   </voice>
 </phrase>
 <phrase>
@@ -3602,16 +3462,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korejski (KSX1001)"
+    *: "Korejski (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korejski"
+    *: "Korejski"
   </voice>
 </phrase>
 <phrase>
@@ -3619,16 +3476,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. kineski (BIG5)"
+    *: "Trad. kineski (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tradicionalni kineski"
+    *: "Tradicionalni kineski"
   </voice>
 </phrase>
 <phrase>
@@ -3652,17 +3506,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Istek vremena za svjetlo tipki"
-    sansafuze*,sansae200*: "Istek vremena za svjetlo kruga"
+    sansae200*,sansafuze*: "Istek vremena za svjetlo kruga"
   </dest>
   <voice>
     *: none
     button_light: "Istek vremena za svjetlo tipki"
-    sansafuze*,sansae200*: "Istek vremena za svjetlo kruga"
+    sansae200*,sansafuze*: "Istek vremena za svjetlo kruga"
   </voice>
 </phrase>
 <phrase>
@@ -3933,27 +3787,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Postavi"
-    mrobe500: "HEART = Postavi"
-    iriverh100,iriverh120,iriverh300: "NAVI = Postavi"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Postavi"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Postavi"
     gogearsa9200,samsungyh*: "PLAY = Postavi"
-    vibe500: "OK = Postavi"
+    iriverh100,iriverh120,iriverh300: "NAVI = Postavi"
     mpiohd300: "ENTER = Postavi"
+    mrobe500: "HEART = Postavi"
+    rtc: "ON = Postavi"
+    vibe500: "OK = Postavi"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3962,39 +3816,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Povrati"
-    mrobe500: "POWER = Povrati"
-    iriverh100,iriverh120,iriverh300: "STOP = Povrati"
-    ipod*,sansac200*,mpiohd300: "MENU = Povrati"
-    iaudiox5,iaudiom5: "RECORD = Povrati"
+    gigabeatfx,mrobe500: "POWER = Povrati"
+    gigabeats,sansafuzeplus: "BACK = Povrati"
+    gogearsa9200: "LEFT = Povrati"
+    iaudiom5,iaudiox5: "RECORD = Povrati"
+    ipod*,mpiohd300,sansac200*: "MENU = Povrati"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Povrati"
-    gigabeatfx: "POWER = Povrati"
-    sansafuzeplus: "BACK = Povrati"
+    iriverh100,iriverh120,iriverh300: "STOP = Povrati"
     mrobe100: "DISPLAY = Povrati"
-    gigabeats: "BACK = Povrati"
-    gogearsa9200: "LEFT = Povrati"
-    vibe500: "CANCEL = Povrati"
+    rtc: "OFF = Povrati"
     samsungyh*: "REW = Povrati"
+    vibe500: "CANCEL = Povrati"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4479,22 +4329,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Na OFF=Otkaži"
+    gigabeats: "SELECT=Na POWER=Otkaži"
     ipod*: "SELECT=Na MENU=Otkaži"
     iriverh10,iriverh10_5gb: "SELECT=Na PREV=Otkaži"
-    gigabeats: "SELECT=Na POWER=Otkaži"
-    vibe500: "OK=Na C=Otkaži"
     mpiohd300: "ENTER=Na MENU=Otkaži"
     sansafuzeplus: "SELECT=Na  BACK=Otkaži"
+    vibe500: "OK=Na C=Otkaži"
   </dest>
   <voice>
     *: none
@@ -5599,15 +5449,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvencija"
+    play_frequency,recording: "Frekvencija"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvencija"
+    play_frequency,recording: "Frekvencija"
   </voice>
 </phrase>
 <phrase>
@@ -5650,18 +5500,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Unutrašnji mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Unutrašnji mikrofon"
+    recording: "Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -6539,13 +6389,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Razina baterije"
@@ -6602,24 +6452,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mikro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mikro S D"
     xduoox3: "mikro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7934,23 +7784,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disk je pun. Pritisnite OFF za nastavak."
-    iriverh100,iriverh120,iriverh300: "Disk je pun. Pritisnite STOP za nastavak."
     iaudiom5,iaudiox5: "Disk je pun. Pritisnite POWER za nastavak."
-    sansae200*,sansac200*,vibe500: "Disk je pun. Pritisnite PREV za nastavak."
+    iriverh100,iriverh120,iriverh300: "Disk je pun. Pritisnite STOP za nastavak."
+    recording: "Disk je pun. Pritisnite OFF za nastavak."
     samsungyh*: "Disk je pun. Pritisnite LEFT za nastavak."
+    sansac200*,sansae200*,vibe500: "Disk je pun. Pritisnite PREV za nastavak."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8038,23 +7888,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK za prekid"
     gigabeatfx: "POWER za prekid"
-    sansafuzeplus: "BACK za prekid"
+    gigabeats,sansafuzeplus: "BACK za prekid"
+    iaudiom5,iaudiox5: "Dugo PLAY za prekid"
+    ipod*: "PLAY/PAUSE za prekid"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV za prekid"
+    iriverh100,iriverh120,iriverh300: "STOP za prekid"
   </dest>
   <voice>
     *: ""
@@ -9606,7 +9454,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "popis znakova za izvođenje"
@@ -9648,15 +9496,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9664,16 +9510,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Odsijecanje"
+    *: "Odsijecanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekvencija odsijecanja"
+    *: "Frekvencija odsijecanja"
   </voice>
 </phrase>
 <phrase>
@@ -9681,16 +9524,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ujednačenje glasnoće"
+    *: "Ujednačenje glasnoće"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ujednačenje glasnoće"
+    *: "Ujednačenje glasnoće"
   </voice>
 </phrase>
 <phrase>
@@ -9698,16 +9538,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Način rada:"
+    *: "Način rada:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10336,7 +10173,7 @@
     multivolume: "Nije prisutna"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10370,15 +10207,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Odsijecanje basa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Odsijecanje basa"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje basa"
   </voice>
 </phrase>
 <phrase>
@@ -10387,15 +10224,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Odsijecanje treblea"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Odsijecanje treblea"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Odsijecanje treblea"
   </voice>
 </phrase>
 <phrase>
@@ -10431,16 +10268,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Pritisak tipke"
+    *: "Pritisak tipke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pritisak tipke"
+    *: "Pritisak tipke"
   </voice>
 </phrase>
 <phrase>
@@ -10448,16 +10282,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Ponovljeni pritisci tipke"
+    *: "Ponovljeni pritisci tipke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ponovljeni pritisci tipke"
+    *: "Ponovljeni pritisci tipke"
   </voice>
 </phrase>
 <phrase>
@@ -10578,11 +10409,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Serijski protok bitova"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Serijski protok bitova"
   </voice>
@@ -10595,11 +10426,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatsko"
   </voice>
@@ -10612,11 +10443,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10629,11 +10460,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10646,11 +10477,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10663,11 +10494,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11188,16 +11019,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Rastezanje vremena"
+    *: "Rastezanje vremena"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rastezanje vremena"
+    *: "Rastezanje vremena"
   </voice>
 </phrase>
 <phrase>
@@ -11205,16 +11033,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Brzina"
+    *: "Brzina"
   </dest>
   <voice>
-    *: none
-    swcodec: "Brzina"
+    *: "Brzina"
   </voice>
 </phrase>
 <phrase>
@@ -11315,7 +11140,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11466,16 +11291,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Širina trake sklizanja"
+    *: "Širina trake sklizanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Širina trake sklizanja"
+    *: "Širina trake sklizanja"
   </voice>
 </phrase>
 <phrase>
@@ -11483,16 +11305,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pozicija trake sklizanja"
+    *: "Pozicija trake sklizanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pozicija trake sklizanja"
+    *: "Pozicija trake sklizanja"
   </voice>
 </phrase>
 <phrase>
@@ -11500,16 +11319,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </voice>
 </phrase>
 <phrase>
@@ -11568,16 +11384,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Prag"
+    *: "Prag"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prag"
+    *: "Prag"
   </voice>
 </phrase>
 <phrase>
@@ -11585,16 +11398,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Omjer"
+    *: "Omjer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Omjer"
+    *: "Omjer"
   </voice>
 </phrase>
 <phrase>
@@ -11602,16 +11412,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 naprema 1"
+    *: "2 naprema 1"
   </voice>
 </phrase>
 <phrase>
@@ -11619,16 +11426,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 naprema 1"
+    *: "4 naprema 1"
   </voice>
 </phrase>
 <phrase>
@@ -11636,16 +11440,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 naprema 1"
+    *: "6 naprema 1"
   </voice>
 </phrase>
 <phrase>
@@ -11653,16 +11454,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 naprema 1"
+    *: "10 naprema 1"
   </voice>
 </phrase>
 <phrase>
@@ -11670,16 +11468,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Ograničenje"
+    *: "Ograničenje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ograničenje"
+    *: "Ograničenje"
   </voice>
 </phrase>
 <phrase>
@@ -11687,16 +11482,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Naknadno ujednačenje glasnoće"
+    *: "Naknadno ujednačenje glasnoće"
   </dest>
   <voice>
-    *: none
-    swcodec: "Naknadno ujednačenje glasnoće"
+    *: "Naknadno ujednačenje glasnoće"
   </voice>
 </phrase>
 <phrase>
@@ -11704,16 +11496,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11721,16 +11510,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Prijelaz"
+    *: "Prijelaz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prijelaz"
+    *: "Prijelaz"
   </voice>
 </phrase>
 <phrase>
@@ -11738,16 +11524,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Nagli prijelaz"
+    *: "Nagli prijelaz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nagli prijelaz"
+    *: "Nagli prijelaz"
   </voice>
 </phrase>
 <phrase>
@@ -11755,16 +11538,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Postupni prijelaz"
+    *: "Postupni prijelaz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Postupni prijelaz"
+    *: "Postupni prijelaz"
   </voice>
 </phrase>
 <phrase>
@@ -11772,16 +11552,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Vrijeme otpuštanja"
+    *: "Vrijeme otpuštanja"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vrijeme otpuštanja"
+    *: "Vrijeme otpuštanja"
   </voice>
 </phrase>
 <phrase>
@@ -11969,16 +11746,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Glavna presvlaka"
+    *: "Glavna presvlaka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Glavna presvlaka"
+    *: "Glavna presvlaka"
   </voice>
 </phrase>
 <phrase>
@@ -11986,16 +11760,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Udaljena glavna presvlaka"
+    *: "Udaljena glavna presvlaka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Udaljena glavna presvlaka"
+    *: "Udaljena glavna presvlaka"
   </voice>
 </phrase>
 <phrase>
@@ -12122,16 +11893,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Premotaj prije nastavljanja"
+    *: "Premotaj prije nastavljanja"
   </dest>
   <voice>
-    *: none
-    swcodec: "Premotaj prije nastavljanja"
+    *: "Premotaj prije nastavljanja"
   </voice>
 </phrase>
 <phrase>
@@ -12523,7 +12291,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 3699893e39..58200ca563 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -982,16 +982,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Píp við lagskipti"
+    *: "Píp við lagskipti"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -999,16 +996,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Lág"
+    *: "Lág"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -1016,16 +1010,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Mið"
+    *: "Mið"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -1033,16 +1024,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Há"
+    *: "Há"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -1263,16 +1251,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Letur"
+    *: "Letur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -1339,16 +1324,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stöðu-/flettistik"
+    *: "Stöðu-/flettistik"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -1697,15 +1679,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Tíðni"
+    play_frequency,recording: "Tíðni"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1731,18 +1713,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Hljóðnemi"
     iriverh100,iriverh120,iriverh300: "Innbyggður hljóðnemi"
+    recording: "Hljóðnemi"
   </dest>
   <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -1897,16 +1879,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Hindra úrklippi"
+    *: "Hindra úrklippi"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -2097,16 +2076,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Á hvolfi"
+    *: "Á hvolfi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2114,16 +2090,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vallínutegund"
+    *: "Vallínutegund"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -2131,16 +2104,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vísir"
+    *: "Vísir"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -2148,16 +2118,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Súla (öfug)"
+    *: "Súla (öfug)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2249,16 +2216,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skrunsúla"
+    *: "Skrunsúla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2266,16 +2230,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stöðu súla"
+    *: "Stöðu súla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -2300,16 +2261,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hljóðstyrki skjár"
+    *: "Hljóðstyrki skjár"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -2317,16 +2275,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rafhlöðu skjár"
+    *: "Rafhlöðu skjár"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -2334,16 +2289,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Myndrænn"
+    *: "Myndrænn"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -2351,16 +2303,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Í tölum"
+    *: "Í tölum"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -3061,13 +3010,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Rafhlaða: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Rafhl.: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Rafhl.: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -3124,24 +3073,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -3271,39 +3220,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3363,23 +3308,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Harði diskurinn er fullur. Ýtið á OFF til að halda áfram."
-    iriverh100,iriverh120,iriverh300: "Harði diskurinn er fullur. Ýtið á STOP til að halda áfram."
     iaudiom5,iaudiox5: "Harði diskurinn er fullur. Ýtið á POWER til að halda áfram."
-    sansae200*,sansac200*,vibe500: "Harði diskurinn er fullur. Ýtið á PREV til að halda áfram."
+    iriverh100,iriverh120,iriverh300: "Harði diskurinn er fullur. Ýtið á STOP til að halda áfram."
+    recording: "Harði diskurinn er fullur. Ýtið á OFF til að halda áfram."
     samsungyh*: "Harði diskurinn er fullur. Ýtið á LEFT til að halda áfram."
+    sansac200*,sansae200*,vibe500: "Harði diskurinn er fullur. Ýtið á PREV til að halda áfram."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3542,22 +3487,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Vista OFF=Hætta við"
+    gigabeats: "SELECT=Vista POWER=Hætta við"
     ipod*: "SELECT=Vista MENU=Hætta við"
     iriverh10,iriverh10_5gb: "SELECT=Vista PREV=Hætta við"
-    gigabeats: "SELECT=Vista POWER=Hætta við"
-    vibe500: "OK=Vista C=Hætta við"
     mpiohd300: "ENTER=Vista MENU=Hætta við"
     sansafuzeplus: "SELECT=Vista  BACK=Hætta við"
+    vibe500: "OK=Vista C=Hætta við"
   </dest>
   <voice>
     *: none
@@ -5769,23 +5714,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
-    *: "OFF to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
+  </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK til að slíta vinnslu"
     gigabeatfx: "POWER til að slíta vinnslu"
-    sansafuzeplus: "BACK til að slíta vinnslu"
+    gigabeats,sansafuzeplus: "BACK til að slíta vinnslu"
+    iaudiom5,iaudiox5: "Long PLAY til að slíta vinnslu"
+    ipod*: "PLAY/PAUSE til að slíta vinnslu"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV til að slíta vinnslu"
+    iriverh100,iriverh120,iriverh300: "STOP til að slíta vinnslu"
   </dest>
   <voice>
     *: ""
@@ -6227,16 +6170,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Breytihamur: %s %s"
+    *: "Breytihamur: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6289,16 +6229,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Útgáfutími"
+    *: "Útgáfutími"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 1d28810562..d5203e6560 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -813,16 +813,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfid"
+    *: "Crossfid"
   </voice>
 </phrase>
 <phrase>
@@ -830,33 +827,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guadagno diretto"
+    *: "Guadagno diretto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guadagno diretto"
+    *: "Guadagno diretto"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
-  <dest>  
-    *: none
-    swcodec: "Guadagno incrociato"
+  <dest>
+    *: "Guadagno incrociato"
   </dest>
-  <voice>  
-    *: none
-    swcodec: "Guadagno incrociato"
+  <voice>
+    *: "Guadagno incrociato"
   </voice>
 </phrase>
 <phrase>
@@ -864,16 +855,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Attenuazione delle alte frequenze"
+    *: "Attenuazione delle alte frequenze"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attenuazione delle alte frequenze"
+    *: "Attenuazione delle alte frequenze"
   </voice>
 </phrase>
 <phrase>
@@ -881,16 +869,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Taglio delle alte frequenze"
+    *: "Taglio delle alte frequenze"
   </dest>
   <voice>
-    *: none
-    swcodec: "Taglio delle alte frequenze"
+    *: "Taglio delle alte frequenze"
   </voice>
 </phrase>
 <phrase>
@@ -898,16 +883,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizzatore"
+    *: "Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizzatore"
+    *: "Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -915,16 +897,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Attiva Equalizzatore"
+    *: "Attiva Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attiva Equalizzatore"
+    *: "Attiva Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -932,16 +911,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizzatore Grafico"
+    *: "Equalizzatore Grafico"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizzatore Grafico"
+    *: "Equalizzatore Grafico"
   </voice>
 </phrase>
 <phrase>
@@ -949,16 +925,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pre-taglio"
+    *: "Pre-taglio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-taglio"
+    *: "Pre-taglio"
   </voice>
 </phrase>
 <phrase>
@@ -966,16 +939,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Impostazioni Base Equalizzatore"
+    *: "Impostazioni Base Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Impostazioni Base Equalizzatore"
+    *: "Impostazioni Base Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -983,16 +953,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Impostazioni Avanzate Equalizzatore"
+    *: "Impostazioni Avanzate Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Impostazioni Avanzate Equalizzatore"
+    *: "Impostazioni Avanzate Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -1000,16 +967,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Salva Programmazioni Equalizzatore"
+    *: "Salva Programmazioni Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Salva Programmazioni Equalizzatore"
+    *: "Salva Programmazioni Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -1017,16 +981,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Carica Programmazioni Equalizzatore"
+    *: "Carica Programmazioni Equalizzatore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Carica Programmazioni Equalizzatore"
+    *: "Carica Programmazioni Equalizzatore"
   </voice>
 </phrase>
 <phrase>
@@ -1034,16 +995,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo editing: %s"
+    *: "Modo editing: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1051,16 +1009,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Guadagno Banda"
+    *: "%d Hz Guadagno Banda"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz, Guadagno Banda"
+    *: "Hertz, Guadagno Banda"
   </voice>
 </phrase>
 <phrase>
@@ -1068,16 +1023,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro Low Shelf"
+    *: "Filtro Low Shelf"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro Low Shelf"
+    *: "Filtro Low Shelf"
   </voice>
 </phrase>
 <phrase>
@@ -1085,16 +1037,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro Picco %d"
+    *: "Filtro Picco %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro picco"
+    *: "Filtro picco"
   </voice>
 </phrase>
 <phrase>
@@ -1102,16 +1051,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro High Shelf"
+    *: "Filtro High Shelf"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro High Shelf"
+    *: "Filtro High Shelf"
   </voice>
 </phrase>
 <phrase>
@@ -1119,16 +1065,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Taglio Frequenza"
+    *: "Taglio Frequenza"
   </dest>
   <voice>
-    *: none
-    swcodec: "Taglio Frequenza"
+    *: "Taglio Frequenza"
   </voice>
 </phrase>
 <phrase>
@@ -1136,16 +1079,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frequenza Centrale"
+    *: "Frequenza Centrale"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frequenza Centrale"
+    *: "Frequenza Centrale"
   </voice>
 </phrase>
 <phrase>
@@ -1153,16 +1093,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1170,16 +1107,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1570,16 +1504,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Previene Saturazione"
+    *: "Previene Saturazione"
   </dest>
   <voice>
-    *: none
-    swcodec: "Previene saturazione"
+    *: "Previene saturazione"
   </voice>
 </phrase>
 <phrase>
@@ -1657,16 +1588,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Beep Cambio Traccia"
+    *: "Beep Cambio Traccia"
   </dest>
   <voice>
-    *: none
-    swcodec: "beep Cambio Traccia"
+    *: "beep Cambio Traccia"
   </voice>
 </phrase>
 <phrase>
@@ -1674,16 +1602,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Debole"
+    *: "Debole"
   </dest>
   <voice>
-    *: none
-    swcodec: "Debole"
+    *: "Debole"
   </voice>
 </phrase>
 <phrase>
@@ -1691,16 +1616,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Medio"
+    *: "Medio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Medio"
+    *: "Medio"
   </voice>
 </phrase>
 <phrase>
@@ -1708,16 +1630,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </voice>
 </phrase>
 <phrase>
@@ -1829,7 +1748,7 @@
 </phrase>
 <phrase>
   id: LANG_HEADPHONE_UNPLUG_RW
-desc: deprecated
+  desc: deprecated
   user: core
   <source>
     *: ""
@@ -2266,16 +2185,13 @@ desc: deprecated
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Carattere"
+    *: "Carattere"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Carattere"
+    *: "Carattere"
   </voice>
 </phrase>
 <phrase>
@@ -2535,16 +2451,13 @@ desc: deprecated
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Capovolgi display"
+    *: "Capovolgi display"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Capovolgi Display"
+    *: "Capovolgi Display"
   </voice>
 </phrase>
 <phrase>
@@ -2552,16 +2465,13 @@ desc: deprecated
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipo Selettore linea"
+    *: "Tipo Selettore linea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipo Selettore Linea"
+    *: "Tipo Selettore Linea"
   </voice>
 </phrase>
 <phrase>
@@ -2569,16 +2479,13 @@ desc: deprecated
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Puntatore"
+    *: "Puntatore"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Puntatore"
+    *: "Puntatore"
   </voice>
 </phrase>
 <phrase>
@@ -2586,16 +2493,13 @@ desc: deprecated
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra (Invertita)"
+    *: "Barra (Invertita)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra Invertita"
+    *: "Barra Invertita"
   </voice>
 </phrase>
 <phrase>
@@ -2885,16 +2789,13 @@ desc: deprecated
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scorrimento schermo fuori visione"
+    *: "Scorrimento schermo fuori visione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scorrimento schermo fuori visione"
+    *: "Scorrimento schermo fuori visione"
   </voice>
 </phrase>
 <phrase>
@@ -2902,16 +2803,13 @@ desc: deprecated
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Passo Scorrimento Schermo"
+    *: "Passo Scorrimento Schermo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Passo Scorrimento Schermo"
+    *: "Passo Scorrimento Schermo"
   </voice>
 </phrase>
 <phrase>
@@ -2967,16 +2865,13 @@ desc: deprecated
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra di scorrimento e stato"
+    *: "Barra di scorrimento e stato"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra di Scorrimento e Stato"
+    *: "Barra di Scorrimento e Stato"
   </voice>
 </phrase>
 <phrase>
@@ -2984,16 +2879,13 @@ desc: deprecated
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra di scorrimento"
+    *: "Barra di scorrimento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra di scorrimento"
+    *: "Barra di scorrimento"
   </voice>
 </phrase>
 <phrase>
@@ -3001,16 +2893,13 @@ desc: deprecated
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra di stato"
+    *: "Barra di stato"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra di Stato"
+    *: "Barra di Stato"
   </voice>
 </phrase>
 <phrase>
@@ -3018,16 +2907,13 @@ desc: deprecated
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Visualizzatore volume"
+    *: "Visualizzatore volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Visualizzatore Volume"
+    *: "Visualizzatore Volume"
   </voice>
 </phrase>
 <phrase>
@@ -3035,16 +2921,13 @@ desc: deprecated
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Visualizzatore batteria"
+    *: "Visualizzatore batteria"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Visualizzatore Batteria"
+    *: "Visualizzatore Batteria"
   </voice>
 </phrase>
 <phrase>
@@ -3052,16 +2935,13 @@ desc: deprecated
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafico"
+    *: "Grafico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafico"
+    *: "Grafico"
   </voice>
 </phrase>
 <phrase>
@@ -3069,16 +2949,13 @@ desc: deprecated
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerico"
+    *: "Numerico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerico"
+    *: "Numerico"
   </voice>
 </phrase>
 <phrase>
@@ -3268,16 +3145,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ebraico (ISO-8859-8)"
+    *: "Ebraico (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ebraico"
+    *: "Ebraico"
   </voice>
 </phrase>
 <phrase>
@@ -3299,16 +3173,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3316,16 +3187,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabo (CP1256)"
+    *: "Arabo (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabo"
+    *: "Arabo"
   </voice>
 </phrase>
 <phrase>
@@ -3361,16 +3229,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Giapponese (SJIS)"
+    *: "Giapponese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Giapponese"
+    *: "Giapponese"
   </voice>
 </phrase>
 <phrase>
@@ -3378,16 +3243,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cinese Sempl. (GB2312)"
+    *: "Cinese Sempl. (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cinese Semplificato"
+    *: "Cinese Semplificato"
   </voice>
 </phrase>
 <phrase>
@@ -3395,16 +3257,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreano (KSX1001)"
+    *: "Coreano (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coreano"
+    *: "Coreano"
   </voice>
 </phrase>
 <phrase>
@@ -3412,16 +3271,13 @@ desc: deprecated
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cinese Tradiz. (BIG5)"
+    *: "Cinese Tradiz. (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cinese Tradizionale"
+    *: "Cinese Tradizionale"
   </voice>
 </phrase>
 <phrase>
@@ -4966,7 +4822,7 @@ desc: deprecated
     *: none
     radio: "Load Preset List"
   </source>
- <dest>
+  <dest>
     *: none
     radio: "Carica Lista Stazioni"
   </dest>
@@ -9236,16 +9092,13 @@ desc: deprecated
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo editazione: %s %s"
+    *: "Modo editazione: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9253,16 +9106,13 @@ desc: deprecated
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Taglio"
+    *: "Taglio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frequenza di Taglio"
+    *: "Frequenza di Taglio"
   </voice>
 </phrase>
 <phrase>
@@ -9270,16 +9120,13 @@ desc: deprecated
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guadagno"
+    *: "Guadagno"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guadagno"
+    *: "Guadagno"
   </voice>
 </phrase>
 <phrase>
@@ -9687,7 +9534,7 @@ desc: deprecated
     multivolume: "Non presente"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -9782,16 +9629,13 @@ desc: deprecated
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Click Tasti"
+    *: "Click Tasti"
   </dest>
   <voice>
-    *: none
-    swcodec: "Click Tasti"
+    *: "Click Tasti"
   </voice>
 </phrase>
 <phrase>
@@ -9799,16 +9643,13 @@ desc: deprecated
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Click Tasti Ripetuto"
+    *: "Click Tasti Ripetuto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Click Tasti Ripetuto"
+    *: "Click Tasti Ripetuto"
   </voice>
 </phrase>
 <phrase>
@@ -9929,11 +9770,11 @@ desc: deprecated
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Bitrate Seriale"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Bitrate Seriale"
   </voice>
@@ -9946,11 +9787,11 @@ desc: deprecated
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatico"
   </voice>
@@ -9963,11 +9804,11 @@ desc: deprecated
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -9980,11 +9821,11 @@ desc: deprecated
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -9997,11 +9838,11 @@ desc: deprecated
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10014,11 +9855,11 @@ desc: deprecated
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -10541,16 +10382,13 @@ desc: deprecated
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -10558,16 +10396,13 @@ desc: deprecated
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocità"
+    *: "Velocità"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocità"
+    *: "Velocità"
   </voice>
 </phrase>
 <phrase>
@@ -10668,7 +10503,7 @@ desc: deprecated
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -10821,16 +10656,13 @@ desc: deprecated
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Larghezza Barra di Scorrimento"
+    *: "Larghezza Barra di Scorrimento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Larghezza Barra di Scorrimento"
+    *: "Larghezza Barra di Scorrimento"
   </voice>
 </phrase>
 <phrase>
@@ -10838,16 +10670,13 @@ desc: deprecated
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posizione Barra di Scorrimento"
+    *: "Posizione Barra di Scorrimento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posizione Barra di Scorrimento"
+    *: "Posizione Barra di Scorrimento"
   </voice>
 </phrase>
 <phrase>
@@ -10855,16 +10684,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressore"
+    *: "Compressore"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressore"
+    *: "Compressore"
   </voice>
 </phrase>
 <phrase>
@@ -10923,16 +10749,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Soglia"
+    *: "Soglia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soglia"
+    *: "Soglia"
   </voice>
 </phrase>
 <phrase>
@@ -10940,16 +10763,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Rapporto"
+    *: "Rapporto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rapporto"
+    *: "Rapporto"
   </voice>
 </phrase>
 <phrase>
@@ -10957,16 +10777,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 a 1"
+    *: "2 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -10974,16 +10791,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 a 1"
+    *: "4 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -10991,16 +10805,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 a 1"
+    *: "6 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11008,16 +10819,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 a 1"
+    *: "10 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -11025,16 +10833,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </voice>
 </phrase>
 <phrase>
@@ -11042,16 +10847,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Guadagno"
+    *: "Guadagno"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guadagno"
+    *: "Guadagno"
   </voice>
 </phrase>
 <phrase>
@@ -11059,16 +10861,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11076,16 +10875,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11093,16 +10889,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11110,16 +10903,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11127,16 +10917,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo Rilascio"
+    *: "Tempo Rilascio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo Rilascio"
+    *: "Tempo Rilascio"
   </voice>
 </phrase>
 <phrase>
@@ -11315,7 +11102,7 @@ desc: deprecated
   <dest>
     *: "di"
   </dest>
-		<voice>
+  <voice>
     *: "di"
   </voice>
 </phrase>
@@ -11324,16 +11111,13 @@ desc: deprecated
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin Base "
+    *: "Skin Base "
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin Base "
+    *: "Skin Base "
   </voice>
 </phrase>
 <phrase>
@@ -11341,16 +11125,13 @@ desc: deprecated
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin Base Per Telecomando"
+    *: "Skin Base Per Telecomando"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin Base Per Telecomando"
+    *: "Skin Base Per Telecomando"
   </voice>
 </phrase>
 <phrase>
@@ -11477,16 +11258,13 @@ desc: deprecated
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Riavvolgi Prima di Riprendere"
+    *: "Riavvolgi Prima di Riprendere"
   </dest>
   <voice>
-    *: none
-    swcodec: "Riavvolgi Prima di Riprendere"
+    *: "Riavvolgi Prima di Riprendere"
   </voice>
 </phrase>
 <phrase>
@@ -11878,7 +11656,7 @@ desc: deprecated
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12274,16 +12052,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Semplice (Meier)"
+    *: "Semplice (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Semplice"
+    *: "Semplice"
   </voice>
 </phrase>
 <phrase>
@@ -12291,16 +12066,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Personalizzato"
+    *: "Personalizzato"
   </dest>
   <voice>
-    *: none
-    swcodec: "Personalizzato"
+    *: "Personalizzato"
   </voice>
 </phrase>
 <phrase>
@@ -12329,7 +12101,7 @@ desc: deprecated
   </dest>
   <voice>
     *: "Seleziona le cartelle da esaminare"
-	</voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_FILTER_ROLL_OFF
@@ -12387,16 +12159,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SOLO LATERALE"
+    *: "SOLO LATERALE"
   </dest>
   <voice>
-    *: none
-    swcodec: "SOLO LATERALE"
+    *: "SOLO LATERALE"
   </voice>
 </phrase>
 <phrase>
@@ -12508,16 +12277,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Miglioramento Percettivo dei Bassi"
+    *: "Miglioramento Percettivo dei Bassi"
   </dest>
   <voice>
-    *: none
-    swcodec: "Miglioramento Percettivo dei Bassi"
+    *: "Miglioramento Percettivo dei Bassi"
   </voice>
 </phrase>
 <phrase>
@@ -12553,16 +12319,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Riduzione della Fatica Uditiva"
+    *: "Riduzione della Fatica Uditiva"
   </dest>
   <voice>
-    *: none
-    swcodec: "Riduzione della Fatica Uditiva"
+    *: "Riduzione della Fatica Uditiva"
   </voice>
 </phrase>
 <phrase>
@@ -12601,16 +12364,13 @@ desc: deprecated
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12618,16 +12378,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12742,16 +12499,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12773,16 +12527,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo d'attacco"
+    *: "Tempo d'attacco"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo d'attacco"
+    *: "Tempo d'attacco"
   </voice>
 </phrase>
 <phrase>
@@ -12804,16 +12555,13 @@ desc: deprecated
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12835,16 +12583,13 @@ desc: deprecated
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -12880,16 +12625,13 @@ desc: deprecated
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tempo della Presentazione"
+    *: "Tempo della Presentazione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tempo della Presentazione"
+    *: "Tempo della Presentazione"
   </voice>
 </phrase>
 <phrase>
@@ -12897,16 +12639,13 @@ desc: deprecated
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "lato re"
+    *: "lato re"
   </voice>
 </phrase>
 <phrase>
@@ -12928,16 +12667,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Regina"
+    *: "Regina"
   </voice>
 </phrase>
 <phrase>
@@ -12945,16 +12681,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dimensione Argh"
+    *: "Dimensione Argh"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dimensione Argh"
+    *: "Dimensione Argh"
   </voice>
 </phrase>
 <phrase>
@@ -12962,16 +12695,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scegli Altra Partita"
+    *: "Scegli Altra Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scegli Altra Partita"
+    *: "Scegli Altra Partita"
   </voice>
 </phrase>
 <phrase>
@@ -12979,16 +12709,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diretto"
+    *: "Diretto"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diretto"
+    *: "Diretto"
   </voice>
 </phrase>
 <phrase>
@@ -13024,16 +12751,13 @@ desc: deprecated
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Commuta Modalità Presentazione"
+    *: "Commuta Modalità Presentazione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Commuta Modalità Presentazione"
+    *: "Commuta Modalità Presentazione"
   </voice>
 </phrase>
 <phrase>
@@ -13055,16 +12779,13 @@ desc: deprecated
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusione"
+    *: "Diffusione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusione"
+    *: "Diffusione"
   </voice>
 </phrase>
 <phrase>
@@ -13072,16 +12793,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scacco matto!"
+    *: "Scacco matto!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scacco matto!"
+    *: "Scacco matto!"
   </voice>
 </phrase>
 <phrase>
@@ -13089,16 +12807,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nascondi titolo album"
+    *: "Nascondi titolo album"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nascondi titolo album"
+    *: "Nascondi titolo album"
   </voice>
 </phrase>
 <phrase>
@@ -13106,16 +12821,13 @@ desc: deprecated
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nessuna copertina trovata"
+    *: "Nessuna copertina trovata"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nessuna copertina trovata"
+    *: "Nessuna copertina trovata"
   </voice>
 </phrase>
 <phrase>
@@ -13137,19 +12849,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Avvio menu se non completato"
     lowmem: none
-    swcodec: "Avvio menu se non completato"
   </dest>
   <voice>
-    *: none
+    *: "Avvio menu se non completato"
     lowmem: none
-    swcodec: "Avvio menu se non completato"
   </voice>
 </phrase>
 <phrase>
@@ -13171,16 +12880,13 @@ desc: deprecated
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scala di grigi"
+    *: "Scala di grigi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scala di grigi"
+    *: "Scala di grigi"
   </voice>
 </phrase>
 <phrase>
@@ -13188,16 +12894,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -13233,19 +12936,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "Salta frames"
     lowmem: none
-    swcodec: "Salta frames"
   </dest>
   <voice>
-    *: none
+    *: "Salta frames"
     lowmem: none
-    swcodec: "Salta frames"
   </voice>
 </phrase>
 <phrase>
@@ -13270,19 +12970,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Modalità Riproduzione"
     lowmem: none
-    swcodec: "Modalità Riproduzione"
   </dest>
   <voice>
-    *: none
+    *: "Modalità Riproduzione"
     lowmem: none
-    swcodec: "Modalità Riproduzione"
   </voice>
 </phrase>
 <phrase>
@@ -13290,16 +12987,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 9: 1 mossa / 60 min"
+    *: "Livello 9: 1 mossa / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 9: 1 mossa ogni 60 minuti"
+    *: "Livello 9: 1 mossa ogni 60 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13307,16 +13001,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 8: 1 mossa / 15 min"
+    *: "Livello 8: 1 mossa / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 8: 1 mossa ogni 15 minuti"
+    *: "Livello 8: 1 mossa ogni 15 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13324,19 +13015,16 @@ desc: deprecated
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Non disponibile"
     lowmem: none
-    swcodec: "Non disponibile"
   </dest>
   <voice>
-    *: none
+    *: "Non disponibile"
     lowmem: none
-    swcodec: "Non disponibile"
   </voice>
 </phrase>
 <phrase>
@@ -13344,16 +13032,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Salva Partita"
+    *: "Salva Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Salva Partita"
+    *: "Salva Partita"
   </voice>
 </phrase>
 <phrase>
@@ -13361,19 +13046,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Limitare FPS"
     lowmem: none
-    swcodec: "Limitare FPS"
   </dest>
   <voice>
-    *: none
+    *: "Limitare FPS"
     lowmem: none
-    swcodec: "Limitare FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13409,19 +13091,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Usa impostazione comune"
     lowmem: none
-    swcodec: "Usa impostazione comune"
   </dest>
   <voice>
-    *: none
+    *: "Usa impostazione comune"
     lowmem: none
-    swcodec: "Usa impostazione comune"
   </voice>
 </phrase>
 <phrase>
@@ -13429,16 +13108,13 @@ desc: deprecated
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aggiunto alla playlist"
+    *: "Aggiunto alla playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aggiunto alla playlist"
+    *: "Aggiunto alla playlist"
   </voice>
 </phrase>
 <phrase>
@@ -13491,16 +13167,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ridimensiona Copertine"
+    *: "Ridimensiona Copertine"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ridimensiona Copertine"
+    *: "Ridimensiona Copertine"
   </voice>
 </phrase>
 <phrase>
@@ -13522,16 +13195,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Alfiere"
+    *: "Alfiere"
   </voice>
 </phrase>
 <phrase>
@@ -13539,19 +13209,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Separazzione Panning"
     lowmem: none
-    swcodec: "Separazzione Panning"
   </dest>
   <voice>
-    *: none
+    *: "Separazzione Panning"
     lowmem: none
-    swcodec: "Separazzione Panning"
   </voice>
 </phrase>
 <phrase>
@@ -13559,16 +13226,13 @@ desc: deprecated
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ordinato"
+    *: "Ordinato"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ordinato"
+    *: "Ordinato"
   </voice>
 </phrase>
 <phrase>
@@ -13590,16 +13254,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Cibo"
+    *: "Arghs Per Cibo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Cibo"
+    *: "Arghs Per Cibo"
   </voice>
 </phrase>
 <phrase>
@@ -13635,16 +13296,13 @@ desc: deprecated
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Alla fine della partita"
+    *: "Alla fine della partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Alla fine della partita"
+    *: "Alla fine della partita"
   </voice>
 </phrase>
 <phrase>
@@ -13652,16 +13310,13 @@ desc: deprecated
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Errore parsing partita!"
+    *: "Errore parsing partita!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Errore parsing partita!"
+    *: "Errore parsing partita!"
   </voice>
 </phrase>
 <phrase>
@@ -13683,16 +13338,13 @@ desc: deprecated
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "cattura"
+    *: "cattura"
   </voice>
 </phrase>
 <phrase>
@@ -13714,19 +13366,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Interpolazione"
     lowmem: none
-    swcodec: "Interpolazione"
   </dest>
   <voice>
-    *: none
+    *: "Interpolazione"
     lowmem: none
-    swcodec: "Interpolazione"
   </voice>
 </phrase>
 <phrase>
@@ -13734,16 +13383,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numero di diapositive"
+    *: "Numero di diapositive"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numero di diapositive"
+    *: "Numero di diapositive"
   </voice>
 </phrase>
 <phrase>
@@ -13765,19 +13411,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Riverbero"
     lowmem: none
-    swcodec: "Riverbero"
   </dest>
   <voice>
-    *: none
+    *: "Riverbero"
     lowmem: none
-    swcodec: "Riverbero"
   </voice>
 </phrase>
 <phrase>
@@ -13841,16 +13484,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bianco"
+    *: "Bianco"
   </voice>
 </phrase>
 <phrase>
@@ -13872,16 +13512,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Torre"
+    *: "Torre"
   </voice>
 </phrase>
 <phrase>
@@ -13889,16 +13526,13 @@ desc: deprecated
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scacco!"
+    *: "Scacco!"
   </voice>
 </phrase>
 <phrase>
@@ -13906,16 +13540,13 @@ desc: deprecated
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lettore"
+    *: "Lettore"
   </voice>
 </phrase>
 <phrase>
@@ -13923,19 +13554,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Cancella tutti i ripristini"
     lowmem: none
-    swcodec: "Cancella tutti i ripristini"
   </dest>
   <voice>
-    *: none
+    *: "Cancella tutti i ripristini"
     lowmem: none
-    swcodec: "Cancella tutti i ripristini"
   </voice>
 </phrase>
 <phrase>
@@ -13943,16 +13571,13 @@ desc: deprecated
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "La cache sarà ricostruita al prossimo riavvio"
+    *: "La cache sarà ricostruita al prossimo riavvio"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "La cache sarà ricostruita al prossimo riavvio"
+    *: "La cache sarà ricostruita al prossimo riavvio"
   </voice>
 </phrase>
 <phrase>
@@ -13960,16 +13585,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 2: 60 mosse / 15 min"
+    *: "Livello 2: 60 mosse / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 2: 60 mosse ogni 15 minuti"
+    *: "Livello 2: 60 mosse ogni 15 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13977,19 +13599,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "Imposta tempo di ripresa (min)"
     lowmem: none
-    swcodec: "Imposta tempo di ripresa (min)"
   </dest>
   <voice>
-    *: none
+    *: "Imposta tempo di ripresa (minuti)"
     lowmem: none
-    swcodec: "Imposta tempo di ripresa (minuti)"
   </voice>
 </phrase>
 <phrase>
@@ -13997,19 +13616,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </dest>
   <voice>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </voice>
 </phrase>
 <phrase>
@@ -14017,16 +13633,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ricostruire la cache"
+    *: "Ricostruire la cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ricostruire la cache"
+    *: "Ricostruire la cache"
   </voice>
 </phrase>
 <phrase>
@@ -14048,16 +13661,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostra in alto"
+    *: "Mostra in alto"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostra in alto"
+    *: "Mostra in alto"
   </voice>
 </phrase>
 <phrase>
@@ -14065,16 +13675,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Integrazione WPS"
+    *: "Integrazione WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Integrazione WPS"
+    *: "Integrazione WPS"
   </voice>
 </phrase>
 <phrase>
@@ -14082,16 +13689,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 5: 40 mosse / 60 min"
+    *: "Livello 5: 40 mosse / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 5: 40 mosse ogni 60 minuti"
+    *: "Livello 5: 40 mosse ogni 60 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14113,16 +13717,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Salva posizione"
+    *: "Salva posizione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Salva posizione"
+    *: "Salva posizione"
   </voice>
 </phrase>
 <phrase>
@@ -14144,19 +13745,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Luminosità schermo"
     lowmem: none
-    swcodec: "Luminosità schermo"
   </dest>
   <voice>
-    *: none
+    *: "Luminosità schermo"
     lowmem: none
-    swcodec: "Luminosità schermo"
   </voice>
 </phrase>
 <phrase>
@@ -14164,16 +13762,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nuova Partita"
+    *: "Nuova Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nuova Partita"
+    *: "Nuova Partita"
   </voice>
 </phrase>
 <phrase>
@@ -14195,19 +13790,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "Parametri Tonalità"
     lowmem: none
-    swcodec: "Parametri Tonalità"
   </dest>
   <voice>
-    *: none
+    *: "Parametri Tonalità"
     lowmem: none
-    swcodec: "Parametri Tonalità"
   </voice>
 </phrase>
 <phrase>
@@ -14232,16 +13824,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Crescita Verme per Cibo"
+    *: "Crescita Verme per Cibo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Crescita Verme per Cibo"
+    *: "Crescita Verme per Cibo"
   </voice>
 </phrase>
 <phrase>
@@ -14277,16 +13866,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Visualizza Partite Giocate"
+    *: "Visualizza Partite Giocate"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Visualizza Partite Giocate"
+    *: "Visualizza Partite Giocate"
   </voice>
 </phrase>
 <phrase>
@@ -14294,16 +13880,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 10: 1 mossa / 600 min"
+    *: "Livello 10: 1 mossa / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 10: 1 mossa ogni 600 minuti"
+    *: "Livello 10: 1 mossa ogni 600 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14311,16 +13894,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Giochi"
+    *: "Giochi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14328,16 +13908,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Margine centrale"
+    *: "Margine centrale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Margine centrale"
+    *: "Margine centrale"
   </voice>
 </phrase>
 <phrase>
@@ -14345,19 +13922,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "Boost CPU"
     lowmem: none
-    swcodec: "Boost CPU"
   </dest>
   <voice>
-    *: none
+    *: "Boost CPU"
     lowmem: none
-    swcodec: "Boost CPU"
   </voice>
 </phrase>
 <phrase>
@@ -14379,16 +13953,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numero di vermi"
+    *: "Numero di vermi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numero di vermi"
+    *: "Numero di vermi"
   </voice>
 </phrase>
 <phrase>
@@ -14410,19 +13981,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Riprendi automaticamente"
     lowmem: none
-    swcodec: "Riprendi automaticamente"
   </dest>
   <voice>
-    *: none
+    *: "Riprendi automaticamente"
     lowmem: none
-    swcodec: "Riprendi automaticamente"
   </voice>
 </phrase>
 <phrase>
@@ -14430,16 +13998,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spaziatura"
+    *: "Spaziatura"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spaziatura"
+    *: "Spaziatura"
   </voice>
 </phrase>
 <phrase>
@@ -14447,16 +14012,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostra in basso"
+    *: "Mostra in basso"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostra in basso"
+    *: "Mostra in basso"
   </voice>
 </phrase>
 <phrase>
@@ -14464,16 +14026,13 @@ desc: deprecated
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arrocco"
+    *: "Arrocco"
   </voice>
 </phrase>
 <phrase>
@@ -14495,16 +14054,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Velocità del verme"
+    *: "Velocità del verme"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Velocità del verme"
+    *: "Velocità del verme"
   </voice>
 </phrase>
 <phrase>
@@ -14512,16 +14068,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostra titolo album"
+    *: "Mostra titolo album"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostra titolo album"
+    *: "Mostra titolo album"
   </voice>
 </phrase>
 <phrase>
@@ -14529,16 +14082,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Elenco delle tracce"
+    *: "Via Elenco delle tracce"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Elenco delle tracce"
+    *: "Via Elenco delle tracce"
   </voice>
 </phrase>
 <phrase>
@@ -14588,16 +14138,13 @@ desc: deprecated
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Mostra FPS"
+    *: "Mostra FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap,swcodec: "Mostra FPS"
+    *: "Mostra FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14605,16 +14152,13 @@ desc: deprecated
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nessuna partita trovata!"
+    *: "Nessuna partita trovata!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nessuna partita trovata!"
+    *: "Nessuna partita trovata!"
   </voice>
 </phrase>
 <phrase>
@@ -14636,16 +14180,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 7: 40 mosse / 240 min"
+    *: "Livello 7: 40 mosse / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 7: 40 mosse ogni 240 minuti"
+    *: "Livello 7: 40 mosse ogni 240 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14723,16 +14264,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ripristina Partita"
+    *: "Ripristina Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ripristina Partita"
+    *: "Ripristina Partita"
   </voice>
 </phrase>
 <phrase>
@@ -14754,16 +14292,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dimensione Cibo"
+    *: "Dimensione Cibo"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dimensione Cibo"
+    *: "Dimensione Cibo"
   </voice>
 </phrase>
 <phrase>
@@ -14785,19 +14320,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Ripristina Impostazioni"
     lowmem: none
-    swcodec: "Ripristina Impostazioni"
   </dest>
   <voice>
-    *: none
+    *: "Ripristina Impostazioni"
     lowmem: none
-    swcodec: "Ripristina Impostazioni"
   </voice>
 </phrase>
 <phrase>
@@ -14805,16 +14337,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cavallo"
+    *: "Cavallo"
   </voice>
 </phrase>
 <phrase>
@@ -14822,16 +14351,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Riavvia Partita"
+    *: "Riavvia Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Riavvia Partita"
+    *: "Riavvia Partita"
   </voice>
 </phrase>
 <phrase>
@@ -14884,16 +14410,13 @@ desc: deprecated
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Sempre Acceso"
+    *: "Sempre Acceso"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Sempre Acceso"
+    *: "Sempre Acceso"
   </voice>
 </phrase>
 <phrase>
@@ -14918,16 +14441,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pedone"
+    *: "Pedone"
   </voice>
 </phrase>
 <phrase>
@@ -14949,16 +14469,13 @@ desc: deprecated
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scacchi GNU"
+    *: "Scacchi GNU"
   </voice>
 </phrase>
 <phrase>
@@ -14966,16 +14483,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 3: 60 mosse / 30 min"
+    *: "Livello 3: 60 mosse / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 3: 60 mosse ogni 30 minuti"
+    *: "Livello 3: 60 mosse ogni 30 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14983,19 +14497,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Utilizzare l'impostazione del suono"
     lowmem: none
-    swcodec: "Utilizzare l'impostazione del suono"
   </dest>
   <voice>
-    *: none
+    *: "Utilizzare l'impostazione del suono"
     lowmem: none
-    swcodec: "Utilizzare l'impostazione del suono"
   </voice>
 </phrase>
 <phrase>
@@ -15017,16 +14528,13 @@ desc: deprecated
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist Svuotata"
+    *: "Playlist Svuotata"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist Svuotata"
+    *: "Playlist Svuotata"
   </voice>
 </phrase>
 <phrase>
@@ -15051,16 +14559,13 @@ desc: deprecated
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "All'inizio della partita"
+    *: "All'inizio della partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "All'inizio della partita"
+    *: "All'inizio della partita"
   </voice>
 </phrase>
 <phrase>
@@ -15068,19 +14573,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Opzioni Audio"
     lowmem: none
-    swcodec: "Opzioni Audio"
   </dest>
   <voice>
-    *: none
+    *: "Opzioni Audio"
     lowmem: none
-    swcodec: "Opzioni Audio"
   </voice>
 </phrase>
 <phrase>
@@ -15088,19 +14590,16 @@ desc: deprecated
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Riproduci dall'inizio"
     lowmem: none
-    swcodec: "Riproduci dall'inizio"
   </dest>
   <voice>
-    *: none
+    *: "Riproduci dall'inizio"
     lowmem: none
-    swcodec: "Riproduci dall'inizio"
   </voice>
 </phrase>
 <phrase>
@@ -15122,16 +14621,13 @@ desc: deprecated
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Errore durante scrittura configurazione"
+    *: "Errore durante scrittura configurazione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Errore durante la scrittura della configurazione"
+    *: "Errore durante la scrittura della configurazione"
   </voice>
 </phrase>
 <phrase>
@@ -15153,16 +14649,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 6: 40 mosse / 120 min"
+    *: "Livello 6: 40 mosse / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 6: 40 mosse ogni 120 minuti"
+    *: "Livello 6: 40 mosse ogni 120 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -15184,16 +14677,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Caricamento posizione"
+    *: "Caricamento posizione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Caricamento posizione"
+    *: "Caricamento posizione"
   </voice>
 </phrase>
 <phrase>
@@ -15232,19 +14722,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Menu di avvio"
     lowmem: none
-    swcodec: "Menu di avvio"
   </dest>
   <voice>
-    *: none
+    *: "Menu di avvio"
     lowmem: none
-    swcodec: "Menu di avvio"
   </voice>
 </phrase>
 <phrase>
@@ -15252,19 +14739,16 @@ desc: deprecated
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Singolo"
     lowmem: none
-    swcodec: "Singolo"
   </dest>
   <voice>
-    *: none
+    *: "Singolo"
     lowmem: none
-    swcodec: "Singolo"
   </voice>
 </phrase>
 <phrase>
@@ -15272,16 +14756,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 1: 60 mosse / 5 min"
+    *: "Livello 1: 60 mosse / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 1: 60 mosse ogni 5 minuti"
+    *: "Livello 1: 60 mosse ogni 5 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -15331,16 +14812,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Contrassegnato"
+    *: "Contrassegnato"
   </voice>
 </phrase>
 <phrase>
@@ -15376,16 +14854,13 @@ desc: deprecated
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Riprendere la  Partita"
+    *: "Riprendere la  Partita"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Riprendere la Partita"
+    *: "Riprendere la Partita"
   </voice>
 </phrase>
 <phrase>
@@ -15393,16 +14868,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nero"
+    *: "Nero"
   </voice>
 </phrase>
 <phrase>
@@ -15410,16 +14882,13 @@ desc: deprecated
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Livello 4: 40 mosse / 30 min"
+    *: "Livello 4: 40 mosse / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Livello 4: 40 mosse ogni 30 minuti"
+    *: "Livello 4: 40 mosse ogni 30 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -15441,16 +14910,13 @@ desc: deprecated
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vai al WPS"
+    *: "Vai al WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vai al WPS"
+    *: "Vai al WPS"
   </voice>
 </phrase>
 <phrase>
@@ -15458,16 +14924,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rifletto..."
+    *: "Rifletto..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15489,16 +14952,13 @@ desc: deprecated
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Impossibile riavviare la riproduzione"
+    *: "Impossibile riavviare la riproduzione"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Impossibile riavviare la riproduzione"
+    *: "Impossibile riavviare la riproduzione"
   </voice>
 </phrase>
 <phrase>
@@ -15520,16 +14980,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Re"
+    *: "Re"
   </voice>
 </phrase>
 <phrase>
@@ -15537,16 +14994,13 @@ desc: deprecated
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Non contrassegnato"
+    *: "Non contrassegnato"
   </voice>
 </phrase>
 <phrase>
@@ -15554,16 +15008,13 @@ desc: deprecated
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "lato regina"
+    *: "lato regina"
   </voice>
 </phrase>
 <phrase>
@@ -15571,16 +15022,13 @@ desc: deprecated
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mossa non autorizzata!"
+    *: "Mossa non autorizzata!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mossa non autorizzata!"
+    *: "Mossa non autorizzata!"
   </voice>
 </phrase>
 <phrase>
@@ -15588,16 +15036,13 @@ desc: deprecated
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gioca a Wormlet!"
+    *: "Gioca a Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gioca a Wormlet!"
+    *: "Gioca a Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -15633,16 +15078,13 @@ desc: deprecated
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Svuota playlist"
+    *: "Svuota playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Svuota playlist"
+    *: "Svuota playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15692,16 +15134,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrare l'album e l'artista all'inizio"
+    *: "Mostrare l'album e l'artista all'inizio"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrare l'album e l'artista all'inizio"
+    *: "Mostrare l'album e l'artista all'inizio"
   </voice>
 </phrase>
 <phrase>
@@ -15709,16 +15148,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nascondere le informazioni"
+    *: "Nascondere le informazioni"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nascondere le informazioni"
+    *: "Nascondere le informazioni"
   </voice>
 </phrase>
 <phrase>
@@ -15726,16 +15162,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrare l'album all'inizio"
+    *: "Mostrare l'album all'inizio"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrare l'album all'inizio"
+    *: "Mostrare l'album all'inizio"
   </voice>
 </phrase>
 <phrase>
@@ -15743,16 +15176,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrare l'album alla fine"
+    *: "Mostrare l'album alla fine"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrare l'album alla fine"
+    *: "Mostrare l'album alla fine"
   </voice>
 </phrase>
 <phrase>
@@ -15760,16 +15190,13 @@ desc: deprecated
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrare l'album e l'artista alla fine"
+    *: "Mostrare l'album e l'artista alla fine"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrare l'album e l'artista alla fine"
+    *: "Mostrare l'album e l'artista alla fine"
   </voice>
 </phrase>
 <phrase>
@@ -16032,19 +15459,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "Mixer HQ"
     lowmem: none
-    swcodec: "Mixer HQ"
   </dest>
   <voice>
-    *: none
+    *: "Mixer Alta Qualità"
     lowmem: none
-    swcodec: "Mixer Alta Qualità"
   </voice>
 </phrase>
 <phrase>
@@ -16052,19 +15476,16 @@ desc: deprecated
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </dest>
   <voice>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 723d4db175..7713f121fd 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -252,23 +252,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = はい"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU または top-right = はい"
+    creativezen*: "Select = はい"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = はい"
     iriverh100,iriverh120,iriverh300: "NAVI = はい"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = はい"
     mrobe500: "PLAY または POWER, top-right = はい"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = はい"
-    creativezen*: "Select = はい"
   </dest>
   <voice>
     *: ""
@@ -823,16 +823,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "クロスフィード"
+    *: "クロスフィード"
   </dest>
   <voice>
-    *: none
-    swcodec: "クロスフィード"
+    *: "クロスフィード"
   </voice>
 </phrase>
 <phrase>
@@ -840,16 +837,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "ダイレクトゲイン"
+    *: "ダイレクトゲイン"
   </dest>
   <voice>
-    *: none
-    swcodec: "ダイレクトゲイン"
+    *: "ダイレクトゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -857,16 +851,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "クロスゲイン"
+    *: "クロスゲイン"
   </dest>
   <voice>
-    *: none
-    swcodec: "クロスゲイン"
+    *: "クロスゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -874,16 +865,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "高周波アッテネーション"
+    *: "高周波アッテネーション"
   </dest>
   <voice>
-    *: none
-    swcodec: "高周波アッテネーション"
+    *: "高周波アッテネーション"
   </voice>
 </phrase>
 <phrase>
@@ -891,16 +879,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "高周波カットオフ"
+    *: "高周波カットオフ"
   </dest>
   <voice>
-    *: none
-    swcodec: "高周波カットオフ"
+    *: "高周波カットオフ"
   </voice>
 </phrase>
 <phrase>
@@ -908,16 +893,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "イコライザ"
+    *: "イコライザ"
   </dest>
   <voice>
-    *: none
-    swcodec: "イコライザ"
+    *: "イコライザ"
   </voice>
 </phrase>
 <phrase>
@@ -925,16 +907,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "イコライザの有効化"
+    *: "イコライザの有効化"
   </dest>
   <voice>
-    *: none
-    swcodec: "イコライザの有効化"
+    *: "イコライザの有効化"
   </voice>
 </phrase>
 <phrase>
@@ -942,16 +921,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "グラフィックEQ"
+    *: "グラフィックEQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "グラフィックイコライザ"
+    *: "グラフィックイコライザ"
   </voice>
 </phrase>
 <phrase>
@@ -959,16 +935,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "プレカット"
+    *: "プレカット"
   </dest>
   <voice>
-    *: none
-    swcodec: "プレカット"
+    *: "プレカット"
   </voice>
 </phrase>
 <phrase>
@@ -976,16 +949,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "簡易EQ設定"
+    *: "簡易EQ設定"
   </dest>
   <voice>
-    *: none
-    swcodec: "簡易イコライザ設定"
+    *: "簡易イコライザ設定"
   </voice>
 </phrase>
 <phrase>
@@ -993,16 +963,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "詳細EQ設定"
+    *: "詳細EQ設定"
   </dest>
   <voice>
-    *: none
-    swcodec: "詳細イコライザ設定"
+    *: "詳細イコライザ設定"
   </voice>
 </phrase>
 <phrase>
@@ -1010,16 +977,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQプリセットの保存"
+    *: "EQプリセットの保存"
   </dest>
   <voice>
-    *: none
-    swcodec: "イコライザプリセットの保存"
+    *: "イコライザプリセットの保存"
   </voice>
 </phrase>
 <phrase>
@@ -1027,16 +991,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "EQプリセットの参照"
+    *: "EQプリセットの参照"
   </dest>
   <voice>
-    *: none
-    swcodec: "イコライザプリセットの参照"
+    *: "イコライザプリセットの参照"
   </voice>
 </phrase>
 <phrase>
@@ -1044,16 +1005,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "調整項目: %s"
+    *: "調整項目: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1061,16 +1019,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz帯 ゲイン"
+    *: "%d Hz帯 ゲイン"
   </dest>
   <voice>
-    *: none
-    swcodec: "ヘルツたい ゲイン"
+    *: "ヘルツたい ゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -1078,16 +1033,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "ローブースト・フィルタ"
+    *: "ローブースト・フィルタ"
   </dest>
   <voice>
-    *: none
-    swcodec: "ローブースト・フィルタ"
+    *: "ローブースト・フィルタ"
   </voice>
 </phrase>
 <phrase>
@@ -1095,16 +1047,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "ピーク・フィルタ %d"
+    *: "ピーク・フィルタ %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "ピーク・フィルタ"
+    *: "ピーク・フィルタ"
   </voice>
 </phrase>
 <phrase>
@@ -1112,16 +1061,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "ハイブースト・フィルタ"
+    *: "ハイブースト・フィルタ"
   </dest>
   <voice>
-    *: none
-    swcodec: "ハイブースト・フィルタ"
+    *: "ハイブースト・フィルタ"
   </voice>
 </phrase>
 <phrase>
@@ -1129,16 +1075,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "カットオフ周波数"
+    *: "カットオフ周波数"
   </dest>
   <voice>
-    *: none
-    swcodec: "カットオフ周波数"
+    *: "カットオフ周波数"
   </voice>
 </phrase>
 <phrase>
@@ -1146,16 +1089,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "中心周波数"
+    *: "中心周波数"
   </dest>
   <voice>
-    *: none
-    swcodec: "中心周波数"
+    *: "中心周波数"
   </voice>
 </phrase>
 <phrase>
@@ -1163,16 +1103,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q値"
+    *: "Q値"
   </dest>
   <voice>
-    *: none
-    swcodec: "きゅーち"
+    *: "きゅーち"
   </voice>
 </phrase>
 <phrase>
@@ -1180,16 +1117,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "ディザリング"
+    *: "ディザリング"
   </dest>
   <voice>
-    *: none
-    swcodec: "ディザリング"
+    *: "ディザリング"
   </voice>
 </phrase>
 <phrase>
@@ -1733,16 +1667,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "クリッピング防止"
+    *: "クリッピング防止"
   </dest>
   <voice>
-    *: none
-    swcodec: "クリッピング防止"
+    *: "クリッピング防止"
   </voice>
 </phrase>
 <phrase>
@@ -1820,16 +1751,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "スキップ時のビープ音量"
+    *: "スキップ時のビープ音量"
   </dest>
   <voice>
-    *: none
-    swcodec: "スキップ時のビープ音量"
+    *: "スキップ時のビープ音量"
   </voice>
 </phrase>
 <phrase>
@@ -1837,16 +1765,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "弱"
+    *: "弱"
   </dest>
   <voice>
-    *: none
-    swcodec: "弱"
+    *: "弱"
   </voice>
 </phrase>
 <phrase>
@@ -1854,16 +1779,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "中"
+    *: "中"
   </dest>
   <voice>
-    *: none
-    swcodec: "中"
+    *: "中"
   </voice>
 </phrase>
 <phrase>
@@ -1871,16 +1793,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "強"
+    *: "強"
   </dest>
   <voice>
-    *: none
-    swcodec: "強"
+    *: "強"
   </voice>
 </phrase>
 <phrase>
@@ -2237,21 +2156,20 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "データベース構築中... %d 件 (OFFで戻る)"
-    iriverh100,iriverh120,iriverh300: "データベース構築中... %d 件 (STOPで戻る)"
-    ipod*: "データベース構築中... %d 件 (PLAY/PAUSEで戻る)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "データベース構築中... %d 件 (左で戻る)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "データベース構築中... %d 件 (PREVで戻る)"
-    gogearsa9200: "データベース構築中... %d 件 (REWで戻る)"
     archosplayer: "DB構築中... %d 件"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "データベース構築中... %d 件 (左で戻る)"
+    gogearsa9200: "データベース構築中... %d 件 (REWで戻る)"
+    ipod*: "データベース構築中... %d 件 (PLAY/PAUSEで戻る)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "データベース構築中... %d 件 (PREVで戻る)"
+    iriverh100,iriverh120,iriverh300: "データベース構築中... %d 件 (STOPで戻る)"
   </dest>
   <voice>
     *: "データベースに登録"
@@ -2433,16 +2351,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "フォント"
+    *: "フォント"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "フォント"
+    *: "フォント"
   </voice>
 </phrase>
 <phrase>
@@ -2704,16 +2619,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "画面の上下反転"
+    *: "画面の上下反転"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "画面の上下反転"
+    *: "画面の上下反転"
   </voice>
 </phrase>
 <phrase>
@@ -2721,16 +2633,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "選択アイテムの表示方法"
+    *: "選択アイテムの表示方法"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "選択アイテムの表示方法"
+    *: "選択アイテムの表示方法"
   </voice>
 </phrase>
 <phrase>
@@ -2738,16 +2647,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ポインタ表示"
+    *: "ポインタ表示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ポインタ表示"
+    *: "ポインタ表示"
   </voice>
 </phrase>
 <phrase>
@@ -2755,16 +2661,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "バー (反転)"
+    *: "バー (反転)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "バー 反転"
+    *: "バー 反転"
   </voice>
 </phrase>
 <phrase>
@@ -3054,16 +2957,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "画面範囲外スクロール"
+    *: "画面範囲外スクロール"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "画面範囲外スクロール"
+    *: "画面範囲外スクロール"
   </voice>
 </phrase>
 <phrase>
@@ -3071,16 +2971,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "スクロールのステップ"
+    *: "スクロールのステップ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "スクロールのステップ"
+    *: "スクロールのステップ"
   </voice>
 </phrase>
 <phrase>
@@ -3136,16 +3033,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ステータス/スクロールバー"
+    *: "ステータス/スクロールバー"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ステータスバー スクロールバー"
+    *: "ステータスバー スクロールバー"
   </voice>
 </phrase>
 <phrase>
@@ -3153,16 +3047,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "スクロールバー"
+    *: "スクロールバー"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "スクロールバー"
+    *: "スクロールバー"
   </voice>
 </phrase>
 <phrase>
@@ -3170,16 +3061,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ステータスバー"
+    *: "ステータスバー"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ステータスバー"
+    *: "ステータスバー"
   </voice>
 </phrase>
 <phrase>
@@ -3204,16 +3092,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "音量表示"
+    *: "音量表示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "音量表示"
+    *: "音量表示"
   </voice>
 </phrase>
 <phrase>
@@ -3221,16 +3106,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "バッテリー表示"
+    *: "バッテリー表示"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "バッテリー表示"
+    *: "バッテリー表示"
   </voice>
 </phrase>
 <phrase>
@@ -3238,16 +3120,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "グラフ"
+    *: "グラフ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "グラフ"
+    *: "グラフ"
   </voice>
 </phrase>
 <phrase>
@@ -3255,16 +3134,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "数値"
+    *: "数値"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "数値"
+    *: "数値"
   </voice>
 </phrase>
 <phrase>
@@ -3484,16 +3360,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ヘブライ語 (ISO-8859-8)"
+    *: "ヘブライ語 (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ヘブライ語"
+    *: "ヘブライ語"
   </voice>
 </phrase>
 <phrase>
@@ -3515,16 +3388,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "タイ語 (ISO-8859-11)"
+    *: "タイ語 (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "タイ語"
+    *: "タイ語"
   </voice>
 </phrase>
 <phrase>
@@ -3532,16 +3402,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "アラビア語 (CP1256)"
+    *: "アラビア語 (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "アラビア語"
+    *: "アラビア語"
   </voice>
 </phrase>
 <phrase>
@@ -3577,16 +3444,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "日本語 (SJIS)"
+    *: "日本語 (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "日本語"
+    *: "日本語"
   </voice>
 </phrase>
 <phrase>
@@ -3594,16 +3458,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "簡体字中国語 (GB2312)"
+    *: "簡体字中国語 (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "簡体字中国語"
+    *: "簡体字中国語"
   </voice>
 </phrase>
 <phrase>
@@ -3611,16 +3472,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "韓国語 (KSX1001)"
+    *: "韓国語 (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "韓国語"
+    *: "韓国語"
   </voice>
 </phrase>
 <phrase>
@@ -3628,16 +3486,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "繁体字中国語 (BIG5)"
+    *: "繁体字中国語 (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "繁体字中国語"
+    *: "繁体字中国語"
   </voice>
 </phrase>
 <phrase>
@@ -3661,17 +3516,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
+    sansae200*,sansafuze*: "ホイールライトのタイムアウト"
   </dest>
   <voice>
     *: none
     button_light: "ボタンライトのタイムアウト"
-    sansafuze*,sansae200*: "ホイールライトのタイムアウト"
+    sansae200*,sansafuze*: "ホイールライトのタイムアウト"
   </voice>
 </phrase>
 <phrase>
@@ -3942,27 +3797,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = 設定"
-    mrobe500: "HEART = 設定"
-    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = 設定"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = 設定"
     gogearsa9200,samsungyh*: "PLAY = 設定"
-    vibe500: "OK = 設定"
+    iriverh100,iriverh120,iriverh300: "NAVI = 設定"
     mpiohd300: "ENTER = 設定"
+    mrobe500: "HEART = 設定"
+    rtc: "ON = 設定"
+    vibe500: "OK = 設定"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3971,39 +3826,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = 元に戻す"
-    mrobe500: "POWER = 元に戻す"
-    iriverh100,iriverh120,iriverh300: "STOP = 元に戻す"
-    ipod*,sansac200*,mpiohd300: "MENU = 元に戻す"
-    iaudiox5,iaudiom5: "RECORD = 元に戻す"
+    gigabeatfx,mrobe500: "POWER = 元に戻す"
+    gigabeats,sansafuzeplus: "BACK = 元に戻す"
+    gogearsa9200: "LEFT = 元に戻す"
+    iaudiom5,iaudiox5: "RECORD = 元に戻す"
+    ipod*,mpiohd300,sansac200*: "MENU = 元に戻す"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 元に戻す"
-    gigabeatfx: "POWER = 元に戻す"
-    sansafuzeplus: "BACK = 元に戻す"
+    iriverh100,iriverh120,iriverh300: "STOP = 元に戻す"
     mrobe100: "DISPLAY = 元に戻す"
-    gigabeats: "BACK = 元に戻す"
-    gogearsa9200: "LEFT = 元に戻す"
-    vibe500: "CANCEL = 元に戻す"
+    rtc: "OFF = 元に戻す"
     samsungyh*: "REW = 元に戻す"
+    vibe500: "CANCEL = 元に戻す"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4489,22 +4340,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=設定 OFF=取り消し"
+    gigabeats: "SELECT=設定 POWER=取り消し"
     ipod*: "SELECT=設定 MENU=取り消し"
     iriverh10,iriverh10_5gb: "SELECT=設定 PREV=取り消し"
-    gigabeats: "SELECT=設定 POWER=取り消し"
-    vibe500: "OK=設定 C=取り消し"
     mpiohd300: "ENTER=設定 MENU=取り消し"
     sansafuzeplus: "SELECT=設定  BACK=取り消し"
+    vibe500: "OK=設定 C=取り消し"
   </dest>
   <voice>
     *: none
@@ -5609,15 +5460,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "周波数"
+    play_frequency,recording: "周波数"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "周波数"
+    play_frequency,recording: "周波数"
   </voice>
 </phrase>
 <phrase>
@@ -5660,18 +5511,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "マイク"
     iriverh100,iriverh120,iriverh300: "内蔵のマイク"
+    recording: "マイク"
   </dest>
   <voice>
     *: none
-    recording: "マイク"
     iriverh100,iriverh120,iriverh300: "内蔵のマイク"
+    recording: "マイク"
   </voice>
 </phrase>
 <phrase>
@@ -6549,13 +6400,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "バッテリー: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "バッテリー容量"
@@ -6612,24 +6463,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "マルチメディアカード"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "マイクロSD"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "マイクロSD"
     xduoox3: "マイクロSD2"
-    archosondio*: "マルチメディアカード"
   </voice>
 </phrase>
 <phrase>
@@ -7944,23 +7795,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "ディスクが一杯です. OFFボタンを押してください"
-    iriverh100,iriverh120,iriverh300: "ディスクが一杯です. STOPボタンを押してください"
     iaudiom5,iaudiox5: "ディスクが一杯です. POWERボタンを押してください"
-    sansae200*,sansac200*,vibe500: "ディスクが一杯です. PREVボタンを押してください"
+    iriverh100,iriverh120,iriverh300: "ディスクが一杯です. STOPボタンを押してください"
+    recording: "ディスクが一杯です. OFFボタンを押してください"
     samsungyh*: "ディスクが一杯です. LEFTボタンを押してください"
+    sansac200*,sansae200*,vibe500: "ディスクが一杯です. PREVボタンを押してください"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8048,23 +7899,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF: 取り消し"
-    iriverh100,iriverh120,iriverh300: "STOP: 取り消し"
-    ipod*: "PLAY/PAUSE: 取り消し"
-    iaudiox5,iaudiom5: "Long PLAY: 取り消し"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV: 取り消し"
-    gigabeats: "BACK: 取り消し"
     gigabeatfx: "POWER: 取り消し"
-    sansafuzeplus: "BACK: 取り消し"
+    gigabeats,sansafuzeplus: "BACK: 取り消し"
+    iaudiom5,iaudiox5: "Long PLAY: 取り消し"
+    ipod*: "PLAY/PAUSE: 取り消し"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV: 取り消し"
+    iriverh100,iriverh120,iriverh300: "STOP: 取り消し"
   </dest>
   <voice>
     *: ""
@@ -9616,7 +9465,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "キューシート"
@@ -9658,16 +9507,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "調整項目: %s %s"
+    *: "調整項目: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9675,16 +9521,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "カットオフ周波数"
+    *: "カットオフ周波数"
   </dest>
   <voice>
-    *: none
-    swcodec: "カットオフ周波数"
+    *: "カットオフ周波数"
   </voice>
 </phrase>
 <phrase>
@@ -9692,16 +9535,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "ゲイン"
+    *: "ゲイン"
   </dest>
   <voice>
-    *: none
-    swcodec: "ゲイン"
+    *: "ゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -9709,16 +9549,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "項目:"
+    *: "項目:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10347,7 +10184,7 @@
     multivolume: "なし"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10381,15 +10218,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "低音域カットオフ"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "低音域カットオフ"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "低音域カットオフ"
   </voice>
 </phrase>
 <phrase>
@@ -10398,15 +10235,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "高音域カットオフ"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "高音域カットオフ"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "高音域カットオフ"
   </voice>
 </phrase>
 <phrase>
@@ -10442,16 +10279,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "クリッカー"
+    *: "クリッカー"
   </dest>
   <voice>
-    *: none
-    swcodec: "クリッカー"
+    *: "クリッカー"
   </voice>
 </phrase>
 <phrase>
@@ -10459,16 +10293,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "クリッカーのリピート"
+    *: "クリッカーのリピート"
   </dest>
   <voice>
-    *: none
-    swcodec: "クリッカーのリピート"
+    *: "クリッカーのリピート"
   </voice>
 </phrase>
 <phrase>
@@ -10589,11 +10420,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "シリアル通信のビットレート"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "シリアル通信のビットレート"
   </voice>
@@ -10606,11 +10437,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "自動"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "自動"
   </voice>
@@ -10623,11 +10454,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10640,11 +10471,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10657,11 +10488,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10674,11 +10505,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11201,16 +11032,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "タイムストレッチ"
+    *: "タイムストレッチ"
   </dest>
   <voice>
-    *: none
-    swcodec: "タイムストレッチ"
+    *: "タイムストレッチ"
   </voice>
 </phrase>
 <phrase>
@@ -11218,16 +11046,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "スピード"
+    *: "スピード"
   </dest>
   <voice>
-    *: none
-    swcodec: "スピード"
+    *: "スピード"
   </voice>
 </phrase>
 <phrase>
@@ -11328,7 +11153,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11481,16 +11306,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "スクロールバーの幅"
+    *: "スクロールバーの幅"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "スクロールバーの幅"
+    *: "スクロールバーの幅"
   </voice>
 </phrase>
 <phrase>
@@ -11498,16 +11320,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "スクロールバーの位置"
+    *: "スクロールバーの位置"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "スクロールバーの位置"
+    *: "スクロールバーの位置"
   </voice>
 </phrase>
 <phrase>
@@ -11515,16 +11334,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "コンプレッサ"
+    *: "コンプレッサ"
   </dest>
   <voice>
-    *: none
-    swcodec: "コンプレッサ"
+    *: "コンプレッサ"
   </voice>
 </phrase>
 <phrase>
@@ -11583,16 +11399,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "しきい値"
+    *: "しきい値"
   </dest>
   <voice>
-    *: none
-    swcodec: "しきい値"
+    *: "しきい値"
   </voice>
 </phrase>
 <phrase>
@@ -11600,16 +11413,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "圧縮率"
+    *: "圧縮率"
   </dest>
   <voice>
-    *: none
-    swcodec: "圧縮率"
+    *: "圧縮率"
   </voice>
 </phrase>
 <phrase>
@@ -11617,16 +11427,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 対 1"
+    *: "2 対 1"
   </voice>
 </phrase>
 <phrase>
@@ -11634,16 +11441,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 対 1"
+    *: "4 対 1"
   </voice>
 </phrase>
 <phrase>
@@ -11651,16 +11455,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 対 1"
+    *: "6 対 1"
   </voice>
 </phrase>
 <phrase>
@@ -11668,16 +11469,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 対 1"
+    *: "10 対 1"
   </voice>
 </phrase>
 <phrase>
@@ -11685,16 +11483,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "リミット"
+    *: "リミット"
   </dest>
   <voice>
-    *: none
-    swcodec: "リミット"
+    *: "リミット"
   </voice>
 </phrase>
 <phrase>
@@ -11702,16 +11497,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "ゲインの構成"
+    *: "ゲインの構成"
   </dest>
   <voice>
-    *: none
-    swcodec: "ゲインの構成"
+    *: "ゲインの構成"
   </voice>
 </phrase>
 <phrase>
@@ -11719,16 +11511,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "自動"
+    *: "自動"
   </dest>
   <voice>
-    *: none
-    swcodec: "自動"
+    *: "自動"
   </voice>
 </phrase>
 <phrase>
@@ -11736,16 +11525,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ニー"
+    *: "ニー"
   </dest>
   <voice>
-    *: none
-    swcodec: "ニー"
+    *: "ニー"
   </voice>
 </phrase>
 <phrase>
@@ -11753,16 +11539,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ハード・ニー"
+    *: "ハード・ニー"
   </dest>
   <voice>
-    *: none
-    swcodec: "ハード ニー"
+    *: "ハード ニー"
   </voice>
 </phrase>
 <phrase>
@@ -11770,16 +11553,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ソフト・ニー"
+    *: "ソフト・ニー"
   </dest>
   <voice>
-    *: none
-    swcodec: "ソフト・ニー"
+    *: "ソフト・ニー"
   </voice>
 </phrase>
 <phrase>
@@ -11787,16 +11567,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "リリースタイム"
+    *: "リリースタイム"
   </dest>
   <voice>
-    *: none
-    swcodec: "リリースタイム"
+    *: "リリースタイム"
   </voice>
 </phrase>
 <phrase>
@@ -11984,16 +11761,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "基本スキン"
+    *: "基本スキン"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "基本スキン"
+    *: "基本スキン"
   </voice>
 </phrase>
 <phrase>
@@ -12001,16 +11775,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "リモコンの基本スキン"
+    *: "リモコンの基本スキン"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "リモコンの基本スキン"
+    *: "リモコンの基本スキン"
   </voice>
 </phrase>
 <phrase>
@@ -12137,16 +11908,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "レジューム時の巻き戻し時間"
+    *: "レジューム時の巻き戻し時間"
   </dest>
   <voice>
-    *: none
-    swcodec: "レジューム時の巻き戻し時間"
+    *: "レジューム時の巻き戻し時間"
   </voice>
 </phrase>
 <phrase>
@@ -12521,7 +12289,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12799,16 +12567,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "アタック・タイム"
+    *: "アタック・タイム"
   </dest>
   <voice>
-    *: none
-    swcodec: "アタック・タイム"
+    *: "アタック・タイム"
   </voice>
 </phrase>
 <phrase>
@@ -12830,16 +12595,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12847,16 +12609,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "パーペプチュアル低音増強"
+    *: "パーペプチュアル低音増強"
   </dest>
   <voice>
-    *: none
-    swcodec: "パーペプチュアル低音増強"
+    *: "パーペプチュアル低音増強"
   </voice>
 </phrase>
 <phrase>
@@ -12878,16 +12637,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "カスタム"
+    *: "カスタム"
   </dest>
   <voice>
-    *: none
-    swcodec: "カスタム"
+    *: "カスタム"
   </voice>
 </phrase>
 <phrase>
@@ -12941,18 +12697,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "充電のみ"
-    ibassodx90: "充電のみ"
+    ibassodx50,ibassodx90: "充電のみ"
   </dest>
   <voice>
     *: none
-    ibassodx50: "充電のみ"
-    ibassodx90: "充電のみ"
+    ibassodx50,ibassodx90: "充電のみ"
   </voice>
 </phrase>
 <phrase>
@@ -12961,18 +12714,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USBモード"
-    ibassodx90: "USBモード"
+    ibassodx50,ibassodx90: "USBモード"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USBモード"
-    ibassodx90: "USBモード"
+    ibassodx50,ibassodx90: "USBモード"
   </voice>
 </phrase>
 <phrase>
@@ -13039,16 +12789,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "シンプル（メイヤー）"
+    *: "シンプル（メイヤー）"
   </dest>
   <voice>
-    *: none
-    swcodec: "シンプル"
+    *: "シンプル"
   </voice>
 </phrase>
 <phrase>
@@ -13056,16 +12803,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13088,18 +12832,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "マス・ストレージ"
-    ibassodx90: "マス・ストレージ"
+    ibassodx50,ibassodx90: "マス・ストレージ"
   </dest>
   <voice>
     *: none
-    ibassodx50: "マス・ストレージ"
-    ibassodx90: "マス・ストレージ"
+    ibassodx50,ibassodx90: "マス・ストレージ"
   </voice>
 </phrase>
 <phrase>
@@ -13107,16 +12848,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "ドライ／ウエット ミックス"
+    *: "ドライ／ウエット ミックス"
   </dest>
   <voice>
-    *: none
-    swcodec: "ドライ／ウエット ミックス"
+    *: "ドライ／ウエット ミックス"
   </voice>
 </phrase>
 <phrase>
@@ -13141,16 +12879,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13158,16 +12893,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "聴覚疲労低減"
+    *: "聴覚疲労低減"
   </dest>
   <voice>
-    *: none
-    swcodec: "聴覚疲労低減"
+    *: "聴覚疲労低減"
   </voice>
 </phrase>
 <phrase>
@@ -13189,16 +12921,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "ハース・サラウンド"
+    *: "ハース・サラウンド"
   </dest>
   <voice>
-    *: none
-    swcodec: "ハース・サラウンド"
+    *: "ハース・サラウンド"
   </voice>
 </phrase>
 <phrase>
@@ -13252,18 +12981,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13285,16 +13011,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "サイドのみ"
+    *: "サイドのみ"
   </dest>
   <voice>
-    *: none
-    swcodec: "サイドのみ"
+    *: "サイドのみ"
   </voice>
 </phrase>
 <phrase>
@@ -13317,18 +13040,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "周波数スケーリング・ガバナー"
-    ibassodx90: "周波数スケーリング・ガバナー"
+    ibassodx50,ibassodx90: "周波数スケーリング・ガバナー"
   </dest>
   <voice>
     *: none
-    ibassodx50: "周波数スケーリング・ガバナー"
-    ibassodx90: "周波数スケーリング・ガバナー"
+    ibassodx50,ibassodx90: "周波数スケーリング・ガバナー"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 17fd942f5d..6effa41d00 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -623,16 +623,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "크로스피드"
+    *: "크로스피드"
   </dest>
   <voice>
-    *: none
-    swcodec: "크로스피드"
+    *: "크로스피드"
   </voice>
 </phrase>
 <phrase>
@@ -640,16 +637,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "이퀄라이져"
+    *: "이퀄라이져"
   </dest>
   <voice>
-    *: none
-    swcodec: "이퀄라이져"
+    *: "이퀄라이져"
   </voice>
 </phrase>
 <phrase>
@@ -828,16 +822,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "이퀄라이져 켜기"
+    *: "이퀄라이져 켜기"
   </dest>
   <voice>
-    *: none
-    swcodec: "이퀄라이져 켜기"
+    *: "이퀄라이져 켜기"
   </voice>
 </phrase>
 <phrase>
@@ -845,16 +836,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "그래픽 EQ"
+    *: "그래픽 EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "그래픽 EQ"
+    *: "그래픽 EQ"
   </voice>
 </phrase>
 <phrase>
@@ -862,16 +850,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "미리 줄임"
+    *: "미리 줄임"
   </dest>
   <voice>
-    *: none
-    swcodec: "미리 줄임"
+    *: "미리 줄임"
   </voice>
 </phrase>
 <phrase>
@@ -879,16 +864,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "간단한 EQ설정"
+    *: "간단한 EQ설정"
   </dest>
   <voice>
-    *: none
-    swcodec: "간단한 EQ설정"
+    *: "간단한 EQ설정"
   </voice>
 </phrase>
 <phrase>
@@ -896,16 +878,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "고급 EQ설정"
+    *: "고급 EQ설정"
   </dest>
   <voice>
-    *: none
-    swcodec: "고급 EQ설정"
+    *: "고급 EQ설정"
   </voice>
 </phrase>
 <phrase>
@@ -913,16 +892,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ 프리셋 저장"
+    *: "EQ 프리셋 저장"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ 프리셋 저장"
+    *: "EQ 프리셋 저장"
   </voice>
 </phrase>
 <phrase>
@@ -930,16 +906,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ 프리셋 탐색"
+    *: "EQ 프리셋 탐색"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ 프리셋 탐색"
+    *: "EQ 프리셋 탐색"
   </voice>
 </phrase>
 <phrase>
@@ -947,16 +920,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "편집 모드: %s"
+    *: "편집 모드: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -964,16 +934,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz 밴드 게인"
+    *: "%d Hz 밴드 게인"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz 밴드 게인"
+    *: "Hertz 밴드 게인"
   </voice>
 </phrase>
 <phrase>
@@ -981,16 +948,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "로우 셀프 필터"
+    *: "로우 셀프 필터"
   </dest>
   <voice>
-    *: none
-    swcodec: "로우 셀프 필터"
+    *: "로우 셀프 필터"
   </voice>
 </phrase>
 <phrase>
@@ -998,16 +962,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "피크 필터 %d"
+    *: "피크 필터 %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "피크 필터"
+    *: "피크 필터"
   </voice>
 </phrase>
 <phrase>
@@ -1015,16 +976,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "하이 셀프 필터"
+    *: "하이 셀프 필터"
   </dest>
   <voice>
-    *: none
-    swcodec: "하이 셀프 필터"
+    *: "하이 셀프 필터"
   </voice>
 </phrase>
 <phrase>
@@ -1032,16 +990,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "컷오프 주파수"
+    *: "컷오프 주파수"
   </dest>
   <voice>
-    *: none
-    swcodec: "컷오프 주파수"
+    *: "컷오프 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -1049,16 +1004,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "센터 주파수"
+    *: "센터 주파수"
   </dest>
   <voice>
-    *: none
-    swcodec: "센터 주파수"
+    *: "센터 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -1066,16 +1018,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q값"
+    *: "Q값"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q값"
+    *: "Q값"
   </voice>
 </phrase>
 <phrase>
@@ -1341,16 +1290,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Beep Volume"
+    *: "Beep Volume"
   </source>
   <dest>
-    *: none
-    swcodec: "삐 소리크기"
+    *: "삐 소리크기"
   </dest>
   <voice>
-    *: none
-    swcodec: "삐 소리크기"
+    *: "삐 소리크기"
   </voice>
 </phrase>
 <phrase>
@@ -1358,16 +1304,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "작음"
+    *: "작음"
   </dest>
   <voice>
-    *: none
-    swcodec: "작음"
+    *: "작음"
   </voice>
 </phrase>
 <phrase>
@@ -1375,16 +1318,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "중간"
+    *: "중간"
   </dest>
   <voice>
-    *: none
-    swcodec: "중간"
+    *: "중간"
   </voice>
 </phrase>
 <phrase>
@@ -1392,16 +1332,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "큼"
+    *: "큼"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1695,16 +1632,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Browse Fonts"
+    *: "Browse Fonts"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "폰트 찾기"
+    *: "폰트 찾기"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "폰트 찾기"
+    *: "폰트 찾기"
   </voice>
 </phrase>
 <phrase>
@@ -1788,16 +1722,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "상태/스크롤 바"
+    *: "상태/스크롤 바"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "상태/스크롤 바"
+    *: "상태/스크롤 바"
   </voice>
 </phrase>
 <phrase>
@@ -1864,16 +1795,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "히브리어 (ISO-8859-8)"
+    *: "히브리어 (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "히브리어"
+    *: "히브리어"
   </voice>
 </phrase>
 <phrase>
@@ -1895,16 +1823,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "태국어 (ISO-8859-11)"
+    *: "태국어 (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "태국어"
+    *: "태국어"
   </voice>
 </phrase>
 <phrase>
@@ -1912,16 +1837,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "아랍어 (CP1256)"
+    *: "아랍어 (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "아랍어"
+    *: "아랍어"
   </voice>
 </phrase>
 <phrase>
@@ -1957,16 +1879,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "일본어 (SJIS)"
+    *: "일본어 (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "일본어"
+    *: "일본어"
   </voice>
 </phrase>
 <phrase>
@@ -1974,16 +1893,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "중국어 간체 (GB2312)"
+    *: "중국어 간체 (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "중국어 간체"
+    *: "중국어 간체"
   </voice>
 </phrase>
 <phrase>
@@ -1991,16 +1907,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "한국어 (KSX1001)"
+    *: "한국어 (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "한국어"
+    *: "한국어"
   </voice>
 </phrase>
 <phrase>
@@ -2008,16 +1921,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "중국어 번체 (BIG5)"
+    *: "중국어 번체 (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "중국어 번체"
+    *: "중국어 번체"
   </voice>
 </phrase>
 <phrase>
@@ -2363,15 +2273,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "주파수"
+    play_frequency,recording: "주파수"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "주파수"
+    play_frequency,recording: "주파수"
   </voice>
 </phrase>
 <phrase>
@@ -2397,18 +2307,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "외부 마이크"
     iriverh100,iriverh120,iriverh300: "내장 마이크"
+    recording: "외부 마이크"
   </dest>
   <voice>
     *: none
-    recording: "외부 마이크"
     iriverh100,iriverh120,iriverh300: "내장 마이크"
+    recording: "외부 마이크"
   </voice>
 </phrase>
 <phrase>
@@ -2750,16 +2660,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "클리핑 방지"
+    *: "클리핑 방지"
   </dest>
   <voice>
-    *: none
-    swcodec: "클리핑 방지"
+    *: "클리핑 방지"
   </voice>
 </phrase>
 <phrase>
@@ -2995,16 +2902,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "뒤집기"
+    *: "뒤집기"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "뒤집기"
+    *: "뒤집기"
   </voice>
 </phrase>
 <phrase>
@@ -3012,16 +2916,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "라인 선택기 타입"
+    *: "라인 선택기 타입"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "라인 선택기 타입"
+    *: "라인 선택기 타입"
   </voice>
 </phrase>
 <phrase>
@@ -3029,16 +2930,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "포인터"
+    *: "포인터"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "포인터"
+    *: "포인터"
   </voice>
 </phrase>
 <phrase>
@@ -3046,16 +2944,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "바(반전)"
+    *: "바(반전)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "바(반전)"
+    *: "바(반전)"
   </voice>
 </phrase>
 <phrase>
@@ -3232,16 +3127,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "화면을 이동해 긴 문자 보기"
+    *: "화면을 이동해 긴 문자 보기"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "화면을 이동해 긴 문자 보기"
+    *: "화면을 이동해 긴 문자 보기"
   </voice>
 </phrase>
 <phrase>
@@ -3249,16 +3141,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "화면 이동 크기"
+    *: "화면 이동 크기"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "화면 이동 크기"
+    *: "화면 이동 크기"
   </voice>
 </phrase>
 <phrase>
@@ -3280,16 +3169,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "스크롤 바"
+    *: "스크롤 바"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "스크롤 바"
+    *: "스크롤 바"
   </voice>
 </phrase>
 <phrase>
@@ -3297,16 +3183,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "상태 바"
+    *: "상태 바"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "상태 바"
+    *: "상태 바"
   </voice>
 </phrase>
 <phrase>
@@ -3331,16 +3214,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "볼륨 표시"
+    *: "볼륨 표시"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "볼륨 표시"
+    *: "볼륨 표시"
   </voice>
 </phrase>
 <phrase>
@@ -3348,16 +3228,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "배터리 표시"
+    *: "배터리 표시"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "배터리 표시"
+    *: "배터리 표시"
   </voice>
 </phrase>
 <phrase>
@@ -3365,16 +3242,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "그래픽"
+    *: "그래픽"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "그래픽"
+    *: "그래픽"
   </voice>
 </phrase>
 <phrase>
@@ -3382,16 +3256,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "숫자"
+    *: "숫자"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "숫자"
+    *: "숫자"
   </voice>
 </phrase>
 <phrase>
@@ -4241,13 +4112,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "배터리: %d%% (%d시간 %d분)"
+    ipodmini1g,ipodmini2g,iriverh10: "배터리: %d%% %d시간 %d분"
     iriverifp7xx: "%d%% %d시간 %d분"
-    iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분"
   </dest>
   <voice>
     *: "배터리 레벨"
@@ -4304,24 +4175,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1 "
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -4451,29 +4322,29 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     gigabeatfx: "A = Revert"
-    mrobe100: "DISPLAY = Revert"
     gigabeats: "BACK = Revert"
-    vibe500: "CANCEL = Revert"
+    gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    mrobe100: "DISPLAY = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "[끔]: 원상태 복구"
-    iriverh100,iriverh120,iriverh300: "[정지]: 원상태 복구"
-    ipod*,sansac200*,gogearsa9200,mpiohd300: "[메뉴]: 원상태 복구"
-    iaudiox5,iaudiom5: "[녹음]: 원상태 복구"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[이전]: 원상태 복구"
     gigabeatfx: "[전원]: 원상태 복구"
-    mrobe100: "[화면]: 원상태 복구"
     gigabeats: "[뒤]: 원상태 복구"
-    vibe500: "C: 원상태 복구"
+    gogearsa9200,ipod*,mpiohd300,sansac200*: "[메뉴]: 원상태 복구"
+    iaudiom5,iaudiox5: "[녹음]: 원상태 복구"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[이전]: 원상태 복구"
+    iriverh100,iriverh120,iriverh300: "[정지]: 원상태 복구"
+    mrobe100: "[화면]: 원상태 복구"
+    rtc: "[끔]: 원상태 복구"
     samsungyh*: "REW: 원상태 복구"
+    vibe500: "C: 원상태 복구"
   </dest>
   <voice>
     *: none
@@ -4536,19 +4407,19 @@
   user: core
   <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*,vibe500: "The disk is full. Press UP to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
-    recording: "디스크 공간이 부족합니다. [끔] 버튼을 누르세요."
-    iriverh100,iriverh120,iriverh300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
     iaudiom5,iaudiox5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요."
-    sansae200*,sansac200*,vibe500: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
+    iriverh100,iriverh120,iriverh300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요."
+    recording: "디스크 공간이 부족합니다. [끔] 버튼을 누르세요."
     samsungyh*: "디스크 공간이 부족합니다. LEFT 버튼을 누르세요."
+    sansac200*,sansae200*,vibe500: "디스크 공간이 부족합니다. [위] 버튼을 누르세요."
   </dest>
   <voice>
     *: none
@@ -4714,21 +4585,21 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "[재생]: 설정   [꺼짐]: 취소"
+    gigabeats: "[선택]: 설정   [꺼짐]: 취소"
     ipod*: "[선택]: 설정   [메뉴]: 취소"
     iriverh10,iriverh10_5gb: "[선택]: 설정   [이전]: 취소"
-    gigabeats: "[선택]: 설정   [꺼짐]: 취소"
-    vibe500: "OK: 설정   C: 취소"
     mpiohd300: "ENTER: 설정   MENU: 취소"
+    vibe500: "OK: 설정   C: 취소"
   </dest>
   <voice>
     *: none
@@ -7154,22 +7025,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "[꺼짐]: 중지"
-    iriverh100,iriverh120,iriverh300: "[정지]: 중지"
-    ipod*: "[재생/일시정지]: 중지"
-    iaudiox5,iaudiom5: "[재생 길게누름]: 중지"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "[이전]: 중지"
-    gigabeats: "[뒤]: 중지"
     gigabeatfx: "[전원]: 중지"
+    gigabeats: "[뒤]: 중지"
+    iaudiom5,iaudiox5: "[재생 길게누름]: 중지"
+    ipod*: "[재생/일시정지]: 중지"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "[이전]: 중지"
+    iriverh100,iriverh120,iriverh300: "[정지]: 중지"
   </dest>
   <voice>
     *: ""
@@ -7512,16 +7382,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "다이렉트 게인"
+    *: "다이렉트 게인"
   </dest>
   <voice>
-    *: none
-    swcodec: "다이렉트 게인"
+    *: "다이렉트 게인"
   </voice>
 </phrase>
 <phrase>
@@ -7529,16 +7396,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "크로스 게인"
+    *: "크로스 게인"
   </dest>
   <voice>
-    *: none
-    swcodec: "크로스 게인"
+    *: "크로스 게인"
   </voice>
 </phrase>
 <phrase>
@@ -7546,16 +7410,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "고주파수 감쇄율"
+    *: "고주파수 감쇄율"
   </dest>
   <voice>
-    *: none
-    swcodec: "고주파수 감쇄율"
+    *: "고주파수 감쇄율"
   </voice>
 </phrase>
 <phrase>
@@ -7563,16 +7424,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "고주파수 컷오프"
+    *: "고주파수 컷오프"
   </dest>
   <voice>
-    *: none
-    swcodec: "고주파수 컷오프"
+    *: "고주파수 컷오프"
   </voice>
 </phrase>
 <phrase>
@@ -8000,16 +7858,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "편집 모드: %s %s"
+    *: "편집 모드: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8017,16 +7872,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "컷오프 주파수"
+    *: "컷오프 주파수"
   </dest>
   <voice>
-    *: none
-    swcodec: "컷오프 주파수"
+    *: "컷오프 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -8472,16 +8324,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "디더링"
+    *: "디더링"
   </dest>
   <voice>
-    *: none
-    swcodec: "디더링"
+    *: "디더링"
   </voice>
 </phrase>
 <phrase>
@@ -9014,17 +8863,15 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "Building database... %d found (PREV to return)"
     iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200,vibe500: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "음악 DB 생성 중... %d개 완료 ([꺼짐]: 돌아가기)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
+    gogearsa9200,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
     iriverh100,iriverh120,iriverh300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)"
-    ipod*: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200,vibe500: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)"
   </dest>
   <voice>
     *: "음악 DB의 요소를 찾음"
@@ -9051,17 +8898,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "버튼 조명 시간"
-    sansafuze*,sansae200*: "휠 조명 시간"
+    sansae200*,sansafuze*: "휠 조명 시간"
   </dest>
   <voice>
     *: none
     button_light: "버튼 조명 시간"
-    sansafuze*,sansae200*: "휠 조명 시간"
+    sansae200*,sansafuze*: "휠 조명 시간"
   </voice>
 </phrase>
 <phrase>
@@ -9202,15 +9049,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "중저음 컷오프 주파수"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "중저음 컷오프 주파수"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "중저음 컷오프 주파수"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "중저음 컷오프 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -9635,16 +9482,16 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
     archosplayer: "(PLAY/STOP)"
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "[재생] = 예"
-    iriverh100,iriverh120,iriverh300: "[네비] = 예"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "[선택] = 예"
     archosplayer: "(재생/정지)"
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "[선택] = 예"
+    iriverh100,iriverh120,iriverh300: "[네비] = 예"
     vibe500: "OK = 예"
   </dest>
   <voice>
@@ -9657,21 +9504,21 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "[켬] = 설정"
-    iriverh100,iriverh120,iriverh300: "[네비] = 설정"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100: "[선택] = 설정"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "[선택] = 설정"
     gogearsa9200,samsungyh*: "PLAY = 설정"
-    vibe500: "OK = 설정"
+    iriverh100,iriverh120,iriverh300: "[네비] = 설정"
     mpiohd300: "ENTER = 설정"
+    rtc: "[켬] = 설정"
+    vibe500: "OK = 설정"
   </dest>
   <voice>
     *: none
@@ -9896,16 +9743,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "게인"
+    *: "게인"
   </dest>
   <voice>
-    *: none
-    swcodec: "게인"
+    *: "게인"
   </voice>
 </phrase>
 <phrase>
@@ -9975,16 +9819,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "모드:"
+    *: "모드:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10175,16 +10016,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "키클릭"
+    *: "키클릭"
   </dest>
   <voice>
-    *: none
-    swcodec: "키클릭"
+    *: "키클릭"
   </voice>
 </phrase>
 <phrase>
@@ -10621,15 +10459,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "고음역 컷오프 주파수"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음역 컷오프 주파수"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "고음역 컷오프 주파수"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고음역 컷오프 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -10800,16 +10638,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "반복 키클릭"
+    *: "반복 키클릭"
   </dest>
   <voice>
-    *: none
-    swcodec: "반복 키클릭"
+    *: "반복 키클릭"
   </voice>
 </phrase>
 <phrase>
@@ -10918,7 +10753,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index c3fa03a706..e160fb9f54 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -14,7 +14,7 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
-# 
+#
 # Latvian language file, translated by Mārtiņš Šimis jeb msh
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -246,20 +246,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Jā"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, vai labā augšējā = Jā"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Jā"
     iriverh100,iriverh120,iriverh300: "NAVI = Jā"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Jā"
     mrobe500: "PLAY, POWER, vai labā augšējā = Jā"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Jā"
   </dest>
   <voice>
@@ -815,16 +815,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Kanālu Izlīdzināšana"
+    *: "Kanālu Izlīdzināšana"
   </dest>
   <voice>
-    *: none
-    swcodec: "kanaalu izliidzinaashana"
+    *: "kanaalu izliidzinaashana"
   </voice>
 </phrase>
 <phrase>
@@ -832,16 +829,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Tiešais Skaļums"
+    *: "Tiešais Skaļums"
   </dest>
   <voice>
-    *: none
-    swcodec: "tieshais skaljums"
+    *: "tieshais skaljums"
   </voice>
 </phrase>
 <phrase>
@@ -849,16 +843,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Starpskaļums"
+    *: "Starpskaļums"
   </dest>
   <voice>
-    *: none
-    swcodec: "starpskaljums"
+    *: "starpskaljums"
   </voice>
 </phrase>
 <phrase>
@@ -866,16 +857,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Augsto Frekvenču Vājinājums"
+    *: "Augsto Frekvenču Vājinājums"
   </dest>
   <voice>
-    *: none
-    swcodec: "augsto frekvenchu vaajinaajums"
+    *: "augsto frekvenchu vaajinaajums"
   </voice>
 </phrase>
 <phrase>
@@ -883,16 +871,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Augsto Frekvenču Sākums"
+    *: "Augsto Frekvenču Sākums"
   </dest>
   <voice>
-    *: none
-    swcodec: "augsto frekvenchu saakums"
+    *: "augsto frekvenchu saakums"
   </voice>
 </phrase>
 <phrase>
@@ -900,16 +885,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ekvalaizers"
+    *: "Ekvalaizers"
   </dest>
   <voice>
-    *: none
-    swcodec: "ekvalaizers"
+    *: "ekvalaizers"
   </voice>
 </phrase>
 <phrase>
@@ -917,16 +899,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ieslēgt Ekvalaizeru"
+    *: "Ieslēgt Ekvalaizeru"
   </dest>
   <voice>
-    *: none
-    swcodec: "ieslēgt ekvalaizeru"
+    *: "ieslēgt ekvalaizeru"
   </voice>
 </phrase>
 <phrase>
@@ -934,16 +913,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafiskais Ekvalaizers"
+    *: "Grafiskais Ekvalaizers"
   </dest>
   <voice>
-    *: none
-    swcodec: "grafiskais ekvalaizers"
+    *: "grafiskais ekvalaizers"
   </voice>
 </phrase>
 <phrase>
@@ -951,16 +927,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pastiprinājums"
+    *: "Pastiprinājums"
   </dest>
   <voice>
-    *: none
-    swcodec: "kopeejais frekvenchu pastiprinaajums"
+    *: "kopeejais frekvenchu pastiprinaajums"
   </voice>
 </phrase>
 <phrase>
@@ -968,16 +941,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Vienkāršotais Ekvalaizers"
+    *: "Vienkāršotais Ekvalaizers"
   </dest>
   <voice>
-    *: none
-    swcodec: "vienkaarshotais ekvalaizers"
+    *: "vienkaarshotais ekvalaizers"
   </voice>
 </phrase>
 <phrase>
@@ -985,16 +955,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Papildus Uzstādījumi"
+    *: "Papildus Uzstādījumi"
   </dest>
   <voice>
-    *: none
-    swcodec: "papildus uzstaadiijumi"
+    *: "papildus uzstaadiijumi"
   </voice>
 </phrase>
 <phrase>
@@ -1002,16 +969,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Saglabāt Uzstādījumus"
+    *: "Saglabāt Uzstādījumus"
   </dest>
   <voice>
-    *: none
-    swcodec: "saglabaat ekvalaizera uzstaadiijumus"
+    *: "saglabaat ekvalaizera uzstaadiijumus"
   </voice>
 </phrase>
 <phrase>
@@ -1019,16 +983,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Aplūkot Uzstādījumus"
+    *: "Aplūkot Uzstādījumus"
   </dest>
   <voice>
-    *: none
-    swcodec: "apluukot ekvalaizera uzstaadiijumus"
+    *: "apluukot ekvalaizera uzstaadiijumus"
   </voice>
 </phrase>
 <phrase>
@@ -1036,16 +997,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Režīms: %s"
+    *: "Režīms: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1053,16 +1011,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Joslas Stiprums"
+    *: "%d Hz Joslas Stiprums"
   </dest>
   <voice>
-    *: none
-    swcodec: "joslas stiprums hercos"
+    *: "joslas stiprums hercos"
   </voice>
 </phrase>
 <phrase>
@@ -1070,16 +1025,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Basu Filtrs"
+    *: "Basu Filtrs"
   </dest>
   <voice>
-    *: none
-    swcodec: "basu filtrs"
+    *: "basu filtrs"
   </voice>
 </phrase>
 <phrase>
@@ -1087,16 +1039,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Pīķa Filtrs %d"
+    *: "Pīķa Filtrs %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "piikja filtrs"
+    *: "piikja filtrs"
   </voice>
 </phrase>
 <phrase>
@@ -1104,16 +1053,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Augsto Frekvenču Filtrs"
+    *: "Augsto Frekvenču Filtrs"
   </dest>
   <voice>
-    *: none
-    swcodec: "augsto frekvenchu filtrs"
+    *: "augsto frekvenchu filtrs"
   </voice>
 </phrase>
 <phrase>
@@ -1121,16 +1067,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Robežfrekvence"
+    *: "Robežfrekvence"
   </dest>
   <voice>
-    *: none
-    swcodec: "robezhfrekvence"
+    *: "robezhfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -1138,16 +1081,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centra Frekvence"
+    *: "Centra Frekvence"
   </dest>
   <voice>
-    *: none
-    swcodec: "centra frekvence"
+    *: "centra frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -1155,16 +1095,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Platums"
+    *: "Platums"
   </dest>
   <voice>
-    *: none
-    swcodec: "platums"
+    *: "platums"
   </voice>
 </phrase>
 <phrase>
@@ -1172,16 +1109,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Skaņas Izlīdzināšana"
+    *: "Skaņas Izlīdzināšana"
   </dest>
   <voice>
-    *: none
-    swcodec: "skanjas izliidzinaashana"
+    *: "skanjas izliidzinaashana"
   </voice>
 </phrase>
 <phrase>
@@ -1725,16 +1659,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Novērst Pārlieku Skaļumu"
+    *: "Novērst Pārlieku Skaļumu"
   </dest>
   <voice>
-    *: none
-    swcodec: "noveerst paarlieku skaljumu"
+    *: "noveerst paarlieku skaljumu"
   </voice>
 </phrase>
 <phrase>
@@ -1812,16 +1743,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Dz.Pārslēgšanas Pīkstiens"
+    *: "Dz.Pārslēgšanas Pīkstiens"
   </dest>
   <voice>
-    *: none
-    swcodec: "dziesmu paarsleegshanas piikstiens"
+    *: "dziesmu paarsleegshanas piikstiens"
   </voice>
 </phrase>
 <phrase>
@@ -1829,16 +1757,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Vājš"
+    *: "Vājš"
   </dest>
   <voice>
-    *: none
-    swcodec: "vaajsh"
+    *: "vaajsh"
   </voice>
 </phrase>
 <phrase>
@@ -1846,16 +1771,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Viduvējs"
+    *: "Viduvējs"
   </dest>
   <voice>
-    *: none
-    swcodec: "viduveejs"
+    *: "viduveejs"
   </voice>
 </phrase>
 <phrase>
@@ -1863,16 +1785,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Spēcīgs"
+    *: "Spēcīgs"
   </dest>
   <voice>
-    *: none
-    swcodec: "speeciigs"
+    *: "speeciigs"
   </voice>
 </phrase>
 <phrase>
@@ -2231,21 +2150,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Veidoju datubāzi... %d atrastas (OFF lai turpinātu)"
-    iriverh100,iriverh120,iriverh300: "Veidoju datubāzi... %d atrastas (STOP lai turpinātu)"
-    ipod*: "Veidoju datubāzi... %d atrastas (PREV lai turpinātu)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Veidoju datubāzi... %d atrastas (LEFT lai turpinātu)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Veidoju datubāzi... %d atrastas (PREV lai turpinātu)"
-    gogearsa9200: "Veidoju datubāzi... %d atrastas (REW lai turpinātu)"
     archosplayer: "Veidoju DB atrasts %d"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Veidoju datubāzi... %d atrastas (LEFT lai turpinātu)"
+    gogearsa9200: "Veidoju datubāzi... %d atrastas (REW lai turpinātu)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Veidoju datubāzi... %d atrastas (PREV lai turpinātu)"
+    iriverh100,iriverh120,iriverh300: "Veidoju datubāzi... %d atrastas (STOP lai turpinātu)"
   </dest>
   <voice>
     *: "atrasti ieraksti datubaazei"
@@ -2427,16 +2344,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fonti"
+    *: "Fonti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "fonti"
+    *: "fonti"
   </voice>
 </phrase>
 <phrase>
@@ -2698,16 +2612,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kājām Gaisā"
+    *: "Kājām Gaisā"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "kaajaam gaisaa"
+    *: "kaajaam gaisaa"
   </voice>
 </phrase>
 <phrase>
@@ -2715,16 +2626,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Līnija"
+    *: "Līnija"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "liinija"
+    *: "liinija"
   </voice>
 </phrase>
 <phrase>
@@ -2732,16 +2640,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kursors"
+    *: "Kursors"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "kursors"
+    *: "kursors"
   </voice>
 </phrase>
 <phrase>
@@ -2749,16 +2654,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rinda (Apvērsta)"
+    *: "Rinda (Apvērsta)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "apveersta rinda"
+    *: "apveersta rinda"
   </voice>
 </phrase>
 <phrase>
@@ -3048,16 +2950,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Teksts Izrullējas Ārpus Ekrāna"
+    *: "Teksts Izrullējas Ārpus Ekrāna"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "teksts izrulleejas aarpus ekraana"
+    *: "teksts izrulleejas aarpus ekraana"
   </voice>
 </phrase>
 <phrase>
@@ -3065,16 +2964,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekrāna Rullēšanas Solis"
+    *: "Ekrāna Rullēšanas Solis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ekraana rulleeshanas solis"
+    *: "ekraana rulleeshanas solis"
   </voice>
 </phrase>
 <phrase>
@@ -3130,16 +3026,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusa-/Rulljosla"
+    *: "Statusa-/Rulljosla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "statusa rulljosla"
+    *: "statusa rulljosla"
   </voice>
 </phrase>
 <phrase>
@@ -3147,16 +3040,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rulljosla"
+    *: "Rulljosla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "rulljosla"
+    *: "rulljosla"
   </voice>
 </phrase>
 <phrase>
@@ -3164,16 +3054,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusa Josla"
+    *: "Statusa Josla"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "statusa josla"
+    *: "statusa josla"
   </voice>
 </phrase>
 <phrase>
@@ -3198,16 +3085,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skaļuma Attēlošana"
+    *: "Skaļuma Attēlošana"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "skaljuma atteeloshana"
+    *: "skaljuma atteeloshana"
   </voice>
 </phrase>
 <phrase>
@@ -3215,16 +3099,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterijas Attēlošana"
+    *: "Batterijas Attēlošana"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "baterijas atteeloshana"
+    *: "baterijas atteeloshana"
   </voice>
 </phrase>
 <phrase>
@@ -3232,16 +3113,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafiski"
+    *: "Grafiski"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "grafiski"
+    *: "grafiski"
   </voice>
 </phrase>
 <phrase>
@@ -3249,16 +3127,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeriski"
+    *: "Numeriski"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "numeriski"
+    *: "numeriski"
   </voice>
 </phrase>
 <phrase>
@@ -3478,16 +3353,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ebreju (ISO-8859-8)"
+    *: "Ebreju (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ebreju"
+    *: "ebreju"
   </voice>
 </phrase>
 <phrase>
@@ -3509,16 +3381,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tai (ISO-8859-11)"
+    *: "Tai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "tai"
+    *: "tai"
   </voice>
 </phrase>
 <phrase>
@@ -3526,16 +3395,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arābu (CP1256)"
+    *: "Arābu (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "araabu"
+    *: "araabu"
   </voice>
 </phrase>
 <phrase>
@@ -3571,16 +3437,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japāņu (SJIS)"
+    *: "Japāņu (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japaanju"
+    *: "Japaanju"
   </voice>
 </phrase>
 <phrase>
@@ -3588,16 +3451,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vienk. Ķīniešu (GB2312)"
+    *: "Vienk. Ķīniešu (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "vienkaarshotais kjiinieshu"
+    *: "vienkaarshotais kjiinieshu"
   </voice>
 </phrase>
 <phrase>
@@ -3605,16 +3465,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korejiešu (KSX1001)"
+    *: "Korejiešu (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "korejieshu"
+    *: "korejieshu"
   </voice>
 </phrase>
 <phrase>
@@ -3622,16 +3479,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Ķīniešu (BIG5)"
+    *: "Trad. Ķīniešu (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "tradicionaalais kjiinieshu"
+    *: "tradicionaalais kjiinieshu"
   </voice>
 </phrase>
 <phrase>
@@ -3655,17 +3509,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Pogu Apgaismojums"
-    sansafuze*,sansae200*: "Ripuļa Apgaismojums"
+    sansae200*,sansafuze*: "Ripuļa Apgaismojums"
   </dest>
   <voice>
     *: none
     button_light: "pogu apgaismojums"
-    sansafuze*,sansae200*: "ripulja apgaismojums"
+    sansae200*,sansafuze*: "ripulja apgaismojums"
   </voice>
 </phrase>
 <phrase>
@@ -3936,27 +3790,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Uzstādīt"
-    mrobe500: "HEART = Uzstādīt"
-    iriverh100,iriverh120,iriverh300: "NAVI = Uzstādīt"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Uzstādīt"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Uzstādīt"
     gogearsa9200,samsungyh*: "PLAY = Uzstādīt"
-    vibe500: "OK = Uzstādīt"
+    iriverh100,iriverh120,iriverh300: "NAVI = Uzstādīt"
     mpiohd300: "ENTER = Uzstādīt"
+    mrobe500: "HEART = Uzstādīt"
+    rtc: "ON = Uzstādīt"
+    vibe500: "OK = Uzstādīt"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3965,39 +3819,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Atcelt"
-    mrobe500: "POWER = Atcelt"
-    iriverh100,iriverh120,iriverh300: "STOP = Atcelt"
-    ipod*,sansac200*,mpiohd300: "MENU = Atcelt"
-    iaudiox5,iaudiom5: "RECORD = Atcelt"
+    gigabeatfx,mrobe500: "POWER = Atcelt"
+    gigabeats,sansafuzeplus: "BACK = Atcelt"
+    gogearsa9200: "LEFT = Atcelt"
+    iaudiom5,iaudiox5: "RECORD = Atcelt"
+    ipod*,mpiohd300,sansac200*: "MENU = Atcelt"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atcelt"
-    gigabeatfx: "POWER = Atcelt"
-    sansafuzeplus: "BACK = Atcelt"
+    iriverh100,iriverh120,iriverh300: "STOP = Atcelt"
     mrobe100: "DISPLAY = Atcelt"
-    gigabeats: "BACK = Atcelt"
-    gogearsa9200: "LEFT = Atcelt"
-    vibe500: "CANCEL = Atcelt"
+    rtc: "OFF = Atcelt"
     samsungyh*: "REW = Atcelt"
+    vibe500: "CANCEL = Atcelt"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4483,22 +4333,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Uzst OFF=Atteikties"
+    gigabeats: "SELECT=Uzst POWER=Atteikties"
     ipod*: "SELECT=Uzst MENU=Atteikties"
     iriverh10,iriverh10_5gb: "SELECT=Uzst PREV=Atteikties"
-    gigabeats: "SELECT=Uzst POWER=Atteikties"
-    vibe500: "OK=Uzst C=Atteikties"
     mpiohd300: "ENTER=Uzst MENU=Atteikties"
     sansafuzeplus: "SELECT=Uzst  BACK=Atteikties"
+    vibe500: "OK=Uzst C=Atteikties"
   </dest>
   <voice>
     *: none
@@ -5603,15 +5453,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvence"
+    play_frequency,recording: "Frekvence"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "frekvence"
+    play_frequency,recording: "frekvence"
   </voice>
 </phrase>
 <phrase>
@@ -5654,18 +5504,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofons"
     iriverh100,iriverh120,iriverh300: "Ievūvētais Mikrofons"
+    recording: "Mikrofons"
   </dest>
   <voice>
     *: none
-    recording: "mikrofons"
     iriverh100,iriverh120,iriverh300: "iebuuveetais mikrofons"
+    recording: "mikrofons"
   </voice>
 </phrase>
 <phrase>
@@ -6543,13 +6393,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %ds %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %ds %dm"
     iriverifp7xx: "%d%% %ds %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %ds %dm"
   </dest>
   <voice>
     *: "baterijas liimenis"
@@ -6606,24 +6456,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "em em cee"
     multivolume: "haa dee viens"
-    sansae200*,sansac200*,sansafuze*: "mikro es dee"
+    sansac200*,sansae200*,sansafuze*: "mikro es dee"
     xduoox3: "mikro es dee 2"
-    archosondio*: "em em cee"
   </voice>
 </phrase>
 <phrase>
@@ -7870,8 +7720,6 @@
     *: "laiks"
   </voice>
 </phrase>
-/* TODO: cleanup LANG_USB_CHARGING unless HAVE_USB_CHARGING_ENABLE defined,
- * the selector should probably be usb_charging_enable_enable as well. */
 <phrase>
   id: LANG_USB_CHARGING
   desc: in Battery menu
@@ -7940,23 +7788,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Atmiņa pilna. Spied OFF lai turpinātu."
-    iriverh100,iriverh120,iriverh300: "Atmiņa pilna. Spied STOP lai turpinātu."
     iaudiom5,iaudiox5: "Atmiņa pilna. Spied POWER lai turpinātu."
-    sansae200*,sansac200*,vibe500: "Atmiņa pilna. Spied PREV lai turpinātu."
+    iriverh100,iriverh120,iriverh300: "Atmiņa pilna. Spied STOP lai turpinātu."
+    recording: "Atmiņa pilna. Spied OFF lai turpinātu."
     samsungyh*: "Atmiņa pilna. Spied LEFT lai turpinātu."
+    sansac200*,sansae200*,vibe500: "Atmiņa pilna. Spied PREV lai turpinātu."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8044,23 +7892,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK lai pārtrauktu"
     gigabeatfx: "POWER lai pārtrauktu"
-    sansafuzeplus: "BACK lai pārtrauktu"
+    gigabeats,sansafuzeplus: "BACK lai pārtrauktu"
+    iaudiom5,iaudiox5: "Long PLAY lai pārtrauktu"
+    ipod*: "PLAY/PAUSE lai pārtrauktu"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV lai pārtrauktu"
+    iriverh100,iriverh120,iriverh300: "STOP lai pārtrauktu"
   </dest>
   <voice>
     *: ""
@@ -9612,7 +9458,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cue fails"
@@ -9654,16 +9500,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Izmainit: %s %s"
+    *: "Izmainit: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9671,16 +9514,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Robeza"
+    *: "Robeza"
   </dest>
   <voice>
-    *: none
-    swcodec: "robezhfrekvence"
+    *: "robezhfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -9688,16 +9528,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Pastiprinajums"
+    *: "Pastiprinajums"
   </dest>
   <voice>
-    *: none
-    swcodec: "pastiprinaajums"
+    *: "pastiprinaajums"
   </voice>
 </phrase>
 <phrase>
@@ -9705,16 +9542,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Režīms:"
+    *: "Režīms:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10343,7 +10177,7 @@
     multivolume: "nav"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10377,15 +10211,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basu Robežfrekvence"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basu Robežfrekvence"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "basu robezhfrekvence"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "basu robezhfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -10394,15 +10228,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "AF Robežfrekvence"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "AF Robežfrekvence"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "augsto frekvenchu robezhfrekvence"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "augsto frekvenchu robezhfrekvence"
   </voice>
 </phrase>
 <phrase>
@@ -10438,16 +10272,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Klikšķis"
+    *: "Klikšķis"
   </dest>
   <voice>
-    *: none
-    swcodec: "klikshkjis"
+    *: "klikshkjis"
   </voice>
 </phrase>
 <phrase>
@@ -10455,16 +10286,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Klikšķu Atkārtošana"
+    *: "Klikšķu Atkārtošana"
   </dest>
   <voice>
-    *: none
-    swcodec: "klikshkju atkaartoshana"
+    *: "klikshkju atkaartoshana"
   </voice>
 </phrase>
 <phrase>
@@ -10585,11 +10413,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Seriālais Bitreits"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "seriaalais bitreits"
   </voice>
@@ -10602,11 +10430,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Automātiski"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "automaatiski"
   </voice>
@@ -10619,11 +10447,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10636,11 +10464,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10653,11 +10481,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10670,11 +10498,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11197,16 +11025,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Ātruma Maiņa"
+    *: "Ātruma Maiņa"
   </dest>
   <voice>
-    *: none
-    swcodec: "aatruma mainja"
+    *: "aatruma mainja"
   </voice>
 </phrase>
 <phrase>
@@ -11214,16 +11039,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Ātrums"
+    *: "Ātrums"
   </dest>
   <voice>
-    *: none
-    swcodec: "aatrums"
+    *: "aatrums"
   </voice>
 </phrase>
 <phrase>
@@ -11324,7 +11146,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11477,16 +11299,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rulljoslas Platums"
+    *: "Rulljoslas Platums"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "rulljoslas platums"
+    *: "rulljoslas platums"
   </voice>
 </phrase>
 <phrase>
@@ -11494,16 +11313,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rulljoslas Pozīcija"
+    *: "Rulljoslas Pozīcija"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "rulljoslas poziicija"
+    *: "rulljoslas poziicija"
   </voice>
 </phrase>
 <phrase>
@@ -11511,16 +11327,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompresors"
+    *: "Kompresors"
   </dest>
   <voice>
-    *: none
-    swcodec: "kompresors"
+    *: "kompresors"
   </voice>
 </phrase>
 <phrase>
@@ -11579,16 +11392,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Slieksnis"
+    *: "Slieksnis"
   </dest>
   <voice>
-    *: none
-    swcodec: "slieksnis"
+    *: "slieksnis"
   </voice>
 </phrase>
 <phrase>
@@ -11596,16 +11406,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Attiecība"
+    *: "Attiecība"
   </dest>
   <voice>
-    *: none
-    swcodec: "attieciiba"
+    *: "attieciiba"
   </voice>
 </phrase>
 <phrase>
@@ -11613,16 +11420,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "divi pret vienu"
+    *: "divi pret vienu"
   </voice>
 </phrase>
 <phrase>
@@ -11630,16 +11434,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "chetri pret vienu"
+    *: "chetri pret vienu"
   </voice>
 </phrase>
 <phrase>
@@ -11647,16 +11448,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "seshi pret vienu"
+    *: "seshi pret vienu"
   </voice>
 </phrase>
 <phrase>
@@ -11664,16 +11462,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "desmit pret vienu"
+    *: "desmit pret vienu"
   </voice>
 </phrase>
 <phrase>
@@ -11681,16 +11476,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Ierobežojums"
+    *: "Ierobežojums"
   </dest>
   <voice>
-    *: none
-    swcodec: "ierobezhojums"
+    *: "ierobezhojums"
   </voice>
 </phrase>
 <phrase>
@@ -11698,16 +11490,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Beigu Pastiprinājums"
+    *: "Beigu Pastiprinājums"
   </dest>
   <voice>
-    *: none
-    swcodec: "beigu pastiprinaajums"
+    *: "beigu pastiprinaajums"
   </voice>
 </phrase>
 <phrase>
@@ -11715,16 +11504,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automātisks"
+    *: "Automātisks"
   </dest>
   <voice>
-    *: none
-    swcodec: "automaatisks"
+    *: "automaatisks"
   </voice>
 </phrase>
 <phrase>
@@ -11732,16 +11518,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Pāreja"
+    *: "Pāreja"
   </dest>
   <voice>
-    *: none
-    swcodec: "paareja"
+    *: "paareja"
   </voice>
 </phrase>
 <phrase>
@@ -11749,16 +11532,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Asa Pāreja"
+    *: "Asa Pāreja"
   </dest>
   <voice>
-    *: none
-    swcodec: "asa paareja"
+    *: "asa paareja"
   </voice>
 </phrase>
 <phrase>
@@ -11766,16 +11546,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Izlīdzināta Pāreja"
+    *: "Izlīdzināta Pāreja"
   </dest>
   <voice>
-    *: none
-    swcodec: "izliidzinaata paareja"
+    *: "izliidzinaata paareja"
   </voice>
 </phrase>
 <phrase>
@@ -11783,16 +11560,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Samazināšanas Laiks"
+    *: "Samazināšanas Laiks"
   </dest>
   <voice>
-    *: none
-    swcodec: "samazinaashanas laiks"
+    *: "samazinaashanas laiks"
   </voice>
 </phrase>
 <phrase>
@@ -11980,16 +11754,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pamatāda"
+    *: "Pamatāda"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "pamataada"
+    *: "pamataada"
   </voice>
 </phrase>
 <phrase>
@@ -11997,16 +11768,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pults Pamatāda"
+    *: "Pults Pamatāda"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "pults pamataada"
+    *: "pults pamataada"
   </voice>
 </phrase>
 <phrase>
@@ -12116,16 +11884,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Attīt Pirms Atsākt"
+    *: "Attīt Pirms Atsākt"
   </dest>
   <voice>
-    *: none
-    swcodec: "attiit pirms atsaakt"
+    *: "attiit pirms atsaakt"
   </voice>
 </phrase>
 <phrase>
@@ -12321,15 +12086,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Paplašinājums"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Paplašinājums"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "triis dimensiju paplashinaajums"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "triis dimensiju paplashinaajums"
   </voice>
 </phrase>
 <phrase>
@@ -12517,7 +12282,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12843,16 +12608,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Vienkāršā (Meier)"
+    *: "Vienkāršā (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "vienkaarshaa"
+    *: "vienkaarshaa"
   </voice>
 </phrase>
 <phrase>
@@ -12888,16 +12650,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Nestandarta"
+    *: "Nestandarta"
   </dest>
   <voice>
-    *: none
-    swcodec: "nestandarta"
+    *: "nestandarta"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 80e64e12f5..f34e6a92cf 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -317,16 +317,16 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
     archosplayer: "(PLAY/STOP)"
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Yes"
+    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Taip"
-    iriverh100,iriverh120,iriverh300: "NAVI = Taip"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Taip"
     archosplayer: "(PLAY/STOP)"
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Taip"
+    iriverh100,iriverh120,iriverh300: "NAVI = Taip"
     vibe500: "OK = Taip"
   </dest>
   <voice>
@@ -882,16 +882,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeedas"
+    *: "Crossfeedas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeedas"
+    *: "Crossfeedas"
   </voice>
 </phrase>
 <phrase>
@@ -899,16 +896,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Tiesioginis stiprinimas"
+    *: "Tiesioginis stiprinimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tiesioginis stiprinimas"
+    *: "Tiesioginis stiprinimas"
   </voice>
 </phrase>
 <phrase>
@@ -916,16 +910,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Kryžminis stiprinimas"
+    *: "Kryžminis stiprinimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kryžminis stiprinimas"
+    *: "Kryžminis stiprinimas"
   </voice>
 </phrase>
 <phrase>
@@ -933,16 +924,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Aukšto dažnio silpninimas"
+    *: "Aukšto dažnio silpninimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aukšto dažnio silpninimas"
+    *: "Aukšto dažnio silpninimas"
   </voice>
 </phrase>
 <phrase>
@@ -950,16 +938,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Aukšto dažnio nukirpimas"
+    *: "Aukšto dažnio nukirpimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aukšto dažnio nukirpimas"
+    *: "Aukšto dažnio nukirpimas"
   </voice>
 </phrase>
 <phrase>
@@ -967,16 +952,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ekvalaizeris"
+    *: "Ekvalaizeris"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekvalaizeris"
+    *: "Ekvalaizeris"
   </voice>
 </phrase>
 <phrase>
@@ -984,16 +966,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Įjungti EQ"
+    *: "Įjungti EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Įjungti Ekvalaizerį"
+    *: "Įjungti Ekvalaizerį"
   </voice>
 </phrase>
 <phrase>
@@ -1001,16 +980,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafinis EQ"
+    *: "Grafinis EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafinis ekvalaizeris"
+    *: "Grafinis ekvalaizeris"
   </voice>
 </phrase>
 <phrase>
@@ -1018,16 +994,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -1035,16 +1008,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Paprastos EQ nuostatos"
+    *: "Paprastos EQ nuostatos"
   </dest>
   <voice>
-    *: none
-    swcodec: "Paprastos Ekvalaizerio nuostatos"
+    *: "Paprastos Ekvalaizerio nuostatos"
   </voice>
 </phrase>
 <phrase>
@@ -1052,16 +1022,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Sudėtingos EQ nuostatos"
+    *: "Sudėtingos EQ nuostatos"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sudėtingos ekvalaizerio nuostatos"
+    *: "Sudėtingos ekvalaizerio nuostatos"
   </voice>
 </phrase>
 <phrase>
@@ -1069,16 +1036,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Išsaugoti EQ nuostatas"
+    *: "Išsaugoti EQ nuostatas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Išsaugoti ekvalaizerio nuostatas"
+    *: "Išsaugoti ekvalaizerio nuostatas"
   </voice>
 </phrase>
 <phrase>
@@ -1086,16 +1050,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Naršyti EQ nuostatas"
+    *: "Naršyti EQ nuostatas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Naršyti ekvalaizerio nuostatas"
+    *: "Naršyti ekvalaizerio nuostatas"
   </voice>
 </phrase>
 <phrase>
@@ -1103,16 +1064,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Keisti tipą: %s"
+    *: "Keisti tipą: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1120,16 +1078,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz bangų stiprinimas"
+    *: "%d Hz bangų stiprinimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz bangų stiprinimas"
+    *: "hertz bangų stiprinimas"
   </voice>
 </phrase>
 <phrase>
@@ -1137,16 +1092,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Žemų pakopų filtras"
+    *: "Žemų pakopų filtras"
   </dest>
   <voice>
-    *: none
-    swcodec: "Žemų pakopų filtras"
+    *: "Žemų pakopų filtras"
   </voice>
 </phrase>
 <phrase>
@@ -1154,16 +1106,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Viršūnių filtras %d"
+    *: "Viršūnių filtras %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Viršūnių filtras"
+    *: "Viršūnių filtras"
   </voice>
 </phrase>
 <phrase>
@@ -1171,16 +1120,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Aukštų pakopų filtras"
+    *: "Aukštų pakopų filtras"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aukštų pakopų filtras"
+    *: "Aukštų pakopų filtras"
   </voice>
 </phrase>
 <phrase>
@@ -1188,16 +1134,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Nukirpimo dažnis"
+    *: "Nukirpimo dažnis"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nukirpimo dažnis"
+    *: "Nukirpimo dažnis"
   </voice>
 </phrase>
 <phrase>
@@ -1205,16 +1148,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centrinis dažnis"
+    *: "Centrinis dažnis"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centrinis dažnis"
+    *: "Centrinis dažnis"
   </voice>
 </phrase>
 <phrase>
@@ -1222,16 +1162,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1239,16 +1176,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Svyravimai"
+    *: "Svyravimai"
   </dest>
   <voice>
-    *: none
-    swcodec: "Svyravimai"
+    *: "Svyravimai"
   </voice>
 </phrase>
 <phrase>
@@ -1792,16 +1726,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Neleisti trūkinėti"
+    *: "Neleisti trūkinėti"
   </dest>
   <voice>
-    *: none
-    swcodec: "Neleisti trūkinėti"
+    *: "Neleisti trūkinėti"
   </voice>
 </phrase>
 <phrase>
@@ -1879,16 +1810,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Beep Volume"
+    *: "Beep Volume"
   </source>
   <dest>
-    *: none
-    swcodec: "Pypsėjimo garsas"
+    *: "Pypsėjimo garsas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pypsėjimo garsas"
+    *: "Pypsėjimo garsas"
   </voice>
 </phrase>
 <phrase>
@@ -1896,16 +1824,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Silpnas"
+    *: "Silpnas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Silpnas"
+    *: "Silpnas"
   </voice>
 </phrase>
 <phrase>
@@ -1913,16 +1838,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Vidutinis"
+    *: "Vidutinis"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vidutinis"
+    *: "Vidutinis"
   </voice>
 </phrase>
 <phrase>
@@ -1930,16 +1852,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Stiprus"
+    *: "Stiprus"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stiprus"
+    *: "Stiprus"
   </voice>
 </phrase>
 <phrase>
@@ -2299,17 +2218,16 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "Building database... %d found (PREV to return)"
     iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200,vibe500: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Kuriama duomenų bazė... %d rasta (OFF grįžimui)"
-    iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
+    gogearsa9200,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
     ipod*: "Kuriama duomenų bazė... %d rasta (PREV grįžimui)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200,vibe500: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)"
+    iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -2491,16 +2409,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Browse Fonts"
+    *: "Browse Fonts"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Naršyti šriftus"
+    *: "Naršyti šriftus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Naršyti šriftus"
+    *: "Naršyti šriftus"
   </voice>
 </phrase>
 <phrase>
@@ -2762,16 +2677,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Apverstas"
+    *: "Apverstas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Apverstas"
+    *: "Apverstas"
   </voice>
 </phrase>
 <phrase>
@@ -2779,16 +2691,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Žymeklio tipas"
+    *: "Žymeklio tipas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Žymeklio tipas"
+    *: "Žymeklio tipas"
   </voice>
 </phrase>
 <phrase>
@@ -2796,16 +2705,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Žymeklio rodyklė"
+    *: "Žymeklio rodyklė"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Žymeklio rodyklė"
+    *: "Žymeklio rodyklė"
   </voice>
 </phrase>
 <phrase>
@@ -2813,16 +2719,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bar (priešingas)"
+    *: "Bar (priešingas)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bar (priešingas)"
+    *: "Bar (priešingas)"
   </voice>
 </phrase>
 <phrase>
@@ -3112,16 +3015,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekrano slinkimas už ribų"
+    *: "Ekrano slinkimas už ribų"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekrano slinkimas už ribų"
+    *: "Ekrano slinkimas už ribų"
   </voice>
 </phrase>
 <phrase>
@@ -3129,16 +3029,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ekrano slinkimo žingsnio dydis"
+    *: "Ekrano slinkimo žingsnio dydis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ekrano slinkimo žingsnio dydis"
+    *: "Ekrano slinkimo žingsnio dydis"
   </voice>
 </phrase>
 <phrase>
@@ -3194,16 +3091,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Būsena-/Slinkiklis"
+    *: "Būsena-/Slinkiklis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Būsena- ir slinkiklis"
+    *: "Būsena- ir slinkiklis"
   </voice>
 </phrase>
 <phrase>
@@ -3211,16 +3105,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Slinkiklis"
+    *: "Slinkiklis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Slinkiklis"
+    *: "Slinkiklis"
   </voice>
 </phrase>
 <phrase>
@@ -3228,16 +3119,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Būsenos juostelė"
+    *: "Būsenos juostelė"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Būsenos juostelė"
+    *: "Būsenos juostelė"
   </voice>
 </phrase>
 <phrase>
@@ -3262,16 +3150,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Garsumo rodymas"
+    *: "Garsumo rodymas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Garsumo rodymas"
+    *: "Garsumo rodymas"
   </voice>
 </phrase>
 <phrase>
@@ -3279,16 +3164,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Baterijos likučio rodymas"
+    *: "Baterijos likučio rodymas"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Baterijos likučio rodymas"
+    *: "Baterijos likučio rodymas"
   </voice>
 </phrase>
 <phrase>
@@ -3296,16 +3178,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafinis"
+    *: "Grafinis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafinis"
+    *: "Grafinis"
   </voice>
 </phrase>
 <phrase>
@@ -3313,16 +3192,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skaitinis"
+    *: "Skaitinis"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skaitinis"
+    *: "Skaitinis"
   </voice>
 </phrase>
 <phrase>
@@ -3542,16 +3418,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -3573,16 +3446,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3590,16 +3460,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -3635,16 +3502,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -3652,16 +3516,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3669,16 +3530,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -3686,16 +3544,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3719,17 +3574,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    sansafuze*,sansae200*: "Rato apšvietimo laikas"
+    sansae200*,sansafuze*: "Rato apšvietimo laikas"
   </dest>
   <voice>
     *: none
     button_light: "Klavišų apšvietimo laikas"
-    sansafuze*,sansae200*: "Rato apšvietimo laikas"
+    sansae200*,sansafuze*: "Rato apšvietimo laikas"
   </voice>
 </phrase>
 <phrase>
@@ -4000,25 +3855,25 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Nustatyti"
-    iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100: "SELECT = Nustatyti"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Nustatyti"
     gogearsa9200,samsungyh*: "PLAY = Nustatyti"
-    vibe500: "OK = Nustatyti"
+    iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
     mpiohd300: "ENTER = Nustatyti"
+    rtc: "ON = Nustatyti"
+    vibe500: "OK = Nustatyti"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4027,31 +3882,29 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,gogearsa9200,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Atstatyti"
-    iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
-    ipod*,sansac200*,gogearsa9200,mpiohd300: "MENU = Atstatyti"
-    iaudiox5,iaudiom5: "RECORD = Atstatyti"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
     gigabeatfx: "POWER = Atstatyti"
-    sansafuzeplus: "BACK = Atstatyti"
+    gigabeats,sansafuzeplus: "BACK = Atstatyti"
+    gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Atstatyti"
+    iaudiom5,iaudiox5: "RECORD = Atstatyti"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
+    iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
     mrobe100: "DISPLAY = Atstatyti"
-    gigabeats: "BACK = Atstatyti"
-    vibe500: "CANCEL = Atstatyti"
+    rtc: "OFF = Atstatyti"
     samsungyh*: "REW = Atstatyti"
+    vibe500: "CANCEL = Atstatyti"
   </dest>
   <voice>
     *: none
@@ -4540,22 +4393,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Nustatyti OFF=Atšaukti"
+    gigabeats: "SELECT=Nustatyti POWER=Atšaukti"
     ipod*: "SELECT=Nustatyti MENU=Atšaukti"
     iriverh10,iriverh10_5gb: "SELECT=Nustatyti PREV=Atšaukti"
-    gigabeats: "SELECT=Nustatyti POWER=Atšaukti"
-    vibe500: "OK=Nustatyti C=Atšaukti"
     mpiohd300: "ENTER=Nustatyti MENU=Atšaukti"
     sansafuzeplus: "SELECT=Nustatyti  BACK=Atšaukti"
+    vibe500: "OK=Nustatyti C=Atšaukti"
   </dest>
   <voice>
     *: none
@@ -5660,15 +5513,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Dažnis"
+    play_frequency,recording: "Dažnis"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Dažnis"
+    play_frequency,recording: "Dažnis"
   </voice>
 </phrase>
 <phrase>
@@ -5711,18 +5564,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofonas"
     iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
+    recording: "Mikrofonas"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofonas"
     iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas"
+    recording: "Mikrofonas"
   </voice>
 </phrase>
 <phrase>
@@ -6600,13 +6453,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterija: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Baterijos lygis"
@@ -6663,24 +6516,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7995,23 +7848,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Diskas pilnas. Spauskite OFF."
-    iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP."
     iaudiom5,iaudiox5: "Diskas pilnas. Spauskite POWER."
-    sansae200*,sansac200*,vibe500: "Diskas pilnas. Spauskite PREV."
+    iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP."
+    recording: "Diskas pilnas. Spauskite OFF."
     samsungyh*: "Diskas pilnas. Spauskite LEFT."
+    sansac200*,sansae200*,vibe500: "Diskas pilnas. Spauskite PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8099,23 +7952,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK atšaukimui"
     gigabeatfx: "POWER atšaukimui"
-    sansafuzeplus: "BACK atšaukimui"
+    gigabeats,sansafuzeplus: "BACK atšaukimui"
+    iaudiom5,iaudiox5: "Ilgas PLAY atšaukimui"
+    ipod*: "PLAY/PAUSE atšaukimui"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV atšaukimui"
+    iriverh100,iriverh120,iriverh300: "STOP atšaukimui"
   </dest>
   <voice>
     *: ""
@@ -9667,7 +9518,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9709,16 +9560,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Keitimo rėžimas: %s %s"
+    *: "Keitimo rėžimas: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9726,16 +9574,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Nukirpimas"
+    *: "Nukirpimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nukirpimo dažnis"
+    *: "Nukirpimo dažnis"
   </voice>
 </phrase>
 <phrase>
@@ -9743,16 +9588,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Stiprinimas"
+    *: "Stiprinimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stiprinimas"
+    *: "Stiprinimas"
   </voice>
 </phrase>
 <phrase>
@@ -9760,16 +9602,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rėžimas:"
+    *: "Rėžimas:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10398,7 +10237,7 @@
     multivolume: "Nėra"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10432,15 +10271,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bosų nukirpimas"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bosų nukirpimas"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bosų nukirpimas"
   </voice>
 </phrase>
 <phrase>
@@ -10449,15 +10288,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Aukštų daž. Nukirpimas"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Aukštų daž. Nukirpimas"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Aukštų daž. Nukirpimas"
   </voice>
 </phrase>
 <phrase>
@@ -10493,16 +10332,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Klavišo paspaudimas"
+    *: "Klavišo paspaudimas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Klavišo paspaudimas"
+    *: "Klavišo paspaudimas"
   </voice>
 </phrase>
 <phrase>
@@ -10510,16 +10346,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Klavišo paspaudimų kartojimasis"
+    *: "Klavišo paspaudimų kartojimasis"
   </dest>
   <voice>
-    *: none
-    swcodec: "Klavišo paspaudimų kartojimasis"
+    *: "Klavišo paspaudimų kartojimasis"
   </voice>
 </phrase>
 <phrase>
@@ -10640,11 +10473,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Serijinis bitreitas"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "SSerijinis bitreitas"
   </voice>
@@ -10657,11 +10490,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatinis"
   </voice>
@@ -10674,11 +10507,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10691,11 +10524,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10708,11 +10541,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10725,11 +10558,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11221,7 +11054,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index f00b9b857f..b6c06a04d8 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -247,18 +247,18 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Igen"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Igen"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Igen"
     iriverh100,iriverh120,iriverh300: "NAVI = Igen"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Igen"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Igen"
   </dest>
   <voice>
@@ -797,16 +797,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -814,33 +811,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Közvetlen módosítás"
+    *: "Közvetlen módosítás"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Módosítás mértéke"
+    *: "Módosítás mértéke"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -848,16 +839,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Magas frekvencia enyhítés"
+    *: "Magas frekvencia enyhítés"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -865,16 +853,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Magas frekvencia levágás"
+    *: "Magas frekvencia levágás"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -882,16 +867,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -899,16 +881,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ bekapcsolása"
+    *: "EQ bekapcsolása"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </voice>
 </phrase>
 <phrase>
@@ -916,16 +895,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ beállítás"
+    *: "EQ beállítás"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </voice>
 </phrase>
 <phrase>
@@ -933,16 +909,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -950,16 +923,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Alap EQ beállítások"
+    *: "Alap EQ beállítások"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </voice>
 </phrase>
 <phrase>
@@ -967,16 +937,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Haladó EQ beállítások"
+    *: "Haladó EQ beállítások"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </voice>
 </phrase>
 <phrase>
@@ -984,16 +951,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ beállítások elmentése"
+    *: "EQ beállítások elmentése"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -1001,16 +965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Elmentett EQ beállítások"
+    *: "Elmentett EQ beállítások"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -1018,16 +979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mód: %s"
+    *: "Mód: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1035,16 +993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz sáv módosítás"
+    *: "%d Hz sáv módosítás"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1052,16 +1007,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Alsó perem szűrő"
+    *: "Alsó perem szűrő"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1069,16 +1021,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Csúcsszűrő %d"
+    *: "Csúcsszűrő %d"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1086,16 +1035,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Felső perem szűrő"
+    *: "Felső perem szűrő"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1103,16 +1049,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Határfrekvencia"
+    *: "Határfrekvencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1120,16 +1063,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Középfrekvencia"
+    *: "Középfrekvencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Center frequency"
+    *: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1137,16 +1077,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1154,16 +1091,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1706,16 +1640,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Túlvezérlés megelőzése"
+    *: "Túlvezérlés megelőzése"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent clipping"
+    *: "Prevent clipping"
   </voice>
 </phrase>
 <phrase>
@@ -1793,16 +1724,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pittyegés erőssége"
+    *: "Pittyegés erőssége"
   </dest>
   <voice>
-    *: none
-    swcodec: "Beep volume"
+    *: "Beep volume"
   </voice>
 </phrase>
 <phrase>
@@ -1810,16 +1738,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Halk"
+    *: "Halk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -1827,16 +1752,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Közepes"
+    *: "Közepes"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -1844,16 +1766,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Hangos"
+    *: "Hangos"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -2210,19 +2129,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Készítem az adatbázist... %d-t találtam (OFF - vissza)"
-    iriverh100,iriverh120,iriverh300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
-    ipod*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Készítem az adatbázist... %d-t találtam (BAL - vissza)"
     gogearsa9200: "Készítem az adatbázist... %d-t találtam (REW - vissza)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Készítem az adatbázist... %d-t találtam (PREV - vissza)"
+    iriverh100,iriverh120,iriverh300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -2404,16 +2321,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Betűtípus választás"
+    *: "Betűtípus választás"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Browse Fonts"
+    *: "Browse Fonts"
   </voice>
 </phrase>
 <phrase>
@@ -2532,11 +2446,11 @@
   </source>
   <dest>
     *: none
-    backlight_fade*:"Világítás beúsztatása"
+    backlight_fade*: "Világítás beúsztatása"
   </dest>
   <voice>
     *: none
-    backlight_fade*:"Backlight fade in"
+    backlight_fade*: "Backlight fade in"
   </voice>
 </phrase>
 <phrase>
@@ -2549,11 +2463,11 @@
   </source>
   <dest>
     *: none
-    backlight_fade*:"Világítás kiúsztatása"
+    backlight_fade*: "Világítás kiúsztatása"
   </dest>
   <voice>
     *: none
-    backlight_fade*:"Backlight fade out"
+    backlight_fade*: "Backlight fade out"
   </voice>
 </phrase>
 <phrase>
@@ -2674,16 +2588,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fejjel lefelé"
+    *: "Fejjel lefelé"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2691,16 +2602,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Sor kiválasztása"
+    *: "Sor kiválasztása"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -2708,16 +2616,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mutató"
+    *: "Mutató"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -2725,16 +2630,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Teljes sor kiemelése"
+    *: "Teljes sor kiemelése"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3024,16 +2926,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gördítés képernyőn túl"
+    *: "Gördítés képernyőn túl"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -3041,16 +2940,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Képernyőgördítés egysége"
+    *: "Képernyőgördítés egysége"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -3106,16 +3002,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Állapot-/Gördítősáv"
+    *: "Állapot-/Gördítősáv"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -3123,16 +3016,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gördítő sáv"
+    *: "Gördítő sáv"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3140,16 +3030,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Állapotjelző"
+    *: "Állapotjelző"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3174,16 +3061,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hangerő kijelzés"
+    *: "Hangerő kijelzés"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3191,16 +3075,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Akku kijelzés"
+    *: "Akku kijelzés"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3208,16 +3089,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafikusan"
+    *: "Grafikusan"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3225,16 +3103,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Számmal"
+    *: "Számmal"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -3454,16 +3329,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Héber (ISO-8859-8)"
+    *: "Héber (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -3485,16 +3357,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3502,16 +3371,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arab (CP1256)"
+    *: "Arab (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -3547,16 +3413,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japán (SJIS)"
+    *: "Japán (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </voice>
 </phrase>
 <phrase>
@@ -3564,16 +3427,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Egyszerűsített kínai (GB2312)"
+    *: "Egyszerűsített kínai (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3581,16 +3441,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreai (KSX1001)"
+    *: "Koreai (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -3598,16 +3455,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hagyományos kínai (BIG5)"
+    *: "Hagyományos kínai (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3631,17 +3485,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Gomb világításának hossza"
-    sansafuze*,sansae200*: "Kerék világításának hossza"
+    sansae200*,sansafuze*: "Kerék világításának hossza"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3912,23 +3766,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Beállít"
-    mrobe500: "SZÍV = Beállít"
-    iriverh100,iriverh120,iriverh300: "NAVI = Beállít"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Beállít"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Beállít"
     gogearsa9200,samsungyh*: "PLAY = Beállít"
-    vibe500: "OK = Beállít"
+    iriverh100,iriverh120,iriverh300: "NAVI = Beállít"
     mpiohd300: "ENTER = Beállít"
+    mrobe500: "SZÍV = Beállít"
+    rtc: "ON = Beállít"
+    vibe500: "OK = Beállít"
   </dest>
   <voice>
     *: none
@@ -3940,35 +3794,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "KI = mégsem"
-    mrobe500: "POWER = mégsem"
-    iriverh100,iriverh120,iriverh300: "STOP = mégsem"
-    ipod*,sansac200*,mpiohd300: "MENU = mégsem"
-    iaudiox5,iaudiom5: "RECORD = mégsem"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = mégsem"
-    gigabeatfx: "POWER = mégsem"
-    sansafuzeplus: "BACK = mégsem"
-    mrobe100: "DISPLAY = mégsem"
+    gigabeatfx,mrobe500: "POWER = mégsem"
     gigabeats: "VISSZA = mégsem"
     gogearsa9200: "BAL = mégsem"
-    vibe500: "C = mégsem"
+    iaudiom5,iaudiox5: "RECORD = mégsem"
+    ipod*,mpiohd300,sansac200*: "MENU = mégsem"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = mégsem"
+    iriverh100,iriverh120,iriverh300: "STOP = mégsem"
+    mrobe100: "DISPLAY = mégsem"
+    rtc: "KI = mégsem"
     samsungyh*: "REW = mégsem"
+    sansafuzeplus: "BACK = mégsem"
+    vibe500: "C = mégsem"
   </dest>
   <voice>
     *: none
@@ -4457,22 +4308,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=OK KI=Mégsem"
+    gigabeats: "SELECT=OK POWER=Mégsem"
     ipod*: "SELECT=OK MENU=Mégsem"
     iriverh10,iriverh10_5gb: "SELECT=OK PREV=Mégsem"
-    gigabeats: "SELECT=OK POWER=Mégsem"
-    vibe500: "OK=OK C=Mégsem"
     mpiohd300: "ENTER=OK MENU=Mégsem"
     sansafuzeplus: "SELECT=OK  BACK=Mégsem"
+    vibe500: "OK=OK C=Mégsem"
   </dest>
   <voice>
     *: none
@@ -5375,8 +5226,7 @@
     radio: "US / Canada"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Észak-Amerika"
+    *: "Észak-Amerika"
   </dest>
   <voice>
     *: none
@@ -5576,15 +5426,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Mintavétel"
+    play_frequency,recording: "Mintavétel"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -5627,18 +5477,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Belső mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -6516,13 +6366,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Akku: %d%% %d óra %d perc"
+    ipodmini1g,ipodmini2g,iriverh10: "Akku: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6579,23 +6429,23 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro Secure Digital card:"
-    xduoox3: "micro Secure Digital card 2:"
     archosondio*: "Multimedia card"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro Secure Digital card:"
+    xduoox3: "micro Secure Digital card 2:"
   </voice>
 </phrase>
 <phrase>
@@ -7911,23 +7761,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "A merevlemez tele van. Folytatáshoz nyomj OFF-ot."
-    iriverh100,iriverh120,iriverh300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
     iaudiom5,iaudiox5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot."
-    sansae200*,sansac200*,vibe500: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
+    iriverh100,iriverh120,iriverh300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot."
+    recording: "A merevlemez tele van. Folytatáshoz nyomj OFF-ot."
     samsungyh*: "A merevlemez tele van. Folytatáshoz nyomd meg a LEFT gombot."
+    sansac200*,sansae200*,vibe500: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8015,22 +7865,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF - 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"
-    gigabeats: "VISSZA - megszakít"
     gigabeatfx: "POWER - megszakít"
+    gigabeats: "VISSZA - megszakít"
+    iaudiom5,iaudiox5: "PLAY hosszan - megszakít"
+    ipod*: "PLAY/PAUSE - megszakít"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV - megszakít"
+    iriverh100,iriverh120,iriverh300: "STOP - megszakít"
     sansafuzeplus: "BACK - megszakít"
   </dest>
   <voice>
@@ -9582,7 +9431,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9624,16 +9473,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Szerkesztés: %s %s"
+    *: "Szerkesztés: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9641,16 +9487,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Határfrekvencia"
+    *: "Határfrekvencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -9658,16 +9501,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Módosítás"
+    *: "Módosítás"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9675,16 +9515,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mód:"
+    *: "Mód:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10132,11 +9969,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10195,15 +10032,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Alsó határfrekvencia"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Alsó határfrekvencia"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10341,11 +10178,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Soros port szélessége"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Serial Bitrate"
   </voice>
@@ -10372,11 +10209,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10617,16 +10454,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Billentyűhangok"
+    *: "Billentyűhangok"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -10637,11 +10471,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10654,11 +10488,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -10875,15 +10709,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Magas határfrekvencia"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Magas határfrekvencia"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10981,16 +10815,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Billentyűhang ismétlés"
+    *: "Billentyűhang ismétlés"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -11018,11 +10849,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Automatikus"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatic"
   </voice>
@@ -11156,16 +10987,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gördítősáv pozíció"
+    *: "Gördítősáv pozíció"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gördítősáv pozíció"
+    *: "Gördítősáv pozíció"
   </voice>
 </phrase>
 <phrase>
@@ -11306,16 +11134,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gördítősáv szélesség"
+    *: "Gördítősáv szélesség"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gördítősáv szélesség"
+    *: "Gördítősáv szélesség"
   </voice>
 </phrase>
 <phrase>
@@ -11351,16 +11176,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Időnyújtás"
+    *: "Időnyújtás"
   </dest>
   <voice>
-    *: none
-    swcodec: "Időnyújtás"
+    *: "Időnyújtás"
   </voice>
 </phrase>
 <phrase>
@@ -11368,16 +11190,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Határoló erősítő"
+    *: "Határoló erősítő"
   </dest>
   <voice>
-    *: none
-    swcodec: "Határoló erősítő"
+    *: "Határoló erősítő"
   </voice>
 </phrase>
 <phrase>
@@ -11430,21 +11249,18 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Sebesség"
+    *: "Sebesség"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sebesség"
+    *: "Sebesség"
   </voice>
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11461,16 +11277,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Maximum"
+    *: "Maximum"
   </dest>
   <voice>
-    *: none
-    swcodec: "Maximum"
+    *: "Maximum"
   </voice>
 </phrase>
 <phrase>
@@ -11495,16 +11308,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11560,16 +11370,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q érték"
+    *: "Q érték"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q érték"
+    *: "Q érték"
   </voice>
 </phrase>
 <phrase>
@@ -11591,16 +11398,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Hallgatásteher Csökkentése"
+    *: "Hallgatásteher Csökkentése"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hallgatásteher Csökkentése"
+    *: "Hallgatásteher Csökkentése"
   </voice>
 </phrase>
 <phrase>
@@ -11622,16 +11426,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Egyszerű (Meier)"
+    *: "Egyszerű (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Egyszerű"
+    *: "Egyszerű"
   </voice>
 </phrase>
 <phrase>
@@ -11701,16 +11502,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Száraz / Nedves Keverés"
+    *: "Száraz / Nedves Keverés"
   </dest>
   <voice>
-    *: none
-    swcodec: "Száraz / Nedves Keverés"
+    *: "Száraz / Nedves Keverés"
   </voice>
 </phrase>
 <phrase>
@@ -11766,16 +11564,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </voice>
 </phrase>
 <phrase>
@@ -11797,16 +11592,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Küszöb"
+    *: "Küszöb"
   </dest>
   <voice>
-    *: none
-    swcodec: "Küszöb"
+    *: "Küszöb"
   </voice>
 </phrase>
 <phrase>
@@ -11831,16 +11623,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </voice>
 </phrase>
 <phrase>
@@ -11849,18 +11638,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB Mód"
-    ibassodx90: "USB Mód"
+    ibassodx50,ibassodx90: "USB Mód"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB Mód"
-    ibassodx90: "USB Mód"
+    ibassodx50,ibassodx90: "USB Mód"
   </voice>
 </phrase>
 <phrase>
@@ -11930,16 +11716,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Előretekerés Folytatás Előtt"
+    *: "Előretekerés Folytatás Előtt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Előretekerés Folytatás Előtt"
+    *: "Előretekerés Folytatás Előtt"
   </voice>
 </phrase>
 <phrase>
@@ -11947,16 +11730,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Átmenet"
+    *: "Átmenet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Átmenet"
+    *: "Átmenet"
   </voice>
 </phrase>
 <phrase>
@@ -12184,16 +11964,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Alap skin"
+    *: "Alap skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Alap skin"
+    *: "Alap skin"
   </voice>
 </phrase>
 <phrase>
@@ -12215,16 +11992,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12232,16 +12006,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Nyereség"
+    *: "Nyereség"
   </dest>
   <voice>
-    *: none
-    swcodec: "Nyereség"
+    *: "Nyereség"
   </voice>
 </phrase>
 <phrase>
@@ -12249,16 +12020,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12297,16 +12065,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </voice>
 </phrase>
 <phrase>
@@ -12331,16 +12096,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Működési idő"
+    *: "Működési idő"
   </dest>
   <voice>
-    *: none
-    swcodec: "Működési idő"
+    *: "Működési idő"
   </voice>
 </phrase>
 <phrase>
@@ -12509,16 +12271,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Hatásidő"
+    *: "Hatásidő"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hatásidő"
+    *: "Hatásidő"
   </voice>
 </phrase>
 <phrase>
@@ -12527,18 +12286,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Csak Töltés"
-    ibassodx90: "Csak Töltés"
+    ibassodx50,ibassodx90: "Csak Töltés"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Csak Töltés"
-    ibassodx90: "Csak Töltés"
+    ibassodx50,ibassodx90: "Csak Töltés"
   </voice>
 </phrase>
 <phrase>
@@ -12546,16 +12302,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Arány"
+    *: "Arány"
   </dest>
   <voice>
-    *: none
-    swcodec: "Arány"
+    *: "Arány"
   </voice>
 </phrase>
 <phrase>
@@ -12563,16 +12316,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Egyéni"
+    *: "Egyéni"
   </dest>
   <voice>
-    *: none
-    swcodec: "Egyéni"
+    *: "Egyéni"
   </voice>
 </phrase>
 <phrase>
@@ -12598,18 +12348,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Frekvencia szabályzó"
-    ibassodx90: "Frekvencia szabályzó"
+    ibassodx50,ibassodx90: "Frekvencia szabályzó"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Frekvencia szabályzó"
-    ibassodx90: "Frekvencia szabályzó"
+    ibassodx50,ibassodx90: "Frekvencia szabályzó"
   </voice>
 </phrase>
 <phrase>
@@ -12665,16 +12412,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Enyhe küszöb"
+    *: "Enyhe küszöb"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enyhe küszöb"
+    *: "Enyhe küszöb"
   </voice>
 </phrase>
 <phrase>
@@ -12848,16 +12592,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "CSAK OLDALT"
+    *: "CSAK OLDALT"
   </dest>
   <voice>
-    *: none
-    swcodec: "CSAK OLDALT"
+    *: "CSAK OLDALT"
   </voice>
 </phrase>
 <phrase>
@@ -12992,16 +12733,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -13023,16 +12761,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </voice>
 </phrase>
 <phrase>
@@ -13088,16 +12823,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Éles küszöb"
+    *: "Éles küszöb"
   </dest>
   <voice>
-    *: none
-    swcodec: "Éles küszöb"
+    *: "Éles küszöb"
   </voice>
 </phrase>
 <phrase>
@@ -13168,18 +12900,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Cserélhető lemez mód"
-    ibassodx90: "Cserélhető lemez mód"
+    ibassodx50,ibassodx90: "Cserélhető lemez mód"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Cserélhető lemez mód"
-    ibassodx90: "Cserélhető lemez mód"
+    ibassodx50,ibassodx90: "Cserélhető lemez mód"
   </voice>
 </phrase>
 <phrase>
@@ -13202,18 +12931,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13221,16 +12947,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Térhatás"
+    *: "Haas Térhatás"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Térhatás"
+    *: "Haas Térhatás"
   </voice>
 </phrase>
 <phrase>
@@ -13325,15 +13048,12 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Mélyhangkiemelés"
+    *: "Mélyhangkiemelés"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mélyhangkiemelés"
+    *: "Mélyhangkiemelés"
   </voice>
 </phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 3aa7a64c2f..f666073c1a 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -618,16 +618,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -635,16 +632,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -823,16 +817,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ inschakelen"
+    *: "EQ inschakelen"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ inschakelen"
+    *: "EQ inschakelen"
   </voice>
 </phrase>
 <phrase>
@@ -840,16 +831,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafische EQ"
+    *: "Grafische EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafische EQ"
+    *: "Grafische EQ"
   </voice>
 </phrase>
 <phrase>
@@ -857,16 +845,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Voorsnijden"
+    *: "Voorsnijden"
   </dest>
   <voice>
-    *: none
-    swcodec: "Voorsnijden"
+    *: "Voorsnijden"
   </voice>
 </phrase>
 <phrase>
@@ -874,16 +859,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Eenvoudige EQ-instellingen"
+    *: "Eenvoudige EQ-instellingen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Eenvoudige EQ-instellingen"
+    *: "Eenvoudige EQ-instellingen"
   </voice>
 </phrase>
 <phrase>
@@ -891,16 +873,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Geavanceerde EQ-instellingen"
+    *: "Geavanceerde EQ-instellingen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Geavanceerde EQ-instellingen"
+    *: "Geavanceerde EQ-instellingen"
   </voice>
 </phrase>
 <phrase>
@@ -908,16 +887,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ-voorkeuze opslaan"
+    *: "EQ-voorkeuze opslaan"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ-voorkeuze opslaan"
+    *: "EQ-voorkeuze opslaan"
   </voice>
 </phrase>
 <phrase>
@@ -925,16 +901,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ-voorkeuzes laden"
+    *: "EQ-voorkeuzes laden"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ-voorkeuzes laden"
+    *: "EQ-voorkeuzes laden"
   </voice>
 </phrase>
 <phrase>
@@ -942,16 +915,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Bewerkmodus: %s"
+    *: "Bewerkmodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -959,16 +929,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz-bandversterking"
+    *: "%d Hz-bandversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz bandversterking"
+    *: "Hertz bandversterking"
   </voice>
 </phrase>
 <phrase>
@@ -976,16 +943,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Lagebandfilter"
+    *: "Lagebandfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lagebandfilter"
+    *: "Lagebandfilter"
   </voice>
 </phrase>
 <phrase>
@@ -993,16 +957,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Piekfilter %d"
+    *: "Piekfilter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Piekfilter"
+    *: "Piekfilter"
   </voice>
 </phrase>
 <phrase>
@@ -1010,16 +971,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Hogebandfilter"
+    *: "Hogebandfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hogebandfilter"
+    *: "Hogebandfilter"
   </voice>
 </phrase>
 <phrase>
@@ -1027,16 +985,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -1044,16 +999,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Middenfrequentie"
+    *: "Middenfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Middenfrequentie"
+    *: "Middenfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -1061,16 +1013,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1336,16 +1285,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Biep bij nummer overslaan"
+    *: "Biep bij nummer overslaan"
   </dest>
   <voice>
-    *: none
-    swcodec: "Biep bij nummer overslaan"
+    *: "Biep bij nummer overslaan"
   </voice>
 </phrase>
 <phrase>
@@ -1353,16 +1299,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Zwak"
+    *: "Zwak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zwak"
+    *: "Zwak"
   </voice>
 </phrase>
 <phrase>
@@ -1370,16 +1313,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Normaal"
+    *: "Normaal"
   </dest>
   <voice>
-    *: none
-    swcodec: "Normaal"
+    *: "Normaal"
   </voice>
 </phrase>
 <phrase>
@@ -1387,16 +1327,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Sterk"
+    *: "Sterk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sterk"
+    *: "Sterk"
   </voice>
 </phrase>
 <phrase>
@@ -1690,16 +1627,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lettertype"
+    *: "Lettertype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lettertype"
+    *: "Lettertype"
   </voice>
 </phrase>
 <phrase>
@@ -1783,16 +1717,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/scrollbalk"
+    *: "Status-/scrollbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- en scrollbalk"
+    *: "Status- en scrollbalk"
   </voice>
 </phrase>
 <phrase>
@@ -1859,16 +1790,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreeuws (ISO-8859-8)"
+    *: "Hebreeuws (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreeuws"
+    *: "Hebreeuws"
   </voice>
 </phrase>
 <phrase>
@@ -1890,16 +1818,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thais (ISO-8859-11)"
+    *: "Thais (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thais"
+    *: "Thais"
   </voice>
 </phrase>
 <phrase>
@@ -1907,16 +1832,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisch (CP1256)"
+    *: "Arabisch (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabisch"
+    *: "Arabisch"
   </voice>
 </phrase>
 <phrase>
@@ -1952,16 +1874,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japans (SJIS)"
+    *: "Japans (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japans"
+    *: "Japans"
   </voice>
 </phrase>
 <phrase>
@@ -1969,16 +1888,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vereenvoudigd Chinees (GB2312)"
+    *: "Vereenvoudigd Chinees (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vereenvoudigd Chinees"
+    *: "Vereenvoudigd Chinees"
   </voice>
 </phrase>
 <phrase>
@@ -1986,16 +1902,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreaans (KSX1001)"
+    *: "Koreaans (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreaans"
+    *: "Koreaans"
   </voice>
 </phrase>
 <phrase>
@@ -2003,16 +1916,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traditioneel Chinees (BIG5)"
+    *: "Traditioneel Chinees (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditioneel Chinees"
+    *: "Traditioneel Chinees"
   </voice>
 </phrase>
 <phrase>
@@ -2239,15 +2149,9 @@
 </phrase>
 <phrase>
   id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
-### The 'desc' field differs from the english!
-### the previously used desc is commented below:
-### desc: Save only on bookmark for each playlist in recent bookmarks
   desc: deprecated
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "Unique only"
     *: ""
   </source>
   <dest>
@@ -2364,15 +2268,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frequentie"
+    play_frequency,recording: "Frequentie"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequentie"
+    play_frequency,recording: "Frequentie"
   </voice>
 </phrase>
 <phrase>
@@ -2398,18 +2302,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microfoon"
     iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    recording: "Microfoon"
   </dest>
   <voice>
     *: none
-    recording: "Microfoon"
     iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    recording: "Microfoon"
   </voice>
 </phrase>
 <phrase>
@@ -2751,16 +2655,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Voorkom clippen"
+    *: "Voorkom clippen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Voorkom clippen"
+    *: "Voorkom clippen"
   </voice>
 </phrase>
 <phrase>
@@ -2996,16 +2897,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ondersteboven"
+    *: "Ondersteboven"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ondersteboven"
+    *: "Ondersteboven"
   </voice>
 </phrase>
 <phrase>
@@ -3013,16 +2911,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Regelkiezertype"
+    *: "Regelkiezertype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Regelkiezertype"
+    *: "Regelkiezertype"
   </voice>
 </phrase>
 <phrase>
@@ -3030,16 +2925,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aanwijzer"
+    *: "Aanwijzer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aanwijzer"
+    *: "Aanwijzer"
   </voice>
 </phrase>
 <phrase>
@@ -3047,16 +2939,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Balk (geïnverteerd)"
+    *: "Balk (geïnverteerd)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Balk (geïnverteerd)"
+    *: "Balk (geïnverteerd)"
   </voice>
 </phrase>
 <phrase>
@@ -3233,16 +3122,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scherm schuift uit beeld"
+    *: "Scherm schuift uit beeld"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scherm schuift uit beeld"
+    *: "Scherm schuift uit beeld"
   </voice>
 </phrase>
 <phrase>
@@ -3250,16 +3136,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Schermscrollstapgrootte"
+    *: "Schermscrollstapgrootte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Schermscrollstapgrootte"
+    *: "Schermscrollstapgrootte"
   </voice>
 </phrase>
 <phrase>
@@ -3281,16 +3164,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalk"
+    *: "Scrollbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalk"
+    *: "Scrollbalk"
   </voice>
 </phrase>
 <phrase>
@@ -3298,16 +3178,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusbalk"
+    *: "Statusbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statusbalk"
+    *: "Statusbalk"
   </voice>
 </phrase>
 <phrase>
@@ -3332,16 +3209,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volume tonen als"
+    *: "Volume tonen als"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume tonen als"
+    *: "Volume tonen als"
   </voice>
 </phrase>
 <phrase>
@@ -3349,16 +3223,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterij tonen als"
+    *: "Batterij tonen als"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterij tonen als"
+    *: "Batterij tonen als"
   </voice>
 </phrase>
 <phrase>
@@ -3366,16 +3237,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisch"
+    *: "Grafisch"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisch"
+    *: "Grafisch"
   </voice>
 </phrase>
 <phrase>
@@ -3383,16 +3251,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeriek"
+    *: "Numeriek"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeriek"
+    *: "Numeriek"
   </voice>
 </phrase>
 <phrase>
@@ -4242,13 +4107,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterijniveau"
@@ -4305,24 +4170,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimediakaart"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "Multimediakaart"
   </voice>
 </phrase>
 <phrase>
@@ -4452,51 +4317,45 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = terugzetten"
-    mrobe500: "POWER = terugzetten"
-    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
-    ipod*,sansac200*,mpiohd300: "MENU = terugzetten"
-    iaudiox5,iaudiom5: "RECORD = terugzetten"
+    gigabeatfx,mrobe500: "POWER = terugzetten"
+    gigabeats,sansafuzeplus: "BACK = terugzetten"
+    gogearsa9200: "LINKS = terugzetten"
+    iaudiom5,iaudiox5: "RECORD = terugzetten"
+    ipod*,mpiohd300,sansac200*: "MENU = terugzetten"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
-    gigabeatfx: "POWER = terugzetten"
-    sansafuzeplus: "BACK = terugzetten"
+    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    gigabeats: "BACK = terugzetten"
-    gogearsa9200: "LINKS = terugzetten"
-    vibe500: "C = terugzetten"
+    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
+    vibe500: "C = terugzetten"
   </dest>
   <voice>
     *: none
-    rtc: "OFF = terugzetten"
-    mrobe500: "POWER = terugzetten"
-    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
-    ipod*,sansac200*,mpiohd300: "MENU = terugzetten"
-    iaudiox5,iaudiom5: "RECORD = terugzetten"
+    gigabeatfx,mrobe500: "POWER = terugzetten"
+    gigabeats,sansafuzeplus: "BACK = terugzetten"
+    gogearsa9200: "LINKS = terugzetten"
+    iaudiom5,iaudiox5: "RECORD = terugzetten"
+    ipod*,mpiohd300,sansac200*: "MENU = terugzetten"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
-    gigabeatfx: "POWER = terugzetten"
-    sansafuzeplus: "BACK = terugzetten"
+    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    gigabeats: "BACK = terugzetten"
-    gogearsa9200: "LINKS = terugzetten"
-    vibe500: "C = terugzetten"
+    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
+    vibe500: "C = terugzetten"
   </voice>
 </phrase>
 <phrase>
@@ -4539,27 +4398,27 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "De schijf is vol. Druk op OFF om verder te gaan."
-    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk op STOP om verder te gaan."
     iaudiom5,iaudiox5: "De schijf is vol. Druk op POWER om verder te gaan."
-    sansae200*,sansac200*,vibe500: "De schijf is vol. Druk op PREV om verder te gaan."
+    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk op STOP om verder te gaan."
+    recording: "De schijf is vol. Druk op OFF om verder te gaan."
     samsungyh*: "De schijf is vol. Druk op LINKS om verder te gaan."
+    sansac200*,sansae200*,vibe500: "De schijf is vol. Druk op PREV om verder te gaan."
   </dest>
   <voice>
     *: none
-    recording: "De schijf is vol. Druk op OFF om verder te gaan."
-    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk op STOP om verder te gaan."
     iaudiom5,iaudiox5: "De schijf is vol. Druk op POWER om verder te gaan."
-    sansae200*,sansac200*,vibe500: "De schijf is vol. Druk op PREV om verder te gaan."
+    iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk op STOP om verder te gaan."
+    recording: "De schijf is vol. Druk op OFF om verder te gaan."
     samsungyh*: "De schijf is vol. Druk op LINKS om verder te gaan."
+    sansac200*,sansae200*,vibe500: "De schijf is vol. Druk op PREV om verder te gaan."
   </voice>
 </phrase>
 <phrase>
@@ -4722,32 +4581,32 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=instellen, OFF=annuleren"
+    gigabeats: "SELECT=instellen, POWER=annuleren"
     ipod*: "SELECT=instellen, MENU=annuleren"
     iriverh10,iriverh10_5gb: "SELECT=instellen, PREV=annuleren"
-    gigabeats: "SELECT=instellen, POWER=annuleren"
-    vibe500: "OK=instellen, C=annuleren"
     mpiohd300: "ENTER=instellen, MENU=annuleren"
     sansafuzeplus: "SELECT=instellen, BACK=annuleren"
+    vibe500: "OK=instellen, C=annuleren"
   </dest>
   <voice>
     *: none
     alarm: "PLAY=instellen, OFF=annuleren"
+    gigabeats: "SELECT=instellen, POWER=annuleren"
     ipod*: "SELECT=instellen, MENU=annuleren"
     iriverh10,iriverh10_5gb: "SELECT=instellen, PREV=annuleren"
-    gigabeats: "SELECT=instellen, POWER=annuleren"
-    vibe500: "OK=instellen, C=annuleren"
     mpiohd300: "ENTER=instellen, MENU=annuleren"
     sansafuzeplus: "SELECT=instellen, BACK=annuleren"
+    vibe500: "OK=instellen, C=annuleren"
   </voice>
 </phrase>
 <phrase>
@@ -4810,11 +4669,11 @@
     lcd_color: "Invalid colour"
   </source>
   <dest>
-   *: none
+    *: none
     lcd_color: "Ongeldige kleur"
   </dest>
   <voice>
-   *: none
+    *: none
     lcd_color: "Ongeldige kleur"
   </voice>
 </phrase>
@@ -6003,15 +5862,9 @@
 </phrase>
 <phrase>
   id: LANG_KILOBYTE
-### The 'desc' field differs from the english!
-### the previously used desc is commented below:
-### desc: a unit postfix, also voiced
   desc: deprecated
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "KB"
     *: ""
   </source>
   <dest>
@@ -6023,15 +5876,9 @@
 </phrase>
 <phrase>
   id: LANG_MEGABYTE
-### The 'desc' field differs from the english!
-### the previously used desc is commented below:
-### desc: a unit postfix, also voiced
   desc: deprecated
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "MB"
     *: ""
   </source>
   <dest>
@@ -6043,15 +5890,9 @@
 </phrase>
 <phrase>
   id: LANG_GIGABYTE
-### The 'desc' field differs from the english!
-### the previously used desc is commented below:
-### desc: a unit postfix, also voiced
   desc: deprecated
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "GB"
     *: ""
   </source>
   <dest>
@@ -7202,33 +7043,30 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK om af te breken"
     gigabeatfx: "POWER om af te breken"
-    sansafuzeplus: "BACK om af te breken"
+    gigabeats,sansafuzeplus: "BACK om af te breken"
+    iaudiom5,iaudiox5: "Lang PLAY om af te breken"
+    ipod*: "PLAY/PAUSE om af te breken"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV om af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP om af te breken"
   </dest>
   <voice>
     *: "OFF 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"
-    gigabeats: "BACK om af te breken"
     gigabeatfx: "POWER om af te breken"
-    sansafuzeplus: "BACK om af te breken"
+    gigabeats,sansafuzeplus: "BACK om af te breken"
+    iaudiom5,iaudiox5: "Lang PLAY om af te breken"
+    ipod*: "PLAY/PAUSE om af te breken"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV om af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP om af te breken"
   </voice>
 </phrase>
 <phrase>
@@ -7568,33 +7406,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Rechtstreekse versterking"
+    *: "Rechtstreekse versterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rechtstreekse versterking"
+    *: "Rechtstreekse versterking"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
-  <dest>  
-    *: none
-    swcodec: "Crossversterking"
+  <dest>
+    *: "Crossversterking"
   </dest>
-  <voice>  
-    *: none
-    swcodec: "Crossversterking"
+  <voice>
+    *: "Crossversterking"
   </voice>
 </phrase>
 <phrase>
@@ -7602,16 +7434,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Hogefrequentievermindering"
+    *: "Hogefrequentievermindering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hogefrequentievermindering"
+    *: "Hogefrequentievermindering"
   </voice>
 </phrase>
 <phrase>
@@ -7619,16 +7448,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Hoge afsnijfrequentie"
+    *: "Hoge afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hoge afsnijfrequentie"
+    *: "Hoge afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -7985,16 +7811,9 @@
 </phrase>
 <phrase>
   id: LANG_NEVER
-### The 'desc' field differs from the english!
-### the previously used desc is commented below:
-### desc: in lcd settings
   desc: deprecated
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: none
-###     lcd_sleep: "Never"
     *: none
     lcd_sleep: ""
   </source>
@@ -8063,16 +7882,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Bewerkmodus: %s %s"
+    *: "Bewerkmodus: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8080,16 +7896,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -8518,16 +8331,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -9060,21 +8870,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Aanmaken van database... %d gevonden (OFF = terug)"
-    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
-    ipod*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Aanmaken van database... %d gevonden (LINKS = terug)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Aanmaken van database... %d gevonden (PREV = terug)"
-    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
     archosplayer: "Aanmaken DB %d gev."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Aanmaken van database... %d gevonden (LINKS = terug)"
+    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Aanmaken van database... %d gevonden (PREV = terug)"
+    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
   </dest>
   <voice>
     *: "aantal bestanden gevonden in database"
@@ -9382,17 +9190,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiellichttime-out"
+    sansae200*,sansafuze*: "Wiellichttime-out"
   </dest>
   <voice>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiellichttime-out"
+    sansae200*,sansafuze*: "Wiellichttime-out"
   </voice>
 </phrase>
 <phrase>
@@ -9586,33 +9394,33 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU of rechtsboven = ja"
+    creativezen*: "Select = ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ja"
     iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ja"
     mrobe500: "PLAY, POWER of rechtsboven = ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = ja"
-    creativezen*: "Select = ja"
   </dest>
   <voice>
     *: "PLAY = ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU of rechtsboven = ja"
+    creativezen*: "Select = ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ja"
     iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ja"
     mrobe500: "PLAY, POWER of rechtsboven = ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = ja"
-    creativezen*: "Select = ja"
   </voice>
 </phrase>
 <phrase>
@@ -9621,33 +9429,33 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = instellen"
-    mrobe500: "HEART = instellen"
-    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = instellen"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
-    vibe500: "OK = instellen"
+    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
+    mrobe500: "HEART = instellen"
+    rtc: "ON = instellen"
+    vibe500: "OK = instellen"
   </dest>
   <voice>
     *: none
-    rtc: "ON = instellen"
-    mrobe500: "HEART = instellen"
-    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = instellen"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
-    vibe500: "OK = instellen"
+    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
+    mrobe500: "HEART = instellen"
+    rtc: "ON = instellen"
+    vibe500: "OK = instellen"
   </voice>
 </phrase>
 <phrase>
@@ -9733,16 +9541,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Versterking"
+    *: "Versterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Versterking"
+    *: "Versterking"
   </voice>
 </phrase>
 <phrase>
@@ -9764,16 +9569,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modus:"
+    *: "Modus:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Modus"
+    *: "Modus"
   </voice>
 </phrase>
 <phrase>
@@ -9908,7 +9710,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -10440,15 +10242,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -10457,15 +10259,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -10501,16 +10303,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Toetsklik"
+    *: "Toetsklik"
   </dest>
   <voice>
-    *: none
-    swcodec: "Toetsklik"
+    *: "Toetsklik"
   </voice>
 </phrase>
 <phrase>
@@ -10518,16 +10317,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Toetsklikherhaling"
+    *: "Toetsklikherhaling"
   </dest>
   <voice>
-    *: none
-    swcodec: "Toetsklikherhaling"
+    *: "Toetsklikherhaling"
   </voice>
 </phrase>
 <phrase>
@@ -11040,11 +10836,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -11057,11 +10853,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Seriële bitrate"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Seriële bitrate"
   </voice>
@@ -11074,11 +10870,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -11091,11 +10887,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -11108,11 +10904,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11139,11 +10935,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatisch"
   </voice>
@@ -11277,16 +11073,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Afspeelsnelheid"
+    *: "Afspeelsnelheid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afspeelsnelheid"
+    *: "Afspeelsnelheid"
   </voice>
 </phrase>
 <phrase>
@@ -11294,16 +11087,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Snelheid"
+    *: "Snelheid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Snelheid"
+    *: "Snelheid"
   </voice>
 </phrase>
 <phrase>
@@ -11393,7 +11183,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11458,16 +11248,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalkbreedte"
+    *: "Scrollbalkbreedte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalkbreedte"
+    *: "Scrollbalkbreedte"
   </voice>
 </phrase>
 <phrase>
@@ -11475,16 +11262,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalkpositie"
+    *: "Scrollbalkpositie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalkpositie"
+    *: "Scrollbalkpositie"
   </voice>
 </phrase>
 <phrase>
@@ -11520,16 +11304,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Releasetijd"
+    *: "Releasetijd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Releasetijd"
+    *: "Releasetijd"
   </voice>
 </phrase>
 <phrase>
@@ -11537,16 +11318,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Drempel"
+    *: "Drempel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Drempel"
+    *: "Drempel"
   </voice>
 </phrase>
 <phrase>
@@ -11554,16 +11332,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Compensatieversterking"
+    *: "Compensatieversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compensatieversterking"
+    *: "Compensatieversterking"
   </voice>
 </phrase>
 <phrase>
@@ -11588,16 +11363,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knie"
+    *: "Knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knie"
+    *: "Knie"
   </voice>
 </phrase>
 <phrase>
@@ -11605,16 +11377,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatisch"
+    *: "Automatisch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisch"
+    *: "Automatisch"
   </voice>
 </phrase>
 <phrase>
@@ -11636,16 +11405,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Zachte knie"
+    *: "Zachte knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zachte knie"
+    *: "Zachte knie"
   </voice>
 </phrase>
 <phrase>
@@ -11653,16 +11419,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Verhouding"
+    *: "Verhouding"
   </dest>
   <voice>
-    *: none
-    swcodec: "Verhouding"
+    *: "Verhouding"
   </voice>
 </phrase>
 <phrase>
@@ -11687,16 +11450,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Harde knie"
+    *: "Harde knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Harde knie"
+    *: "Harde knie"
   </voice>
 </phrase>
 <phrase>
@@ -11789,16 +11549,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 op 1"
+    *: "10 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11806,16 +11563,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 op 1"
+    *: "2 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11840,16 +11594,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limiet"
+    *: "Limiet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiet"
+    *: "Limiet"
   </voice>
 </phrase>
 <phrase>
@@ -11916,16 +11667,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 op 1"
+    *: "6 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11933,16 +11681,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11950,16 +11695,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 op 1"
+    *: "4 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -12060,16 +11802,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Basisthema"
+    *: "Basisthema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Basisthema"
+    *: "Basisthema"
   </voice>
 </phrase>
 <phrase>
@@ -12077,16 +11816,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Extern basisthema"
+    *: "Extern basisthema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Extern basisthema"
+    *: "Extern basisthema"
   </voice>
 </phrase>
 <phrase>
@@ -12281,16 +12017,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Terugspoelen alvorens te hervatten"
+    *: "Terugspoelen alvorens te hervatten"
   </dest>
   <voice>
-    *: none
-    swcodec: "Terugspoelen alvorens te hervatten"
+    *: "Terugspoelen alvorens te hervatten"
   </voice>
 </phrase>
 <phrase>
@@ -12597,7 +12330,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -13024,16 +12757,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Eenvoudig (Meier)"
+    *: "Eenvoudig (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Eenvoudig (Meier)"
+    *: "Eenvoudig (Meier)"
   </voice>
 </phrase>
 <phrase>
@@ -13055,16 +12785,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Aangepast"
+    *: "Aangepast"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aangepast"
+    *: "Aangepast"
   </voice>
 </phrase>
 <phrase>
@@ -13086,16 +12813,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13165,16 +12889,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Stijgtijd"
+    *: "Stijgtijd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stijgtijd"
+    *: "Stijgtijd"
   </voice>
 </phrase>
 <phrase>
@@ -13213,16 +12934,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "ENKEL ZIJKANT"
+    *: "ENKEL ZIJKANT"
   </dest>
   <voice>
-    *: none
-    swcodec: "ENKEL ZIJKANT"
+    *: "ENKEL ZIJKANT"
   </voice>
 </phrase>
 <phrase>
@@ -13303,16 +13021,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13321,18 +13036,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "massaopslag"
-    ibassodx90: "massaopslag"
+    ibassodx50,ibassodx90: "massaopslag"
   </dest>
   <voice>
     *: none
-    ibassodx50: "massaopslag"
-    ibassodx90: "massaopslag"
+    ibassodx50,ibassodx90: "massaopslag"
   </voice>
 </phrase>
 <phrase>
@@ -13341,18 +13053,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -13374,16 +13083,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditievevermoeidheidsvermindering"
+    *: "Auditievevermoeidheidsvermindering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditievevermoeidheidsvermindering"
+    *: "Auditievevermoeidheidsvermindering"
   </voice>
 </phrase>
 <phrase>
@@ -13419,16 +13125,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptuele basversterking"
+    *: "Perceptuele basversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptuele basversterking"
+    *: "Perceptuele basversterking"
   </voice>
 </phrase>
 <phrase>
@@ -13451,18 +13154,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "enkel opladen"
-    ibassodx90: "enkel opladen"
+    ibassodx50,ibassodx90: "enkel opladen"
   </dest>
   <voice>
     *: none
-    ibassodx50: "enkel opladen"
-    ibassodx90: "enkel opladen"
+    ibassodx50,ibassodx90: "enkel opladen"
   </voice>
 </phrase>
 <phrase>
@@ -13471,18 +13171,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13491,18 +13188,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "frequentieschalingsgovernor"
-    ibassodx90: "frequentieschalingsgovernor"
+    ibassodx50,ibassodx90: "frequentieschalingsgovernor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "frequentieschalingsgovernor"
-    ibassodx90: "frequentieschalingsgovernor"
+    ibassodx50,ibassodx90: "frequentieschalingsgovernor"
   </voice>
 </phrase>
 <phrase>
@@ -13510,16 +13204,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13555,16 +13246,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Droge / natte mix"
+    *: "Droge / natte mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Droge of natte mix"
+    *: "Droge of natte mix"
   </voice>
 </phrase>
 <phrase>
@@ -13572,16 +13260,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas-surround"
+    *: "Haas-surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas-surround"
+    *: "Haas-surround"
   </voice>
 </phrase>
 <phrase>
@@ -13598,8 +13283,6 @@
     *: "Zoeken"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: VOICE_TRACK_TO_MOVE
   desc: playlist viewer
@@ -13614,8 +13297,6 @@
     *: "Te verplaatsen nummer"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST
   desc: Save only one bookmark for a playlist in recent bookmarks
@@ -13630,8 +13311,6 @@
     *: "1 per afspeellijst"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_KIBIBYTE
   desc: a unit postfix, also voiced
@@ -13646,8 +13325,6 @@
     *: "kibibyte"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG__NEVER
   desc: in lcd settings
@@ -13662,8 +13339,6 @@
     *: "Nooit"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_FILTER_SHORT
   desc: in sound settings
@@ -13678,8 +13353,6 @@
     *: "Kort"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: VOICE_BAD_TRACK
   desc: playlist viewer
@@ -13694,8 +13367,6 @@
     *: "Beschadigd nummer"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_GIBIBYTE
   desc: a unit postfix, also voiced
@@ -13710,8 +13381,6 @@
     *: "gibibyte"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: VOICE_QUEUED
   desc: playlist viewer
@@ -13726,8 +13395,6 @@
     *: "In wachtrij"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK
   desc: Save only one bookmark for a combination (playlist,track) in recent bookmarks
@@ -13742,8 +13409,6 @@
     *: "1 per nummer"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_FILTER_BYPASS
   desc: in sound settings
@@ -13758,8 +13423,6 @@
     *: "Bypass"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_MEBIBYTE
   desc: a unit postfix, also voiced
@@ -13774,8 +13437,6 @@
     *: "mebibyte"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: LANG_NO_VIEWERS
   desc: text for splash to indicate that no viewers are available
@@ -13790,8 +13451,6 @@
     *: "Geen viewers gevonden"
   </voice>
 </phrase>
-###
-### This phrase below was not present in the translated file
 <phrase>
   id: VOICE_MOVING_TRACK
   desc: playlist viewer
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 5b92e33e47..9c9a0ef8b6 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -607,16 +607,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Krysslyd"
+    *: "Krysslyd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Krysslyd"
+    *: "Krysslyd"
   </voice>
 </phrase>
 <phrase>
@@ -624,16 +621,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Tonekontroll"
+    *: "Tonekontroll"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tonekontroll"
+    *: "Tonekontroll"
   </voice>
 </phrase>
 <phrase>
@@ -812,12 +806,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Bruk tonekontroll"
+    *: "Bruk tonekontroll"
   </dest>
   <voice>
     *: none
@@ -828,12 +820,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafisk tonekontroll"
+    *: "Grafisk tonekontroll"
   </dest>
   <voice>
     *: none
@@ -844,12 +834,10 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Førehandskutting"
+    *: "Førehandskutting"
   </dest>
   <voice>
     *: none
@@ -860,12 +848,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Enkelt oppsett"
+    *: "Enkelt oppsett"
   </dest>
   <voice>
     *: none
@@ -876,12 +862,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Avansert oppsett"
+    *: "Avansert oppsett"
   </dest>
   <voice>
     *: none
@@ -892,12 +876,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Lagra som ferdigoppsett"
+    *: "Lagra som ferdigoppsett"
   </dest>
   <voice>
     *: none
@@ -908,12 +890,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Sjå gjennom ferdigoppsett"
+    *: "Sjå gjennom ferdigoppsett"
   </dest>
   <voice>
     *: none
@@ -924,12 +904,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Redigeringsmodus: %s"
+    *: "Redigeringsmodus: %s"
   </dest>
   <voice>
     *: none
@@ -940,12 +918,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz-bandforsterking"
+    *: "%d Hz-bandforsterking"
   </dest>
   <voice>
     *: none
@@ -956,12 +932,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Lågskrankefilter"
+    *: "Lågskrankefilter"
   </dest>
   <voice>
     *: none
@@ -972,12 +946,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Lydtoppfilter %d"
+    *: "Lydtoppfilter %d"
   </dest>
   <voice>
     *: none
@@ -988,12 +960,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Høgskrankefilter"
+    *: "Høgskrankefilter"
   </dest>
   <voice>
     *: none
@@ -1004,16 +974,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frekvensgrense"
+    *: "Frekvensgrense"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekvensgrense"
+    *: "Frekvensgrense"
   </voice>
 </phrase>
 <phrase>
@@ -1021,12 +988,10 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Midtfrekvens"
+    *: "Midtfrekvens"
   </dest>
   <voice>
     *: none
@@ -1037,16 +1002,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1312,16 +1274,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pipelyd ved sporhopp"
+    *: "Pipelyd ved sporhopp"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pipelyd ved sporhopp"
+    *: "Pipelyd ved sporhopp"
   </voice>
 </phrase>
 <phrase>
@@ -1329,16 +1288,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Låg"
+    *: "Låg"
   </dest>
   <voice>
-    *: none
-    swcodec: "Låg"
+    *: "Låg"
   </voice>
 </phrase>
 <phrase>
@@ -1346,16 +1302,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Middels"
+    *: "Middels"
   </dest>
   <voice>
-    *: none
-    swcodec: "Middels"
+    *: "Middels"
   </voice>
 </phrase>
 <phrase>
@@ -1363,16 +1316,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Høg"
+    *: "Høg"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høg"
+    *: "Høg"
   </voice>
 </phrase>
 <phrase>
@@ -1666,16 +1616,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skrifttype"
+    *: "Skrifttype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skrifttype"
+    *: "Skrifttype"
   </voice>
 </phrase>
 <phrase>
@@ -1741,12 +1688,10 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status- og rullelinje"
+    *: "Status- og rullelinje"
   </dest>
   <voice>
     *: none
@@ -1816,12 +1761,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebraisk (ISO-8859-8)"
+    *: "Hebraisk (ISO-8859-8)"
   </dest>
   <voice>
     *: none
@@ -1846,12 +1789,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
     *: none
@@ -1862,12 +1803,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisk (CP1256)"
+    *: "Arabisk (CP1256)"
   </dest>
   <voice>
     *: none
@@ -1906,12 +1845,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japansk (SJIS)"
+    *: "Japansk (SJIS)"
   </dest>
   <voice>
     *: none
@@ -1922,12 +1859,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kinesisk – forenkla (GB2312)"
+    *: "Kinesisk – forenkla (GB2312)"
   </dest>
   <voice>
     *: none
@@ -1938,12 +1873,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreansk (KSX1001)"
+    *: "Koreansk (KSX1001)"
   </dest>
   <voice>
     *: none
@@ -1954,12 +1887,10 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kinesisk – tradisjonell (BIG5)"
+    *: "Kinesisk – tradisjonell (BIG5)"
   </dest>
   <voice>
     *: none
@@ -2307,15 +2238,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </voice>
 </phrase>
 <phrase>
@@ -2341,18 +2272,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2690,16 +2621,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Unngå klipping"
+    *: "Unngå klipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Unngå klipping"
+    *: "Unngå klipping"
   </voice>
 </phrase>
 <phrase>
@@ -2935,16 +2863,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Opp ned"
+    *: "Opp ned"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Opp ned"
+    *: "Opp ned"
   </voice>
 </phrase>
 <phrase>
@@ -2952,16 +2877,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Linjemarkering"
+    *: "Linjemarkering"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Linjemarkering"
+    *: "Linjemarkering"
   </voice>
 </phrase>
 <phrase>
@@ -2969,16 +2891,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Markør"
+    *: "Markør"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Markør"
+    *: "Markør"
   </voice>
 </phrase>
 <phrase>
@@ -2986,12 +2905,10 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Felt (invers)"
+    *: "Felt (invers)"
   </dest>
   <voice>
     *: none
@@ -3171,16 +3088,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skjermen kan rulla ut av syne"
+    *: "Skjermen kan rulla ut av syne"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skjermen kan rulla ut av syne"
+    *: "Skjermen kan rulla ut av syne"
   </voice>
 </phrase>
 <phrase>
@@ -3188,16 +3102,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Steglengd for skjermrulling"
+    *: "Steglengd for skjermrulling"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Steglengd for skjermrulling"
+    *: "Steglengd for skjermrulling"
   </voice>
 </phrase>
 <phrase>
@@ -3219,16 +3130,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullefelt"
+    *: "Rullefelt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullefelt"
+    *: "Rullefelt"
   </voice>
 </phrase>
 <phrase>
@@ -3236,16 +3144,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statuslinje"
+    *: "Statuslinje"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statuslinje"
+    *: "Statuslinje"
   </voice>
 </phrase>
 <phrase>
@@ -3270,16 +3175,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lydstyrkevising"
+    *: "Lydstyrkevising"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lydstyrkevising"
+    *: "Lydstyrkevising"
   </voice>
 </phrase>
 <phrase>
@@ -3287,16 +3189,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterivising"
+    *: "Batterivising"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterivising"
+    *: "Batterivising"
   </voice>
 </phrase>
 <phrase>
@@ -3304,16 +3203,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </voice>
 </phrase>
 <phrase>
@@ -3321,16 +3217,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </voice>
 </phrase>
 <phrase>
@@ -4174,8 +4067,8 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
@@ -4236,24 +4129,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "Micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "Micro S D"
     xduoox3: "Micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -4380,35 +4273,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = tilbakestill"
-    mrobe500: "POWER = Tilbakestill"
-    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
-    ipod*,sansac200*,mpiohd300: "MENU = Tilbakestill"
-    iaudiox5,iaudiom5: "RECORD = Tilbakestill"
+    gigabeatfx,mrobe500: "POWER = Tilbakestill"
+    gigabeats,sansafuzeplus: "BACK = Tilbakestill"
+    gogearsa9200: "LEFT = Tilbakestill"
+    iaudiom5,iaudiox5: "RECORD = Tilbakestill"
+    ipod*,mpiohd300,sansac200*: "MENU = Tilbakestill"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
-    gigabeatfx: "POWER = Tilbakestill"
-    sansafuzeplus: "BACK = Tilbakestill"
+    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
-    gigabeats: "BACK = Tilbakestill"
-    gogearsa9200: "LEFT = Tilbakestill"
-    vibe500: "CANCEL = Tilbakestill"
+    rtc: "OFF = tilbakestill"
     samsungyh*: "REW = Tilbakestill"
+    vibe500: "CANCEL = Tilbakestill"
   </dest>
   <voice>
     *: none
@@ -4452,19 +4341,19 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disken er full. Trykk OFF for å halde fram."
-    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å halde fram."
     iaudiom5,iaudiox5: "Disken er full. Trykk POWER for å halde fram."
-    sansae200*,sansac200*,vibe500: "Disken er full. Trykk PREV for å halde fram."
+    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å halde fram."
+    recording: "Disken er full. Trykk OFF for å halde fram."
     samsungyh*: "Disken er full. Trykk LEFT for å halde fram."
+    sansac200*,sansae200*,vibe500: "Disken er full. Trykk PREV for å halde fram."
   </dest>
   <voice>
     *: none
@@ -4626,21 +4515,21 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPEL = vel – AV = avbryt"
+    gigabeats: "VEL = vel – PÅ/AV = avbryt"
     ipod*: "VEL = vel  – MENY = avbryt"
     iriverh10,iriverh10_5gb: "VEL = vel – TILBAKE = avbryt"
-    gigabeats: "VEL = vel – PÅ/AV = avbryt"
-    vibe500: "OK = vel – C = avbryt"
     mpiohd300: "ENTER = vel – MENU = avbryt"
+    vibe500: "OK = vel – C = avbryt"
   </dest>
   <voice>
     *: none
@@ -7060,23 +6949,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK for å avbryte"
     gigabeatfx: "POWER for å avbryte"
-    sansafuzeplus: "BACK for å avbryte"
+    gigabeats,sansafuzeplus: "BACK for å avbryte"
+    iaudiom5,iaudiox5: "PLAY (langt trykk) for å avbryte"
+    ipod*: "PLAY/PAUSE for å avbryte"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV for å avbryte"
+    iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
   </dest>
   <voice>
     *: ""
@@ -7417,12 +7304,10 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direkteforsterking"
+    *: "Direkteforsterking"
   </dest>
   <voice>
     *: none
@@ -7433,12 +7318,10 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Kryssforsterking"
+    *: "Kryssforsterking"
   </dest>
   <voice>
     *: none
@@ -7449,12 +7332,10 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Høgfrekvensdemping"
+    *: "Høgfrekvensdemping"
   </dest>
   <voice>
     *: none
@@ -7465,12 +7346,10 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Høgfrekvensgrense"
+    *: "Høgfrekvensgrense"
   </dest>
   <voice>
     *: none
@@ -7816,16 +7695,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Redigeringsmodus: %s"
+    *: "Redigeringsmodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7833,16 +7709,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Frekvensgrense"
+    *: "Frekvensgrense"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekvensgrense"
+    *: "Frekvensgrense"
   </voice>
 </phrase>
 <phrase>
@@ -8647,16 +8520,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -8754,19 +8624,18 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Byggjer database … Fann %d. (OFF for å gå tilbake.)"
-    iriverh100,iriverh120,iriverh300: "Byggjer database … Fann %d. (STOP for å gå tilbake.)"
-    ipod*: "Byggjer database … Fann %d. (PLAY/PAUSE for å gå tilbake.)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Byggjer database … Fann %d. (LEFT for å gå tilbake.)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Byggjer database ... fann %d. (PREV for å gå tilbake.)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Byggjer database … Fann %d. (LEFT for å gå tilbake.)"
     gogearsa9200: "Byggjer database ... Fann %d. (REW for å gå tilbake.)"
+    ipod*: "Byggjer database … Fann %d. (PLAY/PAUSE for å gå tilbake.)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Byggjer database ... fann %d. (PREV for å gå tilbake.)"
+    iriverh100,iriverh120,iriverh300: "Byggjer database … Fann %d. (STOP for å gå tilbake.)"
   </dest>
   <voice>
     *: "oppføringar funne til databasen"
@@ -8939,17 +8808,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Avbrotstid for knappelys"
-    sansafuze*,sansae200*: "Avbrotstid for hjullys"
+    sansae200*,sansafuze*: "Avbrotstid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Avbrotstid for knappelys"
-    sansafuze*,sansae200*: "Avbrotstid for hjullys"
+    sansae200*,sansafuze*: "Avbrotstid for hjullys"
   </voice>
 </phrase>
 <phrase>
@@ -9219,20 +9088,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU eller topp høgre = ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ja"
     iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ja"
     mrobe500: "PLAY, POWER eller topp høgre = ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = ja"
   </dest>
   <voice>
@@ -9245,23 +9114,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "PÅ = velg"
-    mrobe500: "HEART = velg"
-    iriverh100,iriverh120,iriverh300: "NAVI = velg"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = velg"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = velg"
     gogearsa9200,samsungyh*: "PLAY = velg"
-    vibe500: "OK = velg"
+    iriverh100,iriverh120,iriverh300: "NAVI = velg"
     mpiohd300: "ENTER = velg"
+    mrobe500: "HEART = velg"
+    rtc: "PÅ = velg"
+    vibe500: "OK = velg"
   </dest>
   <voice>
     *: none
@@ -9421,16 +9290,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Forsterking"
+    *: "Forsterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forsterking"
+    *: "Forsterking"
   </voice>
 </phrase>
 <phrase>
@@ -9483,16 +9349,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modus:"
+    *: "Modus:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10065,15 +9928,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bassgrense"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bassgrense"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bassgrense"
   </voice>
 </phrase>
 <phrase>
@@ -10271,15 +10134,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgrense"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgrense"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgrense"
   </voice>
 </phrase>
 <phrase>
@@ -10487,16 +10350,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Tasteklikk"
+    *: "Tasteklikk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tasteklikk"
+    *: "Tasteklikk"
   </voice>
 </phrase>
 <phrase>
@@ -10690,16 +10550,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Tasteklikkgjentaking"
+    *: "Tasteklikkgjentaking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tasteklikkgjentaking"
+    *: "Tasteklikkgjentaking"
   </voice>
 </phrase>
 <phrase>
@@ -10721,7 +10578,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index dbe5422e59..3322193a4e 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -19,7 +19,7 @@
 # - Thom Johansen
 # - Frederik Vestre
 # - Tobias Langhoff
-# - Tore Johnny Bråtveit 
+# - Tore Johnny Bråtveit
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -613,16 +613,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Stereokrysslyd"
+    *: "Stereokrysslyd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stereokrysslyd"
+    *: "Stereokrysslyd"
   </voice>
 </phrase>
 <phrase>
@@ -630,16 +627,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -1048,16 +1042,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pip for sporhopp"
+    *: "Pip for sporhopp"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pip for sporhopp"
+    *: "Pip for sporhopp"
   </voice>
 </phrase>
 <phrase>
@@ -1065,16 +1056,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Lav"
+    *: "Lav"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lav"
+    *: "Lav"
   </voice>
 </phrase>
 <phrase>
@@ -1082,16 +1070,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Middels"
+    *: "Middels"
   </dest>
   <voice>
-    *: none
-    swcodec: "Middels"
+    *: "Middels"
   </voice>
 </phrase>
 <phrase>
@@ -1099,16 +1084,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Høy"
+    *: "Høy"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høy"
+    *: "Høy"
   </voice>
 </phrase>
 <phrase>
@@ -1329,16 +1311,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Velg skrifttype"
+    *: "Velg skrifttype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Velg skrifttype"
+    *: "Velg skrifttype"
   </voice>
 </phrase>
 <phrase>
@@ -1422,16 +1401,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/rullefelt"
+    *: "Status-/rullefelt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status og rullefelt"
+    *: "Status og rullefelt"
   </voice>
 </phrase>
 <phrase>
@@ -1498,16 +1474,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebraisk (ISO-8859-8)"
+    *: "Hebraisk (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebraisk (ISO-8859-8)"
+    *: "Hebraisk (ISO-8859-8)"
   </voice>
 </phrase>
 <phrase>
@@ -1518,7 +1491,7 @@
     *: "Cyrillic (CP1251)"
   </source>
   <dest>
-   *: "Cyrillisk (CP1251)"
+    *: "Cyrillisk (CP1251)"
   </dest>
   <voice>
     *: "Cyrillisk"
@@ -1529,16 +1502,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </voice>
 </phrase>
 <phrase>
@@ -1546,16 +1516,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisk (CP1256)"
+    *: "Arabisk (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabisk (CP1256)"
+    *: "Arabisk (CP1256)"
   </voice>
 </phrase>
 <phrase>
@@ -1591,16 +1558,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japansk (SJIS)"
+    *: "Japansk (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japansk (SJIS)"
+    *: "Japansk (SJIS)"
   </voice>
 </phrase>
 <phrase>
@@ -1608,16 +1572,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kinesisk forenklet (GB2312)"
+    *: "Kinesisk forenklet (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Forenklet kinesisk"
+    *: "Forenklet kinesisk"
   </voice>
 </phrase>
 <phrase>
@@ -1625,16 +1586,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreansk (KSX1001)"
+    *: "Koreansk (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreansk"
+    *: "Koreansk"
   </voice>
 </phrase>
 <phrase>
@@ -1642,16 +1600,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kinesisk tradisjonelt (BIG5)"
+    *: "Kinesisk tradisjonelt (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tradisjonelt kinesisk"
+    *: "Tradisjonelt kinesisk"
   </voice>
 </phrase>
 <phrase>
@@ -1997,15 +1952,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </voice>
 </phrase>
 <phrase>
@@ -2031,18 +1986,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -2299,16 +2254,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Unngå klipping"
+    *: "Unngå klipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Unngå klipping"
+    *: "Unngå klipping"
   </voice>
 </phrase>
 <phrase>
@@ -2530,16 +2482,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Opp-ned"
+    *: "Opp-ned"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Opp-ned"
+    *: "Opp-ned"
   </voice>
 </phrase>
 <phrase>
@@ -2547,16 +2496,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Menyvalgindikator"
+    *: "Menyvalgindikator"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Menyvalgindikator"
+    *: "Menyvalgindikator"
   </voice>
 </phrase>
 <phrase>
@@ -2564,16 +2510,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Peker"
+    *: "Peker"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Peker"
+    *: "Peker"
   </voice>
 </phrase>
 <phrase>
@@ -2581,16 +2524,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Felt (invers)"
+    *: "Felt (invers)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Felt invers"
+    *: "Felt invers"
   </voice>
 </phrase>
 <phrase>
@@ -2699,16 +2639,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullefelt"
+    *: "Rullefelt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullefelt"
+    *: "Rullefelt"
   </voice>
 </phrase>
 <phrase>
@@ -2716,16 +2653,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusfelt"
+    *: "Statusfelt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statusfelt"
+    *: "Statusfelt"
   </voice>
 </phrase>
 <phrase>
@@ -2750,16 +2684,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volumvisning"
+    *: "Volumvisning"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volumvisning"
+    *: "Volumvisning"
   </voice>
 </phrase>
 <phrase>
@@ -2767,16 +2698,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterivisning"
+    *: "Batterivisning"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterivisning"
+    *: "Batterivisning"
   </voice>
 </phrase>
 <phrase>
@@ -2784,16 +2712,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </voice>
 </phrase>
 <phrase>
@@ -2801,16 +2726,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </voice>
 </phrase>
 <phrase>
@@ -3023,7 +2945,7 @@
     battery_types: "NiMH"
   </source>
   <dest>
-    *: none 
+    *: none
     battery_types: "NiMH"
   </dest>
   <voice>
@@ -3480,7 +3402,7 @@
     charging: "Battery: Charging"
   </source>
   <dest>
-    *: none 
+    *: none
     charging: "Batteri: lader"
   </dest>
   <voice>
@@ -3528,18 +3450,17 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
-    iriverifp7xx: ""
-    iriverh10,ipodmini1g,ipodmini2g: ""
+    ipodmini1g,ipodmini2g,iriverh10,iriverifp7xx: ""
   </voice>
 </phrase>
 <phrase>
@@ -3593,24 +3514,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mikro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mikro S D"
     xduoox3: "mikro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -3740,35 +3661,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Tilbakestill"
-    mrobe500: "POWER = Tilbakestill"
-    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
-    ipod*,sansac200*,mpiohd300: "MENU = Tilbakestill"
-    iaudiox5,iaudiom5: "RECORD = Tilbakestill"
+    gigabeatfx,mrobe500: "POWER = Tilbakestill"
+    gigabeats,sansafuzeplus: "BACK = Tilbakestill"
+    gogearsa9200: "LEFT = Tilbakestill"
+    iaudiom5,iaudiox5: "RECORD = Tilbakestill"
+    ipod*,mpiohd300,sansac200*: "MENU = Tilbakestill"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
-    gigabeatfx: "POWER = Tilbakestill"
-    sansafuzeplus: "BACK = Tilbakestill"
+    iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
-    gigabeats: "BACK = Tilbakestill"
-    gogearsa9200: "LEFT = Tilbakestill"
-    vibe500: "CANCEL = Tilbakestill"
+    rtc: "OFF = Tilbakestill"
     samsungyh*: "REW = Tilbakestill"
+    vibe500: "CANCEL = Tilbakestill"
   </dest>
   <voice>
     *: none
@@ -3814,23 +3731,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disken er full. Trykk OFF for å fortsette."
-    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å fortsette."
     iaudiom5,iaudiox5: "Disken er full. Trykk POWER for å fortsette."
-    sansae200*,sansac200*,vibe500: "Disken er full. Trykk PREV for å fortsette."
+    iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å fortsette."
+    recording: "Disken er full. Trykk OFF for å fortsette."
     samsungyh*: "Disken er full. Trykk LEFT for å fortsette."
+    sansac200*,sansae200*,vibe500: "Disken er full. Trykk PREV for å fortsette."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3993,29 +3910,26 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Sett OFF=Avbryt"
+    gigabeats: "SELECT=Sett POWER=Avbryt"
     ipod*: "SELECT=Sett MENU=Avbryt"
     iriverh10,iriverh10_5gb: "SELECT=Sett PREV=Avbryt"
-    gigabeats: "SELECT=Sett POWER=Avbryt"
-    vibe500: "OK=Sett C=Avbryt"
     mpiohd300: "ENTER=Sett MENU=Avbryt"
     sansafuzeplus: "SELECT=Sett  BACK=Avbryt"
+    vibe500: "OK=Sett C=Avbryt"
   </dest>
   <voice>
     *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -5791,7 +5705,7 @@
     remote: ""
   </dest>
   <voice>
-    *: none 
+    *: none
     remote: "Spilleskjerm for fjernkontroll"
   </voice>
 </phrase>
@@ -6359,26 +6273,24 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK for å avbryte"
     gigabeatfx: "POWER for å avbryte"
-    sansafuzeplus: "BACK for å avbryte"
+    gigabeats,sansafuzeplus: "BACK for å avbryte"
+    iaudiom5,iaudiox5: "Hold PLAY for å avbryte"
+    ipod*: "PLAY/PAUSE for å avbryte"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV for å avbryte"
+    iriverh100,iriverh120,iriverh300: "STOP for å avbryte"
   </dest>
   <voice>
-    *: "" 
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6585,16 +6497,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Avanserte EQ-innstillinger"
+    *: "Avanserte EQ-innstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Avanserte EQ-innstillinger"
+    *: "Avanserte EQ-innstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -6630,16 +6539,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none 
-    swcodec: "Grafisk EQ"
+    *: "Grafisk EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafisk equalizer"
+    *: "Grafisk equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -6681,16 +6587,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kvalitetsfaktor"
+    *: "Kvalitetsfaktor"
   </voice>
 </phrase>
 <phrase>
@@ -6726,16 +6629,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Forforsterkning"
+    *: "Forforsterkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forforsterkning"
+    *: "Forforsterkning"
   </voice>
 </phrase>
 <phrase>
@@ -6819,16 +6719,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Lagre EQ-innstillinger"
+    *: "Lagre EQ-innstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lagre EQ-innstillinger"
+    *: "Lagre EQ-innstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -6918,16 +6815,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skjermrulletrinnstørrelse"
+    *: "Skjermrulletrinnstørrelse"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skjermrulletrinnstørrelse"
+    *: "Skjermrulletrinnstørrelse"
   </voice>
 </phrase>
 <phrase>
@@ -6949,16 +6843,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Høyfrekvensgrense"
+    *: "Høyfrekvensgrense"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høyfrekvensgrense"
+    *: "Høyfrekvensgrense"
   </voice>
 </phrase>
 <phrase>
@@ -6983,16 +6874,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skal skjermen kunne rulle ut av syne?"
+    *: "Skal skjermen kunne rulle ut av syne?"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skal skjermen kunne rulle ut av syne"
+    *: "Skal skjermen kunne rulle ut av syne"
   </voice>
 </phrase>
 <phrase>
@@ -7094,7 +6982,7 @@
     remote: "Remote Unit Only"
   </source>
   <dest>
-    *: none 
+    *: none
     remote: "Bare fjernkontroll"
   </dest>
   <voice>
@@ -7121,16 +7009,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Knekkfrekvens"
+    *: "Knekkfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knekkfrekvens"
+    *: "Knekkfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -7220,16 +7105,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Forsterkning for %d Hz-båndet"
+    *: "Forsterkning for %d Hz-båndet"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz bånd-forsterkning"
+    *: "hertz bånd-forsterkning"
   </voice>
 </phrase>
 <phrase>
@@ -7254,16 +7136,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Midtfrekvens"
+    *: "Midtfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Midtfrekvens"
+    *: "Midtfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -7316,16 +7195,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Krysslydnivå"
+    *: "Krysslydnivå"
   </dest>
   <voice>
-    *: none
-    swcodec: "Krysslydnivå"
+    *: "Krysslydnivå"
   </voice>
 </phrase>
 <phrase>
@@ -7367,16 +7243,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Enkle EQ-innstillinger"
+    *: "Enkle EQ-innstillinger"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enkle EQ-innstillinger"
+    *: "Enkle EQ-innstillinger"
   </voice>
 </phrase>
 <phrase>
@@ -7384,16 +7257,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Lavfrekvensfilter"
+    *: "Lavfrekvensfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lavfrekvensfilter"
+    *: "Lavfrekvensfilter"
   </voice>
 </phrase>
 <phrase>
@@ -7401,16 +7271,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Redigeringsmodus: %s"
+    *: "Redigeringsmodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7418,16 +7285,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Høyfrekvensdemping"
+    *: "Høyfrekvensdemping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høyfrekvensdemping"
+    *: "Høyfrekvensdemping"
   </voice>
 </phrase>
 <phrase>
@@ -7435,16 +7299,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Bruk EQ"
+    *: "Bruk EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bruk EQ"
+    *: "Bruk EQ"
   </voice>
 </phrase>
 <phrase>
@@ -7466,16 +7327,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Høyfrekvensfilter"
+    *: "Høyfrekvensfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Høyfrekvensfilter"
+    *: "Høyfrekvensfilter"
   </voice>
 </phrase>
 <phrase>
@@ -7483,16 +7341,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Bla igjennom EQ-oppsett"
+    *: "Bla igjennom EQ-oppsett"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bla igjennom equalizer-oppsett"
+    *: "Bla igjennom equalizer-oppsett"
   </voice>
 </phrase>
 <phrase>
@@ -7534,16 +7389,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direktelydnivå"
+    *: "Direktelydnivå"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direktelydnivå"
+    *: "Direktelydnivå"
   </voice>
 </phrase>
 <phrase>
@@ -7551,16 +7403,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Midtfrekvensfilter %d"
+    *: "Midtfrekvensfilter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Midtfrekvensfilter"
+    *: "Midtfrekvensfilter"
   </voice>
 </phrase>
 <phrase>
@@ -7797,16 +7646,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Knekkfrekvens"
+    *: "Knekkfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knekkfrekvens"
+    *: "Knekkfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -7814,16 +7660,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Redigeringsmodus: %s"
+    *: "Redigeringsmodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8613,19 +8456,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -8797,21 +8634,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Bygger database... %d funnet (OFF for å gå tilbake)"
-    iriverh100,iriverh120,iriverh300: "Bygger database... %d funnet (STOP for å gå tilbake)"
-    ipod*: "Bygger database... %d funnet (PREV for å gå tilbake)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Bygger database... %d funnet (LEFT for å gå tilbake)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Bygger database... %d funnet (PREV for å gå tilbake)"
-    gogearsa9200: "Bygger database... %d funnet (REW for å gå tilbake)"
     archosplayer: "Bygger database (%d funnet)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Bygger database... %d funnet (LEFT for å gå tilbake)"
+    gogearsa9200: "Bygger database... %d funnet (REW for å gå tilbake)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Bygger database... %d funnet (PREV for å gå tilbake)"
+    iriverh100,iriverh120,iriverh300: "Bygger database... %d funnet (STOP for å gå tilbake)"
   </dest>
   <voice>
     *: "filer funnet for database"
@@ -9074,17 +8909,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Slukketid for knapplys"
-    sansafuze*,sansae200*: "Slukketid for hjullys"
+    sansae200*,sansafuze*: "Slukketid for hjullys"
   </dest>
   <voice>
     *: none
     button_light: "Tid før lys på knapper slukker"
-    sansafuze*,sansae200*: "Tid før lys på hjul slukker"
+    sansae200*,sansafuze*: "Tid før lys på hjul slukker"
   </voice>
 </phrase>
 <phrase>
@@ -9138,15 +8973,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass-knekkfrekvens"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass-knekkfrekvens"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass-knekkfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -9244,7 +9079,7 @@
 </phrase>
 <phrase>
   id: LANG_DELETING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Deleting..."
@@ -9444,7 +9279,7 @@
 </phrase>
 <phrase>
   id: LANG_REC_DIR_NOT_WRITABLE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -9479,23 +9314,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU eller øvre høyre = Ja"
+    creativezen*: "Select = Ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ja"
     iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ja"
     mrobe500: "Play, POWER eller øvre høyre = Ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Ja"
-    creativezen*: "Select = Ja"
   </dest>
   <voice>
     *: ""
@@ -9507,23 +9342,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Sett"
-    mrobe500: "HEART = Sett"
-    iriverh100,iriverh120,iriverh300: "NAVI = Sett"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Sett"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Sett"
     gogearsa9200,samsungyh*: "PLAY = Sett"
-    vibe500: "OK = Sett"
+    iriverh100,iriverh120,iriverh300: "NAVI = Sett"
     mpiohd300: "ENTER = Sett"
+    mrobe500: "HEART = Sett"
+    rtc: "ON = Sett"
+    vibe500: "OK = Sett"
   </dest>
   <voice>
     *: none
@@ -9548,7 +9383,7 @@
 </phrase>
 <phrase>
   id: LANG_BROWSE_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: "Browse Cuesheet"
@@ -9649,7 +9484,7 @@
 </phrase>
 <phrase>
   id: LANG_ADD_TO_FAVES
-  desc: 
+  desc:
   user: core
   <source>
     *: "Add to Shortcuts"
@@ -9714,21 +9549,18 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Forsterkning"
+    *: "Forsterkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forsterkning"
+    *: "Forsterkning"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CLEAR_REC_DIR
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -9776,16 +9608,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modus:"
+    *: "Modus:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10105,7 +9934,7 @@
 </phrase>
 <phrase>
   id: LANG_MOVING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Moving..."
@@ -10133,7 +9962,7 @@
 </phrase>
 <phrase>
   id: VOICE_EXT_CUESHEET
-  desc: 
+  desc:
   user: core
   <source>
     *: ""
@@ -10213,15 +10042,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantknekkfrekvens"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantknekkfrekvens"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantknekkfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -10369,7 +10198,7 @@
 </phrase>
 <phrase>
   id: LANG_COPYING
-  desc: 
+  desc:
   user: core
   <source>
     *: "Copying..."
@@ -10524,16 +10353,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastelyd"
+    *: "Tastelyd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastelyd"
+    *: "Tastelyd"
   </voice>
 </phrase>
 <phrase>
@@ -10625,16 +10451,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Tastelydgjentagelse"
+    *: "Tastelydgjentagelse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tastelydgjentagelse"
+    *: "Tastelydgjentagelse"
   </voice>
 </phrase>
 <phrase>
@@ -11139,7 +10962,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11157,18 +10980,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Kun lading"
-    ibassodx90: "Kun lading"
+    ibassodx50,ibassodx90: "Kun lading"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Kun lading"
-    ibassodx90: "Kun lading"
+    ibassodx50,ibassodx90: "Kun lading"
   </voice>
 </phrase>
 <phrase>
@@ -11176,16 +10996,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Volum-kompensasjon"
+    *: "Volum-kompensasjon"
   </dest>
   <voice>
-    *: none
-    swcodec: "Volum-kompensasjon"
+    *: "Volum-kompensasjon"
   </voice>
 </phrase>
 <phrase>
@@ -11317,16 +11134,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -11334,16 +11148,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Bassforbedring"
+    *: "Bassforbedring"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bassforbedring"
+    *: "Bassforbedring"
   </voice>
 </phrase>
 <phrase>
@@ -11476,18 +11287,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -11651,18 +11459,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -11873,16 +11678,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Enkel (Meier)"
+    *: "Enkel (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enkel"
+    *: "Enkel"
   </voice>
 </phrase>
 <phrase>
@@ -11907,16 +11709,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 til 1"
+    *: "2 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -11956,18 +11755,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </voice>
 </phrase>
 <phrase>
@@ -11975,16 +11771,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Selvvalgt"
+    *: "Selvvalgt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Selvvalgt"
+    *: "Selvvalgt"
   </voice>
 </phrase>
 <phrase>
@@ -11992,16 +11785,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisk"
+    *: "Automatisk"
   </voice>
 </phrase>
 <phrase>
@@ -12037,16 +11827,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Hastighet"
+    *: "Hastighet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hastighet"
+    *: "Hastighet"
   </voice>
 </phrase>
 <phrase>
@@ -12054,16 +11841,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Grense"
+    *: "Grense"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grense"
+    *: "Grense"
   </voice>
 </phrase>
 <phrase>
@@ -12088,16 +11872,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Innslagstid"
+    *: "Innslagstid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Innslagstid"
+    *: "Innslagstid"
   </voice>
 </phrase>
 <phrase>
@@ -12139,16 +11920,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Tidsmanipulering"
+    *: "Tidsmanipulering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tidsmanipulering"
+    *: "Tidsmanipulering"
   </voice>
 </phrase>
 <phrase>
@@ -12190,16 +11968,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Slippetid"
+    *: "Slippetid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Slippetid"
+    *: "Slippetid"
   </voice>
 </phrase>
 <phrase>
@@ -12207,16 +11982,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Spol tilbake før fortsettelse"
+    *: "Spol tilbake før fortsettelse"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spol tilbake før avspilling gjenopptas"
+    *: "Spol tilbake før avspilling gjenopptas"
   </voice>
 </phrase>
 <phrase>
@@ -12269,16 +12041,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Plassering av rullefelt"
+    *: "Plassering av rullefelt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Plassering av rullefelt"
+    *: "Plassering av rullefelt"
   </voice>
 </phrase>
 <phrase>
@@ -12303,16 +12072,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hardt spenn"
+    *: "Hardt spenn"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hardt spenn"
+    *: "Hardt spenn"
   </voice>
 </phrase>
 <phrase>
@@ -12320,16 +12086,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12338,18 +12101,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Masselagring"
-    ibassodx90: "Masselagring"
+    ibassodx50,ibassodx90: "Masselagring"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Masselagring"
-    ibassodx90: "Masselagring"
+    ibassodx50,ibassodx90: "Masselagring"
   </voice>
 </phrase>
 <phrase>
@@ -12374,16 +12134,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Spenn"
+    *: "Spenn"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spenn"
+    *: "Spenn"
   </voice>
 </phrase>
 <phrase>
@@ -12504,16 +12261,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "KUN SIDE"
+    *: "KUN SIDE"
   </dest>
   <voice>
-    *: none
-    swcodec: "KUN SIDE"
+    *: "KUN SIDE"
   </voice>
 </phrase>
 <phrase>
@@ -12594,16 +12348,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Terskel"
+    *: "Terskel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Terskel"
+    *: "Terskel"
   </voice>
 </phrase>
 <phrase>
@@ -12684,16 +12435,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12701,16 +12449,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hovedtema"
+    *: "Hovedtema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hovedtema"
+    *: "Hovedtema"
   </voice>
 </phrase>
 <phrase>
@@ -12763,16 +12508,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Eksternt hovedtema"
+    *: "Eksternt hovedtema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Eksternt hovedtema"
+    *: "Eksternt hovedtema"
   </voice>
 </phrase>
 <phrase>
@@ -12859,16 +12601,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Mykt spenn"
+    *: "Mykt spenn"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mykt spenn"
+    *: "Mykt spenn"
   </voice>
 </phrase>
 <phrase>
@@ -12924,16 +12663,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </voice>
 </phrase>
 <phrase>
@@ -12941,16 +12677,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 til 1"
+    *: "10 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -12958,16 +12691,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas-surround"
+    *: "Haas-surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -13054,16 +12784,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullefelt-bredde"
+    *: "Rullefelt-bredde"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bredde på rullefelt"
+    *: "Bredde på rullefelt"
   </voice>
 </phrase>
 <phrase>
@@ -13071,16 +12798,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Tørr-/våt-miks"
+    *: "Tørr-/våt-miks"
   </dest>
   <voice>
-    *: none
-    swcodec: "Blanding av tørt og vått signal"
+    *: "Blanding av tørt og vått signal"
   </voice>
 </phrase>
 <phrase>
@@ -13088,16 +12812,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 til 1"
+    *: "4 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -13170,16 +12891,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Forhold"
+    *: "Forhold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forhold"
+    *: "Forhold"
   </voice>
 </phrase>
 <phrase>
@@ -13204,16 +12922,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 til 1"
+    *: "6 til 1"
   </voice>
 </phrase>
 <phrase>
@@ -13303,16 +13018,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Reduksjon av øretretthet"
+    *: "Reduksjon av øretretthet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Reduksjon av øre-tretthet"
+    *: "Reduksjon av øre-tretthet"
   </voice>
 </phrase>
 <phrase>
@@ -13393,16 +13105,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spiller"
+    *: "Spiller"
   </voice>
 </phrase>
 <phrase>
@@ -13438,18 +13147,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Sett forsettelsetid (minutter)"
+    *: "Sett forsettelsetid (minutter)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Sett forsettelsetid (minutter)"
+    *: "Sett forsettelsetid (minutter)"
     lowmem: none
   </voice>
 </phrase>
@@ -13486,16 +13192,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vis album tittel"
+    *: "Vis album tittel"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vis album tittel"
+    *: "Vis album tittel"
   </voice>
 </phrase>
 <phrase>
@@ -13503,16 +13206,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "WPS Integrasjon"
+    *: "WPS Integrasjon"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "WPS Integrasjon"
+    *: "WPS Integrasjon"
   </voice>
 </phrase>
 <phrase>
@@ -13520,16 +13220,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bestilt"
+    *: "Bestilt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bestilt"
+    *: "Bestilt"
   </voice>
 </phrase>
 <phrase>
@@ -13537,16 +13234,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves per 30 minutes"
+    *: "Level 3: 60 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13554,19 +13248,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "Vis FPS (Bilder-i-sekundet)"
-    lcd_bitmap: "Vis FPS (Bilder-i-sekundet)"
+    *: "Vis FPS (Bilder-i-sekundet)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vis FPS (Bilder-i-sekundet)"
-    lcd_bitmap: "Vis FPS (Bilder-i-sekundet)"
+    *: "Vis FPS (Bilder-i-sekundet)"
   </voice>
 </phrase>
 <phrase>
@@ -13605,16 +13293,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </voice>
 </phrase>
 <phrase>
@@ -13622,18 +13307,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </voice>
 </phrase>
@@ -13656,16 +13338,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </voice>
 </phrase>
 <phrase>
@@ -13673,16 +13352,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </voice>
 </phrase>
 <phrase>
@@ -13735,16 +13411,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 10: 1 move per 600 minutes"
+    *: "Level 10: 1 move per 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13766,16 +13439,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "king side"
+    *: "king side"
   </voice>
 </phrase>
 <phrase>
@@ -13783,18 +13453,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </voice>
 </phrase>
@@ -13817,16 +13484,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </voice>
 </phrase>
 <phrase>
@@ -13834,16 +13498,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </voice>
 </phrase>
 <phrase>
@@ -13851,16 +13512,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </voice>
 </phrase>
 <phrase>
@@ -13882,18 +13540,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </voice>
 </phrase>
@@ -13902,16 +13557,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </voice>
 </phrase>
 <phrase>
@@ -13947,16 +13599,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Check!"
+    *: "Check!"
   </voice>
 </phrase>
 <phrase>
@@ -13964,16 +13613,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </voice>
 </phrase>
 <phrase>
@@ -14009,16 +13655,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </voice>
 </phrase>
 <phrase>
@@ -14026,16 +13669,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </voice>
 </phrase>
 <phrase>
@@ -14043,16 +13683,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </voice>
 </phrase>
 <phrase>
@@ -14074,16 +13711,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </voice>
 </phrase>
 <phrase>
@@ -14133,16 +13767,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14164,16 +13795,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14268,16 +13896,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "White"
+    *: "White"
   </voice>
 </phrase>
 <phrase>
@@ -14299,18 +13924,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </voice>
 </phrase>
@@ -14319,16 +13941,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -14364,16 +13983,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </voice>
 </phrase>
 <phrase>
@@ -14381,16 +13997,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </voice>
 </phrase>
 <phrase>
@@ -14398,16 +14011,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </voice>
 </phrase>
 <phrase>
@@ -14429,18 +14039,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </voice>
 </phrase>
@@ -14477,16 +14084,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "No games found!"
+    *: "No games found!"
   </voice>
 </phrase>
 <phrase>
@@ -14508,16 +14112,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </voice>
 </phrase>
 <phrase>
@@ -14539,16 +14140,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </voice>
 </phrase>
 <phrase>
@@ -14570,16 +14168,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bishop"
+    *: "Bishop"
   </voice>
 </phrase>
 <phrase>
@@ -14587,16 +14182,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Marked"
+    *: "Marked"
   </voice>
 </phrase>
 <phrase>
@@ -14632,16 +14224,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </voice>
 </phrase>
 <phrase>
@@ -14649,16 +14238,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </voice>
 </phrase>
 <phrase>
@@ -14680,16 +14266,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "castle"
+    *: "castle"
   </voice>
 </phrase>
 <phrase>
@@ -14697,16 +14280,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </voice>
 </phrase>
 <phrase>
@@ -14714,18 +14294,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </voice>
 </phrase>
@@ -14734,18 +14311,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </voice>
 </phrase>
@@ -14754,18 +14328,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </voice>
 </phrase>
@@ -14774,16 +14345,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "queen side"
+    *: "queen side"
   </voice>
 </phrase>
 <phrase>
@@ -14791,18 +14359,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </voice>
 </phrase>
@@ -14825,16 +14390,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </voice>
 </phrase>
 <phrase>
@@ -14856,16 +14418,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </voice>
 </phrase>
 <phrase>
@@ -14901,18 +14460,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </voice>
 </phrase>
@@ -14921,16 +14477,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -14938,18 +14491,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </voice>
 </phrase>
@@ -14958,18 +14508,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </voice>
 </phrase>
@@ -14978,16 +14525,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves per 120 minutes"
+    *: "Level 6: 40 moves per 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15026,16 +14570,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </voice>
 </phrase>
 <phrase>
@@ -15074,16 +14615,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves per 240 minutes"
+    *: "Level 7: 40 moves per 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15091,16 +14629,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </voice>
 </phrase>
 <phrase>
@@ -15122,16 +14657,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -15153,16 +14685,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -15170,16 +14699,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </voice>
 </phrase>
 <phrase>
@@ -15201,16 +14727,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Black"
+    *: "Black"
   </voice>
 </phrase>
 <phrase>
@@ -15218,18 +14741,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </voice>
 </phrase>
@@ -15252,16 +14772,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rook"
+    *: "Rook"
   </voice>
 </phrase>
 <phrase>
@@ -15269,16 +14786,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4: 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15317,16 +14831,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves per 15 minutes"
+    *: "Level 2: 60 moves per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15390,16 +14901,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </voice>
 </phrase>
 <phrase>
@@ -15407,18 +14915,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </voice>
 </phrase>
@@ -15483,16 +14988,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </voice>
 </phrase>
 <phrase>
@@ -15514,16 +15016,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </voice>
 </phrase>
 <phrase>
@@ -15531,16 +15030,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </voice>
 </phrase>
 <phrase>
@@ -15548,18 +15044,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </voice>
 </phrase>
@@ -15568,18 +15061,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </voice>
 </phrase>
@@ -15588,16 +15078,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves per 5 minutes"
+    *: "Level 1: 60 moves per 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15605,18 +15092,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </voice>
 </phrase>
@@ -15639,18 +15123,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </voice>
 </phrase>
@@ -15659,16 +15140,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5: 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15676,16 +15154,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </voice>
 </phrase>
 <phrase>
@@ -15721,16 +15196,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </voice>
 </phrase>
 <phrase>
@@ -15752,16 +15224,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "King"
+    *: "King"
   </voice>
 </phrase>
 <phrase>
@@ -15769,16 +15238,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </voice>
 </phrase>
 <phrase>
@@ -15786,16 +15252,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </voice>
 </phrase>
 <phrase>
@@ -15803,16 +15266,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </voice>
 </phrase>
 <phrase>
@@ -15820,16 +15280,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </voice>
 </phrase>
 <phrase>
@@ -15851,16 +15308,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "captures"
+    *: "captures"
   </voice>
 </phrase>
 <phrase>
@@ -15868,16 +15322,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </voice>
 </phrase>
 <phrase>
@@ -15885,18 +15336,15 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </voice>
 </phrase>
@@ -15961,16 +15409,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Unmarked"
+    *: "Unmarked"
   </voice>
 </phrase>
 <phrase>
@@ -16020,18 +15465,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </voice>
 </phrase>
@@ -16040,16 +15482,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </voice>
 </phrase>
 <phrase>
@@ -16057,16 +15496,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pawn"
+    *: "Pawn"
   </voice>
 </phrase>
 <phrase>
@@ -16074,16 +15510,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </voice>
 </phrase>
 <phrase>
@@ -16091,16 +15524,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Toggle Slide show Mode"
+    *: "Toggle Slide show Mode"
   </voice>
 </phrase>
 <phrase>
@@ -16108,16 +15538,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Slide show Time"
+    *: "Slide show Time"
   </voice>
 </phrase>
 <phrase>
@@ -16170,16 +15597,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 8: 1 move per 15 minutes"
+    *: "Level 8: 1 move per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -16201,18 +15625,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </voice>
 </phrase>
@@ -16221,16 +15642,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Queen"
+    *: "Queen"
   </voice>
 </phrase>
 <phrase>
@@ -16294,16 +15712,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Level 9: 1 move per 60 minutes"
+    *: "Level 9: 1 move per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -16311,16 +15726,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </voice>
 </phrase>
 <phrase>
@@ -16328,16 +15740,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </voice>
 </phrase>
 <phrase>
@@ -16345,15 +15754,12 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Knight"
+    *: "Knight"
   </voice>
 </phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 10399b14c8..651ec95d22 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -820,16 +820,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "krosfid"
+    *: "krosfid"
   </voice>
 </phrase>
 <phrase>
@@ -837,16 +834,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Wzm. główne"
+    *: "Wzm. główne"
   </dest>
   <voice>
-    *: none
-    swcodec: "Wzmocnienie główne"
+    *: "Wzmocnienie główne"
   </voice>
 </phrase>
 <phrase>
@@ -854,16 +848,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Wzm. skrośne"
+    *: "Wzm. skrośne"
   </dest>
   <voice>
-    *: none
-    swcodec: "wzmocnienie skrośne"
+    *: "wzmocnienie skrośne"
   </voice>
 </phrase>
 <phrase>
@@ -871,16 +862,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Tłumienie tonów wysokich"
+    *: "Tłumienie tonów wysokich"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tłumienie tonów wysokich"
+    *: "Tłumienie tonów wysokich"
   </voice>
 </phrase>
 <phrase>
@@ -888,16 +876,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Górna częstotliwość graniczna"
+    *: "Górna częstotliwość graniczna"
   </dest>
   <voice>
-    *: none
-    swcodec: "Górna częstotliwość graniczna"
+    *: "Górna częstotliwość graniczna"
   </voice>
 </phrase>
 <phrase>
@@ -905,16 +890,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Korektor"
+    *: "Korektor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Korektor"
+    *: "Korektor"
   </voice>
 </phrase>
 <phrase>
@@ -922,16 +904,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Włącz korektor"
+    *: "Włącz korektor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Włącz korektor"
+    *: "Włącz korektor"
   </voice>
 </phrase>
 <phrase>
@@ -939,16 +918,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Korektor graficzny"
+    *: "Korektor graficzny"
   </dest>
   <voice>
-    *: none
-    swcodec: "Korektor graficzny"
+    *: "Korektor graficzny"
   </voice>
 </phrase>
 <phrase>
@@ -956,16 +932,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompensacja poziomu"
+    *: "Kompensacja poziomu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompensacja poziomu"
+    *: "Kompensacja poziomu"
   </voice>
 </phrase>
 <phrase>
@@ -973,16 +946,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Ustawienia podstawowe"
+    *: "Ustawienia podstawowe"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ustawnienia podstawowe korektora"
+    *: "Ustawnienia podstawowe korektora"
   </voice>
 </phrase>
 <phrase>
@@ -990,16 +960,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Ustawienia zaawansowane"
+    *: "Ustawienia zaawansowane"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ustawienia zaawansowane korektora"
+    *: "Ustawienia zaawansowane korektora"
   </voice>
 </phrase>
 <phrase>
@@ -1007,16 +974,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Zapisz ustawienia"
+    *: "Zapisz ustawienia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zapisz ustawienia korektora"
+    *: "Zapisz ustawienia korektora"
   </voice>
 </phrase>
 <phrase>
@@ -1024,16 +988,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Przeglądaj ustawienia"
+    *: "Przeglądaj ustawienia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Przeglądaj ustawienia korektora"
+    *: "Przeglądaj ustawienia korektora"
   </voice>
 </phrase>
 <phrase>
@@ -1041,16 +1002,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Parametr: %s"
+    *: "Parametr: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1058,16 +1016,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Wzm. pasma %d Hz"
+    *: "Wzm. pasma %d Hz"
   </dest>
   <voice>
-    *: none
-    swcodec: "Wzmocnienie pasma podane w hercach"
+    *: "Wzmocnienie pasma podane w hercach"
   </voice>
 </phrase>
 <phrase>
@@ -1075,16 +1030,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr dolnoprzepustowy"
+    *: "Filtr dolnoprzepustowy"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr dolnoprzepustowy"
+    *: "Filtr dolnoprzepustowy"
   </voice>
 </phrase>
 <phrase>
@@ -1092,16 +1044,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr pasmowy %d"
+    *: "Filtr pasmowy %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr pasmowy"
+    *: "Filtr pasmowy"
   </voice>
 </phrase>
 <phrase>
@@ -1109,16 +1058,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtr górnoprzepustowy"
+    *: "Filtr górnoprzepustowy"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtr górnoprzepustowy"
+    *: "Filtr górnoprzepustowy"
   </voice>
 </phrase>
 <phrase>
@@ -1126,16 +1072,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Częstotliwość graniczna"
+    *: "Częstotliwość graniczna"
   </dest>
   <voice>
-    *: none
-    swcodec: "Częstotliwość graniczna"
+    *: "Częstotliwość graniczna"
   </voice>
 </phrase>
 <phrase>
@@ -1143,16 +1086,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Częstotliwość środkowa"
+    *: "Częstotliwość środkowa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Częstotliwość środkowa"
+    *: "Częstotliwość środkowa"
   </voice>
 </phrase>
 <phrase>
@@ -1160,16 +1100,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1177,16 +1114,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Rozpraszanie"
+    *: "Rozpraszanie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rozpraszanie"
+    *: "Rozpraszanie"
   </voice>
 </phrase>
 <phrase>
@@ -1577,16 +1511,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Unikaj przesterowania"
+    *: "Unikaj przesterowania"
   </dest>
   <voice>
-    *: none
-    swcodec: "Unikaj przesterowania"
+    *: "Unikaj przesterowania"
   </voice>
 </phrase>
 <phrase>
@@ -1664,16 +1595,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Brzęczyk przy przejściu"
+    *: "Brzęczyk przy przejściu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Brzęczyk przy przejściu"
+    *: "Brzęczyk przy przejściu"
   </voice>
 </phrase>
 <phrase>
@@ -1681,16 +1609,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Cichy"
+    *: "Cichy"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cichy"
+    *: "Cichy"
   </voice>
 </phrase>
 <phrase>
@@ -1698,16 +1623,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Średni"
+    *: "Średni"
   </dest>
   <voice>
-    *: none
-    swcodec: "Średni"
+    *: "Średni"
   </voice>
 </phrase>
 <phrase>
@@ -1715,16 +1637,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Głośny"
+    *: "Głośny"
   </dest>
   <voice>
-    *: none
-    swcodec: "Głośny"
+    *: "Głośny"
   </voice>
 </phrase>
 <phrase>
@@ -2273,16 +2192,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Czcionka"
+    *: "Czcionka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Czcionka"
+    *: "Czcionka"
   </voice>
 </phrase>
 <phrase>
@@ -2542,16 +2458,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Odwrócony"
+    *: "Odwrócony"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Odwrócony"
+    *: "Odwrócony"
   </voice>
 </phrase>
 <phrase>
@@ -2559,16 +2472,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zaznaczanie linii"
+    *: "Zaznaczanie linii"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zaznaczanie linii"
+    *: "Zaznaczanie linii"
   </voice>
 </phrase>
 <phrase>
@@ -2576,16 +2486,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wskaźnik"
+    *: "Wskaźnik"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wskaźnik"
+    *: "Wskaźnik"
   </voice>
 </phrase>
 <phrase>
@@ -2593,16 +2500,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pasek (w negatywie)"
+    *: "Pasek (w negatywie)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pasek w negatywie"
+    *: "Pasek w negatywie"
   </voice>
 </phrase>
 <phrase>
@@ -2892,16 +2796,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Przesuwanie poza ekran"
+    *: "Przesuwanie poza ekran"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Przesuwanie poza ekran"
+    *: "Przesuwanie poza ekran"
   </voice>
 </phrase>
 <phrase>
@@ -2909,16 +2810,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Krok przesuwania ekranu"
+    *: "Krok przesuwania ekranu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Krok przesuwania ekranu"
+    *: "Krok przesuwania ekranu"
   </voice>
 </phrase>
 <phrase>
@@ -2974,16 +2872,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pasek stanu/przewijania"
+    *: "Pasek stanu/przewijania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pasek stanu oraz przewijania"
+    *: "Pasek stanu oraz przewijania"
   </voice>
 </phrase>
 <phrase>
@@ -2991,16 +2886,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pasek przewijania"
+    *: "Pasek przewijania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pasek przewijania"
+    *: "Pasek przewijania"
   </voice>
 </phrase>
 <phrase>
@@ -3008,16 +2900,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pasek stanu"
+    *: "Pasek stanu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pasek stanu"
+    *: "Pasek stanu"
   </voice>
 </phrase>
 <phrase>
@@ -3025,16 +2914,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stan poziomu głośności"
+    *: "Stan poziomu głośności"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stan poziomu głośności"
+    *: "Stan poziomu głośności"
   </voice>
 </phrase>
 <phrase>
@@ -3042,16 +2928,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stan baterii"
+    *: "Stan baterii"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stan baterii"
+    *: "Stan baterii"
   </voice>
 </phrase>
 <phrase>
@@ -3059,16 +2942,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Graficzny"
+    *: "Graficzny"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graficzny"
+    *: "Graficzny"
   </voice>
 </phrase>
 <phrase>
@@ -3076,16 +2956,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Liczbowy"
+    *: "Liczbowy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Liczbowy"
+    *: "Liczbowy"
   </voice>
 </phrase>
 <phrase>
@@ -3275,16 +3152,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrajski (ISO-8859-8)"
+    *: "Hebrajski (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrajski"
+    *: "Hebrajski"
   </voice>
 </phrase>
 <phrase>
@@ -3306,16 +3180,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tajski (ISO-8859-11)"
+    *: "Tajski (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tajski"
+    *: "Tajski"
   </voice>
 </phrase>
 <phrase>
@@ -3323,16 +3194,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabski (CP1256)"
+    *: "Arabski (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabski"
+    *: "Arabski"
   </voice>
 </phrase>
 <phrase>
@@ -3368,16 +3236,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japoński (SJIS)"
+    *: "Japoński (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japoński"
+    *: "Japoński"
   </voice>
 </phrase>
 <phrase>
@@ -3385,16 +3250,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chiński upr. (GB2312)"
+    *: "Chiński upr. (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chiński uproszczony"
+    *: "Chiński uproszczony"
   </voice>
 </phrase>
 <phrase>
@@ -3402,16 +3264,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreański (KSX1001)"
+    *: "Koreański (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreański"
+    *: "Koreański"
   </voice>
 </phrase>
 <phrase>
@@ -3419,16 +3278,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chiński trad. (BIG5)"
+    *: "Chiński trad. (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chiński tradycyjny"
+    *: "Chiński tradycyjny"
   </voice>
 </phrase>
 <phrase>
@@ -9243,16 +9099,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Parametr: %s %s"
+    *: "Parametr: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9260,16 +9113,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Granica"
+    *: "Granica"
   </dest>
   <voice>
-    *: none
-    swcodec: "Granica"
+    *: "Granica"
   </voice>
 </phrase>
 <phrase>
@@ -9277,16 +9127,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Wzmocnienie"
+    *: "Wzmocnienie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Wzmocnienie"
+    *: "Wzmocnienie"
   </voice>
 </phrase>
 <phrase>
@@ -9789,16 +9636,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Dźwięk przycisków"
+    *: "Dźwięk przycisków"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dźwięk przycisków"
+    *: "Dźwięk przycisków"
   </voice>
 </phrase>
 <phrase>
@@ -9806,16 +9650,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Powtarzaj dźwięk przycisków"
+    *: "Powtarzaj dźwięk przycisków"
   </dest>
   <voice>
-    *: none
-    swcodec: "Powtarzaj dźwięk przycisków"
+    *: "Powtarzaj dźwięk przycisków"
   </voice>
 </phrase>
 <phrase>
@@ -10548,16 +10389,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Szybciej/wolniej"
+    *: "Szybciej/wolniej"
   </dest>
   <voice>
-    *: none
-    swcodec: "Szybciej/wolniej"
+    *: "Szybciej/wolniej"
   </voice>
 </phrase>
 <phrase>
@@ -10565,16 +10403,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Prędkość"
+    *: "Prędkość"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prędkość"
+    *: "Prędkość"
   </voice>
 </phrase>
 <phrase>
@@ -10743,16 +10578,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Szerokość paska przewijania"
+    *: "Szerokość paska przewijania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Szerokość paska przewijania"
+    *: "Szerokość paska przewijania"
   </voice>
 </phrase>
 <phrase>
@@ -10760,16 +10592,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pozycja paska przewijania"
+    *: "Pozycja paska przewijania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pozycja paska przewijania"
+    *: "Pozycja paska przewijania"
   </voice>
 </phrase>
 <phrase>
@@ -10777,16 +10606,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </voice>
 </phrase>
 <phrase>
@@ -10839,16 +10665,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Czas zwolnienia"
+    *: "Czas zwolnienia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Czas zwolnienia"
+    *: "Czas zwolnienia"
   </voice>
 </phrase>
 <phrase>
@@ -10873,16 +10696,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Próg wzbudzenia"
+    *: "Próg wzbudzenia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Próg wzbudzenia"
+    *: "Próg wzbudzenia"
   </voice>
 </phrase>
 <phrase>
@@ -10907,16 +10727,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompensacja poziomu"
+    *: "Kompensacja poziomu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompensacja poziomu"
+    *: "Kompensacja poziomu"
   </voice>
 </phrase>
 <phrase>
@@ -10924,16 +10741,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Styl bazowy"
+    *: "Styl bazowy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Styl bazowy"
+    *: "Styl bazowy"
   </voice>
 </phrase>
 <phrase>
@@ -11009,16 +10823,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Krzywa kompresji"
+    *: "Krzywa kompresji"
   </dest>
   <voice>
-    *: none
-    swcodec: "Krzywa kompresji"
+    *: "Krzywa kompresji"
   </voice>
 </phrase>
 <phrase>
@@ -11026,16 +10837,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatycznie"
+    *: "Automatycznie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatycznie"
+    *: "Automatycznie"
   </voice>
 </phrase>
 <phrase>
@@ -11057,16 +10865,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Gładka"
+    *: "Gładka"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gładka"
+    *: "Gładka"
   </voice>
 </phrase>
 <phrase>
@@ -11088,16 +10893,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Stopień kompresji"
+    *: "Stopień kompresji"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stopień kompresji"
+    *: "Stopień kompresji"
   </voice>
 </phrase>
 <phrase>
@@ -11122,16 +10924,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Ostra"
+    *: "Ostra"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ostra"
+    *: "Ostra"
   </voice>
 </phrase>
 <phrase>
@@ -11139,16 +10938,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Styl bazowy pilota"
+    *: "Styl bazowy pilota"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Styl bazowy pilota"
+    *: "Styl bazowy pilota"
   </voice>
 </phrase>
 <phrase>
@@ -11275,16 +11071,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Cofnij przed wznowieniem"
+    *: "Cofnij przed wznowieniem"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cofnij przed wznowieniem"
+    *: "Cofnij przed wznowieniem"
   </voice>
 </phrase>
 <phrase>
@@ -11323,16 +11116,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "dziesięć do jednego"
+    *: "dziesięć do jednego"
   </voice>
 </phrase>
 <phrase>
@@ -11391,16 +11181,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "dwa do jednego"
+    *: "dwa do jednego"
   </voice>
 </phrase>
 <phrase>
@@ -11459,16 +11246,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11555,16 +11339,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "sześć do jednego"
+    *: "sześć do jednego"
   </voice>
 </phrase>
 <phrase>
@@ -11637,16 +11418,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "cztery do jednego"
+    *: "cztery do jednego"
   </voice>
 </phrase>
 <phrase>
@@ -12222,16 +12000,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Prosty (Meier)"
+    *: "Prosty (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prosty Mejer"
+    *: "Prosty Mejer"
   </voice>
 </phrase>
 <phrase>
@@ -12267,16 +12042,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Własny"
+    *: "Własny"
   </dest>
   <voice>
-    *: none
-    swcodec: "Własny"
+    *: "Własny"
   </voice>
 </phrase>
 <phrase>
@@ -12360,16 +12132,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Czas ataku"
+    *: "Czas ataku"
   </dest>
   <voice>
-    *: none
-    swcodec: "Czas ataku"
+    *: "Czas ataku"
   </voice>
 </phrase>
 <phrase>
@@ -12408,16 +12177,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12487,16 +12253,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Redukcja zmęczenia słuchowego"
+    *: "Redukcja zmęczenia słuchowego"
   </dest>
   <voice>
-    *: none
-    swcodec: "Redukcja zmęczenia słuchowego"
+    *: "Redukcja zmęczenia słuchowego"
   </voice>
 </phrase>
 <phrase>
@@ -12504,16 +12267,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Miks suchy / mokry"
+    *: "Miks suchy / mokry"
   </dest>
   <voice>
-    *: none
-    swcodec: "Miks suchy mokry"
+    *: "Miks suchy mokry"
   </voice>
 </phrase>
 <phrase>
@@ -12538,16 +12298,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "Tylko strona"
+    *: "Tylko strona"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tylko strona"
+    *: "Tylko strona"
   </voice>
 </phrase>
 <phrase>
@@ -12589,16 +12346,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Przestrzenny Haas"
+    *: "Przestrzenny Haas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Przestrzenny Haas"
+    *: "Przestrzenny Haas"
   </voice>
 </phrase>
 <phrase>
@@ -12606,16 +12360,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12657,16 +12408,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12674,16 +12422,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Percepcyjne rozszerzenie basu"
+    *: "Percepcyjne rozszerzenie basu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Percepcyjne rozszerzenie basu"
+    *: "Percepcyjne rozszerzenie basu"
   </voice>
 </phrase>
 <phrase>
@@ -13013,16 +12758,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Czas pokazu slajdów"
+    *: "Czas pokazu slajdów"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Czas pokazu slajdów"
+    *: "Czas pokazu slajdów"
   </voice>
 </phrase>
 <phrase>
@@ -13044,16 +12786,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nieoznakowany"
+    *: "Nieoznakowany"
   </voice>
 </phrase>
 <phrase>
@@ -13061,16 +12800,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukryj tytuł albumu"
+    *: "Ukryj tytuł albumu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukryj tytuł albumu"
+    *: "Ukryj tytuł albumu"
   </voice>
 </phrase>
 <phrase>
@@ -13078,19 +12814,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Tryb odtwarzania"
     lowmem: none
-    swcodec: "Tryb odtwarzania"
   </dest>
   <voice>
-    *: none
+    *: "Tryb odtwarzania"
     lowmem: none
-    swcodec: "Tryb odtwarzania"
   </voice>
 </phrase>
 <phrase>
@@ -13112,16 +12845,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Przywróć grę"
+    *: "Przywróć grę"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Przywróć grę"
+    *: "Przywróć grę"
   </voice>
 </phrase>
 <phrase>
@@ -13129,16 +12859,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Szach mat!"
+    *: "Szach mat!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Szach mat!"
+    *: "Szach mat!"
   </voice>
 </phrase>
 <phrase>
@@ -13146,16 +12873,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 3: 60 ruchów / 30 min"
+    *: "Poziom 3: 60 ruchów / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 3: 60 ruchów na 30 minut"
+    *: "Poziom 3: 60 ruchów na 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13194,16 +12918,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Oznakowany"
+    *: "Oznakowany"
   </voice>
 </phrase>
 <phrase>
@@ -13211,16 +12932,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nie znaleziono gier!"
+    *: "Nie znaleziono gier!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nie znaleziono gier!"
+    *: "Nie znaleziono gier!"
   </voice>
 </phrase>
 <phrase>
@@ -13228,16 +12946,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Wyświetl FPS"
+    *: "Wyświetl FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap,swcodec: "Wyświetl FPS"
+    *: "Wyświetl FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13259,19 +12974,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Użyj ustawienia dźwięku"
     lowmem: none
-    swcodec: "Użyj ustawienia dźwięku"
   </dest>
   <voice>
-    *: none
+    *: "Użyj ustawienia dźwięku"
     lowmem: none
-    swcodec: "Użyj ustawienia dźwięku"
   </voice>
 </phrase>
 <phrase>
@@ -13307,19 +13019,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Opcje wznawiania"
     lowmem: none
-    swcodec: "Opcje wznawiania"
   </dest>
   <voice>
-    *: none
+    *: "Opcje wznawiania"
     lowmem: none
-    swcodec: "Opcje wznawiania"
   </voice>
 </phrase>
 <phrase>
@@ -13327,19 +13036,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Interpolacja"
     lowmem: none
-    swcodec: "Interpolacja"
   </dest>
   <voice>
-    *: none
+    *: "Interpolacja"
     lowmem: none
-    swcodec: "Interpolacja"
   </voice>
 </phrase>
 <phrase>
@@ -13347,16 +13053,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Przejdź do WPS"
+    *: "Przejdź do WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Przejdź do WPS"
+    *: "Przejdź do WPS"
   </voice>
 </phrase>
 <phrase>
@@ -13364,16 +13067,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zagraj w Wormlet!"
+    *: "Zagraj w Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zagraj w Wormlet!"
+    *: "Zagraj w Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -13409,16 +13109,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Powiększenie"
+    *: "Powiększenie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Powiększenie"
+    *: "Powiększenie"
   </voice>
 </phrase>
 <phrase>
@@ -13454,16 +13151,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 1: 60 ruchów / 5 min"
+    *: "Poziom 1: 60 ruchów / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 1: 60 ruchów na 5 minut"
+    *: "Poziom 1: 60 ruchów na 5 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13471,19 +13165,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Odtwarzaj od początku"
     lowmem: none
-    swcodec: "Odtwarzaj od początku"
   </dest>
   <voice>
-    *: none
+    *: "Odtwarzaj od początku"
     lowmem: none
-    swcodec: "Odtwarzaj od początku"
   </voice>
 </phrase>
 <phrase>
@@ -13491,16 +13182,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 8: 1 ruch / 15 min"
+    *: "Poziom 8: 1 ruch / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 8: 1 ruch na 15 minut"
+    *: "Poziom 8: 1 ruch na 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13508,16 +13196,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gracz"
+    *: "Gracz"
   </voice>
 </phrase>
 <phrase>
@@ -13525,16 +13210,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 4: 40 ruchów / 30 min"
+    *: "Poziom 4: 40 ruchów / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 4: 40 ruchów na 30 minut"
+    *: "Poziom 4: 40 ruchów na 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13542,16 +13224,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wielkość żywności"
+    *: "Wielkość żywności"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wielkość żywności"
+    *: "Wielkość żywności"
   </voice>
 </phrase>
 <phrase>
@@ -13587,19 +13266,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "Pomiń klatki"
     lowmem: none
-    swcodec: "Pomiń klatki"
   </dest>
   <voice>
-    *: none
+    *: "Pomiń klatki"
     lowmem: none
-    swcodec: "Pomiń klatki"
   </voice>
 </phrase>
 <phrase>
@@ -13607,16 +13283,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pionek"
+    *: "Pionek"
   </voice>
 </phrase>
 <phrase>
@@ -13638,16 +13311,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nielegalny ruch!"
+    *: "Nielegalny ruch!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nielegalny ruch!"
+    *: "Nielegalny ruch!"
   </voice>
 </phrase>
 <phrase>
@@ -13655,16 +13325,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nowa gra"
+    *: "Nowa gra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nowa gra"
+    *: "Nowa gra"
   </voice>
 </phrase>
 <phrase>
@@ -13672,16 +13339,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Odbuduj pamięć podręczną"
+    *: "Odbuduj pamięć podręczną"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Odbuduj pamięć podręczną"
+    *: "Odbuduj pamięć podręczną"
   </voice>
 </phrase>
 <phrase>
@@ -13731,16 +13395,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Królowa"
+    *: "Królowa"
   </voice>
 </phrase>
 <phrase>
@@ -13748,19 +13409,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Wznów automatycznie"
     lowmem: none
-    swcodec: "Wznów automatycznie"
   </dest>
   <voice>
-    *: none
+    *: "Wznów automatycznie"
     lowmem: none
-    swcodec: "Wznów automatycznie"
   </voice>
 </phrase>
 <phrase>
@@ -13782,16 +13440,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poprzez listę utworów"
+    *: "Poprzez listę utworów"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poprzez listę utworów"
+    *: "Poprzez listę utworów"
   </voice>
 </phrase>
 <phrase>
@@ -13799,19 +13454,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Pogłos"
     lowmem: none
-    swcodec: "Pogłos"
   </dest>
   <voice>
-    *: none
+    *: "Pogłos"
     lowmem: none
-    swcodec: "Pogłos"
   </voice>
 </phrase>
 <phrase>
@@ -13847,16 +13499,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wyczyść listę odtwarzania"
+    *: "Wyczyść listę odtwarzania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wyczyść listę odtwarzania"
+    *: "Wyczyść listę odtwarzania"
   </voice>
 </phrase>
 <phrase>
@@ -13864,16 +13513,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nie można ponownie uruchomić odtwarzania"
+    *: "Nie można ponownie uruchomić odtwarzania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nie można ponownie uruchomić odtwarzania"
+    *: "Nie można ponownie uruchomić odtwarzania"
   </voice>
 </phrase>
 <phrase>
@@ -13881,19 +13527,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Ogranicz FPS"
     lowmem: none
-    swcodec: "Ogranicz FPS"
   </dest>
   <voice>
-    *: none
+    *: "Ogranicz FPS"
     lowmem: none
-    swcodec: "Ogranicz FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13901,19 +13544,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Wyczyść wszystko wznawia"
     lowmem: none
-    swcodec: "Wyczyść wszystko wznawia"
   </dest>
   <voice>
-    *: none
+    *: "Wyczyść wszystko wznawia"
     lowmem: none
-    swcodec: "Wyczyść wszystko wznawia"
   </voice>
 </phrase>
 <phrase>
@@ -13921,16 +13561,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "strona królowej"
+    *: "strona królowej"
   </voice>
 </phrase>
 <phrase>
@@ -13938,16 +13575,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Błąd zapisu konfiguracji"
+    *: "Błąd zapisu konfiguracji"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Błąd zapisu konfiguracji"
+    *: "Błąd zapisu konfiguracji"
   </voice>
 </phrase>
 <phrase>
@@ -13955,16 +13589,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zapisz grę"
+    *: "Zapisz grę"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zapisz grę"
+    *: "Zapisz grę"
   </voice>
 </phrase>
 <phrase>
@@ -14000,16 +13631,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Biały"
+    *: "Biały"
   </voice>
 </phrase>
 <phrase>
@@ -14031,16 +13659,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wyświetl zagrane gry"
+    *: "Wyświetl zagrane gry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wyświetl zagrane gry"
+    *: "Wyświetl zagrane gry"
   </voice>
 </phrase>
 <phrase>
@@ -14048,16 +13673,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wyczyszczono listę odtwarzania"
+    *: "Wyczyszczono listę odtwarzania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wyczyszczono listę odtwarzania"
+    *: "Wyczyszczono listę odtwarzania"
   </voice>
 </phrase>
 <phrase>
@@ -14079,16 +13701,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dyfuzja"
+    *: "Dyfuzja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dyfuzja"
+    *: "Dyfuzja"
   </voice>
 </phrase>
 <phrase>
@@ -14096,16 +13715,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kontynuuj grę"
+    *: "Kontynuuj grę"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kontynuuj grę"
+    *: "Kontynuuj grę"
   </voice>
 </phrase>
 <phrase>
@@ -14113,19 +13729,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Opcje audio"
     lowmem: none
-    swcodec: "Opcje audio"
   </dest>
   <voice>
-    *: none
+    *: "Opcje audio"
     lowmem: none
-    swcodec: "Opcje audio"
   </voice>
 </phrase>
 <phrase>
@@ -14150,19 +13763,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "Przyspieszenie CPU"
     lowmem: none
-    swcodec: "Przyspieszenie CPU"
   </dest>
   <voice>
-    *: none
+    *: "Przyspieszenie CPU"
     lowmem: none
-    swcodec: "Przyspieszenie CPU"
   </voice>
 </phrase>
 <phrase>
@@ -14170,16 +13780,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 7: 40 ruchów / 240 min"
+    *: "Poziom 7: 40 ruchów / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 7: 40 ruchów na 240 minut"
+    *: "Poziom 7: 40 ruchów na 240 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14187,19 +13794,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Menu startowe"
     lowmem: none
-    swcodec: "Menu startowe"
   </dest>
   <voice>
-    *: none
+    *: "Menu startowe"
     lowmem: none
-    swcodec: "Menu startowe"
   </voice>
 </phrase>
 <phrase>
@@ -14207,16 +13811,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 2: 60 ruchów / 15 min"
+    *: "Poziom 2: 60 ruchów / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 2: 60 ruchów na 15 minut"
+    *: "Poziom 2: 60 ruchów na 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14224,16 +13825,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż tytuł albumu"
+    *: "Pokaż tytuł albumu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż tytuł albumu"
+    *: "Pokaż tytuł albumu"
   </voice>
 </phrase>
 <phrase>
@@ -14269,19 +13867,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Jasność podświetlenia"
     lowmem: none
-    swcodec: "Jasność podświetlenia"
   </dest>
   <voice>
-    *: none
+    *: "Jasność podświetlenia"
     lowmem: none
-    swcodec: "Jasność podświetlenia"
   </voice>
 </phrase>
 <phrase>
@@ -14289,16 +13884,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Liczba robaków"
+    *: "Liczba robaków"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Liczba robaków"
+    *: "Liczba robaków"
   </voice>
 </phrase>
 <phrase>
@@ -14306,16 +13898,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż na dole"
+    *: "Pokaż na dole"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż na dole"
+    *: "Pokaż na dole"
   </voice>
 </phrase>
 <phrase>
@@ -14323,16 +13912,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Szach!"
+    *: "Szach!"
   </voice>
 </phrase>
 <phrase>
@@ -14382,16 +13968,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skoczek"
+    *: "Skoczek"
   </voice>
 </phrase>
 <phrase>
@@ -14399,16 +13982,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Margines środkowy"
+    *: "Margines środkowy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Margines środkowy"
+    *: "Margines środkowy"
   </voice>
 </phrase>
 <phrase>
@@ -14416,16 +13996,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 6: 40 ruchów / 120 min"
+    *: "Poziom 6: 40 ruchów / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 6: 40 ruchów na 120 minut"
+    *: "Poziom 6: 40 ruchów na 120 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14433,16 +14010,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghi na żywność"
+    *: "Arghi na żywność"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghi na żywność"
+    *: "Arghi na żywność"
   </voice>
 </phrase>
 <phrase>
@@ -14481,19 +14055,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Menu startowe, jeśli nie zostało ukończone"
     lowmem: none
-    swcodec: "Menu startowe, jeśli nie zostało ukończone"
   </dest>
   <voice>
-    *: none
+    *: "Menu startowe, jeśli nie zostało ukończone"
     lowmem: none
-    swcodec: "Menu startowe, jeśli nie zostało ukończone"
   </voice>
 </phrase>
 <phrase>
@@ -14501,16 +14072,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gry"
+    *: "Gry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14532,16 +14100,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Liczba slajdów"
+    *: "Liczba slajdów"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Liczba slajdów"
+    *: "Liczba slajdów"
   </voice>
 </phrase>
 <phrase>
@@ -14549,19 +14114,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Pojedynczy"
     lowmem: none
-    swcodec: "Pojedynczy"
   </dest>
   <voice>
-    *: none
+    *: "Pojedynczy"
     lowmem: none
-    swcodec: "Pojedynczy"
   </voice>
 </phrase>
 <phrase>
@@ -14586,16 +14148,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Czarny"
+    *: "Czarny"
   </voice>
 </phrase>
 <phrase>
@@ -14603,16 +14162,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 5: 40 ruchów / 60 min"
+    *: "Poziom 5: 40 ruchów / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 5: 40 ruchów na 60 minut"
+    *: "Poziom 5: 40 ruchów na 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14620,16 +14176,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Program GNU Chess"
+    *: "Program GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -14637,16 +14190,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Myślę..."
+    *: "Myślę..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14668,16 +14218,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Król"
+    *: "Król"
   </voice>
 </phrase>
 <phrase>
@@ -14685,16 +14232,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Błąd parsowania gry!"
+    *: "Błąd parsowania gry!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Błąd parsowania gry!"
+    *: "Błąd parsowania gry!"
   </voice>
 </phrase>
 <phrase>
@@ -14702,16 +14246,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wieża"
+    *: "Wieża"
   </voice>
 </phrase>
 <phrase>
@@ -14719,19 +14260,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "Sterowanie tonami"
     lowmem: none
-    swcodec: "Sterowanie tonami"
   </dest>
   <voice>
-    *: none
+    *: "Sterowanie tonami"
     lowmem: none
-    swcodec: "Sterowanie tonami"
   </voice>
 </phrase>
 <phrase>
@@ -14753,16 +14291,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zapisywanie pozycji"
+    *: "Zapisywanie pozycji"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zapisywanie pozycji"
+    *: "Zapisywanie pozycji"
   </voice>
 </phrase>
 <phrase>
@@ -14770,19 +14305,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "Ustaw czas wznowienia (min)"
     lowmem: none
-    swcodec: "Ustaw czas wznowienia (min)"
   </dest>
   <voice>
-    *: none
+    *: "Ustaw czas wznowienia"
     lowmem: none
-    swcodec: "Ustaw czas wznowienia"
   </voice>
 </phrase>
 <phrase>
@@ -14807,16 +14339,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prędkość robaka"
+    *: "Prędkość robaka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prędkość robaka"
+    *: "Prędkość robaka"
   </voice>
 </phrase>
 <phrase>
@@ -14824,16 +14353,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pod koniec gry"
+    *: "Pod koniec gry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pod koniec gry"
+    *: "Pod koniec gry"
   </voice>
 </phrase>
 <phrase>
@@ -14855,16 +14381,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Integracja WPS"
+    *: "Integracja WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Integracja WPS"
+    *: "Integracja WPS"
   </voice>
 </phrase>
 <phrase>
@@ -14872,16 +14395,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ładowanie pozycji"
+    *: "Ładowanie pozycji"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ładowanie pozycji"
+    *: "Ładowanie pozycji"
   </voice>
 </phrase>
 <phrase>
@@ -14903,16 +14423,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 10: 1 ruch / 600 min"
+    *: "Poziom 10: 1 ruch / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 10: 1 ruch na 600 minut"
+    *: "Poziom 10: 1 ruch na 600 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14920,16 +14437,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rozstaw"
+    *: "Rozstaw"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rozstaw"
+    *: "Rozstaw"
   </voice>
 </phrase>
 <phrase>
@@ -14982,16 +14496,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Uszeregowane"
+    *: "Uszeregowane"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Uszeregowane"
+    *: "Uszeregowane"
   </voice>
 </phrase>
 <phrase>
@@ -14999,16 +14510,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zmień rozmiar okładek"
+    *: "Zmień rozmiar okładek"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zmień rozmiar okładek"
+    *: "Zmień rozmiar okładek"
   </voice>
 </phrase>
 <phrase>
@@ -15044,16 +14552,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nie znaleziono okładki albumu"
+    *: "Nie znaleziono okładki albumu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nie znaleziono okładki albumu"
+    *: "Nie znaleziono okładki albumu"
   </voice>
 </phrase>
 <phrase>
@@ -15061,19 +14566,16 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Niedostępne"
     lowmem: none
-    swcodec: "Niedostępne"
   </dest>
   <voice>
-    *: none
+    *: "Niedostępne"
     lowmem: none
-    swcodec: "Niedostępne"
   </voice>
 </phrase>
 <phrase>
@@ -15081,16 +14583,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wybierz inną grę"
+    *: "Wybierz inną grę"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wybierz inną grę"
+    *: "Wybierz inną grę"
   </voice>
 </phrase>
 <phrase>
@@ -15112,16 +14611,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż na górze"
+    *: "Pokaż na górze"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż na górze"
+    *: "Pokaż na górze"
   </voice>
 </phrase>
 <phrase>
@@ -15129,16 +14625,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Wzrost robaka na żywność"
+    *: "Wzrost robaka na żywność"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Wzrost robaka na żywność"
+    *: "Wzrost robaka na żywność"
   </voice>
 </phrase>
 <phrase>
@@ -15146,16 +14639,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rozmiar Argh"
+    *: "Rozmiar Argh"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rozmiar Argh"
+    *: "Rozmiar Argh"
   </voice>
 </phrase>
 <phrase>
@@ -15180,19 +14670,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Separacja panoramowania"
     lowmem: none
-    swcodec: "Separacja panoramowania"
   </dest>
   <voice>
-    *: none
+    *: "Separacja panoramowania"
     lowmem: none
-    swcodec: "Separacja panoramowania"
   </voice>
 </phrase>
 <phrase>
@@ -15200,16 +14687,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "strona króla"
+    *: "strona króla"
   </voice>
 </phrase>
 <phrase>
@@ -15231,19 +14715,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Użyj wspólnego ustawienia"
     lowmem: none
-    swcodec: "Użyj wspólnego ustawienia"
   </dest>
   <voice>
-    *: none
+    *: "Użyj wspólnego ustawienia"
     lowmem: none
-    swcodec: "Użyj wspólnego ustawienia"
   </voice>
 </phrase>
 <phrase>
@@ -15265,16 +14746,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skala szarości"
+    *: "Skala szarości"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skala szarości"
+    *: "Skala szarości"
   </voice>
 </phrase>
 <phrase>
@@ -15324,16 +14802,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "zdobycia"
+    *: "zdobycia"
   </voice>
 </phrase>
 <phrase>
@@ -15369,19 +14844,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Przestrzenny"
     lowmem: none
-    swcodec: "Przestrzenny"
   </dest>
   <voice>
-    *: none
+    *: "Przestrzenny"
     lowmem: none
-    swcodec: "Przestrzenny"
   </voice>
 </phrase>
 <phrase>
@@ -15389,16 +14861,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Goniec"
+    *: "Goniec"
   </voice>
 </phrase>
 <phrase>
@@ -15406,16 +14875,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Na początku gry"
+    *: "Na początku gry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Na początku gry"
+    *: "Na początku gry"
   </voice>
 </phrase>
 <phrase>
@@ -15423,16 +14889,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zrestartuj grę"
+    *: "Zrestartuj grę"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zrestartuj grę"
+    *: "Zrestartuj grę"
   </voice>
 </phrase>
 <phrase>
@@ -15468,16 +14931,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziom 9: 1 ruch / 60 min"
+    *: "Poziom 9: 1 ruch / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziom 9: 1 ruch na 60 minut"
+    *: "Poziom 9: 1 ruch na 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -15485,16 +14945,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Przełącz tryb pokazu slajdów"
+    *: "Przełącz tryb pokazu slajdów"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Przełącz tryb pokazu slajdów"
+    *: "Przełącz tryb pokazu slajdów"
   </voice>
 </phrase>
 <phrase>
@@ -15502,16 +14959,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zawsze włączone"
+    *: "Zawsze włączone"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zawsze włączone"
+    *: "Zawsze włączone"
   </voice>
 </phrase>
 <phrase>
@@ -15575,16 +15029,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pamięć podręczna zostanie odbudowana po restarcie"
+    *: "Pamięć podręczna zostanie odbudowana po restarcie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pamięć podręczna zostanie odbudowana po restarcie"
+    *: "Pamięć podręczna zostanie odbudowana po restarcie"
   </voice>
 </phrase>
 <phrase>
@@ -15592,16 +15043,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dodano do listy odtwarzania"
+    *: "Dodano do listy odtwarzania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dodano do listy odtwarzania"
+    *: "Dodano do listy odtwarzania"
   </voice>
 </phrase>
 <phrase>
@@ -15651,16 +15099,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bezpośrednie"
+    *: "Bezpośrednie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bezpośrednie"
+    *: "Bezpośrednie"
   </voice>
 </phrase>
 <phrase>
@@ -15668,16 +15113,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "roszada"
+    *: "roszada"
   </voice>
 </phrase>
 <phrase>
@@ -15685,16 +15127,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż album na dole"
+    *: "Pokaż album na dole"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż album na dole"
+    *: "Pokaż album na dole"
   </voice>
 </phrase>
 <phrase>
@@ -15716,16 +15155,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukryj informacje"
+    *: "Ukryj informacje"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukryj informacje"
+    *: "Ukryj informacje"
   </voice>
 </phrase>
 <phrase>
@@ -15733,16 +15169,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż album i wykonawcę na górze"
+    *: "Pokaż album i wykonawcę na górze"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż album i wykonawcę na górze"
+    *: "Pokaż album i wykonawcę na górze"
   </voice>
 </phrase>
 <phrase>
@@ -15750,16 +15183,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż album na górze"
+    *: "Pokaż album na górze"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż album na górze"
+    *: "Pokaż album na górze"
   </voice>
 </phrase>
 <phrase>
@@ -15767,16 +15197,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pokaż album i wykonawcę na dole"
+    *: "Pokaż album i wykonawcę na dole"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pokaż album i wykonawcę na dole"
+    *: "Pokaż album i wykonawcę na dole"
   </voice>
 </phrase>
 <phrase>
@@ -16039,19 +15466,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "Mikser HQ"
     lowmem: none
-    swcodec: "Mikser HQ"
   </dest>
   <voice>
-    *: none
+    *: "Mikser wysokiej jakości"
     lowmem: none
-    swcodec: "Mikser wysokiej jakości"
   </voice>
 </phrase>
 <phrase>
@@ -16059,19 +15483,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Częstotliwość próbkowania"
     lowmem: none
-    swcodec: "Częstotliwość próbkowania"
   </dest>
   <voice>
-    *: none
+    *: "Częstotliwość próbkowania"
     lowmem: none
-    swcodec: "Częstotliwość próbkowania"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index fa0ba795a5..457ec883b9 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -247,20 +247,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Sim"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, ou topo direito = Sim"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Sim"
     iriverh100,iriverh120,iriverh300: "NAVI = Sim"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Sim"
     mrobe500: "PLAY, POWER, ou topo direito = Sim"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Sim"
   </dest>
   <voice>
@@ -816,16 +816,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -833,16 +830,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho Direto"
+    *: "Ganho Direto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho Direto"
+    *: "Ganho Direto"
   </voice>
 </phrase>
 <phrase>
@@ -850,16 +844,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho Cruzado"
+    *: "Ganho Cruzado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho Cruzado"
+    *: "Ganho Cruzado"
   </voice>
 </phrase>
 <phrase>
@@ -867,16 +858,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuação de Altas Frequências"
+    *: "Atenuação de Altas Frequências"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuação de Altas Frequências"
+    *: "Atenuação de Altas Frequências"
   </voice>
 </phrase>
 <phrase>
@@ -884,16 +872,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Corte de Altas Frenquências"
+    *: "Corte de Altas Frenquências"
   </dest>
   <voice>
-    *: none
-    swcodec: "Corte de Altas Frenquências"
+    *: "Corte de Altas Frenquências"
   </voice>
 </phrase>
 <phrase>
@@ -901,16 +886,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizador"
+    *: "Equalizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizador"
+    *: "Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -918,16 +900,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Habilitar EQ"
+    *: "Habilitar EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Habilitar Equalizador"
+    *: "Habilitar Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -935,16 +914,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Gráfico"
+    *: "EQ Gráfico"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizador Gráfico"
+    *: "Equalizador Gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -952,16 +928,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pré-corte"
+    *: "Pré-corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pré-corte"
+    *: "Pré-corte"
   </voice>
 </phrase>
 <phrase>
@@ -969,16 +942,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Opções Simples de EQ"
+    *: "Opções Simples de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opções Simples De Equalizador"
+    *: "Opções Simples De Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -986,16 +956,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Opções Avançadas de EQ"
+    *: "Opções Avançadas de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opções Avançadas de Equalizador"
+    *: "Opções Avançadas de Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -1003,16 +970,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Salvar Predefinição de EQ"
+    *: "Salvar Predefinição de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Salvar Predefinição de Equalizador"
+    *: "Salvar Predefinição de Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -1020,16 +984,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Explorar Predefinição de EQ"
+    *: "Explorar Predefinição de EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Explorar Predefinição de Equalizador"
+    *: "Explorar Predefinição de Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -1037,16 +998,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de Edição: %s"
+    *: "Modo de Edição: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1054,16 +1012,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Ganho de Banda"
+    *: "%d Hz Ganho de Banda"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz de Ganho de Banda"
+    *: "hertz de Ganho de Banda"
   </voice>
 </phrase>
 <phrase>
@@ -1071,16 +1026,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Baixa Proteção"
+    *: "Filtro de Baixa Proteção"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Baixa Proteção"
+    *: "Filtro de Baixa Proteção"
   </voice>
 </phrase>
 <phrase>
@@ -1088,16 +1040,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Picos %d"
+    *: "Filtro de Picos %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Picos"
+    *: "Filtro de Picos"
   </voice>
 </phrase>
 <phrase>
@@ -1105,16 +1054,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Alta Proteção"
+    *: "Filtro de Alta Proteção"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Alta Proteção"
+    *: "Filtro de Alta Proteção"
   </voice>
 </phrase>
 <phrase>
@@ -1122,16 +1068,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </voice>
 </phrase>
 <phrase>
@@ -1139,16 +1082,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centrar Frequência"
+    *: "Centrar Frequência"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centrar Frequência"
+    *: "Centrar Frequência"
   </voice>
 </phrase>
 <phrase>
@@ -1156,16 +1096,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1173,16 +1110,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1726,16 +1660,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevenir Clipping"
+    *: "Prevenir Clipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevenir Clipping"
+    *: "Prevenir Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -1813,16 +1744,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Beep do pulo de faixa"
+    *: "Beep do pulo de faixa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Beep do pulo de faixa"
+    *: "Beep do pulo de faixa"
   </voice>
 </phrase>
 <phrase>
@@ -1830,16 +1758,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Fraco"
+    *: "Fraco"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fraco"
+    *: "Fraco"
   </voice>
 </phrase>
 <phrase>
@@ -1847,16 +1772,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </voice>
 </phrase>
 <phrase>
@@ -1864,16 +1786,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </voice>
 </phrase>
 <phrase>
@@ -2230,21 +2149,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Construindo Base de Dados... %d encontrados (OFF para retornar)"
-    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
-    ipod*: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
-    gogearsa9200: "Construindo Base de Dados... %d encontrados (REW para retornar)"
     archosplayer: "Construindo BD %d encontrado"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Construindo Base de Dados... %d encontrados (LEFT para retornar)"
+    gogearsa9200: "Construindo Base de Dados... %d encontrados (REW para retornar)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Construindo Base de Dados... %d encontrados (PREV para retornar)"
+    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para retornar)"
   </dest>
   <voice>
     *: "entradas encontradas para a base de dados"
@@ -2426,16 +2343,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fontes"
+    *: "Fontes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fontes"
+    *: "Fontes"
   </voice>
 </phrase>
 <phrase>
@@ -2697,16 +2611,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rodar 180 Graus"
+    *: "Rodar 180 Graus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rodar Cento e Oitenta Graus"
+    *: "Rodar Cento e Oitenta Graus"
   </voice>
 </phrase>
 <phrase>
@@ -2714,16 +2625,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipo De Seletor De Linha"
+    *: "Tipo De Seletor De Linha"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipo De Seletor De Linha"
+    *: "Tipo De Seletor De Linha"
   </voice>
 </phrase>
 <phrase>
@@ -2731,16 +2639,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Apontador"
+    *: "Apontador"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Apontador"
+    *: "Apontador"
   </voice>
 </phrase>
 <phrase>
@@ -2748,16 +2653,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra (Inversa)"
+    *: "Barra (Inversa)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra Inversa"
+    *: "Barra Inversa"
   </voice>
 </phrase>
 <phrase>
@@ -3047,16 +2949,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barras de Navegação Fora da Tela"
+    *: "Barras de Navegação Fora da Tela"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barras de Navegação Fora da Tela"
+    *: "Barras de Navegação Fora da Tela"
   </voice>
 </phrase>
 <phrase>
@@ -3064,16 +2963,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Avanço das Barras de Navegação"
+    *: "Avanço das Barras de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Avanço das Barras de Navegação"
+    *: "Avanço das Barras de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -3129,16 +3025,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Estado e Barra de Navegação"
+    *: "Estado e Barra de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Estado e Barra de Navegação"
+    *: "Estado e Barra de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -3146,16 +3039,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de Navegação"
+    *: "Barra de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de Navegação"
+    *: "Barra de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -3163,16 +3053,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de Estado"
+    *: "Barra de Estado"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de Estado"
+    *: "Barra de Estado"
   </voice>
 </phrase>
 <phrase>
@@ -3197,16 +3084,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostragem do Volume"
+    *: "Mostragem do Volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostragem do Volume"
+    *: "Mostragem do Volume"
   </voice>
 </phrase>
 <phrase>
@@ -3214,16 +3098,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostragem de Bateria"
+    *: "Mostragem de Bateria"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostragem de Bateria"
+    *: "Mostragem de Bateria"
   </voice>
 </phrase>
 <phrase>
@@ -3231,16 +3112,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gráfica"
+    *: "Gráfica"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gráfica"
+    *: "Gráfica"
   </voice>
 </phrase>
 <phrase>
@@ -3248,16 +3126,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numérica"
+    *: "Numérica"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numérica"
+    *: "Numérica"
   </voice>
 </phrase>
 <phrase>
@@ -3477,16 +3352,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebraico (ISO-8859-8)"
+    *: "Hebraico (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebraico"
+    *: "Hebraico"
   </voice>
 </phrase>
 <phrase>
@@ -3508,16 +3380,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tailandês (ISO-8859-11)"
+    *: "Tailandês (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tailandês"
+    *: "Tailandês"
   </voice>
 </phrase>
 <phrase>
@@ -3525,16 +3394,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Árabe (CP1256)"
+    *: "Árabe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Árabe"
+    *: "Árabe"
   </voice>
 </phrase>
 <phrase>
@@ -3570,16 +3436,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonês (SJIS)"
+    *: "Japonês (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanês"
+    *: "Japanês"
   </voice>
 </phrase>
 <phrase>
@@ -3587,16 +3450,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinês Simplificado (GB2312)"
+    *: "Chinês Simplificado (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinês Simplificado"
+    *: "Chinês Simplificado"
   </voice>
 </phrase>
 <phrase>
@@ -3604,16 +3464,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreano (KSX1001)"
+    *: "Coreano (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coreano"
+    *: "Coreano"
   </voice>
 </phrase>
 <phrase>
@@ -3621,16 +3478,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinês Tradicional (BIG5)"
+    *: "Chinês Tradicional (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinês Tradicional"
+    *: "Chinês Tradicional"
   </voice>
 </phrase>
 <phrase>
@@ -3654,17 +3508,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    sansae200*,sansafuze*: "Duração da Luz da Roda"
   </dest>
   <voice>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    sansae200*,sansafuze*: "Duração da Luz da Roda"
   </voice>
 </phrase>
 <phrase>
@@ -3935,27 +3789,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Ajustar"
-    mrobe500: "HEART = Ajustar"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ajustar"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ajustar"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ajustar"
     gogearsa9200,samsungyh*: "PLAY = Ajustar"
-    vibe500: "OK = Ajustar"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ajustar"
     mpiohd300: "ENTER = Ajustar"
+    mrobe500: "HEART = Ajustar"
+    rtc: "ON = Ajustar"
+    vibe500: "OK = Ajustar"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3964,35 +3818,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Reverter"
-    mrobe500: "POWER = Reverter"
-    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
-    ipod*,sansac200*,mpiohd300: "MENU = Reverter"
-    iaudiox5,iaudiom5: "RECORD = Reverter"
+    gigabeatfx,mrobe500: "POWER = Reverter"
+    gigabeats,sansafuzeplus: "BACK = Reverter"
+    gogearsa9200: "LEFT = Reverter"
+    iaudiom5,iaudiox5: "RECORD = Reverter"
+    ipod*,mpiohd300,sansac200*: "MENU = Reverter"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter"
-    gigabeatfx: "POWER = Reverter"
-    sansafuzeplus: "BACK = Reverter"
+    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
     mrobe100: "DISPLAY = Reverter"
-    gigabeats: "BACK = Reverter"
-    gogearsa9200: "LEFT = Reverter"
-    vibe500: "CANCEL = Reverter"
+    rtc: "OFF = Reverter"
     samsungyh*: "REW = Reverter"
+    vibe500: "CANCEL = Reverter"
   </dest>
   <voice>
     *: none
@@ -4481,22 +4331,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
+    gigabeats: "SELECT=Alterar POWER=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
     iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar"
-    gigabeats: "SELECT=Alterar POWER=Cancelar"
-    vibe500: "OK=Alterar C=Cancelar"
     mpiohd300: "ENTER=Alterar MENU=Cancelar"
     sansafuzeplus: "SELECT=Alterar  BACK=Cancelar"
+    vibe500: "OK=Alterar C=Cancelar"
   </dest>
   <voice>
     *: none
@@ -5601,15 +5451,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frequência"
+    play_frequency,recording: "Frequência"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequência"
+    play_frequency,recording: "Frequência"
   </voice>
 </phrase>
 <phrase>
@@ -5652,18 +5502,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microfone"
     iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    recording: "Microfone"
   </dest>
   <voice>
     *: none
-    recording: "Microfone"
     iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    recording: "Microfone"
   </voice>
 </phrase>
 <phrase>
@@ -6541,13 +6391,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível da bateria"
@@ -6604,24 +6454,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7936,23 +7786,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "O disco está cheio. Pressione OFF para continuar."
-    iriverh100,iriverh120,iriverh300: "O disco está cheio. Pressione STOP para continuar."
     iaudiom5,iaudiox5: "O disco está cheio. Pressione POWER para continuar."
-    sansae200*,sansac200*,vibe500: "O disco está cheio. Pressione PREV para continuar."
+    iriverh100,iriverh120,iriverh300: "O disco está cheio. Pressione STOP para continuar."
+    recording: "O disco está cheio. Pressione OFF para continuar."
     samsungyh*: "O disco está cheio. Pressione LEFT para continuar."
+    sansac200*,sansae200*,vibe500: "O disco está cheio. Pressione PREV para continuar."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8040,23 +7890,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK para abortar"
     gigabeatfx: "POWER para abortar"
-    sansafuzeplus: "BACK para abortar"
+    gigabeats,sansafuzeplus: "BACK para abortar"
+    iaudiom5,iaudiox5: "PLAY Longo para abortar"
+    ipod*: "PLAY/PAUSE para abortar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para abortar"
   </dest>
   <voice>
     *: ""
@@ -9608,7 +9456,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9650,16 +9498,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de Edição: %s %s"
+    *: "Modo de Edição: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9667,16 +9512,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Corte"
+    *: "Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Corte"
+    *: "Corte"
   </voice>
 </phrase>
 <phrase>
@@ -9684,16 +9526,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho"
+    *: "Ganho"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho"
+    *: "Ganho"
   </voice>
 </phrase>
 <phrase>
@@ -9701,16 +9540,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modo:"
+    *: "Modo:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10373,15 +10209,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </voice>
 </phrase>
 <phrase>
@@ -10390,15 +10226,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </voice>
 </phrase>
 <phrase>
@@ -10434,16 +10270,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -10451,16 +10284,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repetir Keyclick"
+    *: "Repetir Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repetir Keyclick"
+    *: "Repetir Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -10581,11 +10411,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Taxa de Bits Serial"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Taxa de Bits Serial"
   </voice>
@@ -10598,11 +10428,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automático"
   </voice>
@@ -10615,11 +10445,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10632,11 +10462,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10649,11 +10479,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10666,11 +10496,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11193,16 +11023,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11210,16 +11037,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </voice>
 </phrase>
 <phrase>
@@ -11320,7 +11144,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11473,16 +11297,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Largura da barra de rolagem"
+    *: "Largura da barra de rolagem"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Largura da barra de rolagem"
+    *: "Largura da barra de rolagem"
   </voice>
 </phrase>
 <phrase>
@@ -11490,16 +11311,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posição da barra de rolagem"
+    *: "Posição da barra de rolagem"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posição da barra de rolagem"
+    *: "Posição da barra de rolagem"
   </voice>
 </phrase>
 <phrase>
@@ -11507,16 +11325,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11575,16 +11390,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Limiar"
+    *: "Limiar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiar"
+    *: "Limiar"
   </voice>
 </phrase>
 <phrase>
@@ -11592,16 +11404,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Razão"
+    *: "Razão"
   </dest>
   <voice>
-    *: none
-    swcodec: "Razão"
+    *: "Razão"
   </voice>
 </phrase>
 <phrase>
@@ -11609,16 +11418,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 por 1"
+    *: "2 por 1"
   </voice>
 </phrase>
 <phrase>
@@ -11626,16 +11432,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 por 1"
+    *: "4 por 1"
   </voice>
 </phrase>
 <phrase>
@@ -11643,16 +11446,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 por 1"
+    *: "6 por 1"
   </voice>
 </phrase>
 <phrase>
@@ -11660,16 +11460,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 por 1"
+    *: "10 por 1"
   </voice>
 </phrase>
 <phrase>
@@ -11677,16 +11474,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </voice>
 </phrase>
 <phrase>
@@ -11694,16 +11488,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho Conjunto"
+    *: "Ganho Conjunto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho Conjunto"
+    *: "Ganho Conjunto"
   </voice>
 </phrase>
 <phrase>
@@ -11711,16 +11502,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11728,16 +11516,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho"
+    *: "Joelho"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho"
+    *: "Joelho"
   </voice>
 </phrase>
 <phrase>
@@ -11745,16 +11530,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho Forte"
+    *: "Joelho Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho Forte"
+    *: "Joelho Forte"
   </voice>
 </phrase>
 <phrase>
@@ -11762,16 +11544,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho Suave"
+    *: "Joelho Suave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho Suave"
+    *: "Joelho Suave"
   </voice>
 </phrase>
 <phrase>
@@ -11779,16 +11558,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo de Liberação"
+    *: "Tempo de Liberação"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo de Liberação"
+    *: "Tempo de Liberação"
   </voice>
 </phrase>
 <phrase>
@@ -11976,16 +11752,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin Base"
+    *: "Skin Base"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin Base"
+    *: "Skin Base"
   </voice>
 </phrase>
 <phrase>
@@ -11993,16 +11766,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin Base Remota"
+    *: "Skin Base Remota"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin Base Remota"
+    *: "Skin Base Remota"
   </voice>
 </phrase>
 <phrase>
@@ -12129,16 +11899,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rebobinar Antes de Retomar"
+    *: "Rebobinar Antes de Retomar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rebobinar antes de retomar"
+    *: "Rebobinar antes de retomar"
   </voice>
 </phrase>
 <phrase>
@@ -12334,15 +12101,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Efeito 3-D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Efeito 3-D"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Efeito 3 D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Efeito 3 D"
   </voice>
 </phrase>
 <phrase>
@@ -12485,7 +12252,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12805,16 +12572,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simples (Meier)"
+    *: "Simples (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simples"
+    *: "Simples"
   </voice>
 </phrase>
 <phrase>
@@ -12898,16 +12662,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Customizado"
+    *: "Customizado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Customizado"
+    *: "Customizado"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index e511f3bfdd..49bb602542 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -612,16 +612,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -629,16 +626,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizador"
+    *: "Equalizador"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizador"
+    *: "Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -817,16 +811,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Activar EQ"
+    *: "Activar EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Activar Equalizador"
+    *: "Activar Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -834,16 +825,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Gráfico"
+    *: "EQ Gráfico"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizador Gráfico"
+    *: "Equalizador Gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -851,16 +839,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Opções Simples do EQ"
+    *: "Opções Simples do EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opções Simples de Equalizador"
+    *: "Opções Simples de Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -868,16 +853,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Opções Avançadas do EQ"
+    *: "Opções Avançadas do EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opções Avançadas de equalizador"
+    *: "Opções Avançadas de equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -885,16 +867,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Guardar Predefinição do EQ"
+    *: "Guardar Predefinição do EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Guardar Predefinição do equalizador"
+    *: "Guardar Predefinição do equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -902,16 +881,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Explorar Predefinições do EQ"
+    *: "Explorar Predefinições do EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Explorar Predefinições de Equalizador"
+    *: "Explorar Predefinições de Equalizador"
   </voice>
 </phrase>
 <phrase>
@@ -919,16 +895,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de Edição: %s"
+    *: "Modo de Edição: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -936,16 +909,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Ganho de Banda"
+    *: "%d Hz Ganho de Banda"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz Ganho de Banda"
+    *: "Hertz Ganho de Banda"
   </voice>
 </phrase>
 <phrase>
@@ -953,16 +923,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Baixa Protecção"
+    *: "Filtro de Baixa Protecção"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Baixa Protecção"
+    *: "Filtro de Baixa Protecção"
   </voice>
 </phrase>
 <phrase>
@@ -970,16 +937,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Picos %d"
+    *: "Filtro de Picos %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Picos"
+    *: "Filtro de Picos"
   </voice>
 </phrase>
 <phrase>
@@ -987,16 +951,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtro de Elevada Protecção"
+    *: "Filtro de Elevada Protecção"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtro de Elevada Protecção"
+    *: "Filtro de Elevada Protecção"
   </voice>
 </phrase>
 <phrase>
@@ -1004,16 +965,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </voice>
 </phrase>
 <phrase>
@@ -1021,16 +979,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centrar Frequência"
+    *: "Centrar Frequência"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centrar Frequência"
+    *: "Centrar Frequência"
   </voice>
 </phrase>
 <phrase>
@@ -1038,16 +993,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1299,16 +1251,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Volume do Beep"
+    *: "Volume do Beep"
   </dest>
   <voice>
-    *: none
-    swcodec: "Volume do Beep"
+    *: "Volume do Beep"
   </voice>
 </phrase>
 <phrase>
@@ -1316,16 +1265,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Fraco"
+    *: "Fraco"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fraco"
+    *: "Fraco"
   </voice>
 </phrase>
 <phrase>
@@ -1333,16 +1279,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderado"
+    *: "Moderado"
   </voice>
 </phrase>
 <phrase>
@@ -1350,16 +1293,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Forte"
+    *: "Forte"
   </voice>
 </phrase>
 <phrase>
@@ -1580,16 +1520,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Explorar Fontes"
+    *: "Explorar Fontes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Explorar Fontes"
+    *: "Explorar Fontes"
   </voice>
 </phrase>
 <phrase>
@@ -1673,16 +1610,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Estado e Barra de Navegação"
+    *: "Estado e Barra de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Estado e Barra de Navegação"
+    *: "Estado e Barra de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -1749,16 +1683,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebraico (ISO-8859-8)"
+    *: "Hebraico (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebraico"
+    *: "Hebraico"
   </voice>
 </phrase>
 <phrase>
@@ -1780,16 +1711,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tailandês (ISO-8859-11)"
+    *: "Tailandês (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tailandês"
+    *: "Tailandês"
   </voice>
 </phrase>
 <phrase>
@@ -1797,16 +1725,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arábe (CP1256)"
+    *: "Arábe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arábe"
+    *: "Arábe"
   </voice>
 </phrase>
 <phrase>
@@ -1842,16 +1767,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonês (SJIS)"
+    *: "Japonês (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonês"
+    *: "Japonês"
   </voice>
 </phrase>
 <phrase>
@@ -1859,16 +1781,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinês Simp. (GB2312)"
+    *: "Chinês Simp. (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinês Simplificado"
+    *: "Chinês Simplificado"
   </voice>
 </phrase>
 <phrase>
@@ -1876,16 +1795,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreano (KSX1001)"
+    *: "Coreano (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Coreano"
+    *: "Coreano"
   </voice>
 </phrase>
 <phrase>
@@ -1893,16 +1809,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinês Trad. (BIG5)"
+    *: "Chinês Trad. (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinês Tradicional"
+    *: "Chinês Tradicional"
   </voice>
 </phrase>
 <phrase>
@@ -2206,15 +2119,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frequência"
+    play_frequency,recording: "Frequência"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequência"
+    play_frequency,recording: "Frequência"
   </voice>
 </phrase>
 <phrase>
@@ -2240,18 +2153,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microfone"
     iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    recording: "Microfone"
   </dest>
   <voice>
     *: none
-    recording: "Microfone"
     iriverh100,iriverh120,iriverh300: "Microfone Interno"
+    recording: "Microfone"
   </voice>
 </phrase>
 <phrase>
@@ -2576,16 +2489,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevenir Corte"
+    *: "Prevenir Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevenir Corte"
+    *: "Prevenir Corte"
   </voice>
 </phrase>
 <phrase>
@@ -2807,16 +2717,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rodar 180 Graus"
+    *: "Rodar 180 Graus"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rodar 180 Graus"
+    *: "Rodar 180 Graus"
   </voice>
 </phrase>
 <phrase>
@@ -2824,16 +2731,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Apontador"
+    *: "Apontador"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Apontador"
+    *: "Apontador"
   </voice>
 </phrase>
 <phrase>
@@ -2841,16 +2745,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra(Invertida)"
+    *: "Barra(Invertida)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra(Invertida)"
+    *: "Barra(Invertida)"
   </voice>
 </phrase>
 <phrase>
@@ -3027,16 +2928,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barras de Navegação Fora do Ecrã"
+    *: "Barras de Navegação Fora do Ecrã"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barras de Navegação Fora do Ecrã"
+    *: "Barras de Navegação Fora do Ecrã"
   </voice>
 </phrase>
 <phrase>
@@ -3044,16 +2942,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Avanço das Barras de Navegação"
+    *: "Avanço das Barras de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Avanço das Barras de Navegação"
+    *: "Avanço das Barras de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -3075,16 +2970,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de Navegação"
+    *: "Barra de Navegação"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de Navegação"
+    *: "Barra de Navegação"
   </voice>
 </phrase>
 <phrase>
@@ -3092,16 +2984,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Barra de Estado"
+    *: "Barra de Estado"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Barra de Estado"
+    *: "Barra de Estado"
   </voice>
 </phrase>
 <phrase>
@@ -3126,16 +3015,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar Volume"
+    *: "Mostrar Volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar Volume"
+    *: "Mostrar Volume"
   </voice>
 </phrase>
 <phrase>
@@ -3143,16 +3029,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mostrar Bateria"
+    *: "Mostrar Bateria"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mostrar Bateria"
+    *: "Mostrar Bateria"
   </voice>
 </phrase>
 <phrase>
@@ -3160,16 +3043,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Gráfico"
+    *: "Gráfico"
   </voice>
 </phrase>
 <phrase>
@@ -3177,16 +3057,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numérico"
+    *: "Numérico"
   </voice>
 </phrase>
 <phrase>
@@ -3918,13 +3795,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Bateria: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Nível de bateria"
@@ -3981,24 +3858,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -4111,35 +3988,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Reverter"
-    mrobe500: "POWER = Reverter"
-    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
-    ipod*,sansac200*,mpiohd300: "MENU = Reverter"
-    iaudiox5,iaudiom5: "RECORD = Reverter"
+    gigabeatfx,mrobe500: "POWER = Reverter"
+    gigabeats,sansafuzeplus: "BACK = Reverter"
+    gogearsa9200: "LEFT = Reverter"
+    iaudiom5,iaudiox5: "RECORD = Reverter"
+    ipod*,mpiohd300,sansac200*: "MENU = Reverter"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter"
-    gigabeatfx: "POWER = Reverter"
-    sansafuzeplus: "BACK = Reverter"
+    iriverh100,iriverh120,iriverh300: "STOP = Reverter"
     mrobe100: "DISPLAY = Reverter"
-    gigabeats: "BACK = Reverter"
-    gogearsa9200: "LEFT = Reverter"
-    vibe500: "C = Reverter"
+    rtc: "OFF = Reverter"
     samsungyh*: "REW = Reverter"
+    vibe500: "C = Reverter"
   </dest>
   <voice>
     *: none
@@ -4202,19 +4075,19 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "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*,vibe500: "O Disco Está Cheio. Carregue PREV Para Continuar"
+    iriverh100,iriverh120,iriverh300: "O Disco Está Cheio. Carregue STOP Para Continuar"
+    recording: "O Disco Está Cheio. Carregue OFF Para Continuar"
     samsungyh*: "O Disco Está Cheio. Carregue LEFT Para Continuar"
+    sansac200*,sansae200*,vibe500: "O Disco Está Cheio. Carregue PREV Para Continuar"
   </dest>
   <voice>
     *: none
@@ -4397,22 +4270,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Alterar OFF=Cancelar"
+    gigabeats: "SELECT=Definir POWER=Cancelar"
     ipod*: "SELECT=Alterar MENU=Cancelar"
     iriverh10,iriverh10_5gb: "SELECT=Definir PREV=Cancelar"
-    gigabeats: "SELECT=Definir POWER=Cancelar"
-    vibe500: "OK=Alterar C=Cancelar"
     mpiohd300: "ENTER=Alterar MENU=Cancelar"
     sansafuzeplus: "SELECT=Alterar  BACK=Cancelar"
+    vibe500: "OK=Alterar C=Cancelar"
   </dest>
   <voice>
     *: none
@@ -6762,23 +6635,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK para abortar"
     gigabeatfx: "POWER para abortar"
-    sansafuzeplus: "BACK para abortar"
+    gigabeats,sansafuzeplus: "BACK para abortar"
+    iaudiom5,iaudiox5: "PLAY longo para abortar"
+    ipod*: "PLAY/PAUSE para Abortar"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV para abortar"
+    iriverh100,iriverh120,iriverh300: "STOP para Abortar"
   </dest>
   <voice>
     *: ""
@@ -7039,16 +6910,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Modo de Edição: %s %s"
+    *: "Modo de Edição: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7056,16 +6924,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frequência de Corte"
+    *: "Frequência de Corte"
   </voice>
 </phrase>
 <phrase>
@@ -7544,23 +7409,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Sim"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, ou canto superior direito = Sim"
+    creativezen*: "Selecionar = Sim"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECIONAR = Sim"
     iriverh100,iriverh120,iriverh300: "NAVI = Sim"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECIONAR = Sim"
     mrobe500: "PLAY, POWER, ou canto superior direito = Sim"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Sim"
-    creativezen*: "Selecionar = Sim"
   </dest>
   <voice>
     *: ""
@@ -7572,23 +7437,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Definir"
-    mrobe500: "HEART = Definir"
-    iriverh100,iriverh120,iriverh300: "NAVI = Definir"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Definir"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Definir"
     gogearsa9200,samsungyh*: "PLAY = Definir"
-    vibe500: "OK = Definir"
+    iriverh100,iriverh120,iriverh300: "NAVI = Definir"
     mpiohd300: "ENTER = Definir"
+    mrobe500: "HEART = Definir"
+    rtc: "ON = Definir"
+    vibe500: "OK = Definir"
   </dest>
   <voice>
     *: none
@@ -7891,16 +7756,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho"
+    *: "Ganho"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho"
+    *: "Ganho"
   </voice>
 </phrase>
 <phrase>
@@ -8032,16 +7894,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modo:"
+    *: "Modo:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9523,16 +9382,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tipo de Linha de Selecção"
+    *: "Tipo de Linha de Selecção"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tipo de Linha de Selecção"
+    *: "Tipo de Linha de Selecção"
   </voice>
 </phrase>
 <phrase>
@@ -9623,21 +9479,20 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Construindo Base de Dados... %d encontrados (OFF para voltar)"
-    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para voltar)"
-    ipod*: "Construindo Base de Dados... %d encontrado (PREV para voltar)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Construindo Base de Dados... %d encontrados (LEFT para voltar)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construindo Base de Dados... %d encontrados (PREV para voltar)"
-    gogearsa9200: "Construindo Base de Dados... %d encontrados (REW para voltar)"
     archosplayer: "Const. DB %d encontr."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Construindo Base de Dados... %d encontrados (LEFT para voltar)"
+    gogearsa9200: "Construindo Base de Dados... %d encontrados (REW para voltar)"
+    ipod*: "Construindo Base de Dados... %d encontrado (PREV para voltar)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Construindo Base de Dados... %d encontrados (PREV para voltar)"
+    iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para voltar)"
   </dest>
   <voice>
     *: "entradas encontradas para base de dados"
@@ -10276,16 +10131,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho Directo"
+    *: "Ganho Directo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho Directo"
+    *: "Ganho Directo"
   </voice>
 </phrase>
 <phrase>
@@ -10356,15 +10208,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Graves"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Graves"
   </voice>
 </phrase>
 <phrase>
@@ -10437,16 +10289,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pré-corte"
+    *: "Pré-corte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pré-corte"
+    *: "Pré-corte"
   </voice>
 </phrase>
 <phrase>
@@ -10530,16 +10379,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Corte das Altas Frequências"
+    *: "Corte das Altas Frequências"
   </dest>
   <voice>
-    *: none
-    swcodec: "Corte das Altas Frequências"
+    *: "Corte das Altas Frequências"
   </voice>
 </phrase>
 <phrase>
@@ -10674,16 +10520,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuação das Altas Frequências"
+    *: "Atenuação das Altas Frequências"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuação das Altas Frequências"
+    *: "Atenuação das Altas Frequências"
   </voice>
 </phrase>
 <phrase>
@@ -10740,15 +10583,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte de Agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte de Agudos"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Corte dos Agudos"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Corte dos Agudos"
   </voice>
 </phrase>
 <phrase>
@@ -10801,16 +10644,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo de Libertação"
+    *: "Tempo de Libertação"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo de Libertação"
+    *: "Tempo de Libertação"
   </voice>
 </phrase>
 <phrase>
@@ -10835,16 +10675,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Limiar"
+    *: "Limiar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiar"
+    *: "Limiar"
   </voice>
 </phrase>
 <phrase>
@@ -10852,16 +10689,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -10869,16 +10703,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Visual Base"
+    *: "Visual Base"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Visual Base"
+    *: "Visual Base"
   </voice>
 </phrase>
 <phrase>
@@ -10900,16 +10731,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Posição da Barra de Deslocamento"
+    *: "Posição da Barra de Deslocamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Posição da Barra de Deslocamento"
+    *: "Posição da Barra de Deslocamento"
   </voice>
 </phrase>
 <phrase>
@@ -10968,16 +10796,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho"
+    *: "Joelho"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho"
+    *: "Joelho"
   </voice>
 </phrase>
 <phrase>
@@ -10985,16 +10810,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto "
+    *: "Auto "
   </dest>
   <voice>
-    *: none
-    swcodec: "Automático"
+    *: "Automático"
   </voice>
 </phrase>
 <phrase>
@@ -11047,16 +10869,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho Suave"
+    *: "Joelho Suave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho Suave"
+    *: "Joelho Suave"
   </voice>
 </phrase>
 <phrase>
@@ -11078,16 +10897,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Rácio"
+    *: "Rácio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rácio"
+    *: "Rácio"
   </voice>
 </phrase>
 <phrase>
@@ -11143,16 +10959,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Joelho Forte"
+    *: "Joelho Forte"
   </dest>
   <voice>
-    *: none
-    swcodec: "Joelho Forte"
+    *: "Joelho Forte"
   </voice>
 </phrase>
 <phrase>
@@ -11194,16 +11007,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Visual da Base Remota"
+    *: "Visual da Base Remota"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Visual da Base Remota"
+    *: "Visual da Base Remota"
   </voice>
 </phrase>
 <phrase>
@@ -11457,16 +11267,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -11491,16 +11298,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 para 1"
+    *: "10 para 1"
   </voice>
 </phrase>
 <phrase>
@@ -11542,16 +11346,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 para 1"
+    *: "2 para 1"
   </voice>
 </phrase>
 <phrase>
@@ -11576,16 +11377,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </voice>
 </phrase>
 <phrase>
@@ -11624,16 +11422,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Largura da Barra de Deslocamento"
+    *: "Largura da Barra de Deslocamento"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Largura da Barra de Deslocamento"
+    *: "Largura da Barra de Deslocamento"
   </voice>
 </phrase>
 <phrase>
@@ -11655,16 +11450,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Ganho Conjunto"
+    *: "Ganho Conjunto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ganho Conjunto"
+    *: "Ganho Conjunto"
   </voice>
 </phrase>
 <phrase>
@@ -11672,16 +11464,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -11734,16 +11523,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11751,16 +11537,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 para 1"
+    *: "6 para 1"
   </voice>
 </phrase>
 <phrase>
@@ -11770,17 +11553,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    sansae200*,sansafuze*: "Duração da Luz da Roda"
   </dest>
   <voice>
     *: none
     button_light: "Duração da Luz do Botão"
-    sansafuze*,sansae200*: "Duração da Luz da Roda"
+    sansae200*,sansafuze*: "Duração da Luz da Roda"
   </voice>
 </phrase>
 <phrase>
@@ -11805,16 +11588,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11898,16 +11678,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -11915,16 +11692,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </dest>
   <voice>
-    *: none
-    swcodec: "Velocidade"
+    *: "Velocidade"
   </voice>
 </phrase>
 <phrase>
@@ -11946,16 +11720,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 para 1"
+    *: "4 para 1"
   </voice>
 </phrase>
 <phrase>
@@ -12243,16 +12014,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Recuar antes de Resumir"
+    *: "Recuar antes de Resumir"
   </dest>
   <voice>
-    *: none
-    swcodec: "Recuar antes de Resumir"
+    *: "Recuar antes de Resumir"
   </voice>
 </phrase>
 <phrase>
@@ -12514,7 +12282,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12882,16 +12650,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simples (Meier)"
+    *: "Simples (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simples"
+    *: "Simples"
   </voice>
 </phrase>
 <phrase>
@@ -12941,16 +12706,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Customizado"
+    *: "Customizado"
   </dest>
   <voice>
-    *: none
-    swcodec: "Customizado"
+    *: "Customizado"
   </voice>
 </phrase>
 <phrase>
@@ -13040,16 +12802,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tempo de Ataque"
+    *: "Tempo de Ataque"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tempo de Ataque"
+    *: "Tempo de Ataque"
   </voice>
 </phrase>
 <phrase>
@@ -13071,16 +12830,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13133,16 +12889,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Redução de Fadiga Auditória"
+    *: "Redução de Fadiga Auditória"
   </dest>
   <voice>
-    *: none
-    swcodec: "Redução de Fadiga Auditória"
+    *: "Redução de Fadiga Auditória"
   </voice>
 </phrase>
 <phrase>
@@ -13151,18 +12904,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Armazenamento em Massa"
-    ibassodx90: "Armazenamento em Massa"
+    ibassodx50,ibassodx90: "Armazenamento em Massa"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Armazenamento em Massa"
-    ibassodx90: "Armazenamento em Massa"
+    ibassodx50,ibassodx90: "Armazenamento em Massa"
   </voice>
 </phrase>
 <phrase>
@@ -13171,18 +12921,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Governador de Escala de Frequência"
-    ibassodx90: "Governador de Escala de Frequência"
+    ibassodx50,ibassodx90: "Governador de Escala de Frequência"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Governador de Escala de Frequência"
-    ibassodx90: "Governador de Escala de Frequência"
+    ibassodx50,ibassodx90: "Governador de Escala de Frequência"
   </voice>
 </phrase>
 <phrase>
@@ -13190,16 +12937,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Melhoramento Perceptual de Bass"
+    *: "Melhoramento Perceptual de Bass"
   </dest>
   <voice>
-    *: none
-    swcodec: "Melhoramento Perceptual de Bass"
+    *: "Melhoramento Perceptual de Bass"
   </voice>
 </phrase>
 <phrase>
@@ -13207,16 +12951,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13224,16 +12965,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Surround Haas "
+    *: "Surround Haas "
   </dest>
   <voice>
-    *: none
-    swcodec: "Surround Haas"
+    *: "Surround Haas"
   </voice>
 </phrase>
 <phrase>
@@ -13242,18 +12980,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "Modo USB"
-    ibassodx90: "Modo USB"
+    ibassodx50,ibassodx90: "Modo USB"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Modo USB"
-    ibassodx90: "Modo USB"
+    ibassodx50,ibassodx90: "Modo USB"
   </voice>
 </phrase>
 <phrase>
@@ -13262,18 +12997,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Carregar só"
-    ibassodx90: "Carregar só"
+    ibassodx50,ibassodx90: "Carregar só"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Carregar só"
-    ibassodx90: "Carregar só"
+    ibassodx50,ibassodx90: "Carregar só"
   </voice>
 </phrase>
 <phrase>
@@ -13281,16 +13013,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Mistura Seca / Molhada"
+    *: "Mistura Seca / Molhada"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mistura Seca / Molhada"
+    *: "Mistura Seca / Molhada"
   </voice>
 </phrase>
 <phrase>
@@ -13298,16 +13027,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13315,16 +13041,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "LADO SÓ"
+    *: "LADO SÓ"
   </dest>
   <voice>
-    *: none
-    swcodec: "LADO SÓ"
+    *: "LADO SÓ"
   </voice>
 </phrase>
 <phrase>
@@ -13333,17 +13056,14 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Ponte de Debug Android"
-    ibassodx90: "Ponte de Debug Android"
+    ibassodx50,ibassodx90: "Ponte de Debug Android"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Ponte de Debug Android"
-    ibassodx90: "Ponte de Debug Android"
+    ibassodx50,ibassodx90: "Ponte de Debug Android"
   </voice>
 </phrase>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index bf6294d5d6..4a4bbb9346 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -727,15 +727,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frecvența"
+    play_frequency,recording: "Frecvența"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frecvența"
+    play_frequency,recording: "Frecvența"
   </voice>
 </phrase>
 <phrase>
@@ -761,18 +761,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microfon"
     iriverh100,iriverh120,iriverh300: "Microfon intern"
+    recording: "Microfon"
   </dest>
   <voice>
     *: none
-    recording: "Microfon"
     iriverh100,iriverh120,iriverh300: "Microfon intern"
+    recording: "Microfon"
   </voice>
 </phrase>
 <phrase>
@@ -971,16 +971,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afișare volum"
+    *: "Afișare volum"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afișare volum"
+    *: "Afișare volum"
   </voice>
 </phrase>
 <phrase>
@@ -988,16 +985,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Afișare baterie"
+    *: "Afișare baterie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Afișare baterie"
+    *: "Afișare baterie"
   </voice>
 </phrase>
 <phrase>
@@ -1005,16 +999,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafic"
+    *: "Grafic"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafic"
+    *: "Grafic"
   </voice>
 </phrase>
 <phrase>
@@ -1022,16 +1013,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -1429,13 +1417,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Baterie: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Bat: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm"
   </dest>
   <voice>
     *: ""
@@ -1495,35 +1483,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF pentru anulare"
-    mrobe500: "POWER pentru anulare"
-    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
-    ipod*,sansac200*,mpiohd300: "MENU pentru anulare"
-    iaudiox5,iaudiom5: "RECORD pentru anulare"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV pentru anulare"
-    gigabeatfx: "POWER pentru anulare"
-    sansafuzeplus: "BACK pentru anulare"
-    mrobe100: "DISPLAY pentru anulare"
+    gigabeatfx,mrobe500: "POWER pentru anulare"
     gigabeats: "BACK  pentru anulare"
     gogearsa9200: "LEFT pentru anulare"
-    vibe500: "C pentru anulare"
+    iaudiom5,iaudiox5: "RECORD pentru anulare"
+    ipod*,mpiohd300,sansac200*: "MENU pentru anulare"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV pentru anulare"
+    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
+    mrobe100: "DISPLAY pentru anulare"
+    rtc: "OFF pentru anulare"
     samsungyh*: "REW pentru anulare"
+    sansafuzeplus: "BACK pentru anulare"
+    vibe500: "C pentru anulare"
   </dest>
   <voice>
     *: none
@@ -1621,22 +1606,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Setat OFF=Anulare"
+    gigabeats: "SELECT=Setat POWER=Anulare"
     ipod*: "SELECT=Setat MENU=Anulare"
     iriverh10,iriverh10_5gb: "SELECT=Setat PREV=Anulare"
-    gigabeats: "SELECT=Setat POWER=Anulare"
-    vibe500: "OK=Setat C=Anulare"
     mpiohd300: "ENTER=Setat MENU=Anulare"
     sansafuzeplus: "SELECT=Setat  BACK=Anulare"
+    vibe500: "OK=Setat C=Anulare"
   </dest>
   <voice>
     *: none
@@ -2401,16 +2386,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mod editare: %s %s"
+    *: "Mod editare: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2435,16 +2417,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tip linie selectoare"
+    *: "Tip linie selectoare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tip linie selectoare"
+    *: "Tip linie selectoare"
   </voice>
 </phrase>
 <phrase>
@@ -2508,16 +2487,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Setări avansate egalizator"
+    *: "Setări avansate egalizator"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -2616,15 +2592,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Retezare basuri"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Retezare basuri"
   </voice>
 </phrase>
 <phrase>
@@ -2768,21 +2744,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Creare bază de date... %d găsite (STINGERE pentru revenire)"
-    iriverh100,iriverh120,iriverh300: "Creare bază de date... %d găsite (STOP pentru revenire)"
-    ipod*: "Creare bază de date... %d găsite (PREV pentru revenire)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Creare bază de date... %d găsite (LEFT pentru revenire)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Creare bază de date... %d găsite (PREV pentru revenire)"
-    gogearsa9200: "Creare bază de date... %d găsite (REW pentru revenire)"
     archosplayer: "Creare bază de date... %d găsite"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Creare bază de date... %d găsite (LEFT pentru revenire)"
+    gogearsa9200: "Creare bază de date... %d găsite (REW pentru revenire)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Creare bază de date... %d găsite (PREV pentru revenire)"
+    iriverh100,iriverh120,iriverh300: "Creare bază de date... %d găsite (STOP pentru revenire)"
   </dest>
   <voice>
     *: "intrări găsite pentru baza de date"
@@ -2849,16 +2823,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Egalizator grafic"
+    *: "Egalizator grafic"
   </dest>
   <voice>
-    *: none
-    swcodec: "Egalizator grafic"
+    *: "Egalizator grafic"
   </voice>
 </phrase>
 <phrase>
@@ -3060,16 +3031,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderat"
+    *: "Moderat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderat"
+    *: "Moderat"
   </voice>
 </phrase>
 <phrase>
@@ -3136,16 +3104,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Retezare frecvență"
+    *: "Retezare frecvență"
   </dest>
   <voice>
-    *: none
-    swcodec: "Retezare frecvență"
+    *: "Retezare frecvență"
   </voice>
 </phrase>
 <phrase>
@@ -3474,16 +3439,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -3618,16 +3580,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3736,16 +3695,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Intens"
+    *: "Intens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Intens"
+    *: "Intens"
   </voice>
 </phrase>
 <phrase>
@@ -3818,16 +3774,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Pre-tăiere"
+    *: "Pre-tăiere"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -3866,16 +3819,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japoneză (SJIS)"
+    *: "Japoneză (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -4001,16 +3951,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bara derulantă"
+    *: "Bara derulantă"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bara derulantă"
+    *: "Bara derulantă"
   </voice>
 </phrase>
 <phrase>
@@ -4018,16 +3965,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ebraică (ISO-8859-8)"
+    *: "Ebraică (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ebraică"
+    *: "Ebraică"
   </voice>
 </phrase>
 <phrase>
@@ -4125,16 +4069,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevenire ciuntiri"
+    *: "Prevenire ciuntiri"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevenire ciuntiri"
+    *: "Prevenire ciuntiri"
   </voice>
 </phrase>
 <phrase>
@@ -4187,16 +4128,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Coreeană (KSX1001)"
+    *: "Coreeană (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "lipsește"
+    *: "lipsește"
   </voice>
 </phrase>
 <phrase>
@@ -4323,26 +4261,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Discul este plin. Apăsați OFF pentru a continua."
-    iriverh100,iriverh120,iriverh300: "Discul este plin. Apăsați STOP pentru a continua."
     iaudiom5,iaudiox5: "Discul este plin. Apăsați POWER pentru a continua."
-    sansae200*,sansac200*,vibe500: "Discul este plin. Apăsați PREV pentru a continua."
+    iriverh100,iriverh120,iriverh300: "Discul este plin. Apăsați STOP pentru a continua."
+    recording: "Discul este plin. Apăsați OFF pentru a continua."
     samsungyh*: "Discul este plin. Apăsați LEFT pentru a continua."
+    sansac200*,sansae200*,vibe500: "Discul este plin. Apăsați PREV pentru a continua."
   </dest>
   <voice>
     *: none
-    recording: ""
-    iriverh100,iriverh120,iriverh300: ""
-    iaudiom5,iaudiox5: ""
-    sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4398,16 +4333,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chineză simplificată (GB2312)"
+    *: "Chineză simplificată (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chineză simplificată"
+    *: "Chineză simplificată"
   </voice>
 </phrase>
 <phrase>
@@ -4630,20 +4562,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Da"
+    archosplayer: "(RULARE/STOP)"
     cowond2*: "MENIU sau dreapta-sus = Da"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECTARE = Da"
     iriverh100,iriverh120,iriverh300: "NAVIGARE = Da"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECTARE = Da"
     mrobe500: "RULARE, PORNIRE sau dreapta-sus = Da"
-    archosplayer: "(RULARE/STOP)"
     vibe500: "OK = Da"
   </dest>
   <voice>
@@ -4670,27 +4602,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Setat"
-    mrobe500: "INIMĂ = Setat"
-    iriverh100,iriverh120,iriverh300: "NAVI = Setat"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECTARE = Setat"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECTARE = Setat"
     gogearsa9200,samsungyh*: "RULARE = Setat"
-    vibe500: "OK = Setat"
+    iriverh100,iriverh120,iriverh300: "NAVI = Setat"
     mpiohd300: "ENTER = Setat"
+    mrobe500: "INIMĂ = Setat"
+    rtc: "ON = Setat"
+    vibe500: "OK = Setat"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4757,16 +4689,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Bip la salt pistă"
+    *: "Bip la salt pistă"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bip la salt pistă"
+    *: "Bip la salt pistă"
   </voice>
 </phrase>
 <phrase>
@@ -4850,16 +4779,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Salvează preset egalizator"
+    *: "Salvează preset egalizator"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -5040,23 +4966,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK pentru anulare"
     gigabeatfx: "POWER pentru anulare"
-    sansafuzeplus: "BACK pentru anulare"
+    gigabeats,sansafuzeplus: "BACK pentru anulare"
+    iaudiom5,iaudiox5: "RULARE (apăsare lungă) pentru anulare"
+    ipod*: "RULARE/PAUZĂ pentru anulare"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV pentru anulare"
+    iriverh100,iriverh120,iriverh300: "STOP pentru anulare"
   </dest>
   <voice>
     *: ""
@@ -5140,16 +5064,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Uniformizare canale"
+    *: "Uniformizare canale"
   </dest>
   <voice>
-    *: none
-    swcodec: "Uniformizare canale"
+    *: "Uniformizare canale"
   </voice>
 </phrase>
 <phrase>
@@ -5319,16 +5240,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Amplificare"
+    *: "Amplificare"
   </dest>
   <voice>
-    *: none
-    swcodec: "Amplificare"
+    *: "Amplificare"
   </voice>
 </phrase>
 <phrase>
@@ -5584,16 +5502,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chineză tradițională (BIG5)"
+    *: "Chineză tradițională (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chineză tradițională"
+    *: "Chineză tradițională"
   </voice>
 </phrase>
 <phrase>
@@ -5823,16 +5738,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mod:"
+    *: "Mod:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6319,16 +6231,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mărime pas defilare"
+    *: "Mărime pas defilare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mărime pas defilare"
+    *: "Mărime pas defilare"
   </voice>
 </phrase>
 <phrase>
@@ -6583,16 +6492,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Tăiere frecvență înaltă"
+    *: "Tăiere frecvență înaltă"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -6690,16 +6596,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ecranul defilează înafara zonei vizuale"
+    *: "Ecranul defilează înafara zonei vizuale"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ecranul defilează înafara zonei vizuale"
+    *: "Ecranul defilează înafara zonei vizuale"
   </voice>
 </phrase>
 <phrase>
@@ -7122,16 +7025,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cursor"
+    *: "Cursor"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cursor"
+    *: "Cursor"
   </voice>
 </phrase>
 <phrase>
@@ -7204,16 +7104,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bara de stare"
+    *: "Bara de stare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bara de stare"
+    *: "Bara de stare"
   </voice>
 </phrase>
 <phrase>
@@ -7294,16 +7191,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecvență tăiere"
+    *: "Frecvență tăiere"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frecvență tăiere"
+    *: "Frecvență tăiere"
   </voice>
 </phrase>
 <phrase>
@@ -7843,16 +7737,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz bandă amplificare"
+    *: "%d Hz bandă amplificare"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz bandă amplificare"
+    *: "hertz bandă amplificare"
   </voice>
 </phrase>
 <phrase>
@@ -7908,16 +7799,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frecvența centrală"
+    *: "Frecvența centrală"
   </dest>
   <voice>
-    *: none
-    swcodec: "Center frequency"
+    *: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -8055,24 +7943,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -8527,16 +8415,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Amplificare între piste"
+    *: "Amplificare între piste"
   </dest>
   <voice>
-    *: none
-    swcodec: "Amplificare între piste"
+    *: "Amplificare între piste"
   </voice>
 </phrase>
 <phrase>
@@ -8637,16 +8522,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Cuantizare"
+    *: "Cuantizare"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cuantizare"
+    *: "Cuantizare"
   </voice>
 </phrase>
 <phrase>
@@ -8654,16 +8536,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabă (CP1256)"
+    *: "Arabă (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabă"
+    *: "Arabă"
   </voice>
 </phrase>
 <phrase>
@@ -8795,16 +8674,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Setări egalizator simple"
+    *: "Setări egalizator simple"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -8826,16 +8702,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtru frecvențe joase"
+    *: "Filtru frecvențe joase"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtru frecvențe joase"
+    *: "Filtru frecvențe joase"
   </voice>
 </phrase>
 <phrase>
@@ -8888,16 +8761,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Slab"
+    *: "Slab"
   </dest>
   <voice>
-    *: none
-    swcodec: "Slab"
+    *: "Slab"
   </voice>
 </phrase>
 <phrase>
@@ -8964,16 +8834,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mod editare: %s"
+    *: "Mod editare: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8981,16 +8848,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Atenuare frecvență înaltă"
+    *: "Atenuare frecvență înaltă"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atenuare frecvență înaltă"
+    *: "Atenuare frecvență înaltă"
   </voice>
 </phrase>
 <phrase>
@@ -9060,16 +8924,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Activare egalizator"
+    *: "Activare egalizator"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -9262,17 +9123,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Timp iluminare butoane"
-    sansafuze*,sansae200*: "Timp iluminare rotiță"
+    sansae200*,sansafuze*: "Timp iluminare rotiță"
   </dest>
   <voice>
     *: none
     button_light: "Timp iluminare butoane"
-    sansafuze*,sansae200*: "Timp iluminare rotiță"
+    sansae200*,sansafuze*: "Timp iluminare rotiță"
   </voice>
 </phrase>
 <phrase>
@@ -9280,16 +9141,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Răsturnat"
+    *: "Răsturnat"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Răsturnat"
+    *: "Răsturnat"
   </voice>
 </phrase>
 <phrase>
@@ -9325,16 +9183,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtru frecvențe ridicate"
+    *: "Filtru frecvențe ridicate"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtru frecvențe ridicate"
+    *: "Filtru frecvențe ridicate"
   </voice>
 </phrase>
 <phrase>
@@ -9464,15 +9319,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Tăiere inalte"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Tăiere inalte"
   </voice>
 </phrase>
 <phrase>
@@ -9542,16 +9397,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Răsfoire presetări egalizator"
+    *: "Răsfoire presetări egalizator"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -9730,16 +9582,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bara (Invers)"
+    *: "Bara (Invers)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -9820,16 +9669,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Egalizator"
+    *: "Egalizator"
   </dest>
   <voice>
-    *: none
-    swcodec: "Egalizator"
+    *: "Egalizator"
   </voice>
 </phrase>
 <phrase>
@@ -9910,16 +9756,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bara de stare/defilare"
+    *: "Bara de stare/defilare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bara de stare și defilare"
+    *: "Bara de stare și defilare"
   </voice>
 </phrase>
 <phrase>
@@ -10034,16 +9877,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Amplificare directă"
+    *: "Amplificare directă"
   </dest>
   <voice>
-    *: none
-    swcodec: "Amplificare directă"
+    *: "Amplificare directă"
   </voice>
 </phrase>
 <phrase>
@@ -10096,16 +9936,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filtru vârfuri %d"
+    *: "Filtru vârfuri %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filtru vârfuri"
+    *: "Filtru vârfuri"
   </voice>
 </phrase>
 <phrase>
@@ -10242,16 +10079,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Răsfoire fonturi"
+    *: "Răsfoire fonturi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Răsfoire fonturi"
+    *: "Răsfoire fonturi"
   </voice>
 </phrase>
 <phrase>
@@ -10583,16 +10417,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Clic buton"
+    *: "Clic buton"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clic buton"
+    *: "Clic buton"
   </voice>
 </phrase>
 <phrase>
@@ -10786,16 +10617,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repetare clic buton"
+    *: "Repetare clic buton"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repetare clic buton"
+    *: "Repetare clic buton"
   </voice>
 </phrase>
 <phrase>
@@ -11309,16 +11137,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lățime bară derulare"
+    *: "Lățime bară derulare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lățime bară derulare"
+    *: "Lățime bară derulare"
   </voice>
 </phrase>
 <phrase>
@@ -11391,16 +11216,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compresor"
+    *: "Compresor"
   </voice>
 </phrase>
 <phrase>
@@ -11470,16 +11292,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Viteză"
+    *: "Viteză"
   </dest>
   <voice>
-    *: none
-    swcodec: "Viteză"
+    *: "Viteză"
   </voice>
 </phrase>
 <phrase>
@@ -11597,16 +11416,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tema principală"
+    *: "Tema principală"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tema principală"
+    *: "Tema principală"
   </voice>
 </phrase>
 <phrase>
@@ -11614,16 +11430,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Poziția barei de derulare"
+    *: "Poziția barei de derulare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Poziția barei de derulare"
+    *: "Poziția barei de derulare"
   </voice>
 </phrase>
 <phrase>
@@ -11676,16 +11489,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Rată"
+    *: "Rată"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rată"
+    *: "Rată"
   </voice>
 </phrase>
 <phrase>
@@ -11738,7 +11548,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11783,16 +11593,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Timpul lansării"
+    *: "Timpul lansării"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timpul lansării"
+    *: "Timpul lansării"
   </voice>
 </phrase>
 <phrase>
@@ -11817,16 +11624,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Prag"
+    *: "Prag"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prag"
+    *: "Prag"
   </voice>
 </phrase>
 <phrase>
@@ -11834,16 +11638,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Sporire compresie"
+    *: "Sporire compresie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sporire compresie"
+    *: "Sporire compresie"
   </voice>
 </phrase>
 <phrase>
@@ -11933,16 +11734,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Limita"
+    *: "Limita"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limita"
+    *: "Limita"
   </voice>
 </phrase>
 <phrase>
@@ -11950,16 +11748,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11995,16 +11790,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Limita fină"
+    *: "Limita fină"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limita fină"
+    *: "Limita fină"
   </voice>
 </phrase>
 <phrase>
@@ -12046,16 +11838,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Limita dură"
+    *: "Limita dură"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limita dură"
+    *: "Limita dură"
   </voice>
 </phrase>
 <phrase>
@@ -12063,16 +11852,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skin de bază la distanță"
+    *: "Skin de bază la distanță"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skin de bază la distanță"
+    *: "Skin de bază la distanță"
   </voice>
 </phrase>
 <phrase>
@@ -12165,16 +11951,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rebobinare înainte de reluare"
+    *: "Rebobinare înainte de reluare"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rebobinare înainte de reluare"
+    *: "Rebobinare înainte de reluare"
   </voice>
 </phrase>
 <phrase>
@@ -12196,16 +11979,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 la 1"
+    *: "10 la 1"
   </voice>
 </phrase>
 <phrase>
@@ -12292,16 +12072,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 la 1"
+    *: "2 la 1"
   </voice>
 </phrase>
 <phrase>
@@ -12360,16 +12137,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limita"
+    *: "Limita"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limita"
+    *: "Limita"
   </voice>
 </phrase>
 <phrase>
@@ -12470,16 +12244,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Scara temporală"
+    *: "Scara temporală"
   </dest>
   <voice>
-    *: none
-    swcodec: "Scara temporală"
+    *: "Scara temporală"
   </voice>
 </phrase>
 <phrase>
@@ -12487,16 +12258,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 la 1"
+    *: "6 la 1"
   </voice>
 </phrase>
 <phrase>
@@ -12563,16 +12331,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 la 1"
+    *: "4 la 1"
   </voice>
 </phrase>
 <phrase>
@@ -12861,16 +12626,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simplu (Meier)"
+    *: "Simplu (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simplu"
+    *: "Simplu"
   </voice>
 </phrase>
 <phrase>
@@ -12920,16 +12682,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Particularizată"
+    *: "Particularizată"
   </dest>
   <voice>
-    *: none
-    swcodec: "particularizată"
+    *: "particularizată"
   </voice>
 </phrase>
 <phrase>
@@ -12996,16 +12755,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13047,16 +12803,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Timp atac"
+    *: "Timp atac"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timp atac"
+    *: "Timp atac"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 842ae14764..bc14af0e48 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -29,7 +29,6 @@
 # - James Hunt
 # - Dmitriy Gamza
 # - Roman Levkin-Taymenev
-
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -623,16 +622,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Перекрёстная подача сигнала"
+    *: "Перекрёстная подача сигнала"
   </dest>
   <voice>
-    *: none
-    swcodec: "Перекрёстная подача сигнала"
+    *: "Перекрёстная подача сигнала"
   </voice>
 </phrase>
 <phrase>
@@ -640,16 +636,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Эквалайзер"
+    *: "Эквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Эквалайзер"
+    *: "Эквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -828,16 +821,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Включить эквалайзер"
+    *: "Включить эквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Включить эквалайзер"
+    *: "Включить эквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -845,16 +835,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Графический эквалайзер"
+    *: "Графический эквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Графический эквалайзер"
+    *: "Графический эквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -862,16 +849,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Простые настройки"
+    *: "Простые настройки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Простые настройки"
+    *: "Простые настройки"
   </voice>
 </phrase>
 <phrase>
@@ -879,16 +863,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Расширенные настройки"
+    *: "Расширенные настройки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Расширенные настройки"
+    *: "Расширенные настройки"
   </voice>
 </phrase>
 <phrase>
@@ -896,16 +877,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Сохранить настройки"
+    *: "Сохранить настройки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сохранить настройки"
+    *: "Сохранить настройки"
   </voice>
 </phrase>
 <phrase>
@@ -913,16 +891,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Загрузить настройки"
+    *: "Загрузить настройки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Загрузить настройки"
+    *: "Загрузить настройки"
   </voice>
 </phrase>
 <phrase>
@@ -930,16 +905,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим редактирования: %s"
+    *: "Режим редактирования: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -947,16 +919,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Гц"
+    *: "%d Гц"
   </dest>
   <voice>
-    *: none
-    swcodec: "Герц"
+    *: "Герц"
   </voice>
 </phrase>
 <phrase>
@@ -964,16 +933,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Фильтр низких частот"
+    *: "Фильтр низких частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Фильтр низких частот"
+    *: "Фильтр низких частот"
   </voice>
 </phrase>
 <phrase>
@@ -981,16 +947,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Полосовой фильтр %d"
+    *: "Полосовой фильтр %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Полосовой фильтр"
+    *: "Полосовой фильтр"
   </voice>
 </phrase>
 <phrase>
@@ -998,16 +961,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Фильтр высоких частот"
+    *: "Фильтр высоких частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Фильтр высоких частот"
+    *: "Фильтр высоких частот"
   </voice>
 </phrase>
 <phrase>
@@ -1015,16 +975,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Частота среза"
+    *: "Частота среза"
   </dest>
   <voice>
-    *: none
-    swcodec: "Частота среза"
+    *: "Частота среза"
   </voice>
 </phrase>
 <phrase>
@@ -1032,16 +989,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Центральная частота"
+    *: "Центральная частота"
   </dest>
   <voice>
-    *: none
-    swcodec: "Центральная частота"
+    *: "Центральная частота"
   </voice>
 </phrase>
 <phrase>
@@ -1049,16 +1003,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Добротность"
+    *: "Добротность"
   </dest>
   <voice>
-    *: none
-    swcodec: "Добротность"
+    *: "Добротность"
   </voice>
 </phrase>
 <phrase>
@@ -1310,16 +1261,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Сигнал при пропуске трека"
+    *: "Сигнал при пропуске трека"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сигнал при пропуске трэка"
+    *: "Сигнал при пропуске трэка"
   </voice>
 </phrase>
 <phrase>
@@ -1327,16 +1275,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Низкая"
+    *: "Низкая"
   </dest>
   <voice>
-    *: none
-    swcodec: "Низкая"
+    *: "Низкая"
   </voice>
 </phrase>
 <phrase>
@@ -1344,16 +1289,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Средняя"
+    *: "Средняя"
   </dest>
   <voice>
-    *: none
-    swcodec: "Средняя"
+    *: "Средняя"
   </voice>
 </phrase>
 <phrase>
@@ -1361,16 +1303,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Высокая"
+    *: "Высокая"
   </dest>
   <voice>
-    *: none
-    swcodec: "Высокая"
+    *: "Высокая"
   </voice>
 </phrase>
 <phrase>
@@ -1591,16 +1530,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шрифты"
+    *: "Шрифты"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шрифты"
+    *: "Шрифты"
   </voice>
 </phrase>
 <phrase>
@@ -1684,16 +1620,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Статус/Прокрутка"
+    *: "Статус/Прокрутка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Статус/Прокрутка"
+    *: "Статус/Прокрутка"
   </voice>
 </phrase>
 <phrase>
@@ -1760,16 +1693,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Иврит (ISO-8859-8)"
+    *: "Иврит (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Иврит"
+    *: "Иврит"
   </voice>
 </phrase>
 <phrase>
@@ -1791,16 +1721,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Тайская (ISO-8859-11)"
+    *: "Тайская (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Тайская"
+    *: "Тайская"
   </voice>
 </phrase>
 <phrase>
@@ -1808,16 +1735,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Арабская (CP1256)"
+    *: "Арабская (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Арабская"
+    *: "Арабская"
   </voice>
 </phrase>
 <phrase>
@@ -1853,16 +1777,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Японская (SJIS)"
+    *: "Японская (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Японская"
+    *: "Японская"
   </voice>
 </phrase>
 <phrase>
@@ -1870,16 +1791,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Упрощённая Китайская (GB2312)"
+    *: "Упрощённая Китайская (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Упрощённая Китайская"
+    *: "Упрощённая Китайская"
   </voice>
 </phrase>
 <phrase>
@@ -1887,16 +1805,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Корейская (KSX1001)"
+    *: "Корейская (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Корейская"
+    *: "Корейская"
   </voice>
 </phrase>
 <phrase>
@@ -1904,16 +1819,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Традиционная Китайская (BIG5)"
+    *: "Традиционная Китайская (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Традиционная Китайская"
+    *: "Традиционная Китайская"
   </voice>
 </phrase>
 <phrase>
@@ -2259,15 +2171,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Частота"
+    play_frequency,recording: "Частота"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Частота"
+    play_frequency,recording: "Частота"
   </voice>
 </phrase>
 <phrase>
@@ -2293,18 +2205,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Микрофон"
     iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
+    recording: "Микрофон"
   </dest>
   <voice>
     *: none
-    recording: "Микрофон"
     iriverh100,iriverh120,iriverh300: "Внутренний микрофон"
+    recording: "Микрофон"
   </voice>
 </phrase>
 <phrase>
@@ -2629,16 +2541,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Предотвращать перегрузки"
+    *: "Предотвращать перегрузки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Предотвращать перегрузки"
+    *: "Предотвращать перегрузки"
   </voice>
 </phrase>
 <phrase>
@@ -2860,16 +2769,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Вверх ногами"
+    *: "Вверх ногами"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Вверх ногами"
+    *: "Вверх ногами"
   </voice>
 </phrase>
 <phrase>
@@ -2877,16 +2783,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Вид курсора"
+    *: "Вид курсора"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Вид курсора"
+    *: "Вид курсора"
   </voice>
 </phrase>
 <phrase>
@@ -2894,16 +2797,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Стрелочка"
+    *: "Стрелочка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Стрелочка"
+    *: "Стрелочка"
   </voice>
 </phrase>
 <phrase>
@@ -2911,16 +2811,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Инверсный курсор"
+    *: "Инверсный курсор"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Инверсный курсор"
+    *: "Инверсный курсор"
   </voice>
 </phrase>
 <phrase>
@@ -3046,16 +2943,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прокручивать за границы экрана"
+    *: "Прокручивать за границы экрана"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прокручивать за границы экрана"
+    *: "Прокручивать за границы экрана"
   </voice>
 </phrase>
 <phrase>
@@ -3063,16 +2957,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шаг прокрутки экрана"
+    *: "Шаг прокрутки экрана"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шаг прокрутки экрана"
+    *: "Шаг прокрутки экрана"
   </voice>
 </phrase>
 <phrase>
@@ -3094,16 +2985,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Панель прокрутки"
+    *: "Панель прокрутки"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Панель прокрутки"
+    *: "Панель прокрутки"
   </voice>
 </phrase>
 <phrase>
@@ -3111,16 +2999,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Панель состояния"
+    *: "Панель состояния"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Панель состояния"
+    *: "Панель состояния"
   </voice>
 </phrase>
 <phrase>
@@ -3145,16 +3030,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Индикатор громкости"
+    *: "Индикатор громкости"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Индикатор громкости"
+    *: "Индикатор громкости"
   </voice>
 </phrase>
 <phrase>
@@ -3162,16 +3044,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Индикатор аккумулятора"
+    *: "Индикатор аккумулятора"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Индикатор аккумулятора"
+    *: "Индикатор аккумулятора"
   </voice>
 </phrase>
 <phrase>
@@ -3179,16 +3058,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Графический"
+    *: "Графический"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Графический"
+    *: "Графический"
   </voice>
 </phrase>
 <phrase>
@@ -3196,16 +3072,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Цифровой"
+    *: "Цифровой"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Цифровой"
+    *: "Цифровой"
   </voice>
 </phrase>
 <phrase>
@@ -3960,13 +3833,12 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    iriverifp7xx: "%d%% %dч %dм"
-    iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм"
+    ipodmini1g,ipodmini2g,iriverh10,iriverifp7xx: "%d%% %dч %dм"
   </dest>
   <voice>
     *: "Заряд аккумулятора"
@@ -4023,24 +3895,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Эм Эм Си"
     multivolume: "Эйч Ди 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "микро Эс Ди"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "микро Эс Ди"
     xduoox3: "микро Эс Ди 2"
-    archosondio*: "Эм Эм Си"
   </voice>
 </phrase>
 <phrase>
@@ -4170,34 +4042,30 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "ВЫКЛ. = Отмена"
-    mrobe500: "ВЫКЛ. = Отмена"
-    iriverh100,iriverh120,iriverh300: "СТОП = Отмена"
-    ipod*,sansac200*,mpiohd300: "МЕНЮ = Отмена"
-    iaudiox5,iaudiom5: "ЗАПИСЬ = Отмена"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПРЕД. = Отмена"
-    gigabeatfx: "ВЫКЛ. = Отмена"
-    mrobe100: "ПОКАЗ. = Отмена"
+    gigabeatfx,mrobe500,rtc: "ВЫКЛ. = Отмена"
     gigabeats: "НАЗАД = Отмена"
     gogearsa9200: "ЛЕВО = Отмена"
-    vibe500: "C = Отмена"
+    iaudiom5,iaudiox5: "ЗАПИСЬ = Отмена"
+    ipod*,mpiohd300,sansac200*: "МЕНЮ = Отмена"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПРЕД. = Отмена"
+    iriverh100,iriverh120,iriverh300: "СТОП = Отмена"
+    mrobe100: "ПОКАЗ. = Отмена"
     samsungyh*: "REW = Отмена"
+    vibe500: "C = Отмена"
   </dest>
   <voice>
     *: none
@@ -4243,19 +4111,18 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
+    iaudiom5,iaudiox5,recording: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
     iriverh100,iriverh120,iriverh300: "Диск заполнен. Нажмите СТОП для продолжения."
-    iaudiom5,iaudiox5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения."
-    sansae200*,sansac200*,vibe500: "Диск заполнен. Нажмите ПРЕД. для продолжения."
     samsungyh*: "Диск заполнен. Нажмите LEFT для продолжения."
+    sansac200*,sansae200*,vibe500: "Диск заполнен. Нажмите ПРЕД. для продолжения."
   </dest>
   <voice>
     *: none
@@ -4421,29 +4288,26 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ВОСПР.=Уст., ВЫКЛ.=Отм."
+    gigabeats: "ВЫБОР=Уст., ВЫКЛ.=Отм."
     ipod*: "ВЫБОР=Уст., МЕНЮ=Отм."
     iriverh10,iriverh10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм."
-    gigabeats: "ВЫБОР=Уст., ВЫКЛ.=Отм."
-    vibe500: "OK=Уст., C=Отм."
     mpiohd300: "ENTER=Уст., MENU=Отм."
     sansafuzeplus: "SELECT=Уст.,  BACK=Отм."
+    vibe500: "OK=Уст., C=Отм."
   </dest>
   <voice>
     *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -6801,22 +6665,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "ВЫКЛ. для отмены"
-    iriverh100,iriverh120,iriverh300: "СТОП для отмены"
-    ipod*: "ПАУЗА для отмены"
-    iaudiox5,iaudiom5: "ВОСПР. для отмены"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "ПРЕД. для отмены"
-    gigabeats: "НАЗАД для отмены"
     gigabeatfx: "ВЫКЛ. для отмены"
+    gigabeats: "НАЗАД для отмены"
+    iaudiom5,iaudiox5: "ВОСПР. для отмены"
+    ipod*: "ПАУЗА для отмены"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "ПРЕД. для отмены"
+    iriverh100,iriverh120,iriverh300: "СТОП для отмены"
   </dest>
   <voice>
     *: ""
@@ -7043,16 +6906,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим редактир.: %s %s"
+    *: "Режим редактир.: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7060,16 +6920,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Срез"
+    *: "Срез"
   </dest>
   <voice>
-    *: none
-    swcodec: "Частота среза"
+    *: "Частота среза"
   </voice>
 </phrase>
 <phrase>
@@ -7171,15 +7028,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отсечение баса"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Отсечение баса"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Отсечение баса"
   </voice>
 </phrase>
 <phrase>
@@ -7236,21 +7093,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Построение базы... %d найдено (ВЫКЛ. для отмены)"
-    iriverh100,iriverh120,iriverh300: "Построение базы... %d найдено (СТОП для отмены)"
-    ipod*: "Построение базы... %d найдено (ПРЕД. для отмены)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Построение базы... %d найдено (ВЛЕВО для отмены)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Построение базы... %d найдено (ПРЕД. для отмены)"
-    gogearsa9200: "Построение базы... %d найдено (РЕВЕРС. для отмены)"
     archosplayer: "Построение БД... %d найдено"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Построение базы... %d найдено (ВЛЕВО для отмены)"
+    gogearsa9200: "Построение базы... %d найдено (РЕВЕРС. для отмены)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Построение базы... %d найдено (ПРЕД. для отмены)"
+    iriverh100,iriverh120,iriverh300: "Построение базы... %d найдено (СТОП для отмены)"
   </dest>
   <voice>
     *: "записей найдено в базе"
@@ -7602,16 +7457,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Предварительное обрезание"
+    *: "Предварительное обрезание"
   </dest>
   <voice>
-    *: none
-    swcodec: "Предварительное обрезание"
+    *: "Предварительное обрезание"
   </voice>
 </phrase>
 <phrase>
@@ -7943,23 +7795,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "ВОСПР. = Да"
+    archosplayer: "(ВОСПР./СТОП)"
     cowond2*: "МЕНЮ или прав. верх. = Да"
+    creativezen*: "Выбрать = Да"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "ВЫБРАТЬ = Да"
     iriverh100,iriverh120,iriverh300: "НАВИГ. = Да"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "ВЫБРАТЬ = Да"
     mrobe500: "ВОСПР., ВЫКЛ или прав. верх. = Да"
-    archosplayer: "(ВОСПР./СТОП)"
     vibe500: "OK = Да"
-    creativezen*: "Выбрать = Да"
   </dest>
   <voice>
     *: ""
@@ -7971,27 +7823,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ВКЛ. = Установить"
-    mrobe500: "СЕРДЦЕ = Установить"
-    iriverh100,iriverh120,iriverh300: "НАВИГ. = Установить"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "ВЫБОР = Установить"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "ВЫБОР = Установить"
     gogearsa9200,samsungyh*: "ВОСПР. = Установить"
-    vibe500: "OK = Установить"
+    iriverh100,iriverh120,iriverh300: "НАВИГ. = Установить"
     mpiohd300: "ENTER = Установить"
+    mrobe500: "СЕРДЦЕ = Установить"
+    rtc: "ВКЛ. = Установить"
+    vibe500: "OK = Установить"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8330,16 +8182,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Усиление"
+    *: "Усиление"
   </dest>
   <voice>
-    *: none
-    swcodec: "Усиление"
+    *: "Усиление"
   </voice>
 </phrase>
 <phrase>
@@ -8801,16 +8650,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Срез высоких частот"
+    *: "Срез высоких частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Срез высоких частот"
+    *: "Срез высоких частот"
   </voice>
 </phrase>
 <phrase>
@@ -9502,16 +9348,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Наложение"
+    *: "Наложение"
   </dest>
   <voice>
-    *: none
-    swcodec: "Наложение"
+    *: "Наложение"
   </voice>
 </phrase>
 <phrase>
@@ -9578,19 +9421,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
-    lcd_bitmap: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Дизеринг"
-    lcd_bitmap: "Дизеринг"
+    *: "Дизеринг"
   </dest>
   <voice>
-    *: none
-    swcodec: "Дизеринг"
-    lcd_bitmap: "Дизеринг"
+    *: "Дизеринг"
   </voice>
 </phrase>
 <phrase>
@@ -9705,16 +9542,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Подавление высоких частот"
+    *: "Подавление высоких частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Подавление высоких частот"
+    *: "Подавление высоких частот"
   </voice>
 </phrase>
 <phrase>
@@ -9811,17 +9645,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
+    sansae200*,sansafuze*: "Таймаут подсветки колёсика"
   </dest>
   <voice>
     *: none
     button_light: "Таймаут подсветки клавиш"
-    sansafuze*,sansae200*: "Таймаут подсветки колёсика"
+    sansae200*,sansafuze*: "Таймаут подсветки колёсика"
   </voice>
 </phrase>
 <phrase>
@@ -9892,15 +9726,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Подавление высоких частот"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Подавление высоких частот"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Подавление высоких частот"
   </voice>
 </phrase>
 <phrase>
@@ -10037,16 +9871,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Прямое усиление"
+    *: "Прямое усиление"
   </dest>
   <voice>
-    *: none
-    swcodec: "Прямое усиление"
+    *: "Прямое усиление"
   </voice>
 </phrase>
 <phrase>
@@ -10220,16 +10051,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Озвучивание нажатия кнопок"
+    *: "Озвучивание нажатия кнопок"
   </dest>
   <voice>
-    *: none
-    swcodec: "Озвучивание нажатия кнопок"
+    *: "Озвучивание нажатия кнопок"
   </voice>
 </phrase>
 <phrase>
@@ -10237,16 +10065,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Повтор сигнала"
+    *: "Повтор сигнала"
   </dest>
   <voice>
-    *: none
-    swcodec: "Повтор сигнала"
+    *: "Повтор сигнала"
   </voice>
 </phrase>
 <phrase>
@@ -11038,16 +10863,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Время освобождения"
+    *: "Время освобождения"
   </dest>
   <voice>
-    *: none
-    swcodec: "Время освобождения"
+    *: "Время освобождения"
   </voice>
 </phrase>
 <phrase>
@@ -11089,16 +10911,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Порог"
+    *: "Порог"
   </dest>
   <voice>
-    *: none
-    swcodec: "Порог"
+    *: "Порог"
   </voice>
 </phrase>
 <phrase>
@@ -11123,16 +10942,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Маскировать усиление"
+    *: "Маскировать усиление"
   </dest>
   <voice>
-    *: none
-    swcodec: "Маскировать усиление"
+    *: "Маскировать усиление"
   </voice>
 </phrase>
 <phrase>
@@ -11140,16 +10956,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основная тема"
+    *: "Основная тема"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основная тема"
+    *: "Основная тема"
   </voice>
 </phrase>
 <phrase>
@@ -11208,16 +11021,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Позиция полосы прокрутки"
+    *: "Позиция полосы прокрутки"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Позиция полосы прокрутки"
+    *: "Позиция полосы прокрутки"
   </voice>
 </phrase>
 <phrase>
@@ -11259,16 +11069,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Колено"
+    *: "Колено"
   </dest>
   <voice>
-    *: none
-    swcodec: "Колено"
+    *: "Колено"
   </voice>
 </phrase>
 <phrase>
@@ -11276,16 +11083,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Авто"
+    *: "Авто"
   </dest>
   <voice>
-    *: none
-    swcodec: "Авто"
+    *: "Авто"
   </voice>
 </phrase>
 <phrase>
@@ -11321,16 +11125,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Мягкое колено"
+    *: "Мягкое колено"
   </dest>
   <voice>
-    *: none
-    swcodec: "Мягкое колено"
+    *: "Мягкое колено"
   </voice>
 </phrase>
 <phrase>
@@ -11338,16 +11139,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Соотношение"
+    *: "Соотношение"
   </dest>
   <voice>
-    *: none
-    swcodec: "Соотношение"
+    *: "Соотношение"
   </voice>
 </phrase>
 <phrase>
@@ -11389,16 +11187,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Жёсткое колено"
+    *: "Жёсткое колено"
   </dest>
   <voice>
-    *: none
-    swcodec: "Жёсткое колено"
+    *: "Жёсткое колено"
   </voice>
 </phrase>
 <phrase>
@@ -11440,16 +11235,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основная тема для ПДУ"
+    *: "Основная тема для ПДУ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основная тема для ПДУ"
+    *: "Основная тема для ПДУ"
   </voice>
 </phrase>
 <phrase>
@@ -11624,16 +11416,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Перемотать перед возобновлением"
+    *: "Перемотать перед возобновлением"
   </dest>
   <voice>
-    *: none
-    swcodec: "Перемотать перед возобновлением"
+    *: "Перемотать перед возобновлением"
   </voice>
 </phrase>
 <phrase>
@@ -11689,16 +11478,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 к 1"
+    *: "10 к 1"
   </voice>
 </phrase>
 <phrase>
@@ -11805,16 +11591,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 к 1"
+    *: "2 к 1"
   </voice>
 </phrase>
 <phrase>
@@ -11873,16 +11656,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Предел"
+    *: "Предел"
   </dest>
   <voice>
-    *: none
-    swcodec: "Предел"
+    *: "Предел"
   </voice>
 </phrase>
 <phrase>
@@ -11921,16 +11701,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ширина полосы прокрутки"
+    *: "Ширина полосы прокрутки"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ширина полосы прокрутки"
+    *: "Ширина полосы прокрутки"
   </voice>
 </phrase>
 <phrase>
@@ -12031,16 +11808,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Растяжение"
+    *: "Растяжение"
   </dest>
   <voice>
-    *: none
-    swcodec: "Растяжение"
+    *: "Растяжение"
   </voice>
 </phrase>
 <phrase>
@@ -12048,16 +11822,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 к 1"
+    *: "6 к 1"
   </voice>
 </phrase>
 <phrase>
@@ -12110,16 +11881,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Компрессор"
+    *: "Компрессор"
   </dest>
   <voice>
-    *: none
-    swcodec: "Компрессор"
+    *: "Компрессор"
   </voice>
 </phrase>
 <phrase>
@@ -12206,16 +11974,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Скорость"
+    *: "Скорость"
   </dest>
   <voice>
-    *: none
-    swcodec: "Скорость"
+    *: "Скорость"
   </voice>
 </phrase>
 <phrase>
@@ -12223,16 +11988,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 к 1"
+    *: "4 к 1"
   </voice>
 </phrase>
 <phrase>
@@ -12681,16 +12443,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Алгоритм Мейера"
+    *: "Алгоритм Мейера"
   </dest>
   <voice>
-    *: none
-    swcodec: "Алгоритм Мейера"
+    *: "Алгоритм Мейера"
   </voice>
 </phrase>
 <phrase>
@@ -12726,16 +12485,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Ручная настройка"
+    *: "Ручная настройка"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ручная настройка"
+    *: "Ручная настройка"
   </voice>
 </phrase>
 <phrase>
@@ -12816,16 +12572,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12901,16 +12654,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Время атаки"
+    *: "Время атаки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Время атаки"
+    *: "Время атаки"
   </voice>
 </phrase>
 <phrase>
@@ -12977,16 +12727,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Эффект Хааса"
+    *: "Эффект Хааса"
   </dest>
   <voice>
-    *: none
-    swcodec: "Эффект Хааса"
+    *: "Эффект Хааса"
   </voice>
 </phrase>
 <phrase>
@@ -13022,16 +12769,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Снижение слуховой утомляемости"
+    *: "Снижение слуховой утомляемости"
   </dest>
   <voice>
-    *: none
-    swcodec: "Снижение слуховой утомляемости"
+    *: "Снижение слуховой утомляемости"
   </voice>
 </phrase>
 <phrase>
@@ -13039,16 +12783,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "Нижняя частота)"
+    *: "Нижняя частота)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Нижняя частота"
+    *: "Нижняя частота"
   </voice>
 </phrase>
 <phrase>
@@ -13088,18 +12829,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "Режим USB"
-    ibassodx90: "Режим USB"
+    ibassodx50,ibassodx90: "Режим USB"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Режим USB"
-    ibassodx90: "Режим USB"
+    ibassodx50,ibassodx90: "Режим USB"
   </voice>
 </phrase>
 <phrase>
@@ -13108,18 +12846,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Только зарядка"
-    ibassodx90: "Только зарядка"
+    ibassodx50,ibassodx90: "Только зарядка"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Только зарядка"
-    ibassodx90: "Только зарядка"
+    ibassodx50,ibassodx90: "Только зарядка"
   </voice>
 </phrase>
 <phrase>
@@ -13142,18 +12877,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Отладочный мост Android"
-    ibassodx90: "Отладочный мост Android"
+    ibassodx50,ibassodx90: "Отладочный мост Android"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Отладочный мост Android"
-    ibassodx90: "Отладочный мост Android"
+    ibassodx50,ibassodx90: "Отладочный мост Android"
   </voice>
 </phrase>
 <phrase>
@@ -13176,18 +12908,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Регулятор масштабирования частоты"
-    ibassodx90: "Регулятор масштабирования частоты"
+    ibassodx50,ibassodx90: "Регулятор масштабирования частоты"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Регулятор масштабирования частоты"
-    ibassodx90: "Регулятор масштабирования частоты"
+    ibassodx50,ibassodx90: "Регулятор масштабирования частоты"
   </voice>
 </phrase>
 <phrase>
@@ -13195,16 +12924,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "Верхняя частота"
+    *: "Верхняя частота"
   </dest>
   <voice>
-    *: none
-    swcodec: "Верхняя частота"
+    *: "Верхняя частота"
   </voice>
 </phrase>
 <phrase>
@@ -13241,18 +12967,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Устройство хранения информации"
-    ibassodx90: "Устройство хранения информации"
+    ibassodx50,ibassodx90: "Устройство хранения информации"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Устройство хранения информации"
-    ibassodx90: "Устройство хранения информации"
+    ibassodx50,ibassodx90: "Устройство хранения информации"
   </voice>
 </phrase>
 <phrase>
@@ -13274,16 +12997,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "ТОЛЬКО БОКОВОЙ"
+    *: "ТОЛЬКО БОКОВОЙ"
   </dest>
   <voice>
-    *: none
-    swcodec: "ТОЛЬКО БОКОВОЙ"
+    *: "ТОЛЬКО БОКОВОЙ"
   </voice>
 </phrase>
 <phrase>
@@ -13361,16 +13081,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Улучшение восприятия баса"
+    *: "Улучшение восприятия баса"
   </dest>
   <voice>
-    *: none
-    swcodec: "Улучшение восприятия баса"
+    *: "Улучшение восприятия баса"
   </voice>
 </phrase>
 <phrase>
@@ -13448,16 +13165,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Смесь необработанного и обработанного сигналов"
+    *: "Смесь необработанного и обработанного сигналов"
   </dest>
   <voice>
-    *: none
-    swcodec: "Смесь необработанного и обработанного сигналов"
+    *: "Смесь необработанного и обработанного сигналов"
   </voice>
 </phrase>
 <phrase>
@@ -13580,18 +13294,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Panning Separation"
+    *: "Panning Separation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Панорама"
+    *: "Панорама"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Панорама"
+    *: "Панорама"
     lowmem: none
   </voice>
 </phrase>
@@ -13600,18 +13311,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Reverberation"
+    *: "Reverberation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Реверберация"
+    *: "Реверберация"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Реверберация"
+    *: "Реверберация"
     lowmem: none
   </voice>
 </phrase>
@@ -13620,18 +13328,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Interpolation"
+    *: "Interpolation"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Интерполяция"
+    *: "Интерполяция"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Интерполяция"
+    *: "Интерполяция"
     lowmem: none
   </voice>
 </phrase>
@@ -13640,18 +13345,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Surround"
+    *: "Surround"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Окружение"
+    *: "Окружение"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Окружение"
+    *: "Окружение"
     lowmem: none
   </voice>
 </phrase>
@@ -13660,18 +13362,15 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    swcodec: "CPU Boost"
+    *: "CPU Boost"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Разгон процессора"
+    *: "Разгон процессора"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Разгон процессора"
+    *: "Разгон процессора"
     lowmem: none
   </voice>
 </phrase>
@@ -13680,16 +13379,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Разбивка"
+    *: "Разбивка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Разбивка"
+    *: "Разбивка"
   </voice>
 </phrase>
 <phrase>
@@ -13697,16 +13393,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Центральное поле"
+    *: "Центральное поле"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Центральное поле"
+    *: "Центральное поле"
   </voice>
 </phrase>
 <phrase>
@@ -13714,16 +13407,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Число слайдов"
+    *: "Число слайдов"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Число слайдов"
+    *: "Число слайдов"
   </voice>
 </phrase>
 <phrase>
@@ -13731,16 +13421,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Увеличение"
+    *: "Увеличение"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Увеличение"
+    *: "Увеличение"
   </voice>
 </phrase>
 <phrase>
@@ -13748,16 +13435,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать название альбома"
+    *: "Показывать название альбома"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать название альбома"
+    *: "Показывать название альбома"
   </voice>
 </phrase>
 <phrase>
@@ -13765,16 +13449,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Изменить размер обложек"
+    *: "Изменить размер обложек"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Изменить размер обложек"
+    *: "Изменить размер обложек"
   </voice>
 </phrase>
 <phrase>
@@ -13782,16 +13463,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Обновить кэш"
+    *: "Обновить кэш"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Обновить кэш"
+    *: "Обновить кэш"
   </voice>
 </phrase>
 <phrase>
@@ -13799,16 +13477,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Взаимодействие с экраном воспроизведения"
+    *: "Взаимодействие с экраном воспроизведения"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Взаимодействие с экраном воспроизведения"
+    *: "Взаимодействие с экраном воспроизведения"
   </voice>
 </phrase>
 <phrase>
@@ -13816,16 +13491,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Перейти к экрану воспроизведения"
+    *: "Перейти к экрану воспроизведения"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Перейти к экрану воспроизведения"
+    *: "Перейти к экрану воспроизведения"
   </voice>
 </phrase>
 <phrase>
@@ -13833,16 +13505,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Очистить список воспроизведения"
+    *: "Очистить список воспроизведения"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Очистить список воспроизведения"
+    *: "Очистить список воспроизведения"
   </voice>
 </phrase>
 <phrase>
@@ -13850,16 +13519,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Скрыть название альбома"
+    *: "Скрыть название альбома"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Скрыть название альбома"
+    *: "Скрыть название альбома"
   </voice>
 </phrase>
 <phrase>
@@ -13867,16 +13533,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать внизу"
+    *: "Показывать внизу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать внизу"
+    *: "Показывать внизу"
   </voice>
 </phrase>
 <phrase>
@@ -13884,16 +13547,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать вверху"
+    *: "Показывать вверху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать вверху"
+    *: "Показывать вверху"
   </voice>
 </phrase>
 <phrase>
@@ -13901,16 +13561,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Непосредственно"
+    *: "Непосредственно"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Непосредственно"
+    *: "Непосредственно"
   </voice>
 </phrase>
 <phrase>
@@ -13918,16 +13575,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Через список треков"
+    *: "Через список треков"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Через список трэков"
+    *: "Через список трэков"
   </voice>
 </phrase>
 <phrase>
@@ -13935,16 +13589,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Всегда включено"
+    *: "Всегда включено"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Всегда включено"
+    *: "Всегда включено"
   </voice>
 </phrase>
 <phrase>
@@ -13952,16 +13603,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Обложек не найдено"
+    *: "Обложек не найдено"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Обложек не найдено"
+    *: "Обложек не найдено"
   </voice>
 </phrase>
 <phrase>
@@ -13969,16 +13617,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Кэш будет обновлен при перезапуске"
+    *: "Кэш будет обновлен при перезапуске"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Кэш будет обновлен при перезапуске"
+    *: "Кэш будет обновлен при перезапуске"
   </voice>
 </phrase>
 <phrase>
@@ -13986,16 +13631,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Список воспроизведения очищен"
+    *: "Список воспроизведения очищен"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Список воспроизведения очищен"
+    *: "Список воспроизведения очищен"
   </voice>
 </phrase>
 <phrase>
@@ -14003,16 +13645,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Добавлено к списку воспроизведения"
+    *: "Добавлено к списку воспроизведения"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Добавлено к списку воспроизведения"
+    *: "Добавлено к списку воспроизведения"
   </voice>
 </phrase>
 <phrase>
@@ -14020,16 +13659,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ошибка при записи конфигурации"
+    *: "Ошибка при записи конфигурации"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ошибка при записи конфигурации"
+    *: "Ошибка при записи конфигурации"
   </voice>
 </phrase>
 <phrase>
@@ -14051,16 +13687,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 8: 1 ход / 15 мин."
+    *: "Уровень 8: 1 ход / 15 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 8: 1 ход за 15 минут"
+    *: "Уровень 8: 1 ход за 15 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14068,16 +13701,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "По порядку"
+    *: "По порядку"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "По порядку"
+    *: "По порядку"
   </voice>
 </phrase>
 <phrase>
@@ -14085,16 +13715,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Выбрать другую партию"
+    *: "Выбрать другую партию"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Выбрать другую партию"
+    *: "Выбрать другую партию"
   </voice>
 </phrase>
 <phrase>
@@ -14130,16 +13757,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Конец партии"
+    *: "Конец партии"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Конец партии"
+    *: "Конец партии"
   </voice>
 </phrase>
 <phrase>
@@ -14147,16 +13771,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Скорость Червя"
+    *: "Скорость Червя"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Скорость Червя"
+    *: "Скорость Червя"
   </voice>
 </phrase>
 <phrase>
@@ -14164,16 +13785,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ладья"
+    *: "Ладья"
   </voice>
 </phrase>
 <phrase>
@@ -14181,16 +13799,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 3: 60 ходов / 30 min."
+    *: "Уровень 3: 60 ходов / 30 min."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 3: 60 ходов за 30 минут"
+    *: "Уровень 3: 60 ходов за 30 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14198,16 +13813,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "в сторону короля"
+    *: "в сторону короля"
   </voice>
 </phrase>
 <phrase>
@@ -14215,16 +13827,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Не могу возобновить воспроизведение"
+    *: "Не могу возобновить воспроизведение"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Не могу возобновить воспроизведение"
+    *: "Не могу возобновить воспроизведение"
   </voice>
 </phrase>
 <phrase>
@@ -14232,16 +13841,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 5: 40 ходов / 60 мин."
+    *: "Уровень 5: 40 ходов / 60 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 5: 40 ходов за 60 минут"
+    *: "Уровень 5: 40 ходов за 60 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14249,16 +13855,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -14266,16 +13869,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 9: 1 ход / 60 мин."
+    *: "Уровень 9: 1 ход / 60 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 9: 1 ход за 60 минут"
+    *: "Уровень 9: 1 ход за 60 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14297,16 +13897,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Запрещенный ход!"
+    *: "Запрещенный ход!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Запрещенный ход!"
+    *: "Запрещенный ход!"
   </voice>
 </phrase>
 <phrase>
@@ -14314,18 +13911,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Play from beginning"
+    *: "Play from beginning"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Воспроизвести сначала"
+    *: "Воспроизвести сначала"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Воспроизвести сначала"
+    *: "Воспроизвести сначала"
     lowmem: none
   </voice>
 </phrase>
@@ -14334,16 +13928,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Восстановить партию"
+    *: "Восстановить партию"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Восстановить партию"
+    *: "Восстановить партию"
   </voice>
 </phrase>
 <phrase>
@@ -14365,16 +13956,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Метка снята"
+    *: "Метка снята"
   </voice>
 </phrase>
 <phrase>
@@ -14382,16 +13970,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Продолжить партию"
+    *: "Продолжить партию"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Продолжить партию"
+    *: "Продолжить партию"
   </voice>
 </phrase>
 <phrase>
@@ -14399,16 +13984,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "рокировка"
+    *: "рокировка"
   </voice>
 </phrase>
 <phrase>
@@ -14416,16 +13998,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Играть в Червячка!"
+    *: "Играть в Червячка!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Играть в Червячка!"
+    *: "Играть в Червячка!"
   </voice>
 </phrase>
 <phrase>
@@ -14492,16 +14071,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 4: 40 ходов / 30 мин."
+    *: "Уровень 4: 40 ходов / 30 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 4: 40 ходов за 30 минут"
+    *: "Уровень 4: 40 ходов за 30 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14509,16 +14085,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Размер бяк"
+    *: "Размер бяк"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Размер бяк"
+    *: "Размер бяк"
   </voice>
 </phrase>
 <phrase>
@@ -14526,16 +14099,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сохранить партию"
+    *: "Сохранить партию"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сохранить партию"
+    *: "Сохранить партию"
   </voice>
 </phrase>
 <phrase>
@@ -14557,16 +14127,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Режим слайд-шоу"
+    *: "Режим слайд-шоу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Режим слайд-шоу"
+    *: "Режим слайд-шоу"
   </voice>
 </phrase>
 <phrase>
@@ -14574,18 +14141,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Use common setting"
+    *: "Use common setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Использовать общие настройки"
+    *: "Использовать общие настройки"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Использовать общие настройки"
+    *: "Использовать общие настройки"
     lowmem: none
   </voice>
 </phrase>
@@ -14608,16 +14172,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Диффузия"
+    *: "Диффузия"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Диффузия"
+    *: "Диффузия"
   </voice>
 </phrase>
 <phrase>
@@ -14625,18 +14186,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Backlight brightness"
+    *: "Backlight brightness"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Яркость подсветки"
+    *: "Яркость подсветки"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Яркость подсветки"
+    *: "Яркость подсветки"
     lowmem: none
   </voice>
 </phrase>
@@ -14645,16 +14203,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Партии"
+    *: "Партии"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14662,16 +14217,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сохранение позиции"
+    *: "Сохранение позиции"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сохранение позиции"
+    *: "Сохранение позиции"
   </voice>
 </phrase>
 <phrase>
@@ -14679,16 +14231,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Загрузка позиции"
+    *: "Загрузка позиции"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Загрузка позиции"
+    *: "Загрузка позиции"
   </voice>
 </phrase>
 <phrase>
@@ -14696,16 +14245,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Думаю..."
+    *: "Думаю..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14741,16 +14287,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Слон"
+    *: "Слон"
   </voice>
 </phrase>
 <phrase>
@@ -14758,16 +14301,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "в сторону ферзя"
+    *: "в сторону ферзя"
   </voice>
 </phrase>
 <phrase>
@@ -14789,18 +14329,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Clear all resumes"
+    *: "Clear all resumes"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Удалить закладки"
+    *: "Удалить закладки"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Удалить закладки"
+    *: "Удалить закладки"
     lowmem: none
   </voice>
 </phrase>
@@ -14809,18 +14346,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu"
+    *: "Start menu"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Стартовое меню"
+    *: "Стартовое меню"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Стартовое меню"
+    *: "Стартовое меню"
     lowmem: none
   </voice>
 </phrase>
@@ -14829,16 +14363,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "бьёт"
+    *: "бьёт"
   </voice>
 </phrase>
 <phrase>
@@ -14846,16 +14377,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 2: 60 ходов / 15 мин."
+    *: "Уровень 2: 60 ходов / 15 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 2: 60 ходов за 15 минут"
+    *: "Уровень 2: 60 ходов за 15 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14905,16 +14433,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 1: 60 ходов / 5 мин."
+    *: "Уровень 1: 60 ходов / 5 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 1: 60 ходов за 5 минут"
+    *: "Уровень 1: 60 ходов за 5 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14936,18 +14461,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Set resume time (min)"
+    *: "Set resume time (min)"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Установить время возобновления (мин.)"
+    *: "Установить время возобновления (мин.)"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Установить время возобновления"
+    *: "Установить время возобновления"
     lowmem: none
   </voice>
 </phrase>
@@ -14956,18 +14478,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Start menu if not completed"
+    *: "Start menu if not completed"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Стартовое меню если не закончено"
+    *: "Стартовое меню если не закончено"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Стартовое меню если не закончено"
+    *: "Стартовое меню если не закончено"
     lowmem: none
   </voice>
 </phrase>
@@ -14976,16 +14495,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Новая партия"
+    *: "Новая партия"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Новая партия"
+    *: "Новая партия"
   </voice>
 </phrase>
 <phrase>
@@ -15021,16 +14537,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Просмотр сыгранных партий"
+    *: "Просмотр сыгранных партий"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Просмотр сыгранных партий"
+    *: "Просмотр сыгранных партий"
   </voice>
 </phrase>
 <phrase>
@@ -15038,18 +14551,15 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Play Mode"
+    *: "Play Mode"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Режим воспроизведения"
+    *: "Режим воспроизведения"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Режим воспроизведения"
+    *: "Режим воспроизведения"
     lowmem: none
   </voice>
 </phrase>
@@ -15089,16 +14599,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Игрок"
+    *: "Игрок"
   </voice>
 </phrase>
 <phrase>
@@ -15120,16 +14627,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Начало партии"
+    *: "Начало партии"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Начало партии"
+    *: "Начало партии"
   </voice>
 </phrase>
 <phrase>
@@ -15165,19 +14669,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    swcodec: "Display FPS"
-    lcd_bitmap: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    swcodec: "Кадров в секунду"
-    lcd_bitmap: "Кадров в секунду"
+    *: "Кадров в секунду"
   </dest>
   <voice>
-    *: none
-    swcodec: "Кадров в секунду"
-    lcd_bitmap: "Кадров в секунду"
+    *: "Кадров в секунду"
   </voice>
 </phrase>
 <phrase>
@@ -15199,16 +14697,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сбой при загрузке партии !"
+    *: "Сбой при загрузке партии !"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сбой при загрузке партии !"
+    *: "Сбой при загрузке партии !"
   </voice>
 </phrase>
 <phrase>
@@ -15216,16 +14711,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прирост Червя на порцию пищи"
+    *: "Прирост Червя на порцию пищи"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прирост Червя на порцию пищи"
+    *: "Прирост Червя на порцию пищи"
   </voice>
 </phrase>
 <phrase>
@@ -15261,18 +14753,15 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Limit FPS"
+    *: "Limit FPS"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Ограничение числа кадров в секунду"
+    *: "Ограничение числа кадров в секунду"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Ограничение числа кадров в секунду"
+    *: "Ограничение числа кадров в секунду"
     lowmem: none
   </voice>
 </phrase>
@@ -15295,16 +14784,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Черные"
+    *: "Черные"
   </voice>
 </phrase>
 <phrase>
@@ -15322,7 +14808,7 @@
   </voice>
 </phrase>
 <phrase>
-id: VOICE_BAT_BENCH_KEYS
+  id: VOICE_BAT_BENCH_KEYS
   desc: Battery bench start up message
   user: core
   <source>
@@ -15340,16 +14826,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 7: 40 ходов / 240 мин."
+    *: "Уровень 7: 40 ходов / 240 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 7: 40 ходов за 240 минут"
+    *: "Уровень 7: 40 ходов за 240 минут"
   </voice>
 </phrase>
 <phrase>
@@ -15357,16 +14840,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Количество бяк на порцию пищи"
+    *: "Количество бяк на порцию пищи"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Количество бяк на порцию пищи"
+    *: "Количество бяк на порцию пищи"
   </voice>
 </phrase>
 <phrase>
@@ -15391,16 +14871,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шах!"
+    *: "Шах!"
   </voice>
 </phrase>
 <phrase>
@@ -15408,18 +14885,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Tone controls"
+    *: "Tone controls"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Настройки тембра"
+    *: "Настройки тембра"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Настройки тембра"
+    *: "Настройки тембра"
     lowmem: none
   </voice>
 </phrase>
@@ -15428,18 +14902,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume automatically"
+    *: "Resume automatically"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Продолжить автоматически"
+    *: "Продолжить автоматически"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Продолжить автоматически"
+    *: "Продолжить автоматически"
     lowmem: none
   </voice>
 </phrase>
@@ -15462,18 +14933,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Single"
+    *: "Single"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Одиночный"
+    *: "Одиночный"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Одиночный"
+    *: "Одиночный"
     lowmem: none
   </voice>
 </phrase>
@@ -15482,16 +14950,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Возобновить игру"
+    *: "Возобновить игру"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Возобновить игру"
+    *: "Возобновить игру"
   </voice>
 </phrase>
 <phrase>
@@ -15499,18 +14964,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Skip frames"
+    *: "Skip frames"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Пропускать кадры"
+    *: "Пропускать кадры"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Пропускать кадры"
+    *: "Пропускать кадры"
     lowmem: none
   </voice>
 </phrase>
@@ -15519,18 +14981,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
-    swcodec: "Unavailable"
+    *: "Unavailable"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Недоступно"
+    *: "Недоступно"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Недоступно"
+    *: "Недоступно"
     lowmem: none
   </voice>
 </phrase>
@@ -15539,18 +14998,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Resume Options"
+    *: "Resume Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Опции продолжения"
+    *: "Опции продолжения"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Опции продолжения"
+    *: "Опции продолжения"
     lowmem: none
   </voice>
 </phrase>
@@ -15559,16 +15015,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шах и мат!"
+    *: "Шах и мат!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шах и мат!"
+    *: "Шах и мат!"
   </voice>
 </phrase>
 <phrase>
@@ -15576,18 +15029,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Audio Options"
+    *: "Audio Options"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Настройки звука"
+    *: "Настройки звука"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Настройки звука"
+    *: "Настройки звука"
     lowmem: none
   </voice>
 </phrase>
@@ -15596,16 +15046,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ферзь"
+    *: "Ферзь"
   </voice>
 </phrase>
 <phrase>
@@ -15655,16 +15102,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 10: 1 ход / 600 min."
+    *: "Уровень 10: 1 ход / 600 min."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 10: 1 ход за 600 минут"
+    *: "Уровень 10: 1 ход за 600 минут"
   </voice>
 </phrase>
 <phrase>
@@ -15672,16 +15116,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Король"
+    *: "Король"
   </voice>
 </phrase>
 <phrase>
@@ -15689,16 +15130,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "В оттенках серого"
+    *: "В оттенках серого"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "В оттенках серого"
+    *: "В оттенках серого"
   </voice>
 </phrase>
 <phrase>
@@ -15706,16 +15144,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Конь"
+    *: "Конь"
   </voice>
 </phrase>
 <phrase>
@@ -15737,16 +15172,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Время слайд-шоу"
+    *: "Время слайд-шоу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Время слайд-шоу"
+    *: "Время слайд-шоу"
   </voice>
 </phrase>
 <phrase>
@@ -15754,16 +15186,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Партий не найдено"
+    *: "Партий не найдено"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Партий не найдено"
+    *: "Партий не найдено"
   </voice>
 </phrase>
 <phrase>
@@ -15802,16 +15231,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Пешка"
+    *: "Пешка"
   </voice>
 </phrase>
 <phrase>
@@ -15819,16 +15245,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Размер порции пищи"
+    *: "Размер порции пищи"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Размер порции пищи"
+    *: "Размер порции пищи"
   </voice>
 </phrase>
 <phrase>
@@ -15836,16 +15259,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Уровень 6: 40 ходов / 120 мин."
+    *: "Уровень 6: 40 ходов / 120 мин."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уровень 6: 40 ходов за 120 минут"
+    *: "Уровень 6: 40 ходов за 120 минут"
   </voice>
 </phrase>
 <phrase>
@@ -15853,16 +15273,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Количество червей"
+    *: "Количество червей"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Количество червей"
+    *: "Количество червей"
   </voice>
 </phrase>
 <phrase>
@@ -15870,16 +15287,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Белые"
+    *: "Белые"
   </voice>
 </phrase>
 <phrase>
@@ -15901,16 +15315,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Помечено"
+    *: "Помечено"
   </voice>
 </phrase>
 <phrase>
@@ -15918,18 +15329,15 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
-    swcodec: "Use sound setting"
+    *: "Use sound setting"
     lowmem: none
   </source>
   <dest>
-    *: none
-    swcodec: "Использовать настройки звука"
+    *: "Использовать настройки звука"
     lowmem: none
   </dest>
   <voice>
-    *: none
-    swcodec: "Использовать настройки звука"
+    *: "Использовать настройки звука"
     lowmem: none
   </voice>
 </phrase>
@@ -16134,16 +15542,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать альбом и артиста внизу"
+    *: "Показывать альбом и артиста внизу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать альбом и артиста внизу"
+    *: "Показывать альбом и артиста внизу"
   </voice>
 </phrase>
 <phrase>
@@ -16151,16 +15556,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать альбом и артиста вверху"
+    *: "Показывать альбом и артиста вверху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать альбом и артиста вверху"
+    *: "Показывать альбом и артиста вверху"
   </voice>
 </phrase>
 <phrase>
@@ -16168,16 +15570,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать альбом внизу"
+    *: "Показывать альбом внизу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать альбом внизу"
+    *: "Показывать альбом внизу"
   </voice>
 </phrase>
 <phrase>
@@ -16185,16 +15584,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ничего не показывать"
+    *: "Ничего не показывать"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ничего не показывать"
+    *: "Ничего не показывать"
   </voice>
 </phrase>
 <phrase>
@@ -16202,16 +15598,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показывать альбом вверху"
+    *: "Показывать альбом вверху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показывать альбом вверху"
+    *: "Показывать альбом вверху"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 4468ac392d..8666eda298 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -812,16 +812,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Krížový prenos (Crossfeed)"
+    *: "Krížový prenos (Crossfeed)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Krížový Prenos zátvorka Crossfeed koniec zátvorky"
+    *: "Krížový Prenos zátvorka Crossfeed koniec zátvorky"
   </voice>
 </phrase>
 <phrase>
@@ -829,16 +826,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zosilnenie Priameho Sygnálu"
+    *: "Zosilnenie Priameho Sygnálu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zosilnenie Priameho Sygnálu"
+    *: "Zosilnenie Priameho Sygnálu"
   </voice>
 </phrase>
 <phrase>
@@ -846,16 +840,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zosilnenie Prenášaného Sygnálu"
+    *: "Zosilnenie Prenášaného Sygnálu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zosilnenie Prenášaného Sygnálu"
+    *: "Zosilnenie Prenášaného Sygnálu"
   </voice>
 </phrase>
 <phrase>
@@ -863,16 +854,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Tlmenie Vysokých Frekvencií"
+    *: "Tlmenie Vysokých Frekvencií"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tlmenie Vysokých Frekvencií"
+    *: "Tlmenie Vysokých Frekvencií"
   </voice>
 </phrase>
 <phrase>
@@ -880,16 +868,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Hranica Tlmenia Vysokých Frekvencií"
+    *: "Hranica Tlmenia Vysokých Frekvencií"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hranica tlmenia Vysokých Frekvencií"
+    *: "Hranica tlmenia Vysokých Frekvencií"
   </voice>
 </phrase>
 <phrase>
@@ -897,16 +882,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ekvalizér"
+    *: "Ekvalizér"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ekvalizér"
+    *: "Ekvalizér"
   </voice>
 </phrase>
 <phrase>
@@ -914,16 +896,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Zapnúť EKV"
+    *: "Zapnúť EKV"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zapnúť Ekvalizér"
+    *: "Zapnúť Ekvalizér"
   </voice>
 </phrase>
 <phrase>
@@ -931,16 +910,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafický EKV"
+    *: "Grafický EKV"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafický Ekvalizér"
+    *: "Grafický Ekvalizér"
   </voice>
 </phrase>
 <phrase>
@@ -948,16 +924,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Celkové Zosilnenie"
+    *: "Celkové Zosilnenie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Celkové Zosilnenie"
+    *: "Celkové Zosilnenie"
   </voice>
 </phrase>
 <phrase>
@@ -965,16 +938,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Jednoduché Nastavenie EKV"
+    *: "Jednoduché Nastavenie EKV"
   </dest>
   <voice>
-    *: none
-    swcodec: "Jednoduché Nastavenie Ekvalizéra"
+    *: "Jednoduché Nastavenie Ekvalizéra"
   </voice>
 </phrase>
 <phrase>
@@ -982,16 +952,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Pokročilé Nastavenie EKV"
+    *: "Pokročilé Nastavenie EKV"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pokročilé nastavenie ekvalizéra"
+    *: "Pokročilé nastavenie ekvalizéra"
   </voice>
 </phrase>
 <phrase>
@@ -999,16 +966,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Uložiť Ako Predvoľbu"
+    *: "Uložiť Ako Predvoľbu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Uložiť ako predvoľbu"
+    *: "Uložiť ako predvoľbu"
   </voice>
 </phrase>
 <phrase>
@@ -1016,16 +980,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Prehľadávať Predvoľby EKV"
+    *: "Prehľadávať Predvoľby EKV"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prehľadávať predvoľby ekvalizéra"
+    *: "Prehľadávať predvoľby ekvalizéra"
   </voice>
 </phrase>
 <phrase>
@@ -1033,16 +994,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Upraviť Režim: %s"
+    *: "Upraviť Režim: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1050,16 +1008,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Zosilnenie Pásma"
+    *: "%d Hz Zosilnenie Pásma"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz zosilnenie pásma"
+    *: "hertz zosilnenie pásma"
   </voice>
 </phrase>
 <phrase>
@@ -1067,16 +1022,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filter Dolného Prahu"
+    *: "Filter Dolného Prahu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filter dolného prahu"
+    *: "Filter dolného prahu"
   </voice>
 </phrase>
 <phrase>
@@ -1084,16 +1036,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Filter Pásma %d"
+    *: "Filter Pásma %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filter Pásma"
+    *: "Filter Pásma"
   </voice>
 </phrase>
 <phrase>
@@ -1101,16 +1050,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Filter Horného Prahu"
+    *: "Filter Horného Prahu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Filter horného prahu"
+    *: "Filter horného prahu"
   </voice>
 </phrase>
 <phrase>
@@ -1118,16 +1064,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Hraničná Frekvencia"
+    *: "Hraničná Frekvencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hraničná frekvencia"
+    *: "Hraničná frekvencia"
   </voice>
 </phrase>
 <phrase>
@@ -1135,16 +1078,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Stredová Frekvencia"
+    *: "Stredová Frekvencia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stredová frekvencia"
+    *: "Stredová frekvencia"
   </voice>
 </phrase>
 <phrase>
@@ -1152,16 +1092,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1169,16 +1106,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Kolísanie"
+    *: "Kolísanie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kolísanie"
+    *: "Kolísanie"
   </voice>
 </phrase>
 <phrase>
@@ -1569,16 +1503,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Zabrániť Praskaniu"
+    *: "Zabrániť Praskaniu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zabrániť praskaniu"
+    *: "Zabrániť praskaniu"
   </voice>
 </phrase>
 <phrase>
@@ -1656,16 +1587,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pípnutie pri Preskočení stopy"
+    *: "Pípnutie pri Preskočení stopy"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pípnutie pri preskočení stopy"
+    *: "Pípnutie pri preskočení stopy"
   </voice>
 </phrase>
 <phrase>
@@ -1673,16 +1601,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Tiché"
+    *: "Tiché"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tiché"
+    *: "Tiché"
   </voice>
 </phrase>
 <phrase>
@@ -1690,16 +1615,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Stredne Silné"
+    *: "Stredne Silné"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stredne silné"
+    *: "Stredne silné"
   </voice>
 </phrase>
 <phrase>
@@ -1707,16 +1629,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Silné"
+    *: "Silné"
   </dest>
   <voice>
-    *: none
-    swcodec: "Silné"
+    *: "Silné"
   </voice>
 </phrase>
 <phrase>
@@ -2265,16 +2184,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -2534,16 +2450,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hore Nohami"
+    *: "Hore Nohami"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hore nohami"
+    *: "Hore nohami"
   </voice>
 </phrase>
 <phrase>
@@ -2551,16 +2464,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kurzor"
+    *: "Kurzor"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kurzor"
+    *: "Kurzor"
   </voice>
 </phrase>
 <phrase>
@@ -2568,16 +2478,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Šípka"
+    *: "Šípka"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šípka"
+    *: "Šípka"
   </voice>
 </phrase>
 <phrase>
@@ -2585,16 +2492,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Inverzný Kurzor"
+    *: "Inverzný Kurzor"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverzný kurzor"
+    *: "Inverzný kurzor"
   </voice>
 </phrase>
 <phrase>
@@ -2884,16 +2788,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Obrazovka Roluje Mimo Zobrazenia"
+    *: "Obrazovka Roluje Mimo Zobrazenia"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obrazovka roluje mimo zobrazenia"
+    *: "Obrazovka roluje mimo zobrazenia"
   </voice>
 </phrase>
 <phrase>
@@ -2901,16 +2802,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dĺžka Kroku Obrazovkového Rolovania"
+    *: "Dĺžka Kroku Obrazovkového Rolovania"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dĺžka kroku obrazovkového rolovania"
+    *: "Dĺžka kroku obrazovkového rolovania"
   </voice>
 </phrase>
 <phrase>
@@ -2966,16 +2864,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stavový Riadok / Posuvník"
+    *: "Stavový Riadok / Posuvník"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stavový riadok alebo posuvník"
+    *: "Stavový riadok alebo posuvník"
   </voice>
 </phrase>
 <phrase>
@@ -2983,16 +2878,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rolovací Pás"
+    *: "Rolovací Pás"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rolovací pás"
+    *: "Rolovací pás"
   </voice>
 </phrase>
 <phrase>
@@ -3000,16 +2892,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stavový riadok"
+    *: "Stavový riadok"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Stavový riadok"
+    *: "Stavový riadok"
   </voice>
 </phrase>
 <phrase>
@@ -3017,16 +2906,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobrazenie Hlasitosti"
+    *: "Zobrazenie Hlasitosti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobrazenie hlasitosti"
+    *: "Zobrazenie hlasitosti"
   </voice>
 </phrase>
 <phrase>
@@ -3034,16 +2920,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobrazenie Batérie"
+    *: "Zobrazenie Batérie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobrazenie batérie"
+    *: "Zobrazenie batérie"
   </voice>
 </phrase>
 <phrase>
@@ -3051,16 +2934,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ikona"
+    *: "Ikona"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ikona"
+    *: "Ikona"
   </voice>
 </phrase>
 <phrase>
@@ -3068,16 +2948,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numericky"
+    *: "Numericky"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numericky"
+    *: "Numericky"
   </voice>
 </phrase>
 <phrase>
@@ -3267,16 +3144,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrejčina (ISO-8859-8)"
+    *: "Hebrejčina (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrejčina"
+    *: "Hebrejčina"
   </voice>
 </phrase>
 <phrase>
@@ -3298,16 +3172,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thajčina (ISO-8859-11)"
+    *: "Thajčina (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thajčina"
+    *: "Thajčina"
   </voice>
 </phrase>
 <phrase>
@@ -3315,16 +3186,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabčina (CP1256)"
+    *: "Arabčina (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabčina"
+    *: "Arabčina"
   </voice>
 </phrase>
 <phrase>
@@ -3360,16 +3228,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japončina (SJIS)"
+    *: "Japončina (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japončina"
+    *: "Japončina"
   </voice>
 </phrase>
 <phrase>
@@ -3377,16 +3242,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zjednod. Čínština (GB2312)"
+    *: "Zjednod. Čínština (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zjednodušená čínština"
+    *: "Zjednodušená čínština"
   </voice>
 </phrase>
 <phrase>
@@ -3394,16 +3256,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kórejčina (KSX1001)"
+    *: "Kórejčina (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kórejčina"
+    *: "Kórejčina"
   </voice>
 </phrase>
 <phrase>
@@ -3411,16 +3270,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Čínština (BIG5)"
+    *: "Trad. Čínština (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tradičná čínština"
+    *: "Tradičná čínština"
   </voice>
 </phrase>
 <phrase>
@@ -9193,7 +9049,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "Hárok stôp (cuesheet)"
@@ -9235,16 +9091,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Režim Editovania: %s %s"
+    *: "Režim Editovania: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9252,16 +9105,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Rez"
+    *: "Rez"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frekvencia rezu"
+    *: "Frekvencia rezu"
   </voice>
 </phrase>
 <phrase>
@@ -9269,16 +9119,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zosilnenie"
+    *: "Zosilnenie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zosilnenie"
+    *: "Zosilnenie"
   </voice>
 </phrase>
 <phrase>
@@ -9686,7 +9533,7 @@
     multivolume: "Nieje"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -9781,16 +9628,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Klikanie Pri Klávesoch"
+    *: "Klikanie Pri Klávesoch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Klikanie pri klávesoch"
+    *: "Klikanie pri klávesoch"
   </voice>
 </phrase>
 <phrase>
@@ -9798,16 +9642,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Opakované Klikanie"
+    *: "Opakované Klikanie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Opakované klikanie"
+    *: "Opakované klikanie"
   </voice>
 </phrase>
 <phrase>
@@ -9929,11 +9770,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Sériová bitová rýchlosť"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Sériová bitová rýchlosť"
   </voice>
@@ -9946,11 +9787,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automaticky"
   </voice>
@@ -9963,11 +9804,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -9980,11 +9821,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -9997,11 +9838,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10014,11 +9855,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -10541,16 +10382,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Úprava Rýchlosti"
+    *: "Úprava Rýchlosti"
   </dest>
   <voice>
-    *: none
-    swcodec: "Úprava Rýchlosti"
+    *: "Úprava Rýchlosti"
   </voice>
 </phrase>
 <phrase>
@@ -10558,16 +10396,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Rýchlosť"
+    *: "Rýchlosť"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rýchlosť"
+    *: "Rýchlosť"
   </voice>
 </phrase>
 <phrase>
@@ -10668,7 +10503,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -10821,16 +10656,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Dĺžka rolovacieho pásu"
+    *: "Dĺžka rolovacieho pásu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Dĺžka rolovacieho pásu"
+    *: "Dĺžka rolovacieho pásu"
   </voice>
 </phrase>
 <phrase>
@@ -10838,16 +10670,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Umiestnenie Rolovacieho Pásu"
+    *: "Umiestnenie Rolovacieho Pásu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Umiestnenie rolovacieho pásu"
+    *: "Umiestnenie rolovacieho pásu"
   </voice>
 </phrase>
 <phrase>
@@ -10855,16 +10684,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompresor"
+    *: "Kompresor"
   </voice>
 </phrase>
 <phrase>
@@ -10923,16 +10749,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Prah"
+    *: "Prah"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prah"
+    *: "Prah"
   </voice>
 </phrase>
 <phrase>
@@ -10940,16 +10763,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Pomer"
+    *: "Pomer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pomer"
+    *: "Pomer"
   </voice>
 </phrase>
 <phrase>
@@ -10957,16 +10777,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 ku 1"
+    *: "2 ku 1"
   </voice>
 </phrase>
 <phrase>
@@ -10974,16 +10791,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 ku 1"
+    *: "4 ku 1"
   </voice>
 </phrase>
 <phrase>
@@ -10991,16 +10805,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 ku 1"
+    *: "6 ku 1"
   </voice>
 </phrase>
 <phrase>
@@ -11008,16 +10819,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 ku 1"
+    *: "10 ku 1"
   </voice>
 </phrase>
 <phrase>
@@ -11025,16 +10833,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11042,16 +10847,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Zosilnenie Po Kompresii"
+    *: "Zosilnenie Po Kompresii"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zosilnenie po kompresii"
+    *: "Zosilnenie po kompresii"
   </voice>
 </phrase>
 <phrase>
@@ -11059,16 +10861,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11076,16 +10875,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Prechod Do Kompresie"
+    *: "Prechod Do Kompresie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prechod do kompresie"
+    *: "Prechod do kompresie"
   </voice>
 </phrase>
 <phrase>
@@ -11093,16 +10889,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Tvrdý Prechod"
+    *: "Tvrdý Prechod"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tvrdý prechod"
+    *: "Tvrdý prechod"
   </voice>
 </phrase>
 <phrase>
@@ -11110,16 +10903,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Mäkký Prechod"
+    *: "Mäkký Prechod"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mäkký prechod"
+    *: "Mäkký prechod"
   </voice>
 </phrase>
 <phrase>
@@ -11127,16 +10917,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Čas Zotavenia"
+    *: "Čas Zotavenia"
   </dest>
   <voice>
-    *: none
-    swcodec: "Čas zotavenia"
+    *: "Čas zotavenia"
   </voice>
 </phrase>
 <phrase>
@@ -11226,7 +11013,7 @@
     *: "Vložiť Nakoniec Zamiešané"
   </dest>
   <voice>
-    *:"Vložiť nakoniec zamiešané"
+    *: "Vložiť nakoniec zamiešané"
   </voice>
 </phrase>
 <phrase>
@@ -11324,16 +11111,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Základný Vzhľad"
+    *: "Základný Vzhľad"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Základný vzhľad"
+    *: "Základný vzhľad"
   </voice>
 </phrase>
 <phrase>
@@ -11341,16 +11125,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vzdialený Základný Vzhľad"
+    *: "Vzdialený Základný Vzhľad"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vzdialený základný vzhľad"
+    *: "Vzdialený základný vzhľad"
   </voice>
 </phrase>
 <phrase>
@@ -11443,16 +11224,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Vrátiť Pred Obnovením Prehrávania"
+    *: "Vrátiť Pred Obnovením Prehrávania"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vrátiť pred obnovením prehrávania"
+    *: "Vrátiť pred obnovením prehrávania"
   </voice>
 </phrase>
 <phrase>
@@ -11861,7 +11639,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12215,16 +11993,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Jednoduché (Meier)"
+    *: "Jednoduché (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Jednoduché"
+    *: "Jednoduché"
   </voice>
 </phrase>
 <phrase>
@@ -12260,16 +12035,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Vlastné"
+    *: "Vlastné"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vlastné"
+    *: "Vlastné"
   </voice>
 </phrase>
 <phrase>
@@ -12364,16 +12136,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12412,16 +12181,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Čas Začiatku"
+    *: "Čas Začiatku"
   </dest>
   <voice>
-    *: none
-    swcodec: "Čas Začiatku"
+    *: "Čas Začiatku"
   </voice>
 </phrase>
 <phrase>
@@ -12480,16 +12246,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -12497,16 +12260,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Vylepšenie basov"
+    *: "Vylepšenie basov"
   </dest>
   <voice>
-    *: none
-    swcodec: "Vylepšenie basov"
+    *: "Vylepšenie basov"
   </voice>
 </phrase>
 <phrase>
@@ -12514,16 +12274,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Redukcia rušivých tónov"
+    *: "Redukcia rušivých tónov"
   </dest>
   <voice>
-    *: none
-    swcodec: "Redukcia rušivých tónov"
+    *: "Redukcia rušivých tónov"
   </voice>
 </phrase>
 <phrase>
@@ -12531,16 +12288,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -12548,16 +12302,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12565,16 +12316,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12650,16 +12398,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13007,16 +12752,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cez zoznam stôp"
+    *: "Cez zoznam stôp"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cez zoznam stôp"
+    *: "Cez zoznam stôp"
   </voice>
 </phrase>
 <phrase>
@@ -13024,16 +12766,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Veža"
+    *: "Veža"
   </voice>
 </phrase>
 <phrase>
@@ -13055,16 +12794,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zväčšenie"
+    *: "Zväčšenie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zväčšenie"
+    *: "Zväčšenie"
   </voice>
 </phrase>
 <phrase>
@@ -13086,16 +12822,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Počet slidov"
+    *: "Počet slidov"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Počet slidov"
+    *: "Počet slidov"
   </voice>
 </phrase>
 <phrase>
@@ -13131,16 +12864,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "strana kráľovnej"
+    *: "strana kráľovnej"
   </voice>
 </phrase>
 <phrase>
@@ -13148,16 +12878,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Veľkosť potravy"
+    *: "Veľkosť potravy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Veľkosť potravy"
+    *: "Veľkosť potravy"
   </voice>
 </phrase>
 <phrase>
@@ -13179,19 +12906,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Prehrať od začiatku"
     lowmem: none
-    swcodec: "Prehrať od začiatku"
   </dest>
   <voice>
-    *: none
+    *: "Prehrať od začiatku"
     lowmem: none
-    swcodec: "Prehrať od začiatku"
   </voice>
 </phrase>
 <phrase>
@@ -13227,19 +12951,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </dest>
   <voice>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13247,16 +12968,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Integrácia WPS"
+    *: "Integrácia WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Integrácia WPS"
+    *: "Integrácia WPS"
   </voice>
 </phrase>
 <phrase>
@@ -13264,16 +12982,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Na začiatku hry"
+    *: "Na začiatku hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Na začiatku hry"
+    *: "Na začiatku hry"
   </voice>
 </phrase>
 <phrase>
@@ -13281,16 +12996,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Odtiene šedej"
+    *: "Odtiene šedej"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Odtiene šedej"
+    *: "Odtiene šedej"
   </voice>
 </phrase>
 <phrase>
@@ -13312,16 +13024,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chyba načítania hry!"
+    *: "Chyba načítania hry!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chyba načítania hry!"
+    *: "Chyba načítania hry!"
   </voice>
 </phrase>
 <phrase>
@@ -13329,16 +13038,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nesprávny ťah!"
+    *: "Nesprávny ťah!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nesprávny ťah!"
+    *: "Nesprávny ťah!"
   </voice>
 </phrase>
 <phrase>
@@ -13360,19 +13066,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </dest>
   <voice>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </voice>
 </phrase>
 <phrase>
@@ -13380,16 +13083,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "nemožno reštartovať prehrávanie"
+    *: "nemožno reštartovať prehrávanie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "nemožno reštartovať prehrávanie"
+    *: "nemožno reštartovať prehrávanie"
   </voice>
 </phrase>
 <phrase>
@@ -13397,16 +13097,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukladám pozíciu"
+    *: "Ukladám pozíciu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukladám pozíciu"
+    *: "Ukladám pozíciu"
   </voice>
 </phrase>
 <phrase>
@@ -13414,16 +13111,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť názov albumu"
+    *: "Zobraziť názov albumu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť názov albumu"
+    *: "Zobraziť názov albumu"
   </voice>
 </phrase>
 <phrase>
@@ -13431,19 +13125,16 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Nedostupné"
     lowmem: none
-    swcodec: "Nedostupné"
   </dest>
   <voice>
-    *: none
+    *: "Nedostupné"
     lowmem: none
-    swcodec: "Nedostupné"
   </voice>
 </phrase>
 <phrase>
@@ -13465,16 +13156,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Čierny"
+    *: "Čierny"
   </voice>
 </phrase>
 <phrase>
@@ -13482,16 +13170,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 5: 40 ťahov / 60 min"
+    *: "Úroveň 5: 40 ťahov / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 5: 40 ťahov za 60 minút"
+    *: "Úroveň 5: 40 ťahov za 60 minút"
   </voice>
 </phrase>
 <phrase>
@@ -13499,16 +13184,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť odohrané hry"
+    *: "Zobraziť odohrané hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť odohrané hry"
+    *: "Zobraziť odohrané hry"
   </voice>
 </phrase>
 <phrase>
@@ -13530,16 +13212,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Obnoviť cache"
+    *: "Obnoviť cache"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obnoviť cache"
+    *: "Obnoviť cache"
   </voice>
 </phrase>
 <phrase>
@@ -13547,16 +13226,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kráľ"
+    *: "Kráľ"
   </voice>
 </phrase>
 <phrase>
@@ -13592,16 +13268,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 4: 40 ťahov / 30 min"
+    *: "Úroveň 4: 40 ťahov / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 4: 40 ťahov za 30 minút"
+    *: "Úroveň 4: 40 ťahov za 30 minút"
   </voice>
 </phrase>
 <phrase>
@@ -13626,16 +13299,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hraj Wormlet!"
+    *: "Hraj Wormlet!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hraj Wormlet!"
+    *: "Hraj Wormlet!"
   </voice>
 </phrase>
 <phrase>
@@ -13643,16 +13313,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Difúzia"
+    *: "Difúzia"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Difúzia"
+    *: "Difúzia"
   </voice>
 </phrase>
 <phrase>
@@ -13660,16 +13327,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Centrovať okraj"
+    *: "Centrovať okraj"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Centrovať okraj"
+    *: "Centrovať okraj"
   </voice>
 </phrase>
 <phrase>
@@ -13691,16 +13355,13 @@
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "označené"
+    *: "označené"
   </voice>
 </phrase>
 <phrase>
@@ -13708,19 +13369,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Menu štart"
     lowmem: none
-    swcodec: "Menu štart"
   </dest>
   <voice>
-    *: none
+    *: "Menu štart"
     lowmem: none
-    swcodec: "Menu štart"
   </voice>
 </phrase>
 <phrase>
@@ -13728,16 +13386,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Počet wormov"
+    *: "Počet wormov"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Počet wormov"
+    *: "Počet wormov"
   </voice>
 </phrase>
 <phrase>
@@ -13745,16 +13400,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Obnoviť hru"
+    *: "Obnoviť hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obnoviť hru"
+    *: "Obnoviť hru"
   </voice>
 </phrase>
 <phrase>
@@ -13762,16 +13414,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Priamy"
+    *: "Priamy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "priamy"
+    *: "priamy"
   </voice>
 </phrase>
 <phrase>
@@ -13779,19 +13428,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </dest>
   <voice>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </voice>
 </phrase>
 <phrase>
@@ -13799,19 +13445,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "hodnoty eq"
     lowmem: none
-    swcodec: "hodnoty eq"
   </dest>
   <voice>
-    *: none
+    *: "hodnoty výšok a hĺbok"
     lowmem: none
-    swcodec: "hodnoty výšok a hĺbok"
   </voice>
 </phrase>
 <phrase>
@@ -13819,16 +13462,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Reštartovať hru"
+    *: "Reštartovať hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Reštartovať hru"
+    *: "Reštartovať hru"
   </voice>
 </phrase>
 <phrase>
@@ -13850,16 +13490,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "kôň"
+    *: "kôň"
   </voice>
 </phrase>
 <phrase>
@@ -13881,16 +13518,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 9: 1 ťah / 60 min"
+    *: "Úroveň 9: 1 ťah / 60 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 9: 1 ťah za 60 minút"
+    *: "Úroveň 9: 1 ťah za 60 minút"
   </voice>
 </phrase>
 <phrase>
@@ -13898,16 +13532,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 8: 1 ťah / 15 min"
+    *: "Úroveň 8: 1 ťah / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 8: 1 ťah za 15 minút"
+    *: "Úroveň 8: 1 ťah za 15 minút"
   </voice>
 </phrase>
 <phrase>
@@ -13915,19 +13546,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Režim prehrávania"
     lowmem: none
-    swcodec: "Režim prehrávania"
   </dest>
   <voice>
-    *: none
+    *: "Režim prehrávania"
     lowmem: none
-    swcodec: "Režim prehrávania"
   </voice>
 </phrase>
 <phrase>
@@ -13935,16 +13563,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nárast Worma po Potrave"
+    *: "Nárast Worma po Potrave"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nárast Worma po Potrave"
+    *: "Nárast Worma po Potrave"
   </voice>
 </phrase>
 <phrase>
@@ -13966,16 +13591,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Strana kráľa"
+    *: "Strana kráľa"
   </voice>
 </phrase>
 <phrase>
@@ -13997,16 +13619,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cache bude vytvorená po reštarte"
+    *: "Cache bude vytvorená po reštarte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cache bude vytvorená po reštarte"
+    *: "Cache bude vytvorená po reštarte"
   </voice>
 </phrase>
 <phrase>
@@ -14028,16 +13647,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prepnúť režim slide show"
+    *: "Prepnúť režim slide show"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prepnúť režim slide show"
+    *: "Prepnúť režim slide show"
   </voice>
 </phrase>
 <phrase>
@@ -14059,16 +13675,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </voice>
 </phrase>
 <phrase>
@@ -14076,16 +13689,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "rýchlosť worma"
+    *: "rýchlosť worma"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "rýchlosť worma"
+    *: "rýchlosť worma"
   </voice>
 </phrase>
 <phrase>
@@ -14093,16 +13703,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zmeniť veľkosť"
+    *: "Zmeniť veľkosť"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zmeniť veľkosť"
+    *: "Zmeniť veľkosť"
   </voice>
 </phrase>
 <phrase>
@@ -14166,16 +13773,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Biely"
+    *: "Biely"
   </voice>
 </phrase>
 <phrase>
@@ -14183,16 +13787,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Strelec"
+    *: "Strelec"
   </voice>
 </phrase>
 <phrase>
@@ -14214,16 +13815,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hráč"
+    *: "Hráč"
   </voice>
 </phrase>
 <phrase>
@@ -14259,16 +13857,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hry"
+    *: "Hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14290,19 +13885,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Jas podsvietenia"
     lowmem: none
-    swcodec: "Jas podsvietenia"
   </dest>
   <voice>
-    *: none
+    *: "Jas podsvietenia"
     lowmem: none
-    swcodec: "Jas podsvietenia"
   </voice>
 </phrase>
 <phrase>
@@ -14310,16 +13902,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skryť názov albumu"
+    *: "Skryť názov albumu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skryť názov albumu"
+    *: "Skryť názov albumu"
   </voice>
 </phrase>
 <phrase>
@@ -14327,19 +13916,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Separácia panningu"
     lowmem: none
-    swcodec: "Separácia panningu"
   </dest>
   <voice>
-    *: none
+    *: "Separácia panningu"
     lowmem: none
-    swcodec: "Separácia panningu"
   </voice>
 </phrase>
 <phrase>
@@ -14361,16 +13947,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "vičistiť playlist"
+    *: "vičistiť playlist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "vičistiť playlist"
+    *: "vičistiť playlist"
   </voice>
 </phrase>
 <phrase>
@@ -14392,19 +13975,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Vymazať všetky obnovenia"
     lowmem: none
-    swcodec: "Vymazať všetky obnovenia"
   </dest>
   <voice>
-    *: none
+    *: "Vymazať všetky obnovenia"
     lowmem: none
-    swcodec: "Vymazať všetky obnovenia"
   </voice>
 </phrase>
 <phrase>
@@ -14412,16 +13992,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukázať navrchu"
+    *: "Ukázať navrchu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukázať navrchu"
+    *: "Ukázať navrchu"
   </voice>
 </phrase>
 <phrase>
@@ -14429,16 +14006,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Veľkosť plochy"
+    *: "Veľkosť plochy"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Veľkosť plochy"
+    *: "Veľkosť plochy"
   </voice>
 </phrase>
 <phrase>
@@ -14446,19 +14020,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </dest>
   <voice>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </voice>
 </phrase>
 <phrase>
@@ -14483,19 +14054,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Použiť zvyčajné nastavenie"
     lowmem: none
-    swcodec: "Použiť zvyčajné nastavenie"
   </dest>
   <voice>
-    *: none
+    *: "Použiť zvyčajné nastavenie"
     lowmem: none
-    swcodec: "Použiť zvyčajné nastavenie"
   </voice>
 </phrase>
 <phrase>
@@ -14503,16 +14071,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vždy zapnuté"
+    *: "Vždy zapnuté"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vždy zapnuté"
+    *: "Vždy zapnuté"
   </voice>
 </phrase>
 <phrase>
@@ -14520,16 +14085,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Žiadne hry!"
+    *: "Žiadne hry!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Žiadne hry!"
+    *: "Žiadne hry!"
   </voice>
 </phrase>
 <phrase>
@@ -14537,19 +14099,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Použiť nastavenie zvuku"
     lowmem: none
-    swcodec: "Použiť nastavenie zvuku"
   </dest>
   <voice>
-    *: none
+    *: "Použiť nastavenie zvuku"
     lowmem: none
-    swcodec: "Použiť nastavenie zvuku"
   </voice>
 </phrase>
 <phrase>
@@ -14574,16 +14133,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Čas slideshow"
+    *: "Čas slideshow"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Čas slideshow"
+    *: "Čas slideshow"
   </voice>
 </phrase>
 <phrase>
@@ -14605,16 +14161,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 2: 60 ťahov / 15 min"
+    *: "Úroveň 2: 60 ťahov / 15 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "úroveň 2: 60 ťahov za 15 minút"
+    *: "úroveň 2: 60 ťahov za 15 minút"
   </voice>
 </phrase>
 <phrase>
@@ -14622,16 +14175,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Na konci hry"
+    *: "Na konci hry"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Na konci hry"
+    *: "Na konci hry"
   </voice>
 </phrase>
 <phrase>
@@ -14667,16 +14217,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "rošáda"
+    *: "rošáda"
   </voice>
 </phrase>
 <phrase>
@@ -14684,16 +14231,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Uložiť hru"
+    *: "Uložiť hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Uložiť hru"
+    *: "Uložiť hru"
   </voice>
 </phrase>
 <phrase>
@@ -14746,19 +14290,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Nastavenia zvuku"
     lowmem: none
-    swcodec: "Nastavenia zvuku"
   </dest>
   <voice>
-    *: none
+    *: "Nastavenia zvuku"
     lowmem: none
-    swcodec: "Nastavenia zvuku"
   </voice>
 </phrase>
 <phrase>
@@ -14766,16 +14307,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Premýšľam..."
+    *: "Premýšľam..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14797,16 +14335,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 6: 40 ťahov / 120 min"
+    *: "Úroveň 6: 40 ťahov / 120 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 6: 40 ťahov za 120 minút"
+    *: "Úroveň 6: 40 ťahov za 120 minút"
   </voice>
 </phrase>
 <phrase>
@@ -14814,19 +14349,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Spustiť ponuku ak nieje dokončené"
     lowmem: none
-    swcodec: "Spustiť ponuku ak nieje dokončené"
   </dest>
   <voice>
-    *: none
+    *: "Spustiť ponuku ak nieje dokončené"
     lowmem: none
-    swcodec: "Spustiť ponuku ak nieje dokončené"
   </voice>
 </phrase>
 <phrase>
@@ -14848,16 +14380,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ukázať naspodku"
+    *: "Ukázať naspodku"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ukázať naspodku"
+    *: "Ukázať naspodku"
   </voice>
 </phrase>
 <phrase>
@@ -14882,16 +14411,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Šach!"
+    *: "Šach!"
   </voice>
 </phrase>
 <phrase>
@@ -14899,16 +14425,13 @@
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Neoznačené"
+    *: "Neoznačené"
   </voice>
 </phrase>
 <phrase>
@@ -15048,16 +14571,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 1: 60 ťahov / 5 min"
+    *: "Úroveň 1: 60 ťahov / 5 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 1: 60 ťahov / 5 min"
+    *: "Úroveň 1: 60 ťahov / 5 min"
   </voice>
 </phrase>
 <phrase>
@@ -15065,16 +14585,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "GNU Chess"
+    *: "GNU Chess"
   </voice>
 </phrase>
 <phrase>
@@ -15124,16 +14641,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chyba pri zápise konfigu"
+    *: "Chyba pri zápise konfigu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chyba pri zápise konfigurácie"
+    *: "Chyba pri zápise konfigurácie"
   </voice>
 </phrase>
 <phrase>
@@ -15155,16 +14669,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 7: 40 ťahov / 240 min"
+    *: "Úroveň 7: 40 ťahov / 240 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 7: 40 ťahov počas 240 minút"
+    *: "Úroveň 7: 40 ťahov počas 240 minút"
   </voice>
 </phrase>
 <phrase>
@@ -15172,16 +14683,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 3: 60 ťahov / 30 min"
+    *: "Úroveň 3: 60 ťahov / 30 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 3: 60 ťahov za 30 minút"
+    *: "Úroveň 3: 60 ťahov za 30 minút"
   </voice>
 </phrase>
 <phrase>
@@ -15189,16 +14697,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zoradené"
+    *: "Zoradené"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zoradené"
+    *: "Zoradené"
   </voice>
 </phrase>
 <phrase>
@@ -15206,19 +14711,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Interpolácia"
     lowmem: none
-    swcodec: "Interpolácia"
   </dest>
   <voice>
-    *: none
+    *: "Interpolácia"
     lowmem: none
-    swcodec: "Interpolácia"
   </voice>
 </phrase>
 <phrase>
@@ -15226,16 +14728,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Choď na WPS"
+    *: "Choď na WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Choď na WPS"
+    *: "Choď na WPS"
   </voice>
 </phrase>
 <phrase>
@@ -15243,16 +14742,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Medzery"
+    *: "Medzery"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Medzery"
+    *: "Medzery"
   </voice>
 </phrase>
 <phrase>
@@ -15274,16 +14770,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Obnoviť hru"
+    *: "Obnoviť hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obnoviť hru"
+    *: "Obnoviť hru"
   </voice>
 </phrase>
 <phrase>
@@ -15291,17 +14784,13 @@
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Zobraziť FPS"
+    *: "Zobraziť FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "zobraziť FPS"
-    swcodec: "Zobraziť FPS"
+    *: "Zobraziť FPS"
   </voice>
 </phrase>
 <phrase>
@@ -15309,16 +14798,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Album art nenájdený"
+    *: "Album art nenájdený"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Album art nenájdený"
+    *: "Album art nenájdený"
   </voice>
 </phrase>
 <phrase>
@@ -15326,16 +14812,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Berie"
+    *: "Berie"
   </voice>
 </phrase>
 <phrase>
@@ -15343,16 +14826,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mat!"
+    *: "Mat!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Mat!"
+    *: "Mat!"
   </voice>
 </phrase>
 <phrase>
@@ -15360,16 +14840,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Playlist vymazaný"
+    *: "Playlist vymazaný"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Playlist vymazaný"
+    *: "Playlist vymazaný"
   </voice>
 </phrase>
 <phrase>
@@ -15391,19 +14868,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "nastaviť čas obnovenia (min)"
     lowmem: none
-    swcodec: "nastaviť čas obnovenia (min)"
   </dest>
   <voice>
-    *: none
+    *: "nastaviť čas obnovenia"
     lowmem: none
-    swcodec: "nastaviť čas obnovenia"
   </voice>
 </phrase>
 <phrase>
@@ -15439,19 +14913,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "preskočiť frejmy"
     lowmem: none
-    swcodec: "preskočiť frejmy"
   </dest>
   <voice>
-    *: none
+    *: "Preskočiť frejmy"
     lowmem: none
-    swcodec: "Preskočiť frejmy"
   </voice>
 </phrase>
 <phrase>
@@ -15459,16 +14930,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pridané do playlistu"
+    *: "Pridané do playlistu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pridané do playlistu"
+    *: "Pridané do playlistu"
   </voice>
 </phrase>
 <phrase>
@@ -15490,19 +14958,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </dest>
   <voice>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </voice>
 </phrase>
 <phrase>
@@ -15524,16 +14989,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kráľovná"
+    *: "Kráľovná"
   </voice>
 </phrase>
 <phrase>
@@ -15541,19 +15003,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Nastavenia obnovenia"
     lowmem: none
-    swcodec: "Nastavenia obnovenia"
   </dest>
   <voice>
-    *: none
+    *: "Nastavenia obnovenia"
     lowmem: none
-    swcodec: "Nastavenia obnovenia"
   </voice>
 </phrase>
 <phrase>
@@ -15561,16 +15020,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Úroveň 10: 1 ťah / 600 min"
+    *: "Úroveň 10: 1 ťah / 600 min"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Úroveň 10: 1 ťah za 600 minút"
+    *: "Úroveň 10: 1 ťah za 600 minút"
   </voice>
 </phrase>
 <phrase>
@@ -15578,16 +15034,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Načítavam pozíciu"
+    *: "Načítavam pozíciu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Načítavam pozíciu"
+    *: "Načítavam pozíciu"
   </voice>
 </phrase>
 <phrase>
@@ -15595,19 +15048,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Obnoviť automaticky"
     lowmem: none
-    swcodec: "Obnoviť automaticky"
   </dest>
   <voice>
-    *: none
+    *: "Obnoviť automaticky"
     lowmem: none
-    swcodec: "Obnoviť automaticky"
   </voice>
 </phrase>
 <phrase>
@@ -15615,16 +15065,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pešiak"
+    *: "Pešiak"
   </voice>
 </phrase>
 <phrase>
@@ -15646,16 +15093,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Nová hra"
+    *: "Nová hra"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Nová hra"
+    *: "Nová hra"
   </voice>
 </phrase>
 <phrase>
@@ -15663,16 +15107,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vybrať inú hru"
+    *: "Vybrať inú hru"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vybrať inú hru"
+    *: "Vybrať inú hru"
   </voice>
 </phrase>
 <phrase>
@@ -15680,16 +15121,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť album navrchu"
+    *: "Zobraziť album navrchu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť album navrchu"
+    *: "Zobraziť album navrchu"
   </voice>
 </phrase>
 <phrase>
@@ -15711,16 +15149,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť album a umelca naspodku"
+    *: "Zobraziť album a umelca naspodku"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť album a umelca naspodku"
+    *: "Zobraziť album a umelca naspodku"
   </voice>
 </phrase>
 <phrase>
@@ -15728,16 +15163,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť album naspodku"
+    *: "Zobraziť album naspodku"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť album naspodku"
+    *: "Zobraziť album naspodku"
   </voice>
 </phrase>
 <phrase>
@@ -15745,16 +15177,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skryť info"
+    *: "Skryť info"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skryť info"
+    *: "Skryť info"
   </voice>
 </phrase>
 <phrase>
@@ -15762,16 +15191,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Zobraziť album a umelca navrchu"
+    *: "Zobraziť album a umelca navrchu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Zobraziť album a umelca navrchu"
+    *: "Zobraziť album a umelca navrchu"
   </voice>
 </phrase>
 <phrase>
@@ -15779,19 +15205,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </dest>
   <voice>
-    *: none
+    *: "Kvalitný Mixér"
     lowmem: none
-    swcodec: "Kvalitný Mixér"
   </voice>
 </phrase>
 <phrase>
@@ -15799,19 +15222,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Vzorkovacia frekvencia"
     lowmem: none
-    swcodec: "Vzorkovacia frekvencia"
   </dest>
   <voice>
-    *: none
+    *: "Vzorkovacia frekvencia"
     lowmem: none
-    swcodec: "Vzorkovacia frekvencia"
   </voice>
 </phrase>
 <phrase>
@@ -15836,8 +15256,8 @@
   <dest>
     *: "Stlačte LEFT pre zrušenie"
     android: "Stlačte späť pre zrušenie"
-    hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
     cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie"
+    hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
     ihifi760,ihifi960: "Poklepte RETURN pre zrušenie"
     ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie"
     iriverh10,samsungyh*: "Poklepte LEFT pre zrušenie"
@@ -15852,8 +15272,8 @@
   <voice>
     *: "Stlačte LEFT pre zrušenie"
     android: "Stlačte späť pre zrušenie"
-    hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
     cowond2,creativezenxfi2,iaudio7,ibassodx50,ibassodx90,mrobe500,ondavx747: "Stlačte POWER pre zrušenie"
+    hifietma*,zenvision: "Stlačte BACK Pre zrušenie"
     ihifi760,ihifi960: "Poklepte RETURN pre zrušenie"
     ihifi770,ihifi770c,ihifi800: "Stlačte HOME pre zrušenie"
     iriverh10,samsungyh*: "Poklepte LEFT pre zrušenie"
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index f38489f68e..23778e64ad 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -726,15 +726,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvenca"
+    play_frequency,recording: "Frekvenca"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvenca"
+    play_frequency,recording: "Frekvenca"
   </voice>
 </phrase>
 <phrase>
@@ -760,18 +760,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Notranji mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Notranji mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -967,16 +967,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Drsnik"
+    *: "Drsnik"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Drsnik"
+    *: "Drsnik"
   </voice>
 </phrase>
 <phrase>
@@ -984,16 +981,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vrstica stanja"
+    *: "Vrstica stanja"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vrstica stanja"
+    *: "Vrstica stanja"
   </voice>
 </phrase>
 <phrase>
@@ -1001,16 +995,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prikaz glasnosti"
+    *: "Prikaz glasnosti"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prikaz glasnosti"
+    *: "Prikaz glasnosti"
   </voice>
 </phrase>
 <phrase>
@@ -1018,16 +1009,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Prikaz baterije"
+    *: "Prikaz baterije"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Prikaz baterije"
+    *: "Prikaz baterije"
   </voice>
 </phrase>
 <phrase>
@@ -1035,16 +1023,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafično"
+    *: "Grafično"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafično"
+    *: "Grafično"
   </voice>
 </phrase>
 <phrase>
@@ -1052,16 +1037,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerično"
+    *: "Numerično"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerično"
+    *: "Numerično"
   </voice>
 </phrase>
 <phrase>
@@ -1551,8 +1533,8 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dh %dm"
@@ -1611,25 +1593,23 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: "OFF Preklici"
-    vibe500: "C Preklici"
     mpiohd300: "MENU Preklici"
     samsungyh*: "REW Preklici"
+    vibe500: "C Preklici"
   </dest>
   <voice>
     *: ""
@@ -1671,16 +1651,16 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: "Disk je poln. Pritisni OFF"
-    vibe500: "Disk je poln. Pritisni PREV"
     samsungyh*: "Disk je poln. Pritisni LEFT"
+    vibe500: "Disk je poln. Pritisni PREV"
   </dest>
   <voice>
     *: ""
@@ -1753,18 +1733,18 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: "PLAY=nastavi OFF=Odpovej"
-    vibe500: "OK=nastavi C=Odpovej"
     mpiohd300: "ENTER=nastavi MENU=Odpovej"
     sansafuzeplus: "SELECT=nastavi  BACK=Odpovej"
+    vibe500: "OK=nastavi C=Odpovej"
   </dest>
   <voice>
     *: ""
@@ -2441,13 +2421,12 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF za odpoved"
@@ -2789,16 +2768,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2893,16 +2869,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -2941,16 +2914,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -3035,15 +3005,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -3179,21 +3149,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Ustvarjanje baze podatkov ... najdenih %d (OFF za nazaj)"
-    iriverh100,iriverh120,iriverh300: "Ustvarjanje baze podatkov ... najdenih %d (STOP za nazaj)"
-    ipod*: "Ustvarjanje baze podatkov ... najdenih %d (PREV za nazaj)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Ustvarjanje baze podatkov ... najdenih %d (LEVO za nazaj)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Ustvarjanje baze podatkov ... najdenih %d (PREV za nazaj)"
-    gogearsa9200: "Ustvarjanje baze podatkov ... najdenih %d (REW za nazaj)"
     archosplayer: "Ustvarjanje baze podatkov ... najdenih %d"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Ustvarjanje baze podatkov ... najdenih %d (LEVO za nazaj)"
+    gogearsa9200: "Ustvarjanje baze podatkov ... najdenih %d (REW za nazaj)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Ustvarjanje baze podatkov ... najdenih %d (PREV za nazaj)"
+    iriverh100,iriverh120,iriverh300: "Ustvarjanje baze podatkov ... najdenih %d (STOP za nazaj)"
   </dest>
   <voice>
     *: "najdeni vnosi za bazo"
@@ -3277,16 +3245,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical equalizer"
+    *: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -3322,16 +3287,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -3522,16 +3484,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -3587,16 +3546,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -3604,16 +3560,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -3666,16 +3619,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -3993,16 +3943,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -4140,16 +4087,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -4261,16 +4205,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -4329,16 +4270,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -4377,16 +4315,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -4453,16 +4388,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -4560,16 +4492,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -4667,16 +4596,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -4746,16 +4672,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -4935,16 +4858,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -4966,16 +4886,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -4997,16 +4914,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -5179,16 +5093,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -5307,20 +5218,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </dest>
   <voice>
@@ -5347,27 +5258,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -5434,16 +5345,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -5451,16 +5359,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -5544,16 +5449,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -5753,16 +5655,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -5860,16 +5759,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -6057,16 +5953,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -6107,16 +6000,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -6389,16 +6279,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -6668,16 +6555,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7187,16 +7071,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind before resume"
+    *: "Rewind before resume"
   </voice>
 </phrase>
 <phrase>
@@ -7221,16 +7102,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -7533,16 +7411,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -7640,16 +7515,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -7747,16 +7619,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -8135,16 +8004,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -8252,15 +8118,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Izboljšava 3-D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Izboljšava 3-D"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "Izboljšava 3-D"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "Izboljšava 3-D"
   </voice>
 </phrase>
 <phrase>
@@ -8327,16 +8193,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -8865,16 +8728,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz band gain"
+    *: "hertz band gain"
   </voice>
 </phrase>
 <phrase>
@@ -8941,16 +8801,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -8958,16 +8815,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centre frequency"
+    *: "Centre frequency"
   </voice>
 </phrase>
 <phrase>
@@ -9172,16 +9026,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -9204,24 +9055,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -9502,16 +9353,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar width"
+    *: "Scroll bar width"
   </voice>
 </phrase>
 <phrase>
@@ -9803,16 +9651,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -9913,16 +9758,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -9930,16 +9772,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -10102,16 +9941,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -10133,16 +9969,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -10181,16 +10014,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -10274,16 +10104,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10291,16 +10118,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -10370,16 +10194,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -10443,16 +10264,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -10460,16 +10278,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -10651,17 +10466,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -10669,16 +10484,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -10714,16 +10526,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -10884,15 +10693,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10948,16 +10757,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -10996,16 +10802,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -11367,16 +11170,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -11485,16 +11285,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -11609,16 +11406,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -11626,16 +11420,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -11657,16 +11448,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </voice>
 </phrase>
 <phrase>
@@ -11705,16 +11493,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -11767,16 +11552,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11899,16 +11681,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -12184,16 +11963,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vrsta izbirnika vrstice"
+    *: "Vrsta izbirnika vrstice"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vrsta izbirnika vrstice"
+    *: "Vrsta izbirnika vrstice"
   </voice>
 </phrase>
 <phrase>
@@ -12291,16 +12067,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Enostavno (Meier)"
+    *: "Enostavno (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enostavno"
+    *: "Enostavno"
   </voice>
 </phrase>
 <phrase>
@@ -12550,16 +12323,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kazalec"
+    *: "Kazalec"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kazalec"
+    *: "Kazalec"
   </voice>
 </phrase>
 <phrase>
@@ -12598,16 +12368,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Po meri"
+    *: "Po meri"
   </dest>
   <voice>
-    *: none
-    swcodec: "Po meri"
+    *: "Po meri"
   </voice>
 </phrase>
 <phrase>
@@ -12834,16 +12601,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Stolpec (obrnjen)"
+    *: "Stolpec (obrnjen)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Obrnjeni stolpec"
+    *: "Obrnjeni stolpec"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index e7de54aadc..1ea456a5d5 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -796,16 +796,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -813,16 +810,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Појачање директног сигнала"
+    *: "Појачање директног сигнала"
   </dest>
   <voice>
-    *: none
-    swcodec: "Појачање директног сигнала"
+    *: "Појачање директног сигнала"
   </voice>
 </phrase>
 <phrase>
@@ -830,16 +824,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Појачање унакрсног сигнала"
+    *: "Појачање унакрсног сигнала"
   </dest>
   <voice>
-    *: none
-    swcodec: "Појачање унакрсног сигнала"
+    *: "Појачање унакрсног сигнала"
   </voice>
 </phrase>
 <phrase>
@@ -847,16 +838,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Слабљење високих фрекв."
+    *: "Слабљење високих фрекв."
   </dest>
   <voice>
-    *: none
-    swcodec: "Слабљење високих фреквенција"
+    *: "Слабљење високих фреквенција"
   </voice>
 </phrase>
 <phrase>
@@ -864,16 +852,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Гранична фрекв. ВФ филтра"
+    *: "Гранична фрекв. ВФ филтра"
   </dest>
   <voice>
-    *: none
-    swcodec: "Гранична фрекв ВФ филтра"
+    *: "Гранична фрекв ВФ филтра"
   </voice>
 </phrase>
 <phrase>
@@ -881,16 +866,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Еквилајзер"
+    *: "Еквилајзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Еквилајзер"
+    *: "Еквилајзер"
   </voice>
 </phrase>
 <phrase>
@@ -898,16 +880,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Укључи EQ"
+    *: "Укључи EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Укључи еквилајзер"
+    *: "Укључи еквилајзер"
   </voice>
 </phrase>
 <phrase>
@@ -915,16 +894,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Графички EQ"
+    *: "Графички EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Графички еквилајзер"
+    *: "Графички еквилајзер"
   </voice>
 </phrase>
 <phrase>
@@ -932,16 +908,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Предслабљење"
+    *: "Предслабљење"
   </dest>
   <voice>
-    *: none
-    swcodec: "Предслабљење"
+    *: "Предслабљење"
   </voice>
 </phrase>
 <phrase>
@@ -949,16 +922,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Једноставна EQ подешавања"
+    *: "Једноставна EQ подешавања"
   </dest>
   <voice>
-    *: none
-    swcodec: "Једноставна подешавања еквилајзера"
+    *: "Једноставна подешавања еквилајзера"
   </voice>
 </phrase>
 <phrase>
@@ -966,16 +936,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Напредна EQ подешавања"
+    *: "Напредна EQ подешавања"
   </dest>
   <voice>
-    *: none
-    swcodec: "Напредна подешавања еквилајзера"
+    *: "Напредна подешавања еквилајзера"
   </voice>
 </phrase>
 <phrase>
@@ -983,16 +950,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Сними EQ поставку"
+    *: "Сними EQ поставку"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сними поставку еквилајзера"
+    *: "Сними поставку еквилајзера"
   </voice>
 </phrase>
 <phrase>
@@ -1000,16 +964,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Прегледај EQ поставке"
+    *: "Прегледај EQ поставке"
   </dest>
   <voice>
-    *: none
-    swcodec: "Прегледај поставке еквилајзера"
+    *: "Прегледај поставке еквилајзера"
   </voice>
 </phrase>
 <phrase>
@@ -1017,16 +978,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Мод подешавања: %s"
+    *: "Мод подешавања: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1034,16 +992,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Појачање у %d Hz појасу"
+    *: "Појачање у %d Hz појасу"
   </dest>
   <voice>
-    *: none
-    swcodec: "херц појас појачање"
+    *: "херц појас појачање"
   </voice>
 </phrase>
 <phrase>
@@ -1051,16 +1006,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low Shelf филтер"
+    *: "Low Shelf филтер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf филтер"
+    *: "Low shelf филтер"
   </voice>
 </phrase>
 <phrase>
@@ -1068,16 +1020,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Вршни филтер %d"
+    *: "Вршни филтер %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Вршни филтер"
+    *: "Вршни филтер"
   </voice>
 </phrase>
 <phrase>
@@ -1085,16 +1034,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High Shelf филтер"
+    *: "High Shelf филтер"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf филтер"
+    *: "High shelf филтер"
   </voice>
 </phrase>
 <phrase>
@@ -1102,16 +1048,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Гранична фреквенција"
+    *: "Гранична фреквенција"
   </dest>
   <voice>
-    *: none
-    swcodec: "Гранична фреквенција"
+    *: "Гранична фреквенција"
   </voice>
 </phrase>
 <phrase>
@@ -1119,16 +1062,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Централна фреквенција"
+    *: "Централна фреквенција"
   </dest>
   <voice>
-    *: none
-    swcodec: "Централна фреквенција"
+    *: "Централна фреквенција"
   </voice>
 </phrase>
 <phrase>
@@ -1136,16 +1076,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q-фактор"
+    *: "Q-фактор"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q-фактор"
+    *: "Q-фактор"
   </voice>
 </phrase>
 <phrase>
@@ -1153,16 +1090,13 @@
   desc: in the sound settings and some other menus
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Дитер"
+    *: "Дитер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Дитер"
+    *: "Дитер"
   </voice>
 </phrase>
 <phrase>
@@ -1553,16 +1487,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Спречи клиповање"
+    *: "Спречи клиповање"
   </dest>
   <voice>
-    *: none
-    swcodec: "Спречи клиповање"
+    *: "Спречи клиповање"
   </voice>
 </phrase>
 <phrase>
@@ -1640,16 +1571,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Бип код прескакања нумера"
+    *: "Бип код прескакања нумера"
   </dest>
   <voice>
-    *: none
-    swcodec: "Бип код прескакања нумера"
+    *: "Бип код прескакања нумера"
   </voice>
 </phrase>
 <phrase>
@@ -1657,16 +1585,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Тихо"
+    *: "Тихо"
   </dest>
   <voice>
-    *: none
-    swcodec: "Тихо"
+    *: "Тихо"
   </voice>
 </phrase>
 <phrase>
@@ -1674,16 +1599,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Средње"
+    *: "Средње"
   </dest>
   <voice>
-    *: none
-    swcodec: "Средње"
+    *: "Средње"
   </voice>
 </phrase>
 <phrase>
@@ -1691,16 +1613,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Јако"
+    *: "Јако"
   </dest>
   <voice>
-    *: none
-    swcodec: "Јако"
+    *: "Јако"
   </voice>
 </phrase>
 <phrase>
@@ -2249,16 +2168,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Фонт"
+    *: "Фонт"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Фонт"
+    *: "Фонт"
   </voice>
 </phrase>
 <phrase>
@@ -2520,16 +2436,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Изврнуто"
+    *: "Изврнуто"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Изврнуто"
+    *: "Изврнуто"
   </voice>
 </phrase>
 <phrase>
@@ -2537,16 +2450,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Тип селектора линије"
+    *: "Тип селектора линије"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Тип селектора линије"
+    *: "Тип селектора линије"
   </voice>
 </phrase>
 <phrase>
@@ -2554,16 +2464,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Показивач"
+    *: "Показивач"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Показивач"
+    *: "Показивач"
   </voice>
 </phrase>
 <phrase>
@@ -2571,16 +2478,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Трака (инверзно)"
+    *: "Трака (инверзно)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Трака инверзно"
+    *: "Трака инверзно"
   </voice>
 </phrase>
 <phrase>
@@ -2870,16 +2774,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Екран скролује ван погледа"
+    *: "Екран скролује ван погледа"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Екран скролује ван погледа"
+    *: "Екран скролује ван погледа"
   </voice>
 </phrase>
 <phrase>
@@ -2887,16 +2788,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Величина корака скроловања"
+    *: "Величина корака скроловања"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Величина корака скроловања"
+    *: "Величина корака скроловања"
   </voice>
 </phrase>
 <phrase>
@@ -2952,16 +2850,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Статусна-/Скрол-линија"
+    *: "Статусна-/Скрол-линија"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Статусна- и скрол-линија"
+    *: "Статусна- и скрол-линија"
   </voice>
 </phrase>
 <phrase>
@@ -2969,16 +2864,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Скрол линија"
+    *: "Скрол линија"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Скрол линија"
+    *: "Скрол линија"
   </voice>
 </phrase>
 <phrase>
@@ -2986,16 +2878,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Статусна линија"
+    *: "Статусна линија"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Статусна линија"
+    *: "Статусна линија"
   </voice>
 </phrase>
 <phrase>
@@ -3003,16 +2892,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Приказ јачине"
+    *: "Приказ јачине"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Приказ јачине"
+    *: "Приказ јачине"
   </voice>
 </phrase>
 <phrase>
@@ -3020,16 +2906,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Приказ батерије"
+    *: "Приказ батерије"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Приказ батерије"
+    *: "Приказ батерије"
   </voice>
 </phrase>
 <phrase>
@@ -3037,16 +2920,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Графички"
+    *: "Графички"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Графички"
+    *: "Графички"
   </voice>
 </phrase>
 <phrase>
@@ -3054,16 +2934,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Бројчано"
+    *: "Бројчано"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Бројчано"
+    *: "Бројчано"
   </voice>
 </phrase>
 <phrase>
@@ -3253,16 +3130,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "хебрејска (ISO-8859-8)"
+    *: "хебрејска (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "хебрејска"
+    *: "хебрејска"
   </voice>
 </phrase>
 <phrase>
@@ -3284,16 +3158,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "тајландска (ISO-8859-11)"
+    *: "тајландска (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "тајландска"
+    *: "тајландска"
   </voice>
 </phrase>
 <phrase>
@@ -3301,16 +3172,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "арапска (CP1256)"
+    *: "арапска (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "арапска"
+    *: "арапска"
   </voice>
 </phrase>
 <phrase>
@@ -3346,16 +3214,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "јапанска (SJIS)"
+    *: "јапанска (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "јапанска"
+    *: "јапанска"
   </voice>
 </phrase>
 <phrase>
@@ -3363,16 +3228,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "кинеска упрошћена (GB2312)"
+    *: "кинеска упрошћена (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "кинеска упрошћена"
+    *: "кинеска упрошћена"
   </voice>
 </phrase>
 <phrase>
@@ -3380,16 +3242,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "корејска (KSX1001)"
+    *: "корејска (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "корејска"
+    *: "корејска"
   </voice>
 </phrase>
 <phrase>
@@ -3397,16 +3256,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "кинеска традиционална (BIG5)"
+    *: "кинеска традиционална (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "кинеска традиционална"
+    *: "кинеска традиционална"
   </voice>
 </phrase>
 <phrase>
@@ -3737,7 +3593,7 @@
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3774,7 +3630,7 @@
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7588,7 +7444,7 @@
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -9233,16 +9089,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mod izmene: %s %s"
+    *: "Mod izmene: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9250,16 +9103,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Granicna"
+    *: "Granicna"
   </dest>
   <voice>
-    *: none
-    swcodec: "Granicna"
+    *: "Granicna"
   </voice>
 </phrase>
 <phrase>
@@ -9267,16 +9117,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Pojacanje"
+    *: "Pojacanje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pojacanje"
+    *: "Pojacanje"
   </voice>
 </phrase>
 <phrase>
@@ -9779,16 +9626,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Клик тастера"
+    *: "Клик тастера"
   </dest>
   <voice>
-    *: none
-    swcodec: "Клик тастера"
+    *: "Клик тастера"
   </voice>
 </phrase>
 <phrase>
@@ -9796,16 +9640,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Клик тастера се понавља"
+    *: "Клик тастера се понавља"
   </dest>
   <voice>
-    *: none
-    swcodec: "Клик тастера се понавља"
+    *: "Клик тастера се понавља"
   </voice>
 </phrase>
 <phrase>
@@ -10290,11 +10131,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10307,11 +10148,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Серијски битски проток"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Серијски битски проток"
   </voice>
@@ -10324,11 +10165,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10341,11 +10182,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10358,11 +10199,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -10389,11 +10230,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Ауто"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Аутоматски"
   </voice>
@@ -10555,16 +10396,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release време"
+    *: "Release време"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release време"
+    *: "Release време"
   </voice>
 </phrase>
 <phrase>
@@ -10572,16 +10410,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Праг"
+    *: "Праг"
   </dest>
   <voice>
-    *: none
-    swcodec: "Праг"
+    *: "Праг"
   </voice>
 </phrase>
 <phrase>
@@ -10589,16 +10424,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Појачање за надокнаду"
+    *: "Појачање за надокнаду"
   </dest>
   <voice>
-    *: none
-    swcodec: "Појачање за надокнаду"
+    *: "Појачање за надокнаду"
   </voice>
 </phrase>
 <phrase>
@@ -10606,16 +10438,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Позиција скрол линије"
+    *: "Позиција скрол линије"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Позиција скрол линије"
+    *: "Позиција скрол линије"
   </voice>
 </phrase>
 <phrase>
@@ -10657,16 +10486,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ни"
+    *: "Ни"
   </voice>
 </phrase>
 <phrase>
@@ -10674,16 +10500,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Ауто"
+    *: "Ауто"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ауто"
+    *: "Ауто"
   </voice>
 </phrase>
 <phrase>
@@ -10705,16 +10528,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Софт ни"
+    *: "Софт ни"
   </voice>
 </phrase>
 <phrase>
@@ -10736,16 +10556,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Однос"
+    *: "Однос"
   </dest>
   <voice>
-    *: none
-    swcodec: "Однос"
+    *: "Однос"
   </voice>
 </phrase>
 <phrase>
@@ -10770,16 +10587,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Хард ни"
+    *: "Хард ни"
   </voice>
 </phrase>
 <phrase>
@@ -10866,7 +10680,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -10954,16 +10768,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 према 1"
+    *: "10 према 1"
   </voice>
 </phrase>
 <phrase>
@@ -11005,16 +10816,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 према 1"
+    *: "2 према 1"
   </voice>
 </phrase>
 <phrase>
@@ -11039,16 +10847,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Лимит"
+    *: "Лимит"
   </dest>
   <voice>
-    *: none
-    swcodec: "Лимит"
+    *: "Лимит"
   </voice>
 </phrase>
 <phrase>
@@ -11087,16 +10892,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ширина скрол линије"
+    *: "Ширина скрол линије"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ширина скрол линије"
+    *: "Ширина скрол линије"
   </voice>
 </phrase>
 <phrase>
@@ -11163,16 +10965,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11180,16 +10979,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 према 1"
+    *: "6 према 1"
   </voice>
 </phrase>
 <phrase>
@@ -11197,16 +10993,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </dest>
   <voice>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </voice>
 </phrase>
 <phrase>
@@ -11259,16 +11052,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Брзина"
+    *: "Брзина"
   </dest>
   <voice>
-    *: none
-    swcodec: "Брзина"
+    *: "Брзина"
   </voice>
 </phrase>
 <phrase>
@@ -11290,16 +11080,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 према 1"
+    *: "4 према 1"
   </voice>
 </phrase>
 <phrase>
@@ -11406,16 +11193,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основни Skin"
+    *: "Основни Skin"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основни Skin"
+    *: "Основни Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11491,16 +11275,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основни скин на даљинском"
+    *: "Основни скин на даљинском"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основни скин на даљинском"
+    *: "Основни скин на даљинском"
   </voice>
 </phrase>
 <phrase>
@@ -11576,16 +11357,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Премотај уназад пре настављања"
+    *: "Премотај уназад пре настављања"
   </dest>
   <voice>
-    *: none
-    swcodec: "Премотај уназад пре настављања"
+    *: "Премотај уназад пре настављања"
   </voice>
 </phrase>
 <phrase>
@@ -11875,7 +11653,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12201,16 +11979,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Једноставан (Meier)"
+    *: "Једноставан (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Једноставан Мејеров"
+    *: "Једноставан Мејеров"
   </voice>
 </phrase>
 <phrase>
@@ -12246,16 +12021,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Подесиви"
+    *: "Подесиви"
   </dest>
   <voice>
-    *: none
-    swcodec: "Подесиви"
+    *: "Подесиви"
   </voice>
 </phrase>
 <phrase>
@@ -12384,16 +12156,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12418,16 +12187,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack време"
+    *: "Attack време"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack време"
+    *: "Attack време"
   </voice>
 </phrase>
 <phrase>
@@ -12511,16 +12277,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "САМО SIDE"
+    *: "САМО SIDE"
   </dest>
   <voice>
-    *: none
-    swcodec: "САМО SIDE"
+    *: "САМО SIDE"
   </voice>
 </phrase>
 <phrase>
@@ -12584,16 +12347,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -12649,16 +12409,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -12694,16 +12451,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -12725,16 +12479,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Редукција слушног замора"
+    *: "Редукција слушног замора"
   </dest>
   <voice>
-    *: none
-    swcodec: "Редукција слушног замора"
+    *: "Редукција слушног замора"
   </voice>
 </phrase>
 <phrase>
@@ -12773,16 +12524,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Однос Чист / Процесиран"
+    *: "Однос Чист / Процесиран"
   </dest>
   <voice>
-    *: none
-    swcodec: "Однос Чист / Процесиран"
+    *: "Однос Чист / Процесиран"
   </voice>
 </phrase>
 <phrase>
@@ -12804,16 +12552,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Перцептуално побољшавање басова"
+    *: "Перцептуално побољшавање басова"
   </dest>
   <voice>
-    *: none
-    swcodec: "Перцептуално побољшавање басова"
+    *: "Перцептуално побољшавање басова"
   </voice>
 </phrase>
 <phrase>
@@ -13276,16 +13021,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Via Track list"
+    *: "Via Track list"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Преко листе нумера"
+    *: "Преко листе нумера"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Преко листе нумера"
+    *: "Преко листе нумера"
   </voice>
 </phrase>
 <phrase>
@@ -13293,16 +13035,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "WPS Integration"
+    *: "WPS Integration"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "WPS интеграција"
+    *: "WPS интеграција"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "WPS интеграција"
+    *: "WPS интеграција"
   </voice>
 </phrase>
 <phrase>
@@ -13310,16 +13049,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Бела"
+    *: "Бела"
   </voice>
 </phrase>
 <phrase>
@@ -13327,16 +13063,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resume Game"
+    *: "Resume Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Настави игру"
+    *: "Настави игру"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Настави игру"
+    *: "Настави игру"
   </voice>
 </phrase>
 <phrase>
@@ -13344,16 +13077,13 @@
   desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Црна"
+    *: "Црна"
   </voice>
 </phrase>
 <phrase>
@@ -13361,16 +13091,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Always On"
+    *: "Always On"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Увек укључено"
+    *: "Увек укључено"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Увек укључено"
+    *: "Увек укључено"
   </voice>
 </phrase>
 <phrase>
@@ -13406,19 +13133,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Set resume time (min)"
     lowmem: none
-    swcodec: "Set resume time (min)"
   </source>
   <dest>
-    *: none
+    *: "Постави време настављања (мин)"
     lowmem: none
-    swcodec: "Постави време настављања (мин)"
   </dest>
   <voice>
-    *: none
+    *: "Постави време настављања"
     lowmem: none
-    swcodec: "Постави време настављања"
   </voice>
 </phrase>
 <phrase>
@@ -13426,16 +13150,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Diffusion"
+    *: "Diffusion"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Дифузија"
+    *: "Дифузија"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Дифузија"
+    *: "Дифузија"
   </voice>
 </phrase>
 <phrase>
@@ -13457,16 +13178,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arghs Per Food"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Аргхова по храни"
+    *: "Аргхова по храни"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Аргхова по храни"
+    *: "Аргхова по храни"
   </voice>
 </phrase>
 <phrase>
@@ -13474,19 +13192,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume automatically"
     lowmem: none
-    swcodec: "Resume automatically"
   </source>
   <dest>
-    *: none
+    *: "Настави аутоматски"
     lowmem: none
-    swcodec: "Настави аутоматски"
   </dest>
   <voice>
-    *: none
+    *: "Настави аутоматски"
     lowmem: none
-    swcodec: "Настави аутоматски"
   </voice>
 </phrase>
 <phrase>
@@ -13494,16 +13209,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 7: 40 moves / 240 min"
+    *: "Level 7: 40 moves / 240 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 7: 40 потеза / 240 мин"
+    *: "Ниво 7: 40 потеза / 240 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 7: 40 потеза за 240 мин"
+    *: "Ниво 7: 40 потеза за 240 мин"
   </voice>
 </phrase>
 <phrase>
@@ -13525,16 +13237,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Краљ"
+    *: "Краљ"
   </voice>
 </phrase>
 <phrase>
@@ -13542,16 +13251,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Топ"
+    *: "Топ"
   </voice>
 </phrase>
 <phrase>
@@ -13559,19 +13265,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Skip frames"
     lowmem: none
-    swcodec: "Skip frames"
   </source>
   <dest>
-    *: none
+    *: "Прескачи фрејмове"
     lowmem: none
-    swcodec: "Прескачи фрејмове"
   </dest>
   <voice>
-    *: none
+    *: "Прескачи фрејмове"
     lowmem: none
-    swcodec: "Прескачи фрејмове"
   </voice>
 </phrase>
 <phrase>
@@ -13579,16 +13282,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Играч"
+    *: "Играч"
   </voice>
 </phrase>
 <phrase>
@@ -13596,16 +13296,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album title"
+    *: "Show album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи наслов албума"
+    *: "Прикажи наслов албума"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи наслов албума"
+    *: "Прикажи наслов албума"
   </voice>
 </phrase>
 <phrase>
@@ -13669,16 +13366,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Argh Size"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Величина аргха"
+    *: "Величина аргха"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Величина аргха"
+    *: "Величина аргха"
   </voice>
 </phrase>
 <phrase>
@@ -13686,16 +13380,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шах!"
+    *: "Шах!"
   </voice>
 </phrase>
 <phrase>
@@ -13703,16 +13394,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cache will be rebuilt on next restart"
+    *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Кеш ће да се изради при наредном поновном покретању"
+    *: "Кеш ће да се изради при наредном поновном покретању"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Кеш ће да се изради при наредном поновном покретању"
+    *: "Кеш ће да се изради при наредном поновном покретању"
   </voice>
 </phrase>
 <phrase>
@@ -13720,16 +13408,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Playlist Cleared"
+    *: "Playlist Cleared"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Плејлиста је очишћена"
+    *: "Плејлиста је очишћена"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Плејлиста је очишћена"
+    *: "Плејлиста је очишћена"
   </voice>
 </phrase>
 <phrase>
@@ -13737,16 +13422,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 3: 60 moves / 30 min"
+    *: "Level 3: 60 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 3: 60 потеза / 30 мин"
+    *: "Ниво 3: 60 потеза / 30 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 3: 60 потеза за 30 minutes"
+    *: "Ниво 3: 60 потеза за 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13768,19 +13450,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Tone controls"
     lowmem: none
-    swcodec: "Tone controls"
   </source>
   <dest>
-    *: none
+    *: "Тонске контроле"
     lowmem: none
-    swcodec: "Тонске контроле"
   </dest>
   <voice>
-    *: none
+    *: "Тонске контроле"
     lowmem: none
-    swcodec: "Тонске контроле"
   </voice>
 </phrase>
 <phrase>
@@ -13802,16 +13481,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 4: 40 moves / 30 min"
+    *: "Level 4: 40 moves / 30 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 4: 40 потеза / 30 мин"
+    *: "Ниво 4: 40 потеза / 30 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 4: 40 потеза за 30 минута"
+    *: "Ниво 4: 40 потеза за 30 минута"
   </voice>
 </phrase>
 <phrase>
@@ -13819,16 +13495,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Clear playlist"
+    *: "Clear playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Очисти плејлисту"
+    *: "Очисти плејлисту"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Очисти плејлисту"
+    *: "Очисти плејлисту"
   </voice>
 </phrase>
 <phrase>
@@ -13850,16 +13523,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "краљичина страна"
+    *: "краљичина страна"
   </voice>
 </phrase>
 <phrase>
@@ -13881,16 +13551,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Checkmate!"
+    *: "Checkmate!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шах-мат!"
+    *: "Шах-мат!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шах-мат!"
+    *: "Шах-мат!"
   </voice>
 </phrase>
 <phrase>
@@ -13926,16 +13593,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Centre margin"
+    *: "Centre margin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Централна маргина"
+    *: "Централна маргина"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Централна маргина"
+    *: "Централна маргина"
   </voice>
 </phrase>
 <phrase>
@@ -13957,16 +13621,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 6: 40 moves / 120 min"
+    *: "Level 6: 40 moves / 120 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 6: 40 потеза / 120 мин"
+    *: "Ниво 6: 40 потеза / 120 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 6: 40 потеза за 120 minutes"
+    *: "Ниво 6: 40 потеза за 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13974,16 +13635,13 @@
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error parsing game !"
+    *: "Error parsing game !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Грешка при парсирању игре!"
+    *: "Грешка при парсирању игре!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Грешка при парсирању игре!"
+    *: "Грешка при парсирању игре!"
   </voice>
 </phrase>
 <phrase>
@@ -14019,19 +13677,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Play Mode"
     lowmem: none
-    swcodec: "Play Mode"
   </source>
   <dest>
-    *: none
+    *: "Режим репродукције"
     lowmem: none
-    swcodec: "Режим репродукције"
   </dest>
   <voice>
-    *: none
+    *: "Режим репродукције"
     lowmem: none
-    swcodec: "Режим репродукције"
   </voice>
 </phrase>
 <phrase>
@@ -14039,16 +13694,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Spacing"
+    *: "Spacing"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Размак"
+    *: "Размак"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Размак"
+    *: "Размак"
   </voice>
 </phrase>
 <phrase>
@@ -14056,16 +13708,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Games"
+    *: "Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Игре"
+    *: "Игре"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14073,16 +13722,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Saving position"
+    *: "Saving position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Чување позиције"
+    *: "Чување позиције"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Чување позиције"
+    *: "Чување позиције"
   </voice>
 </phrase>
 <phrase>
@@ -14090,16 +13736,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "краљева страна"
+    *: "краљева страна"
   </voice>
 </phrase>
 <phrase>
@@ -14107,16 +13750,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Speed"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Брзина црва"
+    *: "Брзина црва"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Брзина црва"
+    *: "Брзина црва"
   </voice>
 </phrase>
 <phrase>
@@ -14138,16 +13778,13 @@
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 2: 60 moves / 15 min"
+    *: "Level 2: 60 moves / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 2: 60 потеза / 15 мин"
+    *: "Ниво 2: 60 потеза / 15 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 2: 60 потеза за 15 минута"
+    *: "Ниво 2: 60 потеза за 15 минута"
   </voice>
 </phrase>
 <phrase>
@@ -14155,16 +13792,13 @@
   desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "ГНУ Шах"
+    *: "ГНУ Шах"
   </voice>
 </phrase>
 <phrase>
@@ -14172,16 +13806,13 @@
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Food Size"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Величина хране"
+    *: "Величина хране"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Величина хране"
+    *: "Величина хране"
   </voice>
 </phrase>
 <phrase>
@@ -14203,16 +13834,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Grayscale"
+    *: "Grayscale"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сиви тонови"
+    *: "Сиви тонови"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сиви тонови"
+    *: "Сиви тонови"
   </voice>
 </phrase>
 <phrase>
@@ -14220,16 +13848,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Краљица"
+    *: "Краљица"
   </voice>
 </phrase>
 <phrase>
@@ -14237,16 +13862,13 @@
   desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "хвата"
+    *: "хвата"
   </voice>
 </phrase>
 <phrase>
@@ -14268,16 +13890,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Slideshow Time"
+    *: "Slideshow Time"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Време слајд шоуа"
+    *: "Време слајд шоуа"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Време слајд шоуа"
+    *: "Време слајд шоуа"
   </voice>
 </phrase>
 <phrase>
@@ -14285,19 +13904,16 @@
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Resume Options"
     lowmem: none
-    swcodec: "Resume Options"
   </source>
   <dest>
-    *: none
+    *: "Опције настављања"
     lowmem: none
-    swcodec: "Опције настављања"
   </dest>
   <voice>
-    *: none
+    *: "Опције настављања"
     lowmem: none
-    swcodec: "Опције настављања"
   </voice>
 </phrase>
 <phrase>
@@ -14305,16 +13921,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "New Game"
+    *: "New Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Нова игра"
+    *: "Нова игра"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Нова игра"
+    *: "Нова игра"
   </voice>
 </phrase>
 <phrase>
@@ -14322,16 +13935,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "View Played Games"
+    *: "View Played Games"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Преглед одиграних игара"
+    *: "Преглед одиграних игара"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Преглед одиграних игара"
+    *: "Преглед одиграних игара"
   </voice>
 </phrase>
 <phrase>
@@ -14339,19 +13949,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Surround"
     lowmem: none
-    swcodec: "Surround"
   </source>
   <dest>
-    *: none
+    *: "Окружујуће"
     lowmem: none
-    swcodec: "Окружујуће"
   </dest>
   <voice>
-    *: none
+    *: "Окружујуће"
     lowmem: none
-    swcodec: "Окружујуће"
   </voice>
 </phrase>
 <phrase>
@@ -14401,19 +14008,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Play from beginning"
     lowmem: none
-    swcodec: "Play from beginning"
   </source>
   <dest>
-    *: none
+    *: "Играј од почетка"
     lowmem: none
-    swcodec: "Играј од почетка"
   </dest>
   <voice>
-    *: none
+    *: "Играј од почетка"
     lowmem: none
-    swcodec: "Играј од почетка"
   </voice>
 </phrase>
 <phrase>
@@ -14421,16 +14025,13 @@
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restart Game"
+    *: "Restart Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Поново покрени игру"
+    *: "Поново покрени игру"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Поново покрени игру"
+    *: "Поново покрени игру"
   </voice>
 </phrase>
 <phrase>
@@ -14438,16 +14039,13 @@
   desc: cannot restart playback splash in imageviewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Cannot restart playback"
+    *: "Cannot restart playback"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Приказивање не може поново да се покрене"
+    *: "Приказивање не може поново да се покрене"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Приказивање не може поново да се покрене"
+    *: "Приказивање не може поново да се покрене"
   </voice>
 </phrase>
 <phrase>
@@ -14469,19 +14067,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Use common setting"
     lowmem: none
-    swcodec: "Use common setting"
   </source>
   <dest>
-    *: none
+    *: "Користи уобичајено подешавање"
     lowmem: none
-    swcodec: "Користи уобичајено подешавање"
   </dest>
   <voice>
-    *: none
+    *: "Користи уобичајено подешавање"
     lowmem: none
-    swcodec: "Користи уобичајено подешавање"
   </voice>
 </phrase>
 <phrase>
@@ -14517,16 +14112,13 @@
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Ordered"
+    *: "Ordered"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Поређано"
+    *: "Поређано"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Поређано"
+    *: "Поређано"
   </voice>
 </phrase>
 <phrase>
@@ -14534,16 +14126,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the top"
+    *: "Show at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи на врху"
+    *: "Прикажи на врху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи на врху"
+    *: "Прикажи на врху"
   </voice>
 </phrase>
 <phrase>
@@ -14551,16 +14140,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ловац"
+    *: "Ловац"
   </voice>
 </phrase>
 <phrase>
@@ -14568,16 +14154,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Пијун"
+    *: "Пијун"
   </voice>
 </phrase>
 <phrase>
@@ -14585,16 +14168,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Resize Covers"
+    *: "Resize Covers"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Промени величину омота"
+    *: "Промени величину омота"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Промени величину омота"
+    *: "Промени величину омота"
   </voice>
 </phrase>
 <phrase>
@@ -14616,16 +14196,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Zoom"
+    *: "Zoom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Зум"
+    *: "Зум"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Зум"
+    *: "Зум"
   </voice>
 </phrase>
 <phrase>
@@ -14633,19 +14210,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Interpolation"
     lowmem: none
-    swcodec: "Interpolation"
   </source>
   <dest>
-    *: none
+    *: "Интерполација"
     lowmem: none
-    swcodec: "Интерполација"
   </dest>
   <voice>
-    *: none
+    *: "Интерполација"
     lowmem: none
-    swcodec: "Интерполација"
   </voice>
 </phrase>
 <phrase>
@@ -14681,16 +14255,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Loading position"
+    *: "Loading position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Учитавање позиције"
+    *: "Учитавање позиције"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Учитавање позиције"
+    *: "Учитавање позиције"
   </voice>
 </phrase>
 <phrase>
@@ -14698,16 +14269,13 @@
   desc: in the pictureflow main menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Go to WPS"
+    *: "Go to WPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Иди на WPS"
+    *: "Иди на WPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Иди на WPS"
+    *: "Иди на WPS"
   </voice>
 </phrase>
 <phrase>
@@ -14715,19 +14283,16 @@
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "CPU Boost"
     lowmem: none
-    swcodec: "CPU Boost"
   </source>
   <dest>
-    *: none
+    *: "CPU убрзање"
     lowmem: none
-    swcodec: "CPU убрзање"
   </dest>
   <voice>
-    *: none
+    *: "CPU убрзање"
     lowmem: none
-    swcodec: "CPU убрзање"
   </voice>
 </phrase>
 <phrase>
@@ -14735,16 +14300,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show at the bottom"
+    *: "Show at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи на дну"
+    *: "Прикажи на дну"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи на дну"
+    *: "Прикажи на дну"
   </voice>
 </phrase>
 <phrase>
@@ -14752,16 +14314,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide album title"
+    *: "Hide album title"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сакриј наслов албума"
+    *: "Сакриј наслов албума"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сакриј наслов албума"
+    *: "Сакриј наслов албума"
   </voice>
 </phrase>
 <phrase>
@@ -14769,19 +14328,16 @@
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Limit FPS"
     lowmem: none
-    swcodec: "Limit FPS"
   </source>
   <dest>
-    *: none
+    *: "Ограничи FPS"
     lowmem: none
-    swcodec: "Ограничи FPS"
   </dest>
   <voice>
-    *: none
+    *: "Ограничи FPS"
     lowmem: none
-    swcodec: "Ограничи FPS"
   </voice>
 </phrase>
 <phrase>
@@ -14789,16 +14345,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No album art found"
+    *: "No album art found"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Није пронађена ниједна слика албума"
+    *: "Није пронађена ниједна слика албума"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Није пронађена ниједна слика албума"
+    *: "Није пронађена ниједна слика албума"
   </voice>
 </phrase>
 <phrase>
@@ -14834,16 +14387,13 @@
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Rebuild cache"
+    *: "Rebuild cache"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Поново изгради кеш"
+    *: "Поново изгради кеш"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Поново изгради кеш"
+    *: "Поново изгради кеш"
   </voice>
 </phrase>
 <phrase>
@@ -14865,16 +14415,13 @@
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Коњ"
+    *: "Коњ"
   </voice>
 </phrase>
 <phrase>
@@ -14882,16 +14429,13 @@
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Illegal move!"
+    *: "Illegal move!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Недозвољен потез!"
+    *: "Недозвољен потез!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Недозвољен потез!"
+    *: "Недозвољен потез!"
   </voice>
 </phrase>
 <phrase>
@@ -14899,16 +14443,13 @@
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Added to playlist"
+    *: "Added to playlist"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Додато у плејлисту"
+    *: "Додато у плејлисту"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Додато у плејлисту"
+    *: "Додато у плејлисту"
   </voice>
 </phrase>
 <phrase>
@@ -14916,16 +14457,13 @@
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Direct"
+    *: "Direct"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Директно"
+    *: "Директно"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Директно"
+    *: "Директно"
   </voice>
 </phrase>
 <phrase>
@@ -14933,23 +14471,20 @@
   desc: in mpegplayer settings
   user: core
   <source>
-    *: none
+    *: "Unavailable"
     lowmem: none
-    swcodec: "Unavailable"
   </source>
   <dest>
-    *: none
+    *: "Недоступно"
     lowmem: none
-    swcodec: "Недоступно"
   </dest>
   <voice>
-    *: none
+    *: "Недоступно"
     lowmem: none
-    swcodec: "Недоступно"
   </voice>
 </phrase>
 <phrase>
-id: VOICE_BAT_BENCH_KEYS
+  id: VOICE_BAT_BENCH_KEYS
   desc: Battery bench start up message
   user: core
   <source>
@@ -14967,19 +14502,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Use sound setting"
     lowmem: none
-    swcodec: "Use sound setting"
   </source>
   <dest>
-    *: none
+    *: "Користи подешавање звука"
     lowmem: none
-    swcodec: "Користи подешавање звука"
   </dest>
   <voice>
-    *: none
+    *: "Користи подешавање звука"
     lowmem: none
-    swcodec: "Користи подешавање звука"
   </voice>
 </phrase>
 <phrase>
@@ -15001,19 +14533,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Reverberation"
     lowmem: none
-    swcodec: "Reverberation"
   </source>
   <dest>
-    *: none
+    *: "Реверберација"
     lowmem: none
-    swcodec: "Реверберација"
   </dest>
   <voice>
-    *: none
+    *: "Реверберација"
     lowmem: none
-    swcodec: "Реверберација"
   </voice>
 </phrase>
 <phrase>
@@ -15021,19 +14550,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Panning Separation"
     lowmem: none
-    swcodec: "Panning Separation"
   </source>
   <dest>
-    *: none
+    *: "Сепарација панирања"
     lowmem: none
-    swcodec: "Сепарација панирања"
   </dest>
   <voice>
-    *: none
+    *: "Сепарација панирања"
     lowmem: none
-    swcodec: "Сепарација панирања"
   </voice>
 </phrase>
 <phrase>
@@ -15055,16 +14581,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 8: 1 move / 15 min"
+    *: "Level 8: 1 move / 15 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 8: 1 потез / 15 минута"
+    *: "Ниво 8: 1 потез / 15 минута"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 8: 1 потез за 15 минута"
+    *: "Ниво 8: 1 потез за 15 минута"
   </voice>
 </phrase>
 <phrase>
@@ -15072,19 +14595,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Clear all resumes"
     lowmem: none
-    swcodec: "Clear all resumes"
   </source>
   <dest>
-    *: none
+    *: "Очисти сва настављања"
     lowmem: none
-    swcodec: "Очисти сва настављања"
   </dest>
   <voice>
-    *: none
+    *: "Очисти сва настављања"
     lowmem: none
-    swcodec: "Очисти сва настављања"
   </voice>
 </phrase>
 <phrase>
@@ -15092,16 +14612,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Restore Game"
+    *: "Restore Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Врати игру"
+    *: "Врати игру"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Врати игру"
+    *: "Врати игру"
   </voice>
 </phrase>
 <phrase>
@@ -15109,19 +14626,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu"
     lowmem: none
-    swcodec: "Start menu"
   </source>
   <dest>
-    *: none
+    *: "Старт мени"
     lowmem: none
-    swcodec: "Старт мени"
   </dest>
   <voice>
-    *: none
+    *: "Старт мени"
     lowmem: none
-    swcodec: "Старт мени"
   </voice>
 </phrase>
 <phrase>
@@ -15129,16 +14643,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "No games found !"
+    *: "No games found !"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Није пронађена ниједна игра!"
+    *: "Није пронађена ниједна игра!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Није пронађена ниједна игра!"
+    *: "Није пронађена ниједна игра!"
   </voice>
 </phrase>
 <phrase>
@@ -15146,16 +14657,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 5: 40 moves / 60 min"
+    *: "Level 5: 40 moves / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 5: 40 потеза / 60 мин"
+    *: "Ниво 5: 40 потеза / 60 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 5: 40 потеза за 60 минута"
+    *: "Ниво 5: 40 потеза за 60 минута"
   </voice>
 </phrase>
 <phrase>
@@ -15163,16 +14671,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Worm Growth Per Food"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Раст црва по храни"
+    *: "Раст црва по храни"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Раст црва по храни"
+    *: "Раст црва по храни"
   </voice>
 </phrase>
 <phrase>
@@ -15180,16 +14685,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Витез"
+    *: "Витез"
   </voice>
 </phrase>
 <phrase>
@@ -15211,16 +14713,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the beginning of the game"
+    *: "At the beginning of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "На почетку игре"
+    *: "На почетку игре"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "На почетку игре"
+    *: "На почетку игре"
   </voice>
 </phrase>
 <phrase>
@@ -15228,19 +14727,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Single"
     lowmem: none
-    swcodec: "Single"
   </source>
   <dest>
-    *: none
+    *: "Сингл"
     lowmem: none
-    swcodec: "Сингл"
   </dest>
   <voice>
-    *: none
+    *: "Сингл"
     lowmem: none
-    swcodec: "Сингл"
   </voice>
 </phrase>
 <phrase>
@@ -15262,16 +14758,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of Worms"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Број црва"
+    *: "Број црва"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Број црва"
+    *: "Број црва"
   </voice>
 </phrase>
 <phrase>
@@ -15279,16 +14772,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15296,16 +14786,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer and pictureflow settings menus
   user: core
   <source>
-    *: none
-    lcd_bitmap,swcodec: "Display FPS"
+    *: "Display FPS"
   </source>
   <dest>
-    *: none
-    lcd_bitmap,swcodec: "Прикажи FPS"
+    *: "Прикажи FPS"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap,swcodec: "Прикажи FPS"
+    *: "Прикажи FPS"
   </voice>
 </phrase>
 <phrase>
@@ -15327,19 +14814,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Start menu if not completed"
     lowmem: none
-    swcodec: "Start menu if not completed"
   </source>
   <dest>
-    *: none
+    *: "Старт мени ако није завршено"
     lowmem: none
-    swcodec: "Старт мени ако није завршено"
   </dest>
   <voice>
-    *: none
+    *: "Старт мени ако није завршено"
     lowmem: none
-    swcodec: "Старт мени ако није завршено"
   </voice>
 </phrase>
 <phrase>
@@ -15347,16 +14831,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game viewer
   user: core
   <source>
-    *: none
-    lcd_bitmap: "At the end of the game"
+    *: "At the end of the game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "На крај игре"
+    *: "На крај игре"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "На крај игре"
+    *: "На крај игре"
   </voice>
 </phrase>
 <phrase>
@@ -15406,16 +14887,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow splash messages
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Error writing config"
+    *: "Error writing config"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Грешка при упису конфигурације"
+    *: "Грешка при упису конфигурације"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Грешка при упису конфигурације"
+    *: "Грешка при упису конфигурације"
   </voice>
 </phrase>
 <phrase>
@@ -15423,16 +14901,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in chessbox
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thinking..."
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Мислим..."
+    *: "Мислим..."
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15440,16 +14915,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the imageviewer settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Toggle Slideshow Mode"
+    *: "Toggle Slideshow Mode"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Преклапај слајдшоу режим"
+    *: "Преклапај слајдшоу режим"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Преклапај слајдшоу режим"
+    *: "Преклапај слајдшоу режим"
   </voice>
 </phrase>
 <phrase>
@@ -15457,16 +14929,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Save Game"
+    *: "Save Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сачувај игру"
+    *: "Сачувај игру"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сачувај игру"
+    *: "Сачувај игру"
   </voice>
 </phrase>
 <phrase>
@@ -15474,16 +14943,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 10: 1 move / 600 min"
+    *: "Level 10: 1 move / 600 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 10: 1 потез / 600 мин"
+    *: "Ниво 10: 1 потез / 600 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 10: 1 потез за 600 минута"
+    *: "Ниво 10: 1 потез за 600 минута"
   </voice>
 </phrase>
 <phrase>
@@ -15491,16 +14957,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Number of slides"
+    *: "Number of slides"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Број слајдова"
+    *: "Број слајдова"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Број слајдова"
+    *: "Број слајдова"
   </voice>
 </phrase>
 <phrase>
@@ -15508,19 +14971,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mpegplayer menus
   user: core
   <source>
-    *: none
+    *: "Audio Options"
     lowmem: none
-    swcodec: "Audio Options"
   </source>
   <dest>
-    *: none
+    *: "Аудио опције"
     lowmem: none
-    swcodec: "Аудио опције"
   </dest>
   <voice>
-    *: none
+    *: "Аудио опције"
     lowmem: none
-    swcodec: "Аудио опције"
   </voice>
 </phrase>
 <phrase>
@@ -15528,16 +14988,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: spoken only, for announcing chess piece unmarking
   user: core
   <source>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Уклоњен маркер"
+    *: "Уклоњен маркер"
   </voice>
 </phrase>
 <phrase>
@@ -15545,17 +15002,14 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 1: 60 moves / 5 min"
+    *: "Level 1: 60 moves / 5 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 1: 60 потеза / 5 мин"
+    *: "Ниво 1: 60 потеза / 5 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 1: 60 потеза за 5 минута"
-</voice>
+    *: "Ниво 1: 60 потеза за 5 минута"
+  </voice>
 </phrase>
 <phrase>
   id: LANG_CONTROL_STYLE
@@ -15576,19 +15030,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the mpegplayer settings menu
   user: core
   <source>
-    *: none
+    *: "Backlight brightness"
     lowmem: none
-    swcodec: "Backlight brightness"
   </source>
   <dest>
-    *: none
+    *: "Јачина позадинског светла"
     lowmem: none
-    swcodec: "Јачина позадинског светла"
   </dest>
   <voice>
-    *: none
+    *: "Јачина позадинског светла"
     lowmem: none
-    swcodec: "Јачина позадинског светла"
   </voice>
 </phrase>
 <phrase>
@@ -15596,16 +15047,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox game level selection
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Level 9: 1 move / 60 min"
+    *: "Level 9: 1 move / 60 min"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ниво 9: 1 потез / 60 мин"
+    *: "Ниво 9: 1 потез / 60 мин"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ниво 9: 1 потез за 60 минута"
+    *: "Ниво 9: 1 потез за 60 минута"
   </voice>
 </phrase>
 <phrase>
@@ -15613,16 +15061,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Play Wormlet!"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Играј Вормлет!"
+    *: "Играј Вормлет!"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Играј Вормлет!!"
+    *: "Играј Вормлет!!"
   </voice>
 </phrase>
 <phrase>
@@ -15630,16 +15075,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the chessbox menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Select Other Game"
+    *: "Select Other Game"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Избор друге игре"
+    *: "Избор друге игре"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Избор друге игре"
+    *: "Избор друге игре"
   </voice>
 </phrase>
 <phrase>
@@ -15706,16 +15148,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hide information"
+    *: "Hide information"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Сакриј информације"
+    *: "Сакриј информације"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Сакриј информације"
+    *: "Сакриј информације"
   </voice>
 </phrase>
 <phrase>
@@ -15723,16 +15162,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the bottom"
+    *: "Show album at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи албум на дну"
+    *: "Прикажи албум на дну"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи албум на дну"
+    *: "Прикажи албум на дну"
   </voice>
 </phrase>
 <phrase>
@@ -15740,16 +15176,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the bottom"
+    *: "Show album and artist at the bottom"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи албум и извођача на дну"
+    *: "Прикажи албум и извођача на дну"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи албум и извођача на дну"
+    *: "Прикажи албум и извођача на дну"
   </voice>
 </phrase>
 <phrase>
@@ -15757,16 +15190,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album and artist at the top"
+    *: "Show album and artist at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи албум и извођача на врху"
+    *: "Прикажи албум и извођача на врху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи албум и извођача на врху"
+    *: "Прикажи албум и извођача на врху"
   </voice>
 </phrase>
 <phrase>
@@ -15774,16 +15204,13 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in the pictureflow settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Show album at the top"
+    *: "Show album at the top"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прикажи албум на врху"
+    *: "Прикажи албум на врху"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прикажи албум на врху"
+    *: "Прикажи албум на врху"
   </voice>
 </phrase>
 <phrase>
@@ -15791,19 +15218,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "HQ Mixer"
     lowmem: none
-    swcodec: "HQ Mixer"
   </source>
   <dest>
-    *: none
+    *: "ВК миксер"
     lowmem: none
-    swcodec: "ВК миксер"
   </dest>
   <voice>
-    *: none
+    *: "Миксер високог квалитета"
     lowmem: none
-    swcodec: "Миксер високог квалитета"
   </voice>
 </phrase>
 <phrase>
@@ -15980,19 +15404,16 @@ id: VOICE_BAT_BENCH_KEYS
   desc: in mikmod settings menu
   user: core
   <source>
-    *: none
+    *: "Sample Rate"
     lowmem: none
-    swcodec: "Sample Rate"
   </source>
   <dest>
-    *: none
+    *: "Учестаност узорковања"
     lowmem: none
-    swcodec: "Учестаност узорковања"
   </dest>
   <voice>
-    *: none
+    *: "Учестаност узорковања"
     lowmem: none
-    swcodec: "Учестаност узорковања"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index bbf0636d37..ae829b3382 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -252,23 +252,23 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "SPELA = Ja"
+    archosplayer: "SPELA/STOPP"
     cowond2*: "MENY, eller överst-höger = Ja"
+    creativezen*: "Välj = Ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "VÄLJ = Ja"
     iriverh100,iriverh120,iriverh300: "NAVI = Ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "VÄLJ = Ja"
     mrobe500: "SPELA, PÅ/AV, eller överst-höger = Ja"
-    archosplayer: "SPELA/STOPP"
     vibe500: "OK = Ja"
-    creativezen*: "Välj = Ja"
   </dest>
   <voice>
     *: ""
@@ -823,16 +823,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Korsmixa"
+    *: "Korsmixa"
   </dest>
   <voice>
-    *: none
-    swcodec: "Korsmixa"
+    *: "Korsmixa"
   </voice>
 </phrase>
 <phrase>
@@ -840,16 +837,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direkt dämpning"
+    *: "Direkt dämpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direkt dämpning"
+    *: "Direkt dämpning"
   </voice>
 </phrase>
 <phrase>
@@ -857,16 +851,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Korsdämpning"
+    *: "Korsdämpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Korsdämpning"
+    *: "Korsdämpning"
   </voice>
 </phrase>
 <phrase>
@@ -874,16 +865,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Högfrekvensdämpning"
+    *: "Högfrekvensdämpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Högfrekvensdämpning"
+    *: "Högfrekvensdämpning"
   </voice>
 </phrase>
 <phrase>
@@ -891,16 +879,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Högfrekvensgräns"
+    *: "Högfrekvensgräns"
   </dest>
   <voice>
-    *: none
-    swcodec: "Högfrekvensgräns"
+    *: "Högfrekvensgräns"
   </voice>
 </phrase>
 <phrase>
@@ -908,16 +893,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -925,16 +907,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Aktivera EQ"
+    *: "Aktivera EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aktivera equalizer"
+    *: "Aktivera equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -942,16 +921,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Parametrisk EQ"
+    *: "Parametrisk EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Parametrisk equalizer"
+    *: "Parametrisk equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -959,16 +935,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Dämpning"
+    *: "Dämpning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Fördämpning"
+    *: "Fördämpning"
   </voice>
 </phrase>
 <phrase>
@@ -976,16 +949,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Enkla EQ-inställnngar"
+    *: "Enkla EQ-inställnngar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enkla equalizerinställningar"
+    *: "Enkla equalizerinställningar"
   </voice>
 </phrase>
 <phrase>
@@ -993,16 +963,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Avancerade EQ-inställningar"
+    *: "Avancerade EQ-inställningar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Avancerade equalizerinställningar"
+    *: "Avancerade equalizerinställningar"
   </voice>
 </phrase>
 <phrase>
@@ -1010,16 +977,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Spara EQ-inställningar"
+    *: "Spara EQ-inställningar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spara equalizerinställningar"
+    *: "Spara equalizerinställningar"
   </voice>
 </phrase>
 <phrase>
@@ -1027,16 +991,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Lista EQ-inställningar"
+    *: "Lista EQ-inställningar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lista equalizerinställningar"
+    *: "Lista equalizerinställningar"
   </voice>
 </phrase>
 <phrase>
@@ -1044,16 +1005,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Läge: %s"
+    *: "Läge: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1061,16 +1019,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz bandförstärkning"
+    *: "%d Hz bandförstärkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz bandförstärkning"
+    *: "hertz bandförstärkning"
   </voice>
 </phrase>
 <phrase>
@@ -1078,16 +1033,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low shelf-filter"
+    *: "Low shelf-filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1095,16 +1047,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Peak-filter %d"
+    *: "Peak-filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -1112,16 +1061,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High shelf-filter"
+    *: "High shelf-filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1129,16 +1075,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Brytfrekvens"
+    *: "Brytfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Brytfrekvens"
+    *: "Brytfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -1146,16 +1089,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Mittfrekvens"
+    *: "Mittfrekvens"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mittfrekvens"
+    *: "Mittfrekvens"
   </voice>
 </phrase>
 <phrase>
@@ -1163,16 +1103,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1180,16 +1117,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1733,16 +1667,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Förhindra klippning"
+    *: "Förhindra klippning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Förhindra klippning"
+    *: "Förhindra klippning"
   </voice>
 </phrase>
 <phrase>
@@ -1820,16 +1751,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Pip vid spårhopp"
+    *: "Pip vid spårhopp"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pip vid spårhopp"
+    *: "Pip vid spårhopp"
   </voice>
 </phrase>
 <phrase>
@@ -1837,16 +1765,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Svagt"
+    *: "Svagt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Svagt"
+    *: "Svagt"
   </voice>
 </phrase>
 <phrase>
@@ -1854,16 +1779,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Mellan"
+    *: "Mellan"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mellan"
+    *: "Mellan"
   </voice>
 </phrase>
 <phrase>
@@ -1871,16 +1793,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Starkt"
+    *: "Starkt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Starkt"
+    *: "Starkt"
   </voice>
 </phrase>
 <phrase>
@@ -2237,21 +2156,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Skapar databas... %d hittade (AV = Återgå)"
-    iriverh100,iriverh120,iriverh300: "Skapar databas... %d hittade (STOPP = Återgå)"
-    ipod*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
-    gogearsa9200: "Skapar databas... %d hittade (REW = Återgå)"
     archosplayer: "Skapar DB %d hittade"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Skapar databas... %d hittade (VÄNSTER = Återgå)"
+    gogearsa9200: "Skapar databas... %d hittade (REW = Återgå)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)"
+    iriverh100,iriverh120,iriverh300: "Skapar databas... %d hittade (STOPP = Återgå)"
   </dest>
   <voice>
     *: "objekt hittade för databasen"
@@ -2433,16 +2350,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Teckensnitt"
+    *: "Teckensnitt"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Teckensnitt"
+    *: "Teckensnitt"
   </voice>
 </phrase>
 <phrase>
@@ -2704,16 +2618,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Upp och ner"
+    *: "Upp och ner"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upp och ned"
+    *: "Upp och ned"
   </voice>
 </phrase>
 <phrase>
@@ -2721,16 +2632,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Radmarkör"
+    *: "Radmarkör"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Radmarkör"
+    *: "Radmarkör"
   </voice>
 </phrase>
 <phrase>
@@ -2738,16 +2646,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pekare"
+    *: "Pekare"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pekare"
+    *: "Pekare"
   </voice>
 </phrase>
 <phrase>
@@ -2755,16 +2660,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Inverterad rad"
+    *: "Inverterad rad"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverterad rad"
+    *: "Inverterad rad"
   </voice>
 </phrase>
 <phrase>
@@ -3054,16 +2956,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Skärmen rullar ur sikte"
+    *: "Skärmen rullar ur sikte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Skärmen rullar ur sikte"
+    *: "Skärmen rullar ur sikte"
   </voice>
 </phrase>
 <phrase>
@@ -3071,16 +2970,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Storlek på skärmrullningssteg"
+    *: "Storlek på skärmrullningssteg"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Storlek på skärmrullningssteg"
+    *: "Storlek på skärmrullningssteg"
   </voice>
 </phrase>
 <phrase>
@@ -3136,16 +3032,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/rullningslist"
+    *: "Status-/rullningslist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- och rullningslist"
+    *: "Status- och rullningslist"
   </voice>
 </phrase>
 <phrase>
@@ -3153,16 +3046,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Rullningslist"
+    *: "Rullningslist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Rullningslist"
+    *: "Rullningslist"
   </voice>
 </phrase>
 <phrase>
@@ -3170,16 +3060,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statuslist"
+    *: "Statuslist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statuslist"
+    *: "Statuslist"
   </voice>
 </phrase>
 <phrase>
@@ -3204,16 +3091,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volymvisning"
+    *: "Volymvisning"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volymvisning"
+    *: "Volymvisning"
   </voice>
 </phrase>
 <phrase>
@@ -3221,16 +3105,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterivisning"
+    *: "Batterivisning"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterivisning"
+    *: "Batterivisning"
   </voice>
 </phrase>
 <phrase>
@@ -3238,16 +3119,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisk"
+    *: "Grafisk"
   </voice>
 </phrase>
 <phrase>
@@ -3255,16 +3133,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numerisk"
+    *: "Numerisk"
   </voice>
 </phrase>
 <phrase>
@@ -3484,16 +3359,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreiska (ISO-8859-8)"
+    *: "Hebreiska (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreiska"
+    *: "Hebreiska"
   </voice>
 </phrase>
 <phrase>
@@ -3515,16 +3387,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thailändska (ISO-8859-11)"
+    *: "Thailändska (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thailändska"
+    *: "Thailändska"
   </voice>
 </phrase>
 <phrase>
@@ -3532,16 +3401,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabiska (CP1256)"
+    *: "Arabiska (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabiska"
+    *: "Arabiska"
   </voice>
 </phrase>
 <phrase>
@@ -3577,16 +3443,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanska (SJIS)"
+    *: "Japanska (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanska"
+    *: "Japanska"
   </voice>
 </phrase>
 <phrase>
@@ -3594,16 +3457,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Förenklad kinesiska (GB2312)"
+    *: "Förenklad kinesiska (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Förenklad kinesiska"
+    *: "Förenklad kinesiska"
   </voice>
 </phrase>
 <phrase>
@@ -3611,16 +3471,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreanska (KSX1001)"
+    *: "Koreanska (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreanska"
+    *: "Koreanska"
   </voice>
 </phrase>
 <phrase>
@@ -3628,16 +3485,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traditionell kinesiska (BIG5)"
+    *: "Traditionell kinesiska (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditionell kinesiska"
+    *: "Traditionell kinesiska"
   </voice>
 </phrase>
 <phrase>
@@ -3661,17 +3515,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knappbelysning"
-    sansafuze*,sansae200*: "Hjulbelysning"
+    sansae200*,sansafuze*: "Hjulbelysning"
   </dest>
   <voice>
     *: none
     button_light: "Knappbelysning"
-    sansafuze*,sansae200*: "Hjulbelysning"
+    sansae200*,sansafuze*: "Hjulbelysning"
   </voice>
 </phrase>
 <phrase>
@@ -3942,27 +3796,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "PÅ = Ställ"
-    mrobe500: "HJÄRTA = Ställ"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ställ"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "VÄLJ = Ställ"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "VÄLJ = Ställ"
     gogearsa9200,samsungyh*: "SPELA = Ställ"
-    vibe500: "OK = Ställ"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ställ"
     mpiohd300: "ENTER = Ställ"
+    mrobe500: "HJÄRTA = Ställ"
+    rtc: "PÅ = Ställ"
+    vibe500: "OK = Ställ"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3971,38 +3825,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "AV = Avbryt"
-    mrobe500: "PÅ/AV = Avbryt"
-    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
-    ipod*,sansac200*,mpiohd300: "MENY = Avbryt"
-    iaudiox5,iaudiom5: "SPELA IN = Avbryt"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FÖREGÅENDE = Avbryt"
-    gigabeatfx: "PÅ/AV = Avbryt"
-    mrobe100: "VISA = Avbryt"
+    gigabeatfx,mrobe500: "PÅ/AV = Avbryt"
     gigabeats: "BAKÅT = Avbryt"
     gogearsa9200: "VÄNSTER = Avbryt"
-    vibe500: "C = Avbryt"
+    iaudiom5,iaudiox5: "SPELA IN = Avbryt"
+    ipod*,mpiohd300,sansac200*: "MENY = Avbryt"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FÖREGÅENDE = Avbryt"
+    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
+    mrobe100: "VISA = Avbryt"
+    rtc: "AV = Avbryt"
     samsungyh*: "REW = Avbryt"
+    vibe500: "C = Avbryt"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4488,22 +4339,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "SPELA=Sätt AV=Avbryt"
+    gigabeats: "VÄLJ=Sätt PÅ/AV=Avbryt"
     ipod*: "VÄLJ=Sätt MENY=Avbryt"
     iriverh10,iriverh10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt"
-    gigabeats: "VÄLJ=Sätt PÅ/AV=Avbryt"
-    vibe500: "OK=Sätt C=Avbryt"
     mpiohd300: "ENTER=Sätt MENU=Avbryt"
     sansafuzeplus: "SELECT=Sätt  BACK=Avbryt"
+    vibe500: "OK=Sätt C=Avbryt"
   </dest>
   <voice>
     *: none
@@ -5608,15 +5459,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frekvens"
+    play_frequency,recording: "Frekvens"
   </voice>
 </phrase>
 <phrase>
@@ -5659,18 +5510,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </dest>
   <voice>
     *: none
-    recording: "Mikrofon"
     iriverh100,iriverh120,iriverh300: "Intern mikrofon"
+    recording: "Mikrofon"
   </voice>
 </phrase>
 <phrase>
@@ -6548,13 +6399,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batteri: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterinivå"
@@ -6611,24 +6462,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mikro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mikro S D"
     xduoox3: "mikro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7943,23 +7794,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Disken är full. Tryck AV för att fortsätta."
-    iriverh100,iriverh120,iriverh300: "Disken är full. Tryck STOPP för att fortsätta."
     iaudiom5,iaudiox5: "Disken är full. Tryck PÅ/AV för att fortsätta."
-    sansae200*,sansac200*,vibe500: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
+    iriverh100,iriverh120,iriverh300: "Disken är full. Tryck STOPP för att fortsätta."
+    recording: "Disken är full. Tryck AV för att fortsätta."
     samsungyh*: "Disken är full. Tryck LEFT för att fortsätta."
+    sansac200*,sansae200*,vibe500: "Disken är full. Tryck FÖREGÅENDE för att fortsätta."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8047,22 +7898,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "AV = 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"
-    gigabeats: "BAKÅT = Avbryt"
     gigabeatfx: "PÅ/AV = Avbryt"
+    gigabeats: "BAKÅT = Avbryt"
+    iaudiom5,iaudiox5: "Lång SPELA = Avbryt"
+    ipod*: "SPELA/PAUSA = Avbryt"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "FÖREGÅENDE = Avbryt"
+    iriverh100,iriverh120,iriverh300: "STOPP = Avbryt"
   </dest>
   <voice>
     *: ""
@@ -9614,7 +9464,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9656,16 +9506,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Läge: %s %s"
+    *: "Läge: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9673,16 +9520,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Brytpunkt"
+    *: "Brytpunkt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Brytpunkt"
+    *: "Brytpunkt"
   </voice>
 </phrase>
 <phrase>
@@ -9690,16 +9534,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Först."
+    *: "Först."
   </dest>
   <voice>
-    *: none
-    swcodec: "Först."
+    *: "Först."
   </voice>
 </phrase>
 <phrase>
@@ -9707,16 +9548,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Läge:"
+    *: "Läge:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10345,7 +10183,7 @@
     multivolume: "Inget"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10379,15 +10217,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basgräns"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Basgräns"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Basgräns"
   </voice>
 </phrase>
 <phrase>
@@ -10396,15 +10234,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgräns"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Diskantgräns"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Diskantgräns"
   </voice>
 </phrase>
 <phrase>
@@ -10440,16 +10278,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Knappljud"
+    *: "Knappljud"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knappljud"
+    *: "Knappljud"
   </voice>
 </phrase>
 <phrase>
@@ -10457,16 +10292,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Knappljud vid repetition"
+    *: "Knappljud vid repetition"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knappljud vid repetition"
+    *: "Knappljud vid repetition"
   </voice>
 </phrase>
 <phrase>
@@ -10587,11 +10419,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Seriell hastighet"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Seriell hastighet"
   </voice>
@@ -10604,11 +10436,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatisk"
   </voice>
@@ -10621,11 +10453,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10638,11 +10470,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10655,11 +10487,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10672,11 +10504,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11199,16 +11031,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11216,16 +11045,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Hastighet"
+    *: "Hastighet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hastighet"
+    *: "Hastighet"
   </voice>
 </phrase>
 <phrase>
@@ -11326,7 +11152,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11479,16 +11305,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bredd på rullningslist"
+    *: "Bredd på rullningslist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Bredd på rullningslist"
+    *: "Bredd på rullningslist"
   </voice>
 </phrase>
 <phrase>
@@ -11496,16 +11319,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Position för rullningslist"
+    *: "Position för rullningslist"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Position för rullningslist"
+    *: "Position för rullningslist"
   </voice>
 </phrase>
 <phrase>
@@ -11513,16 +11333,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kompressor"
+    *: "Kompressor"
   </voice>
 </phrase>
 <phrase>
@@ -11581,16 +11398,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Tröskel"
+    *: "Tröskel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tröskel"
+    *: "Tröskel"
   </voice>
 </phrase>
 <phrase>
@@ -11598,16 +11412,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Förhållande"
+    *: "Förhållande"
   </dest>
   <voice>
-    *: none
-    swcodec: "Förhållande"
+    *: "Förhållande"
   </voice>
 </phrase>
 <phrase>
@@ -11615,16 +11426,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 till 1"
+    *: "2 till 1"
   </voice>
 </phrase>
 <phrase>
@@ -11632,16 +11440,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 till 1"
+    *: "4 till 1"
   </voice>
 </phrase>
 <phrase>
@@ -11649,16 +11454,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 till 1"
+    *: "6 till 1"
   </voice>
 </phrase>
 <phrase>
@@ -11666,16 +11468,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 till 1"
+    *: "10 till 1"
   </voice>
 </phrase>
 <phrase>
@@ -11683,16 +11482,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limiter"
+    *: "Limiter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiter"
+    *: "Limiter"
   </voice>
 </phrase>
 <phrase>
@@ -11700,16 +11496,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Förstärkning"
+    *: "Förstärkning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Förstärkning"
+    *: "Förstärkning"
   </voice>
 </phrase>
 <phrase>
@@ -11717,16 +11510,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatisk"
+    *: "Automatisk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisk"
+    *: "Automatisk"
   </voice>
 </phrase>
 <phrase>
@@ -11734,16 +11524,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Övergång"
+    *: "Övergång"
   </dest>
   <voice>
-    *: none
-    swcodec: "Övergång"
+    *: "Övergång"
   </voice>
 </phrase>
 <phrase>
@@ -11751,16 +11538,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hård"
+    *: "Hård"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hård"
+    *: "Hård"
   </voice>
 </phrase>
 <phrase>
@@ -11768,16 +11552,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Mjuk"
+    *: "Mjuk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mjuk"
+    *: "Mjuk"
   </voice>
 </phrase>
 <phrase>
@@ -11785,16 +11566,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Återgångstid"
+    *: "Återgångstid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Återgångstid"
+    *: "Återgångstid"
   </voice>
 </phrase>
 <phrase>
@@ -11982,16 +11760,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grundskal"
+    *: "Grundskal"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grundskal"
+    *: "Grundskal"
   </voice>
 </phrase>
 <phrase>
@@ -11999,16 +11774,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Fjärrgrundskal"
+    *: "Fjärrgrundskal"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Fjärrgrundskal"
+    *: "Fjärrgrundskal"
   </voice>
 </phrase>
 <phrase>
@@ -12135,16 +11907,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Spola bakåt före återupptagning"
+    *: "Spola bakåt före återupptagning"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spola bakåt före återupptagning"
+    *: "Spola bakåt före återupptagning"
   </voice>
 </phrase>
 <phrase>
@@ -12536,7 +12305,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12932,16 +12701,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Enkel (Meier)"
+    *: "Enkel (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enkel"
+    *: "Enkel"
   </voice>
 </phrase>
 <phrase>
@@ -12949,16 +12715,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Anpassad"
+    *: "Anpassad"
   </dest>
   <voice>
-    *: none
-    swcodec: "Anpassad"
+    *: "Anpassad"
   </voice>
 </phrase>
 <phrase>
@@ -12995,18 +12758,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Endast laddning"
-    ibassodx90: "Endast laddning"
+    ibassodx50,ibassodx90: "Endast laddning"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Endast laddning"
-    ibassodx90: "Endast laddning"
+    ibassodx50,ibassodx90: "Endast laddning"
   </voice>
 </phrase>
 <phrase>
@@ -13045,16 +12805,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13076,16 +12833,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Attack-tid"
+    *: "Attack-tid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Attack-tid"
+    *: "Attack-tid"
   </voice>
 </phrase>
 <phrase>
@@ -13094,18 +12848,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB-läge"
-    ibassodx90: "USB-läge"
+    ibassodx50,ibassodx90: "USB-läge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB-läge"
-    ibassodx90: "USB-läge"
+    ibassodx50,ibassodx90: "USB-läge"
   </voice>
 </phrase>
 <phrase>
@@ -13142,18 +12893,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </voice>
 </phrase>
 <phrase>
@@ -13204,18 +12952,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13223,16 +12968,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptuell basförbättring"
+    *: "Perceptuell basförbättring"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptuell basförbättring"
+    *: "Perceptuell basförbättring"
   </voice>
 </phrase>
 <phrase>
@@ -13240,16 +12982,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13257,16 +12996,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13291,16 +13027,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
@@ -13350,16 +13083,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -13381,16 +13111,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -13458,18 +13185,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Masslagring"
-    ibassodx90: "Masslagring"
+    ibassodx50,ibassodx90: "Masslagring"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Masslagring"
-    ibassodx90: "Masslagring"
+    ibassodx50,ibassodx90: "Masslagring"
   </voice>
 </phrase>
 <phrase>
@@ -13491,16 +13215,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 62964d28ae..c66ba956ee 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -17,6013 +17,5861 @@
 # Tagalog language file, translated by:
 # - Melba Sitjar
 <phrase>
- id: LANG_SET_BOOL_YES
- desc: bool true representation
- user: core
- <source>
+  id: LANG_SET_BOOL_YES
+  desc: bool true representation
+  user: core
+  <source>
     *: "Yes"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Oo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Oo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SET_BOOL_NO
- desc: bool false representation
- user: core
- <source>
+  id: LANG_SET_BOOL_NO
+  desc: bool false representation
+  user: core
+  <source>
     *: "No"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Hindi"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Hindi"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ON
- desc: Used in a lot of places
- user: core
- <source>
+  id: LANG_ON
+  desc: Used in a lot of places
+  user: core
+  <source>
     *: "On"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bukas"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bukas"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_OFF
- desc: Used in a lot of places
- user: core
- <source>
+  id: LANG_OFF
+  desc: Used in a lot of places
+  user: core
+  <source>
     *: "Off"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Isara"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Isara"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ASK
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_ASK
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Ask"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Itanong"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Itanong"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALWAYS
- desc: used in various places
- user: core
- <source>
+  id: LANG_ALWAYS
+  desc: used in various places
+  user: core
+  <source>
     *: "Always"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Palagi"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Palagi"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_NORMAL
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_NORMAL
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Normal"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Karaniwan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Karaniwan"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_GAIN
- desc: Generic string for gain used in EQ menu and recording screen
- user: core
- <source>
+  id: LANG_GAIN
+  desc: Generic string for gain used in EQ menu and recording screen
+  user: core
+  <source>
     *: "Gain"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tubo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Tubo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WAIT
- desc: general please wait splash
- user: core
- <source>
+  id: LANG_WAIT
+  desc: general please wait splash
+  user: core
+  <source>
     *: "Loading..."
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ikarga..."
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Ikarga"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LOADING_PERCENT
- desc: splash number of percents loaded
- user: core
- <source>
+  id: LANG_LOADING_PERCENT
+  desc: splash number of percents loaded
+  user: core
+  <source>
     *: "Loading... %d%% done (%s)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ikarga... %d%% tapusin (%s)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCANNING_DISK
- desc: when booting up and rebuilding the cache and calculating free space
- user: core
- <source>
+  id: LANG_SCANNING_DISK
+  desc: when booting up and rebuilding the cache and calculating free space
+  user: core
+  <source>
     *: "Scanning disk..."
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bumasa..."
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bumasa"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHUTTINGDOWN
- desc: in main menu
- user: core
- <source>
+  id: LANG_SHUTTINGDOWN
+  desc: in main menu
+  user: core
+  <source>
     *: "Shutting down..."
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magsara..."
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Magsara"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CANCEL
- desc: Visual confirmation of canceling a changed setting
- user: core
- <source>
+  id: LANG_CANCEL
+  desc: Visual confirmation of canceling a changed setting
+  user: core
+  <source>
     *: "Cancelled"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kansilahin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Kansilahin"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FAILED
- desc: Something failed. To be appended after actions
- user: core
- <source>
+  id: LANG_FAILED
+  desc: Something failed. To be appended after actions
+  user: core
+  <source>
     *: "Failed"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lagpak"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Lagpak"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNELS
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNELS
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Channels"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Channel"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Channel"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RESET_ASK
- desc: confirm to reset settings
- user: core
- <source>
+  id: LANG_RESET_ASK
+  desc: confirm to reset settings
+  user: core
+  <source>
     *: "Are You Sure?"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sigurado Ka Ba?"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Sigurado Ka Ba?"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CONFIRM_WITH_BUTTON
- desc: Generic string to use to confirm
- user: core
- <source>
+  id: LANG_CONFIRM_WITH_BUTTON
+  desc: Generic string to use to confirm
+  user: core
+  <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "PLAY = Oo"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Oo"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Oo"
     iriverh100,iriverh120,iriverh300: "NAVI = Oo"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Oo"
     mrobe500: "PLAY, POWER, or top-right = Oo"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Oo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CANCEL_WITH_ANY
- desc: Generic string to use to cancel
- user: core
- <source>
+  id: LANG_CANCEL_WITH_ANY
+  desc: Generic string to use to cancel
+  user: core
+  <source>
     *: "Any Other = No"
     archosplayer: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ibang wala = Hindi"
     archosplayer: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: ""
     archosplayer: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ROCKBOX_TITLE
- desc: main menu title
- user: core
- <source>
+  id: LANG_ROCKBOX_TITLE
+  desc: main menu title
+  user: core
+  <source>
     *: "Rockbox"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Rockbox"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Rockbox"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
- desc: in the main menu
- user: core
- <source>
+  id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
+  desc: in the main menu
+  user: core
+  <source>
     *: "Recent Bookmarks"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Di pa natatagalan Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Di pa natatagalan Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DIR_BROWSER
- desc: main menu title
- user: core
- <source>
+  id: LANG_DIR_BROWSER
+  desc: main menu title
+  user: core
+  <source>
     *: "Files"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "File"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE
- desc: in the main menu and the settings menu
- user: core
- <source>
+  id: LANG_TAGCACHE
+  desc: in the main menu and the settings menu
+  user: core
+  <source>
     *: "Database"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Database"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Database"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_NOW_PLAYING
- desc: in the main menu
- user: core
- <source>
+  id: LANG_NOW_PLAYING
+  desc: in the main menu
+  user: core
+  <source>
     *: "Now Playing"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Laro"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Laro"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RESUME_PLAYBACK
- desc: in the main menu
- user: core
- <source>
+  id: LANG_RESUME_PLAYBACK
+  desc: in the main menu
+  user: core
+  <source>
     *: "Resume Playback"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magpatuloy"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Magpatuloy"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SETTINGS
- desc:  in main menu and visual confirmation after settings reset
- user: core
- <source>
+  id: LANG_SETTINGS
+  desc:  in main menu and visual confirmation after settings reset
+  user: core
+  <source>
     *: "Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ilagay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Ilagay"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING
- desc: in the main menu
- user: core
- <source>
+  id: LANG_RECORDING
+  desc: in the main menu
+  user: core
+  <source>
     *: none
     recording: "Recording"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Rekording"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Recording"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_RADIO
- desc: in the main menu
- user: core
- <source>
+  id: LANG_FM_RADIO
+  desc: in the main menu
+  user: core
+  <source>
     *: none
     radio: "FM Radio"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "FM Radyo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "FM Radyo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PLAYLISTS
- desc: in the main menu and file view setting
- user: core
- <source>
+  id: LANG_PLAYLISTS
+  desc: in the main menu and file view setting
+  user: core
+  <source>
     *: "Playlists"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Listahan"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PLUGINS
- desc: in the main menu
- user: core
- <source>
+  id: LANG_PLUGINS
+  desc: in the main menu
+  user: core
+  <source>
     *: "Plugins"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Plugins"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Plugins"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SYSTEM
- desc: in the main menu and settings menu
- user: core
- <source>
+  id: LANG_SYSTEM
+  desc: in the main menu and settings menu
+  user: core
+  <source>
     *: "System"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sistema"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Sistema"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SELECT_BOOKMARK
- desc: bookmark selection list title
- user: core
- <source>
+  id: LANG_BOOKMARK_SELECT_BOOKMARK
+  desc: bookmark selection list title
+  user: core
+  <source>
     *: "Select Bookmark"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pinili Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Pinili Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_DONT_RESUME
- desc: top item in the list when asking user about bookmark auto load
- user: core
- <source>
+  id: LANG_BOOKMARK_DONT_RESUME
+  desc: top item in the list when asking user about bookmark auto load
+  user: core
+  <source>
     *: "<Don't Resume>"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "<Hindi Tuloy>"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Hindi Tuloy"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SHUFFLE
- desc: bookmark selection list, bookmark enables shuffle
- user: core
- <source>
+  id: LANG_BOOKMARK_SHUFFLE
+  desc: bookmark selection list, bookmark enables shuffle
+  user: core
+  <source>
     *: ", Shuffle"
- </source>
- <dest>
+  </source>
+  <dest>
     *: ", Balasahin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Balasahin"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_INVALID
- desc: bookmark selection list, bookmark couldn't be parsed
- user: core
- <source>
+  id: LANG_BOOKMARK_INVALID
+  desc: bookmark selection list, bookmark couldn't be parsed
+  user: core
+  <source>
     *: "<Invalid Bookmark>"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "<Walang-saysay Bookmark>"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Walang-saysay Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_CONTEXT_MENU
- desc: bookmark selection list context menu
- user: core
- <source>
+  id: LANG_BOOKMARK_CONTEXT_MENU
+  desc: bookmark selection list context menu
+  user: core
+  <source>
     *: "Bookmark Actions"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kilos Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Kilos Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_CONTEXT_RESUME
- desc: bookmark context menu, resume this bookmark
- user: core
- <source>
+  id: LANG_BOOKMARK_CONTEXT_RESUME
+  desc: bookmark context menu, resume this bookmark
+  user: core
+  <source>
     *: "Resume"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tuloy"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Tuloy"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_CONTEXT_DELETE
- desc: bookmark context menu, delete this bookmark
- user: core
- <source>
+  id: LANG_BOOKMARK_CONTEXT_DELETE
+  desc: bookmark context menu, delete this bookmark
+  user: core
+  <source>
     *: "Delete"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Alisin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Alisin"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AUTO_BOOKMARK_QUERY
- desc: prompt for user to decide to create an bookmark
- user: core
- <source>
+  id: LANG_AUTO_BOOKMARK_QUERY
+  desc: prompt for user to decide to create an bookmark
+  user: core
+  <source>
     *: "Create a Bookmark?"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Gumawa ng Bookmark?"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Gumawa ng Bookmark?"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_CREATE_SUCCESS
- desc: Indicates bookmark was successfully created
- user: core
- <source>
+  id: LANG_BOOKMARK_CREATE_SUCCESS
+  desc: Indicates bookmark was successfully created
+  user: core
+  <source>
     *: "Bookmark Created"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Nagumawa Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Nagumawa Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_CREATE_FAILURE
- desc: Indicates bookmark was not created
- user: core
- <source>
+  id: LANG_BOOKMARK_CREATE_FAILURE
+  desc: Indicates bookmark was not created
+  user: core
+  <source>
     *: "Bookmark Failed!"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mahulog Bookmark!"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Mahulog Bookmark!"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_LOAD_EMPTY
- desc: Indicates bookmark was empty
- user: core
- <source>
+  id: LANG_BOOKMARK_LOAD_EMPTY
+  desc: Indicates bookmark was empty
+  user: core
+  <source>
     *: "Bookmark Empty"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Walang laman Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Walang laman Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SOUND_SETTINGS
- desc: in the main menu
- user: core
- <source>
+  id: LANG_SOUND_SETTINGS
+  desc: in the main menu
+  user: core
+  <source>
     *: "Sound Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tunog Ilagay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Tunog Ilagay"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOLUME
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_VOLUME
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Volume"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bulumen"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bulumen"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BASS
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_BASS
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Bass"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tinig"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Tinig"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TREBLE
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_TREBLE
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Treble"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lawum ng Tingog"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Lawum ng Tingog"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BALANCE
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_BALANCE
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Balance"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Timbangan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Timbangan"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_CONFIGURATION
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_CONFIGURATION
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Channel Configuration"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lubog Channel"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Lubog Channel"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_STEREO
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_STEREO
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Stereo"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Stereo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Stereo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_MONO
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_MONO
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Mono"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mono"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Mono"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_CUSTOM
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_CUSTOM
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Custom"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Gawi"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Gawi"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_LEFT
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_LEFT
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Mono Left"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mono Kaliwa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Mono Kaliwa"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_RIGHT
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_RIGHT
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Mono Right"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mono Deretso"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Mono Deretso"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CHANNEL_KARAOKE
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_CHANNEL_KARAOKE
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Karaoke"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Karaoke"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Karaoke"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_STEREO_WIDTH
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_STEREO_WIDTH
+  desc: in sound_settings
+  user: core
+  <source>
     *: "Stereo Width"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lapad Stereo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Lapad Stereo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFEED
- desc: in sound settings
- user: core
- <source>
-    *: none
-    swcodec: "Crossfeed"
- </source>
- <dest>
-    *: none
-    swcodec: "Crossfeed"
- </dest>
- <voice>
-    *: none
-    swcodec: "Crossfeed"
- </voice>
+  id: LANG_CROSSFEED
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Crossfeed"
+  </source>
+  <dest>
+    *: "Crossfeed"
+  </dest>
+  <voice>
+    *: "Crossfeed"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFEED_DIRECT_GAIN
- desc: in crossfeed settings
- user: core
- <source>
-    *: none
-    swcodec: "Direct Gain"
- </source>
- <dest>
-    *: none
-    swcodec: "Matuwid Tubo"
- </dest>
- <voice>
-    *: none
-    swcodec: "Matuwid Tubo"
- </voice>
+  id: LANG_CROSSFEED_DIRECT_GAIN
+  desc: in crossfeed settings
+  user: core
+  <source>
+    *: "Direct Gain"
+  </source>
+  <dest>
+    *: "Matuwid Tubo"
+  </dest>
+  <voice>
+    *: "Matuwid Tubo"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFEED_CROSS_GAIN
- desc: in crossfeed settings
+  id: LANG_CROSSFEED_CROSS_GAIN
+  desc: in crossfeed settings
   user: core
- <source>
-    *: none
-    swcodec: "Cross Gain"
- </source>
- <dest>
-    *: none
-    swcodec: "Tumawid Tubo"
- </dest>
- <voice>
-    *: none
-    swcodec: "Tumawid Tubo"
- </voice>
+  <source>
+    *: "Cross Gain"
+  </source>
+  <dest>
+    *: "Tumawid Tubo"
+  </dest>
+  <voice>
+    *: "Tumawid Tubo"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFEED_HF_ATTENUATION
- desc: in crossfeed settings
+  id: LANG_CROSSFEED_HF_ATTENUATION
+  desc: in crossfeed settings
   user: core
- <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
- </source>
- <dest>
-    *: none
-    swcodec: "Mataas ng Dalas Attenuation"
- </dest>
- <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
- </voice>
+  <source>
+    *: "High-Frequency Attenuation"
+  </source>
+  <dest>
+    *: "Mataas ng Dalas Attenuation"
+  </dest>
+  <voice>
+    *: "High-frequency attenuation"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFEED_HF_CUTOFF
- desc: in crossfeed settings
+  id: LANG_CROSSFEED_HF_CUTOFF
+  desc: in crossfeed settings
   user: core
- <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
- </source>
- <dest>
-    *: none
-    swcodec: "Mataas ng Dalas Cutoff"
- </dest>
- <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
- </voice>
+  <source>
+    *: "High-Frequency Cutoff"
+  </source>
+  <dest>
+    *: "Mataas ng Dalas Cutoff"
+  </dest>
+  <voice>
+    *: "High-frequency cutoff"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER
- desc: in the sound settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Equalizer"
- </source>
- <dest>
-    *: none
-    swcodec: "Equalizer"
- </dest>
- <voice>
-    *: none
-    swcodec: "Equalizer"
- </voice>
+  id: LANG_EQUALIZER
+  desc: in the sound settings menu
+  user: core
+  <source>
+    *: "Equalizer"
+  </source>
+  <dest>
+    *: "Equalizer"
+  </dest>
+  <voice>
+    *: "Equalizer"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_ENABLED
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Enable EQ"
- </source>
- <dest>
-    *: none
-    swcodec: "Magbigay-kaya EQ"
- </dest>
- <voice>
-    *: none
-    swcodec: "Enable equalizer"
- </voice>
+  id: LANG_EQUALIZER_ENABLED
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Enable EQ"
+  </source>
+  <dest>
+    *: "Magbigay-kaya EQ"
+  </dest>
+  <voice>
+    *: "Enable equalizer"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_GRAPHICAL
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Graphical EQ"
- </source>
- <dest>
-    *: none
-    swcodec: "Graphical EQ"
- </dest>
- <voice>
-    *: none
-    swcodec: "Graphical equalizer"
- </voice>
+  id: LANG_EQUALIZER_GRAPHICAL
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Graphical EQ"
+  </source>
+  <dest>
+    *: "Graphical EQ"
+  </dest>
+  <voice>
+    *: "Graphical equalizer"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_PRECUT
- desc: in eq settings
- user: core
- <source>
-    *: none
-    swcodec: "Precut"
- </source>
- <dest>
-    *: none
-    swcodec: "Precut"
- </dest>
- <voice>
-    *: none
-    swcodec: "Pre-cut"
- </voice>
+  id: LANG_EQUALIZER_PRECUT
+  desc: in eq settings
+  user: core
+  <source>
+    *: "Precut"
+  </source>
+  <dest>
+    *: "Precut"
+  </dest>
+  <voice>
+    *: "Pre-cut"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_GAIN
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Simple EQ Settings"
- </source>
- <dest>
-    *: none
-    swcodec: "Yano EQ Tagpuan"
- </dest>
- <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
- </voice>
+  id: LANG_EQUALIZER_GAIN
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Simple EQ Settings"
+  </source>
+  <dest>
+    *: "Yano EQ Tagpuan"
+  </dest>
+  <voice>
+    *: "Simple equalizer settings"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_ADVANCED
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
- </source>
- <dest>
-    *: none
-    swcodec: "Adelantado EQ Tagpuan"
- </dest>
- <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
- </voice>
+  id: LANG_EQUALIZER_ADVANCED
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Advanced EQ Settings"
+  </source>
+  <dest>
+    *: "Adelantado EQ Tagpuan"
+  </dest>
+  <voice>
+    *: "Advanced equalizer settings"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_SAVE
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Save EQ Preset"
- </source>
- <dest>
-    *: none
-    swcodec: "Iligtas EQ Preset"
- </dest>
- <voice>
-    *: none
-    swcodec: "Save equalizer preset"
- </voice>
+  id: LANG_EQUALIZER_SAVE
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Save EQ Preset"
+  </source>
+  <dest>
+    *: "Iligtas EQ Preset"
+  </dest>
+  <voice>
+    *: "Save equalizer preset"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BROWSE
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Browse EQ Presets"
- </source>
- <dest>
-    *: none
-    swcodec: "Tumingin EQ Presets"
- </dest>
- <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
- </voice>
+  id: LANG_EQUALIZER_BROWSE
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Browse EQ Presets"
+  </source>
+  <dest>
+    *: "Tumingin EQ Presets"
+  </dest>
+  <voice>
+    *: "Browse equalizer presets"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_EDIT_MODE
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Edit mode: %s"
- </source>
- <dest>
-    *: none
-    swcodec: "Mamatnugot paraan: %s"
- </dest>
- <voice>
-    *: none
-    swcodec: ""
- </voice>
+  id: LANG_EQUALIZER_EDIT_MODE
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Edit mode: %s"
+  </source>
+  <dest>
+    *: "Mamatnugot paraan: %s"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_GAIN_ITEM
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
- </source>
- <dest>
-    *: none
-    swcodec: "%d Hz Band Gain"
- </dest>
- <voice>
-    *: none
-    swcodec: "hertz band gain"
- </voice>
+  id: LANG_EQUALIZER_GAIN_ITEM
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "%d Hz Band Gain"
+  </source>
+  <dest>
+    *: "%d Hz Band Gain"
+  </dest>
+  <voice>
+    *: "hertz band gain"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_LOW_SHELF
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Low Shelf Filter"
- </source>
- <dest>
-    *: none
-    swcodec: "Mababa Shelf Filter"
- </dest>
- <voice>
-    *: none
-    swcodec: "Low shelf filter"
- </voice>
+  id: LANG_EQUALIZER_BAND_LOW_SHELF
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Low Shelf Filter"
+  </source>
+  <dest>
+    *: "Mababa Shelf Filter"
+  </dest>
+  <voice>
+    *: "Low shelf filter"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_PEAK
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Peak Filter %d"
- </source>
- <dest>
-    *: none
-    swcodec: "Peak Filter %d"
- </dest>
- <voice>
-    *: none
-    swcodec: "Peak filter"
- </voice>
+  id: LANG_EQUALIZER_BAND_PEAK
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Peak Filter %d"
+  </source>
+  <dest>
+    *: "Peak Filter %d"
+  </dest>
+  <voice>
+    *: "Peak filter"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_HIGH_SHELF
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "High Shelf Filter"
- </source>
- <dest>
-    *: none
-    swcodec: "Mataas ng Shelf Filter"
- </dest>
- <voice>
-    *: none
-    swcodec: "High shelf filter"
- </voice>
+  id: LANG_EQUALIZER_BAND_HIGH_SHELF
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "High Shelf Filter"
+  </source>
+  <dest>
+    *: "Mataas ng Shelf Filter"
+  </dest>
+  <voice>
+    *: "High shelf filter"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_CUTOFF
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Cutoff Frequency"
- </source>
- <dest>
-    *: none
-    swcodec: "Cutoff ng Dalas"
- </dest>
- <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
- </voice>
+  id: LANG_EQUALIZER_BAND_CUTOFF
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Cutoff Frequency"
+  </source>
+  <dest>
+    *: "Cutoff ng Dalas"
+  </dest>
+  <voice>
+    *: "Cutoff Frequency"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_CENTER
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Centre Frequency"
- </source>
- <dest>
-    *: none
-    swcodec: "Sentro ng Dalas"
- </dest>
- <voice>
-    *: none
-    swcodec: "Center frequency"
- </voice>
+  id: LANG_EQUALIZER_BAND_CENTER
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Centre Frequency"
+  </source>
+  <dest>
+    *: "Sentro ng Dalas"
+  </dest>
+  <voice>
+    *: "Center frequency"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_EQUALIZER_BAND_Q
- desc: in the equalizer settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Q"
- </source>
- <dest>
-    *: none
-    swcodec: "Q"
- </dest>
- <voice>
-    *: none
-    swcodec: "Q"
- </voice>
+  id: LANG_EQUALIZER_BAND_Q
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Q"
+  </source>
+  <dest>
+    *: "Q"
+  </dest>
+  <voice>
+    *: "Q"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DITHERING
- desc: in the sound settings menu
- user: core
- <source>
-    *: none
-    swcodec: "Dithering"
- </source>
- <dest>
-    *: none
-    swcodec: "Dithering"
- </dest>
- <voice>
-    *: none
-    swcodec: "Dithering"
- </voice>
+  id: LANG_DITHERING
+  desc: in the sound settings menu
+  user: core
+  <source>
+    *: "Dithering"
+  </source>
+  <dest>
+    *: "Dithering"
+  </dest>
+  <voice>
+    *: "Dithering"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LOUDNESS
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_LOUDNESS
+  desc: in sound_settings
+  user: core
+  <source>
     *: none
     masf: "Loudness"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Matunog"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "Loudness"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AUTOVOL
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_AUTOVOL
+  desc: in sound_settings
+  user: core
+  <source>
     *: none
     masf: "Auto Volume"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Kusa Bulumen"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "Auto Volume"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DECAY
- desc: in sound_settings
- user: core
- <source>
+  id: LANG_DECAY
+  desc: in sound_settings
+  user: core
+  <source>
     *: none
     masf: "AV Decay Time"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "AV Sira Oras"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SUPERBASS
- desc: in sound settings
- user: core
- <source>
+  id: LANG_SUPERBASS
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "Super Bass"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Super lawum ng Tingog"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "Super Bass"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MDB_ENABLE
- desc: in sound settings
- user: core
- <source>
+  id: LANG_MDB_ENABLE
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "MDB Enable"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Magbigay-kaya ng MDB"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "MDB Enable"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MDB_STRENGTH
- desc: in sound settings
- user: core
- <source>
+  id: LANG_MDB_STRENGTH
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "MDB Strength"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Lakas ng MDB "
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "MDB Strength"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MDB_HARMONICS
- desc: in sound settings
- user: core
- <source>
+  id: LANG_MDB_HARMONICS
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "MDB Harmonics"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "MDB Kaugma"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "MDB Harmonics"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MDB_CENTER
- desc: in sound settings
- user: core
- <source>
+  id: LANG_MDB_CENTER
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "MDB Centre Frequency"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Sentro ng Dalas MDB"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "MDB Center Frequency"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MDB_SHAPE
- desc: in sound settings
- user: core
- <source>
+  id: LANG_MDB_SHAPE
+  desc: in sound settings
+  user: core
+  <source>
     *: none
     masf: "MDB Shape"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     masf: "Hugis ng MDB"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     masf: "MDB Shape"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_GENERAL_SETTINGS
- desc: in the main menu
- user: core
- <source>
+  id: LANG_GENERAL_SETTINGS
+  desc: in the main menu
+  user: core
+  <source>
     *: "General Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Heneral Tagpuan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "General Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PLAYBACK
- desc: in settings_menu()
- user: core
- <source>
+  id: LANG_PLAYBACK
+  desc: in settings_menu()
+  user: core
+  <source>
     *: "Playback Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Playback"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Playback"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHUFFLE
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SHUFFLE
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Shuffle"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Balasahin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Shuffle"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPEAT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_REPEAT
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Repeat"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ulitin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Repeat"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALL
- desc: generic string used both in dir file filter and repeat mode selection
- user: core
- <source>
+  id: LANG_ALL
+  desc: generic string used both in dir file filter and repeat mode selection
+  user: core
+  <source>
     *: "All"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lahat"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "All"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPEAT_ONE
- desc: repeat one song
- user: core
- <source>
+  id: LANG_REPEAT_ONE
+  desc: repeat one song
+  user: core
+  <source>
     *: "One"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Isa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "One"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPEAT_AB
- desc: repeat range from point A to B
- user: core
- <source>
+  id: LANG_REPEAT_AB
+  desc: repeat range from point A to B
+  user: core
+  <source>
     *: "A-B"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "A-B"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "A-B"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PLAY_SELECTED
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_PLAY_SELECTED
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Play Selected First"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Maglaro pang una"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Play Selected File First"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WIND_MENU
- desc: in the playback sub menu
- user: core
- <source>
+  id: LANG_WIND_MENU
+  desc: in the playback sub menu
+  user: core
+  <source>
     *: "Fast-Forward/Rewind"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ipadala/Likod"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Fast forward and Rewind"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FFRW_STEP
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_FFRW_STEP
+  desc: in settings_menu
+  user: core
+  <source>
     *: "FF/RW Min Step"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "FF/RW Min Step"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Minimum Step"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FFRW_ACCEL
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_FFRW_ACCEL
+  desc: in settings_menu
+  user: core
+  <source>
     *: "FF/RW Accel"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "FF/RW Pabilisin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Acceleration"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MP3BUFFER_MARGIN
- desc: MP3 buffer margin time
- user: core
- <source>
+  id: LANG_MP3BUFFER_MARGIN
+  desc: MP3 buffer margin time
+  user: core
+  <source>
     *: "Anti-Skip Buffer"
     flash_storage: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kalabin Ilaktaw ng Buffer "
     flash_storage: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Anti-Skip Buffer"
     flash_storage: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FADE_ON_STOP
- desc: options menu to set fade on stop or pause
- user: core
- <source>
+  id: LANG_FADE_ON_STOP
+  desc: options menu to set fade on stop or pause
+  user: core
+  <source>
     *: "Fade on Stop/Pause"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mawala sa ibabaw Pahintuin/Tumigil"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Fade On Stop and Pause"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PARTY_MODE
- desc: party mode
- user: core
- <source>
+  id: LANG_PARTY_MODE
+  desc: party mode
+  user: core
+  <source>
     *: "Party Mode"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lapian Paraan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Party Mode"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE
- desc: in playback settings
- user: core
- <source>
+  id: LANG_CROSSFADE
+  desc: in playback settings
+  user: core
+  <source>
     *: none
     crossfade: "Crossfade"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Crossfade"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Crossfade"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_ENABLE
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_ENABLE
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Enable Crossfade"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Magbigay-kaya ng Crossfade"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Enable Crossfade"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MANTRACKSKIP
- desc: in crossfade settings
- user: core
- <source>
+  id: LANG_MANTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
     *: none
     crossfade: "Manual Track Skip Only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Landas Laktawan Tangi"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Manual Track Skip Only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHUFFLE_TRACKSKIP
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SHUFFLE_TRACKSKIP
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     crossfade: "Shuffle or Manual Track Skip"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Magbalasa at Landas Laktawan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Shuffle or Manual Track Skip"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_FADE_IN_DELAY
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_FADE_IN_DELAY
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Fade-In Delay"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Pagpapalit ng abala"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Fade-In Delay"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_FADE_IN_DURATION
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_FADE_IN_DURATION
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Fade-In Duration"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Pagpapalit ng Tagal"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Fade-In Duration"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_FADE_OUT_DELAY
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_FADE_OUT_DELAY
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Fade-Out Delay"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Pagpapalit ng abala"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Fade-Out Delay"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_FADE_OUT_DURATION
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_FADE_OUT_DURATION
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Fade-Out Duration"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Pagpapalit ng Tagal"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Fade-Out Duration"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CROSSFADE_FADE_OUT_MODE
- desc: in crossfade settings menu
- user: core
- <source>
+  id: LANG_CROSSFADE_FADE_OUT_MODE
+  desc: in crossfade settings menu
+  user: core
+  <source>
     *: none
     crossfade: "Fade-Out Mode"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Pagpapalit ng Paraan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Fade-Out Mode"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MIX
- desc: in playback settings, crossfade option
- user: core
- <source>
+  id: LANG_MIX
+  desc: in playback settings, crossfade option
+  user: core
+  <source>
     *: none
     crossfade: "Mix"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     crossfade: "Haluin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     crossfade: "Mix"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPLAYGAIN
- desc: in replaygain
- user: core
- <source>
+  id: LANG_REPLAYGAIN
+  desc: in replaygain
+  user: core
+  <source>
     *: "Replaygain"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ulitin ng tubo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Replaygain"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPLAYGAIN_NOCLIP
- desc: in replaygain
- user: core
- <source>
-    *: none
-    swcodec: "Prevent Clipping"
- </source>
- <dest>
-    *: none
-    swcodec: "Pigilin ng klip"
- </dest>
- <voice>
-    *: none
-    swcodec: "Prevent Clipping"
- </voice>
+  id: LANG_REPLAYGAIN_NOCLIP
+  desc: in replaygain
+  user: core
+  <source>
+    *: "Prevent Clipping"
+  </source>
+  <dest>
+    *: "Pigilin ng klip"
+  </dest>
+  <voice>
+    *: "Prevent Clipping"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPLAYGAIN_MODE
- desc: in replaygain
- user: core
- <source>
+  id: LANG_REPLAYGAIN_MODE
+  desc: in replaygain
+  user: core
+  <source>
     *: "Replaygain Type"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ulitin ng tubo tipo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Replaygain Type"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALBUM_GAIN
- desc: in replaygain
- user: core
- <source>
+  id: LANG_ALBUM_GAIN
+  desc: in replaygain
+  user: core
+  <source>
     *: "Album Gain"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Rekord ng tubo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Album Gain"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TRACK_GAIN
- desc: in replaygain
- user: core
- <source>
+  id: LANG_TRACK_GAIN
+  desc: in replaygain
+  user: core
+  <source>
     *: "Track Gain"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Landas ng tubo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Track Gain"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHUFFLE_GAIN
- desc: use track gain if shuffle mode is on, album gain otherwise
- user: core
- <source>
+  id: LANG_SHUFFLE_GAIN
+  desc: use track gain if shuffle mode is on, album gain otherwise
+  user: core
+  <source>
     *: "Track Gain if Shuffling"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Landas ng tubo kung balasahin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Track Gain if Shuffling"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REPLAYGAIN_PREAMP
- desc: in replaygain settings
- user: core
- <source>
+  id: LANG_REPLAYGAIN_PREAMP
+  desc: in replaygain settings
+  user: core
+  <source>
     *: "Pre-amp"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pre-amp"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Preamp"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BEEP
- desc: in playback settings
- user: core
- <source>
-    *: none
-    swcodec: "Track Skip Beep"
- </source>
- <dest>
-    *: none
-    swcodec: "Landas Laktawan Beep"
- </dest>
- <voice>
-    *: none
-    swcodec: "Landas Laktawan Beep"
- </voice>
+  id: LANG_BEEP
+  desc: in playback settings
+  user: core
+  <source>
+    *: "Track Skip Beep"
+  </source>
+  <dest>
+    *: "Landas Laktawan Beep"
+  </dest>
+  <voice>
+    *: "Landas Laktawan Beep"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEAK
- desc: in beep volume in playback settings
- user: core
- <source>
-    *: none
-    swcodec: "Weak"
- </source>
- <dest>
-    *: none
-    swcodec: "Mahina"
- </dest>
- <voice>
-    *: none
-    swcodec: "Weak"
- </voice>
+  id: LANG_WEAK
+  desc: in beep volume in playback settings
+  user: core
+  <source>
+    *: "Weak"
+  </source>
+  <dest>
+    *: "Mahina"
+  </dest>
+  <voice>
+    *: "Weak"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MODERATE
- desc: in beep volume in playback settings
- user: core
- <source>
-    *: none
-    swcodec: "Moderate"
- </source>
- <dest>
-    *: none
-    swcodec: "Kainaman"
- </dest>
- <voice>
-    *: none
-    swcodec: "Moderate"
- </voice>
+  id: LANG_MODERATE
+  desc: in beep volume in playback settings
+  user: core
+  <source>
+    *: "Moderate"
+  </source>
+  <dest>
+    *: "Kainaman"
+  </dest>
+  <voice>
+    *: "Moderate"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_STRONG
- desc: in beep volume in playback settings
- user: core
- <source>
-    *: none
-    swcodec: "Strong"
- </source>
- <dest>
-    *: none
-    swcodec: "Malakas"
- </dest>
- <voice>
-    *: none
-    swcodec: "Strong"
- </voice>
+  id: LANG_STRONG
+  desc: in beep volume in playback settings
+  user: core
+  <source>
+    *: "Strong"
+  </source>
+  <dest>
+    *: "Malakas"
+  </dest>
+  <voice>
+    *: "Strong"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPDIF_ENABLE
- desc: in playback settings menu. enable/disable the optical out
- user: core
- <source>
+  id: LANG_SPDIF_ENABLE
+  desc: in playback settings menu. enable/disable the optical out
+  user: core
+  <source>
     *: none
     spdif_power: "Optical Output"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     spdif_power: "Tungkol sa mata ng kabuuang producto"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     spdif_power: "Optical Output"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_NEXT_FOLDER
- desc: in settings_menu. Should we allow move to next/prev folder from last/first track of current one
- user: core
- <source>
+  id: LANG_NEXT_FOLDER
+  desc: in settings_menu. Should we allow move to next/prev folder from last/first track of current one
+  user: core
+  <source>
     *: "Auto-Change Directory"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kusa palitan ng listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Auto-Change Directory"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RANDOM
- desc: random folder
+  id: LANG_RANDOM
+  desc: random folder
   user: core
- <source>
+  <source>
     *: "Random"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pagkakataon"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Random"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AUDIOSCROBBLER
- desc: "Last.fm Log" in the playback menu
- user: core
- <source>
+  id: LANG_AUDIOSCROBBLER
+  desc: "Last.fm Log" in the playback menu
+  user: core
+  <source>
     *: "Last.fm Log"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Last.fm Log"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Last.fm Log"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CUESHEET_ENABLE
- desc: cuesheet support option
- user: core
- <source>
+  id: LANG_CUESHEET_ENABLE
+  desc: cuesheet support option
+  user: core
+  <source>
     *: "Cuesheet Support"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Paunawa sustento"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Cuesheet Support"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_HEADPHONE_UNPLUG
- desc: in settings_menu.
- user: core
- <source>
+  id: LANG_HEADPHONE_UNPLUG
+  desc: in settings_menu.
+  user: core
+  <source>
     *: none
     headphone_detection: "Pause on Headphone Unplug"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     headphone_detection: "Tumigil sa headphone alisin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     headphone_detection: "Pause on Headphone Unplug"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_HEADPHONE_UNPLUG_RESUME
- desc: in pause_phones_menu.
- user: core
- <source>
+  id: LANG_HEADPHONE_UNPLUG_RESUME
+  desc: in pause_phones_menu.
+  user: core
+  <source>
     *: none
     headphone_detection: "Pause and Resume"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     headphone_detection: "Tumigil at ipagpatuloy"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     headphone_detection: "Pause and Resume"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_HEADPHONE_UNPLUG_RW
- desc: in pause_phones_menu.
- user: core
- <source>
+  id: LANG_HEADPHONE_UNPLUG_RW
+  desc: in pause_phones_menu.
+  user: core
+  <source>
     *: none
     headphone_detection: "Duration to Rewind"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     headphone_detection: "Tagal sa likod"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     headphone_detection: "Duration to Rewind"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
- desc: in pause_phones_menu.
- user: core
- <source>
+  id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
+  desc: in pause_phones_menu.
+  user: core
+  <source>
     *: none
     headphone_detection: "Disable resume on startup if phones unplugged"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     headphone_detection: "Mahina ipagpatuloy sa simulan kung headphones wala ng plug"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     headphone_detection: "Disable resume on startup if phones unplugged"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FILE
- desc: in settings_menu()
- user: core
- <source>
+  id: LANG_FILE
+  desc: in settings_menu()
+  user: core
+  <source>
     *: "File View"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pagtingin Salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "File View"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_CASE
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SORT_CASE
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Sort Case Sensitive"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pag-uri-uriin usapin sensitibo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Sort Case Sensitive"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_DIR
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_DIR
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "Sort Directories"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pag-uri-uriin ng listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "sort directories"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_FILE
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_FILE
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "Sort Files"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pag-uri-uriin salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "sort files"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_ALPHA
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_ALPHA
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "Alphabetical"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sa alpabeto"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Alphabetical"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_DATE
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_DATE
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "By Date"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sa petsa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "By Date"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_DATE_REVERSE
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_DATE_REVERSE
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "By Newest Date"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bago sa petsa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "By Newest Date"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SORT_TYPE
- desc: browser sorting setting
- user: core
- <source>
+  id: LANG_SORT_TYPE
+  desc: browser sorting setting
+  user: core
+  <source>
     *: "By Type"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sa tipo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "By Type"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FILTER
- desc: setting name for dir filter
- user: core
- <source>
+  id: LANG_FILTER
+  desc: setting name for dir filter
+  user: core
+  <source>
     *: "Show Files"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magpakita salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Show Files"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FILTER_SUPPORTED
- desc: show all file types supported by Rockbox
- user: core
- <source>
+  id: LANG_FILTER_SUPPORTED
+  desc: show all file types supported by Rockbox
+  user: core
+  <source>
     *: "Supported"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sustentuhan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Supported"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FILTER_MUSIC
- desc: show only music-related files
- user: core
- <source>
+  id: LANG_FILTER_MUSIC
+  desc: show only music-related files
+  user: core
+  <source>
     *: "Music"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Musika"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Music"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FOLLOW
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_FOLLOW
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Follow Playlist"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sumunod listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Follow Playlist"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHOW_PATH
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SHOW_PATH
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Show Path"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magpakita landas"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Show Path"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHOW_PATH_CURRENT
- desc: in show path menu
- user: core
- <source>
+  id: LANG_SHOW_PATH_CURRENT
+  desc: in show path menu
+  user: core
+  <source>
     *: "Current Directory Only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Lamang ng koryente listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Current Directory Only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DISPLAY_FULL_PATH
- desc: track display options
- user: core
- <source>
+  id: LANG_DISPLAY_FULL_PATH
+  desc: track display options
+  user: core
+  <source>
     *: "Full Path"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Puno landas"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Full Path"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BUILDING_DATABASE
- desc: splash database building progress
- user: core
- <source>
+  id: LANG_BUILDING_DATABASE
+  desc: splash database building progress
+  user: core
+  <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
- </source>
- <dest>
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+  </source>
+  <dest>
     *: "Gumawa database... %d found (OFF sa pagbalik)"
-    iriverh100,iriverh120,iriverh300: "Gumawa database... %d found (STOP sa pagbalik)"
-    ipod*: "Gumawa database... %d found (PLAY/PAUSE sa pagbalik)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Gumawa database... %d found (LEFT sa pagbalik)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Gumawa database... %d found (PREV sa pagbalik)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Gumawa database... %d found (LEFT sa pagbalik)"
     gogearsa9200: "Gumawa database... %d found (REW sa pagbalik)"
- </dest>
- <voice>
+    ipod*: "Gumawa database... %d found (PLAY/PAUSE sa pagbalik)"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Gumawa database... %d found (PREV sa pagbalik)"
+    iriverh100,iriverh120,iriverh300: "Gumawa database... %d found (STOP sa pagbalik)"
+  </dest>
+  <voice>
     *: "entries found for database"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_RAM
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_RAM
+  desc: in tag cache settings
+  user: core
+  <source>
     *: none
     tc_ramcache: "Load to RAM"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     tc_ramcache: "Ikaraga sa RAM"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     tc_ramcache: "Load to RAM"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_AUTOUPDATE
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_AUTOUPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Auto Update"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kusa baguhin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Auto Update"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_FORCE_UPDATE
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_FORCE_UPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Initialize Now"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tumakbo ngayon"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Initialize Now"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_UPDATE
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_UPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Update Now"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Baguhin ngayon"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Update Now"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RUNTIMEDB_ACTIVE
- desc: in settings_menu.
- user: core
- <source>
+  id: LANG_RUNTIMEDB_ACTIVE
+  desc: in settings_menu.
+  user: core
+  <source>
     *: "Gather Runtime Data"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ipunin data"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Gather Runtime Data"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_EXPORT
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_EXPORT
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Export Modifications"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Maglabas pagbabago"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Export Modifications"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_IMPORT
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_IMPORT
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Import Modifications"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Umangkat pagbabago"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Import Modifications"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
- desc: in tag cache settings
- user: core
- <source>
+  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
+  desc: in tag cache settings
+  user: core
+  <source>
     *: "Updating in background"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Baguhin sa background"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Updating in background"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_INIT
- desc: while initializing tagcache on boot
- user: core
- <source>
+  id: LANG_TAGCACHE_INIT
+  desc: while initializing tagcache on boot
+  user: core
+  <source>
     *: "Committing database"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Gumawa database"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Committing database"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGCACHE_BUSY
- desc: when trying to shutdown and tagcache is committing
+  id: LANG_TAGCACHE_BUSY
+  desc: when trying to shutdown and tagcache is committing
   user: core
- <source>
+  <source>
     *: "Database is not ready"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Wala sa database"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Database is not ready"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TAGNAVI_ALL_TRACKS
- desc: "<All tracks>" entry in tag browser
- user: core
- <source>
+  id: LANG_TAGNAVI_ALL_TRACKS
+  desc: "<All tracks>" entry in tag browser
+  user: core
+  <source>
     *: "<All tracks>"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "<Lahat ng landas>"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "All tracks"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DISPLAY
- desc: in settings_menu()
- user: core
- <source>
+  id: LANG_DISPLAY
+  desc: in settings_menu()
+  user: core
+  <source>
     *: "Display"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pakita"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Display"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CUSTOM_FONT
- desc: in setting_menu()
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Font"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Tumingin sa font"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Browse Fonts"
- </voice>
+  id: LANG_CUSTOM_FONT
+  desc: in setting_menu()
+  user: core
+  <source>
+    *: "Font"
+  </source>
+  <dest>
+    *: "Tumingin sa font"
+  </dest>
+  <voice>
+    *: "Browse Fonts"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WHILE_PLAYING
- desc: in settings_menu()
- user: core
- <source>
+  id: LANG_WHILE_PLAYING
+  desc: in settings_menu()
+  user: core
+  <source>
     *: "While Playing Screen"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Tumingin sa .wps salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Browse while-playing-screen files"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REMOTE_WHILE_PLAYING
- desc: in settings_menu()
- user: core
- <source>
+  id: LANG_REMOTE_WHILE_PLAYING
+  desc: in settings_menu()
+  user: core
+  <source>
     *: none
     remote: "Remote While Playing Screen"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Tumingin sa .rwps salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Browse remote while-playing-screen files"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LCD_MENU
- desc: in the display sub menu
- user: core
- <source>
+  id: LANG_LCD_MENU
+  desc: in the display sub menu
+  user: core
+  <source>
     *: "LCD Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "LCD Tagpuan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "LCD Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BACKLIGHT
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Backlight"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magilaw sa likod"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Backlight"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT_ON_WHEN_CHARGING
- desc: in display_settings_menu, backlight timeout with charger connected
- user: core
- <source>
+  id: LANG_BACKLIGHT_ON_WHEN_CHARGING
+  desc: in display_settings_menu, backlight timeout with charger connected
+  user: core
+  <source>
     *: none
     charging: "Backlight (While Plugged In)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     charging: "Magilaw sa likod (Tapon samantala)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     charging: "Backlight (While Plugged In)"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT_ON_BUTTON_HOLD
- desc: in lcd settings
- user: core
- <source>
+  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
+  desc: in lcd settings
+  user: core
+  <source>
     *: none
     hold_button: "Backlight on Hold"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     hold_button: "Magilaw sa likod pigilin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     hold_button: "Backlight on hold"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CAPTION_BACKLIGHT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_CAPTION_BACKLIGHT
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Caption Backlight"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magilaw sa likod ng pamagat"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Caption Backlight"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT_FADE_IN
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BACKLIGHT_FADE_IN
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     backlight_fade*: "Backlight Fade In"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     backlight_fade*: "Magilaw sa likod pagpapalit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     backlight_fade*: "Backlight Fade In"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT_FADE_OUT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BACKLIGHT_FADE_OUT
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     backlight_fade*: "Backlight Fade Out"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     backlight_fade*: "Magilaw sa likod pagpapalit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     backlight_fade*: "Backlight Fade Out"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
- desc: Backlight behaviour setting
- user: core
- <source>
+  id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
+  desc: Backlight behaviour setting
+  user: core
+  <source>
     *: "First Buttonpress Enables Backlight Only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pang-una pindutin buttones magbigay-kaya lamang magilaw sa likod"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "First Buttonpress Enables Backlight Only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
- desc: In display settings, time to switch LCD chip into power saving state
- user: core
- <source>
+  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
+  desc: In display settings, time to switch LCD chip into power saving state
+  user: core
+  <source>
     *: none
     lcd_sleep: "Sleep (After Backlight Off)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_sleep: "Pagtulog (Magtapos magilaw sa likod)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_sleep: "Sleep after backlight off"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_NEVER
- desc: in lcd settings
- user: core
- <source>
+  id: LANG_NEVER
+  desc: in lcd settings
+  user: core
+  <source>
     *: none
     lcd_sleep: "Never"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_sleep: "Hindi Kailanman"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_sleep: "Hindi Kailanman"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BRIGHTNESS
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BRIGHTNESS
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     backlight_brightness: "Brightness"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     backlight_brightness: "Maliwanag"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     backlight_brightness: "Brightness"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CONTRAST
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_CONTRAST
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Contrast"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Kaibahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Contrast"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_INVERT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_INVERT
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     lcd_invert,remote_lcd_invert: "LCD Mode"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_invert,remote_lcd_invert: "LCD paraan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_invert,remote_lcd_invert: "LCD Mode"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_INVERT_LCD_INVERSE
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_INVERT_LCD_INVERSE
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     lcd_invert,remote_lcd_invert: "Inverse"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_invert,remote_lcd_invert: "Bali"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_invert,remote_lcd_invert: "Inverse"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FLIP_DISPLAY
- desc: in settings_menu, option to turn display+buttos by 180 degrees
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Upside Down"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Ibaba"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
- </voice>
+  id: LANG_FLIP_DISPLAY
+  desc: in settings_menu, option to turn display+buttos by 180 degrees
+  user: core
+  <source>
+    *: "Upside Down"
+  </source>
+  <dest>
+    *: "Ibaba"
+  </dest>
+  <voice>
+    *: "Upside Down"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_INVERT_CURSOR
- desc: in settings_menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Piliin Guhit Tipo"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
- </voice>
+  id: LANG_INVERT_CURSOR
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Line Selector Type"
+  </source>
+  <dest>
+    *: "Piliin Guhit Tipo"
+  </dest>
+  <voice>
+    *: "Line Selector Type"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_INVERT_CURSOR_POINTER
- desc: in settings_menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Pointer"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Ituro"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Pointer"
- </voice>
+  id: LANG_INVERT_CURSOR_POINTER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Pointer"
+  </source>
+  <dest>
+    *: "Ituro"
+  </dest>
+  <voice>
+    *: "Pointer"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_INVERT_CURSOR_BAR
- desc: in settings_menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Hadlang (Bali)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
- </voice>
+  id: LANG_INVERT_CURSOR_BAR
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Bar (Inverse)"
+  </source>
+  <dest>
+    *: "Hadlang (Bali)"
+  </dest>
+  <voice>
+    *: "Inverse Bar"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CLEAR_BACKDROP
- desc: text for LCD settings menu
- user: core
- <source>
+  id: LANG_CLEAR_BACKDROP
+  desc: text for LCD settings menu
+  user: core
+  <source>
     *: none
     lcd_non-mono: "Clear Backdrop"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_non-mono: "Alisin Backdrop"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_non-mono: "Clear Backdrop"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BACKGROUND_COLOR
- desc: menu entry to set the background color
- user: core
- <source>
+  id: LANG_BACKGROUND_COLOR
+  desc: menu entry to set the background color
+  user: core
+  <source>
     *: none
     lcd_color: "Background Colour"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "Background Kulay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: "Background Colour"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FOREGROUND_COLOR
- desc: menu entry to set the foreground color
- user: core
- <source>
+  id: LANG_FOREGROUND_COLOR
+  desc: menu entry to set the foreground color
+  user: core
+  <source>
     *: none
     lcd_color: "Foreground Colour"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "Foreground Kulay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: "Foreground Colour"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RESET_COLORS
- desc: menu
- user: core
- <source>
+  id: LANG_RESET_COLORS
+  desc: menu
+  user: core
+  <source>
     *: none
     lcd_color: "Reset Colours"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "Muling itakda kulay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: "Reset Colours"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_COLOR_RGB_LABELS
- desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
- user: core
- <source>
+  id: LANG_COLOR_RGB_LABELS
+  desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
+  user: core
+  <source>
     *: none
     lcd_color: "RGB"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "RGB"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_COLOR_RGB_VALUE
- desc: in color screen
- user: core
- <source>
+  id: LANG_COLOR_RGB_VALUE
+  desc: in color screen
+  user: core
+  <source>
     *: none
     lcd_color: "RGB: %02X%02X%02X"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "RGB: %02X%02X%02X"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_COLOR_UNACCEPTABLE
- desc: splash when user selects an invalid colour
- user: core
- <source>
+  id: LANG_COLOR_UNACCEPTABLE
+  desc: splash when user selects an invalid colour
+  user: core
+  <source>
     *: none
     lcd_color: "Invalid colour"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     lcd_color: "Walang-saysay kulay"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     lcd_color: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LCD_REMOTE_MENU
- desc: in the display sub menu
- user: core
- <source>
+  id: LANG_LCD_REMOTE_MENU
+  desc: in the display sub menu
+  user: core
+  <source>
     *: none
     remote: "Remote-LCD Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Remote-LCD Tagpuan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Remote LCD settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REDUCE_TICKING
- desc: in remote lcd settings menu
- user: core
- <source>
+  id: LANG_REDUCE_TICKING
+  desc: in remote lcd settings menu
+  user: core
+  <source>
     *: none
     remote_ticking: "Reduce Ticking"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote_ticking: "Bawasan tik-tak ng orasan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote_ticking: "Reduce Ticking"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SHOW_ICONS
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SHOW_ICONS
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Show Icons"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magpakita Icons"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Show Icons"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_MENU
- desc: in display_settings_menu()
- user: core
- <source>
+  id: LANG_SCROLL_MENU
+  desc: in display_settings_menu()
+  user: core
+  <source>
     *: "Scrolling"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Umikot"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Scrolling"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SCROLL
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Scroll Speed Setting Example"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bilis Umikot Tagpuan Uliran"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_SPEED
- desc: in display_settings_menu()
- user: core
- <source>
+  id: LANG_SCROLL_SPEED
+  desc: in display_settings_menu()
+  user: core
+  <source>
     *: "Scroll Speed"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bilis Umikot"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Scroll Speed"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_DELAY
- desc: Delay before scrolling
- user: core
- <source>
+  id: LANG_SCROLL_DELAY
+  desc: Delay before scrolling
+  user: core
+  <source>
     *: "Scroll Start Delay"
- </source>
- <dest>
+  </source>
+  <dest>
     *: " Magumpisa umikot abala"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Scroll Start Delay"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_STEP
- desc: Pixels to advance per scroll
- user: core
- <source>
+  id: LANG_SCROLL_STEP
+  desc: Pixels to advance per scroll
+  user: core
+  <source>
     *: "Scroll Step Size"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Umikot Laki"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Scroll Step Size"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_STEP_EXAMPLE
- desc: Pixels to advance per scroll
- user: core
- <source>
+  id: LANG_SCROLL_STEP_EXAMPLE
+  desc: Pixels to advance per scroll
+  user: core
+  <source>
     *: "Scroll Step Size Setting Example Text"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Umikot Tagpuan Uliran"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BIDIR_SCROLL
- desc: Bidirectional scroll limit
- user: core
- <source>
+  id: LANG_BIDIR_SCROLL
+  desc: Bidirectional scroll limit
+  user: core
+  <source>
     *: "Bidirectional Scroll Limit"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Dalwa Umikot Hangga"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bidirectional Scroll Limit"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REMOTE_SCROLL_SETS
- desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
- user: core
- <source>
+  id: LANG_REMOTE_SCROLL_SETS
+  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  user: core
+  <source>
     *: none
     remote: "Remote Scrolling Options"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Remote Umikot ng karaptang makipili"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Remote Scrolling Options"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCREEN_SCROLL_VIEW
- desc: should lines scroll out of the screen
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: " Pagtingin nasa labas ng umikot sa screen"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
- </voice>
+  id: LANG_SCREEN_SCROLL_VIEW
+  desc: should lines scroll out of the screen
+  user: core
+  <source>
+    *: "Screen Scrolls Out Of View"
+  </source>
+  <dest>
+    *: " Pagtingin nasa labas ng umikot sa screen"
+  </dest>
+  <voice>
+    *: "Screen Scrolls Out Of View"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCREEN_SCROLL_STEP
- desc: Pixels to advance per Screen scroll
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Umikot sa screen kalakihan"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
- </voice>
+  id: LANG_SCREEN_SCROLL_STEP
+  desc: Pixels to advance per Screen scroll
+  user: core
+  <source>
+    *: "Screen Scroll Step Size"
+  </source>
+  <dest>
+    *: "Umikot sa screen kalakihan"
+  </dest>
+  <voice>
+    *: "Screen Scroll Step Size"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_PAGINATED
- desc: jump to new page when scrolling
- user: core
- <source>
+  id: LANG_SCROLL_PAGINATED
+  desc: jump to new page when scrolling
+  user: core
+  <source>
     *: "Paged Scrolling"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Paged Scrolling"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Paged scrolling"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LISTACCEL_START_DELAY
- desc: Delay before list starts accelerating
- user: core
- <source>
+  id: LANG_LISTACCEL_START_DELAY
+  desc: Delay before list starts accelerating
+  user: core
+  <source>
     *: "List Acceleration Start Delay"
     wheel_acceleration: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bilisihan ng listahan umpisahan abala"
     wheel_acceleration: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "List Acceleration Start Delay"
     wheel_acceleration: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LISTACCEL_ACCEL_SPEED
- desc: list acceleration speed
- user: core
- <source>
+  id: LANG_LISTACCEL_ACCEL_SPEED
+  desc: list acceleration speed
+  user: core
+  <source>
     *: "List Acceleration Speed"
     wheel_acceleration: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bilisihan ng listahan tulin"
     wheel_acceleration: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "List Acceleration Speed"
     wheel_acceleration: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BARS_MENU
- desc: in the display sub menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Estado-/Umikot Hadlang"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
- </voice>
+  id: LANG_BARS_MENU
+  desc: in the display sub menu
+  user: core
+  <source>
+    *: "Status-/Scrollbar"
+  </source>
+  <dest>
+    *: "Estado-/Umikot Hadlang"
+  </dest>
+  <voice>
+    *: "Status- and Scrollbar"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SCROLL_BAR
- desc: display menu, F3 substitute
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Umikot Hadlang"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
- </voice>
+  id: LANG_SCROLL_BAR
+  desc: display menu, F3 substitute
+  user: core
+  <source>
+    *: "Scroll Bar"
+  </source>
+  <dest>
+    *: "Umikot Hadlang"
+  </dest>
+  <voice>
+    *: "Scroll Bar"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_STATUS_BAR
- desc: display menu, F3 substitute
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Status Bar"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Estado Hadlang"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
- </voice>
+  id: LANG_STATUS_BAR
+  desc: display menu, F3 substitute
+  user: core
+  <source>
+    *: "Status Bar"
+  </source>
+  <dest>
+    *: "Estado Hadlang"
+  </dest>
+  <voice>
+    *: "Status Bar"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BUTTON_BAR
- desc: in settings menu
- user: core
- <source>
+  id: LANG_BUTTON_BAR
+  desc: in settings menu
+  user: core
+  <source>
     *: none
     recorder_pad: "Button Bar"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recorder_pad: "Buttones Hadlang"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recorder_pad: "Button Bar"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOLUME_DISPLAY
- desc: Volume type title
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Volume Display"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Pakita Bulumen"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Pakita Bulumen"
- </voice>
+  id: LANG_VOLUME_DISPLAY
+  desc: Volume type title
+  user: core
+  <source>
+    *: "Volume Display"
+  </source>
+  <dest>
+    *: "Pakita Bulumen"
+  </dest>
+  <voice>
+    *: "Pakita Bulumen"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_DISPLAY
- desc: Battery type title
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Battery Display"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Pakita Batirya"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Pakita Batirya"
- </voice>
+  id: LANG_BATTERY_DISPLAY
+  desc: Battery type title
+  user: core
+  <source>
+    *: "Battery Display"
+  </source>
+  <dest>
+    *: "Pakita Batirya"
+  </dest>
+  <voice>
+    *: "Pakita Batirya"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DISPLAY_GRAPHIC
- desc: Label for type of icon display
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Graphic"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Graphic"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Graphic"
- </voice>
+  id: LANG_DISPLAY_GRAPHIC
+  desc: Label for type of icon display
+  user: core
+  <source>
+    *: "Graphic"
+  </source>
+  <dest>
+    *: "Graphic"
+  </dest>
+  <voice>
+    *: "Graphic"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DISPLAY_NUMERIC
- desc: Label for type of icon display
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Numeric"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Numeric"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Numeric"
- </voice>
+  id: LANG_DISPLAY_NUMERIC
+  desc: Label for type of icon display
+  user: core
+  <source>
+    *: "Numeric"
+  </source>
+  <dest>
+    *: "Numeric"
+  </dest>
+  <voice>
+    *: "Numeric"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_MENU
- desc: in the display menu
- user: core
- <source>
+  id: LANG_PM_MENU
+  desc: in the display menu
+  user: core
+  <source>
     *: "Peak Meter"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Peak Metro"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Peak Meter"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_CLIP_HOLD
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_CLIP_HOLD
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Clip Hold Time"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Clip Hold Time"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Clip Hold Time"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_PEAK_HOLD
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_PEAK_HOLD
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Peak Hold Time"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Peak pigilin oras"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Peak Hold Time"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_ETERNAL
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_ETERNAL
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Eternal"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Walang kamatayan"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Eternal"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_RELEASE
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_RELEASE
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Peak Release"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Peak pakawalan"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Peak Release"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_SCALE
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_SCALE
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Scale"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Timbangan"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Scale"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_DBFS
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_DBFS
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Logarithmic (dB)"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Logarithmic (dB)"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Logarithmic decibel"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_LINEAR
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_LINEAR
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Linear (%)"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Linear (%)"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Linear percent"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_MIN
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_MIN
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Minimum Of Range"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pinakamababa sa lagay"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Minimum Of Range"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PM_MAX
- desc: in the peak meter menu
- user: core
- <source>
+  id: LANG_PM_MAX
+  desc: in the peak meter menu
+  user: core
+  <source>
     *: "Maximum Of Range"
     masd: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sukduean sa lagay"
     masd: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Maximum Of Range"
     masd: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DEFAULT_CODEPAGE
- desc: default encoding used with id3 tags
- user: core
- <source>
+  id: LANG_DEFAULT_CODEPAGE
+  desc: default encoding used with id3 tags
+  user: core
+  <source>
     *: "Default Codepage"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pumaltos Codepage"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Default codepage"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_LATIN1
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_LATIN1
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Latin1 (ISO-8859-1)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Latin1 (ISO-8859-1)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Latin 1"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_GREEK
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_GREEK
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Greek (ISO-8859-7)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Greek (ISO-8859-7)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Greek"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_HEBREW
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
- </voice>
+  id: LANG_CODEPAGE_HEBREW
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Hebrew (ISO-8859-8)"
+  </source>
+  <dest>
+    *: "Hebrew (ISO-8859-8)"
+  </dest>
+  <voice>
+    *: "Hebrew"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_CYRILLIC
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_CYRILLIC
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Cyrillic (CP1251)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Cyrillic (CP1251)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Cyrillic"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_THAI
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Thai"
- </voice>
+  id: LANG_CODEPAGE_THAI
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Thai (ISO-8859-11)"
+  </source>
+  <dest>
+    *: "Thai (ISO-8859-11)"
+  </dest>
+  <voice>
+    *: "Thai"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_ARABIC
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Arabic"
- </voice>
+  id: LANG_CODEPAGE_ARABIC
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Arabic (CP1256)"
+  </source>
+  <dest>
+    *: "Arabic (CP1256)"
+  </dest>
+  <voice>
+    *: "Arabic"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_TURKISH
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_TURKISH
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Turkish (ISO-8859-9)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Turkish (ISO-8859-9)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Turkish"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_LATIN_EXTENDED
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_LATIN_EXTENDED
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Latin Extended (ISO-8859-2)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Latin Extended (ISO-8859-2)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Latin extended"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_JAPANESE
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Japanese"
- </voice>
+  id: LANG_CODEPAGE_JAPANESE
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Japanese (SJIS)"
+  </source>
+  <dest>
+    *: "Japanese (SJIS)"
+  </dest>
+  <voice>
+    *: "Japanese"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_SIMPLIFIED
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
- </voice>
+  id: LANG_CODEPAGE_SIMPLIFIED
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Simp. Chinese (GB2312)"
+  </source>
+  <dest>
+    *: "Simp. Chinese (GB2312)"
+  </dest>
+  <voice>
+    *: "Simplified Chinese"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_KOREAN
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Korean"
- </voice>
+  id: LANG_CODEPAGE_KOREAN
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Korean (KSX1001)"
+  </source>
+  <dest>
+    *: "Korean (KSX1001)"
+  </dest>
+  <voice>
+    *: "Korean"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_TRADITIONAL
- desc: in codepage setting menu
- user: core
- <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
- </source>
- <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
- </dest>
- <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
- </voice>
+  id: LANG_CODEPAGE_TRADITIONAL
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Trad. Chinese (BIG5)"
+  </source>
+  <dest>
+    *: "Trad. Chinese (BIG5)"
+  </dest>
+  <voice>
+    *: "Traditional Chinese"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CODEPAGE_UTF8
- desc: in codepage setting menu
- user: core
- <source>
+  id: LANG_CODEPAGE_UTF8
+  desc: in codepage setting menu
+  user: core
+  <source>
     *: "Unicode (UTF-8)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Unicode (UTF-8)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Unicode"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BUTTONLIGHT_TIMEOUT
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BUTTONLIGHT_TIMEOUT
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
- </source>
- <dest>
+    sansae200*,sansafuze*: "Wheel Light Timeout"
+  </source>
+  <dest>
     *: none
     button_light: "Pahintuin buttones sa ilaw"
-    sansafuze*,sansae200*: "Pahintuin gulong sa ilaw"
- </dest>
- <voice>
+    sansae200*,sansafuze*: "Pahintuin gulong sa ilaw"
+  </dest>
+  <voice>
     *: none
     button_light: ""
-    sansafuze*,sansae200*: "Wheel Light Timeout"
- </voice>
+    sansae200*,sansafuze*: "Wheel Light Timeout"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BUTTONLIGHT_BRIGHTNESS
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BUTTONLIGHT_BRIGHTNESS
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     buttonlight_brightness: "Button Light Brightness"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     buttonlight_brightness: "Buttones liwanag sa ilaw"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     buttonlight_brightness: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_START_SCREEN
- desc: in the system sub menu
- user: core
- <source>
+  id: LANG_START_SCREEN
+  desc: in the system sub menu
+  user: core
+  <source>
     *: "Start Screen"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Magumpisa Tabing"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Start Screen"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MAIN_MENU
- desc: in start screen setting
- user: core
- <source>
+  id: LANG_MAIN_MENU
+  desc: in start screen setting
+  user: core
+  <source>
     *: "Main Menu"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Panguna mga putahe"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Main Menu"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PREVIOUS_SCREEN
- desc: in start screen setting
- user: core
- <source>
+  id: LANG_PREVIOUS_SCREEN
+  desc: in start screen setting
+  user: core
+  <source>
     *: "Previous Screen"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Nauuna Tabing"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Previous Screen"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_MENU
- desc: in the system sub menu
- user: core
- <source>
+  id: LANG_BATTERY_MENU
+  desc: in the system sub menu
+  user: core
+  <source>
     *: "Battery"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Batirya"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Batirya"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_CAPACITY
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_BATTERY_CAPACITY
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Battery Capacity"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Laman Batirya"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Laman Batirya"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_TYPE
- desc: in battery settings
- user: core
- <source>
+  id: LANG_BATTERY_TYPE
+  desc: in battery settings
+  user: core
+  <source>
     *: none
     battery_types: "Battery Type"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     battery_types: "Batirya Typo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     battery_types: "Battery type"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_TYPE_1
- desc: in battery settings
- user: core
- <source>
+  id: LANG_BATTERY_TYPE_1
+  desc: in battery settings
+  user: core
+  <source>
     *: none
     battery_types: "Alkaline"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     battery_types: "Alkaline"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     battery_types: "Alkaline"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BATTERY_TYPE_2
- desc: in battery settings
- user: core
- <source>
+  id: LANG_BATTERY_TYPE_2
+  desc: in battery settings
+  user: core
+  <source>
     *: none
     battery_types: "NiMH"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     battery_types: "NiMH"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     battery_types: "Nickel metal hydride"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DISK_MENU
- desc: in the system sub menu
- user: core
- <source>
+  id: LANG_DISK_MENU
+  desc: in the system sub menu
+  user: core
+  <source>
     *: "Disk"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Disk"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Disk"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPINDOWN
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SPINDOWN
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Disk Spindown"
     flash_storage: none
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Disk Spindown"
     flash_storage: none
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Disk Spindown"
     flash_storage: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_DIRCACHE_ENABLE
- desc: in directory cache settings
- user: core
- <source>
+  id: LANG_DIRCACHE_ENABLE
+  desc: in directory cache settings
+  user: core
+  <source>
     *: none
     dircache: "Directory Cache"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     dircache: "Directory Cache"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     dircache: "Directory Cache"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TIME_MENU
- desc: in the system sub menu
- user: core
- <source>
+  id: LANG_TIME_MENU
+  desc: in the system sub menu
+  user: core
+  <source>
     *: none
     rtc: "Time & Date"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Petsa at Oras"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Petsa at Oras"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SET_TIME
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_SET_TIME
+  desc: in settings_menu
+  user: core
+  <source>
     *: none
     rtc: "Set Time/Date"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Ilagay Oras/Petsa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Set Time and Date"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TIMEFORMAT
- desc: select the time format of time in status bar
- user: core
- <source>
+  id: LANG_TIMEFORMAT
+  desc: select the time format of time in status bar
+  user: core
+  <source>
     *: "Time Format"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Paraan Oras"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Time Format"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_12_HOUR_CLOCK
- desc: option for 12 hour clock
- user: core
- <source>
+  id: LANG_12_HOUR_CLOCK
+  desc: option for 12 hour clock
+  user: core
+  <source>
     *: "12 Hour Clock"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "12 Orasan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "12 Hour Clock"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_24_HOUR_CLOCK
- desc: option for 24 hour clock
- user: core
- <source>
+  id: LANG_24_HOUR_CLOCK
+  desc: option for 24 hour clock
+  user: core
+  <source>
     *: "24 Hour Clock"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "24 Orasan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "24 Hour Clock"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TIME_SET_BUTTON
- desc: used in set_time()
- user: core
- <source>
+  id: LANG_TIME_SET_BUTTON
+  desc: used in set_time()
+  user: core
+  <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
- </source>
- <dest>
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
+  </source>
+  <dest>
     *: none
-    rtc: "ON = Ilagay"
-    mrobe500: "HEART =Ilagay"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ilagay"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ilagay"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ilagay"
     gogearsa9200,samsungyh*: "PLAY = Ilagay"
-    vibe500: "OK = Ilagay"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ilagay"
     mpiohd300: "ENTER = Ilagay"
- </dest>
- <voice>
+    mrobe500: "HEART =Ilagay"
+    rtc: "ON = Ilagay"
+    vibe500: "OK = Ilagay"
+  </dest>
+  <voice>
     *: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_TIME_REVERT
- desc: used in set_time()
- user: core
- <source>
+  id: LANG_TIME_REVERT
+  desc: used in set_time()
+  user: core
+  <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
- </source>
- <dest>
+    vibe500: "CANCEL = Revert"
+  </source>
+  <dest>
     *: none
-    rtc: "OFF = Mabalik"
-    mrobe500: "POWER = Mabalik"
-    iriverh100,iriverh120,iriverh300: "STOP = Mabalik"
-    ipod*,sansac200*,mpiohd300: "MENU = Mabalik"
-    iaudiox5,iaudiom5: "RECORD = Mabalik"
+    gigabeatfx,mrobe500: "POWER = Mabalik"
+    gigabeats,sansafuzeplus: "BACK = Mabalik"
+    gogearsa9200: "LEFT = Mabalik"
+    iaudiom5,iaudiox5: "RECORD = Mabalik"
+    ipod*,mpiohd300,sansac200*: "MENU = Mabalik"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Mabalik"
-    gigabeatfx: "POWER = Mabalik"
-    sansafuzeplus: "BACK = Mabalik"
+    iriverh100,iriverh120,iriverh300: "STOP = Mabalik"
     mrobe100: "DISPLAY = Mabalik"
-    gigabeats: "BACK = Mabalik"
-    gogearsa9200: "LEFT = Mabalik"
-    vibe500: "C = Mabalik"
+    rtc: "OFF = Mabalik"
     samsungyh*: "REW = Mabalik"
- </dest>
- <voice>
+    vibe500: "C = Mabalik"
+  </dest>
+  <voice>
     *: none
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_SUNDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_SUNDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Sun"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Lin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Linggo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_MONDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_MONDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Mon"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Lun"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Lunes"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_TUESDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_TUESDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Tue"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Mar"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Martes"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_WEDNESDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_WEDNESDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Wed"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Miy"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Miyerkoles"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_THURSDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_THURSDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Thu"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Huw"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Huwebes"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_FRIDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_FRIDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Fri"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Biy"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Biyernes"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_WEEKDAY_SATURDAY
- desc: Maximum 3-letter abbreviation for weekday
- user: core
- <source>
+  id: LANG_WEEKDAY_SATURDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
     *: none
     rtc: "Sat"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     rtc: "Sab"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     rtc: "Sabado"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_JANUARY
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_JANUARY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Jan"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ene"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Enero"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_FEBRUARY
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_FEBRUARY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Feb"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Peb"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Pebrero"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_MARCH
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_MARCH
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Mar"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mar"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Marso"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_APRIL
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_APRIL
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Apr"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Abr"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Abril"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_MAY
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_MAY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "May"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "May"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Mayo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_JUNE
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_JUNE
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Jun"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Hun"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Hunyo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_JULY
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_JULY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Jul"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Hul"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Hulyo"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_AUGUST
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_AUGUST
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Aug"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ago"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Agosto"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_SEPTEMBER
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_SEPTEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Sep"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sep"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Septiyembre"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_OCTOBER
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_OCTOBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Oct"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Okt"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Oktubre"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_NOVEMBER
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_NOVEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Nov"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Nob"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Nobiyembre"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MONTH_DECEMBER
- desc: Maximum 3-letter abbreviation for monthname
- user: core
- <source>
+  id: LANG_MONTH_DECEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
     *: "Dec"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Dis"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Disiyembre"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_POWEROFF_IDLE
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_POWEROFF_IDLE
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Idle Poweroff"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Nakatigil pagpihit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Idle Poweroff"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SLEEP_TIMER
- desc: sleep timer setting
- user: core
- <source>
+  id: LANG_SLEEP_TIMER
+  desc: sleep timer setting
+  user: core
+  <source>
     *: "Sleep Timer"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Matulog ng oras"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Sleep Timer"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LIMITS_MENU
- desc: in the system sub menu
- user: core
- <source>
+  id: LANG_LIMITS_MENU
+  desc: in the system sub menu
+  user: core
+  <source>
     *: "Limits"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Hangga"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Limits"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MAX_FILES_IN_DIR
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_MAX_FILES_IN_DIR
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Max Entries in File Browser"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sukduean isalansan sa pakita listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Maximum files in directory browser"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MAX_FILES_IN_PLAYLIST
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_MAX_FILES_IN_PLAYLIST
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Max Playlist Size"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sukduean Listahan Laki"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Maximum playlist size"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CAR_ADAPTER_MODE
- desc: Displayed for setting car adapter mode to on/off
- user: core
- <source>
+  id: LANG_CAR_ADAPTER_MODE
+  desc: Displayed for setting car adapter mode to on/off
+  user: core
+  <source>
     *: none
     charging: "Car Adapter Mode"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
-    charging: "Paraan ng Kotse Adapter " 
- </dest>
- <voice>
+    charging: "Paraan ng Kotse Adapter "
+  </dest>
+  <voice>
     *: none
     charging: "Car Adapter Mode"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_ALARM_MENU
- desc: The name of the additional entry in the main menu for the RTC alarm mod.
- user: core
- <source>
+  id: LANG_ALARM_MOD_ALARM_MENU
+  desc: The name of the additional entry in the main menu for the RTC alarm mod.
+  user: core
+  <source>
     *: none
     alarm: "Wake-Up Alarm"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Magising Alarma"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Wake-Up Alarm"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_WAKEUP_SCREEN
- desc: in alarm menu setting
- user: core
- <source>
+  id: LANG_ALARM_WAKEUP_SCREEN
+  desc: in alarm menu setting
+  user: core
+  <source>
     *: none
     alarm: "Alarm Wake up Screen"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Magising Alarma Tabing"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Alarm Wake up Screen"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_TIME
- desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
- user: core
- <source>
+  id: LANG_ALARM_MOD_TIME
+  desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
+  user: core
+  <source>
     *: none
     alarm: "Alarm Time:"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Alarma oras:"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_TIME_TO_GO
- desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
- user: core
- <source>
+  id: LANG_ALARM_MOD_TIME_TO_GO
+  desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
+  user: core
+  <source>
     *: none
     alarm: "Waking Up In %d:%02d"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Magising Alarma sa In %d:%02d"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Magising Alarma sa In"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_SHUTDOWN
- desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
- user: core
- <source>
+  id: LANG_ALARM_MOD_SHUTDOWN
+  desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
+  user: core
+  <source>
     *: none
     alarm: "Alarm Set"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Ilagay Alarma"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Alarm set"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_ERROR
- desc: The text that tells that the time is incorrect (for the RTC alarm mod).
- user: core
- <source>
+  id: LANG_ALARM_MOD_ERROR
+  desc: The text that tells that the time is incorrect (for the RTC alarm mod).
+  user: core
+  <source>
     *: none
     alarm: "Alarm Time Is Too Soon!"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Alarma oras ay madali!"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Alarm Time Is Too Soon!"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_KEYS
- desc: Shown key functions in alarm menu (for the RTC alarm mod).
- user: core
- <source>
+  id: LANG_ALARM_MOD_KEYS
+  desc: Shown key functions in alarm menu (for the RTC alarm mod).
+  user: core
+  <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
- </source>
- <dest>
+    vibe500: "OK=Set C=Cancel"
+  </source>
+  <dest>
     *: none
     alarm: "PLAY=Ilagay OFF=Kanselahin"
+    gigabeats: "SELECT = Ilagay POWER = Kanselahin"
     ipod*: "SELECT=Ilagay MENU=Kanselahin"
     iriverh10,iriverh10_5gb: "SELECT = Ilagay MENU = Kanselahin"
-    gigabeats: "SELECT = Ilagay POWER = Kanselahin"
-    vibe500: "OK=Ilagay C=Kanselahin"
     mpiohd300: "ENTER=Ilagay MENU=Kanselahin"
     sansafuzeplus: "SELECT=Ilagay  BACK=Kanselahin"
- </dest>
- <voice>
+    vibe500: "OK=Ilagay C=Kanselahin"
+  </dest>
+  <voice>
     *: none
-    alarm: ""
-    ipod*: ""
-    iriverh10,iriverh10_5gb: ""
-    gigabeats: ""
- </voice>
+    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ALARM_MOD_DISABLE
- desc: Announce that the RTC alarm has been turned off
- user: core
- <source>
+  id: LANG_ALARM_MOD_DISABLE
+  desc: Announce that the RTC alarm has been turned off
+  user: core
+  <source>
     *: none
     alarm: "Alarm Disabled"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     alarm: "Paghintuin Alarma"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     alarm: "Alarm Disabled"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS
- desc: in general settings
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS
+  desc: in general settings
+  user: core
+  <source>
     *: "Bookmarking"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bookmarking"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bookmarking"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_AUTOCREATE
- desc: prompt for user to decide to create an bookmark
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_AUTOCREATE
+  desc: prompt for user to decide to create an bookmark
+  user: core
+  <source>
     *: "Bookmark on Stop"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Paghinto sa Bookmark "
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Bookmark on Stop"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES
- desc: Save in recent bookmarks only
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES
+  desc: Save in recent bookmarks only
+  user: core
+  <source>
     *: "Yes - Recent only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Oo - Di pa natatagalan lamang"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Yes - Recent only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK
- desc: Save in recent bookmarks only
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK
+  desc: Save in recent bookmarks only
+  user: core
+  <source>
     *: "Ask - Recent only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: " Itanong - Di pa natatagalan lamang"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Ask - Recent only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_AUTOLOAD
- desc: prompt for user to decide to create a bookmark
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_AUTOLOAD
+  desc: prompt for user to decide to create a bookmark
+  user: core
+  <source>
     *: "Load Last Bookmark"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ikarga huli Bookmark"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Load Last Bookmark"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS
- desc: Configuration option to maintain a list of recent bookmarks
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS
+  desc: Configuration option to maintain a list of recent bookmarks
+  user: core
+  <source>
     *: "Maintain a List of Recent Bookmarks?"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pamalagiin listahan di pa natatagalan ng Bookmarks?"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Maintain a List of Recent Bookmarks?"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
- desc: Save only on bookmark for each playlist in recent bookmarks
- user: core
- <source>
+  id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
+  desc: Save only on bookmark for each playlist in recent bookmarks
+  user: core
+  <source>
     *: "Unique only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Walang kaparis"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Unique only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LANGUAGE
- desc: in settings_menu
- user: core
- <source>
+  id: LANG_LANGUAGE
+  desc: in settings_menu
+  user: core
+  <source>
     *: "Language"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Salita"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Language"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LANGUAGE_LOADED
- desc: shown when a language has been loaded from the dir browser
- user: core
- <source>
+  id: LANG_LANGUAGE_LOADED
+  desc: shown when a language has been loaded from the dir browser
+  user: core
+  <source>
     *: "New Language"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Bago Salita"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "New Language"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE
- desc: root of voice menu
- user: core
- <source>
+  id: LANG_VOICE
+  desc: root of voice menu
+  user: core
+  <source>
     *: "Voice"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Boses"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Voice"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_MENU
- desc: item of voice menu, enable/disable the voice UI
- user: core
- <source>
+  id: LANG_VOICE_MENU
+  desc: item of voice menu, enable/disable the voice UI
+  user: core
+  <source>
     *: "Voice Menus"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Boses Mga Puthe"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Voice Menus"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_DIR
- desc: item of voice menu, set the voice mode for directories
- user: core
- <source>
+  id: LANG_VOICE_DIR
+  desc: item of voice menu, set the voice mode for directories
+  user: core
+  <source>
     *: "Voice Directories"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Boses Listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Voice Directories"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_DIR_TALK
- desc: Item of voice menu, whether to use directory .talk clips
- user: core
- <source>
+  id: LANG_VOICE_DIR_TALK
+  desc: Item of voice menu, whether to use directory .talk clips
+  user: core
+  <source>
     *: "Use Directory .talk Clips"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Gamitin Listahan .talk Klips"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Use Directory .talk Clips"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_FILE
- desc: item of voice menu, set the voice mode for files
- user: core
- <source>
+  id: LANG_VOICE_FILE
+  desc: item of voice menu, set the voice mode for files
+  user: core
+  <source>
     *: "Voice Filenames"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Boses Pangalan ng salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Voice Filenames"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_FILE_TALK
- desc: Item of voice menu, whether to use file .talk clips
- user: core
- <source>
+  id: LANG_VOICE_FILE_TALK
+  desc: Item of voice menu, whether to use file .talk clips
+  user: core
+  <source>
     *: "Use File .talk Clips"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Gamitin Salansan .talk Klips"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Use File .talk Clips"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_NUMBER
- desc: "talkbox" mode for files+directories
- user: core
- <source>
+  id: LANG_VOICE_NUMBER
+  desc: "talkbox" mode for files+directories
+  user: core
+  <source>
     *: "Numbers"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Numero"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Numbers"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_SPELL
- desc: "talkbox" mode for files+directories
- user: core
- <source>
+  id: LANG_VOICE_SPELL
+  desc: "talkbox" mode for files+directories
+  user: core
+  <source>
     *: "Spell"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Engkanto"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Spell"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_VOICE_DIR_HOVER
- desc: "talkbox" mode for directories + files
- user: core
- <source>
+  id: LANG_VOICE_DIR_HOVER
+  desc: "talkbox" mode for directories + files
+  user: core
+  <source>
     *: ".talk Clip"
- </source>
- <dest>
+  </source>
+  <dest>
     *: ".talk klip"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "talk mp3 clip"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MANAGE_MENU
- desc: in the main menu
- user: core
- <source>
+  id: LANG_MANAGE_MENU
+  desc: in the main menu
+  user: core
+  <source>
     *: "Manage Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Panagasiwaan Tagpuan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Manage Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CUSTOM_CFG
- desc: in setting_menu()
- user: core
- <source>
+  id: LANG_CUSTOM_CFG
+  desc: in setting_menu()
+  user: core
+  <source>
     *: "Browse .cfg Files"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pakita .cfg Salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Browse configuration files"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SETTINGS_LOADED
- desc: Feedback shown when a .cfg file is loaded
- user: core
- <source>
+  id: LANG_SETTINGS_LOADED
+  desc: Feedback shown when a .cfg file is loaded
+  user: core
+  <source>
     *: "Settings Loaded"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ilagay ng karga"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Settings Loaded"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RESET
- desc: in system_settings_menu()
- user: core
- <source>
+  id: LANG_RESET
+  desc: in system_settings_menu()
+  user: core
+  <source>
     *: "Reset Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Ilagay muling itakda"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Reset Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RESET_DONE_CLEAR
- desc: visual confirmation after settings reset
- user: core
- <source>
+  id: LANG_RESET_DONE_CLEAR
+  desc: visual confirmation after settings reset
+  user: core
+  <source>
     *: "Cleared"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Alisin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Settings Cleared"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SAVE_SETTINGS
- desc: in system_settings_menu()
- user: core
- <source>
+  id: LANG_SAVE_SETTINGS
+  desc: in system_settings_menu()
+  user: core
+  <source>
     *: "Save .cfg File"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Sumulat .cfg salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Write configuration file"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SETTINGS_SAVED
- desc: Feedback shown when a .cfg file is saved
- user: core
- <source>
+  id: LANG_SETTINGS_SAVED
+  desc: Feedback shown when a .cfg file is saved
+  user: core
+  <source>
     *: "Settings Saved"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mag-ipon"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Settings Saved"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SAVE_THEME
- desc: save a theme file
- user: core
- <source>
+  id: LANG_SAVE_THEME
+  desc: save a theme file
+  user: core
+  <source>
     *: "Save Theme Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Mag-ipun Tema"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Save Theme Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CUSTOM_THEME
- desc: in the main menu
- user: core
- <source>
+  id: LANG_CUSTOM_THEME
+  desc: in the main menu
+  user: core
+  <source>
     *: "Browse Theme Files"
- </source>
- <dest>
+  </source>
+  <dest>
     *: "Pakita Tema"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: "Browse Themes"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_SETTINGS
- desc: in the main menu
- user: core
- <source>
+  id: LANG_RECORDING_SETTINGS
+  desc: in the main menu
+  user: core
+  <source>
     *: none
     recording: "Recording Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Ilagay Rekording"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Recording Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_MENU
- desc: fm menu title
- user: core
- <source>
+  id: LANG_FM_MENU
+  desc: fm menu title
+  user: core
+  <source>
     *: none
     radio: "FM Radio Menu"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "FM Radyo Mga putahe"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "FM Radio Menu"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_NO_PRESETS
- desc: error when preset list is empty
- user: core
- <source>
+  id: LANG_FM_NO_PRESETS
+  desc: error when preset list is empty
+  user: core
+  <source>
     *: none
     radio: "No presets"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Wala presets"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "No presets"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_ADD_PRESET
- desc: in radio menu
- user: core
- <source>
+  id: LANG_FM_ADD_PRESET
+  desc: in radio menu
+  user: core
+  <source>
     *: none
     radio: "Add Preset"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Idagdag Preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Add Preset"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_EDIT_PRESET
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_EDIT_PRESET
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio: "Edit Preset"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Mamatnugot Preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Edit Preset"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_DELETE_PRESET
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_DELETE_PRESET
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio: "Remove Preset"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Alisin Preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Remove Preset"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_PRESET_SAVE_FAILED
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_PRESET_SAVE_FAILED
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio: "Preset Save Failed"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Wala ng mag-ipun preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Preset Save Failed"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_NO_FREE_PRESETS
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_NO_FREE_PRESETS
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio: "The Preset List is Full"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Puno sa listahan ng preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "The Preset List is Full"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BUTTONBAR_MENU
- desc: in button bar
- user: core
- <source>
+  id: LANG_BUTTONBAR_MENU
+  desc: in button bar
+  user: core
+  <source>
     *: none
     radio_screen_button_bar: "Menu"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio_screen_button_bar: "Mga putahe"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio_screen_button_bar: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_BUTTONBAR_EXIT
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_BUTTONBAR_EXIT
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio_screen_button_bar: "Exit"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio_screen_button_bar: "Labasan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio_screen_button_bar: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_BUTTONBAR_ACTION
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_BUTTONBAR_ACTION
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio_screen_button_bar: "Action"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio_screen_button_bar: "Kilos"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio_screen_button_bar: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_PRESET
- desc: in button bar and radio screen / menu
- user: core
- <source>
+  id: LANG_PRESET
+  desc: in button bar and radio screen / menu
+  user: core
+  <source>
     *: none
     radio: "Preset"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_BUTTONBAR_ADD
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_BUTTONBAR_ADD
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio_screen_button_bar: "Add"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio_screen_button_bar: "Idagdag"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio_screen_button_bar: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_BUTTONBAR_RECORD
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_BUTTONBAR_RECORD
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio_screen_button_bar: "Record"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio_screen_button_bar: "Rekord"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio_screen_button_bar: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_MONO_MODE
- desc: in radio screen
- user: core
- <source>
+  id: LANG_FM_MONO_MODE
+  desc: in radio screen
+  user: core
+  <source>
     *: none
     radio: "Force Mono"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Pumilit mono"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Force Mono"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_FREEZE
- desc: splash screen during freeze in radio mode
- user: core
- <source>
+  id: LANG_FM_FREEZE
+  desc: splash screen during freeze in radio mode
+  user: core
+  <source>
     *: none
     radio: "Screen frozen!"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Tabingan amuonanigas!"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_SCAN_PRESETS
- desc: in radio menu
- user: core
- <source>
+  id: LANG_FM_SCAN_PRESETS
+  desc: in radio menu
+  user: core
+  <source>
     *: none
     radio: "Auto-Scan Presets"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Kusa siglawan Presets"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Auto scan presets"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_CLEAR_PRESETS
- desc: confirmation if presets can be cleared
- user: core
- <source>
+  id: LANG_FM_CLEAR_PRESETS
+  desc: confirmation if presets can be cleared
+  user: core
+  <source>
     *: none
     radio: "Clear Current Presets?"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Alisin koryente preset?"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Clear Current Presets?"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_SCANNING
- desc: during auto scan
- user: core
- <source>
+  id: LANG_FM_SCANNING
+  desc: during auto scan
+  user: core
+  <source>
     *: none
     radio: "Scanning %d.%02d MHz"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Siglawan %d.%02d MHz"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_DEFAULT_PRESET_NAME
- desc: default preset name for auto scan mode
- user: core
- <source>
+  id: LANG_FM_DEFAULT_PRESET_NAME
+  desc: default preset name for auto scan mode
+  user: core
+  <source>
     *: none
     radio: "%d.%02d MHz"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "%d.%02d MHz"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RADIO_SCAN_MODE
- desc: in radio screen / menu
- user: core
- <source>
+  id: LANG_RADIO_SCAN_MODE
+  desc: in radio screen / menu
+  user: core
+  <source>
     *: none
     radio: "Scan"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Siglawan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_PRESET_LOAD
- desc: load preset list in fm radio
- user: core
- <source>
+  id: LANG_FM_PRESET_LOAD
+  desc: load preset list in fm radio
+  user: core
+  <source>
     *: none
     radio: "Load Preset List"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Ikarga Listahan ng preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Load Preset List"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_PRESET_SAVE
- desc: Save preset list in fm radio
- user: core
- <source>
+  id: LANG_FM_PRESET_SAVE
+  desc: Save preset list in fm radio
+  user: core
+  <source>
     *: none
     radio: "Save Preset List"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Mag-ipon listahan ng preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Save Preset List"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_PRESET_CLEAR
- desc: clear preset list in fm radio
- user: core
- <source>
+  id: LANG_FM_PRESET_CLEAR
+  desc: clear preset list in fm radio
+  user: core
+  <source>
     *: none
     radio: "Clear Preset List"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Alisin listahan ng preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Clear Preset List"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FMR
- desc: Used when you need to say Preset List, also voiced
- user: core
- <source>
+  id: LANG_FMR
+  desc: Used when you need to say Preset List, also voiced
+  user: core
+  <source>
     *: none
     radio: "Preset List"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Listahan ng preset"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Preset List"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_FIRST_AUTOSCAN
- desc: When you run the radio without an fmr file in settings
- user: core
- <source>
+  id: LANG_FM_FIRST_AUTOSCAN
+  desc: When you run the radio without an fmr file in settings
+  user: core
+  <source>
     *: none
     radio: "No settings found. Autoscan?"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Wala pakita ng ilagay. Kusa siglawan?"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "No settings found. Autoscan?"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_SAVE_CHANGES
+  id: LANG_FM_SAVE_CHANGES
   desc: deprecated
- user: core
- <source>
+  user: core
+  <source>
     *: none
     radio: ""
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: ""
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: ""
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_REGION
- desc: fm tuner region setting
+  id: LANG_FM_REGION
+  desc: fm tuner region setting
   user: core
- <source>
+  <source>
     *: none
     radio: "Region"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Rehiyon"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Region"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_EUROPE
- desc: fm tuner region europe
+  id: LANG_FM_EUROPE
+  desc: fm tuner region europe
   user: core
- <source>
+  <source>
     *: none
     radio: "Europe"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Europa"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Europe"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_US
- desc: fm region us / canada
+  id: LANG_FM_US
+  desc: fm region us / canada
   user: core
- <source>
+  <source>
     *: none
     radio: "US / Canada"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "US / Canada"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "US and Canada"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_JAPAN
- desc: fm region japan
+  id: LANG_FM_JAPAN
+  desc: fm region japan
   user: core
- <source>
+  <source>
     *: none
     radio: "Japan"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Japan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Japan"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_FM_KOREA
- desc: fm region korea
+  id: LANG_FM_KOREA
+  desc: fm region korea
   user: core
- <source>
+  <source>
     *: none
     radio: "Korea"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     radio: "Korea"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     radio: "Korea"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_FORMAT
- desc: audio format item in recording menu
- user: core
- <source>
+  id: LANG_RECORDING_FORMAT
+  desc: audio format item in recording menu
+  user: core
+  <source>
     *: none
     recording: "Format"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Format"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Format"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AFMT_MPA_L3
- desc: audio format description
- user: core
- <source>
+  id: LANG_AFMT_MPA_L3
+  desc: audio format description
+  user: core
+  <source>
     *: none
     recording: "MPEG Layer 3"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "MPEG Layer 3"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "MPEG Layer 3"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AFMT_PCM_WAV
- desc: audio format description
- user: core
- <source>
+  id: LANG_AFMT_PCM_WAV
+  desc: audio format description
+  user: core
+  <source>
     *: none
     recording: "PCM Wave"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "PCM Wave"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "PCM Wave"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AFMT_WAVPACK
- desc: audio format description
- user: core
- <source>
+  id: LANG_AFMT_WAVPACK
+  desc: audio format description
+  user: core
+  <source>
     *: none
     recording_swcodec: "WavPack"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording_swcodec: "WavPack"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording_swcodec: "WavPack"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_AFMT_AIFF
- desc: audio format description
- user: core
- <source>
+  id: LANG_AFMT_AIFF
+  desc: audio format description
+  user: core
+  <source>
     *: none
     recording: "AIFF"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "AIFF"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "AIFF"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_ENCODER_SETTINGS
- desc: encoder settings
- user: core
- <source>
+  id: LANG_ENCODER_SETTINGS
+  desc: encoder settings
+  user: core
+  <source>
     *: none
     recording: "Encoder Settings"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Encoder Tagpuan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Encoder Settings"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_BITRATE
- desc: bits-kilobits per unit time
- user: core
- <source>
+  id: LANG_BITRATE
+  desc: bits-kilobits per unit time
+  user: core
+  <source>
     *: none
     recording_swcodec: "Bitrate"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording_swcodec: "Bitrate"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording_swcodec: "Bitrate"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_NO_SETTINGS
- desc: when something has settings in a certain context
- user: core
- <source>
+  id: LANG_NO_SETTINGS
+  desc: when something has settings in a certain context
+  user: core
+  <source>
     *: none
     recording: "(No Settings)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "(Wala Tagpuan)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "No settings available"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_QUALITY
- desc: in the recording settings
- user: core
- <source>
+  id: LANG_RECORDING_QUALITY
+  desc: in the recording settings
+  user: core
+  <source>
     *: none
     recording_hwcodec: "Quality"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording_hwcodec: "Uri"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording_hwcodec: "Quality"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_FREQUENCY
   desc: in recording and playback settings
- user: core
- <source>
+  user: core
+  <source>
     *: none
-    recording,play_frequency: "Frequency"
- </source>
- <dest>
+    play_frequency,recording: "Frequency"
+  </source>
+  <dest>
     *: none
-    recording,play_frequency: "Dalas"
- </dest>
- <voice>
+    play_frequency,recording: "Dalas"
+  </dest>
+  <voice>
     *: none
-    recording,play_frequency: "Frequency"
- </voice>
+    play_frequency,recording: "Frequency"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SOURCE_FREQUENCY
- desc: when recording source frequency setting must follow source
- user: core
- <source>
+  id: LANG_SOURCE_FREQUENCY
+  desc: when recording source frequency setting must follow source
+  user: core
+  <source>
     *: none
     recording: "(Same As Source)"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "(Gaya ng puno)"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Same As Source"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_SOURCE
- desc: in the recording settings
- user: core
- <source>
+  id: LANG_RECORDING_SOURCE
+  desc: in the recording settings
+  user: core
+  <source>
     *: none
     recording: "Source"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Puno"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Source"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_SRC_MIC
- desc: in the recording settings
- user: core
- <source>
+  id: LANG_RECORDING_SRC_MIC
+  desc: in the recording settings
+  user: core
+  <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
- </source>
- <dest>
+    recording: "Microphone"
+  </source>
+  <dest>
     *: none
-    recording: "Mikropono"
     iriverh100,iriverh120,iriverh300: "Panloob mikropono"
- </dest>
- <voice>
+    recording: "Mikropono"
+  </dest>
+  <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
- </voice>
+    recording: "Microphone"
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_SRC_DIGITAL
- desc: in the recording settings
- user: core
- <source>
+  id: LANG_RECORDING_SRC_DIGITAL
+  desc: in the recording settings
+  user: core
+  <source>
     *: none
     recording: "Digital"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Digital"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Digital"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_LINE_IN
- desc: in the recording settings
- user: core
- <source>
+  id: LANG_LINE_IN
+  desc: in the recording settings
+  user: core
+  <source>
     *: none
     recording: "Line In"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Sa Guhit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Line In"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORDING_EDITABLE
- desc: Editable recordings setting
- user: core
- <source>
+  id: LANG_RECORDING_EDITABLE
+  desc: Editable recordings setting
+  user: core
+  <source>
     *: none
     recording_hwcodec: "Independent Frames"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording_hwcodec: "May kasarinlan o pagsasarili kuwardo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording_hwcodec: "Independent Frames"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_TIMESPLIT
- desc: Record split menu
- user: core
- <source>
+  id: LANG_RECORD_TIMESPLIT
+  desc: Record split menu
+  user: core
+  <source>
     *: none
     recording: "File Split Options"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Maghati-hati salansan karapatang makapilii"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "File Split Options"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPLIT_MEASURE
- desc: in record timesplit options
+  id: LANG_SPLIT_MEASURE
+  desc: in record timesplit options
   user: core
- <source>
+  <source>
     *: none
     recording: "Split Measure"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Maghati-hati takalan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Split Measure"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPLIT_TYPE
- desc: in record timesplit options
+  id: LANG_SPLIT_TYPE
+  desc: in record timesplit options
   user: core
- <source>
+  <source>
     *: none
     recording: "What to do when Splitting"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Ano gawin kung hatiin"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Ano gawin kung hatiin"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_START_NEW_FILE
- desc: in record timesplit options
- user: core
- <source>
+  id: LANG_START_NEW_FILE
+  desc: in record timesplit options
+  user: core
+  <source>
     *: none
     recording: "Start new file"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Magumpisa bago salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Start new file"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_STOP_RECORDING
- desc: in record timesplit options
- user: core
- <source>
+  id: LANG_STOP_RECORDING
+  desc: in record timesplit options
+  user: core
+  <source>
     *: none
     recording: "Stop recording"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Paghintuin rekord"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Stop recording"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPLIT_TIME
- desc: in record timesplit options
+  id: LANG_SPLIT_TIME
+  desc: in record timesplit options
   user: core
- <source>
+  <source>
     *: none
     recording: "Split Time"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Maghati-hati oras"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Split Time"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SPLIT_SIZE
- desc: in record timesplit options
+  id: LANG_SPLIT_SIZE
+  desc: in record timesplit options
   user: core
- <source>
+  <source>
     *: none
     recording: "Split Filesize"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Maghati-hati dami salansan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Split Filesize"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_PRERECORD_TIME
- desc: in recording settings_menu
- user: core
- <source>
+  id: LANG_RECORD_PRERECORD_TIME
+  desc: in recording settings_menu
+  user: core
+  <source>
     *: none
     recording: "Prerecord Time"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Prerecord Time"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Pre-Record time"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_DIRECTORY
- desc: in recording settings_menu
- user: core
- <source>
+  id: LANG_RECORD_DIRECTORY
+  desc: in recording settings_menu
+  user: core
+  <source>
     *: none
     recording: "Directory"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Listahan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Listahan"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_SET_AS_REC_DIR
- desc: used in the onplay menu to set a recording dir
- user: core
- <source>
+  id: LANG_SET_AS_REC_DIR
+  desc: used in the onplay menu to set a recording dir
+  user: core
+  <source>
     *: none
     recording: "Set As Recording Directory"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Ilagay Listahan ng rekording"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Ilagay Listahan ng rekording"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CLEAR_REC_DIR
- desc:
- user: core
- <source>
+  id: LANG_CLEAR_REC_DIR
+  desc:
+  user: core
+  <source>
     *: none
     recording: "Clear Recording Directory"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Alisin Listahan ng rekording"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Alisin Listahan ng rekording"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REC_DIR_NOT_WRITABLE
- desc:
- user: core
- <source>
+  id: LANG_REC_DIR_NOT_WRITABLE
+  desc:
+  user: core
+  <source>
     *: none
     recording: "Can't write to recording directory"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Di maaari sulatan sa listahan ng rekording"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Can't write to recording directory"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_CLIP_LIGHT
- desc: in record settings menu.
- user: core
- <source>
+  id: LANG_CLIP_LIGHT
+  desc: in record settings menu.
+  user: core
+  <source>
     *: none
     recording: "Clipping Light"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Klip ilaw"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Clipping Light"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_MAIN_UNIT
- desc: in record settings menu.
- user: core
- <source>
+  id: LANG_MAIN_UNIT
+  desc: in record settings menu.
+  user: core
+  <source>
     *: none
     remote: "Main Unit Only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Panguna Lamang yunit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Main unit only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REMOTE_UNIT
- desc: in record settings menu.
- user: core
- <source>
+  id: LANG_REMOTE_UNIT
+  desc: in record settings menu.
+  user: core
+  <source>
     *: none
     remote: "Remote Unit Only"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Panguna Remote yunit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Remote unit only"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_REMOTE_MAIN
- desc: in record settings menu.
- user: core
- <source>
+  id: LANG_REMOTE_MAIN
+  desc: in record settings menu.
+  user: core
+  <source>
     *: none
     remote: "Main and Remote Unit"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     remote: "Paguna at Remote yunit"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     remote: "Main and remote unit"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_TRIGGER
- desc: in recording settings_menu
- user: core
- <source>
+  id: LANG_RECORD_TRIGGER
+  desc: in recording settings_menu
+  user: core
+  <source>
     *: none
     recording: "Trigger"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Trigger"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Trigger"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_TRIG_NOREARM
- desc: in recording settings_menu
- user: core
- <source>
+  id: LANG_RECORD_TRIG_NOREARM
+  desc: in recording settings_menu
+  user: core
+  <source>
     *: none
     recording: "Once"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Minsan"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Once"
- </voice>
+  </voice>
 </phrase>
 <phrase>
- id: LANG_RECORD_TRIGGER_TYPE
- desc: in recording trigger menu
+  id: LANG_RECORD_TRIGGER_TYPE
+  desc: in recording trigger menu
   user: core
- <source>
+  <source>
     *: none
     recording: "Trigtype"
- </source>
- <dest>
+  </source>
+  <dest>
     *: none
     recording: "Trigtypo"
- </dest>
- <voice>
+  </dest>
+  <voice>
     *: none
     recording: "Trigger type"
- </voice>
+  </voice>
 </phrase>
 <phrase>
   id: LANG_VOICE_FILETYPE
@@ -6089,16 +5937,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Mamatnugot paraan: %s %s"
+    *: "Mamatnugot paraan: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6194,15 +6039,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass araw ng katapusan"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass araw ng katapusan"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass araw ng katapusan"
   </voice>
 </phrase>
 <phrase>
@@ -6536,16 +6381,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -7115,23 +6957,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Puno disk. Magpatuloy Pindutin OFF."
-    iriverh100,iriverh120,iriverh300: "Puno disk. Magpatuloy Pindutin STOP."
     iaudiom5,iaudiox5: "Puno disk. Magpatuloy Pindutin POWER."
-    sansae200*,sansac200*,vibe500: "Puno disk. Magpatuloy Pindutin PREV."
+    iriverh100,iriverh120,iriverh300: "Puno disk. Magpatuloy Pindutin STOP."
+    recording: "Puno disk. Magpatuloy Pindutin OFF."
     samsungyh*: "Puno disk. Magpatuloy Pindutin LEFT."
+    sansac200*,sansae200*,vibe500: "Puno disk. Magpatuloy Pindutin PREV."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7477,23 +7319,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK sa agas"
     gigabeatfx: "POWER sa agas"
-    sansafuzeplus: "BACK sa agas"
+    gigabeats,sansafuzeplus: "BACK sa agas"
+    iaudiom5,iaudiox5: "Long PLAY sa agas"
+    ipod*: "PLAY/PAUSE sa agas"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV sa agas"
+    iriverh100,iriverh120,iriverh300: "STOP sa agas"
   </dest>
   <voice>
     *: ""
@@ -7547,13 +7387,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -7727,16 +7567,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Tubo"
+    *: "Tubo"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -7980,16 +7817,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Paraan:"
+    *: "Paraan:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9174,24 +9008,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1:"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D Isa"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -9595,7 +9429,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9793,15 +9627,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Pagtatluhin araw ng katapusan"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Pagtatluhin araw ng katapusan"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Pagtatluhin araw ng katapusan"
   </voice>
 </phrase>
 <phrase>
@@ -10528,16 +10362,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -10629,16 +10460,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Ulitin Keyclick"
+    *: "Ulitin Keyclick"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ulitin Keyclick"
+    *: "Ulitin Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -11169,16 +10997,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Pahabain ang oras"
+    *: "Pahabain ang oras"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pahabain ang oras"
+    *: "Pahabain ang oras"
   </voice>
 </phrase>
 <phrase>
@@ -11186,16 +11011,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Tulin"
+    *: "Tulin"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tulin"
+    *: "Tulin"
   </voice>
 </phrase>
 <phrase>
@@ -11203,16 +11025,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -11336,16 +11155,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar width"
+    *: "Scroll bar width"
   </voice>
 </phrase>
 <phrase>
@@ -11471,16 +11287,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release Oras"
+    *: "Release Oras"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Oras"
+    *: "Release Oras"
   </voice>
 </phrase>
 <phrase>
@@ -11522,16 +11335,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Pasukan"
+    *: "Pasukan"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pasukan"
+    *: "Pasukan"
   </voice>
 </phrase>
 <phrase>
@@ -11556,16 +11366,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Kabuuan Makakuha Ng"
+    *: "Kabuuan Makakuha Ng"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kabuuan Makakuha Ng"
+    *: "Kabuuan Makakuha Ng"
   </voice>
 </phrase>
 <phrase>
@@ -11573,16 +11380,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Base Balat"
+    *: "Base Balat"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Balat"
+    *: "Base Balat"
   </voice>
 </phrase>
 <phrase>
@@ -11658,16 +11462,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11675,16 +11476,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Awto"
+    *: "Awto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Awto"
+    *: "Awto"
   </voice>
 </phrase>
 <phrase>
@@ -11720,16 +11518,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11751,16 +11546,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Proporsyon"
+    *: "Proporsyon"
   </dest>
   <voice>
-    *: none
-    swcodec: "Proporsyon"
+    *: "Proporsyon"
   </voice>
 </phrase>
 <phrase>
@@ -11802,16 +11594,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11836,16 +11625,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Remote Base sa Balat"
+    *: "Remote Base sa Balat"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base sa Balat"
+    *: "Remote Base sa Balat"
   </voice>
 </phrase>
 <phrase>
@@ -11972,16 +11758,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Rewind Bago Resume"
+    *: "Rewind Bago Resume"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind bago resume"
+    *: "Rewind bago resume"
   </voice>
 </phrase>
 <phrase>
@@ -12020,16 +11803,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12133,16 +11913,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12218,16 +11995,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limitasyon"
+    *: "Limitasyon"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limitasyon"
+    *: "Limitasyon"
   </voice>
 </phrase>
 <phrase>
@@ -12330,16 +12104,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12392,16 +12163,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -12457,16 +12225,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12533,7 +12298,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 5660f7a01e..246ca4604e 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -247,20 +247,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = ใช่"
+    archosplayer: "(เล่น/หยุด)"
     cowond2*: "MENU = ใช่"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ใช่"
     iriverh100,iriverh120,iriverh300: "NAVI = ใช่"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ใช่"
     mrobe500: "PLAY, POWER, หรือ มุมบนขวา = ใช่"
-    archosplayer: "(เล่น/หยุด)"
     vibe500: "OK = ใช่"
   </dest>
   <voice>
@@ -799,16 +799,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "ผสมเสียงข้ามช่อง"
+    *: "ผสมเสียงข้ามช่อง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -816,16 +813,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตราขยายโดยตรง"
+    *: "อัตราขยายโดยตรง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct gain"
+    *: "Direct gain"
   </voice>
 </phrase>
 <phrase>
@@ -833,16 +827,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตราขยายที่จุดตัด"
+    *: "อัตราขยายที่จุดตัด"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross gain"
+    *: "Cross gain"
   </voice>
 </phrase>
 <phrase>
@@ -850,16 +841,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตราลดทอนความถี่สูง"
+    *: "อัตราลดทอนความถี่สูง"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency attenuation"
+    *: "High-frequency attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -867,16 +855,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "จุดตัดความถี่สูง"
+    *: "จุดตัดความถี่สูง"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-frequency cutoff"
+    *: "High-frequency cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -884,16 +869,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "ปรับแต่งเสียง"
+    *: "ปรับแต่งเสียง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -901,16 +883,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "เปิดใช้การปรับแต่งเสียง"
+    *: "เปิดใช้การปรับแต่งเสียง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Enable equalizer"
+    *: "Enable equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -918,16 +897,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "ปรับแต่งเสียงแบบกราฟฟิก"
+    *: "ปรับแต่งเสียงแบบกราฟฟิก"
   </dest>
   <voice>
-    *: none
-    swcodec: "Graphical equalizer"
+    *: "Graphical equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -935,16 +911,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "ลดเสียงลง"
+    *: "ลดเสียงลง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pre-cut"
+    *: "Pre-cut"
   </voice>
 </phrase>
 <phrase>
@@ -952,16 +925,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "ปรับแต่งเสียงอย่างง่าย"
+    *: "ปรับแต่งเสียงอย่างง่าย"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple equalizer settings"
+    *: "Simple equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -969,16 +939,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "ปรับแต่งเสียงขั้นสูง"
+    *: "ปรับแต่งเสียงขั้นสูง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Advanced equalizer settings"
+    *: "Advanced equalizer settings"
   </voice>
 </phrase>
 <phrase>
@@ -986,16 +953,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "บันทึกค่าการปรับแต่งเสียง"
+    *: "บันทึกค่าการปรับแต่งเสียง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Save equalizer preset"
+    *: "Save equalizer preset"
   </voice>
 </phrase>
 <phrase>
@@ -1003,16 +967,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "เปิดดูบันทึกการปรับแต่งเสียง"
+    *: "เปิดดูบันทึกการปรับแต่งเสียง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Browse equalizer presets"
+    *: "Browse equalizer presets"
   </voice>
 </phrase>
 <phrase>
@@ -1020,16 +981,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "โหมดแก้ไข: %s"
+    *: "โหมดแก้ไข: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1037,16 +995,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตราขยายช่วง %d Hz"
+    *: "อัตราขยายช่วง %d Hz"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1054,16 +1009,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "ขอบล่างตัวกรองความถี่ต่ำ"
+    *: "ขอบล่างตัวกรองความถี่ต่ำ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1071,16 +1023,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "ตัวกรองความถี่ที่ %d"
+    *: "ตัวกรองความถี่ที่ %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -1088,16 +1037,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "ขอบบนตัวกรองความถี่สูง"
+    *: "ขอบบนตัวกรองความถี่สูง"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -1105,16 +1051,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "ความถี่ตัดผ่าน"
+    *: "ความถี่ตัดผ่าน"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1122,16 +1065,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "ความถี่กลาง"
+    *: "ความถี่กลาง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Center frequency"
+    *: "Center frequency"
   </voice>
 </phrase>
 <phrase>
@@ -1139,16 +1079,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1156,16 +1093,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -1709,16 +1643,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "ป้องกันการตัดยอด"
+    *: "ป้องกันการตัดยอด"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -1796,16 +1727,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "เสียงบี๊ปข้ามเพลง"
+    *: "เสียงบี๊ปข้ามเพลง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -1813,16 +1741,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "เบา"
+    *: "เบา"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -1830,16 +1755,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "ปานกลาง"
+    *: "ปานกลาง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -1847,16 +1769,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "ดัง"
+    *: "ดัง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -2216,19 +2135,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (OFF เพื่อย้อนกลับ)"
-    iriverh100,iriverh120,iriverh300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
-    ipod*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)"
     gogearsa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (REW เพื่อย้อนกลับ)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)"
+    iriverh100,iriverh120,iriverh300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)"
   </dest>
   <voice>
     *: "entries found for database"
@@ -2410,16 +2327,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ฟอนต์"
+    *: "ฟอนต์"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -2681,16 +2595,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "กลับหัว"
+    *: "กลับหัว"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -2698,16 +2609,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "การแสดงบรรทัด"
+    *: "การแสดงบรรทัด"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector"
+    *: "Line Selector"
   </voice>
 </phrase>
 <phrase>
@@ -2715,16 +2623,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ตัวชี้"
+    *: "ตัวชี้"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -2732,16 +2637,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "แถบสี (กลับสี)"
+    *: "แถบสี (กลับสี)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3031,16 +2933,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "เลื่อนจอเมื่อตกขอบ"
+    *: "เลื่อนจอเมื่อตกขอบ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -3048,16 +2947,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ขนาดการเลื่อนจอ"
+    *: "ขนาดการเลื่อนจอ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -3113,16 +3009,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "สถานะ-/แถบเลื่อน"
+    *: "สถานะ-/แถบเลื่อน"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -3130,16 +3023,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "แถบเลื่อน"
+    *: "แถบเลื่อน"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3147,16 +3037,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "แถบสถานะ"
+    *: "แถบสถานะ"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </voice>
 </phrase>
 <phrase>
@@ -3181,16 +3068,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "แสดงความดัง"
+    *: "แสดงความดัง"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </voice>
 </phrase>
 <phrase>
@@ -3198,16 +3082,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "แสดงแบตเตอรี่"
+    *: "แสดงแบตเตอรี่"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </voice>
 </phrase>
 <phrase>
@@ -3215,16 +3096,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "กราฟฟิก"
+    *: "กราฟฟิก"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </voice>
 </phrase>
 <phrase>
@@ -3232,16 +3110,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ตัวเลข"
+    *: "ตัวเลข"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </voice>
 </phrase>
 <phrase>
@@ -3461,16 +3336,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -3492,16 +3364,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ไทย (ISO-8859-11)"
+    *: "ไทย (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -3509,16 +3378,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -3554,16 +3420,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japanese"
+    *: "Japanese"
   </voice>
 </phrase>
 <phrase>
@@ -3571,16 +3434,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3588,16 +3448,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -3605,16 +3462,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditional Chinese"
+    *: "Traditional Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -3638,17 +3492,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "เวลาเปิดไฟปุ่ม"
-    sansafuze*,sansae200*: "เวลาเปิดไฟล้อหมุน"
+    sansae200*,sansafuze*: "เวลาเปิดไฟล้อหมุน"
   </dest>
   <voice>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3902,23 +3756,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = ตั้งค่า"
-    mrobe500: "HEART = ตั้งค่า"
-    iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ตั้งค่า"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ตั้งค่า"
     gogearsa9200,samsungyh*: "PLAY = ตั้งค่า"
-    vibe500: "OK = ตั้งค่า"
+    iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า"
     mpiohd300: "ENTER = ตั้งค่า"
+    mrobe500: "HEART = ตั้งค่า"
+    rtc: "ON = ตั้งค่า"
+    vibe500: "OK = ตั้งค่า"
   </dest>
   <voice>
     *: none
@@ -3930,35 +3784,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = ยกเลิก"
-    mrobe500: "POWER = ยกเลิก"
-    iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก"
-    ipod*,sansac200*,mpiohd300: "MENU = ยกเลิก"
-    iaudiox5,iaudiom5: "RECORD = ยกเลิก"
+    gigabeatfx,mrobe500: "POWER = ยกเลิก"
+    gigabeats,sansafuzeplus: "BACK = ยกเลิก"
+    gogearsa9200: "LEFT = ยกเลิก"
+    iaudiom5,iaudiox5: "RECORD = ยกเลิก"
+    ipod*,mpiohd300,sansac200*: "MENU = ยกเลิก"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ยกเลิก"
-    gigabeatfx: "POWER = ยกเลิก"
-    sansafuzeplus: "BACK = ยกเลิก"
+    iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก"
     mrobe100: "DISPLAY = ยกเลิก"
-    gigabeats: "BACK = ยกเลิก"
-    gogearsa9200: "LEFT = ยกเลิก"
-    vibe500: "C = ยกเลิก"
+    rtc: "OFF = ยกเลิก"
     samsungyh*: "REW = ยกเลิก"
+    vibe500: "C = ยกเลิก"
   </dest>
   <voice>
     *: none
@@ -4447,22 +4297,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=ตั้งเวลา OFF=ยกเลิก"
+    gigabeats: "SELECT=ตั้งเวลา POWER=ยกเลิก"
     ipod*: "SELECT=ตั้งเวลา MENU=ยกเลิก"
     iriverh10,iriverh10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก"
-    gigabeats: "SELECT=ตั้งเวลา POWER=ยกเลิก"
-    vibe500: "OK=ตั้งเวลา C=ยกเลิก"
     mpiohd300: "ENTER=ตั้งเวลา MENU=ยกเลิก"
     sansafuzeplus: "SELECT=ตั้งเวลา  BACK=ยกเลิก"
+    vibe500: "OK=ตั้งเวลา C=ยกเลิก"
   </dest>
   <voice>
     *: none
@@ -5566,15 +5416,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "ความถี่"
+    play_frequency,recording: "ความถี่"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -5617,18 +5467,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "ไมโครโฟน"
     iriverh100,iriverh120,iriverh300: "ไมโครโฟนภายใน"
+    recording: "ไมโครโฟน"
   </dest>
   <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -6506,13 +6356,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "แบตเตอรี่: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "แบต: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6569,24 +6419,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimedia card"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro Secure Digital card:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro Secure Digital card:"
     xduoox3: "micro Secure Digital card 2:"
-    archosondio*: "Multimedia card"
   </voice>
 </phrase>
 <phrase>
@@ -7902,23 +7752,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "ดีสก์เต็ม กดปุ่ม OFF เพื่อทำงานต่อ"
-    iriverh100,iriverh120,iriverh300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
     iaudiom5,iaudiox5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ"
-    sansae200*,sansac200*,vibe500: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
+    iriverh100,iriverh120,iriverh300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ"
+    recording: "ดีสก์เต็ม กดปุ่ม OFF เพื่อทำงานต่อ"
     samsungyh*: "ดีสก์เต็ม กดปุ่ม LEFT เพื่อทำงานต่อ"
+    sansac200*,sansae200*,vibe500: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ"
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8006,23 +7856,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF เพื่อยกเลิก"
-    iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
-    ipod*: "PLAY/PAUSE เพื่อยกเลิก"
-    iaudiox5,iaudiom5: "Long PLAY เพื่อยกเลิก"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,vibe500: "PREV เพื่อยกเลิก"
-    gigabeats: "BACK เพื่อยกเลิก"
     gigabeatfx: "POWER เพื่อยกเลิก"
-    sansafuzeplus: "BACK เพื่อยกเลิก"
+    gigabeats,sansafuzeplus: "BACK เพื่อยกเลิก"
+    iaudiom5,iaudiox5: "Long PLAY เพื่อยกเลิก"
+    ipod*: "PLAY/PAUSE เพื่อยกเลิก"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV เพื่อยกเลิก"
+    iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก"
   </dest>
   <voice>
     *: ""
@@ -9574,7 +9422,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9616,16 +9464,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "โหมดแก้ไข: %s %s"
+    *: "โหมดแก้ไข: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9633,16 +9478,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "ความถี่ตัดผ่าน"
+    *: "ความถี่ตัดผ่าน"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -9650,16 +9492,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตราขยาย"
+    *: "อัตราขยาย"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -9667,16 +9506,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "โหมด:"
+    *: "โหมด:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10136,15 +9972,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "ความถี่ตัดเสียงทุ้ม"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงทุ้ม"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10370,15 +10206,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "ความถี่ตัดเสียงแหลม"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "ความถี่ตัดเสียงแหลม"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10640,16 +10476,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "เสียงกดปุ่ม"
+    *: "เสียงกดปุ่ม"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </voice>
 </phrase>
 <phrase>
@@ -10891,16 +10724,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "กดปุ่มซ้ำ"
+    *: "กดปุ่มซ้ำ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </voice>
 </phrase>
 <phrase>
@@ -10987,16 +10817,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ตำแหน่งแถบเลื่อน"
+    *: "ตำแหน่งแถบเลื่อน"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -11267,16 +11094,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "ความกว้างแถบเลื่อน"
+    *: "ความกว้างแถบเลื่อน"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar width"
+    *: "Scroll bar width"
   </voice>
 </phrase>
 <phrase>
@@ -11329,16 +11153,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "ขยายเวลาเล่น"
+    *: "ขยายเวลาเล่น"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -11360,16 +11181,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "ตัวบีบอัดเสียง"
+    *: "ตัวบีบอัดเสียง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11422,16 +11240,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "ความเร็ว"
+    *: "ความเร็ว"
   </dest>
   <voice>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </voice>
 </phrase>
 <phrase>
@@ -11484,16 +11299,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "เวลาปล่อย"
+    *: "เวลาปล่อย"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -11501,16 +11313,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "ช่วงการบีบ"
+    *: "ช่วงการบีบ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -11518,16 +11327,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "ปรับแต่งอัตราขยาย"
+    *: "ปรับแต่งอัตราขยาย"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -11535,16 +11341,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "หน้ากากหลัก"
+    *: "หน้ากากหลัก"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11569,16 +11372,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ฐาน"
+    *: "ฐาน"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11586,16 +11386,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "อัตโนมัติ"
+    *: "อัตโนมัติ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -11617,16 +11414,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "ฐานเบา"
+    *: "ฐานเบา"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11648,16 +11442,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -11682,16 +11473,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -11699,16 +11487,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "หน้ากากหลักรีโมท"
+    *: "หน้ากากหลักรีโมท"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -11784,16 +11569,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 to 1"
+    *: "10 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11818,16 +11600,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11852,16 +11631,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -11931,16 +11707,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -11962,16 +11735,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -12228,16 +11998,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "เริ่มเล่นใหม่หลังเปิดเครื่อง"
+    *: "เริ่มเล่นใหม่หลังเปิดเครื่อง"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rewind before resume"
+    *: "Rewind before resume"
   </voice>
 </phrase>
 <phrase>
@@ -12485,7 +12252,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index d9de1e1495..0aee193f0f 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -234,23 +234,22 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = Devam et"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, veya üst-sağ = Evet"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Evet"
     iriverh100,iriverh120,iriverh300: "NAVI = Devam et"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Evet"
     mrobe500: "PLAY, POWER, veya üst-sağ = Evet"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Devam et"
-    creativezen*: "SELECT = Evet"
   </dest>
   <voice>
     *: ""
@@ -266,9 +265,9 @@
   </source>
   <dest>
     *: "Herhangi PLAY'dan başka = İptal et"
-    iriverh100,iriverh120,iriverh300: "Herhangi NAVI'den başka = İptal et"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "Herhangi SELECT'ten başka = İptal et"
     archosplayer: none
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200: "Herhangi SELECT'ten başka = İptal et"
+    iriverh100,iriverh120,iriverh300: "Herhangi NAVI'den başka = İptal et"
   </dest>
   <voice>
     *: ""
@@ -762,16 +761,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </voice>
 </phrase>
 <phrase>
@@ -779,16 +775,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </voice>
 </phrase>
 <phrase>
@@ -796,16 +789,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </voice>
 </phrase>
 <phrase>
@@ -813,16 +803,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </dest>
   <voice>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -830,16 +817,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ses Dengeleyici"
+    *: "Ses Dengeleyici"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ses Dengeleyici"
+    *: "Ses Dengeleyici"
   </voice>
 </phrase>
 <phrase>
@@ -847,16 +831,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ'yı başlat"
+    *: "EQ'yı başlat"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ses Dengeleyiciyi başlat"
+    *: "Ses Dengeleyiciyi başlat"
   </voice>
 </phrase>
 <phrase>
@@ -864,16 +845,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Çizgesel EQ"
+    *: "Çizgesel EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Çizgesel Ses Dengeleyici"
+    *: "Çizgesel Ses Dengeleyici"
   </voice>
 </phrase>
 <phrase>
@@ -881,16 +859,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </dest>
   <voice>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </voice>
 </phrase>
 <phrase>
@@ -898,16 +873,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Ayarları"
+    *: "EQ Ayarları"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ses Dengeleyici Ayarları"
+    *: "Ses Dengeleyici Ayarları"
   </voice>
 </phrase>
 <phrase>
@@ -915,16 +887,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Karmaşık EQ Ayarları"
+    *: "Karmaşık EQ Ayarları"
   </dest>
   <voice>
-    *: none
-    swcodec: "Karmaşık Ses Dengeleyici Ayarları"
+    *: "Karmaşık Ses Dengeleyici Ayarları"
   </voice>
 </phrase>
 <phrase>
@@ -932,16 +901,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Ayarları Kaydet"
+    *: "EQ Ayarları Kaydet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ses Dengeleyici Ayarları Kaydet"
+    *: "Ses Dengeleyici Ayarları Kaydet"
   </voice>
 </phrase>
 <phrase>
@@ -949,16 +915,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ Ayarlara göz at"
+    *: "EQ Ayarlara göz at"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ses Dengeleyici Ayarlara göz at"
+    *: "Ses Dengeleyici Ayarlara göz at"
   </voice>
 </phrase>
 <phrase>
@@ -966,16 +929,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Durum: %s"
+    *: "Durum: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -983,16 +943,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ku"
+    *: "Ku"
   </voice>
 </phrase>
 <phrase>
@@ -1406,21 +1363,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Veritabanı oluşturuluyor... %d bulundu (dönmek için OFF)"
-    iriverh100,iriverh120,iriverh300: "Veritabanı oluşturuluyor... %d bulundu (dönmek için STOP)"
-    ipod*: "Veritabanı oluşturuluyor... %d bulundu (dönmek için PREV)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Veritabanı oluşturuluyor... %d bulundu (dönmek için LEFT)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Veritabanı oluşturuluyor... %d bulundu (dönmek için PREV)"
-    gogearsa9200: "Veritabanı oluşturuluyor... %d bulundu (dönmek için REW)"
     archosplayer: "DB oluşturuluyor... %d bulundu"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Veritabanı oluşturuluyor... %d bulundu (dönmek için LEFT)"
+    gogearsa9200: "Veritabanı oluşturuluyor... %d bulundu (dönmek için REW)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Veritabanı oluşturuluyor... %d bulundu (dönmek için PREV)"
+    iriverh100,iriverh120,iriverh300: "Veritabanı oluşturuluyor... %d bulundu (dönmek için STOP)"
   </dest>
   <voice>
     *: "veritabanında bulundu"
@@ -1586,16 +1541,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kaydırma Çubuğu"
+    *: "Kaydırma Çubuğu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1603,16 +1555,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Durum Çubuğu"
+    *: "Durum Çubuğu"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1620,16 +1569,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ses Düzeyi"
+    *: "Ses Düzeyi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1637,16 +1583,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pil Düzeyi"
+    *: "Pil Düzeyi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1654,16 +1597,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafik"
+    *: "Grafik"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1671,16 +1611,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Sayısal"
+    *: "Sayısal"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1860,17 +1797,16 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Düğme Işığı Zaman Aşımı"
-    sansafuze*,sansae200*: "Teker Işığı Zaman Aşımı"
+    sansae200*,sansafuze*: "Teker Işığı Zaman Aşımı"
   </dest>
   <voice>
     *: none
-    button_light: ""
-    sansafuze*,sansae200*: ""
+    button_light,sansae200*,sansafuze*: ""
   </voice>
 </phrase>
 <phrase>
@@ -1955,23 +1891,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Ayarlandı"
-    iriverh100,iriverh120,iriverh300: "NAVI = Ayarlandı"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Ayarlandı"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ayarlandı"
     gogearsa9200,samsungyh*: "PLAY = Ayarlandı"
-    vibe500: "OK = Ayarlandı"
+    iriverh100,iriverh120,iriverh300: "NAVI = Ayarlandı"
     mpiohd300: "ENTER = Ayarlandı"
+    mrobe500: "HEART = Ayarlandı"
+    rtc: "ON = Set"
+    vibe500: "OK = Ayarlandı"
   </dest>
   <voice>
     *: none
@@ -1983,35 +1919,32 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Geri Döndür"
-    mrobe500: "POWER = Geri Döndür"
-    iriverh100,iriverh120,iriverh300: "STOP = Geri Döndür"
-    ipod*,sansac200*,mpiohd300: "MENU = Geri Döndür"
-    iaudiox5,iaudiom5: "RECORD = Geri Döndür"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Geri Döndür"
-    gigabeatfx: "POWER = Geri Döndür"
-    sansafuzeplus: "BACK = Geri Döndür"
-    mrobe100: "DISPLAY = Geri Döndür"
+    gigabeatfx,mrobe500: "POWER = Geri Döndür"
     gigabeats: "LEFT =  Revert"
     gogearsa9200: "LEFT = Geri Döndür"
-    vibe500: "C = Geri Döndür"
+    iaudiom5,iaudiox5: "RECORD = Geri Döndür"
+    ipod*,mpiohd300,sansac200*: "MENU = Geri Döndür"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Geri Döndür"
+    iriverh100,iriverh120,iriverh300: "STOP = Geri Döndür"
+    mrobe100: "DISPLAY = Geri Döndür"
+    rtc: "OFF = Geri Döndür"
     samsungyh*: "REW = Geri Döndür"
+    sansafuzeplus: "BACK = Geri Döndür"
+    vibe500: "C = Geri Döndür"
   </dest>
   <voice>
     *: none
@@ -2396,24 +2329,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -2608,23 +2541,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: 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*,vibe500: "The disk is full. Press UP to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200,vibe500: "The disk is full. Press UP to continue."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -2633,20 +2566,19 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF to abort"
-    iriverh100,iriverh120,iriverh300: "STOP to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
     ipod*: "PLAY/PAUSE to abort"
-    iaudiox5,iaudiom5: "Long PLAY to abort"
-    iriverh10,iriverh10_5gb,sansae200,sansac200*,vibe500: "PREV to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </dest>
   <voice>
     *: ""
@@ -2890,16 +2822,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2907,16 +2836,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -3302,16 +3228,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Kaydırken ses yap"
+    *: "Kaydırken ses yap"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kaydırken ses yap"
+    *: "Kaydırken ses yap"
   </voice>
 </phrase>
 <phrase>
@@ -3319,16 +3242,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Kaydırma ses tekrarla"
+    *: "Kaydırma ses tekrarla"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kaydırma ses tekrarla"
+    *: "Kaydırma ses tekrarla"
   </voice>
 </phrase>
 <phrase>
@@ -3527,16 +3447,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Temel Kabuk"
+    *: "Temel Kabuk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -3629,16 +3546,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Uzak Temel Kabuk"
+    *: "Uzak Temel Kabuk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </voice>
 </phrase>
 <phrase>
@@ -3830,16 +3744,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </dest>
   <voice>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </voice>
 </phrase>
 <phrase>
@@ -3865,15 +3776,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </voice>
 </phrase>
 <phrase>
@@ -3988,16 +3899,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </dest>
   <voice>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </voice>
 </phrase>
 <phrase>
@@ -4084,16 +3992,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </voice>
 </phrase>
 <phrase>
@@ -4222,16 +4127,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Kesme Frekansı"
+    *: "Kesme Frekansı"
   </dest>
   <voice>
-    *: none
-    swcodec: "Kesme Frekansı"
+    *: "Kesme Frekansı"
   </voice>
 </phrase>
 <phrase>
@@ -4270,16 +4172,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </voice>
 </phrase>
 <phrase>
@@ -4464,16 +4363,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </voice>
 </phrase>
 <phrase>
@@ -4668,18 +4564,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -4836,16 +4729,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "High shelf filter"
+    *: "High shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -4929,16 +4819,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 a 1"
+    *: "10 a 1"
   </voice>
 </phrase>
 <phrase>
@@ -5033,16 +4920,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </voice>
 </phrase>
 <phrase>
@@ -5174,16 +5058,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Sıkıştırıcı"
+    *: "Sıkıştırıcı"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sıkıştırıcı"
+    *: "Sıkıştırıcı"
   </voice>
 </phrase>
 <phrase>
@@ -5759,16 +5640,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Simplified Chinese"
+    *: "Simplified Chinese"
   </voice>
 </phrase>
 <phrase>
@@ -5897,16 +5775,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </voice>
 </phrase>
 <phrase>
@@ -6061,15 +5936,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -6139,16 +6014,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "hertz band gain"
+    *: "hertz band gain"
   </voice>
 </phrase>
 <phrase>
@@ -6263,16 +6135,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </dest>
   <voice>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </voice>
 </phrase>
 <phrase>
@@ -6460,16 +6329,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Atak Süresi"
+    *: "Atak Süresi"
   </dest>
   <voice>
-    *: none
-    swcodec: "Atak Süresi"
+    *: "Atak Süresi"
   </voice>
 </phrase>
 <phrase>
@@ -6719,16 +6585,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </voice>
 </phrase>
 <phrase>
@@ -6995,16 +6858,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </voice>
 </phrase>
 <phrase>
@@ -7040,16 +6900,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </voice>
 </phrase>
 <phrase>
@@ -7057,16 +6914,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </dest>
   <voice>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </voice>
 </phrase>
 <phrase>
@@ -7091,16 +6945,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </voice>
 </phrase>
 <phrase>
@@ -7153,16 +7004,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -7291,16 +7139,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </voice>
 </phrase>
 <phrase>
@@ -7387,16 +7232,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 to 1"
+    *: "6 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -7719,16 +7561,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Duraklatmadan Önce Geri Sar"
+    *: "Duraklatmadan Önce Geri Sar"
   </dest>
   <voice>
-    *: none
-    swcodec: "Duraklatmadan Önce Geri Sar"
+    *: "Duraklatmadan Önce Geri Sar"
   </voice>
 </phrase>
 <phrase>
@@ -8282,16 +8121,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -8423,16 +8259,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </voice>
 </phrase>
 <phrase>
@@ -8488,16 +8321,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -8894,16 +8724,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Kaydırma Çubuğu Genişliği"
+    *: "Kaydırma Çubuğu Genişliği"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Kaydırma Çubuğu Genişliği"
+    *: "Kaydırma Çubuğu Genişliği"
   </voice>
 </phrase>
 <phrase>
@@ -8976,16 +8803,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Gel. Çince (BIG5)"
+    *: "Gel. Çince (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Geleneksel Çince"
+    *: "Geleneksel Çince"
   </voice>
 </phrase>
 <phrase>
@@ -9038,16 +8862,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </voice>
 </phrase>
 <phrase>
@@ -9361,16 +9182,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thai"
+    *: "Thai"
   </voice>
 </phrase>
 <phrase>
@@ -9406,16 +9224,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </voice>
 </phrase>
 <phrase>
@@ -9455,18 +9270,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </dest>
   <voice>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </voice>
 </phrase>
 <phrase>
@@ -9730,16 +9545,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9749,22 +9561,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </dest>
   <voice>
     *: none
@@ -9775,16 +9587,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Peak filter"
+    *: "Peak filter"
   </voice>
 </phrase>
 <phrase>
@@ -10013,18 +9822,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </voice>
 </phrase>
 <phrase>
@@ -10097,16 +9903,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </dest>
   <voice>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </voice>
 </phrase>
 <phrase>
@@ -10159,16 +9962,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 to 1"
+    *: "2 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -10283,16 +10083,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </voice>
 </phrase>
 <phrase>
@@ -10300,16 +10097,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabic"
+    *: "Arabic"
   </voice>
 </phrase>
 <phrase>
@@ -10671,16 +10465,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 to 1"
+    *: "4 to 1"
   </voice>
 </phrase>
 <phrase>
@@ -10689,15 +10480,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </voice>
 </phrase>
 <phrase>
@@ -10778,16 +10569,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Low shelf filter"
+    *: "Low shelf filter"
   </voice>
 </phrase>
 <phrase>
@@ -10889,18 +10677,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </voice>
 </phrase>
 <phrase>
@@ -10922,16 +10707,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simple"
+    *: "Simple"
   </voice>
 </phrase>
 <phrase>
@@ -10956,16 +10738,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -11221,16 +11000,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Inverse Bar"
+    *: "Inverse Bar"
   </voice>
 </phrase>
 <phrase>
@@ -11267,18 +11043,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </voice>
 </phrase>
 <phrase>
@@ -11317,16 +11090,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </dest>
   <voice>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </voice>
 </phrase>
 <phrase>
@@ -11635,16 +11405,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Korean"
+    *: "Korean"
   </voice>
 </phrase>
 <phrase>
@@ -11714,16 +11481,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebrew"
+    *: "Hebrew"
   </voice>
 </phrase>
 <phrase>
@@ -11760,13 +11524,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -11842,16 +11606,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </voice>
 </phrase>
 <phrase>
@@ -11935,16 +11696,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </dest>
   <voice>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </voice>
 </phrase>
 <phrase>
@@ -12304,16 +12062,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </voice>
 </phrase>
 <phrase>
@@ -12338,16 +12093,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </voice>
 </phrase>
 <phrase>
@@ -12386,16 +12138,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -12507,16 +12256,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scroll bar position"
+    *: "Scroll bar position"
   </voice>
 </phrase>
 <phrase>
@@ -12569,16 +12315,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status- and Scrollbar"
+    *: "Status- and Scrollbar"
   </voice>
 </phrase>
 <phrase>
@@ -12628,16 +12371,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japonca (SJIS)"
+    *: "Japonca (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japonca"
+    *: "Japonca"
   </voice>
 </phrase>
 <phrase>
@@ -12645,16 +12385,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </voice>
 </phrase>
 <phrase>
@@ -12738,16 +12475,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </dest>
   <voice>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -12845,16 +12579,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </voice>
 </phrase>
 <phrase>
@@ -12907,16 +12638,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </dest>
   <voice>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </voice>
 </phrase>
 <phrase>
@@ -13293,16 +13021,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </dest>
   <voice>
-    *: none
-    swcodec: "Centre frequency"
+    *: "Centre frequency"
   </voice>
 </phrase>
 <phrase>
@@ -13418,18 +13143,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </voice>
 </phrase>
 <phrase>
@@ -13482,16 +13204,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index ae5d648f3f..e87e756cca 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -246,20 +246,20 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "ВIДТВОР. = Так"
+    archosplayer: "(ВIДТВОР./СТОП)"
     cowond2*: "Меню або прав. верх. = Так"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "ВИБРАТИ = так"
     iriverh100,iriverh120,iriverh300: "НАВIГ. = Так"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "ВИБРАТИ = так"
     mrobe500: "ВІДТВ, ВИМКН., або правю верх. = Так"
-    archosplayer: "(ВIДТВОР./СТОП)"
     vibe500: "OK = Так"
   </dest>
   <voice>
@@ -815,16 +815,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Зменшення Стерео"
+    *: "Зменшення Стерео"
   </dest>
   <voice>
-    *: none
-    swcodec: "Зменшення Стерео"
+    *: "Зменшення Стерео"
   </voice>
 </phrase>
 <phrase>
@@ -832,16 +829,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Пряме Пiдсилення"
+    *: "Пряме Пiдсилення"
   </dest>
   <voice>
-    *: none
-    swcodec: "Пряме Пiдсилення"
+    *: "Пряме Пiдсилення"
   </voice>
 </phrase>
 <phrase>
@@ -849,16 +843,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Накладання"
+    *: "Накладання"
   </dest>
   <voice>
-    *: none
-    swcodec: "Накладання"
+    *: "Накладання"
   </voice>
 </phrase>
 <phrase>
@@ -866,16 +857,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Зменшення Високих Частот"
+    *: "Зменшення Високих Частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Зменшення Високих Частот"
+    *: "Зменшення Високих Частот"
   </voice>
 </phrase>
 <phrase>
@@ -883,16 +871,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Зрiз Високих Частот"
+    *: "Зрiз Високих Частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Зрiз Високих Частот"
+    *: "Зрiз Високих Частот"
   </voice>
 </phrase>
 <phrase>
@@ -900,16 +885,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Еквалайзер"
+    *: "Еквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Еквалайзер"
+    *: "Еквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -917,16 +899,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Ввiмкнути Еквалайзер"
+    *: "Ввiмкнути Еквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ввiмкнути Еквалайзер"
+    *: "Ввiмкнути Еквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -934,16 +913,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Графiчний Еквалайзер"
+    *: "Графiчний Еквалайзер"
   </dest>
   <voice>
-    *: none
-    swcodec: "Графiчний Еквалайзер"
+    *: "Графiчний Еквалайзер"
   </voice>
 </phrase>
 <phrase>
@@ -951,16 +927,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Поперед. Обрiзання"
+    *: "Поперед. Обрiзання"
   </dest>
   <voice>
-    *: none
-    swcodec: "Поперед. Обрiзання"
+    *: "Поперед. Обрiзання"
   </voice>
 </phrase>
 <phrase>
@@ -968,16 +941,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Простi Налаштування Еквалайзеру"
+    *: "Простi Налаштування Еквалайзеру"
   </dest>
   <voice>
-    *: none
-    swcodec: "Простi Налаштування Еквалайзеру"
+    *: "Простi Налаштування Еквалайзеру"
   </voice>
 </phrase>
 <phrase>
@@ -985,16 +955,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Розширеннi Налаштування Еквалайзеру"
+    *: "Розширеннi Налаштування Еквалайзеру"
   </dest>
   <voice>
-    *: none
-    swcodec: "Розширеннi Налаштування Еквалайзеру"
+    *: "Розширеннi Налаштування Еквалайзеру"
   </voice>
 </phrase>
 <phrase>
@@ -1002,16 +969,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Зберегти Налаштування"
+    *: "Зберегти Налаштування"
   </dest>
   <voice>
-    *: none
-    swcodec: "Зберегти Налаштування Еквалайзеру"
+    *: "Зберегти Налаштування Еквалайзеру"
   </voice>
 </phrase>
 <phrase>
@@ -1019,16 +983,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Завантажити Налаштування"
+    *: "Завантажити Налаштування"
   </dest>
   <voice>
-    *: none
-    swcodec: "Завантажити Налаштування Еквалайзеру"
+    *: "Завантажити Налаштування Еквалайзеру"
   </voice>
 </phrase>
 <phrase>
@@ -1036,16 +997,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим редагування: %s"
+    *: "Режим редагування: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1053,16 +1011,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Гц"
+    *: "%d Гц"
   </dest>
   <voice>
-    *: none
-    swcodec: "Герц"
+    *: "Герц"
   </voice>
 </phrase>
 <phrase>
@@ -1070,16 +1025,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Фiльтр Низьких Частот"
+    *: "Фiльтр Низьких Частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Фiльтр Низьких Частот"
+    *: "Фiльтр Низьких Частот"
   </voice>
 </phrase>
 <phrase>
@@ -1087,16 +1039,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Пiковий Фiльтр %d"
+    *: "Пiковий Фiльтр %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Пiковий Фiльтр"
+    *: "Пiковий Фiльтр"
   </voice>
 </phrase>
 <phrase>
@@ -1104,16 +1053,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Фiльтр Високих Частот"
+    *: "Фiльтр Високих Частот"
   </dest>
   <voice>
-    *: none
-    swcodec: "Фiльтр Високих Частот"
+    *: "Фiльтр Високих Частот"
   </voice>
 </phrase>
 <phrase>
@@ -1121,16 +1067,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Частота Зрiзу"
+    *: "Частота Зрiзу"
   </dest>
   <voice>
-    *: none
-    swcodec: "Частота Зрiзу"
+    *: "Частота Зрiзу"
   </voice>
 </phrase>
 <phrase>
@@ -1138,16 +1081,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Центральна Частота"
+    *: "Центральна Частота"
   </dest>
   <voice>
-    *: none
-    swcodec: "Центральна Частота"
+    *: "Центральна Частота"
   </voice>
 </phrase>
 <phrase>
@@ -1155,16 +1095,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1172,16 +1109,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Зглажування"
+    *: "Зглажування"
   </dest>
   <voice>
-    *: none
-    swcodec: "Зглажування"
+    *: "Зглажування"
   </voice>
 </phrase>
 <phrase>
@@ -1725,16 +1659,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Запобiгати Перевантаженню"
+    *: "Запобiгати Перевантаженню"
   </dest>
   <voice>
-    *: none
-    swcodec: "Запобiгати Перевантаженню"
+    *: "Запобiгати Перевантаженню"
   </voice>
 </phrase>
 <phrase>
@@ -1812,16 +1743,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Сигнал Пропуску Треку"
+    *: "Сигнал Пропуску Треку"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сигнал Пропуску Треку"
+    *: "Сигнал Пропуску Треку"
   </voice>
 </phrase>
 <phrase>
@@ -1829,16 +1757,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Слабкий"
+    *: "Слабкий"
   </dest>
   <voice>
-    *: none
-    swcodec: "Слабкий"
+    *: "Слабкий"
   </voice>
 </phrase>
 <phrase>
@@ -1846,16 +1771,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Помiрний"
+    *: "Помiрний"
   </dest>
   <voice>
-    *: none
-    swcodec: "Помiрний"
+    *: "Помiрний"
   </voice>
 </phrase>
 <phrase>
@@ -1863,16 +1785,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Сильний"
+    *: "Сильний"
   </dest>
   <voice>
-    *: none
-    swcodec: "Сильний"
+    *: "Сильний"
   </voice>
 </phrase>
 <phrase>
@@ -2229,21 +2148,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Створення Бази Даних ... %d знайдено (ВИМК. для скасування)"
-    iriverh100,iriverh120,iriverh300: "Створення Бази Даних... %d знайдено (СТОП для скасування)"
-    ipod*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для скасування)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Створення Бази Даних... %d знайдено (ЛIВО для скасування)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для скасування)"
-    gogearsa9200: "Створення Бази Даних... %d знайдено (ПЕРЕМ. для скасування)"
     archosplayer: "Створення БД %d знайдено"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Створення Бази Даних... %d знайдено (ЛIВО для скасування)"
+    gogearsa9200: "Створення Бази Даних... %d знайдено (ПЕРЕМ. для скасування)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для скасування)"
+    iriverh100,iriverh120,iriverh300: "Створення Бази Даних... %d знайдено (СТОП для скасування)"
   </dest>
   <voice>
     *: "Знайдено записiв в базi даних"
@@ -2425,16 +2342,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Шрифт"
+    *: "Шрифт"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Шрифт"
+    *: "Шрифт"
   </voice>
 </phrase>
 <phrase>
@@ -2696,16 +2610,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Догори ногами"
+    *: "Догори ногами"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Догори ногами"
+    *: "Догори ногами"
   </voice>
 </phrase>
 <phrase>
@@ -2713,16 +2624,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Тип Курсору"
+    *: "Тип Курсору"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Тип Курсору"
+    *: "Тип Курсору"
   </voice>
 </phrase>
 <phrase>
@@ -2730,16 +2638,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Стрiлочка"
+    *: "Стрiлочка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Стрiлочка"
+    *: "Стрiлочка"
   </voice>
 </phrase>
 <phrase>
@@ -2747,16 +2652,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Iнверсний Курсор"
+    *: "Iнверсний Курсор"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Iнверсний Курсор"
+    *: "Iнверсний Курсор"
   </voice>
 </phrase>
 <phrase>
@@ -3004,7 +2906,7 @@
     *: "Scroll Step Size Setting Example Text"
   </source>
   <dest>
-    *: "Приклад Тексту Величини Кроку Прокрутки" 
+    *: "Приклад Тексту Величини Кроку Прокрутки"
   </dest>
   <voice>
     *: ""
@@ -3046,16 +2948,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Прокрутка Екрану"
+    *: "Прокрутка Екрану"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Прокрутка Екрану"
+    *: "Прокрутка Екрану"
   </voice>
 </phrase>
 <phrase>
@@ -3063,16 +2962,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Крок Прокрутки Екрану"
+    *: "Крок Прокрутки Екрану"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Крок Прокрутки Екрану"
+    *: "Крок Прокрутки Екрану"
   </voice>
 </phrase>
 <phrase>
@@ -3128,16 +3024,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Статус/Прокрутка"
+    *: "Статус/Прокрутка"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Статус та Прокрутка"
+    *: "Статус та Прокрутка"
   </voice>
 </phrase>
 <phrase>
@@ -3145,16 +3038,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Панель Прокрутки"
+    *: "Панель Прокрутки"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Панель Прокрутки"
+    *: "Панель Прокрутки"
   </voice>
 </phrase>
 <phrase>
@@ -3162,16 +3052,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Панель Статусу"
+    *: "Панель Статусу"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Панель Статусу"
+    *: "Панель Статусу"
   </voice>
 </phrase>
 <phrase>
@@ -3196,16 +3083,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Вiдображення Гучностi"
+    *: "Вiдображення Гучностi"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Вiдображення Гучностi"
+    *: "Вiдображення Гучностi"
   </voice>
 </phrase>
 <phrase>
@@ -3213,16 +3097,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Вiдображення Заряду Акумулятора"
+    *: "Вiдображення Заряду Акумулятора"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Вiдображення Заряду Акумулятора"
+    *: "Вiдображення Заряду Акумулятора"
   </voice>
 </phrase>
 <phrase>
@@ -3230,16 +3111,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Графiчний"
+    *: "Графiчний"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Графiчний"
+    *: "Графiчний"
   </voice>
 </phrase>
 <phrase>
@@ -3247,16 +3125,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Числовий"
+    *: "Числовий"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Числовий"
+    *: "Числовий"
   </voice>
 </phrase>
 <phrase>
@@ -3476,16 +3351,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Iврит (ISO-8859-8)"
+    *: "Iврит (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Iврит"
+    *: "Iврит"
   </voice>
 </phrase>
 <phrase>
@@ -3507,16 +3379,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Тайська (ISO-8859-11)"
+    *: "Тайська (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Тайська"
+    *: "Тайська"
   </voice>
 </phrase>
 <phrase>
@@ -3524,16 +3393,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Арабська (CP1256)"
+    *: "Арабська (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Арабська"
+    *: "Арабська"
   </voice>
 </phrase>
 <phrase>
@@ -3569,16 +3435,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Японська (SJIS)"
+    *: "Японська (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Японська"
+    *: "Японська"
   </voice>
 </phrase>
 <phrase>
@@ -3586,16 +3449,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Китайська Спрощена (GB2312)"
+    *: "Китайська Спрощена (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Китайська Спрощена"
+    *: "Китайська Спрощена"
   </voice>
 </phrase>
 <phrase>
@@ -3603,16 +3463,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Корейська (KSX1001)"
+    *: "Корейська (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Корейська"
+    *: "Корейська"
   </voice>
 </phrase>
 <phrase>
@@ -3620,16 +3477,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Китайська Традицiйна (BIG5)"
+    *: "Китайська Традицiйна (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Китайська Традицiйна"
+    *: "Китайська Традицiйна"
   </voice>
 </phrase>
 <phrase>
@@ -3653,17 +3507,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Таймаут Пiдсвiтки Кнопок"
-    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"
+    sansae200*,sansafuze*: "Таймаут Пiдсвiтки Колеса"
   </dest>
   <voice>
     *: none
     button_light: "Таймаут Пiдсвiтки Кнопок"
-    sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса"
+    sansae200*,sansafuze*: "Таймаут Пiдсвiтки Колеса"
   </voice>
 </phrase>
 <phrase>
@@ -3934,23 +3788,23 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ВВIМК. = Встановити"
-    mrobe500: "СЕРЦЕ = Встановити"
-    iriverh100,iriverh120,iriverh300: "НАВIГ. = Встановити"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "ВИБРАТИ = Встановити"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "ВИБРАТИ = Встановити"
     gogearsa9200,samsungyh*: "ПРОГРАВ. = Встановити"
-    vibe500: "OK = Встановити"
+    iriverh100,iriverh120,iriverh300: "НАВIГ. = Встановити"
     mpiohd300: "ENTER = Встановити"
+    mrobe500: "СЕРЦЕ = Встановити"
+    rtc: "ВВIМК. = Встановити"
+    vibe500: "OK = Встановити"
   </dest>
   <voice>
     *: none
@@ -3962,34 +3816,31 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "ВИМК. = Скасувати"
-    mrobe500: "ВИМК. = Скасувати"
-    iriverh100,iriverh120,iriverh300: "СТОП = Скасувати"
-    ipod*,sansac200*,mpiohd300: "МЕНЮ = Скасувати"
-    iaudiox5,iaudiom5: "ЗАПИС = Скасувати"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПОПЕРЕД. = Скасувати"
     gigabeatfx: "ЖИВЛЕННЯ = Скасувати"
-    mrobe100: "ДИСПЛЕЙ = Скасувати"
     gigabeats: "НАЗАД = Скасувати"
     gogearsa9200: "ВЛIВО = Скасувати"
-    vibe500: "C = Скасувати"
+    iaudiom5,iaudiox5: "ЗАПИС = Скасувати"
+    ipod*,mpiohd300,sansac200*: "МЕНЮ = Скасувати"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПОПЕРЕД. = Скасувати"
+    iriverh100,iriverh120,iriverh300: "СТОП = Скасувати"
+    mrobe100: "ДИСПЛЕЙ = Скасувати"
+    mrobe500,rtc: "ВИМК. = Скасувати"
     samsungyh*: "REW = Скасувати"
+    vibe500: "C = Скасувати"
   </dest>
   <voice>
     *: none
@@ -4478,22 +4329,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "ВIДТВОР.=Встановити ВИМК.=Вiдмiнити"
+    gigabeats: "ВИБIР=Встановити ЖИВЛ.=Вiдмiнити"
     ipod*: "ВИБIР=Встановити МЕНЮ=Вiдмiнити"
     iriverh10,iriverh10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити"
-    gigabeats: "ВИБIР=Встановити ЖИВЛ.=Вiдмiнити"
-    vibe500: "OK=Встановити C=Вiдмiнити"
     mpiohd300: "ENTER=Встановити MENU=Вiдмiнити"
     sansafuzeplus: "SELECT=Встановити  BACK=Вiдмiнити"
+    vibe500: "OK=Встановити C=Вiдмiнити"
   </dest>
   <voice>
     *: none
@@ -5598,15 +5449,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Частота"
+    play_frequency,recording: "Частота"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Частота"
+    play_frequency,recording: "Частота"
   </voice>
 </phrase>
 <phrase>
@@ -5649,18 +5500,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Мiкрофон"
     iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"
+    recording: "Мiкрофон"
   </dest>
   <voice>
     *: none
-    recording: "Мiкрофон"
     iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон"
+    recording: "Мiкрофон"
   </voice>
 </phrase>
 <phrase>
@@ -6538,13 +6389,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Акумулятор: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Рiвень Заряду Акумулятору"
@@ -6601,24 +6452,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "microSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "microSD:"
     xduoox3: "microSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "H D 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7933,23 +7784,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Диск повний. Натичнiть OFF для продовження."
-    iriverh100,iriverh120,iriverh300: "Диск повний. Натичнiть STOP для продовження."
     iaudiom5,iaudiox5: "Диск повний. Натичнiть POWER для продовження."
-    sansae200*,sansac200*,vibe500: "Диск повний. Натичнiть PREV для продовження."
+    iriverh100,iriverh120,iriverh300: "Диск повний. Натичнiть STOP для продовження."
+    recording: "Диск повний. Натичнiть OFF для продовження."
     samsungyh*: "Диск повний. Натичнiть LEFT для продовження."
+    sansac200*,sansae200*,vibe500: "Диск повний. Натичнiть PREV для продовження."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8037,23 +7888,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF для в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ни"
-    gigabeats: "BACK для вiдмiни"
     gigabeatfx: "POWER для вiдмiни"
-    sansafuzeplus: "BACK для вiдмiни"
+    gigabeats,sansafuzeplus: "BACK для вiдмiни"
+    iaudiom5,iaudiox5: "Довге натискання PLAY для вiдмiни"
+    ipod*: "PLAY/PAUSE для вiдмiни"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV для вiдмiни"
+    iriverh100,iriverh120,iriverh300: "STOP для вiдмiни"
   </dest>
   <voice>
     *: ""
@@ -9605,7 +9454,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9647,16 +9496,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Режим редагування: %s %s"
+    *: "Режим редагування: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9664,16 +9510,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Зрiзання"
+    *: "Зрiзання"
   </dest>
   <voice>
-    *: none
-    swcodec: "Частота Зрiзання"
+    *: "Частота Зрiзання"
   </voice>
 </phrase>
 <phrase>
@@ -9681,16 +9524,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Пiдсилення"
+    *: "Пiдсилення"
   </dest>
   <voice>
-    *: none
-    swcodec: "Пiдсилення"
+    *: "Пiдсилення"
   </voice>
 </phrase>
 <phrase>
@@ -9698,16 +9538,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Режим:"
+    *: "Режим:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10336,7 +10173,7 @@
     multivolume: "Не присутнiй"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10370,15 +10207,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Вiдсiкання Басу"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Вiдсiкання Басу"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Басу"
   </voice>
 </phrase>
 <phrase>
@@ -10387,15 +10224,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Вiдсiкання Високих Частот"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Вiдсiкання Високих Частот"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Вiдсiкання Високих Частот"
   </voice>
 </phrase>
 <phrase>
@@ -10431,16 +10268,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Озвучення Натискання Кнопок"
+    *: "Озвучення Натискання Кнопок"
   </dest>
   <voice>
-    *: none
-    swcodec: "Озвучення Натискання Кнопок"
+    *: "Озвучення Натискання Кнопок"
   </voice>
 </phrase>
 <phrase>
@@ -10448,16 +10282,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Повторення Сигналу Натискання"
+    *: "Повторення Сигналу Натискання"
   </dest>
   <voice>
-    *: none
-    swcodec: "Повторення Сигналу Натискання"
+    *: "Повторення Сигналу Натискання"
   </voice>
 </phrase>
 <phrase>
@@ -10578,11 +10409,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Швидкiсть Послiдовного Порту"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Швидкiсть Послiдовного Порту"
   </voice>
@@ -10595,11 +10426,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Авто"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Автоматично"
   </voice>
@@ -10612,11 +10443,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10629,11 +10460,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10646,11 +10477,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10663,11 +10494,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11162,16 +10993,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Розтягування Часу"
+    *: "Розтягування Часу"
   </dest>
   <voice>
-    *: none
-    swcodec: "Розтягування Часу"
+    *: "Розтягування Часу"
   </voice>
 </phrase>
 <phrase>
@@ -11179,16 +11007,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Швидкiсть"
+    *: "Швидкiсть"
   </dest>
   <voice>
-    *: none
-    swcodec: "Швидкiсть"
+    *: "Швидкiсть"
   </voice>
 </phrase>
 <phrase>
@@ -11289,7 +11114,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11340,7 +11165,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -11402,16 +11227,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Час звільнення"
+    *: "Час звільнення"
   </dest>
   <voice>
-    *: none
-    swcodec: "Час звільнення"
+    *: "Час звільнення"
   </voice>
 </phrase>
 <phrase>
@@ -11467,16 +11289,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Поріг"
+    *: "Поріг"
   </dest>
   <voice>
-    *: none
-    swcodec: "Поріг"
+    *: "Поріг"
   </voice>
 </phrase>
 <phrase>
@@ -11501,16 +11320,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Маскувати підсилення"
+    *: "Маскувати підсилення"
   </dest>
   <voice>
-    *: none
-    swcodec: "Маскувати підсилення"
+    *: "Маскувати підсилення"
   </voice>
 </phrase>
 <phrase>
@@ -11518,16 +11334,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основна тема"
+    *: "Основна тема"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основна тема"
+    *: "Основна тема"
   </voice>
 </phrase>
 <phrase>
@@ -11614,16 +11427,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Позиція смужки прокручування"
+    *: "Позиція смужки прокручування"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Позиція смужки прокручування"
+    *: "Позиція смужки прокручування"
   </voice>
 </phrase>
 <phrase>
@@ -11648,16 +11458,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Коліно"
+    *: "Коліно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Коліно"
+    *: "Коліно"
   </voice>
 </phrase>
 <phrase>
@@ -11665,16 +11472,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Авто"
+    *: "Авто"
   </dest>
   <voice>
-    *: none
-    swcodec: "Авто"
+    *: "Авто"
   </voice>
 </phrase>
 <phrase>
@@ -11724,16 +11528,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Мягке коліно"
+    *: "Мягке коліно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Мягке коліно"
+    *: "Мягке коліно"
   </voice>
 </phrase>
 <phrase>
@@ -11741,16 +11542,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Час атаки"
+    *: "Час атаки"
   </dest>
   <voice>
-    *: none
-    swcodec: "Час атаки"
+    *: "Час атаки"
   </voice>
 </phrase>
 <phrase>
@@ -11772,16 +11570,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Cпіввідношення"
+    *: "Cпіввідношення"
   </dest>
   <voice>
-    *: none
-    swcodec: "Cпіввідношення"
+    *: "Cпіввідношення"
   </voice>
 </phrase>
 <phrase>
@@ -11823,16 +11618,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Жорстке коліно"
+    *: "Жорстке коліно"
   </dest>
   <voice>
-    *: none
-    swcodec: "Жорстке коліно"
+    *: "Жорстке коліно"
   </voice>
 </phrase>
 <phrase>
@@ -11857,16 +11649,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Основна тема"
+    *: "Основна тема"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Основна тема"
+    *: "Основна тема"
   </voice>
 </phrase>
 <phrase>
@@ -12072,16 +11861,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Перемотати перед відновленням"
+    *: "Перемотати перед відновленням"
   </dest>
   <voice>
-    *: none
-    swcodec: "Перемотати перед відновленням"
+    *: "Перемотати перед відновленням"
   </voice>
 </phrase>
 <phrase>
@@ -12179,16 +11965,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 до 1"
+    *: "10 до 1"
   </voice>
 </phrase>
 <phrase>
@@ -12245,15 +12028,15 @@
   user: core
   <source>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3-D Enhancement"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3-D Enhancement"
   </source>
   <dest>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D Збільшення"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D Збільшення"
   </dest>
   <voice>
     *: none
-    gigabeats,mpiohd200,mpiohd300,sansafuzeplus,creativezenxfi2,creativezenxfi3: "3D Збільшення"
+    creativezenxfi2,creativezenxfi3,gigabeats,mpiohd200,mpiohd300,sansafuzeplus: "3D Збільшення"
   </voice>
 </phrase>
 <phrase>
@@ -12362,16 +12145,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 до 1"
+    *: "2 до 1"
   </voice>
 </phrase>
 <phrase>
@@ -12447,16 +12227,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Межа"
+    *: "Межа"
   </dest>
   <voice>
-    *: none
-    swcodec: "Межа"
+    *: "Межа"
   </voice>
 </phrase>
 <phrase>
@@ -12495,16 +12272,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ширина смуги прокрутки"
+    *: "Ширина смуги прокрутки"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ширина смуги прокрутки"
+    *: "Ширина смуги прокрутки"
   </voice>
 </phrase>
 <phrase>
@@ -12633,16 +12407,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 до 1"
+    *: "6 до 1"
   </voice>
 </phrase>
 <phrase>
@@ -12709,16 +12480,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </dest>
   <voice>
-    *: none
-    swcodec: "Компресор"
+    *: "Компресор"
   </voice>
 </phrase>
 <phrase>
@@ -12833,16 +12601,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 до 1"
+    *: "4 до 1"
   </voice>
 </phrase>
 <phrase>
@@ -12923,16 +12688,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Звичайний (Майєр)"
+    *: "Звичайний (Майєр)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Звичайний"
+    *: "Звичайний"
   </voice>
 </phrase>
 <phrase>
@@ -12996,16 +12758,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Користувацькі налаштування"
+    *: "Користувацькі налаштування"
   </dest>
   <voice>
-    *: none
-    swcodec: "Користувацькі налаштування"
+    *: "Користувацькі налаштування"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index 2e1989f0b1..d64eb37ac5 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -620,16 +620,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -637,16 +634,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </dest>
   <voice>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </voice>
 </phrase>
 <phrase>
@@ -825,16 +819,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ inschakelen"
+    *: "EQ inschakelen"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ inschakelen"
+    *: "EQ inschakelen"
   </voice>
 </phrase>
 <phrase>
@@ -842,16 +833,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Grafischen EQ"
+    *: "Grafischen EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Grafischen EQ"
+    *: "Grafischen EQ"
   </voice>
 </phrase>
 <phrase>
@@ -859,16 +847,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Voorsnijden"
+    *: "Voorsnijden"
   </dest>
   <voice>
-    *: none
-    swcodec: "Voorsnijden"
+    *: "Voorsnijden"
   </voice>
 </phrase>
 <phrase>
@@ -876,16 +861,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Eenvoudige EQ-instellingen"
+    *: "Eenvoudige EQ-instellingen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Eenvoudige EQ-instellingen"
+    *: "Eenvoudige EQ-instellingen"
   </voice>
 </phrase>
 <phrase>
@@ -893,16 +875,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Geavanceerde EQ-instellingen"
+    *: "Geavanceerde EQ-instellingen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Geavanceerde EQ-instellingen"
+    *: "Geavanceerde EQ-instellingen"
   </voice>
 </phrase>
 <phrase>
@@ -910,16 +889,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ-voorkeuze opslaan"
+    *: "EQ-voorkeuze opslaan"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ-voorkeuze opslaan"
+    *: "EQ-voorkeuze opslaan"
   </voice>
 </phrase>
 <phrase>
@@ -927,16 +903,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "EQ-voorkeuzes laden"
+    *: "EQ-voorkeuzes laden"
   </dest>
   <voice>
-    *: none
-    swcodec: "EQ-voorkeuzes laden"
+    *: "EQ-voorkeuzes laden"
   </voice>
 </phrase>
 <phrase>
@@ -944,16 +917,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Bewerkmodus: %s"
+    *: "Bewerkmodus: %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -961,16 +931,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz-bandversterking"
+    *: "%d Hz-bandversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hertz bandversterking"
+    *: "Hertz bandversterking"
   </voice>
 </phrase>
 <phrase>
@@ -978,16 +945,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Lagebandfilter"
+    *: "Lagebandfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Lagebandfilter"
+    *: "Lagebandfilter"
   </voice>
 </phrase>
 <phrase>
@@ -995,16 +959,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Piekfilter %d"
+    *: "Piekfilter %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Piekfilter"
+    *: "Piekfilter"
   </voice>
 </phrase>
 <phrase>
@@ -1012,16 +973,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Hogebandfilter"
+    *: "Hogebandfilter"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hogebandfilter"
+    *: "Hogebandfilter"
   </voice>
 </phrase>
 <phrase>
@@ -1029,16 +987,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -1046,16 +1001,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Middenfrequentie"
+    *: "Middenfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Middenfrequentie"
+    *: "Middenfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -1063,16 +1015,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1338,16 +1287,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Biep bij nummer overslaan"
+    *: "Biep bij nummer overslaan"
   </dest>
   <voice>
-    *: none
-    swcodec: "Biep bij nummer overslaan"
+    *: "Biep bij nummer overslaan"
   </voice>
 </phrase>
 <phrase>
@@ -1355,16 +1301,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Zwak"
+    *: "Zwak"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zwak"
+    *: "Zwak"
   </voice>
 </phrase>
 <phrase>
@@ -1372,16 +1315,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Normaal"
+    *: "Normaal"
   </dest>
   <voice>
-    *: none
-    swcodec: "Normaal"
+    *: "Normaal"
   </voice>
 </phrase>
 <phrase>
@@ -1389,16 +1329,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Sterk"
+    *: "Sterk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sterk"
+    *: "Sterk"
   </voice>
 </phrase>
 <phrase>
@@ -1692,16 +1629,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lettertype"
+    *: "Lettertype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lettertype"
+    *: "Lettertype"
   </voice>
 </phrase>
 <phrase>
@@ -1785,16 +1719,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Status-/scrollbalk"
+    *: "Status-/scrollbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Status en scrollbalk"
+    *: "Status en scrollbalk"
   </voice>
 </phrase>
 <phrase>
@@ -1861,16 +1792,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Hebreeuws (ISO-8859-8)"
+    *: "Hebreeuws (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Hebreeuws"
+    *: "Hebreeuws"
   </voice>
 </phrase>
 <phrase>
@@ -1892,16 +1820,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Thais (ISO-8859-11)"
+    *: "Thais (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Thais"
+    *: "Thais"
   </voice>
 </phrase>
 <phrase>
@@ -1909,16 +1834,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabisch (CP1256)"
+    *: "Arabisch (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabisch"
+    *: "Arabisch"
   </voice>
 </phrase>
 <phrase>
@@ -1954,16 +1876,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Japans (SJIS)"
+    *: "Japans (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Japans"
+    *: "Japans"
   </voice>
 </phrase>
 <phrase>
@@ -1971,16 +1890,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Vereenvoudigd Chinees (GB2312)"
+    *: "Vereenvoudigd Chinees (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Vereenvoudigd Chinees"
+    *: "Vereenvoudigd Chinees"
   </voice>
 </phrase>
 <phrase>
@@ -1988,16 +1904,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Koreaans (KSX1001)"
+    *: "Koreaans (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Koreaans"
+    *: "Koreaans"
   </voice>
 </phrase>
 <phrase>
@@ -2005,16 +1918,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Traditioneel Chinees (BIG5)"
+    *: "Traditioneel Chinees (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Traditioneel Chinees"
+    *: "Traditioneel Chinees"
   </voice>
 </phrase>
 <phrase>
@@ -2360,15 +2270,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frequentie"
+    play_frequency,recording: "Frequentie"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frequentie"
+    play_frequency,recording: "Frequentie"
   </voice>
 </phrase>
 <phrase>
@@ -2394,18 +2304,18 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Microfoon"
     iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    recording: "Microfoon"
   </dest>
   <voice>
     *: none
-    recording: "Microfoon"
     iriverh100,iriverh120,iriverh300: "Interne microfoon"
+    recording: "Microfoon"
   </voice>
 </phrase>
 <phrase>
@@ -2747,16 +2657,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Voorkom clippen"
+    *: "Voorkom clippen"
   </dest>
   <voice>
-    *: none
-    swcodec: "Voorkom clippen"
+    *: "Voorkom clippen"
   </voice>
 </phrase>
 <phrase>
@@ -2992,16 +2899,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ondersteboven"
+    *: "Ondersteboven"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ondersteboven"
+    *: "Ondersteboven"
   </voice>
 </phrase>
 <phrase>
@@ -3009,16 +2913,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Regelkiezertype"
+    *: "Regelkiezertype"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Regelkiezertype"
+    *: "Regelkiezertype"
   </voice>
 </phrase>
 <phrase>
@@ -3026,16 +2927,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Aanwijzer"
+    *: "Aanwijzer"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Aanwijzer"
+    *: "Aanwijzer"
   </voice>
 </phrase>
 <phrase>
@@ -3043,16 +2941,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Balk (geïnverteerd)"
+    *: "Balk (geïnverteerd)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Balk (geïnverteerd)"
+    *: "Balk (geïnverteerd)"
   </voice>
 </phrase>
 <phrase>
@@ -3229,16 +3124,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scherm schuift uit beeld"
+    *: "Scherm schuift uit beeld"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scherm schuift uit beeld"
+    *: "Scherm schuift uit beeld"
   </voice>
 </phrase>
 <phrase>
@@ -3246,16 +3138,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Schermscrollstapgrootte"
+    *: "Schermscrollstapgrootte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Schermscrollstapgrootte"
+    *: "Schermscrollstapgrootte"
   </voice>
 </phrase>
 <phrase>
@@ -3277,16 +3166,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalk"
+    *: "Scrollbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalk"
+    *: "Scrollbalk"
   </voice>
 </phrase>
 <phrase>
@@ -3294,16 +3180,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Statusbalk"
+    *: "Statusbalk"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Statusbalk"
+    *: "Statusbalk"
   </voice>
 </phrase>
 <phrase>
@@ -3328,16 +3211,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Volume tonen als"
+    *: "Volume tonen als"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Volume tonen als"
+    *: "Volume tonen als"
   </voice>
 </phrase>
 <phrase>
@@ -3345,16 +3225,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Batterij tonen als"
+    *: "Batterij tonen als"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Batterij tonen als"
+    *: "Batterij tonen als"
   </voice>
 </phrase>
 <phrase>
@@ -3362,16 +3239,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafisch"
+    *: "Grafisch"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafisch"
+    *: "Grafisch"
   </voice>
 </phrase>
 <phrase>
@@ -3379,16 +3253,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Numeriek"
+    *: "Numeriek"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Numeriek"
+    *: "Numeriek"
   </voice>
 </phrase>
 <phrase>
@@ -4238,13 +4109,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batterij: %d%% %du %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Batterijniveau"
@@ -4301,24 +4172,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "Multimediakaart"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "Multimediakaart"
   </voice>
 </phrase>
 <phrase>
@@ -4448,51 +4319,45 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = terugzetten"
-    mrobe500: "POWER = terugzetten"
-    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
-    ipod*,sansac200*,mpiohd300: "MENU = terugzetten"
-    iaudiox5,iaudiom5: "RECORD = terugzetten"
+    gigabeatfx,mrobe500: "POWER = terugzetten"
+    gigabeats,sansafuzeplus: "BACK = terugzetten"
+    gogearsa9200: "LINKS = terugzetten"
+    iaudiom5,iaudiox5: "RECORD = terugzetten"
+    ipod*,mpiohd300,sansac200*: "MENU = terugzetten"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
-    gigabeatfx: "POWER = terugzetten"
-    sansafuzeplus: "BACK = terugzetten"
+    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    gigabeats: "BACK = terugzetten"
-    gogearsa9200: "LINKS = terugzetten"
-    vibe500: "C = terugzetten"
+    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
+    vibe500: "C = terugzetten"
   </dest>
   <voice>
     *: none
-    rtc: "OFF = terugzetten"
-    mrobe500: "POWER = terugzetten"
-    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
-    ipod*,sansac200*,mpiohd300: "MENU = terugzetten"
-    iaudiox5,iaudiom5: "RECORD = terugzetten"
+    gigabeatfx,mrobe500: "POWER = terugzetten"
+    gigabeats,sansafuzeplus: "BACK = terugzetten"
+    gogearsa9200: "LINKS = terugzetten"
+    iaudiom5,iaudiox5: "RECORD = terugzetten"
+    ipod*,mpiohd300,sansac200*: "MENU = terugzetten"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
-    gigabeatfx: "POWER = terugzetten"
-    sansafuzeplus: "BACK = terugzetten"
+    iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    gigabeats: "BACK = terugzetten"
-    gogearsa9200: "LINKS = terugzetten"
-    vibe500: "C = terugzetten"
+    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
+    vibe500: "C = terugzetten"
   </voice>
 </phrase>
 <phrase>
@@ -4535,27 +4400,27 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "De schijf is vol. Drukt op OFF voor verder te gaan."
-    iriverh100,iriverh120,iriverh300: "De schijf is vol. Drukt op STOP voor verder te gaan."
     iaudiom5,iaudiox5: "De schijf is vol. Drukt op POWER voor verder te gaan."
-    sansae200*,sansac200*,vibe500: "De schijf is vol. Drukt op PREV voor verder te gaan."
+    iriverh100,iriverh120,iriverh300: "De schijf is vol. Drukt op STOP voor verder te gaan."
+    recording: "De schijf is vol. Drukt op OFF voor verder te gaan."
     samsungyh*: "De schijf is vol. Drukt op LINKS voor verder te gaan."
+    sansac200*,sansae200*,vibe500: "De schijf is vol. Drukt op PREV voor verder te gaan."
   </dest>
   <voice>
     *: none
-    recording: "De schijf is vol. Drukt op OFF voor verder te gaan."
-    iriverh100,iriverh120,iriverh300: "De schijf is vol. Drukt op STOP voor verder te gaan."
     iaudiom5,iaudiox5: "De schijf is vol. Drukt op POWER voor verder te gaan."
-    sansae200*,sansac200*,vibe500: "De schijf is vol. Drukt op PREV voor verder te gaan."
+    iriverh100,iriverh120,iriverh300: "De schijf is vol. Drukt op STOP voor verder te gaan."
+    recording: "De schijf is vol. Drukt op OFF voor verder te gaan."
     samsungyh*: "De schijf is vol. Drukt op LINKS voor verder te gaan."
+    sansac200*,sansae200*,vibe500: "De schijf is vol. Drukt op PREV voor verder te gaan."
   </voice>
 </phrase>
 <phrase>
@@ -4718,32 +4583,32 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=instellen, OFF=annuleren"
+    gigabeats: "SELECT=instellen, POWER=annuleren"
     ipod*: "SELECT=instellen, MENU=annuleren"
     iriverh10,iriverh10_5gb: "SELECT=instellen, PREV=annuleren"
-    gigabeats: "SELECT=instellen, POWER=annuleren"
-    vibe500: "OK=instellen, C=annuleren"
     mpiohd300: "ENTER=instellen, MENU=annuleren"
     sansafuzeplus: "SELECT=instellen, BACK=annuleren"
+    vibe500: "OK=instellen, C=annuleren"
   </dest>
   <voice>
     *: none
     alarm: "PLAY=instellen, OFF=annuleren"
+    gigabeats: "SELECT=instellen, POWER=annuleren"
     ipod*: "SELECT=instellen, MENU=annuleren"
     iriverh10,iriverh10_5gb: "SELECT=instellen, PREV=annuleren"
-    gigabeats: "SELECT=instellen, POWER=annuleren"
-    vibe500: "OK=instellen, C=annuleren"
     mpiohd300: "ENTER=instellen, MENU=annuleren"
     sansafuzeplus: "SELECT=instellen, BACK=annuleren"
+    vibe500: "OK=instellen, C=annuleren"
   </voice>
 </phrase>
 <phrase>
@@ -4806,11 +4671,11 @@
     lcd_color: "Invalid colour"
   </source>
   <dest>
-   *: none
+    *: none
     lcd_color: "Ongeldige kleur"
   </dest>
   <voice>
-   *: none
+    *: none
     lcd_color: "Ongeldige kleur"
   </voice>
 </phrase>
@@ -7180,33 +7045,30 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
-    gigabeats: "BACK voor af te breken"
     gigabeatfx: "POWER voor af te breken"
-    sansafuzeplus: "BACK voor af te breken"
+    gigabeats,sansafuzeplus: "BACK voor af te breken"
+    iaudiom5,iaudiox5: "Lang PLAY voor af te breken"
+    ipod*: "PLAY/PAUSE voor af te breken"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV voor af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
   </dest>
   <voice>
     *: "OFF 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"
-    gigabeats: "BACK voor af te breken"
     gigabeatfx: "POWER voor af te breken"
-    sansafuzeplus: "BACK voor af te breken"
+    gigabeats,sansafuzeplus: "BACK voor af te breken"
+    iaudiom5,iaudiox5: "Lang PLAY voor af te breken"
+    ipod*: "PLAY/PAUSE voor af te breken"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV voor af te breken"
+    iriverh100,iriverh120,iriverh300: "STOP voor af te breken"
   </voice>
 </phrase>
 <phrase>
@@ -7546,33 +7408,27 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Rechtstreekse versterking"
+    *: "Rechtstreekse versterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rechtstreekse versterking"
+    *: "Rechtstreekse versterking"
   </voice>
 </phrase>
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
-  <source>  
-    *: none
-    swcodec: "Cross Gain"
+  <source>
+    *: "Cross Gain"
   </source>
-  <dest>  
-    *: none
-    swcodec: "Crossversterking"
+  <dest>
+    *: "Crossversterking"
   </dest>
-  <voice>  
-    *: none
-    swcodec: "Crossversterking"
+  <voice>
+    *: "Crossversterking"
   </voice>
 </phrase>
 <phrase>
@@ -7580,16 +7436,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Hogefrequentievermindering"
+    *: "Hogefrequentievermindering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hogefrequentievermindering"
+    *: "Hogefrequentievermindering"
   </voice>
 </phrase>
 <phrase>
@@ -7597,16 +7450,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Hoge afsnijfrequentie"
+    *: "Hoge afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Hoge afsnijfrequentie"
+    *: "Hoge afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -8034,16 +7884,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Bewerkmodus: %s %s"
+    *: "Bewerkmodus: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8051,16 +7898,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afsnijfrequentie"
+    *: "Afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -8489,16 +8333,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </voice>
 </phrase>
 <phrase>
@@ -9031,21 +8872,19 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
-    gogearsa9200: "Building database... %d found (REW to return)"
     archosplayer: "Building DB %d found"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
+    gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Aanmaken van database... %d gevonden (OFF = terug)"
-    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
-    ipod*: "Aanmaken van database... %d gevonden (PREV = terug)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Aanmaken van database... %d gevonden (LINKS = terug)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Aanmaken van database... %d gevonden (PREV = terug)"
-    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
     archosplayer: "Aanmaken DB %d gev."
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Aanmaken van database... %d gevonden (LINKS = terug)"
+    gogearsa9200: "Aanmaken van database... %d gevonden (REW =  terug)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Aanmaken van database... %d gevonden (PREV = terug)"
+    iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)"
   </dest>
   <voice>
     *: "aantal bestanden gevonden in database"
@@ -9353,17 +9192,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiellichttime-out"
+    sansae200*,sansafuze*: "Wiellichttime-out"
   </dest>
   <voice>
     *: none
     button_light: "Knoppen Licht Vertraging"
-    sansafuze*,sansae200*: "Wiellichttime-out"
+    sansae200*,sansafuze*: "Wiellichttime-out"
   </voice>
 </phrase>
 <phrase>
@@ -9557,33 +9396,33 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
+    creativezen*: "Select = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
-    creativezen*: "Select = Yes"
   </source>
   <dest>
     *: "PLAY = ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU of rechtsboven = ja"
+    creativezen*: "Select = ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ja"
     iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ja"
     mrobe500: "PLAY, POWER of rechtsboven = ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = ja"
-    creativezen*: "Select = ja"
   </dest>
   <voice>
     *: "PLAY = ja"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU of rechtsboven = ja"
+    creativezen*: "Select = ja"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ja"
     iriverh100,iriverh120,iriverh300: "NAVI = ja"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = ja"
     mrobe500: "PLAY, POWER of rechtsboven = ja"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = ja"
-    creativezen*: "Select = ja"
   </voice>
 </phrase>
 <phrase>
@@ -9592,33 +9431,33 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = instellen"
-    mrobe500: "HEART = instellen"
-    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = instellen"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
-    vibe500: "OK = instellen"
+    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
+    mrobe500: "HEART = instellen"
+    rtc: "ON = instellen"
+    vibe500: "OK = instellen"
   </dest>
   <voice>
     *: none
-    rtc: "ON = instellen"
-    mrobe500: "HEART = instellen"
-    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = instellen"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
-    vibe500: "OK = instellen"
+    iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
+    mrobe500: "HEART = instellen"
+    rtc: "ON = instellen"
+    vibe500: "OK = instellen"
   </voice>
 </phrase>
 <phrase>
@@ -9704,16 +9543,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Versterking"
+    *: "Versterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Versterking"
+    *: "Versterking"
   </voice>
 </phrase>
 <phrase>
@@ -9735,16 +9571,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Modus:"
+    *: "Modus:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Modus"
+    *: "Modus"
   </voice>
 </phrase>
 <phrase>
@@ -9879,7 +9712,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -10411,15 +10244,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bas-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bas-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -10428,15 +10261,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble-afsnijfrequentie"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble-afsnijfrequentie"
   </voice>
 </phrase>
 <phrase>
@@ -10472,16 +10305,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Toetsklik"
+    *: "Toetsklik"
   </dest>
   <voice>
-    *: none
-    swcodec: "Toetsklik"
+    *: "Toetsklik"
   </voice>
 </phrase>
 <phrase>
@@ -10489,16 +10319,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Toetsklikherhaling"
+    *: "Toetsklikherhaling"
   </dest>
   <voice>
-    *: none
-    swcodec: "Toetsklikherhaling"
+    *: "Toetsklikherhaling"
   </voice>
 </phrase>
 <phrase>
@@ -11011,11 +10838,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -11028,11 +10855,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Seriëlen bitrate"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Seriëlen bitrate"
   </voice>
@@ -11045,11 +10872,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -11062,11 +10889,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -11079,11 +10906,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11110,11 +10937,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Auto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Automatisch"
   </voice>
@@ -11248,16 +11075,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Afspeelsnelheid"
+    *: "Afspeelsnelheid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Afspeelsnelheid"
+    *: "Afspeelsnelheid"
   </voice>
 </phrase>
 <phrase>
@@ -11265,16 +11089,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Snelheid"
+    *: "Snelheid"
   </dest>
   <voice>
-    *: none
-    swcodec: "Snelheid"
+    *: "Snelheid"
   </voice>
 </phrase>
 <phrase>
@@ -11364,7 +11185,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11429,16 +11250,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalkbreedte"
+    *: "Scrollbalkbreedte"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalkbreedte"
+    *: "Scrollbalkbreedte"
   </voice>
 </phrase>
 <phrase>
@@ -11446,16 +11264,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Scrollbalkpositie"
+    *: "Scrollbalkpositie"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Scrollbalkpositie"
+    *: "Scrollbalkpositie"
   </voice>
 </phrase>
 <phrase>
@@ -11491,16 +11306,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Releasetijd"
+    *: "Releasetijd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Releasetijd"
+    *: "Releasetijd"
   </voice>
 </phrase>
 <phrase>
@@ -11508,16 +11320,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Drempel"
+    *: "Drempel"
   </dest>
   <voice>
-    *: none
-    swcodec: "Drempel"
+    *: "Drempel"
   </voice>
 </phrase>
 <phrase>
@@ -11525,16 +11334,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Compensatieversterking"
+    *: "Compensatieversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compensatieversterking"
+    *: "Compensatieversterking"
   </voice>
 </phrase>
 <phrase>
@@ -11559,16 +11365,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Knie"
+    *: "Knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Knie"
+    *: "Knie"
   </voice>
 </phrase>
 <phrase>
@@ -11576,16 +11379,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Automatisch"
+    *: "Automatisch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Automatisch"
+    *: "Automatisch"
   </voice>
 </phrase>
 <phrase>
@@ -11607,16 +11407,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Zachte knie"
+    *: "Zachte knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Zachte knie"
+    *: "Zachte knie"
   </voice>
 </phrase>
 <phrase>
@@ -11624,16 +11421,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Verhouding"
+    *: "Verhouding"
   </dest>
   <voice>
-    *: none
-    swcodec: "Verhouding"
+    *: "Verhouding"
   </voice>
 </phrase>
 <phrase>
@@ -11658,16 +11452,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Harde knie"
+    *: "Harde knie"
   </dest>
   <voice>
-    *: none
-    swcodec: "Harde knie"
+    *: "Harde knie"
   </voice>
 </phrase>
 <phrase>
@@ -11760,16 +11551,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 op 1"
+    *: "10 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11777,16 +11565,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 op 1"
+    *: "2 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11811,16 +11596,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limiet"
+    *: "Limiet"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limiet"
+    *: "Limiet"
   </voice>
 </phrase>
 <phrase>
@@ -11887,16 +11669,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 op 1"
+    *: "6 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -11904,16 +11683,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </dest>
   <voice>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </voice>
 </phrase>
 <phrase>
@@ -11921,16 +11697,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 op 1"
+    *: "4 op 1"
   </voice>
 </phrase>
 <phrase>
@@ -12031,16 +11804,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Basisthema"
+    *: "Basisthema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Basisthema"
+    *: "Basisthema"
   </voice>
 </phrase>
 <phrase>
@@ -12048,16 +11818,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Extern basisthema"
+    *: "Extern basisthema"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Extern basisthema"
+    *: "Extern basisthema"
   </voice>
 </phrase>
 <phrase>
@@ -12252,16 +12019,13 @@
   desc: in playback settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Rewind Before Resume"
+    *: "Rewind Before Resume"
   </source>
   <dest>
-    *: none
-    swcodec: "Terugspoelen alvorens te hervatten"
+    *: "Terugspoelen alvorens te hervatten"
   </dest>
   <voice>
-    *: none
-    swcodec: "Terugspoelen alvorens te hervatten"
+    *: "Terugspoelen alvorens te hervatten"
   </voice>
 </phrase>
 <phrase>
@@ -12568,7 +12332,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
@@ -12995,16 +12759,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Simple (Meier)"
+    *: "Simple (Meier)"
   </source>
   <dest>
-    *: none
-    swcodec: "Eenvoudig (Meier)"
+    *: "Eenvoudig (Meier)"
   </dest>
   <voice>
-    *: none
-    swcodec: "Eenvoudig (Meier)"
+    *: "Eenvoudig (Meier)"
   </voice>
 </phrase>
 <phrase>
@@ -13026,16 +12787,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Custom"
+    *: "Custom"
   </source>
   <dest>
-    *: none
-    swcodec: "Aangepast"
+    *: "Aangepast"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aangepast"
+    *: "Aangepast"
   </voice>
 </phrase>
 <phrase>
@@ -13057,16 +12815,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -13130,16 +12885,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Attack Time"
+    *: "Attack Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Stijgtijd"
+    *: "Stijgtijd"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stijgtijd"
+    *: "Stijgtijd"
   </voice>
 </phrase>
 <phrase>
@@ -13175,16 +12927,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "SIDE ONLY"
+    *: "SIDE ONLY"
   </source>
   <dest>
-    *: none
-    swcodec: "ENKEL ZIJKANT"
+    *: "ENKEL ZIJKANT"
   </dest>
   <voice>
-    *: none
-    swcodec: "ENKEL ZIJKANT"
+    *: "ENKEL ZIJKANT"
   </voice>
 </phrase>
 <phrase>
@@ -13265,16 +13014,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x1)"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
@@ -13283,18 +13029,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Mass Storage"
-    ibassodx90: "Mass Storage"
+    ibassodx50,ibassodx90: "Mass Storage"
   </source>
   <dest>
     *: none
-    ibassodx50: "massaopslag"
-    ibassodx90: "massaopslag"
+    ibassodx50,ibassodx90: "massaopslag"
   </dest>
   <voice>
     *: none
-    ibassodx50: "massaopslag"
-    ibassodx90: "massaopslag"
+    ibassodx50,ibassodx90: "massaopslag"
   </voice>
 </phrase>
 <phrase>
@@ -13303,18 +13046,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "USB Mode"
-    ibassodx90: "USB Mode"
+    ibassodx50,ibassodx90: "USB Mode"
   </source>
   <dest>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </dest>
   <voice>
     *: none
-    ibassodx50: "USB-modus"
-    ibassodx90: "USB-modus"
+    ibassodx50,ibassodx90: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -13336,16 +13076,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auditory Fatigue Reduction"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: none
-    swcodec: "Auditievevermoeidheidsvermindering"
+    *: "Auditievevermoeidheidsvermindering"
   </dest>
   <voice>
-    *: none
-    swcodec: "Auditievevermoeidheidsvermindering"
+    *: "Auditievevermoeidheidsvermindering"
   </voice>
 </phrase>
 <phrase>
@@ -13381,16 +13118,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Perceptual Bass Enhancement"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: none
-    swcodec: "Perceptuele basversterking"
+    *: "Perceptuele basversterking"
   </dest>
   <voice>
-    *: none
-    swcodec: "Perceptuele basversterking"
+    *: "Perceptuele basversterking"
   </voice>
 </phrase>
 <phrase>
@@ -13413,18 +13147,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Charge Only"
-    ibassodx90: "Charge Only"
+    ibassodx50,ibassodx90: "Charge Only"
   </source>
   <dest>
     *: none
-    ibassodx50: "enkel opladen"
-    ibassodx90: "enkel opladen"
+    ibassodx50,ibassodx90: "enkel opladen"
   </dest>
   <voice>
     *: none
-    ibassodx50: "enkel opladen"
-    ibassodx90: "enkel opladen"
+    ibassodx50,ibassodx90: "enkel opladen"
   </voice>
 </phrase>
 <phrase>
@@ -13433,18 +13164,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </source>
   <dest>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </dest>
   <voice>
     *: none
-    ibassodx50: "Android Debug Bridge"
-    ibassodx90: "Android Debug Bridge"
+    ibassodx50,ibassodx90: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13453,18 +13181,15 @@
   user: core
   <source>
     *: none
-    ibassodx50: "Freq Scaling Governor"
-    ibassodx90: "Freq Scaling Governor"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    ibassodx50: "frequentieschalingsgovernor"
-    ibassodx90: "frequentieschalingsgovernor"
+    ibassodx50,ibassodx90: "frequentieschalingsgovernor"
   </dest>
   <voice>
     *: none
-    ibassodx50: "frequentieschalingsgovernor"
-    ibassodx90: "frequentieschalingsgovernor"
+    ibassodx50,ibassodx90: "frequentieschalingsgovernor"
   </voice>
 </phrase>
 <phrase>
@@ -13472,16 +13197,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </source>
   <dest>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: none
-    swcodec: "f(x2)"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
@@ -13517,16 +13239,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Dry / Wet Mix"
+    *: "Dry / Wet Mix"
   </source>
   <dest>
-    *: none
-    swcodec: "Droge / natte mix"
+    *: "Droge / natte mix"
   </dest>
   <voice>
-    *: none
-    swcodec: "Droge of natte mix"
+    *: "Droge of natte mix"
   </voice>
 </phrase>
 <phrase>
@@ -13534,16 +13253,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Haas Surround"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: none
-    swcodec: "Haas-surround"
+    *: "Haas-surround"
   </dest>
   <voice>
-    *: none
-    swcodec: "Haas-surround"
+    *: "Haas-surround"
   </voice>
 </phrase>
 <phrase>
@@ -13565,9 +13281,6 @@
   desc: playlist viewer
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "Track to move"
     *: ""
   </source>
   <dest>
@@ -13638,9 +13351,6 @@
   desc: playlist viewer
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "Bad track"
     *: ""
   </source>
   <dest>
@@ -13669,9 +13379,6 @@
   desc: playlist viewer
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "Queued"
     *: ""
   </source>
   <dest>
@@ -13742,9 +13449,6 @@
   desc: playlist viewer
   user: core
   <source>
-### The <source> section differs from the english!
-### the previously used one is commented below:
-###     *: "Moving track"
     *: ""
   </source>
   <dest>
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index 926959b53b..c58e61aafd 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -2556,13 +2556,13 @@
   user: core
   <source>
     *: "OFF To Revert"
-    vibe500: "CANCEL To Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL To Revert"
   </source>
   <dest>
     *: "OFF = abbrächu"
-    vibe500: "C = abbrächu"
     samsungyh*: "REW = abbrächu"
+    vibe500: "C = abbrächu"
   </dest>
   <voice>
     *: ""
@@ -2616,13 +2616,13 @@
   user: core
   <source>
     *: "The disk is full. Press OFF to continue."
-    vibe500: "The disk is full. Press PREV to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: "Feschtplatta isch voll. Drick OFF."
-    vibe500: "Feschtplatta isch voll. Drick PREV."
     samsungyh*: "Feschtplatta isch voll. Drick LEFT."
+    vibe500: "Feschtplatta isch voll. Drick PREV."
   </dest>
   <voice>
     *: ""
@@ -2690,15 +2690,15 @@
   user: core
   <source>
     *: "PLAY=Set OFF=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: "PLAY=Ok OFF=Abbrächu"
-    vibe500: "OK=Ok C=Abbrächu"
     mpiohd300: "ENTER=Ok MENU=Abbrächu"
     sansafuzeplus: "SELECT=Ok  BACK=Abbrächu"
+    vibe500: "OK=Ok C=Abbrächu"
   </dest>
   <voice>
     *: ""
@@ -2720,7 +2720,7 @@
 </phrase>
 <phrase>
   id: LANG_ID3_ARTIST
-  desc: in wps 
+  desc: in wps
   user: core
   <source>
     *: "Artist"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index dd4371ba67..78720de19a 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -251,19 +251,19 @@
   user: core
   <source>
     *: "PLAY = Yes"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Yes"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Yes"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Oyi"
+    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU = Oyi"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Oyi"
     iriverh100,iriverh120,iriverh300: "NAVI = Oyi"
-    ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Oyi"
     mrobe500: "PLAY or POWER = Oyi"
-    archosplayer: "(PLAY/STOP)"
     vibe500: "OK = Oyi"
   </dest>
   <voice>
@@ -819,16 +819,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Crossfeed"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: none
-    swcodec: "Ahessaedje mitan-croejhlé"
+    *: "Ahessaedje mitan-croejhlé"
   </dest>
   <voice>
-    *: none
-    swcodec: "ahessaedje mitan-croejhlé"
+    *: "ahessaedje mitan-croejhlé"
   </voice>
 </phrase>
 <phrase>
@@ -836,16 +833,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Direct Gain"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Crexhaedje direk"
+    *: "Crexhaedje direk"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crexhaedje direk"
+    *: "Crexhaedje direk"
   </voice>
 </phrase>
 <phrase>
@@ -853,16 +847,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "Cross Gain"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Croejhlé crexhaedje"
+    *: "Croejhlé crexhaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Croejhlé crexhaedje"
+    *: "Croejhlé crexhaedje"
   </voice>
 </phrase>
 <phrase>
@@ -870,16 +861,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Attenuation"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: none
-    swcodec: "Aswådjaedje hôte frécwince"
+    *: "Aswådjaedje hôte frécwince"
   </dest>
   <voice>
-    *: none
-    swcodec: "Aswådjaedje hôte frécwince"
+    *: "Aswådjaedje hôte frécwince"
   </voice>
 </phrase>
 <phrase>
@@ -887,16 +875,13 @@
   desc: in crossfeed settings
   user: core
   <source>
-    *: none
-    swcodec: "High-Frequency Cutoff"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Côpaedje hôte frécwince"
+    *: "Côpaedje hôte frécwince"
   </dest>
   <voice>
-    *: none
-    swcodec: "Côpaedje hôte frécwince"
+    *: "Côpaedje hôte frécwince"
   </voice>
 </phrase>
 <phrase>
@@ -904,16 +889,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Equalizer"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    swcodec: "Ewalijheu"
+    *: "Ewalijheu"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ewalijheu"
+    *: "Ewalijheu"
   </voice>
 </phrase>
 <phrase>
@@ -921,16 +903,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Enable EQ"
+    *: "Enable EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "Mete EW en alaedje"
+    *: "Mete EW en alaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mete l'ewalijheu en alaedje"
+    *: "Mete l'ewalijheu en alaedje"
   </voice>
 </phrase>
 <phrase>
@@ -938,16 +917,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Graphical EQ"
+    *: "Graphical EQ"
   </source>
   <dest>
-    *: none
-    swcodec: "EW Grafike"
+    *: "EW Grafike"
   </dest>
   <voice>
-    *: none
-    swcodec: "Ewalijheu Grafike"
+    *: "Ewalijheu Grafike"
   </voice>
 </phrase>
 <phrase>
@@ -955,16 +931,13 @@
   desc: in eq settings
   user: core
   <source>
-    *: none
-    swcodec: "Precut"
+    *: "Precut"
   </source>
   <dest>
-    *: none
-    swcodec: "Précôpaedje"
+    *: "Précôpaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Pré-côpaedje"
+    *: "Pré-côpaedje"
   </voice>
 </phrase>
 <phrase>
@@ -972,16 +945,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Simple EQ Settings"
+    *: "Simple EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Simpes apontiaedjes EW"
+    *: "Simpes apontiaedjes EW"
   </dest>
   <voice>
-    *: none
-    swcodec: "Simpes apontiaedjes di l'ewalijheu"
+    *: "Simpes apontiaedjes di l'ewalijheu"
   </voice>
 </phrase>
 <phrase>
@@ -989,16 +959,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Advanced EQ Settings"
+    *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: none
-    swcodec: "Spepieus apontiaedjes EW"
+    *: "Spepieus apontiaedjes EW"
   </dest>
   <voice>
-    *: none
-    swcodec: "Spepieus apontiaedjes di l'ewalijheu"
+    *: "Spepieus apontiaedjes di l'ewalijheu"
   </voice>
 </phrase>
 <phrase>
@@ -1006,16 +973,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Save EQ Preset"
+    *: "Save EQ Preset"
   </source>
   <dest>
-    *: none
-    swcodec: "Schaper les tchuzes EW"
+    *: "Schaper les tchuzes EW"
   </dest>
   <voice>
-    *: none
-    swcodec: "Schaper les tchuzes di l'ewalijheu"
+    *: "Schaper les tchuzes di l'ewalijheu"
   </voice>
 </phrase>
 <phrase>
@@ -1023,16 +987,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Browse EQ Presets"
+    *: "Browse EQ Presets"
   </source>
   <dest>
-    *: none
-    swcodec: "Foyter les tchuzes EQ"
+    *: "Foyter les tchuzes EQ"
   </dest>
   <voice>
-    *: none
-    swcodec: "Foyter les tchuzes di l'ewalijheu"
+    *: "Foyter les tchuzes di l'ewalijheu"
   </voice>
 </phrase>
 <phrase>
@@ -1040,16 +1001,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s"
+    *: "Edit mode: %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Môde candjî : %s"
+    *: "Môde candjî : %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -1057,16 +1015,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "%d Hz Band Gain"
+    *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "%d Hz di crexheadje di bande"
+    *: "%d Hz di crexheadje di bande"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crexheadje di bande a hertz"
+    *: "Crexheadje di bande a hertz"
   </voice>
 </phrase>
 <phrase>
@@ -1074,16 +1029,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Low Shelf Filter"
+    *: "Low Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Passete påwion grave"
+    *: "Passete påwion grave"
   </dest>
   <voice>
-    *: none
-    swcodec: "Passete påwion grave"
+    *: "Passete påwion grave"
   </voice>
 </phrase>
 <phrase>
@@ -1091,16 +1043,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Peak Filter %d"
+    *: "Peak Filter %d"
   </source>
   <dest>
-    *: none
-    swcodec: "Passete cresse %d"
+    *: "Passete cresse %d"
   </dest>
   <voice>
-    *: none
-    swcodec: "Passete cresse"
+    *: "Passete cresse"
   </voice>
 </phrase>
 <phrase>
@@ -1108,16 +1057,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "High Shelf Filter"
+    *: "High Shelf Filter"
   </source>
   <dest>
-    *: none
-    swcodec: "Passete påwion foirt"
+    *: "Passete påwion foirt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Passete påwion foirt"
+    *: "Passete påwion foirt"
   </voice>
 </phrase>
 <phrase>
@@ -1125,16 +1071,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff Frequency"
+    *: "Cutoff Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frécwince di côpaedje"
+    *: "Frécwince di côpaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frécwince di côpaedje"
+    *: "Frécwince di côpaedje"
   </voice>
 </phrase>
 <phrase>
@@ -1142,16 +1085,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Centre Frequency"
+    *: "Centre Frequency"
   </source>
   <dest>
-    *: none
-    swcodec: "Frécwince do mitan"
+    *: "Frécwince do mitan"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frécwince do mitan"
+    *: "Frécwince do mitan"
   </voice>
 </phrase>
 <phrase>
@@ -1159,16 +1099,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </source>
   <dest>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </dest>
   <voice>
-    *: none
-    swcodec: "Q"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
@@ -1176,16 +1113,13 @@
   desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Dithering"
+    *: "Dithering"
   </source>
   <dest>
-    *: none
-    swcodec: "Tramaedje"
+    *: "Tramaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tramaedje"
+    *: "Tramaedje"
   </voice>
 </phrase>
 <phrase>
@@ -1729,16 +1663,13 @@
   desc: in replaygain
   user: core
   <source>
-    *: none
-    swcodec: "Prevent Clipping"
+    *: "Prevent Clipping"
   </source>
   <dest>
-    *: none
-    swcodec: "Espaitchî formadulaedje"
+    *: "Espaitchî formadulaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Espaitchî formadulaedje"
+    *: "Espaitchî formadulaedje"
   </voice>
 </phrase>
 <phrase>
@@ -1816,16 +1747,13 @@
   desc: in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Track Skip Beep"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: none
-    swcodec: "Volume do bip"
+    *: "Volume do bip"
   </dest>
   <voice>
-    *: none
-    swcodec: "Volume do bip"
+    *: "Volume do bip"
   </voice>
 </phrase>
 <phrase>
@@ -1833,16 +1761,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Weak"
+    *: "Weak"
   </source>
   <dest>
-    *: none
-    swcodec: "Bas"
+    *: "Bas"
   </dest>
   <voice>
-    *: none
-    swcodec: "Bas"
+    *: "Bas"
   </voice>
 </phrase>
 <phrase>
@@ -1850,16 +1775,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Moderate"
+    *: "Moderate"
   </source>
   <dest>
-    *: none
-    swcodec: "Å mitan"
+    *: "Å mitan"
   </dest>
   <voice>
-    *: none
-    swcodec: "å mitan"
+    *: "å mitan"
   </voice>
 </phrase>
 <phrase>
@@ -1867,16 +1789,13 @@
   desc: in beep volume in playback settings
   user: core
   <source>
-    *: none
-    swcodec: "Strong"
+    *: "Strong"
   </source>
   <dest>
-    *: none
-    swcodec: "Foirt"
+    *: "Foirt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Foirt"
+    *: "Foirt"
   </voice>
 </phrase>
 <phrase>
@@ -2236,19 +2155,17 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PREV to return)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
   </source>
   <dest>
     *: "Bastixhaedje del båze di dnêyes... %d di trovés (OFF po-z eraler en erî)"
-    iriverh100,iriverh120,iriverh300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
-    ipod*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
-    iaudiox5,iaudiom5,gigabeat*,mrobe100,samsungyh*: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
-    iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)"
     gogearsa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)"
+    iriverh100,iriverh120,iriverh300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)"
   </dest>
   <voice>
     *: "intrêyes trovêyes pol båze di dnêyes"
@@ -2430,16 +2347,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Font"
+    *: "Font"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tchoezi les fontes"
+    *: "Tchoezi les fontes"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tchoezi les fontes"
+    *: "Tchoezi les fontes"
   </voice>
 </phrase>
 <phrase>
@@ -2701,16 +2615,13 @@
   desc: in settings_menu, option to turn display+buttos by 180 degrees
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Upside Down"
+    *: "Upside Down"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Betchfessî"
+    *: "Betchfessî"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Betchfessî"
+    *: "Betchfessî"
   </voice>
 </phrase>
 <phrase>
@@ -2718,16 +2629,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Line Selector Type"
+    *: "Line Selector Type"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Tchoezixheu d' cogne di roye"
+    *: "Tchoezixheu d' cogne di roye"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Tchoezixheu d' cogne di roye"
+    *: "Tchoezixheu d' cogne di roye"
   </voice>
 </phrase>
 <phrase>
@@ -2735,16 +2643,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Pointer"
+    *: "Pointer"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Cursoe"
+    *: "Cursoe"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Cursoe"
+    *: "Cursoe"
   </voice>
 </phrase>
 <phrase>
@@ -2752,16 +2657,13 @@
   desc: in settings_menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Bar (Inverse)"
+    *: "Bar (Inverse)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Roye sorligneye"
+    *: "Roye sorligneye"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Roye sorligneye"
+    *: "Roye sorligneye"
   </voice>
 </phrase>
 <phrase>
@@ -3051,16 +2953,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out Of View"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Erôlaedje foû del waitroûle"
+    *: "Erôlaedje foû del waitroûle"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "erôlaedje foû del waitroûle"
+    *: "erôlaedje foû del waitroûle"
   </voice>
 </phrase>
 <phrase>
@@ -3068,16 +2967,13 @@
   desc: Pixels to advance per Screen scroll
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Screen Scroll Step Size"
+    *: "Screen Scroll Step Size"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grandeu del hope d'erôl. del waitroûle"
+    *: "Grandeu del hope d'erôl. del waitroûle"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grandeu del hope d'erôlaedje del waitroûle"
+    *: "Grandeu del hope d'erôlaedje del waitroûle"
   </voice>
 </phrase>
 <phrase>
@@ -3133,16 +3029,13 @@
   desc: in the display sub menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status-/Scrollbar"
+    *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Båre d'estat/d'acinseur"
+    *: "Båre d'estat/d'acinseur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Båre d'estat et d'acinseur"
+    *: "Båre d'estat et d'acinseur"
   </voice>
 </phrase>
 <phrase>
@@ -3150,16 +3043,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar"
+    *: "Scroll Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Båre d'acinseur"
+    *: "Båre d'acinseur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Båre d'acinseur"
+    *: "Båre d'acinseur"
   </voice>
 </phrase>
 <phrase>
@@ -3167,16 +3057,13 @@
   desc: display menu, F3 substitute
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Status Bar"
+    *: "Status Bar"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Båre d'estat"
+    *: "Båre d'estat"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Båre d'estat"
+    *: "Båre d'estat"
   </voice>
 </phrase>
 <phrase>
@@ -3201,16 +3088,13 @@
   desc: Volume type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Volume Display"
+    *: "Volume Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Håynaedje do volume"
+    *: "Håynaedje do volume"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Håynaedje do volume"
+    *: "Håynaedje do volume"
   </voice>
 </phrase>
 <phrase>
@@ -3218,16 +3102,13 @@
   desc: Battery type title
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Battery Display"
+    *: "Battery Display"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Håynaedje del batreye"
+    *: "Håynaedje del batreye"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Håynaedje del batreye"
+    *: "Håynaedje del batreye"
   </voice>
 </phrase>
 <phrase>
@@ -3235,16 +3116,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Graphic"
+    *: "Graphic"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Grafike"
+    *: "Grafike"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Grafike"
+    *: "Grafike"
   </voice>
 </phrase>
 <phrase>
@@ -3252,16 +3130,13 @@
   desc: Label for type of icon display
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Numeric"
+    *: "Numeric"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Limerike"
+    *: "Limerike"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Limerike"
+    *: "Limerike"
   </voice>
 </phrase>
 <phrase>
@@ -3481,16 +3356,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    *: "Hebrew (ISO-8859-8)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Ebreu (ISO-8859-8)"
+    *: "Ebreu (ISO-8859-8)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Ebreu"
+    *: "Ebreu"
   </voice>
 </phrase>
 <phrase>
@@ -3512,16 +3384,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Taylandès (ISO-8859-11)"
+    *: "Taylandès (ISO-8859-11)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Taylandès"
+    *: "Taylandès"
   </voice>
 </phrase>
 <phrase>
@@ -3529,16 +3398,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    *: "Arabic (CP1256)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Arabe (CP1256)"
+    *: "Arabe (CP1256)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Arabe"
+    *: "Arabe"
   </voice>
 </phrase>
 <phrase>
@@ -3574,16 +3440,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    *: "Japanese (SJIS)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Djaponès (SJIS)"
+    *: "Djaponès (SJIS)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Djaponès"
+    *: "Djaponès"
   </voice>
 </phrase>
 <phrase>
@@ -3591,16 +3454,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinwès simplifyî (GB2312)"
+    *: "Chinwès simplifyî (GB2312)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinwès simplifyî"
+    *: "Chinwès simplifyî"
   </voice>
 </phrase>
 <phrase>
@@ -3608,16 +3468,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    *: "Korean (KSX1001)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Corêyin (KSX1001)"
+    *: "Corêyin (KSX1001)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Corêyin"
+    *: "Corêyin"
   </voice>
 </phrase>
 <phrase>
@@ -3625,16 +3482,13 @@
   desc: in codepage setting menu
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Chinwès tradicionel (BIG5)"
+    *: "Chinwès tradicionel (BIG5)"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Chinwès tradicionel"
+    *: "Chinwès tradicionel"
   </voice>
 </phrase>
 <phrase>
@@ -3658,17 +3512,17 @@
   <source>
     *: none
     button_light: "Button Light Timeout"
-    sansafuze*,sansae200*: "Wheel Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
+    sansae200*,sansafuze*: "Tins ki l' rôlete si loume"
   </dest>
   <voice>
     *: none
     button_light: "Tins k' les botons s' loumèt"
-    sansafuze*,sansae200*: "Tins ki l' rôlete si loume"
+    sansae200*,sansafuze*: "Tins ki l' rôlete si loume"
   </voice>
 </phrase>
 <phrase>
@@ -3939,27 +3793,27 @@
   user: core
   <source>
     *: none
-    rtc: "ON = Set"
-    mrobe500: "HEART = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Set"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
-    vibe500: "OK = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
   </source>
   <dest>
     *: none
-    rtc: "ON = Eployî"
-    mrobe500: "HEART = Eployî"
-    iriverh100,iriverh120,iriverh300: "NAVI = Eployî"
-    ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*,sansaconnect: "SELECT = Eployî"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Eployî"
     gogearsa9200,samsungyh*: "PLAY = Eployî"
-    vibe500: "OK = Eployî"
+    iriverh100,iriverh120,iriverh300: "NAVI = Eployî"
     mpiohd300: "ENTER = Eployî"
+    mrobe500: "HEART = Eployî"
+    rtc: "ON = Eployî"
+    vibe500: "OK = Eployî"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200,samsungyh*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3968,39 +3822,35 @@
   user: core
   <source>
     *: none
-    rtc: "OFF = Revert"
-    mrobe500: "POWER = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    ipod*,sansac200*,mpiohd300: "MENU = Revert"
-    iaudiox5,iaudiom5: "RECORD = Revert"
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    gigabeatfx: "POWER = Revert"
-    sansafuzeplus: "BACK = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200: "LEFT = Revert"
-    vibe500: "CANCEL = Revert"
+    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = Rinoncî"
-    mrobe500: "POWER = Rinoncî"
-    iriverh100,iriverh120,iriverh300: "STOP = Rinoncî"
-    ipod*,sansac200*,mpiohd300: "MENU = Rinoncî"
-    iaudiox5,iaudiom5: "RECORD = Rinoncî"
+    gigabeatfx,mrobe500: "POWER = Rinoncî"
+    gigabeats,sansafuzeplus: "BACK = Rinoncî"
+    gogearsa9200: "LEFT = Rinoncî"
+    iaudiom5,iaudiox5: "RECORD = Rinoncî"
+    ipod*,mpiohd300,sansac200*: "MENU = Rinoncî"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Rinoncî"
-    gigabeatfx: "POWER = Rinoncî"
-    sansafuzeplus: "BACK = Rinoncî"
+    iriverh100,iriverh120,iriverh300: "STOP = Rinoncî"
     mrobe100: "DISPLAY = Rinoncî"
-    gigabeats: "BACK = Rinoncî"
-    gogearsa9200: "LEFT = Rinoncî"
-    vibe500: "C = Rinoncî"
+    rtc: "OFF = Rinoncî"
     samsungyh*: "REW = Rinoncî"
+    vibe500: "C = Rinoncî"
   </dest>
   <voice>
     *: none
-    rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4486,22 +4336,22 @@
   <source>
     *: none
     alarm: "PLAY=Set OFF=Cancel"
+    gigabeats: "SELECT=Set POWER=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
     iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    vibe500: "OK=Set C=Cancel"
     mpiohd300: "ENTER=Set MENU=Cancel"
     sansafuzeplus: "SELECT=Set  BACK=Cancel"
+    vibe500: "OK=Set C=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=Set OFF=Rinoncî"
+    gigabeats: "SELECT=Defini POWER=Rinoncî"
     ipod*: "SELECT=Set MENU=Rinoncî"
     iriverh10,iriverh10_5gb: "SELECT=Defini PREV=Rinoncî"
-    gigabeats: "SELECT=Defini POWER=Rinoncî"
-    vibe500: "OK=Set C=Rinoncî"
     mpiohd300: "ENTER=Defini MENU=Rinoncî"
     sansafuzeplus: "SELECT=Defini  BACK=Rinoncî"
+    vibe500: "OK=Set C=Rinoncî"
   </dest>
   <voice>
     *: none
@@ -5606,15 +5456,15 @@
   user: core
   <source>
     *: none
-    recording,play_frequency: "Frequency"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    recording,play_frequency: "Frécwince"
+    play_frequency,recording: "Frécwince"
   </dest>
   <voice>
     *: none
-    recording,play_frequency: "Frécwince"
+    play_frequency,recording: "Frécwince"
   </voice>
 </phrase>
 <phrase>
@@ -5657,18 +5507,16 @@
   user: core
   <source>
     *: none
-    recording: "Microphone"
     iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
     *: none
-    recording: "Dvintrin micro"
-    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
+    iriverh100,iriverh120,iriverh300,recording: "Dvintrin micro"
   </dest>
   <voice>
     *: none
-    recording: "Dvintrin micro"
-    iriverh100,iriverh120,iriverh300: "Dvintrin micro"
+    iriverh100,iriverh120,iriverh300,recording: "Dvintrin micro"
   </voice>
 </phrase>
 <phrase>
@@ -6546,13 +6394,13 @@
   user: core
   <source>
     *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
     *: "Batreye: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batr: %d%% %dh %dm"
     iriverifp7xx: "%d%% %dh %dm"
-    iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Livea del batreye"
@@ -6609,24 +6457,24 @@
   user: core
   <source>
     *: none
+    archosondio*: "MMC:"
     multivolume: "HD1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "mSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
-    archosondio*: "MMC:"
   </source>
   <dest>
     *: none
+    archosondio*: "MMC:"
     multivolume: "DP1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "MSD:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
     xduoox3: "MSD2:"
-    archosondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    archosondio*: "M M C"
     multivolume: "D P 1"
-    sansae200*,sansac200*,sansafuze*,sansaclipplus: "micro S D"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
-    archosondio*: "M M C"
   </voice>
 </phrase>
 <phrase>
@@ -7941,23 +7789,23 @@
   user: core
   <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*,vibe500: "The disk is full. Press PREV to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
     samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    recording: "Li plake est plinne. Tchôkîz OFF et tcheryî pus lon."
-    iriverh100,iriverh120,iriverh300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
     iaudiom5,iaudiox5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon."
-    sansae200*,sansac200*,vibe500: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
+    iriverh100,iriverh120,iriverh300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon."
+    recording: "Li plake est plinne. Tchôkîz OFF et tcheryî pus lon."
     samsungyh*: "Li plake est plinne. Tchôkîz LEFT et tcheryî pus lon."
+    sansac200*,sansae200*,vibe500: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon."
   </dest>
   <voice>
     *: none
-    recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8045,22 +7893,21 @@
   user: core
   <source>
     *: "OFF 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"
-    gigabeats: "BACK to abort"
     gigabeatfx: "POWER to abort"
-    sansafuzeplus: "BACK to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
     *: "OFF 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"
+    gigabeatfx: "POWER po-z abandner"
     gigabeats: "BACK po-z abandner"
-    gigabeatfx:"POWER po-z abandner"
+    iaudiom5,iaudiox5: "Long PLAY po-z abandner"
+    ipod*: "PLAY/PAUSE po-z abandner"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV po-z abandner"
+    iriverh100,iriverh120,iriverh300: "STOP po-z abandner"
   </dest>
   <voice>
     *: ""
@@ -9612,7 +9459,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -9654,16 +9501,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Edit mode: %s %s"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: none
-    swcodec: "Môde candjî: %s %s"
+    *: "Môde candjî: %s %s"
   </dest>
   <voice>
-    *: none
-    swcodec: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9671,16 +9515,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Cutoff"
+    *: "Cutoff"
   </source>
   <dest>
-    *: none
-    swcodec: "Frécwince di côpaedje"
+    *: "Frécwince di côpaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Frécwince di côpaedje"
+    *: "Frécwince di côpaedje"
   </voice>
 </phrase>
 <phrase>
@@ -9688,16 +9529,13 @@
   desc: in the equalizer settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Gain"
+    *: "Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Crexhaedje"
+    *: "Crexhaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Crexhaedje"
+    *: "Crexhaedje"
   </voice>
 </phrase>
 <phrase>
@@ -9705,16 +9543,13 @@
   desc: in wps F2 pressed
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Mode:"
+    *: "Mode:"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Môde:"
+    *: "Môde:"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10343,7 +10178,7 @@
     multivolume: "Nén la"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user: core
@@ -10377,15 +10212,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Bass Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frécwince di côpaedje des basses"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frécwince di côpaedje des basses"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des basses"
   </voice>
 </phrase>
 <phrase>
@@ -10394,15 +10229,15 @@
   user: core
   <source>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Treble Cutoff"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frécwince di côpaedje des hôts sons"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
   </dest>
   <voice>
     *: none
-    ipodvideo,ipod6g,mpiohd200,mpiohd300,gigabeatfx,mrobe100: "Frécwince di côpaedje des hôts sons"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Frécwince di côpaedje des hôts sons"
   </voice>
 </phrase>
 <phrase>
@@ -10438,16 +10273,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick"
+    *: "Keyclick"
   </source>
   <dest>
-    *: none
-    swcodec: "Clitch des tapes"
+    *: "Clitch des tapes"
   </dest>
   <voice>
-    *: none
-    swcodec: "Clitch des tapes"
+    *: "Clitch des tapes"
   </voice>
 </phrase>
 <phrase>
@@ -10455,16 +10287,13 @@
   desc: in keyclick settings menu
   user: core
   <source>
-    *: none
-    swcodec: "Keyclick Repeats"
+    *: "Keyclick Repeats"
   </source>
   <dest>
-    *: none
-    swcodec: "Repeter les clitch"
+    *: "Repeter les clitch"
   </dest>
   <voice>
-    *: none
-    swcodec: "Repeter les clitch"
+    *: "Repeter les clitch"
   </voice>
 </phrase>
 <phrase>
@@ -10585,11 +10414,11 @@
     *: none
     serial_port: "Serial Bitrate"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Debit séreye"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Debit séreye"
   </voice>
@@ -10602,11 +10431,11 @@
     *: none
     serial_port: "Auto"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "Oto"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "Otomatike"
   </voice>
@@ -10619,11 +10448,11 @@
     *: none
     serial_port: "9600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "9600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "9600"
   </voice>
@@ -10636,11 +10465,11 @@
     *: none
     serial_port: "19200"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "19200"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "19200"
   </voice>
@@ -10653,11 +10482,11 @@
     *: none
     serial_port: "38400"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "38400"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "38400"
   </voice>
@@ -10670,11 +10499,11 @@
     *: none
     serial_port: "57600"
   </source>
-  <dest> 
+  <dest>
     *: none
     serial_port: "57600"
   </dest>
-  <voice> 
+  <voice>
     *: none
     serial_port: "57600"
   </voice>
@@ -11197,16 +11026,13 @@
   desc: timestretch enable
   user: core
   <source>
-    *: none
-    swcodec: "Timestretch"
+    *: "Timestretch"
   </source>
   <dest>
-    *: none
-    swcodec: "Stindaedje do tins"
+    *: "Stindaedje do tins"
   </dest>
   <voice>
-    *: none
-    swcodec: "Stindaedje do tins"
+    *: "Stindaedje do tins"
   </voice>
 </phrase>
 <phrase>
@@ -11214,16 +11040,13 @@
   desc: timestretch speed
   user: core
   <source>
-    *: none
-    swcodec: "Speed"
+    *: "Speed"
   </source>
   <dest>
-    *: none
-    swcodec: "Radisté"
+    *: "Radisté"
   </dest>
   <voice>
-    *: none
-    swcodec: "Radisté"
+    *: "Radisté"
   </voice>
 </phrase>
 <phrase>
@@ -11324,7 +11147,7 @@
 </phrase>
 <phrase>
   id: LANG_SEMITONE
-  desc: 
+  desc:
   user: core
   <source>
     *: none
@@ -11477,16 +11300,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Width"
+    *: "Scroll Bar Width"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Lårdjeu del bår d' acinseur"
+    *: "Lårdjeu del bår d' acinseur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Lårdjeu del bår d' acinseur"
+    *: "Lårdjeu del bår d' acinseur"
   </voice>
 </phrase>
 <phrase>
@@ -11494,16 +11314,13 @@
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Scroll Bar Position"
+    *: "Scroll Bar Position"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Eplaeçmint del bår d' acinseur"
+    *: "Eplaeçmint del bår d' acinseur"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Eplaeçmint del bår d' acinseur"
+    *: "Eplaeçmint del bår d' acinseur"
   </voice>
 </phrase>
 <phrase>
@@ -11511,16 +11328,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Compressor"
+    *: "Compressor"
   </source>
   <dest>
-    *: none
-    swcodec: "Rastrindrece"
+    *: "Rastrindrece"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rastrindrece"
+    *: "Rastrindrece"
   </voice>
 </phrase>
 <phrase>
@@ -11579,16 +11393,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Threshold"
+    *: "Threshold"
   </source>
   <dest>
-    *: none
-    swcodec: "Sou"
+    *: "Sou"
   </dest>
   <voice>
-    *: none
-    swcodec: "Sou"
+    *: "Sou"
   </voice>
 </phrase>
 <phrase>
@@ -11596,16 +11407,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Ratio"
+    *: "Ratio"
   </source>
   <dest>
-    *: none
-    swcodec: "Rapoirt"
+    *: "Rapoirt"
   </dest>
   <voice>
-    *: none
-    swcodec: "Rapoirt"
+    *: "Rapoirt"
   </voice>
 </phrase>
 <phrase>
@@ -11613,16 +11421,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </source>
   <dest>
-    *: none
-    swcodec: "2:1"
+    *: "2:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "2 di 1"
+    *: "2 di 1"
   </voice>
 </phrase>
 <phrase>
@@ -11630,16 +11435,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </source>
   <dest>
-    *: none
-    swcodec: "4:1"
+    *: "4:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "4 di 1"
+    *: "4 di 1"
   </voice>
 </phrase>
 <phrase>
@@ -11647,16 +11449,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </source>
   <dest>
-    *: none
-    swcodec: "6:1"
+    *: "6:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "6 di 1"
+    *: "6 di 1"
   </voice>
 </phrase>
 <phrase>
@@ -11664,16 +11463,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </source>
   <dest>
-    *: none
-    swcodec: "10:1"
+    *: "10:1"
   </dest>
   <voice>
-    *: none
-    swcodec: "10 di 1"
+    *: "10 di 1"
   </voice>
 </phrase>
 <phrase>
@@ -11681,16 +11477,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Limit"
+    *: "Limit"
   </source>
   <dest>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </dest>
   <voice>
-    *: none
-    swcodec: "Limite"
+    *: "Limite"
   </voice>
 </phrase>
 <phrase>
@@ -11698,16 +11491,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Makeup Gain"
+    *: "Makeup Gain"
   </source>
   <dest>
-    *: none
-    swcodec: "Amîdré Crexhaedje"
+    *: "Amîdré Crexhaedje"
   </dest>
   <voice>
-    *: none
-    swcodec: "Amîdré Crexhaedje"
+    *: "Amîdré Crexhaedje"
   </voice>
 </phrase>
 <phrase>
@@ -11715,16 +11505,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Auto"
+    *: "Auto"
   </source>
   <dest>
-    *: none
-    swcodec: "Otomatic"
+    *: "Otomatic"
   </dest>
   <voice>
-    *: none
-    swcodec: "Otomatic"
+    *: "Otomatic"
   </voice>
 </phrase>
 <phrase>
@@ -11732,16 +11519,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Knee"
+    *: "Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Djino"
+    *: "Djino"
   </dest>
   <voice>
-    *: none
-    swcodec: "Djino"
+    *: "Djino"
   </voice>
 </phrase>
 <phrase>
@@ -11749,16 +11533,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Hard Knee"
+    *: "Hard Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Deur di djno"
+    *: "Deur di djno"
   </dest>
   <voice>
-    *: none
-    swcodec: "Deur do djno"
+    *: "Deur do djno"
   </voice>
 </phrase>
 <phrase>
@@ -11766,16 +11547,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Soft Knee"
+    *: "Soft Knee"
   </source>
   <dest>
-    *: none
-    swcodec: "Mol do djno"
+    *: "Mol do djno"
   </dest>
   <voice>
-    *: none
-    swcodec: "Mol do djno"
+    *: "Mol do djno"
   </voice>
 </phrase>
 <phrase>
@@ -11783,16 +11561,13 @@
   desc: in sound settings
   user: core
   <source>
-    *: none
-    swcodec: "Release Time"
+    *: "Release Time"
   </source>
   <dest>
-    *: none
-    swcodec: "Tins di rlåtche"
+    *: "Tins di rlåtche"
   </dest>
   <voice>
-    *: none
-    swcodec: "Tins di rlåtche"
+    *: "Tins di rlåtche"
   </voice>
 </phrase>
 <phrase>
@@ -11854,7 +11629,7 @@
 <phrase>
   id: LANG_CUSTOM_STATUSBAR
   desc: deprecated
-  user:
+  user: core
   <source>
     *: none
   </source>
@@ -11868,7 +11643,7 @@
 <phrase>
   id: LANG_REMOTE_CUSTOM_STATUSBAR
   desc: deprecated
-  user:
+  user: core
   <source>
     *: none
   </source>
@@ -12005,16 +11780,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Base Skin"
+    *: "Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pea"
+    *: "Pea"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pea"
+    *: "Pea"
   </voice>
 </phrase>
 <phrase>
@@ -12022,16 +11794,13 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
-    lcd_bitmap: "Remote Base Skin"
+    *: "Remote Base Skin"
   </source>
   <dest>
-    *: none
-    lcd_bitmap: "Pea då lon"
+    *: "Pea då lon"
   </dest>
   <voice>
-    *: none
-    lcd_bitmap: "Pea då lon"
+    *: "Pea då lon"
   </voice>
 </phrase>
 <phrase>
@@ -12070,7 +11839,7 @@
 </phrase>
 <phrase>
   id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer 
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
     *: "Filesize"
diff --git a/tools/updatelang b/tools/updatelang
index 62e7c327b6..de17e2248e 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -59,6 +59,14 @@ sub parselangfile {
 	    my @targets = split(',', $1);
 	    foreach (@targets) {
 		my $l = trim($_);
+
+		# Strip out some keys
+#		if ($l eq "swcodec") {
+#		    $l = "*";
+#		} elsif ($l eq "lcd_bitmap") {
+#		    $l = "*";
+#		}
+
 		$thisphrase{$pos}->{$l} = $2;
 	    }
 	}
@@ -220,11 +228,15 @@ foreach my $id (@langorder) {
 	}
     }
 
+    if (!defined($ep{'user'}) || length($ep{'user'}) == 0) {
+	$lp{'user'} = 'core';
+    }
+
     if (!defined($lp{'user'}) || $lp{'user'} ne $ep{'user'}) {
-	if (!defined($lp{'user'})) {
+	$lang{$id}{'notes'} .= "### The 'user' field for '$id' differs from the english!\n### the previously used desc is commented below:\n### desc: $lp{user}\n";
+	if (!defined($lp{'user'}) || length($lp{'user'}) == 0) {
 	    $lp{'user'} = $ep{'user'};
 	}
-	$lang{$id}{'notes'} .= "### The 'user' field for '$id' differs from the english!\n### the previously used desc is commented below:\n### desc: $lp{user}\n";
 	$lang{$id}{'phrase'}{'user'} = $english{$id}{'phrase'}{'user'};
 #	print "#!! '$id' changed user\n";
     }
@@ -389,6 +401,10 @@ foreach my $id (@finalorder) {
 
     # phrase
     %lp = %{$lang{$id}{'phrase'}};
+
+    # Drop all deprecated phrases?
+#    next if ($lp{'desc'} eq 'deprecated');
+
     if (length($lang{$id}{'notes'}) && $printnotes) {
 	print $fh "$lang{$id}{notes}";
     }