lang: More automated rejiggering, USB_MODE_* is no longer ibasso-specific

Change-Id: I8e7eb3bb3c5ed61572c0ade4059c3e3527558932

19 files changed, 221 insertions, 435 deletions

diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ce3f6a6534..a66df1ba51 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -12786,16 +12786,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -12845,16 +12842,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Само зареждане"
+    *: "Само зареждане"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Само зареждане"
+    *: "Само зареждане"
   </voice>
 </phrase>
 <phrase>
@@ -12890,16 +12884,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB Режим"
+    *: "USB Режим"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Ю Ес Би Режим"
+    *: "Ю Ес Би Режим"
   </voice>
 </phrase>
 <phrase>
@@ -12924,16 +12915,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Масова памет"
+    *: "Масова памет"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Масова памет"
+    *: "Масова памет"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 2111a8c48b..c1829298be 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -12747,16 +12747,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB模式"
+    *: "USB模式"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB模式"
+    *: "USB模式"
   </voice>
 </phrase>
 <phrase>
@@ -12764,16 +12761,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "大容量存储"
+    *: "大容量存储"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "大容量存储"
+    *: "大容量存储"
   </voice>
 </phrase>
 <phrase>
@@ -12781,16 +12775,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "仅充电"
+    *: "仅充电"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "仅充电"
+    *: "仅充电"
   </voice>
 </phrase>
 <phrase>
@@ -12798,15 +12789,12 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "ADB调试"
+    *: "ADB调试"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "ADB调试"
+    *: "ADB调试"
   </voice>
 </phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 3d82c62d0b..5af129590b 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -11345,16 +11345,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB模式"
+    *: "USB模式"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB模式"
+    *: "USB模式"
   </voice>
 </phrase>
 <phrase>
@@ -11362,16 +11359,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "大容量存儲"
+    *: "大容量存儲"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "大容量存儲"
+    *: "大容量存儲"
   </voice>
 </phrase>
 <phrase>
@@ -11379,16 +11373,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "僅充電"
+    *: "僅充電"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "僅充電"
+    *: "僅充電"
   </voice>
 </phrase>
 <phrase>
@@ -11396,16 +11387,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "ADB偵錯"
+    *: "ADB偵錯"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "ADB偵錯"
+    *: "ADB偵錯"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index ef7dd3c113..eb89feb218 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -12612,16 +12612,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB Modus"
+    *: "USB Modus"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB Modus"
+    *: "USB Modus"
   </voice>
 </phrase>
 <phrase>
@@ -12629,16 +12626,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Massenspeicher"
+    *: "Massenspeicher"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Massenspeicher"
+    *: "Massenspeicher"
   </voice>
 </phrase>
 <phrase>
@@ -12646,16 +12640,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Nur laden"
+    *: "Nur laden"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Nur laden"
+    *: "Nur laden"
   </voice>
 </phrase>
 <phrase>
@@ -12663,16 +12654,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index e5071fa387..49fa6f854b 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -12038,16 +12038,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Stockage de masse"
+    *: "Stockage de masse"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Stockage de masse"
+    *: "Stockage de masse"
   </voice>
 </phrase>
 <phrase>
@@ -12215,16 +12212,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Charge seulement"
+    *: "Charge seulement"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Charge seulement"
+    *: "Charge seulement"
   </voice>
 </phrase>
 <phrase>
@@ -12232,16 +12226,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Pont de débogage Android"
+    *: "Pont de débogage Android"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Pont de débogage Android"
+    *: "Pont de débogage Android"
   </voice>
 </phrase>
 <phrase>
@@ -12294,16 +12285,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Mode USB"
+    *: "Mode USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Mode USB"
+    *: "Mode USB"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 1442c6ba32..44507e9eca 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -11310,16 +11310,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Μόνο φόρτιση"
+    *: "Μόνο φόρτιση"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Μόνο φόρτιση"
+    *: "Μόνο φόρτιση"
   </voice>
 </phrase>
 <phrase>
@@ -11839,16 +11836,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Λειτουργία USB"
+    *: "Λειτουργία USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Λειτουργία USB"
+    *: "Λειτουργία USB"
   </voice>
 </phrase>
 <phrase>
@@ -12379,16 +12373,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Εσωτερική μνήμη"
+    *: "Εσωτερική μνήμη"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Εσωτερική μνήμη"
+    *: "Εσωτερική μνήμη"
   </voice>
 </phrase>
 <phrase>
@@ -12979,16 +12970,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index bb710640f1..70f6cb6f19 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -12015,16 +12015,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Memoria di massa"
+    *: "Memoria di massa"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Memoria di massa"
+    *: "Memoria di massa"
   </voice>
 </phrase>
 <phrase>
@@ -12161,16 +12158,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Solo ricarica batteria"
+    *: "Solo ricarica batteria"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Solo ricarica batteria"
+    *: "Solo ricarica batteria"
   </voice>
 </phrase>
 <phrase>
@@ -12220,16 +12214,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Modalità USB"
+    *: "Modalità USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Modalità USB"
+    *: "Modalità USB"
   </voice>
 </phrase>
 <phrase>
@@ -12265,16 +12256,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index e4bd6bbaa8..4961753dc1 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -12589,16 +12589,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "充電のみ"
+    *: "充電のみ"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "充電のみ"
+    *: "充電のみ"
   </voice>
 </phrase>
 <phrase>
@@ -12606,16 +12603,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USBモード"
+    *: "USBモード"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USBモード"
+    *: "USBモード"
   </voice>
 </phrase>
 <phrase>
@@ -12724,16 +12718,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "マス・ストレージ"
+    *: "マス・ストレージ"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "マス・ストレージ"
+    *: "マス・ストレージ"
   </voice>
 </phrase>
 <phrase>
@@ -12873,16 +12864,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 142c586ea1..96e5833e8e 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -11544,16 +11544,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB Mód"
+    *: "USB Mód"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB Mód"
+    *: "USB Mód"
   </voice>
 </phrase>
 <phrase>
@@ -12178,16 +12175,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Csak Töltés"
+    *: "Csak Töltés"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Csak Töltés"
+    *: "Csak Töltés"
   </voice>
 </phrase>
 <phrase>
@@ -12792,16 +12786,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Cserélhető lemez mód"
+    *: "Cserélhető lemez mód"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Cserélhető lemez mód"
+    *: "Cserélhető lemez mód"
   </voice>
 </phrase>
 <phrase>
@@ -12823,16 +12814,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 4f45408167..bdecb2c4b0 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -12855,16 +12855,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "massaopslag"
+    *: "massaopslag"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "massaopslag"
+    *: "massaopslag"
   </voice>
 </phrase>
 <phrase>
@@ -12872,16 +12869,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -12973,16 +12967,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "enkel opladen"
+    *: "enkel opladen"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "enkel opladen"
+    *: "enkel opladen"
   </voice>
 </phrase>
 <phrase>
@@ -12990,16 +12981,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index ef5dda8db9..877cb1c269 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -10841,16 +10841,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Kun lading"
+    *: "Kun lading"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Kun lading"
+    *: "Kun lading"
   </voice>
 </phrase>
 <phrase>
@@ -11120,16 +11117,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -11292,16 +11286,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -11920,16 +11911,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Masselagring"
+    *: "Masselagring"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Masselagring"
+    *: "Masselagring"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 0647a61db4..953549e371 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -12109,16 +12109,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Tylko ładowanie"
+    *: "Tylko ładowanie"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Tylko ładowanie"
+    *: "Tylko ładowanie"
   </voice>
 </phrase>
 <phrase>
@@ -12140,16 +12137,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Tryb USB"
+    *: "Tryb USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Tryb USB"
+    *: "Tryb USB"
   </voice>
 </phrase>
 <phrase>
@@ -12202,16 +12196,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Pamięć masowa"
+    *: "Pamięć masowa"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Pamięć masowa"
+    *: "Pamięć masowa"
   </voice>
 </phrase>
 <phrase>
@@ -12219,16 +12210,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Mostek diagnostyczny Androida"
+    *: "Mostek diagnostyczny Androida"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Mostek diagnostyczny Androida"
+    *: "Mostek diagnostyczny Androida"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 22eececcb9..40035b1832 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -12796,16 +12796,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Armazenamento em Massa"
+    *: "Armazenamento em Massa"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Armazenamento em Massa"
+    *: "Armazenamento em Massa"
   </voice>
 </phrase>
 <phrase>
@@ -12872,16 +12869,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Modo USB"
+    *: "Modo USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Modo USB"
+    *: "Modo USB"
   </voice>
 </phrase>
 <phrase>
@@ -12889,16 +12883,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Carregar só"
+    *: "Carregar só"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Carregar só"
+    *: "Carregar só"
   </voice>
 </phrase>
 <phrase>
@@ -12948,15 +12939,12 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Ponte de Debug Android"
+    *: "Ponte de Debug Android"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Ponte de Debug Android"
+    *: "Ponte de Debug Android"
   </voice>
 </phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 8af90eb1d1..65015a5990 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -12158,16 +12158,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Režim USB"
+    *: "Režim USB"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Režim USB"
+    *: "Režim USB"
   </voice>
 </phrase>
 <phrase>
@@ -12192,16 +12189,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -12209,16 +12203,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "úložisko"
+    *: "úložisko"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "úložisko"
+    *: "úložisko"
   </voice>
 </phrase>
 <phrase>
@@ -12240,17 +12231,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50: "Iba nabíjanie"
-    ibassodx90: "Iba Nabíjanie"
+    *: "Iba Nabíjanie"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Iba nabíjanie"
+    *: "Iba nabíjanie"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index d03580562a..db93124c8f 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -12181,16 +12181,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB Мод"
+    *: "USB Мод"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB Мод"
+    *: "USB Мод"
   </voice>
 </phrase>
 <phrase>
@@ -12212,16 +12209,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -12327,16 +12321,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Масовно Складиште"
+    *: "Масовно Складиште"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Масовно Складиште"
+    *: "Масовно Складиште"
   </voice>
 </phrase>
 <phrase>
@@ -12414,16 +12405,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Само пуњење"
+    *: "Само пуњење"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Само пуњење"
+    *: "Само пуњење"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index f5caf71fea..758ad373ef 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -12650,16 +12650,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Endast laddning"
+    *: "Endast laddning"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Endast laddning"
+    *: "Endast laddning"
   </voice>
 </phrase>
 <phrase>
@@ -12740,16 +12737,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB-läge"
+    *: "USB-läge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB-läge"
+    *: "USB-läge"
   </voice>
 </phrase>
 <phrase>
@@ -12844,16 +12838,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -13077,16 +13068,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Masslagring"
+    *: "Masslagring"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Masslagring"
+    *: "Masslagring"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index ab5afc2057..4fc073bebc 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -4563,16 +4563,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
@@ -10569,16 +10566,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </voice>
 </phrase>
 <phrase>
@@ -10935,16 +10929,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </voice>
 </phrase>
 <phrase>
@@ -13035,16 +13026,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index c29d4e1237..b77da656a4 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -12848,16 +12848,13 @@
   desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Mass Storage"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "massaopslag"
+    *: "massaopslag"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "massaopslag"
+    *: "massaopslag"
   </voice>
 </phrase>
 <phrase>
@@ -12865,16 +12862,13 @@
   desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "USB Mode"
+    *: "USB Mode"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "USB-modus"
+    *: "USB-modus"
   </voice>
 </phrase>
 <phrase>
@@ -12966,16 +12960,13 @@
   desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Charge Only"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "enkel opladen"
+    *: "enkel opladen"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "enkel opladen"
+    *: "enkel opladen"
   </voice>
 </phrase>
 <phrase>
@@ -12983,16 +12974,13 @@
   desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </dest>
   <voice>
-    *: none
-    ibassodx50,ibassodx90: "Android Debug Bridge"
+    *: "Android Debug Bridge"
   </voice>
 </phrase>
 <phrase>
diff --git a/tools/updatelang b/tools/updatelang
index 7a3cb934b9..fa78430958 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -57,9 +57,10 @@ sub parselangfile {
 	    }
 	} elsif ($pos ne 'phrase' && $line =~ /^([^:]+): ?\"?([^\"]*)\"?$/) {
 	    my @targets = split(',', $1);
+	    my $w = $2;
+
 	    foreach (@targets) {
 		my $l = trim($_);
-
 		# Convert some obsolete keys
 		if ($l eq "swcodec") {
 		    $l = "*";
@@ -67,9 +68,11 @@ sub parselangfile {
 		    $l = "*";
 		} elsif ($l eq "recording_swcodec") {
 		    $l = "recording";
+#		} elsif ($id =~ /USB_MODE/ && $l =~ /ibassodx/) {
+#		    $l = "*";
 		}
 
-		$thisphrase{$pos}->{$l} = $2;
+		$thisphrase{$pos}->{$l} = $w;
 	    }
 	}
 	if ($line eq '</voice>' ||