Crossfade: fix shuffle OR manual skip functionality, verbiage and manual

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23621 a1c6a512-1295-4272-9138-f99709370657

35 files changed, 47 insertions, 47 deletions

diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index ffb2209..66dcc29 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -4674,7 +4674,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 9a7ec98..e221c35 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -1667,7 +1667,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index cfadfa2..6cd45e1 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -9256,7 +9256,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 14b3045..a43eaa2 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -9235,7 +9235,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -9243,7 +9243,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index a5f7a20..f614cde 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -1673,7 +1673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index e519d4b..9d91daa 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -9516,7 +9516,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 8a1c328..ed2690e 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -1690,7 +1690,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 1aee809..94bc191 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1762,15 +1762,15 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
@@ -13233,14 +13233,14 @@
   user: core
   <source>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </source>
   <dest>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </dest>
   <voice>
     *: none
-    crossfade: "Auto Track Skip Only"
+    crossfade: "Automatic Track Change Only"
   </voice>
 </phrase>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 5a91b71..d1fec20 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -8911,7 +8911,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index e3d34d5..5959080 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -9673,7 +9673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index d4d28f4..2e25db7 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -1720,7 +1720,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index db68fa2..200833f 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -1673,7 +1673,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 34960e0..926a533 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -1697,7 +1697,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index 45b885f..4cf8c44 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -1691,7 +1691,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 9cc009d..58103dc 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -1695,7 +1695,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index fab6f69..168789f 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -9693,7 +9693,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 0a16bb7..e2c96e6 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -1759,7 +1759,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index bc6a152..997f8c8 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -1669,7 +1669,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -1677,7 +1677,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index b8665e2..47e75e6 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -9671,15 +9671,15 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 814a48e..c977116 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -9355,7 +9355,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index cda2325..e55ab14 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -8905,7 +8905,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index a6939cf..2a72aa3 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -1697,7 +1697,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index e4a5809..1a13983 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -1688,7 +1688,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index c2a3928..35a3552 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -8224,7 +8224,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index d7e7d96..bccb52f 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -4930,7 +4930,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 3dd1a61..d045a19 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -8761,7 +8761,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index 24f8721..d5ceaaa 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -1672,7 +1672,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index d0ff7a3..acc74e7 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -1694,7 +1694,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 622f41d..03b5a61 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -1671,7 +1671,7 @@
  user: core
  <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
  </source>
  <dest>
     *: none
@@ -1679,7 +1679,7 @@
  </dest>
  <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
  </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 266599a..be470d6 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -1670,7 +1670,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
@@ -1678,7 +1678,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 06747a5..0cc3ed8 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -1687,7 +1687,7 @@
   user: core

   <source>

     *: none

-    crossfade: "Shuffle and Manual Track Skip"

+    crossfade: "Shuffle or Manual Track Skip"

   </source>

   <dest>

     *: none

diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 32b4775..a0ac409 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -1694,7 +1694,7 @@
   user: core
   <source>
     *: none
-    crossfade: "Shuffle and Manual Track Skip"
+    crossfade: "Shuffle or Manual Track Skip"
   </source>
   <dest>
     *: none
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 9bf4c96..da4b76f 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -493,8 +493,8 @@ void pcmbuf_start_track_change(bool auto_skip)
             case CROSSFADE_ENABLE_SHUFFLE:
                 crossfade = global_settings.playlist_shuffle;
                 break;
-            case CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP:
-                crossfade = global_settings.playlist_shuffle && !auto_skip;
+            case CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP:
+                crossfade = global_settings.playlist_shuffle || !auto_skip;
                 break;
             case CROSSFADE_ENABLE_ALWAYS:
                 crossfade = true;
diff --git a/apps/settings.h b/apps/settings.h
index ffadfa9..ea7138c 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -115,7 +115,7 @@ enum {
     CROSSFADE_ENABLE_AUTOSKIP,
     CROSSFADE_ENABLE_MANSKIP,
     CROSSFADE_ENABLE_SHUFFLE,
-    CROSSFADE_ENABLE_SHUFFLE_AND_MANSKIP,
+    CROSSFADE_ENABLE_SHUFFLE_OR_MANSKIP,
     CROSSFADE_ENABLE_ALWAYS,
 };
 #endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 1a9f7f2..9c6c85f 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1166,7 +1166,7 @@ const struct settings_list settings[] = {
     /* crossfade */
     CHOICE_SETTING(F_SOUNDSETTING, crossfade, LANG_CROSSFADE_ENABLE, 0,
                    "crossfade",
-                   "off,auto track skip,man track skip,shuffle,shuffle and man track skip,always",
+                   "off,auto track change,man track skip,shuffle,shuffle or man track skip,always",
                    NULL, 6, ID2P(LANG_OFF), ID2P(LANG_AUTOTRACKSKIP),
                    ID2P(LANG_MANTRACKSKIP), ID2P(LANG_SHUFFLE),
                    ID2P(LANG_SHUFFLE_TRACKSKIP), ID2P(LANG_ALWAYS)),