[Feature] Options 'Sort by' (#399), 1.2.9.19

Business/Menus.cs

@@ -437,7 +437,10 @@ namespace SystemTrayMenu.Business
                         directories = directories.Concat(directoriesToAddToMainMenu).ToArray();
                     }
 
-                    Array.Sort(directories, new WindowsExplorerSort());
+                    if (Properties.Settings.Default.SortByTypeAndNameWindowsExplorerSort)
+                    {
+                        Array.Sort(directories, new WindowsExplorerSort());
+                    }
                 }
                 catch (UnauthorizedAccessException ex)
                 {
@@ -473,11 +476,17 @@ namespace SystemTrayMenu.Business
                     rowData.MenuLevel = level;
                     menuData.RowDatas.Add(rowData);
                 }
+
+                if (Properties.Settings.Default.SortByTypeAndDate)
+                {
+                    menuData.RowDatas = menuData.RowDatas.OrderBy(x => x.FileInfo.LastWriteTime).Reverse().ToList();
+                }
             }
 
             if (!worker.CancellationPending)
             {
                 string[] files = Array.Empty<string>();
+                List<RowData> rowDatasFiles = new List<RowData>();
 
                 try
                 {
@@ -491,7 +500,10 @@ namespace SystemTrayMenu.Business
                         files = files.Concat(filesToAddToMainMenu).ToArray();
                     }
 
-                    Array.Sort(files, new WindowsExplorerSort());
+                    if (Properties.Settings.Default.SortByTypeAndNameWindowsExplorerSort)
+                    {
+                        Array.Sort(files, new WindowsExplorerSort());
+                    }
                 }
                 catch (UnauthorizedAccessException ex)
                 {
@@ -533,8 +545,15 @@ namespace SystemTrayMenu.Business
                         rowData.HiddenEntry = hiddenEntry;
                     }
 
-                    menuData.RowDatas.Add(rowData);
+                    rowDatasFiles.Add(rowData);
                 }
+
+                if (Properties.Settings.Default.SortByTypeAndDate)
+                {
+                    rowDatasFiles = rowDatasFiles.OrderBy(x => x.FileInfo.LastWriteTime).Reverse().ToList();
+                }
+
+                menuData.RowDatas = menuData.RowDatas.Concat(rowDatasFiles).ToList();
             }
 
             if (!worker.CancellationPending)
@@ -547,6 +566,15 @@ namespace SystemTrayMenu.Business
                     }
                     else
                     {
+                        if (Properties.Settings.Default.SortByName)
+                        {
+                            menuData.RowDatas = menuData.RowDatas.OrderBy(x => x.Text).ToList();
+                        }
+                        else if (Properties.Settings.Default.SortByDate)
+                        {
+                            menuData.RowDatas = menuData.RowDatas.OrderBy(x => x.FileInfo.LastWriteTime).Reverse().ToList();
+                        }
+
                         menuData.Validity = MenuDataValidity.Valid;
                     }
                 }
@@ -795,26 +823,27 @@ namespace SystemTrayMenu.Business
 
             try
             {
-                rowData.FileInfo = new FileInfo(fileName);
-                rowData.TargetFilePath = rowData.FileInfo.FullName;
+                FileInfo fileInfo = new FileInfo(fileName);
+                rowData.TargetFilePath = fileInfo.FullName;
                 if (!isResolvedLnk)
                 {
-                    if (string.IsNullOrEmpty(rowData.FileInfo.Name))
+                    rowData.FileInfo = fileInfo;
+                    if (string.IsNullOrEmpty(fileInfo.Name))
                     {
-                        string path = rowData.FileInfo.FullName;
+                        string path = fileInfo.FullName;
                         int directoryNameBegin = path.LastIndexOf(@"\", StringComparison.InvariantCulture) + 1;
                         rowData.SetText(path[directoryNameBegin..]);
                     }
                     else if (!rowData.ContainsMenu && Config.IsHideFileExtension())
                     {
-                        rowData.SetText(Path.GetFileNameWithoutExtension(rowData.FileInfo.Name));
+                        rowData.SetText(Path.GetFileNameWithoutExtension(fileInfo.Name));
                     }
                     else
                     {
-                        rowData.SetText(rowData.FileInfo.Name);
+                        rowData.SetText(fileInfo.Name);
                     }
 
-                    rowData.TargetFilePathOrig = rowData.FileInfo.FullName;
+                    rowData.TargetFilePathOrig = fileInfo.FullName;
                 }
             }
             catch (Exception ex)

DataClasses/RowData.cs

@@ -17,13 +17,14 @@ namespace SystemTrayMenu.DataClasses
         private static readonly Icon White50PercentageIcon = Properties.Resources.White50Percentage;
         private static readonly Icon NotFoundIcon = Properties.Resources.NotFound;
         private static DateTime contextMenuClosed;
-        private string text;
         private Icon icon;
 
         internal RowData()
         {
         }
 
+        internal string Text { get; set; }
+
         internal FileInfo FileInfo { get; set; }
 
         internal Menu SubMenu { get; set; }
@@ -60,7 +61,7 @@ namespace SystemTrayMenu.DataClasses
 
         internal void SetText(string text)
         {
-            this.text = text;
+            this.Text = text;
         }
 
         internal void SetData(RowData data, DataTable dataTable)
@@ -77,7 +78,7 @@ namespace SystemTrayMenu.DataClasses
                 row[0] = data.icon;
             }
 
-            row[1] = data.text;
+            row[1] = data.Text;
             row[2] = data;
         }
 
@@ -113,7 +114,7 @@ namespace SystemTrayMenu.DataClasses
                 }
                 else if (fileExtension.Equals(".url", StringComparison.InvariantCultureIgnoreCase))
                 {
-                    SetText($"{FileInfo.Name[0..^4]}");
+                    SetText($"{Text[0..^4]}");
                     showOverlay = Properties.Settings.Default.ShowLinkOverlay;
                 }
                 else if (fileExtension.Equals(".appref-ms", StringComparison.InvariantCultureIgnoreCase))

Helpers/WindowsExplorerSort.cs

@@ -11,21 +11,7 @@ namespace SystemTrayMenu.Helper
     {
         public int Compare(string x, string y)
         {
-            if (Properties.Settings.Default.SortFolderAndFilesByDate)
-            {
-                if (new FileInfo(x).LastWriteTime > new FileInfo(y).LastWriteTime)
-                {
-                    return -1;
-                }
-                else
-                {
-                    return 1;
-                }
-            }
-            else
-            {
-                return DllImports.NativeMethods.ShlwapiStrCmpLogicalW(x, y);
-            }
+            return DllImports.NativeMethods.ShlwapiStrCmpLogicalW(x, y);
         }
     }
 }

Properties/AssemblyInfo.cs

@@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.9.18")]
-[assembly: AssemblyFileVersion("1.2.9.18")]
+[assembly: AssemblyVersion("1.2.9.19")]
+[assembly: AssemblyFileVersion("1.2.9.19")]

Properties/Settings.Designer.cs

@@ -495,16 +495,64 @@ namespace SystemTrayMenu.Properties
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("false")]
-        public bool SortFolderAndFilesByDate
+        [global::System.Configuration.DefaultSettingValueAttribute("true")]
+        public bool SortByTypeAndNameWindowsExplorerSort
         {
             get
             {
-                return ((bool)(this["SortFolderAndFilesByDate"]));
+                return ((bool)(this["SortByTypeAndNameWindowsExplorerSort"]));
             }
             set
             {
-                this["SortFolderAndFilesByDate"] = value;
+                this["SortByTypeAndNameWindowsExplorerSort"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("false")]
+        public bool SortByTypeAndDate
+        {
+            get
+            {
+                return ((bool)(this["SortByTypeAndDate"]));
+            }
+            set
+            {
+                this["SortByTypeAndDate"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("false")]
+        public bool SortByName
+        {
+            get
+            {
+                return ((bool)(this["SortByName"]));
+            }
+            set
+            {
+                this["SortByName"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Configuration.SettingsProviderAttribute(typeof(CustomSettingsProvider))]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("false")]
+        public bool SortByDate
+        {
+            get
+            {
+                return ((bool)(this["SortByDate"]));
+            }
+            set
+            {
+                this["SortByDate"] = value;
             }
         }
 

Resources/Languages/lang.af.resx

@@ -217,7 +217,7 @@
     <value>Millisekondes totdat 'n spyskaart oopmaak wanneer die muis daarop is</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
-    <value>Millisekondes totdat die spyskaart toemaak as in hierdie geval die muis dan die spyskaart verlaat</value>
+    <value>Millisekondes totdat die spyskaart sluit as in hierdie geval die muis dan die spyskaart verlaat</value>
   </data>
   <data name="Pixels maximum menu width" xml:space="preserve">
     <value>Pixel maksimum spyskaart breedte</value>
@@ -238,7 +238,7 @@
     <value>Geopende gids</value>
   </data>
   <data name="Border of opened directory" xml:space="preserve">
-    <value>Rand van oop gids</value>
+    <value>Rand van oopgemaakte gids</value>
   </data>
   <data name="Search field" xml:space="preserve">
     <value>Soek veld</value>
@@ -274,7 +274,7 @@
     <value>Pyltjie terwyl die muis daaroor beweeg</value>
   </data>
   <data name="Background of arrow when clicking" xml:space="preserve">
-    <value>Agtergrond van pyl wanneer u klik</value>
+    <value>Agtergrond van pyl wanneer jy klik</value>
   </data>
   <data name="Background of arrow while mouse hovers over it" xml:space="preserve">
     <value>Agtergrond van pyl terwyl die muis daaroor beweeg</value>
@@ -421,7 +421,7 @@
     <value>Kas</value>
   </data>
   <data name="Always show hidden files, directories or drives" xml:space="preserve">
-    <value>Wys altyd versteekte lêers, gidse of dryf</value>
+    <value>Wys altyd versteekte lêers, gidse of aandrywers</value>
   </data>
   <data name="Hidden files and directories" xml:space="preserve">
     <value>Versteekte lêers en gidse</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Stuur sneltoets na ander instansie</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sorteer volgens datum</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Gesorteer volgens datum</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorteer volgens naam</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Gesorteer volgens naam</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sorteer</value>
@@ -499,7 +499,7 @@
     <value>Wys soekbalk</value>
   </data>
   <data name="Saving log file in application directory instead of AppData" xml:space="preserve">
-    <value>Stoor tans loglêer in toepassingsgids in plaas van AppData</value>
+    <value>Stoor loglêer in toepassingsgids in plaas van AppData</value>
   </data>
   <data name="Show link overlay" xml:space="preserve">
     <value>Wys skakeloorleg</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Gids van internetkortpad-ikone</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Gesorteer volgens tipe en datum</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Gesorteer volgens tipe en naam</value>
+  </data>
 </root>

Resources/Languages/lang.ar.resx

@@ -238,7 +238,7 @@
     <value>الدليل المفتوح</value>
   </data>
   <data name="Border of opened directory" xml:space="preserve">
-    <value>حدود الدليل المفتوح</value>
+    <value>حد الدليل المفتوح</value>
   </data>
   <data name="Search field" xml:space="preserve">
     <value>مجال البحث</value>
@@ -328,7 +328,7 @@
     <value>مشكلة في ارتباط الاختصار</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
-    <value>تم تغيير العنصر الذي يشير إليه هذا الاختصار أو نقله ، لذلك لن يعمل هذا الاختصار بشكل صحيح بعد الآن.</value>
+    <value>تم تغيير العنصر الذي يشير إليه هذا الاختصار أو نقله ، لذا لن يعمل هذا الاختصار بشكل صحيح بعد الآن.</value>
   </data>
   <data name="Open directory" xml:space="preserve">
     <value>الدليل المفتوح</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>إرسال مفتاح التشغيل السريع إلى حالة أخرى</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>رتب حسب التاريخ</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>مرتبة حسب التاريخ</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>الترتيب حسب الاسم</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>مرتبة حسب الاسم</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>فرز</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>دليل أيقونات اختصارات الإنترنت</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>مرتبة حسب النوع والتاريخ</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>مرتبة حسب النوع والاسم</value>
+  </data>
 </root>

Resources/Languages/lang.az.resx

@@ -145,7 +145,7 @@
     <value>Kataloq əlçatmaz</value>
   </data>
   <data name="Language" xml:space="preserve">
-    <value>dil</value>
+    <value>Dil</value>
   </data>
   <data name="Log File" xml:space="preserve">
     <value>Günlük Faylı</value>
@@ -217,7 +217,7 @@
     <value>Siçan üzərində olduqda menyu açılana qədər millisaniyə</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
-    <value>Əgər bu halda siçan menyunu tərk edərsə, menyu bağlanana qədər millisaniyələr</value>
+    <value>Bu halda siçan menyunu tərk edərsə, menyu bağlanana qədər millisaniyələr</value>
   </data>
   <data name="Pixels maximum menu width" xml:space="preserve">
     <value>Piksel maksimum menyu eni</value>
@@ -325,7 +325,7 @@
     <value>yüklənir</value>
   </data>
   <data name="Problem with shortcut link" xml:space="preserve">
-    <value>Qısayol keçidi ilə bağlı problem</value>
+    <value>Qısayol keçidində problem</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
     <value>Bu qısayolun istinad etdiyi element dəyişdirilib və ya köçürülüb, ona görə də bu qısayol artıq düzgün işləməyəcək.</value>
@@ -427,7 +427,7 @@
     <value>Gizli fayllar və qovluqlar</value>
   </data>
   <data name="Never show hidden files, directories or drives" xml:space="preserve">
-    <value>Heç vaxt gizli faylları, qovluqları və ya sürücüləri göstərməyin</value>
+    <value>Heç vaxt gizli faylları, qovluqları və ya diskləri göstərməyin</value>
   </data>
   <data name="Size and location" xml:space="preserve">
     <value>Ölçü və yer</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>İsti düyməni digər nümunəyə göndərin</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Tarixə görə çeşidləyin</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Tarixə görə çeşidlənib</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ada görə çeşidləyin</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ada görə sıralanıb</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Çeşidləmə</value>
@@ -505,6 +505,12 @@
     <value>Link örtüyünü göstərin</value>
   </data>
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
-    <value>İnternet Qısayol İkonlarının Kataloqu</value>
+    <value>İnternet Qısayol Nişanlarının Kataloqu</value>
+  </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Növ və tarixə görə çeşidlənir</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Növ və ada görə çeşidlənir</value>
   </data>
 </root>

Resources/Languages/lang.be.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Адправіць гарачую клавішу ў іншы асобнік</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Сартаваць па даце</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Адсартавана па даце</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Сартаваць па назве</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Адсартавана па назве</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сартаванне</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Каталог значкоў інтэрнэт-цэтлікаў</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Адсартавана па тыпу і даце</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Сартаванне па тыпу і назве</value>
+  </data>
 </root>

Resources/Languages/lang.bg.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Изпратете бърз клавиш към друг екземпляр</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Сортиране по дата</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Сортирано по дата</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Сортиране по име</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Сортирано по име</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сортиране</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Директория с икони за бърз достъп до интернет</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Сортирани по вид и дата</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Сортирани по вид и име</value>
+  </data>
 </root>

Resources/Languages/lang.bn.resx

@@ -465,17 +465,17 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>অন্য উদাহরণে হটকি পাঠান</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>তারিখ অনুযায়ী সাজাও</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>তারিখ অনুসারে সাজানো</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>নাম অনুযায়ী সাজাও</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>নাম অনুসারে সাজানো</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>শ্রেণীবিভাজন</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>ড্র্যাগ ড্রপের মাধ্যমে সারি আইটেম অনুলিপি করুন</value>
+    <value>ড্র্যাগ ড্রপের মাধ্যমে সারি আইটেম কপি করুন</value>
   </data>
   <data name="Drag" xml:space="preserve">
     <value>টেনে আনুন</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ইন্টারনেট শর্টকাট আইকনের ডিরেক্টরি</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>প্রকার এবং তারিখ অনুসারে সাজানো</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>প্রকার এবং নাম অনুসারে সাজানো</value>
+  </data>
 </root>

Resources/Languages/lang.ca.resx

@@ -175,7 +175,7 @@
     <value>Preguntes freqüents</value>
   </data>
   <data name="Read the FAQ and then choose a root directory for the SystemTrayMenu." xml:space="preserve">
-    <value>Llegiu les PMF i, a continuació, trieu un directori arrel per al SystemTrayMenu.</value>
+    <value>Llegiu les PMF i trieu un directori arrel per al SystemTrayMenu.</value>
   </data>
   <data name="Select directory" xml:space="preserve">
     <value>Seleccioneu el directori</value>
@@ -346,7 +346,7 @@
     <value>Expert</value>
   </data>
   <data name="If the focus is lost and the Enter key was pressed" xml:space="preserve">
-    <value>Si es perd el focus i es prem la tecla Enter</value>
+    <value>Si es perd el focus i es premeu la tecla Enter</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the menu is not reactivated" xml:space="preserve">
     <value>Mil·lisegons fins que es tanqui el menú si en aquest cas el menú no es reactiva</value>
@@ -382,7 +382,7 @@
     <value>Esborra la memòria cau si hi ha més d'aquest nombre d'elements</value>
   </data>
   <data name="Add sample directory 'Start Menu'" xml:space="preserve">
-    <value>Afegeix el directori de mostra "Menú Inici"</value>
+    <value>Afegeix el directori d'exemple "Menú Inici"</value>
   </data>
   <data name="Row height in percent" xml:space="preserve">
     <value>Alçada de fila en percentatge</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Envia la tecla d'accés ràpid a una altra instància</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordena per data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordenat per data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordena per nom</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordenat per nom</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Classificació</value>
@@ -481,7 +481,7 @@
     <value>Arrossegueu</value>
   </data>
   <data name="Scroll via swipe" xml:space="preserve">
-    <value>Desplaceu-vos amb el dit</value>
+    <value>Desplaceu-vos amb lliscar</value>
   </data>
   <data name="Filter menu by file type e.g.: *.exe|*.dll" xml:space="preserve">
     <value>Filtra el menú per tipus de fitxer, p. ex.: *.exe|*.dll</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directori d'icones de dreceres d'Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordenat per tipus i data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordenat per tipus i nom</value>
+  </data>
 </root>

Resources/Languages/lang.cs.resx

@@ -181,7 +181,7 @@
     <value>Vyberte adresář</value>
   </data>
   <data name="Your root directory for the app does not exist or is empty! Change the root directory or put some files, directories or shortcuts into the root directory." xml:space="preserve">
-    <value>Váš kořenový adresář pro aplikaci neexistuje nebo je prázdný! Změňte kořenový adresář nebo do něj vložte některé soubory, adresáře nebo zástupce.</value>
+    <value>Váš kořenový adresář pro aplikaci neexistuje nebo je prázdný! Změňte kořenový adresář nebo vložte některé soubory, adresáře nebo zástupce do kořenového adresáře.</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
     <value>Nemáte přístup do kořenového adresáře aplikace. Udělte přístup k adresáři nebo změňte kořenový adresář.</value>
@@ -283,7 +283,7 @@
     <value>Barevné provedení tmavé</value>
   </data>
   <data name="Color scheme bright" xml:space="preserve">
-    <value>Barevné schéma světlé</value>
+    <value>Barevné provedení světlé</value>
   </data>
   <data name="App menu" xml:space="preserve">
     <value>Nabídka aplikací</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Odeslat klávesovou zkratku do jiné instance</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Seřadit podle data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Seřazeno podle data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Seřaď dle jména</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Seřazeno podle názvu</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Řazení</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Adresář ikon zástupců Internetu</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Seřazeno podle typu a data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Seřazeno podle typu a názvu</value>
+  </data>
 </root>

Resources/Languages/lang.cy.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Anfon hotkey i achos arall</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Trefnu yn ôl dyddiad</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Trefnwyd yn ôl dyddiad</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Trefnu yn ôl enw</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Trefnwyd yn ôl enw</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Didoli</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Cyfeiriadur o Eiconau Llwybr Byr Rhyngrwyd</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Trefnwyd yn ôl math a dyddiad</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Trefnwyd yn ôl math ac enw</value>
+  </data>
 </root>

Resources/Languages/lang.da.resx

@@ -184,7 +184,7 @@
     <value>Din rodmappe til appen eksisterer ikke eller er tom! Skift rodmappen eller indsæt nogle filer, mapper eller genveje i rodmappen.</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
-    <value>Du har ingen adgang til rodmappen på appen. Giv adgang til biblioteket eller skift rodmappen.</value>
+    <value>Du har ingen adgang til rodmappen til appen. Giv adgang til biblioteket eller skift rodmappen.</value>
   </data>
   <data name="Single click to open an element instead of double click" xml:space="preserve">
     <value>Enkeltklik for at åbne et element i stedet for at dobbeltklikke</value>
@@ -346,7 +346,7 @@
     <value>Ekspert</value>
   </data>
   <data name="If the focus is lost and the Enter key was pressed" xml:space="preserve">
-    <value>Hvis fokus mistes, og Enter-tasten blev trykket</value>
+    <value>Hvis fokus mistes, og der blev trykket på Enter-tasten</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the menu is not reactivated" xml:space="preserve">
     <value>Millisekunder, indtil menuen lukker, hvis menuen i dette tilfælde ikke genaktiveres</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Send genvejstasten til en anden instans</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sorter efter dato</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sorteret efter dato</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorter efter navn</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sorteret efter navn</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortering</value>
@@ -484,7 +484,7 @@
     <value>Rul via swipe</value>
   </data>
   <data name="Filter menu by file type e.g.: *.exe|*.dll" xml:space="preserve">
-    <value>Filtrer menu efter filtype, f.eks.: *.exe|*.dll</value>
+    <value>Filtrer menuen efter filtype, f.eks.: *.exe|*.dll</value>
   </data>
   <data name="Show count of elements below" xml:space="preserve">
     <value>Vis antallet af elementer nedenfor</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Katalog over internetgenvejsikoner</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sorteret efter type og dato</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sorteret efter type og navn</value>
+  </data>
 </root>

Resources/Languages/lang.de.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Hotkey an andere Instanz senden</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Nach Datum sortieren</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sortiert nach Datum</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Nach Name sortieren</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sortiert nach Namen</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortierung</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Verzeichnis der Internet-Verknüpfungssymbole</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sortiert nach Typ und Datum</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sortiert nach Typ und Name</value>
+  </data>
 </root>

Resources/Languages/lang.el.resx

@@ -283,7 +283,7 @@
     <value>Σχέδιο χρωμάτων σκούρο</value>
   </data>
   <data name="Color scheme bright" xml:space="preserve">
-    <value>Χρωματικός συνδυασμός φωτεινός</value>
+    <value>Χρωματικός συνδυασμός φωτεινό</value>
   </data>
   <data name="App menu" xml:space="preserve">
     <value>Μενού εφαρμογών</value>
@@ -349,7 +349,7 @@
     <value>Εάν χαθεί η εστίαση και πατηθεί το πλήκτρο Enter</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the menu is not reactivated" xml:space="preserve">
-    <value>χιλιοστά του δευτερολέπτου έως ότου κλείσει το μενού, εάν σε αυτήν την περίπτωση το μενού δεν ενεργοποιηθεί ξανά</value>
+    <value>Χιλιοστά του δευτερολέπτου έως ότου κλείσει το μενού εάν σε αυτήν την περίπτωση το μενού δεν ενεργοποιηθεί ξανά</value>
   </data>
   <data name="Show in Taskbar" xml:space="preserve">
     <value>Εμφάνιση στη γραμμή εργασιών</value>
@@ -465,10 +465,10 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Στείλτε το πλήκτρο πρόσβασης σε άλλη παρουσία</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>Ταξινόμηση κατά ημερομηνία</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
+  <data name="Sorted by name" xml:space="preserve">
     <value>Ταξινόμηση κατά όνομα</value>
   </data>
   <data name="Sorting" xml:space="preserve">
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Κατάλογος εικονιδίων συντομεύσεων Διαδικτύου</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ταξινόμηση κατά τύπο και ημερομηνία</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ταξινόμηση κατά τύπο και όνομα</value>
+  </data>
 </root>

Resources/Languages/lang.eo.resx

@@ -256,7 +256,7 @@
     <value>Konservu agordon en aplikaĵa dosierujo</value>
   </data>
   <data name="Configuration file and log file" xml:space="preserve">
-    <value>Agorda dosiero kaj protokolo-dosiero</value>
+    <value>Agorda dosiero kaj protokolo dosiero</value>
   </data>
   <data name="Open application directory" xml:space="preserve">
     <value>Malfermu aplikan dosierujon</value>
@@ -463,13 +463,13 @@
     <value>Forvelkanta</value>
   </data>
   <data name="Send hotkey to other instance" xml:space="preserve">
-    <value>Sendu klavoklavon al alia kazo</value>
+    <value>Sendu klavoklavon al alia petskribo</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordigi laŭ dato</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordigita laŭ dato</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordigi laŭ nomo</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordigita laŭ nomo</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Ordigo</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Dosierujo de Interretaj Ŝparvojaj Ikonoj</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordigita laŭ tipo kaj dato</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordigita laŭ tipo kaj nomo</value>
+  </data>
 </root>

Resources/Languages/lang.es.resx

@@ -163,7 +163,7 @@
     <value>General</value>
   </data>
   <data name="Hotkey" xml:space="preserve">
-    <value>tecla de acceso directo</value>
+    <value>tecla de acceso rápido</value>
   </data>
   <data name="Start with Windows" xml:space="preserve">
     <value>Empieza con las ventanas</value>
@@ -184,7 +184,7 @@
     <value>¡Su directorio raíz para la aplicación no existe o está vacío! Cambie el directorio raíz o coloque algunos archivos, directorios o accesos directos en el directorio raíz.</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
-    <value>No tiene acceso al directorio raíz de la aplicación. Otorgue acceso al directorio o cambie el directorio raíz.</value>
+    <value>No tienes acceso al directorio raíz de la aplicación. Otorgue acceso al directorio o cambie el directorio raíz.</value>
   </data>
   <data name="Single click to open an element instead of double click" xml:space="preserve">
     <value>Un solo clic para abrir un elemento en lugar de doble clic</value>
@@ -463,13 +463,13 @@
     <value>Desvanecimiento</value>
   </data>
   <data name="Send hotkey to other instance" xml:space="preserve">
-    <value>Enviar tecla de acceso directo a otra instancia</value>
+    <value>Enviar tecla de acceso rápido a otra instancia</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordenar por fecha</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordenado por fecha</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordenar por nombre</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordenado por nombre</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Clasificación</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directorio de iconos de acceso directo a Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordenado por tipo y fecha</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordenado por tipo y nombre</value>
+  </data>
 </root>

Resources/Languages/lang.et.resx

@@ -139,7 +139,7 @@
     <value>Üksikasjad</value>
   </data>
   <data name="System Info" xml:space="preserve">
-    <value>Süsteemiteave</value>
+    <value>Süsteemi teave</value>
   </data>
   <data name="Directory inaccessible" xml:space="preserve">
     <value>Kataloog pole juurdepääsetav</value>
@@ -361,7 +361,7 @@
     <value>Lisage juurkataloogi kataloogi sisu</value>
   </data>
   <data name="Directory paths" xml:space="preserve">
-    <value>Kataloogiteed</value>
+    <value>Kataloogi teed</value>
   </data>
   <data name="Directories" xml:space="preserve">
     <value>Kataloogid</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Saada kiirklahv teisele eksemplarile</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sorteeri kuupäeva järgi</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sorteeritud kuupäeva järgi</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorteeri nime järgi</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sorteeritud nime järgi</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sorteerimine</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Interneti otseteede ikoonide kataloog</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sorteeritud tüübi ja kuupäeva järgi</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sorteeritud tüübi ja nime järgi</value>
+  </data>
 </root>

Resources/Languages/lang.eu.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Bidali laster-tekla beste instantzia batera</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordenatu dataren arabera</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Dataren arabera ordenatuta</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordenatu izenaren arabera</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Izenaren arabera ordenatuta</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sailkatzea</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Interneteko lasterbideen ikonoen direktorioa</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Motaren eta dataren arabera sailkatuta</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Motaren eta izenaren arabera ordenatuta</value>
+  </data>
 </root>

Resources/Languages/lang.fa.resx

@@ -337,7 +337,7 @@
     <value>Task Manager</value>
   </data>
   <data name="Deactivated" xml:space="preserve">
-    <value>غیر فعال شد</value>
+    <value>غیرفعال شد</value>
   </data>
   <data name="Activated" xml:space="preserve">
     <value>فعال شد</value>
@@ -436,7 +436,7 @@
     <value>از تنظیمات سیستم عامل استفاده کنید</value>
   </data>
   <data name="Show only as search result" xml:space="preserve">
-    <value>فقط به عنوان نتیجه جستجو نمایش داده شود</value>
+    <value>نمایش فقط به عنوان نتیجه جستجو</value>
   </data>
   <data name="Single click to open a directory instead of double click" xml:space="preserve">
     <value>یک کلیک برای باز کردن یک دایرکتوری به جای دوبار کلیک کردن</value>
@@ -445,7 +445,7 @@
     <value>کنار قبلی</value>
   </data>
   <data name="Offset by pixels" xml:space="preserve">
-    <value>انحراف با پیکسل</value>
+    <value>افست با پیکسل</value>
   </data>
   <data name="Overlapping" xml:space="preserve">
     <value>با هم تداخل دارند</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>کلید میانبر را به نمونه دیگر ارسال کنید</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>به ترتیب تاریخ مرتب کن</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>مرتب شده بر اساس تاریخ</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>مرتب سازی بر اساس نام</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>مرتب شده بر اساس نام</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>مرتب سازی</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>دایرکتوری آیکون های میانبر اینترنت</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>بر اساس نوع و تاریخ مرتب شده است</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>بر اساس نوع و نام مرتب شده است</value>
+  </data>
 </root>

Resources/Languages/lang.fi.resx

@@ -268,7 +268,7 @@
     <value>Nuoli</value>
   </data>
   <data name="Arrow when clicking" xml:space="preserve">
-    <value>Nuoli napsautettaessa</value>
+    <value>Nuoli napsauttaessa</value>
   </data>
   <data name="Arrow while mouse hovers over it" xml:space="preserve">
     <value>Nuoli, kun hiiri liikkuu sen päällä</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Lähetä pikanäppäin toiseen esiintymään</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Lajittele päivämäärän mukaan</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Lajiteltu päivämäärän mukaan</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Lajittele nimen mukaan</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Lajiteltu nimen mukaan</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Lajittelu</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Internet-pikakuvakkeiden hakemisto</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Lajiteltu tyypin ja päivämäärän mukaan</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Lajiteltu tyypin ja nimen mukaan</value>
+  </data>
 </root>

Resources/Languages/lang.fr.resx

@@ -181,7 +181,7 @@
     <value>Sélectionnez le répertoire</value>
   </data>
   <data name="Your root directory for the app does not exist or is empty! Change the root directory or put some files, directories or shortcuts into the root directory." xml:space="preserve">
-    <value>Votre répertoire racine pour l'application n'existe pas ou est vide ! Modifiez le répertoire racine ou placez des fichiers, répertoires ou raccourcis dans le répertoire racine.</value>
+    <value>Votre répertoire racine pour l'application n'existe pas ou est vide ! Modifiez le répertoire racine ou placez des fichiers, des répertoires ou des raccourcis dans le répertoire racine.</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
     <value>Vous n'avez pas accès au répertoire racine de l'application. Accordez l'accès au répertoire ou modifiez le répertoire racine.</value>
@@ -217,7 +217,7 @@
     <value>Millisecondes jusqu'à ce qu'un menu s'ouvre lorsque la souris est dessus</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
-    <value>Millisecondes jusqu'à la fermeture du menu si dans ce cas la souris quitte alors le menu</value>
+    <value>Millisecondes jusqu'à la fermeture du menu si dans ce cas la souris quitte ensuite le menu</value>
   </data>
   <data name="Pixels maximum menu width" xml:space="preserve">
     <value>Largeur maximale du menu en pixels</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Envoyer le raccourci vers une autre instance</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Trier par date</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Trié par date</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Trier par nom</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Trié par nom</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Tri</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Répertoire des icônes de raccourcis Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Trié par type et date</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Trié par type et nom</value>
+  </data>
 </root>

Resources/Languages/lang.ga.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Seol hotkey chuig cás eile</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sórtáil de réir dáta</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sórtáilte de réir dáta</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sórtáil de réir ainm</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sórtáilte de réir ainm</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sórtáil</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Eolaire de Dheilbhíní Aicearra Idirlín</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sórtáilte de réir cineáil agus dáta</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sórtáilte de réir cineáil agus ainm</value>
+  </data>
 </root>

Resources/Languages/lang.gl.resx

@@ -316,7 +316,7 @@
     <value>Iconas</value>
   </data>
   <data name="Set by context menu " xml:space="preserve">
-    <value>Establecido por menú contextual</value>
+    <value>Establecer mediante menú contextual</value>
   </data>
   <data name="Set as directory" xml:space="preserve">
     <value>Establecer como directorio</value>
@@ -388,10 +388,10 @@
     <value>Altura da fila en porcentaxe</value>
   </data>
   <data name="Round corners" xml:space="preserve">
-    <value>Esquinas redondeadas</value>
+    <value>Cantos redondeados</value>
   </data>
   <data name="Appearance" xml:space="preserve">
-    <value>Aparencia</value>
+    <value>Aparición</value>
   </data>
   <data name="Bottom left" xml:space="preserve">
     <value>Abaixo á esquerda</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Enviar tecla de acceso rápido a outra instancia</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordenar por data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordenado por data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordenar por nome</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordenado polo nome</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Ordenación</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directorio de iconas de atallos de Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordenado por tipo e data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordenado por tipo e nome</value>
+  </data>
 </root>

Resources/Languages/lang.gu.resx

@@ -154,7 +154,7 @@
     <value>ફરી થી શરૂ કરવું</value>
   </data>
   <data name="Could not register the hot key." xml:space="preserve">
-    <value>હોટ કીની નોંધણી કરી શકાઈ નથી.</value>
+    <value>હોટ કી રજીસ્ટર કરી શકાઈ નથી.</value>
   </data>
   <data name="Abort" xml:space="preserve">
     <value>ગર્ભપાત</value>
@@ -286,7 +286,7 @@
     <value>રંગ યોજના તેજસ્વી</value>
   </data>
   <data name="App menu" xml:space="preserve">
-    <value>એપ્લિકેશન મેનૂ</value>
+    <value>એપ્લિકેશન મેનુ</value>
   </data>
   <data name="Scrollbar" xml:space="preserve">
     <value>સ્ક્રોલબાર</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>અન્ય ઉદાહરણ પર હોટકી મોકલો</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>તારીખ દ્વારા સૉર્ટ કરો</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>તારીખ દ્વારા ક્રમાંકિત</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>નામ પ્રમાણે સૉર્ટ કરો</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>નામ પ્રમાણે ક્રમાંકિત</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>વર્ગીકરણ</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ઈન્ટરનેટ શોર્ટકટ ચિહ્નોની ડિરેક્ટરી</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>પ્રકાર અને તારીખ દ્વારા ક્રમાંકિત</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>પ્રકાર અને નામ દ્વારા ક્રમાંકિત</value>
+  </data>
 </root>

Resources/Languages/lang.hi.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About SystemTrayMenu" xml:space="preserve">
-    <value>SystemTrayMenu के बारे में</value>
+    <value>सिस्टमट्रेमेनू के बारे में</value>
   </data>
   <data name="OK" xml:space="preserve">
     <value>ठीक है</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>अन्य उदाहरण के लिए हॉटकी भेजें</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>दिनांक के हिसाब से अलग करे</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>तिथि के अनुसार क्रमित</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>नाम द्वारा क्रमबद्ध करें</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>नाम के अनुसार क्रमबद्ध</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>छंटाई</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>इंटरनेट शॉर्टकट आइकन की निर्देशिका</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>प्रकार और तिथि के अनुसार क्रमबद्ध</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>प्रकार और नाम द्वारा क्रमबद्ध</value>
+  </data>
 </root>

Resources/Languages/lang.hr.resx

@@ -403,7 +403,7 @@
     <value>Pojavljuje se glavni izbornik</value>
   </data>
   <data name="Mouse location (Above Taskbar icon)" xml:space="preserve">
-    <value>Lokacija miša (iznad ikone trake zadataka)</value>
+    <value>Lokacija miša (iznad ikone na traci zadataka)</value>
   </data>
   <data name="Custom (drag it to the appropriate place)" xml:space="preserve">
     <value>Prilagođeno (povucite na odgovarajuće mjesto)</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Pošalji prečac na drugu instancu</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Poredaj po datumu</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Poredano po datumu</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Poredaj po imenu</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Poredano po imenu</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortiranje</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Imenik ikona internetskih prečaca</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Poredano po vrsti i datumu</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Poredano po vrsti i nazivu</value>
+  </data>
 </root>

Resources/Languages/lang.ht.resx

@@ -310,7 +310,7 @@
     <value>Gwosè</value>
   </data>
   <data name="Border of menu" xml:space="preserve">
-    <value>Fwontyè nan meni an</value>
+    <value>Fwontyè meni an</value>
   </data>
   <data name="Icons" xml:space="preserve">
     <value>Ikon</value>
@@ -349,7 +349,7 @@
     <value>Si konsantre a pèdi epi yo te peze kle antre a</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the menu is not reactivated" xml:space="preserve">
-    <value>Milisecond jiskaske meni an fèmen si nan ka sa a meni an pa reaktive</value>
+    <value>Milisgond jiskaske meni an fèmen si nan ka sa a meni an pa reaktive</value>
   </data>
   <data name="Show in Taskbar" xml:space="preserve">
     <value>Montre nan Taskbar</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Voye hotkey nan lòt egzanp</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Triye pa dat</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ranje pa dat</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Triye pa non</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ranje pa non</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Klasman</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Anyè ikon chemen kout sou entènèt</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ranje pa kalite ak dat</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ranje pa kalite ak non</value>
+  </data>
 </root>

Resources/Languages/lang.hu.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Gyorsbillentyű küldése másik példánynak</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Rendezés dátum szerint</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Dátum szerint rendezve</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Név szerinti rendezés</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Név szerint rendezve</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Válogató</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Internet parancsikonok könyvtára</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Típus és dátum szerint rendezve</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Típus és név szerint rendezve</value>
+  </data>
 </root>

Resources/Languages/lang.hy.resx

@@ -181,7 +181,7 @@
     <value>Ընտրեք գրացուցակը</value>
   </data>
   <data name="Your root directory for the app does not exist or is empty! Change the root directory or put some files, directories or shortcuts into the root directory." xml:space="preserve">
-    <value>Հավելվածի ձեր արմատային գրացուցակը գոյություն չունի կամ դատարկ է: Փոխեք արմատային գրացուցակը կամ որոշ ֆայլեր, գրացուցակներ կամ դյուրանցումներ դրեք արմատային գրացուցակում:</value>
+    <value>Հավելվածի ձեր արմատային գրացուցակը գոյություն չունի կամ դատարկ է: Փոխեք արմատային գրացուցակը կամ որոշ ֆայլեր, գրացուցակներ կամ դյուրանցումներ տեղադրեք արմատային գրացուցակում:</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
     <value>Դուք մուտք չունեք հավելվածի արմատային գրացուցակ: Տրամադրել մուտք դեպի գրացուցակ կամ փոխել արմատային գրացուցակը:</value>
@@ -226,7 +226,7 @@
     <value>Բաց է մնում</value>
   </data>
   <data name="Time until a menu opens" xml:space="preserve">
-    <value>Ժամանակ է, մինչև մենյու բացվի</value>
+    <value>Ժամանակ, մինչև մենյու բացվի</value>
   </data>
   <data name="If an element was clicked" xml:space="preserve">
     <value>Եթե ​​որևէ տարր սեղմված է եղել</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Ուղարկեք թեժ ստեղնը այլ օրինակ</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Դասավորել ըստ ամսաթվի</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Դասավորված է ըստ ամսաթվի</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Դասավորել ըստ անվանման</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Տեսակավորված ըստ անվանման</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Տեսակավորում</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Ինտերնետային դյուրանցումների պատկերակների տեղեկատու</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Տեսակավորված ըստ տեսակի և ամսաթվի</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Տեսակավորված ըստ տեսակի և անվան</value>
+  </data>
 </root>

Resources/Languages/lang.id.resx

@@ -241,7 +241,7 @@
     <value>Batas direktori yang dibuka</value>
   </data>
   <data name="Search field" xml:space="preserve">
-    <value>Bidang pencarian</value>
+    <value>bidang pencarian</value>
   </data>
   <data name="Selected element" xml:space="preserve">
     <value>Elemen yang dipilih</value>
@@ -465,10 +465,10 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Kirim hotkey ke instance lain</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Urutkan berdasarkan tanggal</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Diurutkan berdasarkan tanggal</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
+  <data name="Sorted by name" xml:space="preserve">
     <value>Diurutkan berdasarkan nama</value>
   </data>
   <data name="Sorting" xml:space="preserve">
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Direktori Ikon Pintasan Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Diurutkan berdasarkan jenis dan tanggal</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Diurutkan berdasarkan jenis dan nama</value>
+  </data>
 </root>

Resources/Languages/lang.is.resx

@@ -127,7 +127,7 @@
     <value>Sjálfvirk ræsing</value>
   </data>
   <data name="Exit app" xml:space="preserve">
-    <value>Hætta app</value>
+    <value>Lokaðu appinu</value>
   </data>
   <data name="Directory" xml:space="preserve">
     <value>Skrá</value>
@@ -439,7 +439,7 @@
     <value>Sýna aðeins sem leitarniðurstöðu</value>
   </data>
   <data name="Single click to open a directory instead of double click" xml:space="preserve">
-    <value>Einfaldur smellur til að opna möppu í stað þess að tvísmella</value>
+    <value>Einn smellur til að opna möppu í stað þess að tvísmella</value>
   </data>
   <data name="Next to the previous one" xml:space="preserve">
     <value>Við hliðina á fyrri</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Sendu flýtilykla í annað tilvik</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Raða eftir dagsetningu</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Raðað eftir dagsetningu</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Raða eftir nafni</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Raðað eftir nafni</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Flokkun</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Skrá yfir Internet flýtivísa tákn</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Raðað eftir tegund og dagsetningu</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Raðað eftir tegund og nafni</value>
+  </data>
 </root>

Resources/Languages/lang.it.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Invia tasto di scelta rapida ad un'altra istanza</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ordinare per data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordinati per data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Ordina per nome</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordinati per nome</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Ordinamento</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directory di icone di collegamento a Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordinati per tipo e data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordinati per tipo e nome</value>
+  </data>
 </root>

Resources/Languages/lang.iw.resx

@@ -238,7 +238,7 @@
     <value>ספרייה נפתחה</value>
   </data>
   <data name="Border of opened directory" xml:space="preserve">
-    <value>גבול של ספרייה שנפתחה</value>
+    <value>גבול הספרייה שנפתחה</value>
   </data>
   <data name="Search field" xml:space="preserve">
     <value>שדה חיפוש</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>שלח מקש קיצור למופע אחר</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>מיין לפי תאריך</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>ממוין לפי תאריך</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>מיין לפי שם</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>ממוין לפי שם</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>מִיוּן</value>
@@ -490,7 +490,7 @@
     <value>הצג את ספירת האלמנטים למטה</value>
   </data>
   <data name="Show directory title at top" xml:space="preserve">
-    <value>הצג את כותרת הספרייה למעלה</value>
+    <value>הצג את כותרת הספרייה בראש</value>
   </data>
   <data name="Show function keys below" xml:space="preserve">
     <value>הצג מקשי פונקציות למטה</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ספריית סמלי קיצורי אינטרנט</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>ממוין לפי סוג ותאריך</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>ממוין לפי סוג ושם</value>
+  </data>
 </root>

Resources/Languages/lang.ja.resx

@@ -175,7 +175,7 @@
     <value>よくある質問</value>
   </data>
   <data name="Read the FAQ and then choose a root directory for the SystemTrayMenu." xml:space="preserve">
-    <value>FAQを読んでから、SystemTrayMenuのルートディレクトリを選択してください。</value>
+    <value>FAQを読み、SystemTrayMenuのルートディレクトリを選択します。</value>
   </data>
   <data name="Select directory" xml:space="preserve">
     <value>ディレクトリを選択</value>
@@ -331,7 +331,7 @@
     <value>このショートカットが参照するアイテムが変更または移動されたため、このショートカットは正しく機能しなくなります。</value>
   </data>
   <data name="Open directory" xml:space="preserve">
-    <value>ディレクトリを開く</value>
+    <value>Directoryを開く</value>
   </data>
   <data name="Task Manager" xml:space="preserve">
     <value>タスクマネージャー</value>
@@ -406,7 +406,7 @@
     <value>マウスの位置（タスクバーアイコンの上）</value>
   </data>
   <data name="Custom (drag it to the appropriate place)" xml:space="preserve">
-    <value>カスタム（適切な場所にドラッグ）</value>
+    <value>カスタム（適切な場所にドラッグします）</value>
   </data>
   <data name="element" xml:space="preserve">
     <value>エレメント</value>
@@ -465,17 +465,17 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ホットキーを他のインスタンスに送信する</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>日付けで並び替え</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>日付でソート</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>名前順</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>名前で並べ替え</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>並べ替え</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>ドラッグドロップで行アイテムをコピーする</value>
+    <value>ドラッグアンドドロップで行アイテムをコピーする</value>
   </data>
   <data name="Drag" xml:space="preserve">
     <value>引っ張る</value>
@@ -493,7 +493,7 @@
     <value>ディレクトリタイトルを上部に表示</value>
   </data>
   <data name="Show function keys below" xml:space="preserve">
-    <value>以下にファンクションキーを表示します</value>
+    <value>以下にファンクションキーを表示</value>
   </data>
   <data name="Show search bar" xml:space="preserve">
     <value>検索バーを表示する</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>インターネットショートカットアイコンのディレクトリ</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>タイプと日付で並べ替え</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>タイプと名前で並べ替え</value>
+  </data>
 </root>

Resources/Languages/lang.ka.resx

@@ -214,7 +214,7 @@
     <value>თუ ფოკუსი დაკარგულია და თუ მაუსი კვლავ მენიუშია</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
-    <value>მილიწამებში მენიუს გახსნამდე, როცა მასზე მაუსია</value>
+    <value>მილიწამებში მენიუს გახსნამდე, როდესაც მასზე მაუსია</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
     <value>მილიწამები მენიუს დახურვამდე, თუ ამ შემთხვევაში მაუსი ტოვებს მენიუს</value>
@@ -316,7 +316,7 @@
     <value>ხატები</value>
   </data>
   <data name="Set by context menu " xml:space="preserve">
-    <value>დაყენებულია კონტექსტური მენიუს მიხედვით</value>
+    <value>კონტექსტური მენიუს დაყენება</value>
   </data>
   <data name="Set as directory" xml:space="preserve">
     <value>დააყენეთ დირექტორიად</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ცხელი კლავიშის გაგზავნა სხვა ინსტანციაზე</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>დალაგება თარიღის მიხედვით</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>დალაგებულია თარიღის მიხედვით</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>დალაგება სახელის მიხედვით</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>დალაგებულია სახელის მიხედვით</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>დახარისხება</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ინტერნეტ მალსახმობების ხატულების დირექტორია</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>დალაგებულია ტიპისა და თარიღის მიხედვით</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>დალაგებულია ტიპისა და სახელის მიხედვით</value>
+  </data>
 </root>

Resources/Languages/lang.km.resx

@@ -465,10 +465,10 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ផ្ញើ hotkey ទៅឧទាហរណ៍ផ្សេងទៀត។</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>តម្រៀបតាមកាលបរិច្ឆេទ</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
+  <data name="Sorted by name" xml:space="preserve">
     <value>តម្រៀបតាមឈ្មោះ</value>
   </data>
   <data name="Sorting" xml:space="preserve">
@@ -502,9 +502,15 @@
     <value>ការរក្សាទុកឯកសារកំណត់ហេតុនៅក្នុងថតកម្មវិធីជំនួសឱ្យ AppData</value>
   </data>
   <data name="Show link overlay" xml:space="preserve">
-    <value>បង្ហាញការត្រួតលើតំណ</value>
+    <value>បង្ហាញតំណជាន់លើ</value>
   </data>
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>បញ្ជីឈ្មោះរូបតំណាងផ្លូវកាត់អ៊ីនធឺណិត</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>តម្រៀបតាមប្រភេទ និងកាលបរិច្ឆេទ</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>តម្រៀបតាមប្រភេទនិងឈ្មោះ</value>
+  </data>
 </root>

Resources/Languages/lang.kn.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ಹಾಟ್‌ಕೀಯನ್ನು ಇತರ ನಿದರ್ಶನಕ್ಕೆ ಕಳುಹಿಸಿ</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>ದಿನಾಂಕದ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>ದಿನಾಂಕದ ಪ್ರಕಾರ ವಿಂಗಡಿಸಲಾಗಿದೆ</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>ಹೆಸರಿನಿಂದ ವಿಂಗಡಿಸಿ</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>ಹೆಸರಿನಿಂದ ವಿಂಗಡಿಸಲಾಗಿದೆ</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>ವಿಂಗಡಿಸಲಾಗುತ್ತಿದೆ</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ಇಂಟರ್ನೆಟ್ ಶಾರ್ಟ್‌ಕಟ್ ಐಕಾನ್‌ಗಳ ಡೈರೆಕ್ಟರಿ</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>ಪ್ರಕಾರ ಮತ್ತು ದಿನಾಂಕದ ಪ್ರಕಾರ ವಿಂಗಡಿಸಲಾಗಿದೆ</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>ಪ್ರಕಾರ ಮತ್ತು ಹೆಸರಿನ ಮೂಲಕ ವಿಂಗಡಿಸಲಾಗಿದೆ</value>
+  </data>
 </root>

Resources/Languages/lang.ko.resx

@@ -211,7 +211,7 @@
     <value>기본</value>
   </data>
   <data name="If the focus is lost and if the mouse is still on the menu" xml:space="preserve">
-    <value>포커스가 손실되고 마우스가 여전히 메뉴에 있는 경우</value>
+    <value>초점을 잃고 마우스가 여전히 메뉴에 있는 경우</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
     <value>마우스가 메뉴에 있을 때 메뉴가 열릴 때까지의 밀리초</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>다른 인스턴스로 단축키 보내기</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>날짜순 정렬</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>이름으로 분류하다</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>이름순으로 정렬</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>정렬</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>인터넷 바로 가기 아이콘 디렉토리</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>유형 및 날짜별로 정렬</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>유형 및 이름별로 정렬</value>
+  </data>
 </root>

Resources/Languages/lang.la.resx

@@ -465,17 +465,17 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Mitte hotkey aliis exempli gratia</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Pro tempore dispone</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordinatae ad tempus</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Pro nomine digerere</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Pro nomine disposita</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sorting</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>Effingo row item per drag gutta</value>
+    <value>Effingo row item per drag stilla</value>
   </data>
   <data name="Drag" xml:space="preserve">
     <value>Drag</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directorium Internet Brevis Icones</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordinatae genus et diem</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordinatae genus et nomen</value>
+  </data>
 </root>

Resources/Languages/lang.lo.resx

@@ -465,10 +465,10 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ສົ່ງ hotkey ໄປຫາຕົວຢ່າງອື່ນ</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>ຈັດຮຽງຕາມວັນທີ</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
+  <data name="Sorted by name" xml:space="preserve">
     <value>ຈັດຮຽງຕາມຊື່</value>
   </data>
   <data name="Sorting" xml:space="preserve">
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ໄດເລກະທໍລີຂອງໄອຄອນທາງລັດອິນເຕີເນັດ</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>ຈັດຮຽງຕາມປະເພດ ແລະວັນທີ</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>ຈັດຮຽງຕາມປະເພດແລະຊື່</value>
+  </data>
 </root>

Resources/Languages/lang.lt.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Siųsti sparčiąjį klavišą į kitą egzempliorių</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Rūšiuoti pagal datą</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Rūšiuota pagal datą</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Rūšiuoti pagal pavadinimą</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Rūšiuota pagal pavadinimą</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Rūšiavimas</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Interneto nuorodų piktogramų katalogas</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Rūšiuojama pagal tipą ir datą</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Rūšiuojama pagal tipą ir pavadinimą</value>
+  </data>
 </root>

Resources/Languages/lang.lv.resx

@@ -217,7 +217,7 @@
     <value>Milisekundes, līdz tiek atvērta izvēlne, kad uz tās ir pele</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
-    <value>Milisekundes, līdz izvēlne tiek aizvērta, ja šajā gadījumā pele pēc tam iziet no izvēlnes</value>
+    <value>Milisekundes, līdz izvēlne tiek aizvērta, ja šajā gadījumā pele iziet no izvēlnes</value>
   </data>
   <data name="Pixels maximum menu width" xml:space="preserve">
     <value>Maksimālais izvēlnes platums pikseļos</value>
@@ -274,7 +274,7 @@
     <value>Bultiņa, kamēr pele atrodas virs tās</value>
   </data>
   <data name="Background of arrow when clicking" xml:space="preserve">
-    <value>Noklikšķinot, bultiņas fons</value>
+    <value>Bultiņas fons, noklikšķinot</value>
   </data>
   <data name="Background of arrow while mouse hovers over it" xml:space="preserve">
     <value>Bultas fons, kamēr pele atrodas virs tās</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Sūtīt karsto taustiņu uz citu gadījumu</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Kārtot pēc datuma</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sakārtots pēc datuma</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Kārtot pēc nosaukuma</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sakārtots pēc nosaukuma</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Šķirošana</value>
@@ -484,7 +484,7 @@
     <value>Ritiniet, velkot</value>
   </data>
   <data name="Filter menu by file type e.g.: *.exe|*.dll" xml:space="preserve">
-    <value>Filtrēšanas izvēlne pēc faila veida, piemēram, *.exe|*.dll</value>
+    <value>Filtrēšanas izvēlne pēc faila veida, piemēram: *.exe|*.dll</value>
   </data>
   <data name="Show count of elements below" xml:space="preserve">
     <value>Tālāk parādīt elementu skaitu</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Interneta īsceļu ikonu direktorijs</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sakārtots pēc veida un datuma</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sakārtots pēc veida un nosaukuma</value>
+  </data>
 </root>

Resources/Languages/lang.mk.resx

@@ -154,7 +154,7 @@
     <value>Рестарт</value>
   </data>
   <data name="Could not register the hot key." xml:space="preserve">
-    <value>Не може да се регистрира топлото копче.</value>
+    <value>Не можеше да се регистрира копче за готвење.</value>
   </data>
   <data name="Abort" xml:space="preserve">
     <value>Прекини</value>
@@ -184,7 +184,7 @@
     <value>Вашиот root директориум за апликацијата не постои или е празен! Променете го root директориумот или ставете некои датотеки, директориуми или кратенки во root директориумот.</value>
   </data>
   <data name="You have no access to the root directory of the app. Grant access to the directory or change the root directory." xml:space="preserve">
-    <value>Немате пристап до root директориумот на апликацијата. Дозволете пристап до директориумот или променете го root директориумот.</value>
+    <value>Немате пристап до root директориумот на апликацијата. Дозволете пристап до директориумот или сменете го root директориумот.</value>
   </data>
   <data name="Single click to open an element instead of double click" xml:space="preserve">
     <value>Еден клик за отворање на елемент наместо двоен клик</value>
@@ -325,7 +325,7 @@
     <value>вчитување</value>
   </data>
   <data name="Problem with shortcut link" xml:space="preserve">
-    <value>Проблем со врската со кратенка</value>
+    <value>Проблем со кратенка врска</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
     <value>Ставката на која се однесува оваа кратенка е променета или преместена, така што оваа кратенка повеќе нема да работи правилно.</value>
@@ -463,13 +463,13 @@
     <value>Избледување</value>
   </data>
   <data name="Send hotkey to other instance" xml:space="preserve">
-    <value>Испратете копче на друга инстанца</value>
+    <value>Испрати копче на друга инстанца</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Подреди по датум</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Подредени по датум</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Подреди по име</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Подредени по име</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сортирање</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Директориум на икони за кратенки на Интернет</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Подредени по тип и датум</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Подредени по тип и име</value>
+  </data>
 </root>

Resources/Languages/lang.ms.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Hantar hotkey ke contoh lain</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Isih mengikut tarikh</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Diisih mengikut tarikh</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Isih mengikut nama</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Diisih mengikut nama</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Menyusun</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Direktori Ikon Pintasan Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Diisih mengikut jenis dan tarikh</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Diisih mengikut jenis dan nama</value>
+  </data>
 </root>

Resources/Languages/lang.mt.resx

@@ -445,7 +445,7 @@
     <value>Ħdejn dak ta’ qabel</value>
   </data>
   <data name="Offset by pixels" xml:space="preserve">
-    <value>Offset mill-pixels</value>
+    <value>Offset bil-pixels</value>
   </data>
   <data name="Overlapping" xml:space="preserve">
     <value>Jikkoinċidu</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Ibgħat hotkey lil eżempju ieħor</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Issortja skond id-data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Issortjati skond id-data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Issortja skond l-isem</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Issortjati skond l-isem</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Issortjar</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Direttorju tal-Ikoni tal-Shortcut tal-Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Issortjati skond it-tip u d-data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Issortjati skond it-tip u l-isem</value>
+  </data>
 </root>

Resources/Languages/lang.nl.resx

@@ -298,7 +298,7 @@
     <value>Schuifregelaar tijdens het slepen</value>
   </data>
   <data name="Slider while mouse hovers over it 1" xml:space="preserve">
-    <value>Schuif terwijl de muis erover zweeft 1</value>
+    <value>Schuifregelaar terwijl de muis erover zweeft 1</value>
   </data>
   <data name="Slider while mouse hovers over it 2" xml:space="preserve">
     <value>Schuif terwijl de muis erover zweeft 2</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Sneltoets naar andere instantie verzenden</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sorteren op datum</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Gesorteerd op datum</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorteren op naam</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Gesorteerd op naam</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sorteren</value>
@@ -490,7 +490,7 @@
     <value>Toon aantal elementen hieronder</value>
   </data>
   <data name="Show directory title at top" xml:space="preserve">
-    <value>Titel van directory bovenaan weergeven</value>
+    <value>Toon maptitel bovenaan</value>
   </data>
   <data name="Show function keys below" xml:space="preserve">
     <value>Functietoetsen hieronder weergeven:</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directory met pictogrammen voor internetsnelkoppelingen</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Gesorteerd op soort en datum</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Gesorteerd op type en naam</value>
+  </data>
 </root>

Resources/Languages/lang.no.resx

@@ -211,7 +211,7 @@
     <value>Misligholde</value>
   </data>
   <data name="If the focus is lost and if the mouse is still on the menu" xml:space="preserve">
-    <value>Hvis fokuset er tapt og hvis musen fortsatt er på menyen</value>
+    <value>Hvis fokus er tapt og hvis musen fortsatt er på menyen</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
     <value>Millisekunder til en meny åpnes når musen er på den</value>
@@ -325,7 +325,7 @@
     <value>lasting</value>
   </data>
   <data name="Problem with shortcut link" xml:space="preserve">
-    <value>Problem med snarveislenke</value>
+    <value>Problem med snarveislink</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
     <value>Elementet som denne snarveien refererer til har blitt endret eller flyttet, så denne snarveien vil ikke lenger fungere som den skal.</value>
@@ -465,17 +465,17 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Send hurtigtast til en annen instans</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sorter etter dato</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sortert etter dato</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorter etter navn</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sortert etter navn</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortering</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>Kopier radelement via dra-slipp</value>
+    <value>Kopier radelementet med dra-slipp</value>
   </data>
   <data name="Drag" xml:space="preserve">
     <value>Dra</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Katalog over Internett-snarveisikoner</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sortert etter type og dato</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sortert etter type og navn</value>
+  </data>
 </root>

Resources/Languages/lang.pl.resx

@@ -463,13 +463,13 @@
     <value>Zblakły</value>
   </data>
   <data name="Send hotkey to other instance" xml:space="preserve">
-    <value>Wyślij klawisz skrótu do innej instancji</value>
+    <value>Wyślij skrót do innej instancji</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sortowanie według daty</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Posortowane według daty</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sortuj według nazwy</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Posortowane według nazwy</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortowanie</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Katalog ikon skrótów internetowych</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Posortowane według typu i daty</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Posortowane według typu i nazwy</value>
+  </data>
 </root>

Resources/Languages/lang.pt-BR.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Enviar tecla de atalho para outra instância</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Classificar por data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordenado por data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Classificar por nome</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordenado por nome</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Ordenação</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Diretório de ícones de atalhos da Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordenado por tipo e data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordenado por tipo e nome</value>
+  </data>
 </root>

Resources/Languages/lang.pt-PT.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Enviar tecla de atalho para outra instância</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Classificar por data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Ordenado por data</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Classificar por nome</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ordenado por nome</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Ordenação</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Diretório de ícones de atalhos da Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Ordenado por tipo e data</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Ordenado por tipo e nome</value>
+  </data>
 </root>

Resources/Languages/lang.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Send hotkey to other instance</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sort by date</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sorted by date</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sort by name</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sorted by name</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sorting</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directory of Internet Shortcut Icons</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sorted by type and date</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sorted by type and name</value>
+  </data>
 </root>

Resources/Languages/lang.ro.resx

@@ -310,7 +310,7 @@
     <value>mărimea</value>
   </data>
   <data name="Border of menu" xml:space="preserve">
-    <value>Chenarul meniului</value>
+    <value>Marginea meniului</value>
   </data>
   <data name="Icons" xml:space="preserve">
     <value>icoane</value>
@@ -382,7 +382,7 @@
     <value>Goliți memoria cache dacă este mai mare de acest număr de articole</value>
   </data>
   <data name="Add sample directory 'Start Menu'" xml:space="preserve">
-    <value>Adăugați exemplu de director „Start Menu”</value>
+    <value>Adăugați exemplu de director „Meniu Start”</value>
   </data>
   <data name="Row height in percent" xml:space="preserve">
     <value>Înălțimea rândului în procente</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Trimiteți tasta rapidă către altă instanță</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sortati dupa data</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sortate după dată</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sorteaza dupa nume</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sortate după nume</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Triere</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Director cu pictograme pentru comenzi rapide pe Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sortate după tip și dată</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sortate după tip și nume</value>
+  </data>
 </root>

Resources/Languages/lang.ru.resx

@@ -211,7 +211,7 @@
     <value>По умолчанию</value>
   </data>
   <data name="If the focus is lost and if the mouse is still on the menu" xml:space="preserve">
-    <value>Если фокус потерян, и если мышь все еще находится в меню</value>
+    <value>Если фокус потерян и мышь все еще находится в меню</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
     <value>Миллисекунды до открытия меню при наведении на него мыши</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Отправить горячую клавишу в другой экземпляр</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Сортировать по дате</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Отсортировано по дате</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Сортировать по имени</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Отсортировано по имени</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сортировка</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Каталог значков ярлыков Интернета</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Сортировка по типу и дате</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Сортировка по типу и названию</value>
+  </data>
 </root>

Resources/Languages/lang.sk.resx

@@ -214,7 +214,7 @@
     <value>Ak sa stratí zameranie a ak je myš stále v ponuke</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
-    <value>Milisekúnd, kým sa otvorí ponuka, keď je na nej myš</value>
+    <value>Milisekundy, kým sa otvorí ponuka, keď je na nej myš</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
     <value>Milisekundy, kým sa ponuka zatvorí, ak v tomto prípade myš opustí ponuku</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Odoslať klávesovú skratku do inej inštancie</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Zoradiť podľa dátumu</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Zoradené podľa dátumu</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Zoradiť podľa názvu</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Zoradené podľa názvu</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Triedenie</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Adresár ikon internetových skratiek</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Zoradené podľa typu a dátumu</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Zoradené podľa typu a názvu</value>
+  </data>
 </root>

Resources/Languages/lang.sl.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Pošlji bližnjico drugemu primerku</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Razvrsti po datumu</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Razvrščeno po datumu</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Razvrsti po imenu</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Razvrščeno po imenu</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Razvrščanje</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Imenik ikon internetnih bližnjic</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Razvrščeno po vrsti in datumu</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Razvrščeno po vrsti in imenu</value>
+  </data>
 </root>

Resources/Languages/lang.sq.resx

@@ -262,7 +262,7 @@
     <value>Hap direktorinë e aplikacionit</value>
   </data>
   <data name="Pixels maximum menu height" xml:space="preserve">
-    <value>Lartësia maksimale e pikselëve të menusë</value>
+    <value>Lartësia maksimale e pikselëve të menysë</value>
   </data>
   <data name="Arrow" xml:space="preserve">
     <value>Shigjeta</value>
@@ -463,22 +463,22 @@
     <value>Venitje</value>
   </data>
   <data name="Send hotkey to other instance" xml:space="preserve">
-    <value>Dërgo çelësin e nxehtë në një shembull tjetër</value>
+    <value>Dërgo çelësin e nxehtësisë në një shembull tjetër</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Rendit sipas datës</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Renditur sipas datës</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Rendit sipas emrit</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Renditur sipas emrit</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Renditja</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>Kopjo artikullin e rreshtit përmes zvarritjes</value>
+    <value>Kopjoni artikullin e rreshtit përmes zvarritjes</value>
   </data>
   <data name="Drag" xml:space="preserve">
-    <value>Zvarritni</value>
+    <value>Zvarrit</value>
   </data>
   <data name="Scroll via swipe" xml:space="preserve">
     <value>Lëvizni përmes rrëshqitjes</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Drejtoria e ikonave të shkurtoreve të internetit</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Renditur sipas llojit dhe datës</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Renditur sipas llojit dhe emrit</value>
+  </data>
 </root>

Resources/Languages/lang.sr.resx

@@ -247,7 +247,7 @@
     <value>Изабрани елемент</value>
   </data>
   <data name="Border of selected element" xml:space="preserve">
-    <value>Ивица изабраног елемента</value>
+    <value>Граница изабраног елемента</value>
   </data>
   <data name="Convert to relative directory" xml:space="preserve">
     <value>Конвертујте у релативни директоријум</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Пошаљи интервентни тастер на другу инстанцу</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Сортирај по датуму</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Сортирано по датуму</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Сортирај по имену</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Сортирано по имену</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сортирање</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Именик икона Интернет пречица</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Сортирано по врсти и датуму</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Сортирано по врсти и имену</value>
+  </data>
 </root>

Resources/Languages/lang.sv.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Skicka snabbtangent till annan instans</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Sortera efter datum</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sorterat efter datum</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sortera efter namn</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Sorterat efter namn</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sortering</value>
@@ -481,7 +481,7 @@
     <value>Drag</value>
   </data>
   <data name="Scroll via swipe" xml:space="preserve">
-    <value>Bläddra med svep</value>
+    <value>Scrolla via svep</value>
   </data>
   <data name="Filter menu by file type e.g.: *.exe|*.dll" xml:space="preserve">
     <value>Filtrera menyn efter filtyp, t.ex.: *.exe|*.dll</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Katalog över internetgenvägsikoner</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sorterat efter typ och datum</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sorterat efter typ och namn</value>
+  </data>
 </root>

Resources/Languages/lang.sw.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Tuma hotkey kwa mfano mwingine</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Panga kwa tarehe</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Imepangwa kwa tarehe</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Panga kwa jina</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Imepangwa kwa jina</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Inapanga</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Saraka ya Aikoni za Njia za Mkato za Mtandao</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Imepangwa kwa aina na tarehe</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Imepangwa kwa aina na jina</value>
+  </data>
 </root>

Resources/Languages/lang.ta.resx

@@ -379,7 +379,7 @@
     <value>கேச் முதன்மை மெனு</value>
   </data>
   <data name="Clear cache if more than this number of items" xml:space="preserve">
-    <value>இந்த எண்ணிக்கையை விட அதிகமாக இருந்தால் தற்காலிக சேமிப்பை அழிக்கவும்</value>
+    <value>இந்த உருப்படிகளின் எண்ணிக்கையை விட அதிகமாக இருந்தால் தற்காலிக சேமிப்பை அழிக்கவும்</value>
   </data>
   <data name="Add sample directory 'Start Menu'" xml:space="preserve">
     <value>'ஸ்டார்ட் மெனு' மாதிரி கோப்பகத்தைச் சேர்க்கவும்</value>
@@ -427,7 +427,7 @@
     <value>மறைக்கப்பட்ட கோப்புகள் மற்றும் கோப்பகங்கள்</value>
   </data>
   <data name="Never show hidden files, directories or drives" xml:space="preserve">
-    <value>மறைக்கப்பட்ட கோப்புகள், கோப்பகங்கள் அல்லது இயக்ககங்களைக் காட்ட வேண்டாம்</value>
+    <value>மறைக்கப்பட்ட கோப்புகள், கோப்பகங்கள் அல்லது இயக்கிகளைக் காட்ட வேண்டாம்</value>
   </data>
   <data name="Size and location" xml:space="preserve">
     <value>அளவு மற்றும் இடம்</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>மற்றொரு நிகழ்வுக்கு ஹாட்கியை அனுப்பவும்</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>தேதி வாரியாக வரிசைப்படுத்தவும்</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>தேதியின்படி வரிசைப்படுத்தப்பட்டது</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>பெயரால் வரிசைப்படுத்தவும்</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>பெயரால் வரிசைப்படுத்தப்பட்டது</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>வரிசைப்படுத்துதல்</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>இணைய குறுக்குவழி ஐகான்களின் அடைவு</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>வகை மற்றும் தேதி மூலம் வரிசைப்படுத்தப்பட்டது</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>வகை மற்றும் பெயர் மூலம் வரிசைப்படுத்தப்பட்டது</value>
+  </data>
 </root>

Resources/Languages/lang.te.resx

@@ -238,7 +238,7 @@
     <value>డైరెక్టరీ తెరవబడింది</value>
   </data>
   <data name="Border of opened directory" xml:space="preserve">
-    <value>తెరిచిన డైరెక్టరీ సరిహద్దు</value>
+    <value>తెరిచిన డైరెక్టరీ అంచు</value>
   </data>
   <data name="Search field" xml:space="preserve">
     <value>శోధన ఫీల్డ్</value>
@@ -301,7 +301,7 @@
     <value>మౌస్ దానిపై కదులుతున్నప్పుడు స్లైడర్ 1</value>
   </data>
   <data name="Slider while mouse hovers over it 2" xml:space="preserve">
-    <value>మౌస్ దానిపై హోవర్ చేస్తున్నప్పుడు స్లైడర్ 2</value>
+    <value>మౌస్ దానిపై కదులుతున్నప్పుడు స్లైడర్ 2</value>
   </data>
   <data name="Use icon from directory" xml:space="preserve">
     <value>డైరెక్టరీ నుండి చిహ్నాన్ని ఉపయోగించండి</value>
@@ -358,7 +358,7 @@
     <value>డైరెక్టరీని జోడించండి</value>
   </data>
   <data name="Add content of directory to root directory" xml:space="preserve">
-    <value>రూట్ డైరెక్టరీకి డైరెక్టరీ యొక్క కంటెంట్‌ని జోడించండి</value>
+    <value>రూట్ డైరెక్టరీకి డైరెక్టరీ యొక్క కంటెంట్‌ను జోడించండి</value>
   </data>
   <data name="Directory paths" xml:space="preserve">
     <value>డైరెక్టరీ మార్గాలు</value>
@@ -451,7 +451,7 @@
     <value>అతివ్యాప్తి చెందుతోంది</value>
   </data>
   <data name="Sub menu appears" xml:space="preserve">
-    <value>ఉప మెను కనిపిస్తుంది</value>
+    <value>సబ్ మెనూ కనిపిస్తుంది</value>
   </data>
   <data name="Size of the icons in percent" xml:space="preserve">
     <value>శాతంలో చిహ్నాల పరిమాణం</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>హాట్‌కీని ఇతర సందర్భానికి పంపండి</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>తేదీ వారీగా క్రమబద్ధీకరించండి</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>తేదీ ప్రకారం క్రమబద్ధీకరించబడింది</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>పేరు ద్వారా క్రమబద్ధీకరించండి</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>పేరు ద్వారా క్రమబద్ధీకరించబడింది</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>క్రమబద్ధీకరణ</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ఇంటర్నెట్ షార్ట్‌కట్ చిహ్నాల డైరెక్టరీ</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>రకం మరియు తేదీ ద్వారా క్రమబద్ధీకరించబడింది</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>రకం మరియు పేరు ద్వారా క్రమబద్ధీకరించబడింది</value>
+  </data>
 </root>

Resources/Languages/lang.th.resx

@@ -175,7 +175,7 @@
     <value>คำถามที่พบบ่อย</value>
   </data>
   <data name="Read the FAQ and then choose a root directory for the SystemTrayMenu." xml:space="preserve">
-    <value>อ่านคำถามที่พบบ่อย จากนั้นเลือกไดเร็กทอรีรากสำหรับ SystemTrayMenu</value>
+    <value>อ่านคำถามที่พบบ่อย จากนั้นเลือกไดเรกทอรีรากสำหรับ SystemTrayMenu</value>
   </data>
   <data name="Select directory" xml:space="preserve">
     <value>เลือกไดเรกทอรี</value>
@@ -214,7 +214,7 @@
     <value>หากโฟกัสหายและหากเมาส์ยังคงอยู่บนเมนู</value>
   </data>
   <data name="Milliseconds until a menu opens when the mouse is on it" xml:space="preserve">
-    <value>มิลลิวินาทีจนกว่าเมนูจะเปิดขึ้นเมื่อเมาส์อยู่</value>
+    <value>มิลลิวินาทีจนกระทั่งเมนูเปิดขึ้นเมื่อวางเมาส์ไว้</value>
   </data>
   <data name="Milliseconds until the menu closes if in this case the mouse then leaves the menu" xml:space="preserve">
     <value>มิลลิวินาทีจนกว่าเมนูจะปิด ถ้าในกรณีนี้เมาส์ออกจากเมนู</value>
@@ -325,7 +325,7 @@
     <value>กำลังโหลด</value>
   </data>
   <data name="Problem with shortcut link" xml:space="preserve">
-    <value>ปัญหาเกี่ยวกับลิงก์ทางลัด</value>
+    <value>ปัญหาเกี่ยวกับลิงค์ทางลัด</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
     <value>รายการที่ทางลัดนี้อ้างถึงมีการเปลี่ยนแปลงหรือย้าย ดังนั้นคำสั่งลัดนี้จะทำงานไม่ถูกต้องอีกต่อไป</value>
@@ -403,7 +403,7 @@
     <value>เมนูหลักปรากฏขึ้น</value>
   </data>
   <data name="Mouse location (Above Taskbar icon)" xml:space="preserve">
-    <value>ตำแหน่งเมาส์ (เหนือไอคอนแถบงาน)</value>
+    <value>ตำแหน่งของเมาส์ (เหนือไอคอนแถบงาน)</value>
   </data>
   <data name="Custom (drag it to the appropriate place)" xml:space="preserve">
     <value>กำหนดเอง (ลากไปยังตำแหน่งที่เหมาะสม)</value>
@@ -465,10 +465,10 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ส่งฮ็อตคีย์ไปยังอินสแตนซ์อื่น</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>เรียงตามวันที่</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
+  <data name="Sorted by name" xml:space="preserve">
     <value>เรียงตามชื่อ</value>
   </data>
   <data name="Sorting" xml:space="preserve">
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>ไดเรกทอรีของไอคอนทางลัดอินเทอร์เน็ต</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>เรียงตามประเภทและวันที่</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>เรียงตามประเภทและชื่อ</value>
+  </data>
 </root>

Resources/Languages/lang.tl.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Ipadala ang hotkey sa ibang instance</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Ayusin ayon sa petsa</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Inayos ayon sa petsa</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Pagbukud-bukurin ayon sa pangalan</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Pinagbukud-bukod ayon sa pangalan</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Pag-uuri</value>
@@ -499,7 +499,7 @@
     <value>Ipakita ang search bar</value>
   </data>
   <data name="Saving log file in application directory instead of AppData" xml:space="preserve">
-    <value>Sine-save ang log file sa application directory sa halip na AppData</value>
+    <value>Sine-save ang log file sa direktoryo ng application sa halip na AppData</value>
   </data>
   <data name="Show link overlay" xml:space="preserve">
     <value>Ipakita ang overlay ng link</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Direktoryo ng Internet Shortcut Icon</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Pinagbukud-bukod ayon sa uri at petsa</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Pinagbukud-bukod ayon sa uri at pangalan</value>
+  </data>
 </root>

Resources/Languages/lang.tr.resx

@@ -271,7 +271,7 @@
     <value>Tıklandığında ok</value>
   </data>
   <data name="Arrow while mouse hovers over it" xml:space="preserve">
-    <value>Fare üzerindeyken ok</value>
+    <value>Fare üzerine geldiğinde ok</value>
   </data>
   <data name="Background of arrow when clicking" xml:space="preserve">
     <value>Tıklandığında okun arka planı</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Başka bir örneğe kısayol tuşu gönder</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Tarihe göre sırala</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Tarihe göre sıralanmış</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>İsme göre sırala</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Ada göre sıralanmış</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>sıralama</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>İnternet Kısayol Simgeleri Dizini</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Türe ve tarihe göre sıralanmış</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Türe ve ada göre sıralanmış</value>
+  </data>
 </root>

Resources/Languages/lang.uk.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Надіслати гарячу клавішу в інший екземпляр</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Сортувати за датою</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Відсортовано за датою</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Сортувати за назвою</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Відсортовано за назвою</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Сортування</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Каталог значків ярликів Інтернету</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Відсортовано за типом і датою</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Відсортовано за типом та назвою</value>
+  </data>
 </root>

Resources/Languages/lang.ur.resx

@@ -235,7 +235,7 @@
     <value>پس منظر</value>
   </data>
   <data name="Opened directory" xml:space="preserve">
-    <value>کھلی ڈائریکٹری</value>
+    <value>ڈائرکٹری کھولی۔</value>
   </data>
   <data name="Border of opened directory" xml:space="preserve">
     <value>کھلی ڈائریکٹری کا بارڈر</value>
@@ -304,7 +304,7 @@
     <value>سلائیڈر جب اس پر ماؤس منڈلاتا ہے 2</value>
   </data>
   <data name="Use icon from directory" xml:space="preserve">
-    <value>ڈائرکٹری سے آئیکن استعمال کریں۔</value>
+    <value>ڈائریکٹری سے آئیکن استعمال کریں۔</value>
   </data>
   <data name="Size" xml:space="preserve">
     <value>سائز</value>
@@ -445,7 +445,7 @@
     <value>پچھلے کے آگے</value>
   </data>
   <data name="Offset by pixels" xml:space="preserve">
-    <value>پکسلز کے ذریعے آفسیٹ</value>
+    <value>پکسلز کے ذریعہ آفسیٹ</value>
   </data>
   <data name="Overlapping" xml:space="preserve">
     <value>اوور لیپنگ</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>ہاٹکی کو دوسری مثال میں بھیجیں۔</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>تاریخ کے لحاظ سے ترتیب دیں۔</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>تاریخ کے لحاظ سے ترتیب دیا گیا۔</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>نام سے ترتیب دیں۔</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>نام کے لحاظ سے ترتیب دیا گیا۔</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>چھانٹنا</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>انٹرنیٹ شارٹ کٹ شبیہیں کی ڈائرکٹری</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>قسم اور تاریخ کے لحاظ سے ترتیب دیا گیا ہے۔</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>قسم اور نام کے لحاظ سے ترتیب دیا گیا ہے۔</value>
+  </data>
 </root>

Resources/Languages/lang.vi.resx

@@ -292,7 +292,7 @@
     <value>Thanh cuộn</value>
   </data>
   <data name="Slider" xml:space="preserve">
-    <value>Con trượt</value>
+    <value>Thanh trượt</value>
   </data>
   <data name="Slider while dragging" xml:space="preserve">
     <value>Thanh trượt trong khi kéo</value>
@@ -415,7 +415,7 @@
     <value>các yếu tố</value>
   </data>
   <data name="Generate drive shortcuts on startup" xml:space="preserve">
-    <value>Tạo phím tắt cho ổ đĩa khi khởi động</value>
+    <value>Tạo các phím tắt cho ổ đĩa khi khởi động</value>
   </data>
   <data name="Cache" xml:space="preserve">
     <value>Bộ nhớ đệm</value>
@@ -465,17 +465,17 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>Gửi phím nóng đến phiên bản khác</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>Lọc theo ngày</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>Sắp xếp theo ngày</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>Sắp xếp theo tên</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>Được sắp xếp theo tên</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>Sắp xếp</value>
   </data>
   <data name="Copy row item via drag drop" xml:space="preserve">
-    <value>Sao chép mục hàng bằng cách kéo thả</value>
+    <value>Sao chép mục hàng thông qua kéo thả</value>
   </data>
   <data name="Drag" xml:space="preserve">
     <value>Lôi kéo</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Thư mục các biểu tượng lối tắt trên Internet</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>Sắp xếp theo loại và ngày</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>Sắp xếp theo loại và tên</value>
+  </data>
 </root>

Resources/Languages/lang.yi.resx

@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>שיקן האָטקיי צו אנדערע בייַשפּיל</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
-    <value>סאָרט דורך דאַטע</value>
+  <data name="Sorted by date" xml:space="preserve">
+    <value>סאָרטירט לויט דאַטע</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>סאָרט דורך נאָמען</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>סאָרטירט לויט נאָמען</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>סאָרטינג</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Directory פון אינטערנעט דורכוועג יקאָנס</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>סאָרטירט לויט טיפּ און דאַטע</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>סאָרטירט לויט טיפּ און נאָמען</value>
+  </data>
 </root>

Resources/Languages/lang.zh-CN.resx

@@ -301,7 +301,7 @@
     <value>鼠标悬停时的滑块 1</value>
   </data>
   <data name="Slider while mouse hovers over it 2" xml:space="preserve">
-    <value>鼠标悬停在滑块上时的滑块 2</value>
+    <value>鼠标悬停时的滑块 2</value>
   </data>
   <data name="Use icon from directory" xml:space="preserve">
     <value>使用目录中的图标</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>向其他实例发送热键</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>按日期排序</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>按名称分类</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>按名称排序</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>排序</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Internet 快捷方式图标目录</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>按类型和日期排序</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>按类型和名称排序</value>
+  </data>
 </root>

Resources/Languages/lang.zh-TW.resx

@@ -274,7 +274,7 @@
     <value>鼠標懸停時的箭頭</value>
   </data>
   <data name="Background of arrow when clicking" xml:space="preserve">
-    <value>點擊時箭頭的背景</value>
+    <value>單擊時箭頭的背景</value>
   </data>
   <data name="Background of arrow while mouse hovers over it" xml:space="preserve">
     <value>鼠標懸停在箭頭上時的箭頭背景</value>
@@ -325,7 +325,7 @@
     <value>加載</value>
   </data>
   <data name="Problem with shortcut link" xml:space="preserve">
-    <value>快捷鏈接問題</value>
+    <value>快捷方式鏈接問題</value>
   </data>
   <data name="The item that this shortcut refers to has been changed or moved, so this shortcut will no longer work properly." xml:space="preserve">
     <value>此快捷方式所指的項目已更改或移動，因此此快捷方式將不再正常工作。</value>
@@ -465,11 +465,11 @@
   <data name="Send hotkey to other instance" xml:space="preserve">
     <value>向其他實例發送熱鍵</value>
   </data>
-  <data name="Sort by date" xml:space="preserve">
+  <data name="Sorted by date" xml:space="preserve">
     <value>按日期排序</value>
   </data>
-  <data name="Sort by name" xml:space="preserve">
-    <value>按名稱分類</value>
+  <data name="Sorted by name" xml:space="preserve">
+    <value>按名稱排序</value>
   </data>
   <data name="Sorting" xml:space="preserve">
     <value>排序</value>
@@ -507,4 +507,10 @@
   <data name="Directory of Internet Shortcut Icons" xml:space="preserve">
     <value>Internet 快捷方式圖標目錄</value>
   </data>
+  <data name="Sorted by type and date" xml:space="preserve">
+    <value>按類型和日期排序</value>
+  </data>
+  <data name="Sorted by type and name" xml:space="preserve">
+    <value>按類型和名稱排序</value>
+  </data>
 </root>

UserInterface/SettingsForm.Designer.cs

@@ -112,7 +112,7 @@ namespace SystemTrayMenu.UserInterface
             this.checkBoxShowInTaskbar = new System.Windows.Forms.CheckBox();
             this.buttonAdvancedDefault = new System.Windows.Forms.Button();
             this.groupBoxSorting = new System.Windows.Forms.GroupBox();
-            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLayoutPanelSorting = new System.Windows.Forms.TableLayoutPanel();
             this.radioButtonSortByDate = new System.Windows.Forms.RadioButton();
             this.radioButtonSortByName = new System.Windows.Forms.RadioButton();
             this.groupBoxHiddenFilesAndFolders = new System.Windows.Forms.GroupBox();
@@ -335,6 +335,8 @@ namespace SystemTrayMenu.UserInterface
             this.buttonOk = new System.Windows.Forms.Button();
             this.buttonCancel = new System.Windows.Forms.Button();
             this.colorDialog = new System.Windows.Forms.ColorDialog();
+            this.radioButtonSortByTypeAndDate = new System.Windows.Forms.RadioButton();
+            this.radioButtonSortByTypeAndName = new System.Windows.Forms.RadioButton();
             this.tableLayoutPanelMain.SuspendLayout();
             this.tabControl.SuspendLayout();
             this.tabPageGeneral.SuspendLayout();
@@ -381,7 +383,7 @@ namespace SystemTrayMenu.UserInterface
             this.groupBoxClick.SuspendLayout();
             this.tableLayoutPanelClick.SuspendLayout();
             this.groupBoxSorting.SuspendLayout();
-            this.tableLayoutPanel5.SuspendLayout();
+            this.tableLayoutPanelSorting.SuspendLayout();
             this.groupBoxHiddenFilesAndFolders.SuspendLayout();
             this.tableLayoutPanelHiddenFilesAndFolders.SuspendLayout();
             this.tabPageFolders.SuspendLayout();
@@ -1419,7 +1421,7 @@ namespace SystemTrayMenu.UserInterface
             this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanelAdvanced.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanelAdvanced.Size = new System.Drawing.Size(391, 517);
+            this.tableLayoutPanelAdvanced.Size = new System.Drawing.Size(391, 567);
             this.tableLayoutPanelAdvanced.TabIndex = 0;
             // 
             // groupBoxInternetShortcutIcons
@@ -1638,7 +1640,7 @@ namespace SystemTrayMenu.UserInterface
             // 
             this.buttonAdvancedDefault.AutoSize = true;
             this.buttonAdvancedDefault.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 483);
+            this.buttonAdvancedDefault.Location = new System.Drawing.Point(9, 533);
             this.buttonAdvancedDefault.Margin = new System.Windows.Forms.Padding(9, 9, 3, 9);
             this.buttonAdvancedDefault.MinimumSize = new System.Drawing.Size(75, 25);
             this.buttonAdvancedDefault.Name = "buttonAdvancedDefault";
@@ -1652,40 +1654,43 @@ namespace SystemTrayMenu.UserInterface
             // 
             this.groupBoxSorting.AutoSize = true;
             this.groupBoxSorting.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.groupBoxSorting.Controls.Add(this.tableLayoutPanel5);
+            this.groupBoxSorting.Controls.Add(this.tableLayoutPanelSorting);
             this.groupBoxSorting.Location = new System.Drawing.Point(3, 296);
             this.groupBoxSorting.MaximumSize = new System.Drawing.Size(385, 0);
             this.groupBoxSorting.MinimumSize = new System.Drawing.Size(385, 0);
             this.groupBoxSorting.Name = "groupBoxSorting";
-            this.groupBoxSorting.Size = new System.Drawing.Size(385, 72);
+            this.groupBoxSorting.Size = new System.Drawing.Size(385, 122);
             this.groupBoxSorting.TabIndex = 3;
             this.groupBoxSorting.TabStop = false;
             this.groupBoxSorting.Text = "groupBoxSorting";
             // 
             // tableLayoutPanel5
             // 
-            this.tableLayoutPanel5.AutoSize = true;
-            this.tableLayoutPanel5.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel5.ColumnCount = 1;
-            this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel5.Controls.Add(this.radioButtonSortByDate, 0, 1);
-            this.tableLayoutPanel5.Controls.Add(this.radioButtonSortByName, 0, 0);
-            this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 19);
-            this.tableLayoutPanel5.Name = "tableLayoutPanel5";
-            this.tableLayoutPanel5.RowCount = 2;
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel5.Size = new System.Drawing.Size(379, 50);
-            this.tableLayoutPanel5.TabIndex = 1;
+            this.tableLayoutPanelSorting.AutoSize = true;
+            this.tableLayoutPanelSorting.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.tableLayoutPanelSorting.ColumnCount = 1;
+            this.tableLayoutPanelSorting.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanelSorting.Controls.Add(this.radioButtonSortByTypeAndDate, 0, 1);
+            this.tableLayoutPanelSorting.Controls.Add(this.radioButtonSortByTypeAndName, 0, 0);
+            this.tableLayoutPanelSorting.Controls.Add(this.radioButtonSortByDate, 0, 3);
+            this.tableLayoutPanelSorting.Controls.Add(this.radioButtonSortByName, 0, 2);
+            this.tableLayoutPanelSorting.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanelSorting.Location = new System.Drawing.Point(3, 19);
+            this.tableLayoutPanelSorting.Name = "tableLayoutPanel5";
+            this.tableLayoutPanelSorting.RowCount = 4;
+            this.tableLayoutPanelSorting.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanelSorting.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanelSorting.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanelSorting.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanelSorting.Size = new System.Drawing.Size(379, 100);
+            this.tableLayoutPanelSorting.TabIndex = 1;
             // 
             // radioButtonSortByDate
             // 
             this.radioButtonSortByDate.AutoSize = true;
-            this.radioButtonSortByDate.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.radioButtonSortByDate.Location = new System.Drawing.Point(3, 28);
+            this.radioButtonSortByDate.Location = new System.Drawing.Point(3, 78);
             this.radioButtonSortByDate.Name = "radioButtonSortByDate";
-            this.radioButtonSortByDate.Size = new System.Drawing.Size(373, 19);
+            this.radioButtonSortByDate.Size = new System.Drawing.Size(146, 19);
             this.radioButtonSortByDate.TabIndex = 1;
             this.radioButtonSortByDate.TabStop = true;
             this.radioButtonSortByDate.Text = "radioButtonSortByDate";
@@ -1694,10 +1699,9 @@ namespace SystemTrayMenu.UserInterface
             // radioButtonSortByName
             // 
             this.radioButtonSortByName.AutoSize = true;
-            this.radioButtonSortByName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.radioButtonSortByName.Location = new System.Drawing.Point(3, 3);
+            this.radioButtonSortByName.Location = new System.Drawing.Point(3, 53);
             this.radioButtonSortByName.Name = "radioButtonSortByName";
-            this.radioButtonSortByName.Size = new System.Drawing.Size(373, 19);
+            this.radioButtonSortByName.Size = new System.Drawing.Size(154, 19);
             this.radioButtonSortByName.TabIndex = 2;
             this.radioButtonSortByName.TabStop = true;
             this.radioButtonSortByName.Text = "radioButtonSortByName";
@@ -1708,7 +1712,7 @@ namespace SystemTrayMenu.UserInterface
             this.groupBoxHiddenFilesAndFolders.AutoSize = true;
             this.groupBoxHiddenFilesAndFolders.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.groupBoxHiddenFilesAndFolders.Controls.Add(this.tableLayoutPanelHiddenFilesAndFolders);
-            this.groupBoxHiddenFilesAndFolders.Location = new System.Drawing.Point(3, 374);
+            this.groupBoxHiddenFilesAndFolders.Location = new System.Drawing.Point(3, 424);
             this.groupBoxHiddenFilesAndFolders.MaximumSize = new System.Drawing.Size(385, 0);
             this.groupBoxHiddenFilesAndFolders.MinimumSize = new System.Drawing.Size(385, 0);
             this.groupBoxHiddenFilesAndFolders.Name = "groupBoxHiddenFilesAndFolders";
@@ -4769,6 +4773,28 @@ namespace SystemTrayMenu.UserInterface
             this.buttonCancel.UseVisualStyleBackColor = true;
             this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
             // 
+            // radioButtonSortByTypeAndDate
+            // 
+            this.radioButtonSortByTypeAndDate.AutoSize = true;
+            this.radioButtonSortByTypeAndDate.Location = new System.Drawing.Point(3, 28);
+            this.radioButtonSortByTypeAndDate.Name = "radioButtonSortByTypeAndDate";
+            this.radioButtonSortByTypeAndDate.Size = new System.Drawing.Size(192, 19);
+            this.radioButtonSortByTypeAndDate.TabIndex = 3;
+            this.radioButtonSortByTypeAndDate.TabStop = true;
+            this.radioButtonSortByTypeAndDate.Text = "radioButtonSortByTypeAndDate";
+            this.radioButtonSortByTypeAndDate.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonSortByTypeAndName
+            // 
+            this.radioButtonSortByTypeAndName.AutoSize = true;
+            this.radioButtonSortByTypeAndName.Location = new System.Drawing.Point(3, 3);
+            this.radioButtonSortByTypeAndName.Name = "radioButtonSortByTypeAndName";
+            this.radioButtonSortByTypeAndName.Size = new System.Drawing.Size(200, 19);
+            this.radioButtonSortByTypeAndName.TabIndex = 4;
+            this.radioButtonSortByTypeAndName.TabStop = true;
+            this.radioButtonSortByTypeAndName.Text = "radioButtonSortByTypeAndName";
+            this.radioButtonSortByTypeAndName.UseVisualStyleBackColor = true;
+            // 
             // SettingsForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -4869,8 +4895,8 @@ namespace SystemTrayMenu.UserInterface
             this.tableLayoutPanelClick.PerformLayout();
             this.groupBoxSorting.ResumeLayout(false);
             this.groupBoxSorting.PerformLayout();
-            this.tableLayoutPanel5.ResumeLayout(false);
-            this.tableLayoutPanel5.PerformLayout();
+            this.tableLayoutPanelSorting.ResumeLayout(false);
+            this.tableLayoutPanelSorting.PerformLayout();
             this.groupBoxHiddenFilesAndFolders.ResumeLayout(false);
             this.groupBoxHiddenFilesAndFolders.PerformLayout();
             this.tableLayoutPanelHiddenFilesAndFolders.ResumeLayout(false);
@@ -5337,7 +5363,7 @@ namespace SystemTrayMenu.UserInterface
         private System.Windows.Forms.Button buttonAppearanceDefault;
         private System.Windows.Forms.CheckBox checkBoxSendHotkeyInsteadKillOtherInstances;
         private System.Windows.Forms.GroupBox groupBoxSorting;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanelSorting;
         private System.Windows.Forms.RadioButton radioButtonSortByDate;
         private System.Windows.Forms.RadioButton radioButtonSortByName;
         private System.Windows.Forms.GroupBox groupBoxDrag;
@@ -5358,5 +5384,7 @@ namespace SystemTrayMenu.UserInterface
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel7;
         private System.Windows.Forms.Button buttonChangeIcoFolder;
         private System.Windows.Forms.TextBox textBoxIcoFolder;
+        private System.Windows.Forms.RadioButton radioButtonSortByTypeAndDate;
+        private System.Windows.Forms.RadioButton radioButtonSortByTypeAndName;
     }
 }

UserInterface/SettingsForm.cs

@@ -155,8 +155,10 @@ namespace SystemTrayMenu.UserInterface
                 groupBoxInternetShortcutIcons.Text = Translator.GetText("Directory of Internet Shortcut Icons");
                 buttonChangeIcoFolder.Text = Translator.GetText("Changing directory");
                 groupBoxSorting.Text = Translator.GetText("Sorting");
-                radioButtonSortByName.Text = Translator.GetText("Sort by name");
-                radioButtonSortByDate.Text = Translator.GetText("Sort by date");
+                radioButtonSortByTypeAndName.Text = Translator.GetText("Sorted by type and name");
+                radioButtonSortByTypeAndDate.Text = Translator.GetText("Sorted by type and date");
+                radioButtonSortByName.Text = Translator.GetText("Sorted by name");
+                radioButtonSortByDate.Text = Translator.GetText("Sorted by date");
                 groupBoxHiddenFilesAndFolders.Text = Translator.GetText("Hidden files and directories");
                 radioButtonSystemSettingsShowHiddenFiles.Text = Translator.GetText("Use operating system settings");
                 radioButtonNeverShowHiddenFiles.Text = Translator.GetText("Never show hidden files, directories or drives");
@@ -459,8 +461,10 @@ namespace SystemTrayMenu.UserInterface
             }
 
             textBoxIcoFolder.Text = Settings.Default.PathIcoDirectory;
-            radioButtonSortByName.Checked = !Settings.Default.SortFolderAndFilesByDate;
-            radioButtonSortByDate.Checked = Settings.Default.SortFolderAndFilesByDate;
+            radioButtonSortByTypeAndName.Checked = Settings.Default.SortByTypeAndNameWindowsExplorerSort;
+            radioButtonSortByTypeAndDate.Checked = Settings.Default.SortByTypeAndDate;
+            radioButtonSortByName.Checked = Settings.Default.SortByName;
+            radioButtonSortByDate.Checked = Settings.Default.SortByDate;
             radioButtonSystemSettingsShowHiddenFiles.Checked = Settings.Default.SystemSettingsShowHiddenFiles;
             radioButtonNeverShowHiddenFiles.Checked = Settings.Default.NeverShowHiddenFiles;
             radioButtonAlwaysShowHiddenFiles.Checked = Settings.Default.AlwaysShowHiddenFiles;
@@ -933,7 +937,10 @@ namespace SystemTrayMenu.UserInterface
             }
 
             Settings.Default.PathIcoDirectory = textBoxIcoFolder.Text;
-            Settings.Default.SortFolderAndFilesByDate = radioButtonSortByDate.Checked;
+            Settings.Default.SortByTypeAndNameWindowsExplorerSort = radioButtonSortByTypeAndName.Checked;
+            Settings.Default.SortByTypeAndDate = radioButtonSortByTypeAndDate.Checked;
+            Settings.Default.SortByName = radioButtonSortByName.Checked;
+            Settings.Default.SortByDate = radioButtonSortByDate.Checked;
             Settings.Default.SystemSettingsShowHiddenFiles = radioButtonSystemSettingsShowHiddenFiles.Checked;
             Settings.Default.AlwaysShowHiddenFiles = radioButtonAlwaysShowHiddenFiles.Checked;
             Settings.Default.NeverShowHiddenFiles = radioButtonNeverShowHiddenFiles.Checked;