Merge branch 'master' into master

Repositories.md

@@ -22,6 +22,7 @@ Direct Install | Short Codes { class="compact" }
 [!badge variant="secondary" icon="static/fr.png" text="FStream"](https://cutt.ly/fstream) | `fstream`
 [!badge variant="secondary" icon="static/world.png" text="Avocado"](https://cutt.ly/aguaco) | `aguaco`
 [!badge variant="secondary" icon="static/tr.png" text="Turkish"](https://cutt.ly/KekikAkademi) | `KekikAkademi`
+[!badge variant="secondary" icon="static/jo.png" text="Arabico"](https://cutt.ly/0wF96Vs1) | `0wF96Vs1`
 
 !!!info
 if you don't understand the name of a repository, the repository was named after the developer of that repository.

Settings/Subtitle.md

@@ -4,7 +4,7 @@ order: 1000
 icon: /static/sub.png
 ---
 
-# Subtitle Related FAQ
+# FAQ on Subtitles
 
 ==- Subtitle appearance settings
 
@@ -22,23 +22,23 @@ icon: /static/sub.png
 ===
 ==- Select subtitle source
 
-[!badge variant="dark" text="Video player"] → [!badge variant="dark" text="sources"] → [!badge variant="dark" text="subtitles"] → 3 types of subtitle source: 
+[!badge variant="dark" text="Video player"] → [!badge variant="dark" text="sources"] → [!badge variant="dark" text="subtitles"] → subtitles can come from three sources: 
 
-1. from the provider
+1. load from provider — listed automatically when available
-2. from the device 
+2. load from file — you manually add a subtitle file that's on your device to play with the video
-3. from the internet which are [Open subtitles](https://www.opensubtitles.com/), [Addic7ed](https://www.addic7ed.com/) and [Index subtitles](https://subscene.cyou/) (not stable).
+3. load from Internet — using [OpenSubtitles](https://www.opensubtitles.com/) (login required), [Addic7ed](https://www.addic7ed.com/) and [Index subtitles](https://subscene.cyou/) (not stable).
 
 ![image](https://user-images.githubusercontent.com/57977673/194716636-f16fe137-c2e6-4529-bfd8-b86214ab8843.png)
 
 ===
-==- How to use Open subtitles
+==- How to use OpenSubtitles
 
-[!badge variant="dark" icon="gear" text="Settings"] → [!badge variant="dark" text="Account"] → [!badge variant="dark" icon="/static/osub.png" text="OpenSubtitles"] → **Login with username and password**
+[!badge variant="dark" icon="gear" text="Settings"] → [!badge variant="dark" text="Account"] → [!badge variant="dark" icon="/static/osub.png" text="OpenSubtitles"] → **Login with your username and password**
 
 ![image](https://user-images.githubusercontent.com/57977673/194716884-04860e09-7910-4216-bf26-52fbca4e0a86.png)
 
-!!! note Open Subtitles FAQ
+!!! note OpenSubtitles FAQ
-If you have more questions about open subtitles, you can go [here](/Integrations/OpenSubtitles.md)
+For more information, you can [read our OpenSubtitles FAQ](/Integrations/OpenSubtitles.md)
 !!!
 
 ===

devs/scraping/starting.md

@@ -150,7 +150,7 @@ fun main() {
 
 ## **Regex:**
 
-When working with Regex I highly recommend using (regex101.com)[https://regex101.com/] (using the python flavor)
+When working with Regex I highly recommend using [regex101.com](https://regex101.com/) (using the python flavor)
 
 Press <kbd>Ctrl</kbd> + <kbd>U</kbd> 
 
@@ -219,4 +219,4 @@ fun main() {
     val description = descriptionRegex.find(response.text)?.groups?.get(1)?.value
     println(description)
 }
-```
+```

devs/using-plugin-template.md

@@ -5,15 +5,14 @@ order: 999
 ---
 
 # Using the template
-The easiest way to start developing is to use our [plugin-template](https://gitdab.com/recloudstream/plugin-template) as it sets up the build environment automatically.
+The easiest way to start developing is to fork our [Test Plugins](https://github.com/recloudstream/TestPlugins).
 
 To get started:
 
-1) <a href="https://gitdab.com/recloudstream/plugin-template" target="_blank">Copy the plugin template page URL</a>
+1) <a href="https://github.com/recloudstream/TestPlugins/fork" target="_blank">Fork the Test Plugins</a>
 
-2) Import into GitHub using the <a href="https://github.com/new/import" target="_blank">"Import a Repository"</a> Feature
+2) Check if GitHub actions are enabled, by going to: `Settings > Actions > General > Allow all actions and reusable workflows`
 
-3) Check if GitHub actions are enabled, by going to: `Settings > Actions > General > Allow all actions and reusable workflows`
+3) Make sure workflows have push access in your repository, by going to: `Settings > Actions > General > Read and write permissions`
-
-4) You can now create your own plugins and after you push new code, they should automatically be built
 
+4) You can now create your own plugins and after you push new code, they should automatically be built 

index.md

@@ -4,19 +4,19 @@ icon: /static/base.png
 ---
 # Getting Started
 
-Cloudstream is an android app for streaming and downloading Movies, TV-Series, Anime, Asian contents and Livestreams. The app provides all the contents without any ads, sign-up and subscription.
+CloudStream is an Android application for streaming and downloading movies, TV series, anime, Asian content and livestreams. The app provides all this content ad-free, without any sign-up or subscription requirements.
 
 ![](/static/cover.png)
 ___
 ## Standard Setup
 
-[!badge variant="light" text="Step 1"] Install the cloudstream base app [!badge variant="primary" icon="/static/stable.png" text="Stable"](https://github.com/recloudstream/cloudstream/releases/latest) or [!badge variant="danger" icon="/static/pre.png" text="Pre-release"](https://github.com/recloudstream/cloudstream/releases/pre-release)
+[!badge variant="light" text="Step 1"] Install the CloudStream base app: [!badge variant="primary" icon="/static/stable.png" text="Stable"](https://github.com/recloudstream/cloudstream/releases/latest) or [!badge variant="danger" icon="/static/pre.png" text="Pre-release"](https://github.com/recloudstream/cloudstream/releases/pre-release).
 
-[!badge variant="light" text="Step 2"] Install the [!badge variant="secondary" icon="repo" text="repositories"](Repositories.md)
+[!badge variant="light" text="Step 2"] Install the [!badge variant="secondary" icon="repo" text="repositories"](Repositories.md).
 
-[!badge variant="light" text="Step 3"] Go to **[!badge variant="dark" icon="static/base.png" text="Cloudstream"] → [!badge variant="dark" icon="static/gear.png" text="Settings"] → [!badge variant="dark" icon="" text="Extensions"] → [!badge variant="dark" icon="" text="Your installed Repository"]** and install your desired extensions.
+[!badge variant="light" text="Step 3"] Go to **[!badge variant="dark" icon="static/base.png" text="Cloudstream"] → [!badge variant="dark" icon="static/gear.png" text="Settings"] → [!badge variant="dark" icon="" text="Extensions"] → [!badge variant="dark" icon="" text="Your installed Repository"]**, and install your desired extensions.
 
-[!badge variant="light" text="Step 4"] Go back to [!badge variant="dark" icon="home" text="Home"] and click the [!badge variant="dark" icon="filter" text="None"] button at the bottom right. Then select the catagory of the extension you have installed and select the extension.
+[!badge variant="light" text="Step 4"] Go back to [!badge variant="dark" icon="home" text="Home"] and click the [!badge variant="dark" icon="filter" text="None"] button at the bottom right. Then select the category of the extension you have installed and select the extension.
 
 [!embed](https://www.youtube-nocookie.com/embed/B_WmCAUCy2c)
 ___
@@ -30,6 +30,6 @@ You can install repositories using short codes too.
 
 [!embed](https://youtu.be/Wpq9MPajOVc)
 
-!!!contrast If you aren't able to add repositories using these methods
+!!!contrast If you aren't able to add repositories using these methods,
-Use vpn in your device because your ISP is blocking Github raw URLs. You can try [!badge variant="link" text="these VPNs"](/recapps.md/#vpn) for the process.
+use a VPN on your device, because your ISP is blocking GitHub raw URLs. You can try [!badge variant="link" text="these VPNs"](/recapps.md/#vpn) for the process.
 !!!