2 files changed, 33 insertions, 37 deletions

diff --git a/apps/features.txt b/apps/features.txt
index e40273e98b..b510136a33 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -4,6 +4,10 @@
    version numbers should be updated. It also means that changing defines in
    the various config*.h files could also break back compatibility */  
 
+#if defined(HAVE_ACCESSORY_SUPPLY)
+accessory_supply
+#endif
+
 #if defined(HAVE_AGC)
 agc
 #endif
@@ -143,8 +147,8 @@ rtc
 scrollwheel
 #endif
 
-#if defined(HAVE_WHEEL_ACCELERATION)
-wheel_acceleration
+#if defined(IPOD_ACCESSORY_PROTOCOL)
+serial_port
 #endif
 
 #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER)
@@ -155,6 +159,10 @@ soft_shutdown
 spdif_power
 #endif
 
+#if defined(HAVE_SPEAKER)
+speaker
+#endif
+
 #if CONFIG_CODEC == SWCODEC
 swcodec
 #else
@@ -176,23 +184,11 @@ usb_charging
 #endif
 #endif
 
-#if defined(HAVE_USBSTACK)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
 usbstack
 #endif
 
-#if defined(HAVE_ACCESSORY_SUPPLY)
-accessory_supply
-#endif
-
-#if defined(IPOD_ACCESSORY_PROTOCOL)
-serial_port
-#endif
-
-#if defined(HAVE_SPEAKER)
-speaker
-#endif
-
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
-usbstack
+#if defined(HAVE_WHEEL_ACCELERATION)
+wheel_acceleration
 #endif
 
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 682725737f..8ac60e18c4 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -11232,87 +11232,87 @@
 </phrase>
 <phrase>
   id: LANG_USBSTACK
-  desc: in settings_menu
+  desc: deprecated
   user: core
   <source>
     *: none
-    usbstack: "USB Stack"
+    usbstack: ""
   </source>
   <dest>
     *: none
-    usbstack: "USB Stack"
+    usbstack: ""
   </dest>
   <voice>
     *: none
-    usbstack: "USB Stack"
+    usbstack: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_USBSTACK_MODE
-  desc: in usbstack settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    usbstack: "USB Stack Mode"
+    usbstack: ""
   </source>
   <dest>
     *: none
-    usbstack: "USB Stack Mode"
+    usbstack: ""
   </dest>
   <voice>
     *: none
-    usbstack: "USB Stack Mode"
+    usbstack: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_USBSTACK_DEVICE
-  desc: in usbstack settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    usbstack: "Device"
+    usbstack: ""
   </source>
   <dest>
     *: none
-    usbstack: "Device"
+    usbstack: ""
   </dest>
   <voice>
     *: none
-    usbstack: "Device"
+    usbstack: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_USBSTACK_HOST
-  desc: in usbstack settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    usbstack: "Host"
+    usbstack: ""
   </source>
   <dest>
     *: none
-    usbstack: "Host"
+    usbstack: ""
   </dest>
   <voice>
     *: none
-    usbstack: "Host"
+    usbstack: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_USBSTACK_DEVICE_DRIVER
-  desc: in usbstack settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    usbstack: "Device Driver"
+    usbstack: ""
   </source>
   <dest>
     *: none
-    usbstack: "Device Driver"
+    usbstack: ""
   </dest>
   <voice>
     *: none
-    usbstack: "Device Driver"
+    usbstack: ""
   </voice>
 </phrase>
 <phrase>