Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(Revision 19773)
+++ apps/lang/english.lang	(Arbeitskopie)
@@ -12359,3 +12359,17 @@
     *: "Credits"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_HUMAN
+  desc: browser sorting setting
+  user:
+  <source>
+    *: "Human alphabetical"
+  </source>
+  <dest>
+    *: "Human alphabetical"
+  </dest>
+  <voice>
+    *: "Human alphabetical"
+  </voice>
+</phrase>
Index: apps/settings.h
===================================================================
--- apps/settings.h	(Revision 19773)
+++ apps/settings.h	(Arbeitskopie)
@@ -145,8 +145,8 @@
        SHOW_WPS, SHOW_RWPS, SHOW_FMR, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS};
 
 /* file and dir sort options */
-enum { SORT_ALPHA, SORT_DATE, SORT_DATE_REVERSED, SORT_TYPE, /* available as settings */
-       SORT_ALPHA_REVERSED, SORT_TYPE_REVERSED };            /* internal use only */
+enum { SORT_HUMAN, SORT_ALPHA, SORT_DATE, SORT_DATE_REVERSED, SORT_TYPE, /* available as settings */
+       SORT_HUMAN_REVERSED, SORT_ALPHA_REVERSED, SORT_TYPE_REVERSED };            /* internal use only */
 
 /* recursive dir insert options */
 enum { RECURSE_OFF, RECURSE_ON, RECURSE_ASK };
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c	(Revision 19773)
+++ apps/settings_list.c	(Arbeitskopie)
@@ -784,7 +784,6 @@
                    "all,supported,music,playlists", NULL, 4, ID2P(LANG_ALL),
                    ID2P(LANG_FILTER_SUPPORTED), ID2P(LANG_FILTER_MUSIC),
                    ID2P(LANG_PLAYLISTS)),
-    OFFON_SETTING(0, sort_case, LANG_SORT_CASE, false, "sort case", NULL),
     CHOICE_SETTING(0, show_filename_ext, LANG_SHOW_FILENAME_EXT, 3,
                    "show filename exts", "off,on,unknown,view_all", NULL , 4 ,
                    ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_UNKNOWN_TYPES),
@@ -895,12 +894,15 @@
                   "Announce Battery Level", NULL),
 
     /* file sorting */
-    CHOICE_SETTING(0, sort_file, LANG_SORT_FILE, 0 ,
-                   "sort files", "alpha,oldest,newest,type", NULL, 4,
+    OFFON_SETTING(0, sort_case, LANG_SORT_CASE, false, "sort case", NULL),
+    CHOICE_SETTING(0, sort_file, LANG_SORT_FILE, SORT_HUMAN ,
+                   "sort files", "human,alpha,oldest,newest,type", NULL, 4,
+                   ID2P(LANG_SORT_HUMAN),
                    ID2P(LANG_SORT_ALPHA), ID2P(LANG_SORT_DATE),
                    ID2P(LANG_SORT_DATE_REVERSE) , ID2P(LANG_SORT_TYPE)),
-    CHOICE_SETTING(0, sort_dir, LANG_SORT_DIR, 0 ,
-                   "sort dirs", "alpha,oldest,newest", NULL, 3,
+    CHOICE_SETTING(0, sort_dir, LANG_SORT_DIR, SORT_HUMAN ,
+                   "sort dirs", "human,alpha,oldest,newest", NULL, 3,
+                   ID2P(LANG_SORT_HUMAN),
                    ID2P(LANG_SORT_ALPHA), ID2P(LANG_SORT_DATE),
                    ID2P(LANG_SORT_DATE_REVERSE)),
 
Index: apps/filetree.c
===================================================================
--- apps/filetree.c	(Revision 19773)
+++ apps/filetree.c	(Arbeitskopie)
@@ -28,6 +28,7 @@
 #include <font.h>
 #include <limits.h>
 #include "bookmark.h"
+#include <strnatcmp.h>
 #include "tree.h"
 #include "settings.h"
 #include "filetypes.h"
@@ -181,7 +182,27 @@
     }
     closedir(dir);
 }
-
+static int alphabetic_sort(struct entry* e1, struct entry* e2, int criteria)
+{
+    if (criteria == SORT_ALPHA || criteria == SORT_ALPHA_REVERSED)
+    {
+        if (global_settings.sort_case)
+            return strncmp(e1->name, e2->name, MAX_PATH)
+                   * (criteria == SORT_ALPHA_REVERSED ? -1 : 1);
+        else
+            return strncasecmp(e1->name, e2->name, MAX_PATH)
+                   * (criteria == SORT_ALPHA_REVERSED ? -1 : 1);
+    }
+    else /* else if SORT_HUMAN, and as fall back for other criterias */
+    {
+        if (global_settings.sort_case)
+            return strnatcmp(e1->name, e2->name)
+                   * (criteria == SORT_HUMAN_REVERSED ? -1 : 1);
+        else
+            return strnatcasecmp(e1->name, e2->name)
+                   * (criteria == SORT_HUMAN_REVERSED ? -1 : 1);
+    }
+}
 /* support function for qsort() */
 static int compare(const void* p1, const void* p2)
 {
@@ -197,7 +218,9 @@
         if (e1->attr & ATTR_VOLUME || e2->attr & ATTR_VOLUME)
         {   /* a volume identifier is involved */
             if (e1->attr & ATTR_VOLUME && e2->attr & ATTR_VOLUME)
-                criteria = SORT_ALPHA; /* two volumes: sort alphabetically */
+            {
+                return alphabetic_sort(e1, e2, criteria);
+            }
             else /* only one is a volume: volume first */
                 return (e2->attr & ATTR_VOLUME) - (e1->attr & ATTR_VOLUME);
         }
@@ -226,29 +249,23 @@
 
             if (t1 != t2) /* if different */
                 return (t1 - t2) * (criteria == SORT_TYPE_REVERSED ? -1 : 1);
-            /* else fall through to alphabetical sorting */
+            /* else fall back to alphabetical sort */
+            return alphabetic_sort(e1, e2, SORT_HUMAN);
         }
 
         case SORT_DATE:
         case SORT_DATE_REVERSED:
-            /* Ignore SORT_TYPE */
-            if (criteria == SORT_DATE || criteria == SORT_DATE_REVERSED)
-            {
-                if (e1->time_write != e2->time_write)
-                    return (e1->time_write - e2->time_write)
-                           * (criteria == SORT_DATE_REVERSED ? -1 : 1);
-                /* else fall through to alphabetical sorting */
-            }
+            if (e1->time_write != e2->time_write)
+                return (e1->time_write - e2->time_write)
+                       * (criteria == SORT_DATE_REVERSED ? -1 : 1);
+            /* else fall back to alphabetical sort */
+            return alphabetic_sort(e1, e2, SORT_HUMAN);
 
+        case SORT_HUMAN:
+        case SORT_HUMAN_REVERSED:
         case SORT_ALPHA:
         case SORT_ALPHA_REVERSED:
-            if (global_settings.sort_case)
-                return strncmp(e1->name, e2->name, MAX_PATH)
-                       * (criteria == SORT_ALPHA_REVERSED ? -1 : 1);
-            else
-                return strncasecmp(e1->name, e2->name, MAX_PATH)
-                       * (criteria == SORT_ALPHA_REVERSED ? -1 : 1);
-
+            return alphabetic_sort(e1, e2, criteria);
     }
     return 0; /* never reached */
 }
Index: firmware/SOURCES
===================================================================
--- firmware/SOURCES	(Revision 19773)
+++ firmware/SOURCES	(Arbeitskopie)
@@ -48,6 +48,7 @@
 common/strcat.c
 common/strchr.c
 common/strcmp.c
+common/strnatcmp.c
 common/strcpy.c
 common/strncmp.c
 common/strncpy.c