diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9747e8ce4..9b39177eb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -238,7 +238,6 @@
     <string name="set_bar_action">Vlastní akce lišty přehrávání</string>
     <string name="set_bar_action_next">Přeskočit na další</string>
     <string name="set_bar_action_repeat">Režim opakování</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="lbl_equalizer">Ekvalizér</string>
     <string name="desc_exit">Zastavit přehrávání</string>
     <string name="set_separators_and">Ampersand (&amp;)</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3021d6d65..e7ef4639c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,6 @@
     <string name="lbl_shuffle">Zufällig</string>
     <string name="set_playback_mode_all">Von allen Lieder abspielen</string>
     <string name="set_playback_mode_album">Von Album abspielen</string>
-    <string name="set_playback_mode_artist">\@string/lbl_play_artist</string>
     <string name="lbl_playback">Aktuelle Wiedergabe</string>
     <string name="lbl_queue">Warteschlange</string>
     <string name="lbl_play_next">Spiele als Nächstes</string>
@@ -232,7 +231,6 @@
     <string name="set_bar_action">Angepasste Wiedergabeaktionstaste</string>
     <string name="set_bar_action_next">Zum nächsten Song gehen</string>
     <string name="set_bar_action_repeat">Wiederholungsmodus</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="desc_exit">Wiedergabe anhalten</string>
     <string name="lbl_compilation_live">Live-Kompilation</string>
     <string name="lbl_compilation_remix">Remix-Kompilation</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 3499db19d..9adefa121 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -92,7 +92,6 @@
     <string name="set_library_song_playback_mode">Kada se reproducira iz zbirke</string>
     <string name="set_detail_song_playback_mode">Kada se reproducira iz detalja o predmetu</string>
     <string name="set_playback_mode_all">Reproduciraj od svih pjesama</string>
-    <string name="set_playback_mode_artist">\@string/lbl_play_artist</string>
     <string name="set_reindex">Ponovno učitaj glazbu</string>
     <string name="set_reindex_desc">Može izbrisati stanje reprodukcije</string>
     <string name="set_dirs">Mape glazbe</string>
@@ -238,6 +237,5 @@
     <string name="lbl_equalizer">Ekvilajzer</string>
     <string name="set_bar_action_next">Prijeđi na sljedeću</string>
     <string name="set_bar_action_repeat">Način ponavljanja</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="lbl_go_genre">Idi na žanr</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 93a61e39e..27a4b5f15 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -208,7 +208,6 @@
     <string name="set_reindex">Perkrauti muziką</string>
     <string name="set_reindex_desc">Gali nuvalyti grojimo būseną</string>
     <string name="set_bar_action">Pasirinktinis grojimo juostos veiksmas</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="set_alt_shuffle">Pirmenybė teikiama išmaišymo veiksmui</string>
     <string name="err_did_not_restore">Jokios grojimo būsenos nepavyko atkurti</string>
     <string name="set_pre_amp">„ReplayGain“ išankstinis stiprintuvas</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5f4ecbe32..b2b6ab8a0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -162,7 +162,6 @@
     <string name="set_bar_action">Akcja na pasku odtwarzania</string>
     <string name="set_bar_action_next">Następny utwór</string>
     <string name="set_bar_action_repeat">Powtórz</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="set_replay_gain">Ustawienie ReplayGain</string>
     <string name="set_replay_gain_dynamic">Preferuj album, jeśli takowy jest odtwarzany</string>
     <string name="set_library_song_playback_mode">Odtwarzając utwór z widoku biblioteki</string>
@@ -185,7 +184,6 @@
     <string name="desc_tab_handle">Przesuń kartę</string>
     <string name="desc_artist_image">Wizerunek artysty dla %s</string>
     <string name="lng_indexing">Ładuję bibliotekę muzyczną…</string>
-    <string name="set_playback_mode_artist">\@string/lbl_play_artist</string>
     <string name="set_show_covers_desc">Wyłącz, aby zmniejszyć użycie pamięci</string>
     <string name="set_quality_covers_desc">Zwiększa jakość okładek albumów, ale skutkuje dłuższym czasem ładowanie oraz większym użyciem pamięci</string>
     <string name="set_replay_gain_track">Preferuj utwór</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ce15db916..f689b61fc 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -201,7 +201,6 @@
     <string name="lbl_observing">Monitorando a biblioteca de música</string>
     <string name="set_round_mode">Modo redondo</string>
     <string name="set_bar_action_next">Pular para o próximo</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="set_playback_mode_album">Reproduzir do álbum</string>
     <string name="set_save_state">Salvar estado de reprodução</string>
     <string name="set_wipe_state">Limpar estado de reprodução</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d2b690913..d78a3183a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -233,6 +233,5 @@
     <string name="lbl_genre">Жанр</string>
     <string name="set_bar_action_next">Перейти к следующей</string>
     <string name="set_bar_action_repeat">Режим повтора</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="lbl_equalizer">Эквалайзер</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6c322b095..c540ecdeb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -230,7 +230,6 @@
     <string name="set_bar_action">自定义播放栏动作</string>
     <string name="set_bar_action_repeat">重复模式</string>
     <string name="set_bar_action_next">跳到下一首</string>
-    <string name="set_bar_action_shuffle">\@string/lbl_shuffle</string>
     <string name="lbl_equalizer">均衡器</string>
     <string name="desc_exit">停止播放</string>
     <string name="set_separators_and">与号(&amp;)</string>
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index be6d05c54..e0c1a0ccc 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -65,7 +65,7 @@
     <string-array name="entries_bar_action">
         <item>@string/set_bar_action_next</item>
         <item>@string/set_bar_action_repeat</item>
-        <item>@string/set_bar_action_shuffle</item>
+        <item>@string/lbl_shuffle</item>
     </string-array>
 
     <integer-array name="values_bar_action">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f9c2e009..381a6413f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -180,7 +180,7 @@
     <!-- Skip to next (song) -->
     <string name="set_bar_action_next">Skip to next</string>
     <string name="set_bar_action_repeat">Repeat mode</string>
-    <string name="set_bar_action_shuffle" translatable="false">@string/lbl_shuffle</string>
+    <string name="set_bar_action_shuffle">Shuffle</string>
     <string name="set_alt_action">Use alternate notification action</string>
     <string name="set_alt_repeat">Prefer repeat mode action</string>
     <string name="set_alt_shuffle">Prefer shuffle action</string>
diff --git a/fastlane/metadata/android/zh-Hans/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/full_description.txt
rename to fastlane/metadata/android/zh-CN/full_description.txt
diff --git a/fastlane/metadata/android/zh-Hans/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh-Hans/short_description.txt
rename to fastlane/metadata/android/zh-CN/short_description.txt