From 34b2357a20b12eb88885b082ebae415796e3b0f6 Mon Sep 17 00:00:00 2001
From: k1zn <46452865+k1zn@users.noreply.github.com>
Date: Mon, 31 Oct 2022 13:35:12 +0500
Subject: [PATCH] translate + move music settings above

---
 smali/res/values-ru/strings.xml     |  2 ++
 smali/res/values/strings.xml        |  2 ++
 smali/res/xml/preferences_media.xml | 50 ++++++++++++++---------------
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml
index e462d352f..e02da9efb 100644
--- a/smali/res/values-ru/strings.xml
+++ b/smali/res/values-ru/strings.xml
@@ -6317,4 +6317,6 @@
     <string name="maxquality_title">Максимальное качество</string>
     <string name="maxquality_summ">Открывать видео в максимальном качестве через внешний видеоплеер</string>
     <string name="promotedstickers_title">Не получать промостикеры</string>
+    <string name="useOldAppVer_title">Использовать старый дизайн</string>
+    <string name="useOldAppVer_summ">Работает \"как есть\". Могут быть ошибки</string>
 </resources>
\ No newline at end of file
diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml
index 2f309aa81..048071b40 100644
--- a/smali/res/values/strings.xml
+++ b/smali/res/values/strings.xml
@@ -6455,4 +6455,6 @@ May look like a fake leaving the online"</string>
     <string name="maxquality_title">Maximum quality</string>
     <string name="maxquality_summ">Open video in maximum quality through an external video player</string>
     <string name="promotedstickers_title">Don\'t receive promoted stickers</string>
+    <string name="useOldAppVer_title">Use old music catalog</string>
+    <string name="useOldAppVer_summ">Works \"as is\". There may be errors</string>
 </resources>
diff --git a/smali/res/xml/preferences_media.xml b/smali/res/xml/preferences_media.xml
index 886da6f91..a0246f306 100644
--- a/smali/res/xml/preferences_media.xml
+++ b/smali/res/xml/preferences_media.xml
@@ -24,6 +24,31 @@
             android:summary="@string/pollresults_summ"
             android:title="@string/pollresults_title" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtl_music_settings">
+        <Preference
+            android:key="cached_tracks"
+            android:title="@string/cached_tracks_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="autocache"
+            android:summary="@string/autocache_summ"
+            android:title="@string/autocache_title" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="useOldAppVer"
+            android:summary="@string/useOldAppVer_summ"
+            android:title="@string/useOldAppVer_title" />
+        <com.vtosters.lite.ui.SummaryListPreference
+            android:defaultValue="default"
+            android:dialogTitle="@string/musicdefcatalog_dialogTitle"
+            android:entries="@array/musicdefcatalog_value"
+            android:entryValues="@array/musicdefcatalog"
+            android:key="musicdefcatalog"
+            android:title="@string/musicdefcatalog_title" />
+        <Preference
+            android:key="audio_download"
+            android:title="@string/audio_download_title"/>
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/sett_media">
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
@@ -47,31 +72,6 @@
             android:summary="@string/lastfm_enabled_summ"
             android:title="@string/lastfm_enabled_title" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vtl_music_settings">
-        <Preference
-            android:key="cached_tracks"
-            android:title="@string/cached_tracks_title"/>
-        <Preference
-            android:key="audio_download"
-            android:title="@string/audio_download_title"/>
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="autocache"
-            android:summary="@string/autocache_summ"
-            android:title="@string/autocache_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="useOldAppVer"
-            android:summary="Работает КАК ЕСТЬ. Могут быть ошибки"
-            android:title="Использовать старый дизайн" />
-        <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/musicdefcatalog_dialogTitle"
-            android:entries="@array/musicdefcatalog_value"
-            android:entryValues="@array/musicdefcatalog"
-            android:key="musicdefcatalog"
-            android:title="@string/musicdefcatalog_title" />
-    </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtl_video_settings">
         <Preference
             android:key="download_video"