Backport r24968 again. svn diff -r PREV was too greedy in the previous commit.

Make the buffer low-level watermark (and the related anti-skip setting) work again. Update the buffering 'base handle' as new tracks start playing, since this is needed to determine how much playable data is left in the buffer. Should fix the buffering problem reported in the forums (http://forums.rockbox.org/index.php?topic=24014.0), and also makes the usefl line in the buffering thread debug screen useful again. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@25010 a1c6a512-1295-4272-9138-f99709370657
Revert previous commit. It appears to introduce a regression (FS#11041) which doesn't happen in trunk (anymore).
2010-03-03 22:47:05 +00:00 · 2010-03-03 22:39:55 +00:00 · 2010-03-03 21:40:17 +00:00 · 2010-02-28 17:19:08 +00:00 · 2010-02-28 17:17:32 +00:00 · 2010-02-03 19:42:36 +00:00
40 changed files with 15658 additions and 1522 deletions
--- a/apps/features.txt
+++ b/apps/features.txt
@ -197,14 +197,15 @@ tc_ramcache

 #if CONFIG_CHARGING
 charging
-#if defined(HAVE_USB_POWER)
-usb_charging
-#endif
 #if defined(HAVE_USB_CHARGING_ENABLE)
 usb_charging_enable
 #endif
 #endif

+#if defined(HAVE_USB_POWER)
+usb_power
+#endif
+
 #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
 usbstack
 #endif
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@ -45,7 +45,7 @@
 #if CONFIG_CODEC == SWCODEC
 #define MAX_FILETYPES 128
 #else
-#define MAX_FILETYPES 48
+#define MAX_FILETYPES 64
 #endif

 /* a table for the know file types */
--- a/apps/gui/backdrop.c
+++ b/apps/gui/backdrop.c
@ -211,7 +211,29 @@ void remote_backdrop_hide(void)
 {
        lcd_remote_set_backdrop(NULL);
 }
+#else
+/* api functions */
+bool remote_backdrop_load(enum backdrop_type bdrop,
+                                const char *filename)
+{
+    (void)bdrop; (void)filename;
+    return true;
+}

+void remote_backdrop_show(enum backdrop_type bdrop)
+{
+    (void)bdrop;
+}
+
+void remote_backdrop_unload(enum backdrop_type bdrop)
+{
+    (void)bdrop;
+}
+
+
+void remote_backdrop_hide(void)
+{
+}
 #endif

    
--- a/apps/gui/backdrop.h
+++ b/apps/gui/backdrop.h
@ -40,13 +40,10 @@ void backdrop_hide(void);
 #endif

 #if defined(HAVE_REMOTE_LCD)
-/* no main backdrop, stubs! */
-#if LCD_REMOTE_DEPTH > 1
 bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename);
 void remote_backdrop_unload(enum backdrop_type bdrop);
 void remote_backdrop_show(enum backdrop_type bdrop);
 void remote_backdrop_hide(void);
 #endif
-#endif

 #endif /* _BACKDROP_H */
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@ -69,16 +69,10 @@ static int theme_stack_top[NB_SCREENS]; /* the last item added */
 static struct viewport_stack_item theme_stack[NB_SCREENS][VPSTACK_DEPTH];
 static bool is_theme_enabled(enum screen_type screen);

-static void toggle_theme(enum screen_type screen, bool force)
+
+static void toggle_events(bool enable)
 {
-    bool enable_event = false;
-    static bool was_enabled[NB_SCREENS] = {false};
-    int i;
-    FOR_NB_SCREENS(i)
-    {
-        enable_event = enable_event || is_theme_enabled(i);
-    }
-    if (enable_event)
+    if (enable)
    {
        add_event(GUI_EVENT_ACTIONUPDATE, false, viewportmanager_redraw);
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
@ -88,8 +82,34 @@ static void toggle_theme(enum screen_type screen, bool force)
                                                do_sbs_update_callback);
        add_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, false,
                                                do_sbs_update_callback);
-        
-#if LCD_DEPTH > 1
+    }
+    else
+    {
+#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
+        remove_event(LCD_EVENT_ACTIVATION, do_sbs_update_callback);
+#endif
+        remove_event(PLAYBACK_EVENT_TRACK_CHANGE, do_sbs_update_callback);
+        remove_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, do_sbs_update_callback);
+        remove_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw);
+    }   
+}
+
+
+static void toggle_theme(enum screen_type screen, bool force)
+{
+    bool enable_event = false;
+    static bool was_enabled[NB_SCREENS] = {false};
+    int i;
+
+    FOR_NB_SCREENS(i)
+    {
+        enable_event = enable_event || is_theme_enabled(i);
+    }
+    toggle_events(enable_event);
+
+    if (is_theme_enabled(screen))
+    {
+#if LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)
        screens[screen].backdrop_show(BACKDROP_MAIN);
 #endif
        /* remove the left overs from the previous screen.
@ -144,20 +164,10 @@ static void toggle_theme(enum screen_type screen, bool force)
    }
    else
    {
-        FOR_NB_SCREENS(i)
-        {
-#if LCD_DEPTH > 1
-            screens[i].backdrop_hide();
+#if LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)
+        screens[screen].backdrop_hide();
 #endif
-            screens[i].stop_scroll();
-        }
-            
-#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
-        remove_event(LCD_EVENT_ACTIVATION, do_sbs_update_callback);
-#endif
-        remove_event(PLAYBACK_EVENT_TRACK_CHANGE, do_sbs_update_callback);
-        remove_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, do_sbs_update_callback);
-        remove_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw);
+        screens[screen].stop_scroll();
    }
    /* let list initialize viewport in case viewport dimensions is changed. */
    send_event(GUI_EVENT_THEME_CHANGED, NULL);
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@ -10554,16 +10554,18 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
    *: "SPIL = Ja"
-    cowond2*: "MENU = Ja"
+    cowond2*: "MENU eller top-højre = Ja"
    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
    samsungyh*,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)"
  </dest>
  <voice>
@ -12650,11 +12652,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Lydstyrkekompressor"
  </dest>
  <voice>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Lydstyrkekompressor"
  </voice>
 </phrase>
 <phrase>
@ -12685,3 +12687,582 @@
    *: "Øverst"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_QUEUE_LAST_SHUFFLED
+  desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
+  user: core
+  <source>
+    *: "Queue Last Shuffled"
+  </source>
+  <dest>
+    *: "Sæt i kø til sidst, blandet"
+  </dest>
+  <voice>
+    *: "Sæt i kø til sidst, blandet"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CUSTOM_STATUSBAR
+  desc: deprecated
+  user:
+  <source>
+    *: none
+  </source>
+  <dest>
+    *: none
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_SBS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "statusbar skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RELEASE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Release Time"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Slip efter"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Slip efter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_CUSTOM_STATUSBAR
+  desc: deprecated
+  user:
+  <source>
+    *: none
+  </source>
+  <dest>
+    *: none
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_THRESHOLD
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Threshold"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Grænse"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Grænse"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_GAIN
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Makeup Gain"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Efterforstærkning"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Efterforstærkning"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Basis skin"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Basis skin"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RSBS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "fjernbetjenings statusbar skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Ændringshastighed"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Ændringshastighed"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Auto"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Automatisk"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Automatisk"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INSERT_LAST_SHUFFLED
+  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
+  user: core
+  <source>
+    *: "Insert Last Shuffled"
+  </source>
+  <dest>
+    *: "Indsæt til sidst, blandet"
+  </dest>
+  <voice>
+    *: "Indsæt til sidst, blandet"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_SOFT_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Soft Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Langsom"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Langsom"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "Næste:"
+  </dest>
+  <voice>
+    *: "Næste:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Ratio"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Forhold"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Forhold"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_KEYPAD_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB Keypad Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB tastetilstand"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB tastetilstand"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_HARD_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Hard Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Hurtig"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Hurtig"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Fjernbetjenings basis skin"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Fjernbetjenings basis skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSER_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Browser Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Browsertilstand"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Browsertilstand"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_HID
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB HID"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB HID"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB Human Interface Device"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_OTHER
+  desc: Catch-all FM region. Select if none of the others work
+  user: core
+  <source>
+    *: none
+    radio: "Other"
+  </source>
+  <dest>
+    *: none
+    radio: "Andre"
+  </dest>
+  <voice>
+    *: none
+    radio: "Andre"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_ITALY
+  desc: fm region Italy
+  user: core
+  <source>
+    *: none
+    radio: "Italy"
+  </source>
+  <dest>
+    *: none
+    radio: "Italien"
+  </dest>
+  <voice>
+    *: none
+    radio: "Italien"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_10
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "10:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "10:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "10 til 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
+  user: core
+  <source>
+    *: none
+    morse_input: "Use Morse Code Input"
+  </source>
+  <dest>
+    *: none
+    morse_input: "Brug morse indtastning"
+  </dest>
+  <voice>
+    *: none
+    morse_input: "Brug morse indtastning"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_2
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "2:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "2:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "2 til 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOUSE_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Mouse Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Musetilstand"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Musetilstand"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_LIMIT
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Limit"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Grænse"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Grænse"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MULTIMEDIA_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Multimedia Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Multimedietilstand"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Multimedietilstand"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STATUSBAR_CUSTOM
+  desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then
+  user: core
+  <source>
+    *: "Custom"
+  </source>
+  <dest>
+    *: "Brugerdefineret"
+  </dest>
+  <voice>
+    *: "Brugerdefineret"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_OUTRO
+  desc: skipping to the 5 seconds before the end of a track
+  user: core
+  <source>
+    *: "Skip to Outro"
+  </source>
+  <dest>
+    *: "Spol til slutning"
+  </dest>
+  <voice>
+    *: "Spol til slutning"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTOTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
+    *: none
+    crossfade: "Automatic Track Change Only"
+  </source>
+  <dest>
+    *: none
+    crossfade: "Kun automatisk sangskift"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "Kun automatisk sangskift"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_6
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "6:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "6:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "6 til 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "Næste sang:"
+  </dest>
+  <voice>
+    *: "Næste sang:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_4
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "4:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "4:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "4 til 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PRESENTATION_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Presentation Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Præsentationstilstand"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Præsentationstilstand"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "af"
+  </dest>
+  <voice>
+    *: "af"
+  </voice>
+</phrase>
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@ -279,16 +279,18 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
    *: "PLAY = Ja"
-    cowond2*: "MENU = Ja"
+    cowond2*: "MENU oder rechts oben= Ja"
    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Ja"
+    mrobe500: "PLAY, POWER oder rechts oben = Ja"
    archosplayer: "(PLAY/STOP)"
  </dest>
  <voice>
@ -7123,10 +7125,10 @@
    *: "Insert Shuffled"
  </source>
  <dest>
-    *: "Zufällig einfügen"
+    *: "Gemischt einfügen"
  </dest>
  <voice>
-    *: "Zufällig einfügen"
+    *: "Gemischt einfügen"
  </voice>
 </phrase>
 <phrase>
@ -7179,10 +7181,10 @@
    *: "Queue Shuffled"
  </source>
  <dest>
-    *: "Zufällig in Warteschlange"
+    *: "Gemischt in Warteschlange"
  </dest>
  <voice>
-    *: "Zufällig in Warteschlange"
+    *: "Gemischt in Warteschlange"
  </voice>
 </phrase>
 <phrase>
@ -11564,11 +11566,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "Tastentöne Wiederholung"
+    swcodec: "Tastentonwiederholung"
  </dest>
  <voice>
    *: none
-    swcodec: "Tastentöne Wiederholung"
+    swcodec: "Tastentonwiederholung"
  </voice>
 </phrase>
 <phrase>
@ -11581,11 +11583,11 @@
  </source>
  <dest>
    *: none
-    accessory_supply: "Zubehör Spannungsversorgung"
+    accessory_supply: "Zubehör-Spannungsversorgung"
  </dest>
  <voice>
    *: none
-    accessory_supply: "Zubehör Spannungsversorgung"
+    accessory_supply: "Zubehör-Spannungsversorgung"
  </voice>
 </phrase>
 <phrase>
@ -12645,11 +12647,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Kompressor"
  </dest>
  <voice>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Kompressor"
  </voice>
 </phrase>
 <phrase>
@ -12680,3 +12682,582 @@
    *: "Oben"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_QUEUE_LAST_SHUFFLED
+  desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
+  user: core
+  <source>
+    *: "Queue Last Shuffled"
+  </source>
+  <dest>
+    *: "Gemischt ans Ende der Warteschlange"
+  </dest>
+  <voice>
+    *: "Gemischt ans Ende der Warteschlange"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CUSTOM_STATUSBAR
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+  </source>
+  <dest>
+    *:none
+  </dest>
+  <voice>
+    *:none
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_SBS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "SBS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RELEASE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Release Time"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Abklingzeit"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Abklingzeit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_CUSTOM_STATUSBAR
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+  </source>
+  <dest>
+    *:none
+  </dest>
+  <voice>
+    *:none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_THRESHOLD
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Threshold"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Schwellwert"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Schwellwert"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_GAIN
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Makeup Gain"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Endverstärkung"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Endverstärkung"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RSBS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "RSBS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Übergang"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Übergang"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Auto"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Automatik"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Automatik"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INSERT_LAST_SHUFFLED
+  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
+  user: core
+  <source>
+    *: "Insert Last Shuffled"
+  </source>
+  <dest>
+    *: "Gemischt am Ende einfügen"
+  </dest>
+  <voice>
+    *: "Gemischt am Ende einfügen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_SOFT_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Soft Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Weicher Übergang"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Weicher Übergang"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "Danach:"
+  </dest>
+  <voice>
+    *: "Danach:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Ratio"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Verhältnis"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Verhältnis"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_KEYPAD_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB Keypad Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB-Tastenmodus"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB-Tastenmodus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_HARD_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Hard Knee"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Harter Übergang"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Harter Übergang"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSER_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Browser Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Browser-Modus"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Browser-Modus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_HID
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB HID"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB HID"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB Human Interface Device"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_OTHER
+  desc: Catch-all FM region. Select if none of the others work
+  user: core
+  <source>
+    *: none
+    radio: "Other"
+  </source>
+  <dest>
+    *: none
+    radio: "Andere"
+  </dest>
+  <voice>
+    *: none
+    radio: "Andere"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_ITALY
+  desc: fm region Italy
+  user: core
+  <source>
+    *: none
+    radio: "Italy"
+  </source>
+  <dest>
+    *: none
+    radio: "Italien"
+  </dest>
+  <voice>
+    *: none
+    radio: "Italien"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_10
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "10:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "10:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "10 zu 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
+  user: core
+  <source>
+    *: none
+    morse_input: "Use Morse Code Input"
+  </source>
+  <dest>
+    *: none
+    morse_input: "Morseeingabe verwenden"
+  </dest>
+  <voice>
+    *: none
+    morse_input: "Morseeingabe verwenden"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_2
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "2:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "2:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "2 zu 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOUSE_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Mouse Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Mausmodus"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Mausmodus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_LIMIT
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Limit"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Grenze"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Grenze"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MULTIMEDIA_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Multimedia Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Multimediamodus"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Multimediamodus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STATUSBAR_CUSTOM
+  desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then
+  user: core
+  <source>
+    *: "Custom"
+  </source>
+  <dest>
+    *: "Eigene"
+  </dest>
+  <voice>
+    *: "Eigene"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_OUTRO
+  desc: skipping to the 5 seconds before the end of a track
+  user: core
+  <source>
+    *: "Skip to Outro"
+  </source>
+  <dest>
+    *: "Vor das Ende springen"
+  </dest>
+  <voice>
+    *: "Vor das Ende springen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTOTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
+    *: none
+    crossfade: "Automatic Track Change Only"
+  </source>
+  <dest>
+    *: none
+    crossfade: "Bei automatischem Titelwechsel"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "Bei automatischem Titelwechsel"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_6
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "6:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "6:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "6 zu 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "Nächster Titel:"
+  </dest>
+  <voice>
+    *: "Nächster Titel:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_4
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "4:1"
+  </source>
+  <dest>
+    *: none
+    swcodec: "4:1"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "4 zu 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PRESENTATION_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Presentation Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Präsentationsmodus"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Präsentationsmodus"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "von"
+  </dest>
+  <voice>
+    *: "von"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Basisskin (SBS)"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Basisskin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Fernbedienungs-SBS"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Fernbedienungs-SBS"
+  </voice>
+</phrase>
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@ -291,9 +291,10 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
@ -13191,7 +13192,7 @@
  </dest>
  <voice>
    *: none
-    crossfade: "Seulement quand changement de piste automatique
+    crossfade: "Seulement quand changement de piste automatique"
  </voice>
 </phrase>
 <phrase>
@ -13236,3 +13237,37 @@
    *: "sur"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Habillage"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Habillage"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Habillage télécommande"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Habillage télécommande"
+  </voice>
+</phrase>
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@ -12612,7 +12612,7 @@
  user: core
  <source>
    *: none
-    usb_hid: "Multimedia"
+    usb_hid: "Multimedia Mode"
  </source>
  <dest>
    *: none
@ -12629,7 +12629,7 @@
  user: core
  <source>
    *: none
-    usb_hid: "Presentation"
+    usb_hid: "Presentation Mode"
  </source>
  <dest>
    *: none
@ -12646,7 +12646,7 @@
  user: core
  <source>
    *: none
-    usb_hid: "Browser"
+    usb_hid: "Browser Mode"
  </source>
  <dest>
    *: none
@ -12663,7 +12663,7 @@
  user: core
  <source>
    *: none
-    usb_hid: "Mouse"
+    usb_hid: "Mouse Mode"
  </source>
  <dest>
    *: none
@ -13216,3 +13216,37 @@
    *: "מתוך"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </voice>
+</phrase>
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@ -266,17 +266,18 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
    *: "PLAY = はい"
-    cowond2*: "MENU = はい"
+    cowond2*: "MENU または top-right = はい"
    iriverh100,iriverh120,iriverh300: "NAVI = はい"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = はい"
-    mrobe500: "PLAY or POWER = はい"
+    mrobe500: "PLAY または POWER, top-right = はい"
    archosplayer: "(PLAY/STOP)"
  </dest>
  <voice>
@ -496,10 +497,10 @@
    *: "<Don't Resume>"
  </source>
  <dest>
-    *: "<レジュームしません>"
+    *: "<レジュームしない>"
  </dest>
  <voice>
-    *: "レジュームしません"
+    *: "レジュームしない"
  </voice>
 </phrase>
 <phrase>
@ -1682,11 +1683,11 @@
  </source>
  <dest>
    *: none
-    crossfade: "スキップしたときのみ"
+    crossfade: "スキップ時のみ"
  </dest>
  <voice>
    *: none
-    crossfade: "スキップしたときのみ"
+    crossfade: "スキップ時のみ"
  </voice>
 </phrase>
 <phrase>
@ -1699,11 +1700,11 @@
  </source>
  <dest>
    *: none
-    crossfade: "シャッフルとスキップしたとき"
+    crossfade: "シャッフル時とスキップ時"
  </dest>
  <voice>
    *: none
-    crossfade: "シャッフルとスキップしたとき"
+    crossfade: "シャッフル時とスキップ時"
  </voice>
 </phrase>
 <phrase>
@ -2843,11 +2844,11 @@
  </source>
  <dest>
    *: none
-    lcd_invert,remote_lcd_invert:"反転"
+    lcd_invert,remote_lcd_invert: "反転"
  </dest>
  <voice>
    *: none
-    lcd_invert,remote_lcd_invert:"反転"
+    lcd_invert,remote_lcd_invert: "反転"
  </voice>
 </phrase>
 <phrase>
@ -4677,7 +4678,7 @@
  </source>
  <dest>
    *: none
-    alarm: "%d:%02d に起きます"
+    alarm: "%d:%02d 後に起きます"
  </dest>
  <voice>
    *: none
@ -4794,10 +4795,10 @@
    *: "Yes - Recent only"
  </source>
  <dest>
-    *: "最近のリストのみ保存"
+    *: "最近のブックマークのみ保存"
  </dest>
  <voice>
-    *: "最近のリストのみ保存"
+    *: "最近のブックマークのみ保存"
  </voice>
 </phrase>
 <phrase>
@ -4808,10 +4809,10 @@
    *: "Ask - Recent only"
  </source>
  <dest>
-    *: "最近のリストのみ毎回尋ねる"
+    *: "最近のブックマークのみ, 毎回確認"
  </dest>
  <voice>
-    *: "最近のリストのみ毎回尋ねる"
+    *: "最近のブックマークのみ 毎回確認"
  </voice>
 </phrase>
 <phrase>
@ -5588,11 +5589,11 @@
  </source>
  <dest>
    *: none
-    radio: "プリセットが空なので自動スキャンしますか?"
+    radio: "プリセットが空です. 自動スキャンしますか?"
  </dest>
  <voice>
    *: none
-    radio: "プリセットが から なので自動スキャンしますか?"
+    radio: "プリセットが から です 自動スキャンしますか?"
  </voice>
 </phrase>
 <phrase>
@ -6713,10 +6714,10 @@
    *: "Track Display"
  </source>
  <dest>
-    *: "曲目を表示"
+    *: "曲目の表示"
  </dest>
  <voice>
-    *: "曲目を表示"
+    *: "曲目の表示"
  </voice>
 </phrase>
 <phrase>
@ -6825,7 +6826,7 @@
    *: "Warn When Erasing Dynamic Playlist"
  </source>
  <dest>
-    *: "ダイナミックリストを削除するときに警告を表示"
+    *: "ダイナミックリストの削除するときに警告を表示"
  </dest>
  <voice>
    *: "ダイナミックリストを削除するときに警告を表示"
@ -7042,10 +7043,10 @@
    *: "Clear Time?"
  </source>
  <dest>
-    *: "稼働時間をクリアしますか?"
+    *: "稼働時間を消去しますか?"
  </dest>
  <voice>
-    *: "稼働時間をクリアしますか?"
+    *: "稼働時間を消去しますか?"
  </voice>
 </phrase>
 <phrase>
@ -7339,7 +7340,7 @@
    *: "%s が存在しません"
  </dest>
  <voice>
-    *: "プレイリストディレクトリが存在しません。"
+    *: "プレイリストディレクトリが存在しません"
  </voice>
 </phrase>
 <phrase>
@ -7434,10 +7435,10 @@
    *: "Browse Cuesheet"
  </source>
  <dest>
-    *: "Cueシートの参照"
+    *: "Cueシートを表示"
  </dest>
  <voice>
-    *: "キューシートの参照"
+    *: "キューシートを表示"
  </voice>
 </phrase>
 <phrase>
@ -7448,10 +7449,10 @@
    *: "Show Track Info"
  </source>
  <dest>
-    *: "タグ情報の表示"
+    *: "タグ情報を表示"
  </dest>
  <voice>
-    *: "タグ情報の表示"
+    *: "タグ情報を表示"
  </voice>
 </phrase>
 <phrase>
@ -7798,10 +7799,10 @@
    *: "Delete Directory"
  </source>
  <dest>
-    *: "ディレクトリの削除"
+    *: "ディレクトリを削除"
  </dest>
  <voice>
-    *: "ディレクトリの削除"
+    *: "ディレクトリを削除"
  </voice>
 </phrase>
 <phrase>
@ -8339,10 +8340,10 @@
  </source>
  <dest>
    *: none
-    recording: "ディスクが一杯です．停止ボタンを押してください"
-    iriverh100,iriverh120,iriverh300: "ディスクが一杯です．停止ボタンを押してください"
-    iaudiom5,iaudiox5: "ディスクが一杯です．電源ボタンを押してください"
-    sansae200*,sansac200*: "ディスクが一杯です．PREVボタンを押してください"
+    recording: "ディスクが一杯です. OFFボタンを押してください"
+    iriverh100,iriverh120,iriverh300: "ディスクが一杯です. STOPボタンを押してください"
+    iaudiom5,iaudiox5: "ディスクが一杯です. POWERボタンを押してください"
+    sansae200*,sansac200*: "ディスクが一杯です. PREVボタンを押してください"
  </dest>
  <voice>
    *: none
@ -8602,10 +8603,10 @@
    *: "Invalid Filename!"
  </source>
  <dest>
-    *: "無効なファイル名!"
+    *: "無効なファイル名です"
  </dest>
  <voice>
-    *: "無効なファイル名"
+    *: "無効なファイル名です"
  </voice>
 </phrase>
 <phrase>
@ -11367,11 +11368,11 @@
  </source>
  <dest>
    *: none
-    lcd_color: "色"
+    lcd_color: "色設定"
  </dest>
  <voice>
    *: none
-    lcd_color: "色"
+    lcd_color: "色設定"
  </voice>
 </phrase>
 <phrase>
@ -12584,6 +12585,91 @@
    pitchscreen: "比率"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_KEYPAD_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB Keypad Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB キーパッドの動作モード"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB キーパッドの動作モード"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MULTIMEDIA_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Multimedia Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "マルチメディア モード"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "マルチメディア モード"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PRESENTATION_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Presentation Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "プレゼンテーション モード"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "プレゼンテーション モード"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSER_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Browser Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "ブラウザ モード"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "ブラウザ モード"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOUSE_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Mouse Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "マウス モード"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "マウス モード"
+  </voice>
+</phrase>
 <phrase>
  id: LANG_SKIN_RAM_USAGE
  desc: how much RAM the skins are using
@ -12722,7 +12808,7 @@
    *: ""
  </dest>
  <voice>
-    *: "ステータスバー スキン"
+    *: "スキン"
  </voice>
 </phrase>
 <phrase>
@ -12736,7 +12822,7 @@
    *: ""
  </dest>
  <voice>
-    *: "リモコンのステータスバー スキン"
+    *: "リモコンのスキン"
  </voice>
 </phrase>
 <phrase>
@ -12767,6 +12853,23 @@
    *: none
  </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_HID
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB HID"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB HID"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB H I D"
+  </voice>
+</phrase>
 <phrase>
  id: LANG_INSERT_LAST_SHUFFLED
  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
@ -12783,7 +12886,7 @@
 </phrase>
 <phrase>
  id: LANG_QUEUE_LAST_SHUFFLED
-  desc: in onplay menu.  queue a playlist randomly at and of dynamic playlist
+  desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
  user: core
  <source>
    *: "Queue Last Shuffled"
@ -12795,3 +12898,113 @@
    *: "リストの最後にシャッフルで予約"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
+  user: core
+  <source>
+    *: none
+    morse_input: "Use Morse Code Input"
+  </source>
+  <dest>
+    *: none
+    morse_input: "モールス信号で入力する"
+  </dest>
+  <voice>
+    *: none
+    morse_input: "モールス信号で入力する"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTOTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
+    *: none
+    crossfade: "Automatic Track Change Only"
+  </source>
+  <dest>
+    *: none
+    crossfade: "自動的な曲変更時のみ"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "自動的な曲変更時のみ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "次の曲:"
+  </dest>
+  <voice>
+    *: "次の曲:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "次:"
+  </dest>
+  <voice>
+    *: "次:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "/"
+  </dest>
+  <voice>
+    *: "オブ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "基本スキン"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "基本スキン"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "リモコンの基本スキン"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "リモコンの基本スキン"
+  </voice>
+</phrase>
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@ -10532,14 +10532,15 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
    *: "PLAY = Ja"
-    cowond2*: "MENU = Ja"
+    cowond2*: "MENU of bovenaan rechts = Ja"
    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip,sansafuze*: "SELECT = Ja"
    archosplayer: "(PLAY/STOP)"
@ -13208,3 +13209,37 @@
    *: "van"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Basis skin"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Basis skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Afstandsbediening basis skin"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Afstandsbediening basis skin"
+  </voice>
+</phrase>
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@ -12648,11 +12648,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Kompresor"
  </dest>
  <voice>
    *: none
-    swcodec: "Compressor"
+    swcodec: "Kompresor"
  </voice>
 </phrase>
 <phrase>
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@ -260,7 +260,7 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes"
    archosplayer: "(PLAY/STOP)"
@ -12215,11 +12215,11 @@
  </source>
  <dest>
    *: none
-    quickscreen: "Definir como Tela Rápida Esquerda"
+    quickscreen: "Definir como Tela Rápida À Esquerda"
  </dest>
  <voice>
    *: none
-    quickscreen: "Definir como Tela Rápida Esquerda"
+    quickscreen: "Definir como Tela Rápida À Esquerda"
  </voice>
 </phrase>
 <phrase>
@ -12232,11 +12232,11 @@
  </source>
  <dest>
    *: none
-    quickscreen: "Definir como Tela Rápida Direita"
+    quickscreen: "Definir como Tela Rápida À Direita"
  </dest>
  <voice>
    *: none
-    quickscreen: "Definir como Tela Rápida Direita"
+    quickscreen: "Definir como Tela Rápida À Direita"
  </voice>
 </phrase>
 <phrase>
@ -12249,11 +12249,11 @@
  </source>
  <dest>
    *: none
-    quickscreen: "Definir como Botão de Tela Rápida"
+    quickscreen: "Definir como Tela Rápida Para Baixo"
  </dest>
  <voice>
    *: none
-    quickscreen: "Definir como Botão de Tela Rápida"
+    quickscreen: "Definir como Tela Rápida Para Baixo"
  </voice>
 </phrase>
 <phrase>
@ -12735,11 +12735,11 @@
  </source>
  <dest>
    *: none
-    quickscreen: "Ajustar como Item Topo de Tela Rápida"
+    quickscreen: "Definir como Tela Rápida Para Cima"
  </dest>
  <voice>
    *: none
-    quickscreen: "Ajustar como Item Topo de Tela Rápida"
+    quickscreen: "Definir como Tela Rápida Para Cima"
  </voice>
 </phrase>
 <phrase>
@ -13126,3 +13126,113 @@
    *: "Embaralhar e Enfileirar como Último"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
+  user: core
+  <source>
+    *: none
+    morse_input: "Use Morse Code Input"
+  </source>
+  <dest>
+    *: none
+    morse_input: "Usar Código Morse Como Entrada"
+  </dest>
+  <voice>
+    *: none
+    morse_input: "Usar Código Morse Como Entrada"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTOTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
+    *: none
+    crossfade: "Automatic Track Change Only"
+  </source>
+  <dest>
+    *: none
+    crossfade: "Apenas Mudança Automática de Faixa"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "Apenas Mudança Automática de Faixa"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "Próxima Faixa:"
+  </dest>
+  <voice>
+    *: "Próxima Faixa:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "Próxima:"
+  </dest>
+  <voice>
+    *: "Próxima:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "de"
+  </dest>
+  <voice>
+    *: "de"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Skin Base"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Skin Base"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Skin Base Remota"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Skin Base Remota"
+  </voice>
+</phrase>
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@ -266,16 +266,18 @@
  user: core
  <source>
    *: "PLAY = Yes"
-    cowond2*: "MENU = Yes"
+    cowond2*: "MENU, or top-right = Yes"
    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes"
+    mrobe500: "PLAY, POWER, or top-right = Yes"
    archosplayer: "(PLAY/STOP)"
  </source>
  <dest>
    *: "SPELA = Ja"
-    cowond2*: "MENY = Ja"
+    cowond2*: "MENY, eller överst-höger = Ja"
    iriverh100,iriverh120,iriverh300: "NAVI = Ja"
    samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ja"
+    mrobe500: "SPELA, PÅ/AV, eller överst-höger = Ja"
    archosplayer: "SPELA/STOPP"
  </dest>
  <voice>
@ -12583,6 +12585,91 @@
    pitchscreen: "Hastighet"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_USB_KEYPAD_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "USB Keypad Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "USB-tangentläge"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "USB-tangentläge"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MULTIMEDIA_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Multimedia Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Multimedialäge"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Multimedialäge"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PRESENTATION_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Presentation Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Presentationsläge"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Presentationsläge"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSER_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Browser Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Webbläsarläge"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Webbläsarläge"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOUSE_MODE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    usb_hid: "Mouse Mode"
+  </source>
+  <dest>
+    *: none
+    usb_hid: "Musläge"
+  </dest>
+  <voice>
+    *: none
+    usb_hid: "Musläge"
+  </voice>
+</phrase>
 <phrase>
  id: LANG_SKIN_RAM_USAGE
  desc: how much RAM the skins are using
@ -13037,7 +13124,7 @@
 </phrase>
 <phrase>
  id: LANG_QUEUE_LAST_SHUFFLED
-  desc: in onplay menu.  queue a playlist randomly at and of dynamic playlist
+  desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
  user: core
  <source>
    *: "Queue Last Shuffled"
@ -13049,6 +13136,23 @@
    *: "Köa blandat sist"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
+  user: core
+  <source>
+    *: none
+    morse_input: "Use Morse Code Input"
+  </source>
+  <dest>
+    *: none
+    morse_input: "Använd morsekodsinmatning"
+  </dest>
+  <voice>
+    *: none
+    morse_input: "Använd inmatning med morsekod"
+  </voice>
+</phrase>
 <phrase>
  id: LANG_AUTOTRACKSKIP
  desc: in crossfade settings
@ -13066,3 +13170,79 @@
    crossfade: "Automatiskt byte"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
+  user: core
+  <source>
+    *: "Next Track:"
+  </source>
+  <dest>
+    *: "Nästa spår:"
+  </dest>
+  <voice>
+    *: "Nästa spår:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "Nästa:"
+  </dest>
+  <voice>
+    *: "Nästa:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "av"
+  </dest>
+  <voice>
+    *: "av"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Grundskal"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Grundskal"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *:none
+    lcd_bitmap: "Remote Base Skin"
+  </source>
+  <dest>
+    *:none
+    lcd_bitmap: "Fjärrgrundskal"
+  </dest>
+  <voice>
+    *:none
+    lcd_bitmap: "Fjärrgrundskal"
+  </voice>
+</phrase>
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@ -12439,23 +12439,6 @@
    remote: "Remote Statusbar"
  </voice>
 </phrase>
-<phrase>
-  id: LANG_COMPRESSOR
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    swcodec: "Compressor"
-  </source>
-  <dest>
-    *: none
-    swcodec: "Compressor"
-  </dest>
-  <voice>
-    *: none
-    swcodec: "Compressor"
-  </voice>
-</phrase>
 <phrase>
  id: LANG_PLAYBACK_RATE
  desc: "rate" in pitch screen
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@ -8228,15 +8228,15 @@
  user: core
  <source>
    *: none
-    usb_charging: "Charge During USB Connection"
+    usb_charging_enable: "Charge During USB Connection"
  </source>
  <dest>
    *: none
-    usb_charging: "ชาร์จระหว่างการต่อ USB"
+    usb_charging_enable: "ชาร์จระหว่างการต่อ USB"
  </dest>
  <voice>
    *: none
-    usb_charging: "Charge During U S B Connection"
+    usb_charging_enable: "Charge During U S B Connection"
  </voice>
 </phrase>
 <phrase>
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@ -12631,20 +12631,3 @@
    lcd_bitmap: "Eplaeçmint del bår d' acinseur"
  </voice>
 </phrase>
-<phrase>
-  id: LANG_COMPRESSOR
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    swcodec: "Compressor"
-  </source>
-  <dest>
-    *: none
-    swcodec: "Compressor"
-  </dest>
-  <voice>
-    *: none
-    swcodec: "Compressor"
-  </voice>
-</phrase>
--- a/apps/playback.c
+++ b/apps/playback.c
@ -1565,6 +1565,7 @@ static int audio_check_new_track(void)

    /* Move to the new track */
    track_ridx = (track_ridx + ci.new_track) & MAX_TRACK_MASK;
+    buf_set_base_handle(CUR_TI->audio_hid);


    if (automatic_skip)
@ -1723,6 +1724,7 @@ static void audio_play_start(size_t offset)

    sound_set_volume(global_settings.volume);
    track_widx = track_ridx = 0;
+    buf_set_base_handle(-1);

    /* Clear all track entries. */
    for (i = 0; i < MAX_TRACK; i++) {
--- a/apps/plugins/fractals/mandelbrot_set.c
+++ b/apps/plugins/fractals/mandelbrot_set.c
@ -31,14 +31,16 @@ static unsigned char imgbuffer[LCD_HEIGHT];
 static fb_data imgbuffer[LCD_HEIGHT];
 #endif

-#define NUM_COLORS ((unsigned)(1 << LCD_DEPTH))
-
+#ifdef USEGSLIB
+#define LCOLOR(iter) ((iter ^ 7) << 5)
+#else
 /*
 * Spread iter's colors over color range.
 * 345 (=15*26-45) is max_iter maximal value
 * This implementation ignores pixel format, thus it is not uniformly spread
 */
-#define LCOLOR(iter) ((iter * NUM_COLORS) / 345)
+#define LCOLOR(iter) ((iter << LCD_DEPTH) / 345)
+#endif

 #ifdef HAVE_LCD_COLOR
 #define COLOR(iter) (fb_data)LCOLOR(iter)
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@ -289,7 +289,7 @@ struct screen screens[NB_SCREENS] =
        .is_backlight_on=&is_remote_backlight_on,
        .backlight_set_timeout=&remote_backlight_set_timeout,

-#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
+#if LCD_DEPTH > 1
        .backdrop_load=&remote_backdrop_load,
        .backdrop_unload=&remote_backdrop_unload,
        .backdrop_show=&remote_backdrop_show,
--- a/docs/CREDITS
+++ b/docs/CREDITS
@ -522,6 +522,9 @@ Tse-Hsien Chiang
 Szymon Dziok
 Domenico Di Misa
 Delyan Kratunov
+Purling Yukie
+Marek Salaba
+Altay Oz

 The libmad team
 The wavpack team
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@ -185,7 +185,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1203
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@ -162,7 +162,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1204
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@ -177,7 +177,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@ -184,7 +184,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@ -172,7 +172,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x120a
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@ -196,7 +196,8 @@

 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1209
 #define HAVE_USB_HID_MOUSE
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@ -162,6 +162,11 @@
 /* Define this if you want to use the AS2525 i2c interface */
 #define CONFIG_I2C I2C_AS3525

+/* define current usage levels (based on battery bench) */
+#define CURRENT_NORMAL     65
+#define CURRENT_BACKLIGHT  30
+#define CURRENT_RECORD     CURRENT_NORMAL
+
 /* Define this to the CPU frequency */
 #define CPU_FREQ      250000000

--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@ -712,6 +712,7 @@ all other settings that can be modified using \fname{.cfg} files. This topic
 is discussed in more detail in \reference{ref:manage_settings}.
 The Rockbox distribution comes with some themes that should look nice on
 your \dap{}.
+
 \opt{lcd_bitmap}{
 \note{Some of the themes shipped with Rockbox need additional
 fonts from the fonts package, so make sure you installed them.
@ -720,10 +721,18 @@ have the needed fonts installed as otherwise the theme may not display
 properly.}
 }

-\opt{usb_charging}
-{
-    \section{Charging}
+\nopt{ondio}{
+  \opt{usb_power}{
+    \section{USB Charging}

+    The \dap{} can be charged over USB without connecting to your
+    computer by holding \ActionStdUsbCharge{} while plugging in. This
+    allows you to continue using the \dap{} normally.
+  }
+}
+
+\opt{ondio}{
+  \section{USB Power}
    The \dap{} can be powered over USB without connecting to your
    computer by holding \ActionStdUsbCharge{} while plugging in. This
    allows you to continue using the \dap{} normally.
--- a/tools/builds.pm
+++ b/tools/builds.pm
@ -1,6 +1,6 @@
-$publicrelease="3.4";
-$releasedate="September 24, 2009";
-$releasenotes="/wiki/ReleaseNotes34";
+$publicrelease="3.5";
+$releasedate="February 3, 2010";
+$releasenotes="/wiki/ReleaseNotes35";

 %builds = (
    'archosav300' => {
@ -246,12 +246,12 @@ $releasenotes="/wiki/ReleaseNotes34";
    },
    'sansae200v2' => {
        name => 'SanDisk Sansa e200 v2',
-        status => 2,
+        status => 3,
        icon => 'sansae200',
    },
    'sansafuze' => {
        name => 'SanDisk Sansa Fuze',
-        status => 2,
+        status => 3,
    },
    'sansam200' => {
        name => 'SanDisk Sansa m200',
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@ -1,6 +1,7 @@
 #!/usr/bin/perl
+$version="3.5.1";

-$version="3.0";
+require "tools/builds.pm";

 my $verbose;
 if($ARGV[0] eq "-v") {
--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@ -1,6 +1,8 @@
 #!/usr/bin/perl

-$version="3.0";
+$version="3.5.1";
+
+require "tools/builds.pm";

 my $verbose;
 if($ARGV[0] eq "-v") {
@ -57,7 +59,7 @@ sub buildit {

    `rm -rf * >/dev/null 2>&1`;

-    my $c = "../tools/configure --target=$target --type=m";
+    my $c = "echo|../tools/configure --target=$target --type=m";

    print "C: $c\n" if($verbose);
    `$c`;
@ -73,7 +75,7 @@ sub buildit {
 `(cd tools && make ) >/dev/null 2>&1`;

 for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
+    #next if ($builds{$b}{configname} < 3); # no variants

    runone($b);
 }
--- a/tools/release/tarball.sh
+++ b/tools/release/tarball.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-version="3.0"
+version="3.5.1"

 srcdir=.
 tempdir=rockbox-temp
--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@ -1,6 +1,7 @@
 #!/usr/bin/perl
+require "tools/builds.pm";

-$version="3.0";
+$version="3.5.1";

 my $verbose;
 if($ARGV[0] eq "-v") {
@ -54,7 +55,7 @@ sub buildit {

    `rm -rf * >/dev/null 2>&1`;

-    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f";
+    my $c = "echo|../tools/configure --type=av --target=$model --language=0 --tts=f";

    print "C: $c\n" if($verbose);
    `$c`;
@ -74,7 +75,7 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
 $ENV{'POOL'}="$pool";

 for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
+    #next if ($builds{$b}{configname} < 3); # no variants

    runone($b);
 }
--- a/tools/version.sh
+++ b/tools/version.sh
@ -109,5 +109,5 @@ else
    fi
 fi
 VERSION=$VER-`date -u +%y%m%d`
-echo $VERSION
-
+#echo $VERSION
+echo "3.5.1"
Author	SHA1	Message	Date
Thomas Martitz	2e99a0f561	Backport r24968 again. svn diff -r PREV was too greedy in the previous commit. Make the buffer low-level watermark (and the related anti-skip setting) work again. Update the buffering 'base handle' as new tracks start playing, since this is needed to determine how much playable data is left in the buffer. Should fix the buffering problem reported in the forums (http://forums.rockbox.org/index.php?topic=24014.0), and also makes the usefl line in the buffering thread debug screen useful again. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@25010 a1c6a512-1295-4272-9138-f99709370657	2010-03-03 22:47:05 +00:00
Thomas Martitz	dd95d6ecba	Revert previous commit. It appears to introduce a regression (FS#11041) which doesn't happen in trunk (anymore). git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@25009 a1c6a512-1295-4272-9138-f99709370657	2010-03-03 22:39:55 +00:00
Thomas Martitz	a55e5b61e1	Backport r24618 and r24755 for 3.5.1. r24618: Convert RINGBUF_* macros to inline functions, saving binsize and improving type safety. r24755: Fix FS#11004 - Buffering crashes when skipping back from end of song. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@25006 a1c6a512-1295-4272-9138-f99709370657	2010-03-03 21:40:17 +00:00
Frank Gevaerts	4d015624c5	Backport r24968 Make the buffer low-level watermark (and the related anti-skip setting) work again. Update the buffering 'base handle' as new tracks start playing, since this is needed to determine how much playable data is left in the buffer. Should fix the buffering problem reported in the forums (http://forums.rockbox.org/index.php?topic=24014.0), and also makes the usefl line in the buffering thread debug screen useful again. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24978 a1c6a512-1295-4272-9138-f99709370657	2010-02-28 17:19:08 +00:00
Frank Gevaerts	552bd156fd	bump version numbers in preparation for a possible 3.5.1 release git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24977 a1c6a512-1295-4272-9138-f99709370657	2010-02-28 17:17:32 +00:00
Michael Chicoine	ef57362b5f	Spanish translation update Author: Diego Herranz Flyspray: FS #10958 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24496 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 19:42:36 +00:00
Michael Chicoine	d456a43831	Add back previously translated strings that were removed in r24490 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24495 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 19:40:47 +00:00
Michael Chicoine	81eaaa2109	Português Brasileiro Lang Update Author: Adilson Xavier Flyspray: FS #10962 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24493 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 19:26:12 +00:00
Frank Gevaerts	5e412a87a0	Some fixes to make the release scripts actually work. These are not necessarily very clean, and the ipod video build is still problematic due to bins.pl not handling variants properly, but at least the scripts now do something git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24492 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 19:24:35 +00:00
Michael Chicoine	6f4c356418	Fix yellow by removing strings that were not completely translated so they can be translated properly. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24490 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 19:06:21 +00:00
Michael Chicoine	cd7ec100c0	Updated Portuguese Translation Author: Rui Araújo Flyspray: FS #10950 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24486 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 14:45:57 +00:00
Michael Chicoine	870b04522c	Finish & update Chinese translation Author: Purling Yukie Flyspray: FS #10961 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24484 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 13:43:19 +00:00
Michael Chicoine	5e683657ce	Last changes in Czech language Author: Marek Salaba Flyspray: FS #10960 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24482 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 13:29:37 +00:00
Michael Chicoine	6f6a4656c2	Correct issues with LANG_COMPRESSOR from r22832 - Author: Marianne Arnold git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24480 a1c6a512-1295-4272-9138-f99709370657	2010-02-03 13:16:19 +00:00
Marianne Arnold	8dbf7c35ab	Update French translation by Mustapha Senhaji git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24470 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 20:23:31 +00:00
Frank Gevaerts	a06c224a13	Fix missing quote (again?) git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24469 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 20:19:32 +00:00
Jonas Häggqvist	e59e065c51	Fix LANG_COMPRESSOR git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24463 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 19:38:17 +00:00
Frank Gevaerts	2662a0b476	Update Turkish translation Flyspray: FS#10944 Author: Altay Oz git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24461 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 19:28:13 +00:00
Frank Gevaerts	85caf9818f	(hopefully) fix encoding (FS#10956) git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24459 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 19:15:52 +00:00
Jonas Häggqvist	13cc98f6d3	Portuguese translation update. Author: Rui Araújo Flyspray: FS #10950 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24456 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 15:45:53 +00:00
Michael Chicoine	030208a7a8	fix yellow - correct feature designations git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24454 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 14:36:33 +00:00
Michael Chicoine	9cdaed24d3	Complete Czech language update Author: Marek Salaba Flyspray: FS #10951 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24451 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 13:07:23 +00:00
Jonathan Gordon	7d0478bcfe	ditto git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24449 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 02:20:49 +00:00
Jonathan Gordon	9af3f4cd33	fix bins.pl and promote fuze and e200v2 to stable git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24448 a1c6a512-1295-4272-9138-f99709370657	2010-02-02 02:07:27 +00:00
Marianne Arnold	0b30ce72e2	Update German translation including minor fixes - be more accurate about 'shuffle' (not 'random') and fix some occurences of wrong spaces. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24438 a1c6a512-1295-4272-9138-f99709370657	2010-02-01 08:23:40 +00:00
Rafaël Carré	94bd65b8d2	Modify version strings for 3.5 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24430 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 23:55:43 +00:00
Rafaël Carré	96d87ec719	Fuzev1: estimate current use with battery_bench results git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24429 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 23:48:29 +00:00
Alex Parker	713bcc7ad7	Add Purling Yukie to CREDITS for r24424. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24426 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 18:32:47 +00:00
Alex Parker	ad912d7367	FS#10946 - Updated Chinese (Simple) translation by Purling Yukie. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24423 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 17:42:47 +00:00
Magnus Holmgren	1e90f678bb	Update Swedish translation. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24422 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 17:10:57 +00:00
Alex Parker	53f240573e	Show USB power not charging in the ondio manual, and rename usb_charging to usb_power as it is dependent on HAVE_USB_POWER. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24416 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 14:05:21 +00:00
Jens Arnold	d0a4460fbe	Several filetypes were added (more or less) recently so the array became full on HWCODEC. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24413 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 13:41:48 +00:00
Frank Gevaerts	c7bccafacf	Fix usb_charging_enable feature which was broken by r24247 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24410 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 11:59:31 +00:00
Teruaki Kawashima	e2f38c45a9	Update Japanese translation git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24407 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 11:29:22 +00:00
Michael Chicoine	a15808da81	Update Dutch translation by: Peter D'Hoye git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24400 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 02:55:55 +00:00
Michael Chicoine	23a82fc9ed	Hebrew language update by: Tomer Shalev git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24399 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 02:54:15 +00:00
Jonas Häggqvist	44cb86921b	Sync Danish translation. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24395 a1c6a512-1295-4272-9138-f99709370657	2010-01-31 01:47:33 +00:00
Rafaël Carré	5cda26f9fb	backport r24377 and r24378 mandelbrot color fixes for greyscale targets git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24379 a1c6a512-1295-4272-9138-f99709370657	2010-01-30 08:39:02 +00:00
Jonathan Gordon	984c17bee9	fix red git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24359 a1c6a512-1295-4272-9138-f99709370657	2010-01-28 07:02:46 +00:00
Jonathan Gordon	713fc7e48e	fix crashing with remote lcd's git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24356 a1c6a512-1295-4272-9138-f99709370657	2010-01-28 06:51:16 +00:00
Thomas Martitz	3173ed933e	Backport r24351: Fix multiscreen handling of the viewportmanager. git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24353 a1c6a512-1295-4272-9138-f99709370657	2010-01-28 01:53:09 +00:00
Frank Gevaerts	86240ceee9	Use OF USB on the ipods. Using our own USB code exposes some problems, such as the current charging issues (for many people, charging basically doesn't work) Copied from r22815 and r21261 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24350 a1c6a512-1295-4272-9138-f99709370657	2010-01-27 19:41:09 +00:00
Rafaël Carré	b131bc5a04	Branch for rockbox 3.5 git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@24344 a1c6a512-1295-4272-9138-f99709370657	2010-01-27 07:41:51 +00:00