diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index c58ad7cc5c..f305430d44 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -3123,57 +3123,6 @@
     *: "电池容量"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SPINDOWN
   desc: in settings_menu
@@ -3938,8 +3887,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx: "POWER:取消"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK:取消"
+    gigabeatfx: "POWER:取消"
     gogearsa9200: "LEFT:取消"
     iaudiom5,iaudiox5: "RECORD:取消"
     ipod*,mpiohd300,sansac200*: "MENU:取消"
@@ -3953,7 +3902,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -6286,7 +6234,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "正在扫描"
   </voice>
 </phrase>
 <phrase>
@@ -6570,7 +6518,7 @@
     *: "读取%s失败"
   </dest>
   <voice>
-    *: ""
+    *: "读取文件失败"
   </voice>
 </phrase>
 <phrase>
@@ -7457,8 +7405,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT:设置"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY:设置"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT:设置"
     iriverh100,iriverh120,iriverh300: "NAVI=设置"
     mpiohd300: "ENTER:设置"
     mrobe500: "HEART:设置"
@@ -7467,7 +7415,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7980,20 +7927,6 @@
     headphone_detection: "拔出耳机后自动暂停"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
@@ -12494,20 +12427,6 @@
     *: "曲目已播放"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -14060,16 +13979,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "切换项目"
+    *: ""
   </dest>
   <voice>
-    *: "切换项目"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14130,13 +14049,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox主屏幕菜单定制"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14639,20 +14558,6 @@
     *: "未找到专辑艺术"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -16991,3 +16896,17 @@
     *: "无法加载字体"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "排序播放列表"
+  </dest>
+  <voice>
+    *: "排序播放列表"
+  </voice>
+</phrase>
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index 55ca745900..85d63e965d 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -3353,57 +3353,6 @@
     *: "Battery Capacity"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3554,7 +3503,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3591,7 +3539,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4669,7 +4616,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Scanning"
   </voice>
 </phrase>
 <phrase>
@@ -5781,20 +5728,6 @@
     *: "tracks saved"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -7245,7 +7178,7 @@
     *: "Failed reading %s"
   </dest>
   <voice>
-    *: ""
+    *: "Failed reading file"
   </voice>
 </phrase>
 <phrase>
@@ -12484,20 +12417,6 @@
     *: "Track elapsed"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -14050,16 +13969,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Toggle Item"
+    *: ""
   </dest>
   <voice>
-    *: "Toggle Item"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14120,13 +14039,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14629,20 +14548,6 @@
     *: "No album art found"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -16980,3 +16885,17 @@
     *: "Tracks by"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Sort Playlists"
+  </dest>
+  <voice>
+    *: "sort playlists"
+  </voice>
+</phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 4761b29998..291beb283a 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -3343,57 +3343,6 @@
     *: "Capacità Batteria"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3534,8 +3483,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Imposta"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Imposta"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Imposta"
     iriverh100,iriverh120,iriverh300: "NAVI = Imposta"
     mpiohd300: "ENTER = Imposta"
     mrobe500: "HEART = Imposta"
@@ -3544,7 +3493,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3567,8 +3515,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe500: "POWER = Annulla"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Annulla"
+    gigabeatfx,mrobe500: "POWER = Annulla"
     gogearsa9200: "LEFT = Annulla"
     iaudiom5,iaudiox5: "RECORD = Annulla"
     ipod*,mpiohd300,sansac200*: "MENU = Annulla"
@@ -3581,7 +3529,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4659,7 +4606,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Ricerca"
   </voice>
 </phrase>
 <phrase>
@@ -5771,20 +5718,6 @@
     *: "Traccie salvate"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -7235,7 +7168,7 @@
     *: "Errore in lettura di %s"
   </dest>
   <voice>
-    *: ""
+    *: "Errore nella lettura del file"
   </voice>
 </phrase>
 <phrase>
@@ -12816,13 +12749,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Ordine Menu Principale Rockbox"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -12887,20 +12820,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_LEVEL_2
   desc: in the chessbox game level selection
@@ -13482,20 +13401,6 @@
     *: "Livello 7, 40 mosse ogni 240 minuti"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PROPERTIES_PATH
   desc: in properties plugin
@@ -13804,16 +13709,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Commuta l'elemento"
+    *: ""
   </dest>
   <voice>
-    *: "Commuta l'elemento"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -16984,3 +16889,17 @@
     *: "Tracce per"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Ordina Playlist"
+  </dest>
+  <voice>
+    *: "Ordina Playlist"
+  </voice>
+</phrase>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index b92d83f94c..503e1f1ee6 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -3370,57 +3370,6 @@
     *: "배터리 용량"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3561,8 +3510,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "선택 버튼 = 설정"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "재생 버튼 = 설정"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "선택 버튼 = 설정"
     iriverh100,iriverh120,iriverh300: "탐색 버튼 = 설정"
     mpiohd300: "진입 버튼 = 설정"
     mrobe500: "하트 버튼 = 설정"
@@ -3571,7 +3520,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3594,8 +3542,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe500: "전원 버터느 = 반복"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "뒤로가기 버튼 = 반복"
+    gigabeatfx,mrobe500: "전원 버터느 = 반복"
     gogearsa9200: "왼쪽 버튼 = 반복"
     iaudiom5,iaudiox5: "녹음 버튼 = 반복"
     ipod*,mpiohd300,sansac200*: "메뉴 버튼 = 반복"
@@ -3608,7 +3556,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4686,7 +4633,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "검색 중"
   </voice>
 </phrase>
 <phrase>
@@ -5798,20 +5745,6 @@
     *: "트랙이 저장되었음"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -7262,7 +7195,7 @@
     *: "%s을(를) 읽기 실패함"
   </dest>
   <voice>
-    *: ""
+    *: "파일 읽기 실패함"
   </voice>
 </phrase>
 <phrase>
@@ -12501,20 +12434,6 @@
     *: "트랙 경과됨"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -14067,16 +13986,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "전환 항목"
+    *: ""
   </dest>
   <voice>
-    *: "전환 항목"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14137,13 +14056,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "록박스 메인 메뉴 순서"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14646,20 +14565,6 @@
     *: "앨범 아트를 찾을 수 없음"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -16997,3 +16902,17 @@
     *: "다음의 트랙"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "재생 목록 정렬"
+  </dest>
+  <voice>
+    *: "재생 목록 정렬"
+  </voice>
+</phrase>
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index be3fb51b6e..099199d8a8 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -3356,57 +3356,6 @@
     *: "Ietilpība"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3547,8 +3496,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Uzstādīt"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Uzstādīt"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Uzstādīt"
     iriverh100,iriverh120,iriverh300: "NAVI = Uzstādīt"
     mpiohd300: "ENTER = Uzstādīt"
     mrobe500: "HEART = Uzstādīt"
@@ -3557,7 +3506,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3580,8 +3528,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe500: "POWER = Atcelt"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Atcelt"
+    gigabeatfx,mrobe500: "POWER = Atcelt"
     gogearsa9200: "LEFT = Atcelt"
     iaudiom5,iaudiox5: "RECORD = Atcelt"
     ipod*,mpiohd300,sansac200*: "MENU = Atcelt"
@@ -3594,7 +3542,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4672,7 +4619,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Skenē"
   </voice>
 </phrase>
 <phrase>
@@ -5784,20 +5731,6 @@
     *: "Saglabātas dziesmas"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -7248,7 +7181,7 @@
     *: "Neizdevās nolasīt %s"
   </dest>
   <voice>
-    *: ""
+    *: "Neizdevās nolasīt failu"
   </voice>
 </phrase>
 <phrase>
@@ -12599,20 +12532,6 @@
     *: "Pagājušais dziesmas laiks"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -14165,16 +14084,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Pārslēgt vienumu"
+    *: ""
   </dest>
   <voice>
-    *: "Pārslēgt vienumu"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14235,13 +14154,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox galvenās izvēlnes secība"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14744,20 +14663,6 @@
     *: "Albuma vāks nav atrasts"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -16983,3 +16888,17 @@
     *: "Atskaņošanas saraksts pabeigts. Atskaņot vēlreiz?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Kārtot atskaņošanas sarakstus"
+  </dest>
+  <voice>
+    *: "Kārtot atskaņošanas sarakstus"
+  </voice>
+</phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index dc927ba47d..2b07ed56b8 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -3349,57 +3349,6 @@
     *: "Pojemność baterii"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types,xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types,xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3540,8 +3489,8 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ustaw"
     aigoerosq,erosqnative,gogearsa9200,samsungyh*: "PLAY = Ustaw"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ustaw"
     iriverh100,iriverh120,iriverh300: "NAVI = Ustaw"
     mpiohd300: "ENTER = Ustaw"
     mrobe500: "HEART = Ustaw"
@@ -3550,7 +3499,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3573,8 +3521,8 @@
   </source>
   <dest>
     *: none
-    gigabeatfx,mrobe500: "POWER = Przywróć"
     aigoerosq,erosqnative,gigabeats,sansafuzeplus: "BACK = Przywróć"
+    gigabeatfx,mrobe500: "POWER = Przywróć"
     gogearsa9200: "LEFT = Przywróć"
     iaudiom5,iaudiox5: "RECORD = Przywróć"
     ipod*,mpiohd300,sansac200*: "MENU = Przywróć"
@@ -3587,7 +3535,6 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4661,11 +4608,11 @@
   </source>
   <dest>
     *: none
-    radio: "Szukam %d.%02d MHz"
+    radio: "Wyszukiwanie %d.%02d MHz"
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Wyszukiwanie"
   </voice>
 </phrase>
 <phrase>
@@ -5777,20 +5724,6 @@
     *: "Zachowano utwory"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -7241,7 +7174,7 @@
     *: "Błąd odczytu %s"
   </dest>
   <voice>
-    *: ""
+    *: "Błąd odczytu pliku"
   </voice>
 </phrase>
 <phrase>
@@ -12230,20 +12163,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_MENU_RESTORE_GAME
   desc: in the chessbox menu
@@ -13535,16 +13454,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Przełącz element"
+    *: ""
   </dest>
   <voice>
-    *: "Przełącz element"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14133,13 +14052,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Kolejność menu głównego Rockbox"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14316,20 +14235,6 @@
     *: "Zamień kanały"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_4_KEY_CONTROL
   desc: Item for menus
@@ -16990,3 +16895,17 @@
     *: "Utwory według"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Sortuj listy odtwarzania"
+  </dest>
+  <voice>
+    *: "Sortuj listy odtwarzania"
+  </voice>
+</phrase>