Merge branch 'development'

.github/workflows/flatpak.yml

@@ -121,4 +121,4 @@ jobs:
         echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
         gh auth login --with-token < auth.txt
         rm auth.txt
-        gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merge once testing is complete."
+        gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."

package-lock.json

@@ -19127,26 +19127,11 @@
       }
     },
     "yt-trending-scraper": {
-      "version": "1.0.5",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/yt-trending-scraper/-/yt-trending-scraper-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/yt-trending-scraper/-/yt-trending-scraper-1.0.4.tgz",
-      "integrity": "sha512-jAEJ6i8iulXDvDBy26nN/RTm72bf7Guhl4p8J9qnpAwJGTqigiwjWHG424ZF0wxXvkHJQawlsvktt+glOvLp3Q==",
+      "integrity": "sha512-RWNHDP0Gx1cKBGy0229jG8XzunsGXF4ZPG1gOtbFF54oF+smahCeWmsuYlmzr+5MwTWzq2s968spTGVgpkNjTA==",
       "requires": {
-        "axios": "^0.21.1"
+        "axios": "^0.19.2"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.21.1",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-          "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-          "requires": {
-            "follow-redirects": "^1.10.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
-          "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
-        }
       }
     },
     "yt-xml2vtt": {

package.json

@@ -46,7 +46,7 @@
     "yt-channel-info": "^1.2.0",
     "yt-comment-scraper": "^1.3.11",
     "yt-dash-manifest-generator": "^1.1.0",
-    "yt-trending-scraper": "^1.0.5",
+    "yt-trending-scraper": "1.0.4",
     "yt-xml2vtt": "^1.2.0",
     "ytdl-core": "^4.4.3",
     "ytpl": "^2.0.4",

static/locales/id.yaml

@@ -240,6 +240,7 @@ Settings:
     Unknown data key: 'Kunci data tidak diketahui'
     How do I import my subscriptions?: 'Bagaimana saya mengimpor langganan saya?'
     Check for Legacy Subscriptions: Cek untuk Langganan Lama
+    Manage Subscriptions: Kelola Langganan
   Advanced Settings:
     Advanced Settings: 'Pengaturan Lanjutan'
     Enable Debug Mode (Prints data to the console): 'Aktifkan Mode Debug (Menampilkan
@@ -277,8 +278,25 @@ Settings:
     Distraction Free Settings: Pengaturan Bebas Gangguan
     Hide Video Likes And Dislikes: Sembunyikan Suka dan Tidak Suka Video
     Hide Video Views: Sembunyikan Tinjauan Video
+    Hide Active Subscriptions: Sembunyikan Langganan Aktif
   The app needs to restart for changes to take effect. Restart and apply change?: Aplikasi
     butuh dimulai ulang agar perbubahan diterapkan. Mulai ulang dan terapkan perubahan?
+  Proxy Settings:
+    Error getting network information. Is your proxy configured properly?: Galat mendapatkan
+      informasi jaringan. Apakah proksi anda dikonfigurasi dengan benar?
+    City: Kota
+    Region: Wilayah
+    Country: Negara
+    Ip: IP
+    Your Info: Info Anda
+    Test Proxy: Tes Proksi
+    Clicking on Test Proxy will send a request to: Klik pada Tes Proksi akan mengirim
+      permintaan ke
+    Proxy Port Number: Porta Proksi
+    Proxy Host: Hos Proksi
+    Proxy Protocol: Protokol Proksi
+    Enable Tor / Proxy: Aktifkan Tor / Proksi
+    Proxy Settings: Pengaturan Proksi
 About:
   #On About page
   About: 'Ihwal'
@@ -309,6 +327,30 @@ About:
 
   Latest FreeTube News: 'Berita FreeTube Terbaru'
 
+  Donate: Donasi
+  these people and projects: pengembang dan proyek berikut
+  FreeTube is made possible by: FreeTube dikembangkan oleh
+  Credits: Kredit
+  Translate: Terjemahkan
+  room rules: aturan kamar
+  Please read the: Silakan baca
+  Chat on Matrix: Mengobrol di Matrix
+  Mastodon: Mastodon
+  Email: Surel
+  Blog: Blog
+  Website: Situs web
+  Please check for duplicates before posting: Silakan periksa duplikat sebelum melaporkan
+  GitHub issues: Isu GitHub
+  Report a problem: Laporkan masalah
+  FAQ: PYSD
+  FreeTube Wiki: Wiki FreeTube
+  Help: Bantuan
+  GitHub releases: Rilis GitHub
+  Downloads / Changelog: Unduhan / Catatan Perubahan
+  View License: Lihat Lisensi
+  Licensed under the AGPLv3: Lisensi AGPLv3
+  Source code: Kode sumber
+  Beta: Beta
 Profile:
   Profile Select: 'Pilih Profil'
   All Channels: 'Semua Kanal'
@@ -468,6 +510,10 @@ Video:
   Open Channel in YouTube: Buka Kanal di YouTube
   Started streaming on: Siaran langsung dimulai pada
   Streamed on: Siaran langsung pada
+  Video has been removed from your saved list: Video telah dihapus dari daftar simpan
+    anda
+  Video has been saved: Video telah disimpan
+  Save Video: Simpan Video
 Videos:
   #& Sort By
   Sort By: