update sorting strings

README.md

@@ -260,11 +260,11 @@ It's not just simply playing music; different playback modes are supported:
 - `Audiobook`=> single file or playlist/folder; last play position (file and playlist) is saved
   (when pushing pause or moving to another track) and reused next time
 - `Audiobook (loop)` => same as audiobook but loops forever
-- `Folder/playlist (alph. sorted)` => plays all tracks in alph. order from a folder one time
+- `Folder/playlist (sorted)` => plays all tracks in order from a folder one time
 - `Folder/playlist (random order)` => plays all tracks in random order from a folder one time
-- `Folder/playlist (alph. sorted)` => plays all tracks in alph. order from a folder forever
+- `Folder/playlist (sorted)` => plays all tracks in order from a folder forever
 - `Folder/playlist (random order)` => plays all tracks in random order from a folder forever
-- `All tracks of a random subdirectory (sorted alph.)` => plays of tracks in alph. order of a
+- `All tracks of a random subdirectory (sorted)` => plays of tracks in order of a
   randomly picked subdirectory of a given directory
 - `All tracks of a random subdirectory (random order)` => plays all tracks in random order of a
   randomly picked subdirectory of a given directory

html/locales/en.json

@@ -133,11 +133,11 @@
                     "12":"Single track of a directory (random). Followed by sleep.",
                     "3":"Audiobook",
                     "4":"Audiobook (loop)",
-                    "5":"All tracks of a directory (sorted alph.)",
+                    "5":"All tracks of a directory (sorted)",
                     "6":"All tracks of a directory (random)",
-                    "7":"All tracks of a directory (sorted alph., loop)",
+                    "7":"All tracks of a directory (sorted, loop)",
                     "9":"All tracks of a directory (random, loop)",
-                    "13":"All tracks of a random subdirectory (sorted alph.)",
+                    "13":"All tracks of a random subdirectory (sorted)",
                     "14":"All tracks of a random subdirectory (random)",
                     "8":"Webradio",
                     "11":"List (files from SD and/or webstreams) from local .m3u-File"

html/locales/fr.json

@@ -133,11 +133,11 @@
                     "12":"Piste unique d'un répertoire (aléatoire). Suivi par un mode veille.",
                     "3":"Livre audio",
                     "4":"Livre audio (boucle)",
-                    "5":"Toutes les pistes d'un répertoire (triées alphabétiquement)",
+                    "5":"Toutes les pistes d'un répertoire (triées)",
                     "6":"Toutes les pistes d'un répertoire (aléatoire)",
-                    "7":"Toutes les pistes d'un répertoire (triées alphabétiquement, boucle)",
+                    "7":"Toutes les pistes d'un répertoire (triées, boucle)",
                     "9":"Toutes les pistes d'un répertoire (aléatoire, boucle)",
-                    "13":"Toutes les pistes d'un sous-répertoire aléatoire (triées alphabétiquement)",
+                    "13":"Toutes les pistes d'un sous-répertoire aléatoire (triées)",
                     "14":"Toutes les pistes d'un sous-répertoire aléatoire (aléatoire)",
                     "8":"Webradio",
                     "11":"Liste (fichiers de la carte SD et/ou flux web) à partir d'un fichier .m3u local"

src/AudioPlayer.cpp

@@ -1078,15 +1078,15 @@ void AudioPlayer_TrackQueueDispatcher(const char *_itemToPlay, const uint32_t _l
 			break;
 		}
 
-		case AUDIOBOOK: { // Tracks need to be alph. sorted!
+		case AUDIOBOOK: { // Tracks need to be sorted!
 			gPlayProperties.saveLastPlayPosition = true;
 			Log_Println(modeSingleAudiobook, LOGLEVEL_NOTICE);
 			AudioPlayer_SortPlaylist(musicFiles, gPlayProperties.numberOfTracks);
 			xQueueSend(gTrackQueue, &(musicFiles), 0);
 			break;
 		}
 
-		case AUDIOBOOK_LOOP: { // Tracks need to be alph. sorted!
+		case AUDIOBOOK_LOOP: { // Tracks need to be sorted!
 			gPlayProperties.repeatPlaylist = true;
 			gPlayProperties.saveLastPlayPosition = true;
 			Log_Println(modeSingleAudiobookLoop, LOGLEVEL_NOTICE);

src/LogMessages_DE.cpp

@@ -70,9 +70,9 @@ const char modeSingleTrackLoop[] = "Modus: Einzelner Track in Endlosschleife";
 const char modeSingleTrackRandom[] = "Modus: Einzelner Track eines Ordners zufällig";
 const char modeSingleAudiobook[] = "Modus: Hoerspiel";
 const char modeSingleAudiobookLoop[] = "Modus: Hoerspiel in Endlosschleife";
-const char modeAllTrackAlphSorted[] = "Modus: Spiele alle Tracks (alphabetisch sortiert) des Ordners '%s'";
+const char modeAllTrackAlphSorted[] = "Modus: Spiele alle Tracks (sortiert) des Ordners '%s'";
 const char modeAllTrackRandom[] = "Modus: Spiele alle Tracks (zufällig sortiert) des Ordners '%s'";
-const char modeAllTrackAlphSortedLoop[] = "Modus: Alle Tracks eines Ordners sortiert (alphabetisch) in Endlosschleife";
+const char modeAllTrackAlphSortedLoop[] = "Modus: Alle Tracks eines Ordners sortiert in Endlosschleife";
 const char modeAllTrackRandomLoop[] = "Modus: Alle Tracks eines Ordners zufällig in Endlosschleife";
 const char modeWebstream[] = "Modus: Webstream";
 const char modeWebstreamM3u[] = "Modus: Webstream (lokale .m3u-Datei)";
@@ -95,7 +95,7 @@ const char ledsBrightnessRestored[] = "LED Helligkeit wieder hergestellt.";
 const char modificatorNotallowedWhenIdle[] = "Modifikator kann bei nicht aktivierter Playlist nicht angewendet werden.";
 const char modificatorSleepAtEOT[] = "Modifikator: Sleep-Timer am Ende des Titels aktiviert.";
 const char modificatorSleepAtEOP[] = "Modifikator: Sleep-Timer am Ende der Playlist aktiviert.";
-const char modificatorAllTrackAlphSortedLoop[] = "Modifikator: Alle Titel (alphabetisch sortiert) in Endlosschleife.";
+const char modificatorAllTrackAlphSortedLoop[] = "Modifikator: Alle Titel (sortiert) in Endlosschleife.";
 const char modificatorAllTrackRandomLoop[] = "Modifikator: Alle Titel (zufällige Reihenfolge) in Endlosschleife.";
 const char modificatorCurTrackLoop[] = "Modifikator: Aktueller Titel in Endlosschleife.";
 const char modificatorCurAudiobookLoop[] = "Modifikator: Aktuelles Hörspiel in Endlosschleife.";

src/LogMessages_EN.cpp

@@ -70,9 +70,9 @@ const char modeSingleTrackLoop[] = "Mode: single track as infinite loop";
 const char modeSingleTrackRandom[] = "Mode: single track (random) of directory";
 const char modeSingleAudiobook[] = "Mode: audiobook";
 const char modeSingleAudiobookLoop[] = "Mode: audiobook as infinite loop";
-const char modeAllTrackAlphSorted[] = "Mode: all tracks (in alph. order) of directory '%s'";
+const char modeAllTrackAlphSorted[] = "Mode: all tracks (in order) of directory '%s'";
 const char modeAllTrackRandom[] = "Mode: all tracks (in random. order) of directory '%s";
-const char modeAllTrackAlphSortedLoop[] = "Mode: all tracks (in alph. order) of directory as infinite loop";
+const char modeAllTrackAlphSortedLoop[] = "Mode: all tracks (in order) of directory as infinite loop";
 const char modeAllTrackRandomLoop[] = "Mode: all tracks (in random order) of directory as infinite loop";
 const char modeWebstream[] = "Mode: webstream";
 const char modeWebstreamM3u[] = "Mode: Webstream (local .m3u-file)";
@@ -96,7 +96,7 @@ const char ledsBrightnessRestored[] = "LED brightness restored.";
 const char modificatorNotallowedWhenIdle[] = "Modificator cannot be applied while playlist is inactive.";
 const char modificatorSleepAtEOT[] = "Modificator: adjusted sleep-timer to after end of current track.";
 const char modificatorSleepAtEOP[] = "Modificator: adjusted sleep-timer to after end of playlist.";
-const char modificatorAllTrackAlphSortedLoop[] = "Modificator: adjusted to all tracks (in alph. order) as infinite loop.";
+const char modificatorAllTrackAlphSortedLoop[] = "Modificator: adjusted to all tracks (in order) as infinite loop.";
 const char modificatorAllTrackRandomLoop[] = "Modificator: adjusted to all tracks (in random order) as infinite loop.";
 const char modificatorCurTrackLoop[] = "Modificator: adjusted to current track as infinite loop.";
 const char modificatorCurAudiobookLoop[] = "Modificator: adjusted to current audiobook as infinite loop.";

src/LogMessages_FR.cpp

@@ -69,9 +69,9 @@ const char modeSingleTrackLoop[] = "Mode : piste unique en boucle infinie";
 const char modeSingleTrackRandom[] = "Mode : piste unique (aléatoire) du répertoire";
 const char modeSingleAudiobook[] = "Mode : livre audio";
 const char modeSingleAudiobookLoop[] = "Mode : livre audio en boucle infinie";
-const char modeAllTrackAlphSorted[] = "Mode : toutes les pistes (par ordre alphabétique) du répertoire '%s'";
+const char modeAllTrackAlphSorted[] = "Mode : toutes les pistes (par ordre) du répertoire '%s'";
 const char modeAllTrackRandom[] = "Mode : toutes les pistes (par ordre aléatoire) du répertoire '%s'";
-const char modeAllTrackAlphSortedLoop[] = "Mode : toutes les pistes (par ordre alphabétique) du répertoire en boucle infinie";
+const char modeAllTrackAlphSortedLoop[] = "Mode : toutes les pistes (par ordre) du répertoire en boucle infinie";
 const char modeAllTrackRandomLoop[] = "Mode : toutes les pistes (par ordre aléatoire) du répertoire en boucle infinie";
 const char modeWebstream[] = "Mode : diffusion Web";
 const char modeWebstreamM3u[] = "Mode : diffusion Web (fichier .m3u local)";
@@ -94,7 +94,7 @@ const char ledsBrightnessRestored[] = "Luminosité des LED restaurée.";
 const char modificatorNotallowedWhenIdle[] = "Le modificateur ne peut pas être appliqué lorsque la liste de lecture est inactive.";
 const char modificatorSleepAtEOT[] = "Modificateur : minuteur d'arrêt ajusté après la fin de la piste en cours.";
 const char modificatorSleepAtEOP[] = "Modificateur : minuteur d'arrêt ajusté après la fin de la liste de lecture.";
-const char modificatorAllTrackAlphSortedLoop[] = "Modificateur : ajusté à toutes les pistes (par ordre alphabétique) en boucle infinie.";
+const char modificatorAllTrackAlphSortedLoop[] = "Modificateur : ajusté à toutes les pistes (par ordre) en boucle infinie.";
 const char modificatorAllTrackRandomLoop[] = "Modificateur : ajusté à toutes les pistes (par ordre aléatoire) en boucle infinie.";
 const char modificatorCurTrackLoop[] = "Modificateur : ajusté à la piste en cours en boucle infinie.";
 const char modificatorCurAudiobookLoop[] = "Modificateur : ajusté au livre audio en cours en boucle infinie.";

src/values.h

@@ -22,9 +22,9 @@
 #define SINGLE_TRACK_OF_DIR_RANDOM								  12 // Play a single track of a directory and fall asleep subsequently
 #define AUDIOBOOK												  3 // Single track, can save last play-position
 #define AUDIOBOOK_LOOP											  4 // Single track as infinite-loop, can save last play-position
-#define ALL_TRACKS_OF_DIR_SORTED								  5 // Play all files of a directory (alph. sorted)
+#define ALL_TRACKS_OF_DIR_SORTED								  5 // Play all files of a directory (sorted)
 #define ALL_TRACKS_OF_DIR_RANDOM								  6 // Play all files of a directory (randomized)
-#define ALL_TRACKS_OF_DIR_SORTED_LOOP							  7 // Play all files of a directory (alph. sorted) in infinite-loop
+#define ALL_TRACKS_OF_DIR_SORTED_LOOP							  7 // Play all files of a directory (sorted) in infinite-loop
 #define ALL_TRACKS_OF_DIR_RANDOM_LOOP							  9 // Play all files of a directory (randomized) in infinite-loop
 #define RANDOM_SUBDIRECTORY_OF_DIRECTORY						  13 // Picks a random subdirectory from a given directory and do ALL_TRACKS_OF_DIR_SORTED
 #define RANDOM_SUBDIRECTORY_OF_DIRECTORY_ALL_TRACKS_OF_DIR_RANDOM 14 // Picks a random subdirectory from a given directory and do ALL_TRACKS_OF_DIR_RANDOM