From 70835d757fd0c2dccdffe73b347d603618f74da3 Mon Sep 17 00:00:00 2001
From: LagradOst <balt.758@gmail.com>
Date: Sat, 4 Sep 2021 01:24:47 +0200
Subject: [PATCH] string reorder for better translation

---
 .../movieproviders/AsiaFlixProvider.kt        |  2 +
 .../cloudstream3/ui/search/SearchFragment.kt  |  2 +-
 .../res/layout/download_child_episode.xml     |  2 +-
 .../res/layout/download_header_episode.xml    |  2 +-
 app/src/main/res/layout/fragment_home.xml     | 10 +--
 app/src/main/res/layout/fragment_result.xml   |  2 +-
 app/src/main/res/layout/fragment_search.xml   |  2 +-
 app/src/main/res/layout/home_result_grid.xml  |  2 +-
 .../main/res/layout/player_custom_layout.xml  |  8 +--
 .../layout/player_select_source_and_subs.xml  |  2 +-
 app/src/main/res/layout/result_episode.xml    |  2 +-
 .../main/res/layout/result_episode_large.xml  |  2 +-
 .../main/res/layout/search_result_grid.xml    |  2 +-
 .../layout/search_result_super_compact.xml    |  3 +-
 app/src/main/res/layout/subtitle_settings.xml |  2 +-
 app/src/main/res/values-fr/strings.xml        | 30 ++++-----
 app/src/main/res/values-gr/strings.xml        | 22 +++----
 app/src/main/res/values-mo/string.xml         | 30 ++++-----
 app/src/main/res/values-nl/strings.xml        | 20 +++---
 app/src/main/res/values-sv/strings.xml        | 29 +++++----
 app/src/main/res/values-tl/strings.xml        | 28 ++++-----
 app/src/main/res/values/strings.xml           | 61 +++++++++++--------
 app/src/main/res/xml/settings.xml             |  2 +-
 23 files changed, 138 insertions(+), 129 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AsiaFlixProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AsiaFlixProvider.kt
index 592fb003..a36edec1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AsiaFlixProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AsiaFlixProvider.kt
@@ -21,6 +21,8 @@ class AsiaFlixProvider : MainAPI() {
         get() = true
     override val hasChromecastSupport: Boolean
         get() = false
+    override val supportedTypes: Set<TvType>
+        get() = setOf(TvType.TvSeries)
 
     private val apiUrl = "https://api.asiaflix.app/api/v2"
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index 9949627b..e1bb8e13 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -131,7 +131,7 @@ class SearchFragment : Fragment() {
                     Pair(R.string.cartoons, listOf(TvType.Cartoon)),
                     Pair(R.string.anime, listOf(TvType.Anime, TvType.ONA, TvType.AnimeMovie)),
                     Pair(R.string.torrent, listOf(TvType.Torrent)),
-                )
+                ).filter { item -> apis.any { api -> api.supportedTypes.any { type -> item.second.contains(type) } } }
 
                 val arrayAdapter2 = ArrayAdapter<String>(searchView.context, R.layout.sort_bottom_single_choice)
                 arrayAdapter2.addAll(typeChoices.map { getString(it.first) })
diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml
index 263b750f..67a79731 100644
--- a/app/src/main/res/layout/download_child_episode.xml
+++ b/app/src/main/res/layout/download_child_episode.xml
@@ -31,7 +31,7 @@
                 android:layout_gravity="center_vertical"
                 android:id="@+id/download_child_episode_play"
                 android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_des"/>
+                android:contentDescription="@string/episode_play_img_des"/>
         <LinearLayout
                 android:layout_gravity="center_vertical"
                 android:orientation="vertical"
diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml
index c7ddb23d..06383d6b 100644
--- a/app/src/main/res/layout/download_header_episode.xml
+++ b/app/src/main/res/layout/download_header_episode.xml
@@ -26,7 +26,7 @@
                     android:scaleType="centerCrop"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:contentDescription="@string/episode_poster">
+                    android:contentDescription="@string/episode_poster_img_des">
             </ImageView>
         </androidx.cardview.widget.CardView>
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 621c4fa3..dd6075d6 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -31,7 +31,7 @@
                 android:src="@drawable/ic_outline_settings_24"
                 android:layout_width="25dp"
                 android:layout_height="25dp"
-                android:contentDescription="@string/home_change_provider">
+                android:contentDescription="@string/home_change_provider_img_des">
         </ImageView>
     </FrameLayout>
 
@@ -93,7 +93,7 @@
                     android:src="@drawable/ic_outline_settings_24"
                     android:layout_width="25dp"
                     android:layout_height="25dp"
-                    android:contentDescription="@string/home_change_provider">
+                    android:contentDescription="@string/home_change_provider_img_des">
             </ImageView>
             <LinearLayout
                     android:layout_marginTop="-20dp"
@@ -109,7 +109,7 @@
                         android:scaleType="centerCrop"
                         android:layout_width="150dp"
                         android:layout_height="212dp"
-                        android:contentDescription="@string/home_main_poster">
+                        android:contentDescription="@string/home_main_poster_img_des">
                 </ImageView>
                 <TextView
                         android:id="@+id/home_main_text"
@@ -137,7 +137,7 @@
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:padding="10dp"
-                            android:contentDescription="@string/home_next_random">
+                            android:contentDescription="@string/home_next_random_img_des">
                     </ImageView>
                     <com.google.android.material.button.MaterialButton
                             style="@style/WhiteButton"
@@ -170,7 +170,7 @@
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:padding="10dp"
-                            android:contentDescription="@string/home_next_random">
+                            android:contentDescription="@string/home_next_random_img_des">
                     </ImageView>
                 </LinearLayout>
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index fc27eb2b..9977bef5 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -162,7 +162,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 tools:src="@drawable/example_poster"
-                                android:contentDescription="@string/result_poster"/>
+                                android:contentDescription="@string/result_poster_img_des"/>
                     </androidx.cardview.widget.CardView>
 
 
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 485676cf..8e1bb222 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -57,7 +57,7 @@
                 android:layout_margin="10dp"
                 android:layout_gravity="end|center_vertical"
                 app:tint="?attr/textColor"
-                android:contentDescription="@string/change_providers_des">
+                android:contentDescription="@string/change_providers_img_des">
         </ImageView>
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/home_result_grid.xml b/app/src/main/res/layout/home_result_grid.xml
index beb10c19..778a32de 100644
--- a/app/src/main/res/layout/home_result_grid.xml
+++ b/app/src/main/res/layout/home_result_grid.xml
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:foreground="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/search_poster_des"/>
+            android:contentDescription="@string/search_poster_img_des"/>
     <ImageView
             android:focusable="false"
             android:clickable="false"
diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml
index 40f5048f..35a40bb4 100644
--- a/app/src/main/res/layout/player_custom_layout.xml
+++ b/app/src/main/res/layout/player_custom_layout.xml
@@ -500,7 +500,7 @@
                             <TextView
                                     android:layout_width="match_parent"
                                     android:layout_height="match_parent"
-                                    android:text="@string/lock"
+                                    android:text="@string/video_lock"
                                     android:gravity="center"
                                     android:paddingStart="10dp"
                                     android:paddingEnd="10dp"
@@ -552,7 +552,7 @@
                                 <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
-                                        android:text="@string/resize"
+                                        android:text="@string/video_aspect_ratio_resize"
                                         android:gravity="center"
                                         android:paddingStart="10dp"
                                         android:paddingEnd="10dp"
@@ -645,7 +645,7 @@
                                 <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
-                                        android:text="@string/source"
+                                        android:text="@string/video_source"
                                         android:gravity="center"
                                         android:paddingStart="10dp"
 
@@ -691,7 +691,7 @@
                                 <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
-                                        android:text="@string/skip_op"
+                                        android:text="@string/video_skip_op"
                                         android:gravity="start|center"
                                         android:paddingStart="10dp"
 
diff --git a/app/src/main/res/layout/player_select_source_and_subs.xml b/app/src/main/res/layout/player_select_source_and_subs.xml
index 0a534fc4..d44e53a3 100644
--- a/app/src/main/res/layout/player_select_source_and_subs.xml
+++ b/app/src/main/res/layout/player_select_source_and_subs.xml
@@ -79,7 +79,7 @@
                         android:src="@drawable/ic_outline_settings_24"
                         android:layout_width="25dp"
                         android:layout_height="wrap_content"
-                        android:contentDescription="@string/home_change_provider">
+                        android:contentDescription="@string/home_change_provider_img_des">
                 </ImageView>
             </FrameLayout>
 
diff --git a/app/src/main/res/layout/result_episode.xml b/app/src/main/res/layout/result_episode.xml
index 6f94fc69..e20fa097 100644
--- a/app/src/main/res/layout/result_episode.xml
+++ b/app/src/main/res/layout/result_episode.xml
@@ -52,7 +52,7 @@
                 android:layout_gravity="center_vertical"
                 android:id="@+id/episode_play"
                 android:src="@drawable/ic_baseline_play_arrow_24"
-                android:contentDescription="@string/episode_play_des"/>
+                android:contentDescription="@string/episode_play_img_des"/>
         <TextView
                 android:id="@+id/episode_text"
                 android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/result_episode_large.xml b/app/src/main/res/layout/result_episode_large.xml
index c9634a63..85078803 100644
--- a/app/src/main/res/layout/result_episode_large.xml
+++ b/app/src/main/res/layout/result_episode_large.xml
@@ -32,7 +32,7 @@
                         android:scaleType="centerCrop"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:contentDescription="@string/episode_poster">
+                        android:contentDescription="@string/episode_poster_img_des">
                 </ImageView>
                 <ImageView
                         android:src="@drawable/play_button"
diff --git a/app/src/main/res/layout/search_result_grid.xml b/app/src/main/res/layout/search_result_grid.xml
index 23085402..a19acd07 100644
--- a/app/src/main/res/layout/search_result_grid.xml
+++ b/app/src/main/res/layout/search_result_grid.xml
@@ -29,7 +29,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/search_poster_des"/>
+                android:contentDescription="@string/search_poster_img_des"/>
         <ImageView
                 android:focusable="false"
                 android:clickable="false"
diff --git a/app/src/main/res/layout/search_result_super_compact.xml b/app/src/main/res/layout/search_result_super_compact.xml
index 667f4d87..0121a471 100644
--- a/app/src/main/res/layout/search_result_super_compact.xml
+++ b/app/src/main/res/layout/search_result_super_compact.xml
@@ -33,7 +33,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                    tools:ignore="RtlHardcoded" android:contentDescription="@string/search_poster_des"/>
+                    tools:ignore="RtlHardcoded"
+                    android:contentDescription="@string/search_poster_img_des"/>
         </androidx.cardview.widget.CardView>
 
         <LinearLayout
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index dd3eabf1..d76e5ea1 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -30,7 +30,7 @@
                     android:src="@drawable/subtitles_preview_background"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:contentDescription="@string/preview_background">
+                    android:contentDescription="@string/preview_background_img_des">
             </ImageView>
             <com.google.android.exoplayer2.ui.SubtitleView
                     android:id="@+id/subtitle_text"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cf27ab8b..16dc1862 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -6,14 +6,14 @@
     <string name="title_downloads">Téléchargements</string>
     <string name="title_settings">Paramètres</string>
     <string name="search_hint">Rechercher…</string>
-    <string name="change_providers_des">Changer les fournisseurs</string>
-    <string name="search_poster_des">Miniature</string>
+    <string name="change_providers_img_des">Changer les fournisseurs</string>
+    <string name="search_poster_img_des">Miniature</string>
     <string name="no_data">Auccune Donnée</string>
     <string name="episode_more_options_des">Plus d\'options</string>
-    <string name="episode_play_des">Lire l\'épisode</string>
-    <string name="go_back">Retour</string>
+    <string name="episode_play_img_des">Lire l\'épisode</string>
+    <string name="go_back_img_des">Retour</string>
     <string name="next_episode">Episode suivant</string>
-    <string name="result_poster">Miniature</string>
+    <string name="result_poster_img_des">Miniature</string>
     <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Partager</string>
@@ -34,7 +34,7 @@
     <string name="pick_subtitle">Sous-titres</string>
     <string name="reload_error">Réessayer la connection…</string>
     <string name="result_go_back">Retour</string>
-    <string name="episode_poster">Miniature de l\'Episode</string>
+    <string name="episode_poster_img_des">Miniature de l\'Episode</string>
     <string name="play_episode">Lire l\'Episode</string>
     <string name="need_storage">Permet de télécharger les épisodes</string>
 
@@ -62,11 +62,11 @@
     <string name="pref_disable_acra">Désactiver le rapport de bug automatique</string>
     <string name="home_more_info">Plus d\'informations</string>
     <string name="home_expanded_hide">Cacher</string>
-    <string name="home_main_poster">Poster principal</string>
+    <string name="home_main_poster_img_des">Poster principal</string>
     <string name="home_play">Lecture</string>
     <string name="home_info">Info</string>
-    <string name="home_next_random">Suivant Aléatoire</string>
-    <string name="home_change_provider">Changer le fournisseur</string>
+    <string name="home_next_random_img_des">Suivant Aléatoire</string>
+    <string name="home_change_provider_img_des">Changer le fournisseur</string>
     <string name="filter_bookmarks">Filtrer les marques-pages</string>
     <string name="error_bookmarks_text">Marque-pages</string>
     <string name="action_remove_from_bookmarks">Supprimer</string>
@@ -80,7 +80,7 @@
     <string name="subs_window_color">Couleur de la fenètre</string>
     <string name="subs_edge_type">Type de bordure</string>
     <string name="subs_subtitle_elevation">Elevation des sous-titres</string>
-    <string name="preview_background">Aperçu de l\'arrière-plan</string>
+    <string name="preview_background_img_des">Aperçu de l\'arrière-plan</string>
     <string name="subs_font">Police</string>
     <string name="search_provider_text_providers">Rechercher en utilisant les fournisseurs</string>
     <string name="search_provider_text_types">Rechercher en utilisant les types</string>
@@ -118,7 +118,7 @@
     <string name="double_tap_to_seek_setthings">Tapper deux fois pour rechercher</string>
     <string name="double_tap_to_seek_setthings_des">Tapper deux fois sur le coté droit ou gauche pour avancer ou reculer</string>
     <string name="search">Rechercher</string>
-    <string name="info">Info</string>
+    <string name="settings_info">Info</string>
     <string name="advanced_search">Recherche Avancée</string>
     <string name="advanced_search_des">Donne les résultats séparé par les fournisseur</string>
     <string name="bug_report_setthings_off">N\'envoyer les données que lors d\'un crash</string>
@@ -199,10 +199,10 @@
     <string name="no_update_found">Pas de mise-à-jour trouvés</string>
     <string name="check_for_update">Vérifier les mise-à-jour</string>
 
-    <string name="lock">Verouiller</string>
-    <string name="resize">Redimensionner</string>
-    <string name="source">Source</string>
-    <string name="skip_op">Passer l\'OP</string>
+    <string name="video_lock">Verouiller</string>
+    <string name="video_aspect_ratio_resize">Redimensionner</string>
+    <string name="video_source">Source</string>
+    <string name="video_skip_op">Passer l\'OP</string>
 
     <string name="dont_show_again">Ne pas afficher à nouveau</string>
     <string name="update">Mettre à jour</string>
diff --git a/app/src/main/res/values-gr/strings.xml b/app/src/main/res/values-gr/strings.xml
index cdaab813..eb3376a4 100644
--- a/app/src/main/res/values-gr/strings.xml
+++ b/app/src/main/res/values-gr/strings.xml
@@ -6,17 +6,17 @@
     <string name="title_downloads">Λήψεις</string>
     <string name="title_settings">Ρυθμίσεις</string>
     <string name="search_hint">Ψάξε…</string>
-    <string name="change_providers_des">Αλλαγή Παροχών</string>
+    <string name="change_providers_img_des">Αλλαγή Παροχών</string>
     <string name="search_providers_list_key">search_providers_list</string>
     <string name="search_types_list_key">search_type_list</string>
     <string name="grid_format_key">grid_format</string>
-    <string name="search_poster_des">Πόστερ</string>
+    <string name="search_poster_img_des">Πόστερ</string>
     <string name="no_data">Χωρίς δεδομένα</string>
     <string name="episode_more_options_des">Περισσότερες Επιλογές</string>
-    <string name="episode_play_des">Αναπαραγωγή Επισοδείου</string>
-    <string name="go_back">Πίσω</string>
+    <string name="episode_play_img_des">Αναπαραγωγή Επισοδείου</string>
+    <string name="go_back_img_des">Πίσω</string>
     <string name="next_episode">Επόμενο Επισόδειο</string>
-    <string name="result_poster">Πόστερ</string>
+    <string name="result_poster_img_des">Πόστερ</string>
     <string name="synopsis">Πλοκή</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Μοίρασε</string>
@@ -37,7 +37,7 @@
     <string name="pick_subtitle">Υπότιτλοι</string>
     <string name="reload_error">Ξανά φόρτωσε…</string>
     <string name="result_go_back">Πίσω</string>
-    <string name="episode_poster">Πόστερ</string>
+    <string name="episode_poster_img_des">Πόστερ</string>
     <string name="play_episode">Αναπαραγωγή Επισοδείου</string>
     <string name="need_storage">Δώσε άδεια για την λήψη επισοδείου</string>
     <string name="download">Λήξη</string>
@@ -57,11 +57,11 @@
     <string name="pref_disable_acra">Απενεργοποιήστε την αυτόματη αναφορά σφαλμάτων</string>
     <string name="home_more_info">Παραπάνω πληροφορίες</string>
     <string name="home_expanded_hide">Κρύψιμο</string>
-    <string name="home_main_poster">Κύριο Πόστερ</string>
+    <string name="home_main_poster_img_des">Κύριο Πόστερ</string>
     <string name="home_play">Αναπαραγωγή</string>
     <string name="home_info">Πληροφορίες</string>
-    <string name="home_next_random">Next Random</string>
-    <string name="home_change_provider">Change Provider</string>
+    <string name="home_next_random_img_des">Next Random</string>
+    <string name="home_change_provider_img_des">Change Provider</string>
     <string name="filter_bookmarks">Filter Bookmarks</string>
     <string name="error_bookmarks_text">Bookmarks</string>
     <string name="action_remove_from_bookmarks">Remove</string>
@@ -77,7 +77,7 @@
     <string name="subs_edge_type">Τύπος άκρων</string>
     <string name="subs_subtitle_elevation">Ύψωση υπότιτλων</string>
     <string name="subs_default_reset_toast">Επαναφορά στην προεπιλεγμένη τιμή</string>
-    <string name="preview_background">Προεπισκόπηση φόντου</string>
+    <string name="preview_background_img_des">Προεπισκόπηση φόντου</string>
     <string name="subs_font">Γραμματοσειρά</string>
     <string name="search_provider_text_providers">Αναζήτηση με τους παρόχους</string>
     <string name="search_provider_text_types">Αναζήτηση με τύπους</string>
@@ -118,7 +118,7 @@
     <string name="double_tap_to_seek_setthings">Διπλό πάτημα για seek</string>
     <string name="double_tap_to_seek_setthings_des">Διπλό πάτημα στα αριστερά ή δεξιά για seek μπροστά ή πίσω</string>
     <string name="search">Αναζήτηση</string>
-    <string name="info">Πληροφορείες</string>
+    <string name="settings_info">Πληροφορείες</string>
     <string name="advanced_search">Προχωρημένη Αναζήτηση</string>
     <string name="advanced_search_des">Δίνει τα αποτελέσματα αναζήτησης χωρισμένα ανά πάροχο</string>
     <string name="bug_report_setthings_off">Αποστέλλει δεδομένα μόνο για σφάλματα</string>
diff --git a/app/src/main/res/values-mo/string.xml b/app/src/main/res/values-mo/string.xml
index 373b70dd..3757e64f 100644
--- a/app/src/main/res/values-mo/string.xml
+++ b/app/src/main/res/values-mo/string.xml
@@ -7,14 +7,14 @@
     <string name="title_downloads">ouuhhhooh ooh</string>
     <string name="title_settings">aaaghhoh aauugghh</string>
     <string name="search_hint">haaooh</string>
-    <string name="change_providers_des">ooooo aah ohaooooo</string>
-    <string name="search_poster_des">aaaaaah</string>
+    <string name="change_providers_img_des">ooooo aah ohaooooo</string>
+    <string name="search_poster_img_des">aaaaaah</string>
     <string name="no_data">oooohhoouuh</string>
     <string name="episode_more_options_des">aaaaaoouuhahhh ahh</string>
-    <string name="episode_play_des">ahooo aoohoouuhhaa</string>
-    <string name="go_back">oooohh aauuh</string>
+    <string name="episode_play_img_des">ahooo aoohoouuhhaa</string>
+    <string name="go_back_img_des">oooohh aauuh</string>
     <string name="next_episode">ahhhaaaghh aaaaa</string>
-    <string name="result_poster">ahaauugghh</string>
+    <string name="result_poster_img_des">ahaauugghh</string>
     <string name="result_plot">oohouuhhhaaahhu</string>
     <string name="result_tags">ahhh oouuh</string>
     <string name="result_share">aauuh</string>
@@ -33,7 +33,7 @@
     <string name="pick_subtitle">ahooo ooo-ahah</string>
     <string name="reload_error">aaaghhahaaaaaaaaaaooh</string>
     <string name="result_go_back">aauugghhaaaghh</string>
-    <string name="episode_poster">oouuhahoooooo-ahahoooohh</string>
+    <string name="episode_poster_img_des">oouuhahoooooo-ahahoooohh</string>
     <string name="play_episode">aaaaa oh ohaouuhhh</string>
     <string name="need_storage">ahouuhhhaaaaa ahhaaaghh ahhh</string>
     <string name="download">aauuhahh</string>
@@ -45,11 +45,11 @@
     <string name="pref_disable_acra">ooo-ahahoohahoooooo-ahahouuhhhoouuhaaahhu</string>
     <string name="home_more_info">ahooo a aaaghhouuhhh</string>
     <string name="home_expanded_hide">oh ahhh</string>
-    <string name="home_main_poster">ahhhahaaaaaahhhaaaghh</string>
+    <string name="home_main_poster_img_des">ahhhahaaaaaahhhaaaghh</string>
     <string name="home_play">ooo-ahahouuhhh</string>
     <string name="home_info">aauugghh</string>
-    <string name="home_next_random">aoooohh</string>
-    <string name="home_change_provider">ah ohaaaaghh aaahhu</string>
+    <string name="home_next_random_img_des">aoooohh</string>
+    <string name="home_change_provider_img_des">ah ohaaaaghh aaahhu</string>
     <string name="filter_bookmarks">aaaghh aaaghhoouuh</string>
     <string name="error_bookmarks_text">oouuh ooh</string>
     <string name="action_remove_from_bookmarks">aauuh ooh</string>
@@ -63,7 +63,7 @@
     <string name="subs_window_color">oouuhoooohhah aauugghh</string>
     <string name="subs_edge_type">aaaaaooh</string>
     <string name="subs_subtitle_elevation">oooohhaaaaghh ooh ahhh</string>
-    <string name="preview_background">ahoooooo-ahah ohaaaaaaauuh</string>
+    <string name="preview_background_img_des">ahoooooo-ahah ohaaaaaaauuh</string>
     <string name="subs_font">ooo-ahah</string>
     <string name="search_provider_text_providers">aauuhaauugghhahhh ohaauugghhouuhhh</string>
     <string name="search_provider_text_types">ahhhahoooohhaa ahhhoohahh</string>
@@ -95,7 +95,7 @@
     <string name="swipe_to_change_settings_des">ohahhaaahhuoh ooo-ahahahhhooo-ahah aaaghha oooohhoouuh aaaghhaaaghhooo-ahah</string>
     <string name="double_tap_to_seek_setthings">ahaauuhaaaaaooooo ahooo aauuh aaaghhaooo-ahah</string>
     <string name="search">aauuh</string>
-    <string name="info">aauugghh ah</string>
+    <string name="settings_info">aauugghh ah</string>
     <string name="advanced_search">aah ouuhhhooo-ahah aaaghh</string>
     <string name="advanced_search_des">aauugghh ahahooo ouuhhhahh ooh oouuhahoooahhaaahhu ohaooh oouuhooo-ahah</string>
     <string name="bug_report_setthings_off">aaaaa ahhhahhohoouuhahoooaaaghh aahhhaaaaa</string>
@@ -157,10 +157,10 @@
     <string name="episode_action_reload_links">ahoooaaahhuahaaahhuoha</string>
     <string name="no_update_found">oohaaahhu ah ahhaaaaa ooo-ahah</string>
     <string name="check_for_update">ohaaaahhuhaaahhhaaahhu</string>
-    <string name="lock">ooo-ahah</string>
-    <string name="resize">ohaooo-ahahouuhhh</string>
-    <string name="source">ahohooh</string>
-    <string name="skip_op">aaaaaohaah ooh</string>
+    <string name="video_lock">ooo-ahah</string>
+    <string name="video_aspect_ratio_resize">ohaooo-ahahouuhhh</string>
+    <string name="video_source">ahohooh</string>
+    <string name="video_skip_op">aaaaaohaah ooh</string>
     <string name="dont_show_again">ahh haa ah ooooo</string>
     <string name="update">aaahhuooh ahh</string>
     <string name="download_started">aaaaa oooohh aauugghh</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 07417018..d5bf3b28 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -6,17 +6,17 @@
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Instellingen</string>
     <string name="search_hint">Zoeken…</string>
-    <string name="change_providers_des">Aanbieders wijzigen</string>
+    <string name="change_providers_img_des">Aanbieders wijzigen</string>
     <string name="search_providers_list_key">search_providers_list</string>
     <string name="search_types_list_key">search_type_list</string>
     <string name="grid_format_key">grid_format</string>
-    <string name="search_poster_des">Poster</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="no_data">Geen gegevens</string>
     <string name="episode_more_options_des">Meer Opties</string>
-    <string name="episode_play_des">Aflevering afspelen</string>
-    <string name="go_back">Ga terug</string>
+    <string name="episode_play_img_des">Aflevering afspelen</string>
+    <string name="go_back_img_des">Ga terug</string>
     <string name="next_episode">Volgende aflevering</string>
-    <string name="result_poster">Poster</string>
+    <string name="result_poster_img_des">Poster</string>
     <string name="synopsis">Verhaal</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Deel</string>
@@ -37,7 +37,7 @@
     <string name="pick_subtitle">Ondertitels</string>
     <string name="reload_error">Probeer verbinding opnieuw…</string>
     <string name="result_go_back">Ga terug</string>
-    <string name="episode_poster">Afleveringsposter</string>
+    <string name="episode_poster_img_des">Afleveringsposter</string>
     <string name="play_episode">Aflevering afspelen</string>
     <string name="need_storage">Toestaan om afleveringen te downloaden</string>
     <string name="download">Download</string>
@@ -57,11 +57,11 @@
     <string name="pref_disable_acra">Automatische bugrapportage uitschakelen</string>
     <string name="home_more_info">Meer informatie</string>
     <string name="home_expanded_hide">Verberg</string>
-    <string name="home_main_poster">Hoofd Poster</string>
+    <string name="home_main_poster_img_des">Hoofd Poster</string>
     <string name="home_play">Speel</string>
     <string name="home_info">Info</string>
-    <string name="home_next_random">Volgende willekeurig</string>
-    <string name="home_change_provider">Aanbieder wijzigen</string>
+    <string name="home_next_random_img_des">Volgende willekeurig</string>
+    <string name="home_change_provider_img_des">Aanbieder wijzigen</string>
     <string name="filter_bookmarks">Bladwijzers filteren</string>
     <string name="error_bookmarks_text">Bladwijzers</string>
     <string name="action_remove_from_bookmarks">Verwijderen</string>
@@ -77,7 +77,7 @@
     <string name="subs_edge_type">Randtype</string>
     <string name="subs_subtitle_elevation">Ondertitelhoogte</string>
     <string name="subs_default_reset_toast">Reset naar standaardwaarde</string>
-    <string name="preview_background">Voorbeeld Achtergrond</string>
+    <string name="preview_background_img_des">Voorbeeld Achtergrond</string>
     <string name="subs_font">Lettertype</string>
     <string name="search_provider_text_providers">Zoeken met providers</string>
     <string name="search_provider_text_types">Zoeken met types</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 758d67d7..3e5e82d9 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -10,14 +10,13 @@
     <string name="title_downloads">Nerladdningar</string>
     <string name="title_settings">Instälningar</string>
     <string name="search_hint">Sök…</string>
-    <string name="change_providers_des">Ändra Providers</string>
-    <string name="search_poster_des">Poster</string>
+    <string name="change_providers_img_des">Ändra Providers</string>
+    <string name="search_poster_img_des">Poster</string>
     <string name="no_data">Ingen Data</string>
     <string name="episode_more_options_des">Mer Instälningar</string>
-    <string name="episode_play_des">Spela up avsnitt</string>
-    <string name="go_back">Gå tillbacka</string>
+    <string name="go_back_img_des">Gå tillbacka</string>
     <string name="next_episode">Nästa avsnitt</string>
-    <string name="result_poster">Affisch</string>
+    <string name="result_poster_img_des">Affisch</string>
     <string name="result_plot">Sammanfattning</string>
     <string name="result_tags">Genrer</string>
     <string name="result_share">Dela</string>
@@ -38,7 +37,7 @@
     <string name="pick_subtitle">Undertexter</string>
     <string name="reload_error">Försök ansluta igen…</string>
     <string name="result_go_back">Gå tillbaka</string>
-    <string name="episode_poster">@string/result_poster</string>
+    <string name="episode_poster_img_des">@string/result_poster_img_des</string>
     <string name="play_episode">Spela Avsnitt</string>
     <string name="need_storage">Allow to download episodes</string>
     <string name="download">Ladda ner</string>
@@ -53,11 +52,11 @@
     <string name="pref_disable_acra">Inaktivera automatisk felrapportering</string>
     <string name="home_more_info">Mer information</string>
     <string name="home_expanded_hide">Hide</string>
-    <string name="home_main_poster">@string/result_poster</string>
+    <string name="home_main_poster_img_des">@string/result_poster_img_des</string>
     <string name="home_play">Spela upp</string>
     <string name="home_info">Info</string>
-    <string name="home_next_random">Nästa</string>
-    <string name="home_change_provider">Byt leverantör</string>
+    <string name="home_next_random_img_des">Nästa</string>
+    <string name="home_change_provider_img_des">Byt leverantör</string>
     <string name="filter_bookmarks">Filtrera bokmärken</string>
     <string name="error_bookmarks_text">Bokmärken</string>
     <string name="action_remove_from_bookmarks">Ta bort</string>
@@ -71,7 +70,7 @@
     <string name="subs_window_color">Textfönsterfärg</string>
     <string name="subs_edge_type">Kanttyp</string>
     <string name="subs_subtitle_elevation">Undertextförflyttning</string>
-    <string name="preview_background">Förhandsgranska bakgrund</string>
+    <string name="preview_background_img_des">Förhandsgranska bakgrund</string>
     <string name="subs_font">Font</string>
     <string name="search_provider_text_providers">Sök med följande leverantörer</string>
     <string name="search_provider_text_types">Sök med följande filmtyper</string>
@@ -109,7 +108,7 @@
     <string name="double_tap_to_seek_setthings">Dubbeltryck för att hoppa fram eller bak</string>
     <string name="double_tap_to_seek_setthings_des">Tryck två gånger på höger eller vänster sida för att hoppa fram eller bak</string>
     <string name="search">Sök</string>
-    <string name="info">Information</string>
+    <string name="settings_info">Information</string>
     <string name="advanced_search">Avancerade sökresultat</string>
     <string name="advanced_search_des">Presenterar sökresultaten i flera olika rader baserat på leverantören</string>
     <string name="bug_report_setthings_off">Skickar endast data när appen kraschar</string>
@@ -182,10 +181,10 @@
     <string name="no_update_found">Ingen uppdatering hittad</string>
     <string name="check_for_update">Sök efter uppdatering</string>
 
-    <string name="lock">Skärmlås</string>
-    <string name="resize">Bildförhållande</string>
-    <string name="source">Källa</string>
-    <string name="skip_op">Hoppa över OP</string>
+    <string name="video_lock">Skärmlås</string>
+    <string name="video_aspect_ratio_resize">Bildförhållande</string>
+    <string name="video_source">Källa</string>
+    <string name="video_skip_op">Hoppa över OP</string>
 
     <string name="dont_show_again">Visa inte igen</string>
     <string name="update">Uppdatera</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 8dfe341d..d12c3d21 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -31,13 +31,13 @@
     <string name="title_settings">Mga Settings</string>
     <string name="search_hint">Maghanap...</string>
     <string name="change_providers_descript">Magpalit ng pinagkukunan ng palabas</string>
-    <string name="search_poster_des">Pabalat</string>
+    <string name="search_poster_img_des">Pabalat</string>
     <string name="no_data">Walang Impormasyong Nakalap</string>
     <string name="episode_more_options_des">Mga Opsyon</string>
-    <string name="episode_play_des">Panoorin</string>
-    <string name="go_back">Bumalik</string>
+    <string name="episode_play_img_des">Panoorin</string>
+    <string name="go_back_img_des">Bumalik</string>
     <string name="next_episode">Susunod na episode</string>
-    <string name="result_poster">Pabalat</string>
+    <string name="result_poster_img_des">Pabalat</string>
     <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Kategorya</string>
     <string name="result_share">Ibahagi</string>
@@ -58,7 +58,7 @@
     <string name="pick_subtitle">Nakasaling diyalogo</string>
     <string name="reload_error">Sinsubukang kumonekta…</string>
     <string name="result_go_back">Bumalik</string>
-    <string name="episode_poster">Pabalat</string>
+    <string name="episode_poster_img_des">Pabalat</string>
     <string name="play_episode">Panoorin</string>
     <string name="need_storage">Payagang i-download ang mga episode</string>
 
@@ -86,11 +86,11 @@
     <string name="pref_disable_acra">Ihinto ang paguulat ng mga bugs</string>
     <string name="home_more_info">Higit pang mpormasyon</string>
     <string name="home_expanded_hide">Itago</string>
-    <string name="home_main_poster">Main Poster</string>
+    <string name="home_main_poster_img_des">Main Poster</string>
     <string name="home_play">Panoorin</string>
     <string name="home_info">Impormasyon</string>
-    <string name="home_next_random">Pasumalang susunod</string>
-    <string name="home_change_provider">Palitan ang pinagkukunan ng palabas</string>
+    <string name="home_next_random_img_des">Pasumalang susunod</string>
+    <string name="home_change_provider_img_des">Palitan ang pinagkukunan ng palabas</string>
     <string name="filter_bookmarks">Salain ang Bookmark</string>
     <string name="error_bookmarks_text">Mga Bookmark</string>
     <string name="action_remove_from_bookmarks">Tanggalin</string>
@@ -104,7 +104,7 @@
     <string name="subs_window_color">Kulay ng window</string>
     <string name="subs_edge_type">Uri ng gilid</string>
     <string name="subs_subtitle_elevation">Taas ng nakasaling diyalogo</string>
-    <string name="preview_background">Preview ng Sanligan</string>
+    <string name="preview_background_img_des">Preview ng Sanligan</string>
     <string name="subs_font">Font</string>
     <string name="search_provider_text_providers">Maghanap gamit ang pinagkukunan ng palabas</string>
     <string name="search_provider_text_types">Maghanap gamit ang uri</string>
@@ -143,7 +143,7 @@
     <string name="double_tap_to_seek_setthings_des">Pindutin ng dalawang beses ang bandang kanan at kaliwa upang sumulong at umurong
     </string>
     <string name="search">Maghanap</string>
-    <string name="info">Marami pang impormasyon</string>
+    <string name="settings_info">Marami pang impormasyon</string>
     <string name="advanced_search">Psulong na paghahanap</string>
     <string name="advanced_search_des">Ibigay ang resulta ng nakahiwalay batay sa pinagkukunan ng pelikula</string>
     <string name="bug_report_setthings_off">Ipadala lamang ang impormasyon sa pagkakataon ng kamalian</string>
@@ -225,10 +225,10 @@
     <string name="no_update_found">Walang update na nahanap</string>
     <string name="check_for_update">Surrin kung mayroon nang update</string>
 
-    <string name="lock">Ikandado</string>
-    <string name="resize">Lakihan/Liitan</string>
-    <string name="source">Pinagmulan</string>
-    <string name="skip_op">Laktawan ang simula</string>
+    <string name="video_lock">Ikandado</string>
+    <string name="video_aspect_ratio_resize">Lakihan/Liitan</string>
+    <string name="video_source">Pinagmulan</string>
+    <string name="video_skip_op">Laktawan ang simula</string>
 
     <string name="dont_show_again">Huwag ipakitang muli</string>
     <string name="update">i-Update</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fa5d391..1663e405 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,32 +12,42 @@
     <string name="benene_count" translatable="false">benene_count</string>
 
     <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
-    <string name="extra_info_format" translatable="false">%d %s | %sMB</string>
-    <string name="storage_size_format" translatable="false">%s • %sGB</string>
-    <string name="download_size_format" translatable="false">%sMB / %sMB</string>
-    <string name="episode_name_format" translatable="false">%s %s</string>
-    <string name="ffw_text_format" translatable="false">+%d</string>
-    <string name="rew_text_format" translatable="false">-%d</string>
-    <string name="ffw_text_regular_format" translatable="false">%d</string>
-    <string name="rew_text_regular_format" translatable="false">%d</string>
-    <string name="player_speed_text_format">Speed (%.2fx)</string>
-    <string name="rated_format">Rated: %.1f</string>
-    <string name="new_update_format">New update found!\n%s -> %s</string>
+    <string name="extra_info_format" translatable="false" formatted="true">%d %s | %sMB</string>
+    <string name="storage_size_format" translatable="false" formatted="true">%s • %sGB</string>
+    <string name="download_size_format" translatable="false" formatted="true">%sMB / %sMB</string>
+    <string name="episode_name_format" translatable="false" formatted="true">%s %s</string>
+    <string name="ffw_text_format" translatable="false" formatted="true">+%d</string>
+    <string name="rew_text_format" translatable="false" formatted="true">-%d</string>
+    <string name="ffw_text_regular_format" translatable="false" formatted="true">%d</string>
+    <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
+
+    <!-- IS NOT NEEDED TO TRANSLATE AS THEY ARE ONLY USED FOR SCREEN READERS AND WONT SHOW UP TO NORMAL USERS -->
+    <string name="result_poster_img_des">Poster</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">Episode Poster</string>
+    <string name="home_main_poster_img_des">Main Poster</string>
+    <string name="home_next_random_img_des">Next Random</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="go_back_img_des">Go back</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="home_change_provider_img_des">Change Provider</string>
+    <string name="preview_background_img_des">Preview Background</string>
+
+    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+    <string name="player_speed_text_format" formatted="true">Speed (%.2fx)</string>
+    <string name="rated_format" formatted="true">Rated: %.1f</string>
+    <string name="new_update_format" formatted="true">New update found!\n%s -> %s</string>
 
     <string name="app_name">CloudStream</string>
     <string name="title_home">Home</string>
     <string name="title_search">Search</string>
     <string name="title_downloads">Downloads</string>
     <string name="title_settings">Settings</string>
+
     <string name="search_hint">Search…</string>
-    <string name="change_providers_des">Change Providers</string>
-    <string name="search_poster_des">Poster</string>
     <string name="no_data">No Data</string>
     <string name="episode_more_options_des">More Options</string>
-    <string name="episode_play_des">Play Episode</string>
-    <string name="go_back">Go back</string>
     <string name="next_episode">Next episode</string>
-    <string name="result_poster">Poster</string>
     <string name="result_plot" translatable="false">@string/synopsis</string>
     <string name="result_tags">Genres</string>
     <string name="result_share">Share</string>
@@ -58,9 +68,8 @@
     <string name="pick_subtitle">Subtitles</string>
     <string name="reload_error">Retry connection…</string>
     <string name="result_go_back">Go Back</string>
-    <string name="episode_poster">Episode Poster</string>
     <string name="play_episode">Play Episode</string>
-    <string name="need_storage">Allow to download episodes</string>
+    <!--<string name="need_storage">Allow to download episodes</string>-->
 
     <string name="download">Download</string>
     <string name="downloaded">Downloaded</string>
@@ -86,17 +95,15 @@
     <string name="pref_disable_acra">Disable automatic bug reporting</string>
     <string name="home_more_info">More info</string>
     <string name="home_expanded_hide">Hide</string>
-    <string name="home_main_poster">Main Poster</string>
     <string name="home_play">Play</string>
     <string name="home_info">Info</string>
-    <string name="home_next_random">Next Random</string>
-    <string name="home_change_provider">Change Provider</string>
     <string name="filter_bookmarks">Filter Bookmarks</string>
     <string name="error_bookmarks_text">Bookmarks</string>
     <string name="action_remove_from_bookmarks">Remove</string>
     <string name="sort_apply">Apply</string>
     <string name="sort_cancel">Cancel</string>
     <string name="player_speed">Player Speed</string>
+
     <string name="subtitles_settings">Subtitle Settings</string>
     <string name="subs_text_color">Text Color</string>
     <string name="subs_outline_color">Outline Color</string>
@@ -104,8 +111,8 @@
     <string name="subs_window_color">Window Color</string>
     <string name="subs_edge_type">Edge Type</string>
     <string name="subs_subtitle_elevation">Subtitle Elevation</string>
-    <string name="preview_background">Preview Background</string>
     <string name="subs_font">Font</string>
+
     <string name="search_provider_text_providers">Search using providers</string>
     <string name="search_provider_text_types">Search using types</string>
 
@@ -143,7 +150,7 @@
     <string name="double_tap_to_seek_setthings_des">Tap twice on the right or left side to seek forwards or backwards
     </string>
     <string name="search">Search</string>
-    <string name="info">Info</string>
+    <string name="settings_info">Info</string>
     <string name="advanced_search">Advanced Search</string>
     <string name="advanced_search_des">Gives you the search results separated by provider</string>
     <string name="bug_report_setthings_off">Only sends data on crashes</string>
@@ -226,10 +233,10 @@
     <string name="no_update_found">No Update Found</string>
     <string name="check_for_update">Check for Update</string>
 
-    <string name="lock">Lock</string>
-    <string name="resize">Resize</string>
-    <string name="source">Source</string>
-    <string name="skip_op">Skip OP</string>
+    <string name="video_lock">Lock</string>
+    <string name="video_aspect_ratio_resize">Resize</string>
+    <string name="video_source">Source</string>
+    <string name="video_skip_op">Skip OP</string>
 
     <string name="dont_show_again">Don\'t show again</string>
     <string name="update">Update</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index ca4325e7..52b0bbc8 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -73,7 +73,7 @@
 
     <PreferenceCategory
             android:key="info"
-            android:title="@string/info"
+            android:title="@string/settings_info"
             app:isPreferenceVisible="true"
     >
         <Preference