settings: Move USB-related settings to their own submenu

Change-Id: Ic35025633f655138767e82bf4369e0626e91b4d4

apps/lang/bulgarian.lang

@@ -16976,3 +16976,17 @@
     *: "Винаги помни последната папка"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "Ю Ес Би"
+  </voice>
+</phrase>

apps/lang/chinese-simp.lang

@@ -16953,3 +16953,17 @@
     general_purpose_led: "使用 L E D 指示灯"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/deutsch.lang

@@ -16992,3 +16992,17 @@
     *: "Zuletzt verwendeten Ordner immer merken"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/english-us.lang

@@ -16970,3 +16970,17 @@
     *: "Always remember last folder"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "USB"
+  </dest>
+  <voice>
+    *: "U S B"
+  </voice>
+</phrase>

apps/lang/english.lang

@@ -12280,7 +12280,7 @@
 </phrase>
 <phrase>
   id: LANG_USB_MODE
-  desc: in Settings -> General -> System -> USB Mode
+  desc: in Settings -> General -> System -> USB
   user: core
   <source>
     *: "USB Mode"
@@ -17043,3 +17043,17 @@
     *: "Always remember last folder"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "USB"
+  </dest>
+  <voice>
+    *: "U S B"
+  </voice>
+</phrase>

apps/lang/espanol.lang

@@ -16982,3 +16982,17 @@
     *: "Recordar siempre la última carpeta"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/francais.lang

@@ -16953,3 +16953,17 @@
     *: "trier les listes de lecture"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/italiano.lang

@@ -16974,3 +16974,17 @@
     *: "Ricorda sempre l'ultima cartella"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/japanese.lang

@@ -16514,3 +16514,17 @@
     *: "プレイリストは終了しました。もう一度再生しますか？"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/korean.lang

@@ -16988,3 +16988,17 @@
     *: "항상 마지막 폴더 기억"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/latviesu.lang

@@ -16959,3 +16959,17 @@
     *: "Paziņot statusu"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "Ju es bī"
+  </voice>
+</phrase>

apps/lang/magyar.lang

@@ -16962,3 +16962,17 @@
     *: "Állapot bejelentése"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/moldoveneste.lang

@@ -16979,3 +16979,17 @@
     *: "Ține minte mereu ultimul dosar"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "u se be"
+  </voice>
+</phrase>

apps/lang/nederlands.lang

@@ -16954,3 +16954,17 @@
     general_purpose_led: "Gebruik LED-indicatoren"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/norsk-nynorsk.lang

@@ -16978,3 +16978,17 @@
     *: "Alltid hugs siste mappe"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/polski.lang

@@ -16980,3 +16980,17 @@
     *: "Zawsze pamiętaj ostatni katalog"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "u es be"
+  </voice>
+</phrase>

apps/lang/portugues-brasileiro.lang

@@ -16983,3 +16983,17 @@
     *: "Playlist finalizada. Reproduzir novamente?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/romaneste.lang

@@ -16979,3 +16979,17 @@
     *: "Ține minte mereu ultimul dosar"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "u se be"
+  </voice>
+</phrase>

apps/lang/russian.lang

@@ -16988,3 +16988,17 @@
     *: "Всегда запоминать последнюю папку"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "Ю С Б"
+  </voice>
+</phrase>

apps/lang/slovak.lang

@@ -16974,3 +16974,17 @@
     *: "Vždy si zapamätať posledný priečinok"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/srpski.lang

@@ -16958,3 +16958,17 @@
     general_purpose_led: "Користи LED индикаторе"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "У Ес Бе"
+  </voice>
+</phrase>

apps/lang/svenska.lang

@@ -16953,3 +16953,17 @@
     general_purpose_led: "Använd LED-indikatorer"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/turkce.lang

@@ -16975,3 +16975,17 @@
     *: "En son dosyayı her zaman hatırla"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/ukrainian.lang

@@ -16945,3 +16945,17 @@
     general_purpose_led: "Використати світлодіодні індикатори"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/lang/vietnamese.lang

@@ -16958,3 +16958,17 @@
     *: "Thông báo trạng thái"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_MENU
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "USB"
+  </source>
+  <dest>
+    *: "~USB"
+  </dest>
+  <voice>
+    *: "~U S B"
+  </voice>
+</phrase>

apps/menus/settings_menu.c

@@ -59,6 +59,10 @@
 #include "onplay.h"
 #include "misc.h"
 
+#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
+#define HAVE_USB_MODE
+#endif
+
 #ifndef HAS_BUTTON_HOLD
 static int selectivesoftlock_callback(int action,
                                       const struct menu_item_ex *this_item,
@@ -271,7 +275,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
             &usb_charging,
 #endif
          );
-#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
+#ifdef HAVE_USB_MODE
 MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
 #endif
 #if defined(HAVE_GENERAL_PURPOSE_LED)
@@ -411,6 +415,22 @@ MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE),
 MENUITEM_SETTING(governor, &global_settings.governor, NULL);
 #endif
 
+MAKE_MENU(usb_menu, ID2P(LANG_USB_MENU), 0, Icon_NOICON,
+#ifdef USB_ENABLE_HID
+            &usb_hid,
+            &usb_keypad_mode,
+#endif
+#ifdef USB_ENABLE_AUDIO
+            &usb_audio,
+#endif
+#if defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)
+            &usb_skip_first_drive,
+#endif
+#ifdef HAVE_USB_MODE
+            &usb_mode,
+#endif
+         );
+
 MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
           0, Icon_System_menu,
 #if (BATTERY_CAPACITY_INC > 0) || defined(HAVE_USB_CHARGING_ENABLE)
@@ -458,23 +478,15 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #ifndef HAS_BUTTON_HOLD
             &sel_softlock,
 #endif
-#ifdef USB_ENABLE_HID
+#if defined(USB_ENABLE_HID) || \
-            &usb_hid,
+    defined(USB_ENABLE_AUDIO) || \
-            &usb_keypad_mode,
+    (defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)) || \
+    defined(HAVE_USB_MODE)
+            &usb_menu,
 #endif
-#ifdef USB_ENABLE_AUDIO
-            &usb_audio,
-#endif
-#if defined(USB_ENABLE_STORAGE) && defined(HAVE_MULTIDRIVE)
-            &usb_skip_first_drive,
-#endif
-
 #if defined(DX50) || defined(DX90)
             &governor,
 #endif
-#if defined(DX50) || defined(DX90) || (defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR))
-            &usb_mode,
-#endif
 #if defined(HAVE_GENERAL_PURPOSE_LED)
             &use_led_indicators,
 #endif