From 2cd65246fbea4e777289bd75ef8585dbb2da76c8 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Fri, 18 Mar 2022 17:02:18 +0800
Subject: [PATCH 1/5] [skip ci] Skip building app when json file is edited.
 (#807)

---
 .github/workflows/prerelease.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 5ab95416..4859511a 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -5,6 +5,7 @@ on:
     branches: [ master ]
     paths-ignore:
       - '*.md'
+      - '*.json'
 
 concurrency: 
   group: "pre-release"

From 035aa22626f4dc17e031f7f74d8e7423cb487277 Mon Sep 17 00:00:00 2001
From: Zaw <42999156+ImZaw@users.noreply.github.com>
Date: Sat, 19 Mar 2022 01:24:49 +0300
Subject: [PATCH 2/5] some small changes for akwam, mycima (#812)

* Update MyCimaProvider.kt

* Update AkwamProvider.kt

* ah
---
 .../movieproviders/AkwamProvider.kt           | 20 ++++----
 .../movieproviders/MyCimaProvider.kt          | 50 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AkwamProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AkwamProvider.kt
index 326fd8c2..218650da 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AkwamProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/AkwamProvider.kt
@@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.movieproviders
 
 import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.LoadResponse.Companion.addActors
-import com.lagradost.cloudstream3.network.AppResponse
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import org.jsoup.nodes.Element
@@ -165,10 +164,10 @@ class AkwamProvider : MainAPI() {
     }
 
 
-    // Maybe possible to not use the url shortener but cba investigating that.
-    private suspend fun skipUrlShortener(url: String): AppResponse {
-        return app.get(app.get(url).document.select("a.download-link").attr("href"))
-    }
+//    // Maybe possible to not use the url shortener but cba investigating that.
+//    private suspend fun skipUrlShortener(url: String): AppResponse {
+//        return app.get(app.get(url).document.select("a.download-link").attr("href"))
+//    }
 
     private fun getQualityFromId(id: Int?): Qualities {
         return when (id) {
@@ -190,14 +189,15 @@ class AkwamProvider : MainAPI() {
 
         val links = doc.select("div.tab-content.quality").map {
             val quality = getQualityFromId(it.attr("id").getIntFromText())
-            it.select(".col-lg-6 > a").map { linkElement ->
-                linkElement.attr("href") to quality
-                // Only uses the download links, primarily to prevent unnecessary duplicate requests.
-            }.filter { link -> link.first.contains("/link/") }
+            it.select(".col-lg-6 > a:contains(تحميل)").map { linkElement ->
+                if(linkElement.attr("href").contains("/download/")) { linkElement.attr("href") to quality } else {
+                    "$mainUrl/download${linkElement.attr("href").split("/link")[1]}${data.split("/movie|/episode|/show/episode".toRegex())[1]}" to quality // just in case if they add the shorts urls again
+                }
+            }
         }.flatten()
 
         links.map {
-            val linkDoc = skipUrlShortener(it.first).document
+            val linkDoc = app.get(it.first).document
             val button = linkDoc.select("div.btn-loader > a")
             val url = button.attr("href")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/MyCimaProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/MyCimaProvider.kt
index 25b6e23c..3e65710f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/MyCimaProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/MyCimaProvider.kt
@@ -13,7 +13,7 @@ class MyCimaProvider : MainAPI() {
     override var name = "MyCima"
     override val usesWebView = false
     override val hasMainPage = true
-    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie)
+    override val supportedTypes = setOf(TvType.TvSeries, TvType.Movie, TvType.Anime)
 
     private fun String.getImageURL(): String? {
         return this.replace("--im(age|g):url\\(|\\);".toRegex(), "")
@@ -63,9 +63,10 @@ class MyCimaProvider : MainAPI() {
     override suspend fun search(query: String): List<SearchResponse> {
         val q = query.replace(" ","%20")
         val result = arrayListOf<SearchResponse>()
-        listOf("$mainUrl/search/$q", "$mainUrl/search/$q/list/series/").apmap { url ->
+        listOf("$mainUrl/search/$q",
+            "$mainUrl/search/$q/list/series/",
+            "$mainUrl/search/$q/list/anime/").apmap { url ->
             val d = app.get(url).document
-            if(d.select("a.hoverable.active").text().contains("الانيمي و الكرتون")) return@apmap null
             d.select("div.Grid--MycimaPosts div.GridItem").mapNotNull {
                 if(it.text().contains("اعلان")) return@mapNotNull null
                     it.toSearchResponse()?.let { it1 -> result.add(it1) }
@@ -88,7 +89,7 @@ class MyCimaProvider : MainAPI() {
         val year = doc.select("div.Title--Content--Single-begin h1 a.unline")?.text()?.getIntFromText()
         val title = doc.select("div.Title--Content--Single-begin h1").text()
             .replace("($year)", "")
-            .replace("مشاهدة|فيلم|مسلسل|مترجم".toRegex(), "")
+            .replace("مشاهدة|فيلم|مسلسل|مترجم|انمي".toRegex(), "")
         // A bit iffy to parse twice like this, but it'll do.
         val duration =
             doc.select("ul.Terms--Content--Single-begin li").firstOrNull {
@@ -106,6 +107,9 @@ class MyCimaProvider : MainAPI() {
                 ?: return@mapNotNull null
             Actor(name, image)
         }
+        val recommendations = doc.select("div.Grid--MycimaPosts div.GridItem")?.mapNotNull { element ->
+            element.toSearchResponse()
+        }
 
         return if (isMovie) {
             newMovieLoadResponse(
@@ -119,6 +123,7 @@ class MyCimaProvider : MainAPI() {
                 this.plot = synopsis
                 this.tags = tags
                 this.duration = duration
+                this.recommendations = recommendations
                 addActors(actors)
             }
         } else {
@@ -133,14 +138,16 @@ class MyCimaProvider : MainAPI() {
             if(moreButton.isNotEmpty()) {
                 val n = doc.select("div.Seasons--Episodes div.Episodes--Seasons--Episodes a").size
                 val totals = doc.select("div.Episodes--Seasons--Episodes a").first().text().getIntFromText()
-                arrayListOf(n, n+40, n+80, n+120, n+160, n+200, n+240, n+280, n+320, n+360)
-                    .apmap { it ->
-                        if(it > totals!!) return@apmap
-                        val ajaxURL = "$mainUrl/AjaxCenter/MoreEpisodes/${moreButton.attr("data-term")}/$it"
-                        val jsonResponse = app.get(ajaxURL)
-                        val json = parseJson<MoreEPS>(jsonResponse.text)
-                        val document = Jsoup.parse(json.output?.replace("""\""", ""))
-                        document.select("a").map { episodes.add(TvSeriesEpisode(it.text(), season, it.text().getIntFromText(), it.attr("href"), null, null)) }
+                val mEPS = arrayListOf(n, n+40, n+80, n+120, n+160, n+200, n+240, n+280, n+320, n+360, n+400, n+440, n+480, n+520, n+660, n+700, n+740, n+780, n+820, n+860, n+900, n+940, n+980, n+1020, n+1060, n+1100, n+1140, n+1180, n+1220, totals)
+                mEPS.apmap { it ->
+                        if (it != null) {
+                            if(it > totals!!) return@apmap
+                            val ajaxURL = "$mainUrl/AjaxCenter/MoreEpisodes/${moreButton.attr("data-term")}/$it"
+                            val jsonResponse = app.get(ajaxURL)
+                            val json = parseJson<MoreEPS>(jsonResponse.text)
+                            val document = Jsoup.parse(json.output?.replace("""\""", ""))
+                            document.select("a").map { episodes.add(TvSeriesEpisode(it.text(), season, it.text().getIntFromText(), it.attr("href"), null, null)) }
+                        }
                     }
             }
             if(seasons.isNotEmpty()) {
@@ -154,14 +161,16 @@ class MyCimaProvider : MainAPI() {
                             if(fmoreButton.isNotEmpty()) {
                                 val n = seasonsite.select("div.Seasons--Episodes div.Episodes--Seasons--Episodes a").size
                                 val totals = seasonsite.select("div.Episodes--Seasons--Episodes a").first().text().getIntFromText()
-                                arrayListOf(n, n+40, n+80, n+120, n+160, n+200, n+240, n+280, n+320, n+360)
-                                    .apmap { it ->
-                                        if(it > totals!!) return@apmap
-                                        val ajaxURL = "$mainUrl/AjaxCenter/MoreEpisodes/${fmoreButton.attr("data-term")}/$it"
-                                        val jsonResponse = app.get(ajaxURL)
-                                        val json = parseJson<MoreEPS>(jsonResponse.text)
-                                        val document = Jsoup.parse(json.output?.replace("""\""", ""))
-                                        document.select("a").map { episodes.add(TvSeriesEpisode(it.text(), fseason, it.text().getIntFromText(), it.attr("href"), null, null)) }
+                                val mEPS = arrayListOf(n, n+40, n+80, n+120, n+160, n+200, n+240, n+280, n+320, n+360, n+400, n+440, n+480, n+520, n+660, n+700, n+740, n+780, n+820, n+860, n+900, n+940, n+980, n+1020, n+1060, n+1100, n+1140, n+1180, n+1220, totals)
+                                mEPS.apmap { it ->
+                                        if (it != null) {
+                                            if(it > totals!!) return@apmap
+                                            val ajaxURL = "$mainUrl/AjaxCenter/MoreEpisodes/${fmoreButton.attr("data-term")}/$it"
+                                            val jsonResponse = app.get(ajaxURL)
+                                            val json = parseJson<MoreEPS>(jsonResponse.text)
+                                            val document = Jsoup.parse(json.output?.replace("""\""", ""))
+                                            document.select("a").map { episodes.add(TvSeriesEpisode(it.text(), fseason, it.text().getIntFromText(), it.attr("href"), null, null)) }
+                                        }
                                 }
                             } else return@apmap
                     }
@@ -172,6 +181,7 @@ class MyCimaProvider : MainAPI() {
                 this.tags = tags
                 this.year = year
                 this.plot = synopsis
+                this.recommendations = recommendations
                 addActors(actors)
             }
         }

From 015111c6d24cd607c64d2d3ffdaaa11dd3e6ab38 Mon Sep 17 00:00:00 2001
From: wang <58252651+shanyan-wcx@users.noreply.github.com>
Date: Sat, 19 Mar 2022 08:13:25 +0800
Subject: [PATCH 3/5] Add Chinese translation (#808)

* Add Chinese translation

* fix Chinese translation
---
 .../ui/settings/SettingsFragment.kt           |   1 +
 app/src/main/res/values-cn/strings.xml        | 430 ++++++++++++++++++
 .../android/zh-CN/full_description.txt        |  14 +
 .../android/zh-CN/short_description.txt       |   1 +
 4 files changed, 446 insertions(+)
 create mode 100644 app/src/main/res/values-cn/strings.xml
 create mode 100644 fastlane/metadata/android/zh-CN/full_description.txt
 create mode 100644 fastlane/metadata/android/zh-CN/short_description.txt

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 05139957..8f81e12c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -140,6 +140,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         Triple("\ud83c\udde7\ud83c\uddf7", "Portuguese (Brazil)", "pt"),
         Triple("\ud83c\uddf7\ud83c\uddf4", "Romanian", "ro"),
         Triple("\uD83C\uDDEE\uD83C\uDDF9", "Italian", "it"),
+        Triple("\uD83C\uDDE8\uD83C\uDDF3", "Chinese", "cn"),
     ).sortedBy { it.second } //ye, we go alphabetical, so ppl don't put their lang on top
 
     private fun showAccountSwitch(context: Context, api: AccountManager) {
diff --git a/app/src/main/res/values-cn/strings.xml b/app/src/main/res/values-cn/strings.xml
new file mode 100644
index 00000000..40014779
--- /dev/null
+++ b/app/src/main/res/values-cn/strings.xml
@@ -0,0 +1,430 @@
+<!--https://newbedev.com/concatenate-multiple-strings-in-xml-->
+<resources>
+    <!-- KEYS DON'T TRANSLATE -->
+    <string name="search_providers_list_key" translatable="false">search_providers_list</string>
+    <string name="locale_key" translatable="false">app_locale</string>
+    <string name="search_types_list_key" translatable="false">search_type_list</string>
+    <string name="grid_format_key" translatable="false">grid_format</string>
+    <string name="auto_update_key" translatable="false">auto_update</string>
+    <string name="prerelease_update_key" translatable="false">prerelease_update</string>
+    <string name="manual_check_update_key" translatable="false">manual_check_update</string>
+    <string name="fast_forward_button_time_key" translatable="false">fast_forward_button_time</string>
+    <string name="benene_count" translatable="false">benene_count</string>
+    <string name="subtitle_settings_key" translatable="false">subtitle_settings_key</string>
+    <string name="subtitle_settings_chromecast_key" translatable="false">subtitle_settings_chromecast_key</string>
+    <string name="quality_pref_key" translatable="false">quality_pref_key</string>
+    <string name="video_buffer_size_key" translatable="false">video_buffer_size_key</string>
+    <string name="video_buffer_length_key" translatable="false">video_buffer_length_key</string>
+    <string name="video_buffer_clear_key" translatable="false">video_buffer_clear_key</string>
+    <string name="video_buffer_disk_key" translatable="false">video_buffer_disk_key</string>
+    <string name="prerelease_commit_hash" translatable="false">unknown_prerelease</string>
+    <string name="use_system_brightness_key" translatable="false">use_system_brightness_key</string>
+    <string name="swipe_enabled_key" translatable="false">swipe_enabled_key</string>
+    <string name="playback_speed_enabled_key" translatable="false">playback_speed_enabled_key</string>
+    <string name="player_resize_enabled_key" translatable="false">player_resize_enabled_key</string>
+    <string name="pip_enabled_key" translatable="false">pip_enabled_key</string>
+    <string name="double_tap_enabled_key" translatable="false">double_tap_enabled_key</string>
+    <string name="double_tap_pause_enabled_key" translatable="false">double_tap_pause_enabled_key</string>
+    <string name="swipe_vertical_enabled_key" translatable="false">swipe_vertical_enabled_key</string>
+    <string name="display_sub_key" translatable="false">display_sub_key</string>
+    <string name="show_fillers_key" translatable="false">show_fillers_key</string>
+    <string name="provider_lang_key" translatable="false">provider_lang_key</string>
+    <string name="dns_key" translatable="false">dns_key</string>
+    <string name="download_path_key" translatable="false">download_path_key</string>
+    <string name="app_name_download_path" translatable="false">Cloudstream</string>
+    <string name="app_layout_key" translatable="false">app_layout_key</string>
+    <string name="primary_color_key" translatable="false">primary_color_key</string>
+    <string name="restore_key" translatable="false">restore_key</string>
+    <string name="killswitch_key" translatable="false">killswitch_key</string>
+    <string name="backup_key" translatable="false">backup_key</string>
+    <string name="prefer_media_type_key" translatable="false">prefer_media_type_key</string>
+    <string name="app_theme_key" translatable="false">app_theme_key</string>
+
+
+    <!-- FORMAT MIGHT TRANSLATE, WILL CAUSE CRASH IF APPLIED WRONG -->
+    <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="mb_format" translatable="false" formatted="true">%dMB</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>
+    <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
+    <string name="year_format" translatable="false" formatted="true">%d</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s 第%d集</string>
+    <string name="cast_format" formatted="true">投屏：%s</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">海报</string>
+    <string name="search_poster_img_des">@string/result_poster_img_des</string>
+    <string name="episode_poster_img_des">剧集海报</string>
+    <string name="home_main_poster_img_des">主海报</string>
+    <string name="home_next_random_img_des">随机下一个</string>
+    <string name="episode_play_img_des" translatable="false">@string/play_episode</string>
+    <string name="go_back_img_des">返回</string>
+    <string name="change_providers_img_des" translatable="false">@string/home_change_provider_img_des</string>
+    <string name="home_change_provider_img_des">更改内容提供者</string>
+    <string name="preview_background_img_des">预览背景</string>
+
+    <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
+    <string name="player_speed_text_format" formatted="true">播放速度：(%.2fx)</string>
+    <string name="rated_format" formatted="true">评分：%.1f</string>
+    <string name="new_update_format" formatted="true">发现新版本！\n%s -> %s</string>
+    <string name="filler" formatted="true">填充</string>
+    <string name="duration_format" formatted="true">%d分钟</string>
+
+    <string name="app_name">CloudStream</string>
+    <string name="title_home">主页</string>
+    <string name="title_search">搜索</string>
+    <string name="title_downloads">下载</string>
+    <string name="title_settings">设置</string>
+
+    <string name="search_hint">搜索…</string>
+    <string name="no_data">无数据</string>
+    <string name="episode_more_options_des">更多选项</string>
+    <string name="next_episode">下一集</string>
+    <string name="result_plot" translatable="false">@string/synopsis</string>
+    <string name="result_tags">类型</string>
+    <string name="result_share">分享</string>
+    <string name="result_open_in_browser">在浏览器中打开</string>
+    <string name="skip_loading">跳过加载</string>
+    <string name="loading_chromecast">正在加载…</string>
+
+    <string name="type_watching">正在观看</string>
+    <string name="type_on_hold">暂时搁置</string>
+    <string name="type_completed">观看完毕</string>
+    <string name="type_dropped">放弃观看</string>
+    <string name="type_plan_to_watch">计划观看</string>
+    <string name="type_none">无</string>
+    <string name="type_re_watching">重新观看</string>
+
+    <string name="play_movie_button">播放电影</string>
+    <string name="play_torrent_button">串流Torrent</string>
+    <string name="pick_source">来源</string>
+    <string name="pick_subtitle">字幕</string>
+    <string name="reload_error">重试连接…</string>
+    <string name="go_back">返回</string>
+    <string name="play_episode">播放剧集</string>
+    <!--<string name="need_storage">Allow to download episodes</string>-->
+
+    <string name="download">下载</string>
+    <string name="downloaded">已下载</string>
+    <string name="downloading">正在下载</string>
+    <string name="download_paused">下载暂停</string>
+    <string name="download_started">下载开始</string>
+    <string name="download_failed">下载失败</string>
+    <string name="download_canceled">下载取消</string>
+    <string name="download_done">下载完毕</string>
+    <string name="download_format" translatable="false">%s - %s</string>
+
+    <string name="error_loading_links_toast">加载链接时出错</string>
+    <string name="download_storage_text">内部存储</string>
+
+    <string name="app_dubbed_text">音轨</string>
+    <string name="app_subbed_text">字幕</string>
+
+    <string name="popup_delete_file">删除文件</string>
+    <string name="popup_play_file">播放文件</string>
+    <string name="popup_resume_download">继续下载</string>
+    <string name="popup_pause_download">暂停下载</string>
+
+    <string name="pref_disable_acra">禁用自动错误报告</string>
+    <string name="home_more_info">更多信息</string>
+    <string name="home_expanded_hide">隐藏</string>
+    <string name="home_play">播放</string>
+    <string name="home_info">信息</string>
+    <string name="filter_bookmarks">筛选书签</string>
+    <string name="error_bookmarks_text">书签</string>
+    <string name="action_remove_from_bookmarks">移除</string>
+    <string name="action_add_to_bookmarks">设置观看状态</string>
+    <string name="sort_apply">应用</string>
+    <string name="sort_cancel">取消</string>
+    <string name="player_speed">播放速度</string>
+
+    <string name="subtitles_settings">字幕设置</string>
+    <string name="subs_text_color">文本颜色</string>
+    <string name="subs_outline_color">轮廓颜色</string>
+    <string name="subs_background_color">背景颜色</string>
+    <string name="subs_window_color">窗口颜色</string>
+    <string name="subs_edge_type">边缘类型</string>
+    <string name="subs_subtitle_elevation">字幕高度</string>
+    <string name="subs_font">字体</string>
+    <string name="subs_font_size">字体大小</string>
+
+    <string name="search_provider_text_providers">按内容提供者搜索</string>
+    <string name="search_provider_text_types">按类型搜索</string>
+
+    <string name="benene_count_text">%d Benenes given to devs</string>
+    <string name="benene_count_text_none">No Benenes given</string>
+
+    <string name="subs_auto_select_language">自动选择语言</string>
+    <string name="subs_download_languages">下载语言</string>
+    <string name="subs_hold_to_reset_to_default">按住重置为默认值</string>
+    <string name="continue_watching">继续观看</string>
+
+    <string name="action_remove_watching">移除</string>
+    <string name="action_open_watching">更多信息</string>
+    <string name="action_open_play">@string/home_play </string>
+
+    <string name="vpn_might_be_needed">此内容提供者可能需要VPN才能正常工作</string>
+    <string name="vpn_torrent">此内容提供者是一个Torrent,建议使用VPN</string>
+
+    <string name="provider_info_meta">站点不提供元数据，如果站点上不存在元数据，视频加载将失败。</string>
+
+    <string name="torrent_plot">简介</string>
+    <string name="normal_no_plot">没有找到简介</string>
+    <string name="torrent_no_plot">没有找到简介</string>
+
+    <string name="picture_in_picture">画中画</string>
+    <string name="picture_in_picture_des">在其他应用之上的迷你播放器中继续播放</string>
+    <string name="player_size_settings">播放器大小调整按钮</string>
+    <string name="player_size_settings_des">移除黑色边框</string>
+    <string name="player_subtitles_settings">字幕</string>
+    <string name="player_subtitles_settings_des">播放器字幕设置</string>
+    <string name="chromecast_subtitles_settings">投屏字幕</string>
+    <string name="chromecast_subtitles_settings_des">投屏字幕设置</string>
+
+    <string name="eigengraumode_settings">Eigengravy模式</string>
+    <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
+    <string name="swipe_to_seek_settings">滑动控制进度</string>
+    <string name="swipe_to_seek_settings_des">向屏幕左侧或右侧滑动来控制播放进度</string>
+    <string name="swipe_to_change_settings">滑动更改设置</string>
+    <string name="swipe_to_change_settings_des">在屏幕左侧或右侧滑动来更改亮度或音量</string>
+    <string name="double_tap_to_seek_settings">双击控制进度</string>
+    <string name="double_tap_to_pause_settings">双击暂停</string>
+    <string name="double_tap_to_seek_settings_des">在屏幕左侧或右侧双击来快进或快退
+    </string>
+    <string name="double_tap_to_pause_settings_des">双击屏幕中间暂停</string>
+    <string name="use_system_brightness_settings">使用系统亮度</string>
+    <string name="use_system_brightness_settings_des">在app player中使用系统亮度，而不是黑色遮罩
+    </string>
+
+    <string name="restore_settings">从备份中恢复数据</string>
+    <string name="killswitch_settings">从github下载最新元数据</string>
+    <string name="killswitch_settings_des">如果你想访问所有的内容提供者（即使是损坏的），请关闭此选项</string>
+
+    <string name="backup_settings">备份数据</string>
+    <string name="restore_success">已加载备份文件</string>
+    <string name="restore_failed_format" formatted="true">无法从文件%s中还原数据</string>
+    <string name="backup_success">成功存储数据</string>
+    <string name="backup_failed">缺少存储权限，请重试</string>
+    <string name="backup_failed_error_format">备份%s时出错</string>
+
+    <string name="search">搜索</string>
+    <string name="settings_info">信息</string>
+    <string name="advanced_search">高级搜索</string>
+    <string name="advanced_search_des">给出按内容提供者分隔的搜索结果</string>
+    <string name="bug_report_settings_off">只发送关于崩溃的数据</string>
+    <string name="bug_report_settings_on">不发送数据</string>
+    <string name="show_fillers_settings">为动画显示填充集</string>
+    <string name="updates_settings">显示应用更新</string>
+    <string name="updates_settings_des">启动时自动搜索更新</string>
+    <string name="uprereleases_settings">更新至预览版</string>
+    <string name="uprereleases_settings_des">搜索预览版更新，而不是仅搜索完整版本</string>
+    <string name="github">Github</string>
+    <string name="lightnovel">由同一开发者开发的轻小说应用</string>
+    <string name="anim">由同一开发者开发的动漫应用</string>
+    <string name="discord">加入Discord</string>
+    <string name="benene">Give a benene to the devs</string>
+    <string name="benene_des">Given benene</string>
+
+    <string name="app_language">应用语言</string>
+
+    <string name="no_chromecast_support_toast">该内容提供者不支持投屏</string>
+    <string name="no_links_found_toast">没有找到链接</string>
+    <string name="copy_link_toast">链接已复制到剪贴板</string>
+    <string name="play_episode_toast">播放剧集</string>
+    <string name="subs_default_reset_toast">重置为默认值</string>
+    <string name="acra_report_toast">抱歉，应用崩溃了，将向开发人员发送一份匿名Bug报告
+    </string>
+
+    <string name="season">季</string>
+    <string name="no_season">没有季</string>
+    <string name="episode">集</string>
+    <string name="episodes">集</string>
+    <string name="season_short">S</string>
+    <string name="episode_short">E</string>
+    <string name="no_episodes_found">没有找到剧集</string>
+
+    <string name="delete_file">删除文件</string>
+    <string name="delete">删除</string>
+    <string name="cancel" translatable="false">@string/sort_cancel</string>
+    <string name="pause">暂停</string>
+    <string name="resume">继续</string>
+    <string name="go_back_30">-30</string>
+    <string name="go_forward_30">+30</string>
+    <string name="delete_message" formatted="true">这将永久删除%s\n你确定吗？</string>
+    <string name="resume_time_left" formatted="true">剩余%d分钟\n</string>
+
+
+    <string name="status_ongoing">连载中</string>
+    <string name="status_completed">已完结</string>
+    <string name="status">状态</string>
+    <string name="year">年份</string>
+    <string name="rating">评分</string>
+    <string name="duration">持续时间</string>
+    <string name="site">网站</string>
+    <string name="synopsis">简介</string>
+
+    <string name="queued">队列</string>
+    <string name="no_subtitles">无字幕</string>
+    <string name="default_subtitles">默认</string>
+
+    <string name="free_storage">空闲</string>
+    <string name="used_storage">已使用</string>
+    <string name="app_storage">应用</string>
+
+    <!--plural-->
+    <string name="movies">电影</string>
+    <string name="tv_series">剧集</string>
+    <string name="cartoons">卡通</string>
+    <string name="anime">动漫</string>
+    <string name="torrent">Torrents</string>
+    <string name="documentaries">纪录片</string>
+    <string name="ova">OVA</string>
+
+    <!--singular-->
+    <string name="movies_singular">电影</string>
+    <string name="tv_series_singular">剧集</string>
+    <string name="cartoons_singular">卡通</string>
+    <string name="anime_singular">@string/anime</string>
+    <string name="ova_singular">@string/ova</string>
+    <string name="torrent_singular">Torrent</string>
+    <string name="documentaries_singular">纪录片</string>
+
+    <string name="source_error">源错误</string>
+    <string name="remote_error">远程错误</string>
+    <string name="render_error">渲染器错误</string>
+    <string name="unexpected_error">意外的播放器错误</string>
+    <string name="storage_error">下载错误，请检查存储权限</string>
+
+    <string name="episode_action_chromecast_episode">投屏剧集</string>
+    <string name="episode_action_chromecast_mirror">投屏镜像</string>
+    <string name="episode_action_play_in_app">在应用程序中播放</string>
+    <string name="episode_action_play_in_vlc">在VLC中播放</string>
+    <string name="episode_action_play_in_browser">在浏览器中播放</string>
+    <string name="episode_action_copy_link">复制链接</string>
+    <string name="episode_action_auto_download">自动下载</string>
+    <string name="episode_action_download_mirror">下载镜像</string>
+    <string name="episode_action_reload_links">重新加载链接</string>
+
+    <string name="no_update_found">找不到更新</string>
+    <string name="check_for_update">检查更新</string>
+
+    <string name="video_lock">锁定</string>
+    <string name="video_aspect_ratio_resize">调整大小</string>
+    <string name="video_source">来源</string>
+    <string name="video_skip_op">跳过OP</string>
+
+    <string name="dont_show_again">不再显示</string>
+    <string name="update">更新</string>
+    <string name="watch_quality_pref">首选播放质量</string>
+    <string name="video_buffer_size_settings">视频缓冲区大小</string>
+    <string name="video_buffer_length_settings">视频缓冲区长度</string>
+    <string name="video_buffer_disk_settings">磁盘上的视频缓存</string>
+    <string name="video_buffer_clear_settings">清除视频和图像缓存</string>
+
+    <string name="video_ram_description">如果设置太高，可能会在内存较低的系统（如Android TV设备或旧手机）上导致问题 </string>
+    <string name="video_disk_description">如果将存储空间设置得太高，可能会导致Android TV设备等存储空间不足的系统出现问题  </string>
+
+    <string name="dns_pref">DNS over HTTPS</string>
+    <string name="dns_pref_summary">用于忽略ISP块</string>
+
+    <string name="download_path_pref">下载路径</string>
+
+    <string name="display_subbed_dubbed_settings">显示音轨/字幕动画</string>
+
+    <string name="resize_fit">适应屏幕</string>
+    <string name="resize_fill">拉伸</string>
+    <string name="resize_zoom">Zoom</string>
+
+    <string name="legal_notice">免责声明</string>
+    <string name="legal_notice_key" translatable="false">legal_notice_key</string>
+    <string name="legal_notice_text" translatable="false">Any legal issues regarding the content on this application
+        should be taken up with the actual file hosts and providers themselves as we are not affiliated with them.
+
+        In case of copyright infringement, please directly contact the responsible parties or the streaming websites.
+
+        The app is purely for educational and personal use.
+
+        CloudStream 3 does not host any content on the app, and has no control over what media is put up or taken down.
+        CloudStream 3 functions like any other search engine, such as Google. CloudStream 3 does not host, upload or
+        manage any videos, films or content. It simply crawls, aggregates and displayes links in a convenient,
+        user-friendly interface.
+
+        It merely scrapes 3rd-party websites that are publicly accessable via any regular web browser. It is the
+        responsibility of user to avoid any actions that might violate the laws governing his/her locality. Use
+        CloudStream 3 at your own risk.
+    </string>
+    <string name="general">全局</string>
+    <string name="provider_lang_settings">内容提供者语言</string>
+    <string name="app_layout">应用布局</string>
+    <string name="preferred_media_settings">首选媒体</string>
+
+    <string name="automatic">自动</string>
+    <string name="tv_layout">电视布局</string>
+    <string name="phone_layout">手机布局</string>
+    <string name="emulator_layout">模拟器布局</string>
+
+    <string name="primary_color_settings">主题色</string>
+    <string name="app_theme_settings">应用主题</string>
+
+    <!-- account stuff -->
+    <string name="anilist_key" translatable="false">anilist_key</string>
+    <string name="mal_key" translatable="false">mal_key</string>
+    <!--
+    <string name="mal_account_settings" translatable="false">MAL</string>
+    <string name="anilist_account_settings" translatable="false">AniList</string>
+    <string name="tmdb_account_settings" translatable="false">TMDB</string>
+    <string name="imdb_account_settings" translatable="false">IMDB</string>
+    <string name="kitsu_account_settings" translatable="false">Kitsu</string>
+    <string name="trakt_account_settings" translatable="false">Trakt</string>
+    -->
+    <string name="login_format" formatted="true">%s %s</string>
+    <string name="account">账户</string>
+    <string name="logout">注销</string>
+    <string name="login">登录</string>
+    <string name="switch_account">切换账户</string>
+    <string name="add_account">添加帐户</string>
+    <string name="add_sync">添加跟踪</string>
+    <string name="added_sync_format" formatted="true">已添加%s</string>
+    <string name="upload_sync">同步</string>
+
+    <!-- ============ -->
+    <string name="none">无</string>
+    <string name="normal">普通</string>
+    <string name="all">全部</string>
+    <string name="max">最大</string>
+    <string name="min">最小</string>
+    <string name="subtitles_none" translatable="false">@string/none</string>
+    <string name="subtitles_outline">轮廓</string>
+    <string name="subtitles_depressed">降低</string>
+    <string name="subtitles_shadow">阴影</string>
+    <string name="subtitles_raised">提高</string>
+    <string name="subtitle_offset">同步字幕</string>
+    <string name="subtitle_offset_hint">1000ms</string>
+    <string name="subtitle_offset_title">字幕延迟</string>
+    <string name="subtitle_offset_extra_hint_later_format">如果字幕过早显示%dms，请使用此选项 </string>
+    <string name="subtitle_offset_extra_hint_before_format">如果字幕过晚显示%dms，请使用此选项</string>
+    <string name="subtitle_offset_extra_hint_none_format">无字幕延迟</string>
+
+    <!--
+    Example text (pangram) can optionally be translated; if you do, include all the letters in the alphabet,
+    see:
+	https://en.wikipedia.org/w/index.php?title=Pangram&oldid=225849300
+	https://en.wikipedia.org/wiki/The_quick_brown_fox_jumps_over_the_lazy_dog
+    -->
+    <string name="subtitles_example_text">一只敏捷的棕色狐狸跳过一只懒惰的狗</string>
+
+    <string name="recommended">推荐</string>
+    <string name="player_loaded_subtitles" formatted="true">已加载%s</string>
+    <string name="player_load_subtitles">从文件加载</string>
+    <string name="downloaded_file">下载的文件</string>
+    <string name="actor_main">主演</string>
+    <string name="actor_supporting">配演</string>
+    <string name="actor_background">群演</string>
+
+    <string name="home_source">来源</string>
+</resources>
diff --git a/fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
new file mode 100644
index 00000000..1f437a99
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/full_description.txt
@@ -0,0 +1,14 @@
+CloudStream-3可以让你串流和下载电影、剧集和动漫。这款应用没有任何广告和分析。它支持多个预告片和电影网站等。特点包括：
+
+
+
+书签
+
+
+下载和串流电影、电视节目和动漫
+
+
+下载字幕
+
+
+支持投屏
diff --git a/fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt
new file mode 100644
index 00000000..c31c1282
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/short_description.txt
@@ -0,0 +1 @@
+串流和下载电影、剧集和动漫。

From 6051d1430a467359724815d672e2a16673f0ce60 Mon Sep 17 00:00:00 2001
From: wang <58252651+shanyan-wcx@users.noreply.github.com>
Date: Sat, 19 Mar 2022 21:04:02 +0800
Subject: [PATCH 4/5] fix Chinese translation (#819)

* Add Chinese translation

* fix Chinese translation

* fix Chinese translation
---
 app/src/main/res/values-cn/strings.xml | 32 +++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/values-cn/strings.xml b/app/src/main/res/values-cn/strings.xml
index 40014779..be0d8475 100644
--- a/app/src/main/res/values-cn/strings.xml
+++ b/app/src/main/res/values-cn/strings.xml
@@ -53,8 +53,8 @@
     <string name="rew_text_regular_format" translatable="false" formatted="true">%d</string>
     <string name="rating_format" translatable="false" formatted="true">%.1f/10.0</string>
     <string name="year_format" translatable="false" formatted="true">%d</string>
-    <string name="app_dub_sub_episode_text_format" formatted="true">%s 第%d集</string>
-    <string name="cast_format" formatted="true">投屏：%s</string>
+    <string name="app_dub_sub_episode_text_format" formatted="true">%s 共%d集</string>
+    <string name="cast_format" formatted="true">演员：%s</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">海报</string>
@@ -69,7 +69,7 @@
     <string name="preview_background_img_des">预览背景</string>
 
     <!-- TRANSLATE, BUT DON'T FORGET FORMAT -->
-    <string name="player_speed_text_format" formatted="true">播放速度：(%.2fx)</string>
+    <string name="player_speed_text_format" formatted="true">速度(%.2fx)</string>
     <string name="rated_format" formatted="true">评分：%.1f</string>
     <string name="new_update_format" formatted="true">发现新版本！\n%s -> %s</string>
     <string name="filler" formatted="true">填充</string>
@@ -122,7 +122,7 @@
     <string name="error_loading_links_toast">加载链接时出错</string>
     <string name="download_storage_text">内部存储</string>
 
-    <string name="app_dubbed_text">音轨</string>
+    <string name="app_dubbed_text">配音</string>
     <string name="app_subbed_text">字幕</string>
 
     <string name="popup_delete_file">删除文件</string>
@@ -156,8 +156,8 @@
     <string name="search_provider_text_providers">按内容提供者搜索</string>
     <string name="search_provider_text_types">按类型搜索</string>
 
-    <string name="benene_count_text">%d Benenes given to devs</string>
-    <string name="benene_count_text_none">No Benenes given</string>
+    <string name="benene_count_text">送给开发者%d根香蕉</string>
+    <string name="benene_count_text_none">不送香蕉</string>
 
     <string name="subs_auto_select_language">自动选择语言</string>
     <string name="subs_download_languages">下载语言</string>
@@ -179,14 +179,14 @@
 
     <string name="picture_in_picture">画中画</string>
     <string name="picture_in_picture_des">在其他应用之上的迷你播放器中继续播放</string>
-    <string name="player_size_settings">播放器大小调整按钮</string>
+    <string name="player_size_settings">播放器画面调整按钮</string>
     <string name="player_size_settings_des">移除黑色边框</string>
     <string name="player_subtitles_settings">字幕</string>
     <string name="player_subtitles_settings_des">播放器字幕设置</string>
     <string name="chromecast_subtitles_settings">投屏字幕</string>
     <string name="chromecast_subtitles_settings_des">投屏字幕设置</string>
 
-    <string name="eigengraumode_settings">Eigengravy模式</string>
+    <string name="eigengraumode_settings">本征模式</string>
     <string name="eigengraumode_settings_des">在播放器中添加播放速度选项</string>
     <string name="swipe_to_seek_settings">滑动控制进度</string>
     <string name="swipe_to_seek_settings_des">向屏幕左侧或右侧滑动来控制播放进度</string>
@@ -218,7 +218,7 @@
     <string name="advanced_search_des">给出按内容提供者分隔的搜索结果</string>
     <string name="bug_report_settings_off">只发送关于崩溃的数据</string>
     <string name="bug_report_settings_on">不发送数据</string>
-    <string name="show_fillers_settings">为动画显示填充集</string>
+    <string name="show_fillers_settings">为动画显示下一集</string>
     <string name="updates_settings">显示应用更新</string>
     <string name="updates_settings_des">启动时自动搜索更新</string>
     <string name="uprereleases_settings">更新至预览版</string>
@@ -227,8 +227,8 @@
     <string name="lightnovel">由同一开发者开发的轻小说应用</string>
     <string name="anim">由同一开发者开发的动漫应用</string>
     <string name="discord">加入Discord</string>
-    <string name="benene">Give a benene to the devs</string>
-    <string name="benene_des">Given benene</string>
+    <string name="benene">送给开发者一根香蕉</string>
+    <string name="benene_des">送香蕉</string>
 
     <string name="app_language">应用语言</string>
 
@@ -314,15 +314,15 @@
     <string name="check_for_update">检查更新</string>
 
     <string name="video_lock">锁定</string>
-    <string name="video_aspect_ratio_resize">调整大小</string>
+    <string name="video_aspect_ratio_resize">调整画面</string>
     <string name="video_source">来源</string>
     <string name="video_skip_op">跳过OP</string>
 
     <string name="dont_show_again">不再显示</string>
     <string name="update">更新</string>
     <string name="watch_quality_pref">首选播放质量</string>
-    <string name="video_buffer_size_settings">视频缓冲区大小</string>
-    <string name="video_buffer_length_settings">视频缓冲区长度</string>
+    <string name="video_buffer_size_settings">视频缓冲大小</string>
+    <string name="video_buffer_length_settings">视频缓冲时长</string>
     <string name="video_buffer_disk_settings">磁盘上的视频缓存</string>
     <string name="video_buffer_clear_settings">清除视频和图像缓存</string>
 
@@ -334,11 +334,11 @@
 
     <string name="download_path_pref">下载路径</string>
 
-    <string name="display_subbed_dubbed_settings">显示音轨/字幕动画</string>
+    <string name="display_subbed_dubbed_settings">显示有配音/字幕的动画</string>
 
     <string name="resize_fit">适应屏幕</string>
     <string name="resize_fill">拉伸</string>
-    <string name="resize_zoom">Zoom</string>
+    <string name="resize_zoom">缩放</string>
 
     <string name="legal_notice">免责声明</string>
     <string name="legal_notice_key" translatable="false">legal_notice_key</string>

From 9d94e22bfb93979b3c8f66fa41e969e400541693 Mon Sep 17 00:00:00 2001
From: Jace <54625750+Jacekun@users.noreply.github.com>
Date: Sun, 20 Mar 2022 16:56:55 +0800
Subject: [PATCH 5/5] sopa2day: Add year, casts, and genres. (#825)

---
 .../movieproviders/SoaptwoDayProvider.kt      | 61 ++++++++++++++-----
 1 file changed, 45 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SoaptwoDayProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SoaptwoDayProvider.kt
index 6730f15e..90220961 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SoaptwoDayProvider.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/movieproviders/SoaptwoDayProvider.kt
@@ -5,6 +5,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.mvvm.logError
 import com.lagradost.cloudstream3.utils.*
 import com.lagradost.cloudstream3.utils.AppUtils.parseJson
+import org.jsoup.Jsoup
 import java.util.*
 
 class SoaptwoDayProvider:MainAPI() {
@@ -67,20 +68,44 @@ class SoaptwoDayProvider:MainAPI() {
     }
 
     override suspend fun load(url: String): LoadResponse? {
-        val soup = app.get(url, timeout = 120).document
-        val title = soup.selectFirst(".hidden-lg > div:nth-child(1) > h4").text()
+        val soup = app.get(url).document
+        val title = soup.selectFirst(".hidden-lg > div:nth-child(1) > h4")?.text() ?: ""
         val description = soup.selectFirst("p#wrap")?.text()?.trim()
-        val poster = soup.selectFirst(".col-md-5 > div:nth-child(1) > div:nth-child(1) > img").attr("src")
-        val episodes = soup.select("div.alert > div > div > a").map {
-            val link = it.attr("href")
-            val name = it.text().replace(Regex("(^(\\d+)\\.)"),"")
+        val poster = soup.selectFirst(".col-md-5 > div:nth-child(1) > div:nth-child(1) > img")?.attr("src")
+        val episodes = soup.select("div.alert > div > div > a").mapNotNull {
+            val link = fixUrlNull(it?.attr("href")) ?: return@mapNotNull null
+            val name = it?.text()?.replace(Regex("(^(\\d+)\\.)"),"")
             TvSeriesEpisode(
-                name,
-                null,
-                null,
-                fixUrl(link)
+                name = name,
+                data = link
             )
         }
+        val otherInfoBody = soup.select("div.col-sm-8 div.panel-body")?.toString()
+        //Fetch casts
+        val casts = otherInfoBody?.substringAfter("Stars : ")
+            ?.substringBefore("Genre : ")?.let {
+            Jsoup.parse(it)?.select("a")
+        }?.mapNotNull {
+            val castName = it?.text() ?: return@mapNotNull null
+            ActorData(
+                Actor(
+                    name = castName
+                )
+            )
+        }
+        //Fetch year
+        val year = otherInfoBody?.substringAfter("<h4>Release : </h4>")
+            ?.substringBefore("<div")?.let {
+                //Log.i(this.name, "Result => year string: $it")
+                Jsoup.parse(it)?.select("p")?.get(1)
+            }?.text()?.take(4)?.toIntOrNull()
+        //Fetch genres
+        val genre = otherInfoBody?.substringAfter("<h4>Genre : </h4>")
+            ?.substringBefore("<h4>Release : </h4>")?.let {
+                //Log.i(this.name, "Result => genre string: $it")
+                Jsoup.parse(it)?.select("a")
+            }?.mapNotNull { it?.text()?.trim() ?: return@mapNotNull null }
+
         val tvType = if (episodes.isEmpty()) TvType.Movie else TvType.TvSeries
         return when (tvType) {
             TvType.TvSeries -> {
@@ -90,9 +115,11 @@ class SoaptwoDayProvider:MainAPI() {
                     this.name,
                     tvType,
                     episodes.reversed(),
-                    fixUrl(poster),
-                    null,
+                    fixUrlNull(poster),
+                    year = year,
                     description,
+                    actors = casts,
+                    tags = genre
                 )
             }
             TvType.Movie -> {
@@ -102,9 +129,11 @@ class SoaptwoDayProvider:MainAPI() {
                     this.name,
                     tvType,
                     url,
-                    fixUrl(poster),
-                    null,
+                    fixUrlNull(poster),
+                    year = year,
                     description,
+                    actors = casts,
+                    tags = genre
                 )
             }
             else -> null
@@ -181,10 +210,10 @@ class SoaptwoDayProvider:MainAPI() {
             ).text.replace("\\\"","\"").replace("\"{","{").replace("}\"","}")
                 .replace("\\\\\\/","\\/")
             val json = parseJson<ServerJson>(url)
-            listOf(
+            listOfNotNull(
                 json.stream,
                 json.streambackup
-            ).filterNotNull().apmap { stream ->
+            ).apmap { stream ->
                 val cleanstreamurl = stream.replace("\\/","/").replace("\\\\\\","")
                 if (cleanstreamurl.isNotBlank()) {
                     callback(ExtractorLink(