summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/bulgarian.lang2
-rw-r--r--apps/lang/catala.lang2
-rw-r--r--apps/lang/chinese-simp.lang2
-rw-r--r--apps/lang/chinese-trad.lang4
-rw-r--r--apps/lang/czech.lang2
-rw-r--r--apps/lang/dansk.lang2
-rw-r--r--apps/lang/deutsch.lang2
-rw-r--r--apps/lang/english.lang12
-rw-r--r--apps/lang/espanol.lang2
-rw-r--r--apps/lang/finnish.lang2
-rw-r--r--apps/lang/francais.lang2
-rw-r--r--apps/lang/greek.lang2
-rw-r--r--apps/lang/hebrew.lang2
-rw-r--r--apps/lang/italiano.lang2
-rw-r--r--apps/lang/japanese.lang2
-rw-r--r--apps/lang/korean.lang2
-rw-r--r--apps/lang/lietuviu.lang2
-rw-r--r--apps/lang/magyar.lang4
-rw-r--r--apps/lang/nederlands.lang6
-rw-r--r--apps/lang/norsk-nynorsk.lang2
-rw-r--r--apps/lang/norsk.lang2
-rw-r--r--apps/lang/polski.lang2
-rw-r--r--apps/lang/portugues-brasileiro.lang2
-rw-r--r--apps/lang/portugues.lang2
-rw-r--r--apps/lang/romaneste.lang2
-rw-r--r--apps/lang/russian.lang2
-rw-r--r--apps/lang/srpski.lang2
-rw-r--r--apps/lang/svenska.lang2
-rw-r--r--apps/lang/tagalog.lang4
-rw-r--r--apps/lang/thai.lang4
-rw-r--r--apps/lang/ukrainian.lang2
-rw-r--r--apps/lang/walon.lang2
-rw-r--r--apps/pcmbuf.c4
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_list.c2
35 files changed, 47 insertions, 47 deletions
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ffb2209ce5..66dcc29c94 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -4674,7 +4674,7 @@
4674 user: core 4674 user: core
4675 <source> 4675 <source>
4676 *: none 4676 *: none
4677 crossfade: "Shuffle and Manual Track Skip" 4677 crossfade: "Shuffle or Manual Track Skip"
4678 </source> 4678 </source>
4679 <dest> 4679 <dest>
4680 *: none 4680 *: none
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 9a7ec982cc..e221c35de4 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -1667,7 +1667,7 @@
1667 user: core 1667 user: core
1668 <source> 1668 <source>
1669 *: none 1669 *: none
1670 crossfade: "Shuffle and Manual Track Skip" 1670 crossfade: "Shuffle or Manual Track Skip"
1671 </source> 1671 </source>
1672 <dest> 1672 <dest>
1673 *: none 1673 *: none
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index cfadfa2c85..6cd45e15e5 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -9256,7 +9256,7 @@
9256 user: core 9256 user: core
9257 <source> 9257 <source>
9258 *: none 9258 *: none
9259 crossfade: "Shuffle and Manual Track Skip" 9259 crossfade: "Shuffle or Manual Track Skip"
9260 </source> 9260 </source>
9261 <dest> 9261 <dest>
9262 *: none 9262 *: none
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 14b30457fa..a43eaa2cdd 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -9235,7 +9235,7 @@
9235 user: core 9235 user: core
9236 <source> 9236 <source>
9237 *: none 9237 *: none
9238 crossfade: "Shuffle and Manual Track Skip" 9238 crossfade: "Shuffle or Manual Track Skip"
9239 </source> 9239 </source>
9240 <dest> 9240 <dest>
9241 *: none 9241 *: none
@@ -9243,7 +9243,7 @@
9243 </dest> 9243 </dest>
9244 <voice> 9244 <voice>
9245 *: none 9245 *: none
9246 crossfade: "Shuffle and Manual Track Skip" 9246 crossfade: "Shuffle or Manual Track Skip"
9247 </voice> 9247 </voice>
9248</phrase> 9248</phrase>
9249<phrase> 9249<phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index a5f7a20728..f614cde4d9 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -1673,7 +1673,7 @@
1673 user: core 1673 user: core
1674 <source> 1674 <source>
1675 *: none 1675 *: none
1676 crossfade: "Shuffle and Manual Track Skip" 1676 crossfade: "Shuffle or Manual Track Skip"
1677 </source> 1677 </source>
1678 <dest> 1678 <dest>
1679 *: none 1679 *: none
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index e519d4b2a0..9d91daa2fe 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -9516,7 +9516,7 @@
9516 user: core 9516 user: core
9517 <source> 9517 <source>
9518 *: none 9518 *: none
9519 crossfade: "Shuffle and Manual Track Skip" 9519 crossfade: "Shuffle or Manual Track Skip"
9520 </source> 9520 </source>
9521 <dest> 9521 <dest>
9522 *: none 9522 *: none
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 8a1c328ec4..ed2690e066 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -1690,7 +1690,7 @@
1690 user: core 1690 user: core
1691 <source> 1691 <source>
1692 *: none 1692 *: none
1693 crossfade: "Shuffle and Manual Track Skip" 1693 crossfade: "Shuffle or Manual Track Skip"
1694 </source> 1694 </source>
1695 <dest> 1695 <dest>
1696 *: none 1696 *: none
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1aee8090d9..94bc191b8e 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1762,15 +1762,15 @@
1762 user: core 1762 user: core
1763 <source> 1763 <source>
1764 *: none 1764 *: none
1765 crossfade: "Shuffle and Manual Track Skip" 1765 crossfade: "Shuffle or Manual Track Skip"
1766 </source> 1766 </source>
1767 <dest> 1767 <dest>
1768 *: none 1768 *: none
1769 crossfade: "Shuffle and Manual Track Skip" 1769 crossfade: "Shuffle or Manual Track Skip"
1770 </dest> 1770 </dest>
1771 <voice> 1771 <voice>
1772 *: none 1772 *: none
1773 crossfade: "Shuffle and Manual Track Skip" 1773 crossfade: "Shuffle or Manual Track Skip"
1774 </voice> 1774 </voice>
1775</phrase> 1775</phrase>
1776<phrase> 1776<phrase>
@@ -13233,14 +13233,14 @@
13233 user: core 13233 user: core
13234 <source> 13234 <source>
13235 *: none 13235 *: none
13236 crossfade: "Auto Track Skip Only" 13236 crossfade: "Automatic Track Change Only"
13237 </source> 13237 </source>
13238 <dest> 13238 <dest>
13239 *: none 13239 *: none
13240 crossfade: "Auto Track Skip Only" 13240 crossfade: "Automatic Track Change Only"
13241 </dest> 13241 </dest>
13242 <voice> 13242 <voice>
13243 *: none 13243 *: none
13244 crossfade: "Auto Track Skip Only" 13244 crossfade: "Automatic Track Change Only"
13245 </voice> 13245 </voice>
13246</phrase> 13246</phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 5a91b71da9..d1fec20154 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -8911,7 +8911,7 @@
8911 user: core 8911 user: core
8912 <source> 8912 <source>
8913 *: none 8913 *: none
8914 crossfade: "Shuffle and Manual Track Skip" 8914 crossfade: "Shuffle or Manual Track Skip"
8915 </source> 8915 </source>
8916 <dest> 8916 <dest>
8917 *: none 8917 *: none
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index e3d34d55b4..5959080864 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -9673,7 +9673,7 @@
9673 user: core 9673 user: core
9674 <source> 9674 <source>
9675 *: none 9675 *: none
9676 crossfade: "Shuffle and Manual Track Skip" 9676 crossfade: "Shuffle or Manual Track Skip"
9677 </source> 9677 </source>
9678 <dest> 9678 <dest>
9679 *: none 9679 *: none
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index d4d28f4574..2e25db7cad 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -1720,7 +1720,7 @@
1720 user: core 1720 user: core
1721 <source> 1721 <source>
1722 *: none 1722 *: none
1723 crossfade: "Shuffle and Manual Track Skip" 1723 crossfade: "Shuffle or Manual Track Skip"
1724 </source> 1724 </source>
1725 <dest> 1725 <dest>
1726 *: none 1726 *: none
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index db68fa2ed5..200833f07f 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -1673,7 +1673,7 @@
1673 user: core 1673 user: core
1674 <source> 1674 <source>
1675 *: none 1675 *: none
1676 crossfade: "Shuffle and Manual Track Skip" 1676 crossfade: "Shuffle or Manual Track Skip"
1677 </source> 1677 </source>
1678 <dest> 1678 <dest>
1679 *: none 1679 *: none
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 34960e0e2d..926a533194 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -1697,7 +1697,7 @@
1697 user: core 1697 user: core
1698 <source> 1698 <source>
1699 *: none 1699 *: none
1700 crossfade: "Shuffle and Manual Track Skip" 1700 crossfade: "Shuffle or Manual Track Skip"
1701 </source> 1701 </source>
1702 <dest> 1702 <dest>
1703 *: none 1703 *: none
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 45b885f0b6..4cf8c44fe6 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -1691,7 +1691,7 @@
1691 user: core 1691 user: core
1692 <source> 1692 <source>
1693 *: none 1693 *: none
1694 crossfade: "Shuffle and Manual Track Skip" 1694 crossfade: "Shuffle or Manual Track Skip"
1695 </source> 1695 </source>
1696 <dest> 1696 <dest>
1697 *: none 1697 *: none
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 9cc009d9a6..58103dc84e 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -1695,7 +1695,7 @@
1695 user: core 1695 user: core
1696 <source> 1696 <source>
1697 *: none 1697 *: none
1698 crossfade: "Shuffle and Manual Track Skip" 1698 crossfade: "Shuffle or Manual Track Skip"
1699 </source> 1699 </source>
1700 <dest> 1700 <dest>
1701 *: none 1701 *: none
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index fab6f69f37..168789f803 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -9693,7 +9693,7 @@
9693 user: core 9693 user: core
9694 <source> 9694 <source>
9695 *: none 9695 *: none
9696 crossfade: "Shuffle and Manual Track Skip" 9696 crossfade: "Shuffle or Manual Track Skip"
9697 </source> 9697 </source>
9698 <dest> 9698 <dest>
9699 *: none 9699 *: none
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 0a16bb7bd9..e2c96e65c2 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -1759,7 +1759,7 @@
1759 user: core 1759 user: core
1760 <source> 1760 <source>
1761 *: none 1761 *: none
1762 crossfade: "Shuffle and Manual Track Skip" 1762 crossfade: "Shuffle or Manual Track Skip"
1763 </source> 1763 </source>
1764 <dest> 1764 <dest>
1765 *: none 1765 *: none
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index bc6a152eb2..997f8c80a1 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -1669,7 +1669,7 @@
1669 user: core 1669 user: core
1670 <source> 1670 <source>
1671 *: none 1671 *: none
1672 crossfade: "Shuffle and Manual Track Skip" 1672 crossfade: "Shuffle or Manual Track Skip"
1673 </source> 1673 </source>
1674 <dest> 1674 <dest>
1675 *: none 1675 *: none
@@ -1677,7 +1677,7 @@
1677 </dest> 1677 </dest>
1678 <voice> 1678 <voice>
1679 *: none 1679 *: none
1680 crossfade: "Shuffle and Manual Track Skip" 1680 crossfade: "Shuffle or Manual Track Skip"
1681 </voice> 1681 </voice>
1682</phrase> 1682</phrase>
1683<phrase> 1683<phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index b8665e2f78..47e75e63f7 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -9671,15 +9671,15 @@
9671 user: core 9671 user: core
9672 <source> 9672 <source>
9673 *: none 9673 *: none
9674 crossfade: "Shuffle and Manual Track Skip" 9674 crossfade: "Shuffle or Manual Track Skip"
9675 </source> 9675 </source>
9676 <dest> 9676 <dest>
9677 *: none 9677 *: none
9678 crossfade: "Shuffle and Manual Track Skip" 9678 crossfade: "Shuffle or Manual Track Skip"
9679 </dest> 9679 </dest>
9680 <voice> 9680 <voice>
9681 *: none 9681 *: none
9682 crossfade: "Shuffle and Manual Track Skip" 9682 crossfade: "Shuffle or Manual Track Skip"
9683 </voice> 9683 </voice>
9684</phrase> 9684</phrase>
9685<phrase> 9685<phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 814a48efce..c9771161da 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -9355,7 +9355,7 @@
9355 user: core 9355 user: core
9356 <source> 9356 <source>
9357 *: none 9357 *: none
9358 crossfade: "Shuffle and Manual Track Skip" 9358 crossfade: "Shuffle or Manual Track Skip"
9359 </source> 9359 </source>
9360 <dest> 9360 <dest>
9361 *: none 9361 *: none
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index cda23251a8..e55ab1488a 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -8905,7 +8905,7 @@
8905 user: core 8905 user: core
8906 <source> 8906 <source>
8907 *: none 8907 *: none
8908 crossfade: "Shuffle and Manual Track Skip" 8908 crossfade: "Shuffle or Manual Track Skip"
8909 </source> 8909 </source>
8910 <dest> 8910 <dest>
8911 *: none 8911 *: none
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index a6939cfaf7..2a72aa36e8 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -1697,7 +1697,7 @@
1697 user: core 1697 user: core
1698 <source> 1698 <source>
1699 *: none 1699 *: none
1700 crossfade: "Shuffle and Manual Track Skip" 1700 crossfade: "Shuffle or Manual Track Skip"
1701 </source> 1701 </source>
1702 <dest> 1702 <dest>
1703 *: none 1703 *: none
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index e4a5809314..1a13983770 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -1688,7 +1688,7 @@
1688 user: core 1688 user: core
1689 <source> 1689 <source>
1690 *: none 1690 *: none
1691 crossfade: "Shuffle and Manual Track Skip" 1691 crossfade: "Shuffle or Manual Track Skip"
1692 </source> 1692 </source>
1693 <dest> 1693 <dest>
1694 *: none 1694 *: none
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index c2a39288e6..35a3552a2f 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -8224,7 +8224,7 @@
8224 user: core 8224 user: core
8225 <source> 8225 <source>
8226 *: none 8226 *: none
8227 crossfade: "Shuffle and Manual Track Skip" 8227 crossfade: "Shuffle or Manual Track Skip"
8228 </source> 8228 </source>
8229 <dest> 8229 <dest>
8230 *: none 8230 *: none
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index d7e7d96fa0..bccb52f73f 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -4930,7 +4930,7 @@
4930 user: core 4930 user: core
4931 <source> 4931 <source>
4932 *: none 4932 *: none
4933 crossfade: "Shuffle and Manual Track Skip" 4933 crossfade: "Shuffle or Manual Track Skip"
4934 </source> 4934 </source>
4935 <dest> 4935 <dest>
4936 *: none 4936 *: none
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 3dd1a617fe..d045a19621 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -8761,7 +8761,7 @@
8761 user: core 8761 user: core
8762 <source> 8762 <source>
8763 *: none 8763 *: none
8764 crossfade: "Shuffle and Manual Track Skip" 8764 crossfade: "Shuffle or Manual Track Skip"
8765 </source> 8765 </source>
8766 <dest> 8766 <dest>
8767 *: none 8767 *: none
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 24f8721f32..d5ceaaad2b 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -1672,7 +1672,7 @@
1672 user: core 1672 user: core
1673 <source> 1673 <source>
1674 *: none 1674 *: none
1675 crossfade: "Shuffle and Manual Track Skip" 1675 crossfade: "Shuffle or Manual Track Skip"
1676 </source> 1676 </source>
1677 <dest> 1677 <dest>
1678 *: none 1678 *: none
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index d0ff7a3e93..acc74e78c5 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -1694,7 +1694,7 @@
1694 user: core 1694 user: core
1695 <source> 1695 <source>
1696 *: none 1696 *: none
1697 crossfade: "Shuffle and Manual Track Skip" 1697 crossfade: "Shuffle or Manual Track Skip"
1698 </source> 1698 </source>
1699 <dest> 1699 <dest>
1700 *: none 1700 *: none
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 622f41d126..03b5a61ba2 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -1671,7 +1671,7 @@
1671 user: core 1671 user: core
1672 <source> 1672 <source>
1673 *: none 1673 *: none
1674 crossfade: "Shuffle and Manual Track Skip" 1674 crossfade: "Shuffle or Manual Track Skip"
1675 </source> 1675 </source>
1676 <dest> 1676 <dest>
1677 *: none 1677 *: none
@@ -1679,7 +1679,7 @@
1679 </dest> 1679 </dest>
1680 <voice> 1680 <voice>
1681 *: none 1681 *: none
1682 crossfade: "Shuffle and Manual Track Skip" 1682 crossfade: "Shuffle or Manual Track Skip"
1683 </voice> 1683 </voice>
1684</phrase> 1684</phrase>
1685<phrase> 1685<phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 266599a84c..be470d6d32 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -1670,7 +1670,7 @@
1670 user: core 1670 user: core
1671 <source> 1671 <source>
1672 *: none 1672 *: none
1673 crossfade: "Shuffle and Manual Track Skip" 1673 crossfade: "Shuffle or Manual Track Skip"
1674 </source> 1674 </source>
1675 <dest> 1675 <dest>
1676 *: none 1676 *: none
@@ -1678,7 +1678,7 @@
1678 </dest> 1678 </dest>
1679 <voice> 1679 <voice>
1680 *: none 1680 *: none
1681 crossfade: "Shuffle and Manual Track Skip" 1681 crossfade: "Shuffle or Manual Track Skip"
1682 </voice> 1682 </voice>
1683</phrase> 1683</phrase>
1684<phrase> 1684<phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 06747a5d9e..0cc3ed8e1d 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -1687,7 +1687,7 @@
1687 user: core 1687 user: core
1688 <source> 1688 <source>
1689 *: none 1689 *: none
1690 crossfade: "Shuffle and Manual Track Skip" 1690 crossfade: "Shuffle or Manual Track Skip"
1691 </source> 1691 </source>
1692 <dest> 1692 <dest>
1693 *: none 1693 *: none
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 32b4775495..a0ac409ea8 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -1694,7 +1694,7 @@
1694 user: core 1694 user: core
1695 <source> 1695 <source>
1696 *: none 1696 *: none
1697 crossfade: "Shuffle and Manual Track Skip" 1697 crossfade: "Shuffle or Manual Track Skip"
1698 </source> 1698 </source>
1699 <dest> 1699 <dest>
1700 *: none 1700 *: none
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 9bf4c96233..da4b76fc20 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -493,8 +493,8 @@ void pcmbuf_start_track_change(bool auto_skip)
493 case CROSSFADE_ENABLE_SHUFFLE: 493 case CROSSFADE_ENABLE_SHUFFLE:
494 crossfade = global_settings.playlist_shuffle; 494 crossfade = global_settings.playlist_shuffle;
495 break; 495 break;
496 case CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP: 496 case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP:
497 crossfade = global_settings.playlist_shuffle && !auto_skip; 497 crossfade = global_settings.playlist_shuffle || !auto_skip;
498 break; 498 break;
499 case CROSSFADE_ENABLE_ALWAYS: 499 case CROSSFADE_ENABLE_ALWAYS:
500 crossfade = true; 500 crossfade = true;
diff --git a/apps/settings.h b/apps/settings.h
index ffadfa9eee..ea7138c8b0 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -115,7 +115,7 @@ enum {
115 CROSSFADE_ENABLE_AUTOSKIP, 115 CROSSFADE_ENABLE_AUTOSKIP,
116 CROSSFADE_ENABLE_MANSKIP, 116 CROSSFADE_ENABLE_MANSKIP,
117 CROSSFADE_ENABLE_SHUFFLE, 117 CROSSFADE_ENABLE_SHUFFLE,
118 CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP, 118 CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP,
119 CROSSFADE_ENABLE_ALWAYS, 119 CROSSFADE_ENABLE_ALWAYS,
120}; 120};
121#endif 121#endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 1a9f7f2d6e..9c6c85fa61 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1166,7 +1166,7 @@ const struct settings_list settings[] = {
1166 /* crossfade */ 1166 /* crossfade */
1167 CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0, 1167 CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0,
1168 "crossfade", 1168 "crossfade",
1169 "off,auto track skip,man track skip,shuffle,shuffle and man track skip,always", 1169 "off,auto track change,man track skip,shuffle,shuffle or man track skip,always",
1170 NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP), 1170 NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP),
1171 ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE), 1171 ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE),
1172 ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)), 1172 ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)),
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 23:21:46 +0000