Merge branch 'development' of https://github.com/FreeTubeApp/FreeTube into development

Merge
2020-10-22 19:14:13 +02:00 · 2020-10-22 19:14:13 +02:00 · 82f7dafda6
parent 8a89062387 1912c3aa46
commit 82f7dafda6
15 changed files with 4734 additions and 7053 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -36,127 +36,127 @@ jobs:
        node-version: ${{ matrix.node-version }}
    - run: npm ci
    - run: npm run lint
-      
+
    - name: Install libarchive-tools
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      run: sudo apt -y install libarchive-tools
-      
+
    - name: Build x64 with Node.js ${{ matrix.node-version}}
      if: contains(matrix.runtime, 'x64')
      run: npm run build --if-present
-      
+
    - name: Build ARM64 with Node.js ${{ matrix.node-version}}
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      run: npm run build:arm --if-present
-      
+
    - name: Upload Linux .zip x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_linux_portable_x64
-        path: build/freetube-0.9.0.zip
+        name: freetube_0.9.1_linux_portable_x64
+        path: build/freetube-0.9.1.zip

    - name: Upload Linux .zip ARM Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      with:
-        name: freetube_0.9.0_linux_portable_arm64
-        path: build/freetube-0.9.0-arm64.zip
+        name: freetube_0.9.1_linux_portable_arm64
+        path: build/freetube-0.9.1-arm64.zip

    - name: Upload .deb x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_amd64.deb
-        path: build/freetube_0.9.0_amd64.deb
+        name: freetube_0.9.1_amd64.deb
+        path: build/freetube_0.9.1_amd64.deb

    - name: Upload .deb ARM Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      with:
-        name: freetube_0.9.0_arm64.deb
-        path: build/freetube_0.9.0_arm64.deb
+        name: freetube_0.9.1_arm64.deb
+        path: build/freetube_0.9.1_arm64.deb

    - name: Upload AppImage x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_amd64.AppImage
-        path: build/FreeTube-0.9.0.AppImage
+        name: freetube_0.9.1_amd64.AppImage
+        path: build/FreeTube-0.9.1.AppImage

    - name: Upload AppImage ARM Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      with:
-        name: freetube_0.9.0_arm64.AppImage
-        path: build/FreeTube-0.9.0-arm64.AppImage
+        name: freetube_0.9.1_arm64.AppImage
+        path: build/FreeTube-0.9.1-arm64.AppImage

    - name: Upload .rpm x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_amd64.rpm
-        path: build/freetube-0.9.0.x86_64.rpm
+        name: freetube_0.9.1_amd64.rpm
+        path: build/freetube-0.9.1.x86_64.rpm

    - name: Upload .rpm ARM Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      with:
-        name: freetube_0.9.0_arm64.rpm
-        path: build/freetube-0.9.0.arm64.rpm
+        name: freetube_0.9.1_arm64.rpm
+        path: build/freetube-0.9.1.arm64.rpm

    - name: Upload Alpine .apk x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_alpine_amd64.apk
-        path: build/freetube-0.9.0.apk
+        name: freetube_0.9.1_alpine_amd64.apk
+        path: build/freetube-0.9.1.apk

    - name: Upload Alpine .apk ARM Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
      with:
-        name: freetube_0.9.0_alpine_arm64.apk
-        path: build/freetube-0.9.0-arm64.apk
+        name: freetube_0.9.1_alpine_arm64.apk
+        path: build/freetube-0.9.1-arm64.apk

    - name: Upload Pacman .pacman x64 Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_pacman_arm64.pacman
-        path: build/freetube-0.9.0.pacman
+        name: freetube_0.9.1_pacman_arm64.pacman
+        path: build/freetube-0.9.1.pacman

    - name: Upload Web Build
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
      with:
-        name: freetube_0.9.0_static_web
+        name: freetube_0.9.1_static_web
        path: dist/web

    - name: Upload Windows .exe Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'windows')
      with:
-        name: freetube-0.9.0-win-x64-portable
-        path: build/freetube-0.9.0-win.zip
+        name: freetube-0.9.1-win-x64-portable
+        path: build/freetube-0.9.1-win.zip

    - name: Upload Windows .zip Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'windows')
      with:
-        name: freetube-0.9.0-setup-x64.exe
-        path: build/freetube Setup 0.9.0.exe
+        name: freetube-0.9.1-setup-x64.exe
+        path: build/freetube Setup 0.9.1.exe

    - name: Upload Windows Portable Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'windows')
      with:
-        name: freetube-0.9.0-portable-x64.exe
-        path: build/freetube 0.9.0.exe
+        name: freetube-0.9.1-portable-x64.exe
+        path: build/freetube 0.9.1.exe

    - name: Upload Mac .dmg Artifact
      uses: actions/upload-artifact@v2
      if: startsWith(matrix.os, 'macos')
      with:
-        name: freetube-0.9.0-mac.dmg
-        path: build/freetube-0.9.0.dmg
+        name: freetube-0.9.1-mac.dmg
+        path: build/freetube-0.9.1.dmg
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -34,9 +34,9 @@
    "videojs-vtt-thumbnails-freetube": "0.0.15",
    "vue": "^2.6.12",
    "vue-electron": "^1.0.6",
-    "vue-i18n": "^8.22.0",
+    "vue-i18n": "^8.22.1",
    "vue-observe-visibility": "^0.4.6",
-    "vue-router": "^3.4.6",
+    "vue-router": "^3.4.7",
    "vuex": "^3.5.1",
    "xml2json": "^0.12.0",
    "youtube-chat": "^1.1.0",
@ -44,46 +44,46 @@
    "yt-channel-info": "^1.1.4",
    "yt-comment-scraper": "^1.3.7",
    "yt-dash-manifest-generator": "^1.1.0",
-    "yt-trending-scraper": "^1.0.3",
+    "yt-trending-scraper": "^1.0.4",
    "yt-xml2vtt": "^1.1.2",
-    "ytdl-core": "^3.3.0",
+    "ytdl-core": "^3.4.1",
    "ytpl": "^1.0.1",
-    "ytsr": "^1.0.4"
+    "ytsr": "github:TimeForANinja/node-ytsr#wip-api-adjustments"
  },
  "description": "A private YouTube client",
  "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-typescript": "^7.10.4",
-    "@typescript-eslint/eslint-plugin": "^4.4.0",
-    "@typescript-eslint/parser": "^4.4.0",
-    "acorn": "^8.0.3",
+    "@babel/core": "^7.12.3",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+    "@babel/preset-env": "^7.12.1",
+    "@babel/preset-typescript": "^7.12.1",
+    "@typescript-eslint/eslint-plugin": "^4.5.0",
+    "@typescript-eslint/parser": "^4.5.0",
+    "acorn": "^8.0.4",
    "babel-eslint": "^10.1.0",
    "babel-loader": "^8.1.0",
-    "copy-webpack-plugin": "^6.2.0",
-    "css-loader": "^4.3.0",
+    "copy-webpack-plugin": "^6.2.1",
+    "css-loader": "^5.0.0",
    "devtron": "^1.4.0",
    "electron": "^9.3.1",
-    "electron-builder": "^22.8.1",
+    "electron-builder": "^22.9.1",
    "electron-builder-squirrel-windows": "^22.9.1",
    "electron-debug": "^3.1.0",
-    "electron-rebuild": "^2.2.0",
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.12.0",
+    "electron-rebuild": "^2.3.2",
+    "eslint": "^7.11.0",
+    "eslint-config-prettier": "^6.14.0",
    "eslint-config-standard": "^14.1.1",
    "eslint-plugin-import": "^2.22.1",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-prettier": "^3.1.4",
    "eslint-plugin-promise": "^4.2.1",
    "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-vue": "^7.0.1",
+    "eslint-plugin-vue": "^7.1.0",
    "fast-glob": "^3.2.4",
    "file-loader": "^6.1.1",
    "html-webpack-plugin": "^4.5.0",
-    "jest": "^26.5.2",
-    "mini-css-extract-plugin": "^1.0.0",
+    "jest": "^26.6.0",
+    "mini-css-extract-plugin": "^1.1.1",
    "node-abi": "^2.19.1",
    "node-loader": "^1.0.2",
    "npm-run-all": "^4.1.5",
@ -95,7 +95,7 @@
    "typescript": "^4.0.3",
    "url-loader": "^4.1.1",
    "vue-devtools": "^5.1.4",
-    "vue-eslint-parser": "^7.1.0",
+    "vue-eslint-parser": "^7.1.1",
    "vue-loader": "^15.9.3",
    "vue-style-loader": "^4.1.2",
    "vue-template-compiler": "^2.6.12",
@ -141,5 +141,5 @@
    "test": "run-s rebuild:node pack:workers jest",
    "test:watch": "run-s rebuild:node pack:workers jest:watch"
  },
-  "version": "0.9.0"
+  "version": "0.9.1"
 }
--- a/src/renderer/components/ft-tooltip/ft-tooltip.css
+++ b/src/renderer/components/ft-tooltip/ft-tooltip.css
@ -30,8 +30,8 @@
 }

 .text {
-  background-color: black;
-  border-radius: 2px;
+  background-color: rgba(0, 0, 0, 0.8);
+  border-radius: 20px;
  color: #fff;
  font-size: 1rem;
  line-height: 120%;
--- a/src/renderer/store/modules/ytdl.js
+++ b/src/renderer/store/modules/ytdl.js
@ -49,6 +49,9 @@ const actions = {
          }).finally(() => {
            commit('toggleIsYtSearchRunning')
          })
+        }).catch((err) => {
+          console.log(err)
+          reject(err)
        })
      } else {
        ytsr(payload.query, payload.options).then((result) => {
@ -66,7 +69,7 @@ const actions = {
  },

  ytSearchGetFilters ({ rootState }, payload) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
      let filter = payload.query
      let searchSettings = payload.searchSettings

@ -108,6 +111,8 @@ const actions = {
            })
          })
        })
+      }).catch((err) => {
+        reject(err)
      })
    })
  },
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@ -122,7 +122,9 @@ export default Vue.extend({
        }

        const returnData = result.items.filter((item) => {
-          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
+          if (typeof item !== 'undefined') {
+            return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
+          }
        })

        const returnDataInvidious = []
--- a/src/renderer/views/Search/Search.vue
+++ b/src/renderer/views/Search/Search.vue
@ -15,6 +15,7 @@
        :data="shownResults"
      />
      <div
+        v-if="nextPageRef !== null && nextPageRef !== ''"
        class="getNextPage"
        @click="nextPage"
      >
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@ -396,7 +396,7 @@ export default Vue.extend({
          console.log(err)
          const errorMessage = this.$t('Invidious API Error (Click to copy)')
          this.showToast({
-            message: `${errorMessage}: ${err.responseText}`,
+            message: `${errorMessage}: ${err}`,
            time: 10000,
            action: () => {
              navigator.clipboard.writeText(err)
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@ -421,7 +421,7 @@ Video:
 #& Videos
  Play Previous Video: Lire la vidéo précédente
  Play Next Video: Lire la vidéo suivante
-  Autoplay: Lecture Automatique
+  Autoplay: Lecture Auto
  Reverse Playlist: Inverser la Playlist
  Shuffle Playlist: Mélanger la Playlist
  Loop Playlist: Playlist en boucle
@ -608,4 +608,4 @@ Tooltips:
      comme méthode de secours lorsqu'elle est activée
    Preferred API Backend: Choisissez le backend que FreeTube utilise pour obtenir
      les données. L'API locale est un extracteur intégré. L'API Invidious nécessite
-      un serveur Invidious pour se connecter à
+      un serveur Invidious pour se connecter
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@ -35,7 +35,7 @@ Search / Go to URL: 'Pretraži / Idi na URL'
 Search Filters:
  Search Filters: 'Filtri za pretraživanje'
  Sort By:
-    Sort By: 'Razvrstaj po'
+    Sort By: 'Razvrstaj prema'
    Most Relevant: 'Najrelevantniji'
    Rating: 'Ocjena'
    Upload Date: 'Datum prijenosa'
@ -51,7 +51,7 @@ Search Filters:
  Type:
    Type: 'Vrsta'
    All Types: 'Sve vrste'
-    Videos: 'Videozapisi'
+    Videos: 'Videa'
    Channels: 'Kanali'
    #& Playlists
  Duration:
@ -76,7 +76,7 @@ Subscriptions:
  This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: Ovaj
    profil sadrži velik broj pretplata. Za izbjegavanje ograničenja stope koristit
    će se RSS
-  Load More Videos: Učitaj još videozapisa
+  Load More Videos: Učitaj još videa
 Trending: 'U trendu'
 Most Popular: 'Najpopularniji'
 Playlists: 'Zbirke'
@ -98,11 +98,11 @@ Settings:
    Default Landing Page: 'Standardna odredišna stranica'
    Locale Preference: 'Jezik'
    Preferred API Backend:
-      Preferred API Backend: 'Primarni pozadinski sustav'
+      Preferred API Backend: 'Primarni pozadinski sustav sučelja'
      Local API: 'Lokalno sučelje'
      Invidious API: 'Invidious sučelje'
    Video View Type:
-      Video View Type: 'Način prikaza videozapisa'
+      Video View Type: 'Način prikaza videa'
      Grid: 'Popločeno'
      List: 'Popis'
    Thumbnail Preference:
@ -113,7 +113,7 @@ Settings:
      End: 'Kraj'
    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious primjerak
      (standardno se koristi https://invidious.snopyta.org)'
-    Region for Trending: 'Regija za videozapise u trendu'
+    Region for Trending: 'Regija za videa u trendu'
        #! List countries
    Check for Latest Blog Posts: Traži najnovije objave na blogu
    Check for Updates: Traži nove verzije
@ -152,10 +152,10 @@ Settings:
    Player Settings: 'Postavke playera'
    Force Local Backend for Legacy Formats: 'Koristi lokalni pozadinski sustav za
      stare formate'
-    Play Next Video: 'Reproduciraj sljedeći videozapis'
+    Play Next Video: 'Reproduciraj sljedeći video'
    Turn on Subtitles by Default: 'Standardno uključi titlove'
-    Autoplay Videos: 'Automatski reproduciraj videozapise'
-    Proxy Videos Through Invidious: 'Koristi Invidious za prosljeđivanje videozapisa'
+    Autoplay Videos: 'Automatski reproduciraj videa'
+    Proxy Videos Through Invidious: 'Koristi Invidious kao posrednika videa'
    Autoplay Playlists: 'Automatski reproduciraj zbirke'
    Enable Theatre Mode by Default: 'Standardno aktiviraj kazališni modus'
    Default Volume: 'Standardna glasnoća'
@ -194,7 +194,7 @@ Settings:
    Remove All Subscriptions / Profiles: Ukloni sve pretplate/profile
  Subscription Settings:
    Subscription Settings: 'Postavke pretplata'
-    Hide Videos on Watch: 'Sakrij videozapise nakon gledanja'
+    Hide Videos on Watch: 'Sakrij video nakon gledanja'
    Fetch Feeds from RSS: 'Dohvati feedove s RSS-a'
    Subscriptions Export Format:
      Subscriptions Export Format: 'Format izvoza pretplata'
@ -209,12 +209,12 @@ Settings:
    Advanced Settings: 'Napredne postavke'
    Enable Debug Mode (Prints data to the console): 'Aktiviraj modus otklanjanja grešaka
      (ispisuje podatke na konzolu)'
-    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Proxy adresa (primjer: SOCKS5:
-      //127.0.0.1: 9050)'
+    'Proxy Address (Example: SOCKS5://127.0.0.1:9050 )': 'Adresa posrednika (npr.:
+      SOCKS5: //127.0.0.1: 9050)'
    'Clicking "TEST PROXY" button will send a request to https://ipinfo.io/json': 'Pritiskom
-      gumba „TESTIRAJ PROXY” poslat će se zahtjev na https://ipinfo.io/json'
-    Use Tor / Proxy for API calls: 'Koristi Tor/Proxy za pozive sučelja'
-    TEST PROXY: 'TESTIRAJ PROXY'
+      gumba „TESTIRAJ POSREDNIKA” poslat će se zahtjev na https://ipinfo.io/json'
+    Use Tor / Proxy for API calls: 'Koristi Tor/posrednika za pozive sučelja'
+    TEST PROXY: 'TESTIRAJ POSREDNIKA'
    #& Invidious Instance (Default is https://invidious.snopyta.org)
    See Public Instances: 'Pogledaj javne primjerke'
    Clear History:
@ -268,14 +268,14 @@ Settings:
      pretplata
    Check for Legacy Subscriptions: Potraži stare pretplate
  Distraction Free Settings:
-    Hide Trending Videos: Sakrij videozapise u trendu
-    Hide Recommended Videos: Sakrij preporučene videozapise
+    Hide Trending Videos: Sakrij videa u trendu
+    Hide Recommended Videos: Sakrij preporučena videa
    Hide Channel Subscribers: Sakrij pretplatnike na kanal
    Hide Live Chat: Sakrij chat u živo
-    Hide Popular Videos: Sakrij popularne videozapise
+    Hide Popular Videos: Sakrij popularna videa
    Hide Comment Likes: Sakrij ocjene komentara
-    Hide Video Likes And Dislikes: Sakrij ocjenjivanje videozapisa
-    Hide Video Views: Sakrij broj gledanja videozapisa
+    Hide Video Likes And Dislikes: Sakrij ocjenjivanje videa
+    Hide Video Views: Sakrij broj gledanja videa
    Distraction Free Settings: Postavke za nesmetan rad
  The app needs to restart for changes to take effect. Restart and apply change?: Za
    primjenu promjena, program se mora ponovo pokrenuti. Ponovo pokrenuti program?
@ -359,9 +359,9 @@ Channel:
  Your search results have returned 0 results: 'Pretraživanje je vratilo 0 rezultata'
  Sort By: 'Razvrstaj po'
  Videos:
-    Videos: 'Videozapisi'
+    Videos: 'Videa'
    This channel does not currently have any videos: 'Na ovom kanalu trenutačno nema
-      videozapisa'
+      videa'
    Sort Types:
      Newest: 'Najnoviji'
      Oldest: 'Najstariji'
@ -371,7 +371,7 @@ Channel:
    This channel does not currently have any playlists: 'Ovaj kanal trenutačno ne
      sadrži nijednu zbirku'
    Sort Types:
-      Last Video Added: 'Zadnji dodani videozapis'
+      Last Video Added: 'Zadnji dodani video'
      Newest: 'Najnoviji'
      Oldest: 'Najstariji'
  About:
@ -384,9 +384,9 @@ Channel:
 Video:
  Mark As Watched: 'Označi kao pogledano'
  Remove From History: 'Ukloni iz povijesti'
-  Video has been marked as watched: 'Videozapis je označen kao pogledan'
-  Video has been removed from your history: 'Videozapis je uklonjen iz tvoje povijesti'
-  Open in YouTube: 'Otvori na YouTube stranici'
+  Video has been marked as watched: 'Video je označen kao pogledan'
+  Video has been removed from your history: 'Video je uklonjen iz tvoje povijesti'
+  Open in YouTube: 'Otvori na YouTubeu'
  Copy YouTube Link: 'Kopiraj poveznicu na YouTube'
  Open YouTube Embedded Player: 'Otvori ugrađeni YouTube player'
  Copy YouTube Embedded Player Link: 'Kopiraj poveznicu na ugrađeni YouTube player'
@ -399,7 +399,7 @@ Video:
  Watched: 'Pogledano'
  # As in a Live Video
  Live: 'Uživo'
-  Live Now: 'Trenutno uživo'
+  Live Now: 'Sada uživo'
  Live Chat: 'Chat uživo'
  Enable Live Chat: 'Aktiviraj chat uživo'
  Live Chat is currently not supported in this build.: 'Chat uživo trenutačno nije
@ -439,14 +439,14 @@ Video:
    Year: 'g'
    Years: 'g'
    Ago: 'Prije'
-    Upcoming: 'Datum premijere'
+    Upcoming: 'Premijera'
  Published on: 'Objavljeno'
  # $ is replaced with the number and % with the unit (days, hours, minutes...)
  Publicationtemplate: 'prije $ %'
 #& Videos
  Autoplay: Automatska reprodukcija
-  Play Previous Video: Reproduciraj prethodni videozapis
-  Play Next Video: Reproduciraj sljedeći videozapis
+  Play Previous Video: Reproduciraj prethodni video
+  Play Next Video: Reproduciraj sljedeći video
  Reverse Playlist: Obrni redoslijed zbirke
  Shuffle Playlist: Slučajni redoslijed zbirke
  Loop Playlist: Ponavljaj zbirku
@ -457,9 +457,9 @@ Video:
    High: Visoka
    Medium: Srednja
    Low: Niska
-  audio only: samo audiozapis
-  video only: samo videozapis
-  Download Video: Preuzmi videozapis
+  audio only: samo audiosnimku
+  video only: samo video
+  Download Video: Preuzmi video
 Videos:
  #& Sort By
  Sort By:
@ -470,7 +470,7 @@ Videos:
 Playlist:
  #& About
  View Full Playlist: 'Pogledaj cijelu zbirku'
-  Videos: 'Videozapisi'
+  Videos: 'Videa'
  View: 'Pogled'
  Views: 'Pogledi'
  Last Updated On: 'Zadnje aktualiziranje'
@ -491,11 +491,11 @@ Change Format:
  Use Legacy Formats: 'Koristi stare formate'
  Use Audio Formats: 'Koristi audioformate'
  Audio formats are not available for this video: Audioformati nisu dostupni za ovaj
-    videozapis
+    video
  Dash formats are not available for this video: Dash formati nisu dostupni za ovaj
-    videozapis
+    video
 Share:
-  Share Video: 'Dijeli videozapis'
+  Share Video: 'Dijeli video'
  Copy Link: 'Kopiraj poveznicu'
  Open Link: 'Otvori poveznicu'
  Copy Embed: 'Kopiraj ugrađenu verziju'
@ -520,9 +520,9 @@ Comments:
  Hide: 'Sakrij'
  Replies: 'Odgovori'
  Reply: 'Odgovor'
-  There are no comments available for this video: 'Nema komentara za ovaj videozapis'
+  There are no comments available for this video: 'Nema komentara za ovaj video'
  Load More Comments: 'Učitaj još komentara'
-  There are no more comments for this video: Nema daljnjih komentara za ovaj videozapis
+  There are no more comments for this video: Nema daljnjih komentara za ovaj video
  No more comments available: Nema daljnjih komentara
  Newest first: Najprije najnovije
  Top comments: Najpopularniji komentari
@ -539,11 +539,11 @@ Loop is now disabled: 'Ponavljanje je sada deaktivirano'
 Loop is now enabled: 'Ponavljanje je sada aktivirano'
 Shuffle is now disabled: 'Slučajni redoslijed je sada deaktiviran'
 Shuffle is now enabled: 'Slučajni redoslijed je sada aktiviran'
-Playing Next Video: 'Reprodukcija sljedećeg videozapisa'
-Playing Previous Video: 'Reprodukcija prethodnog videozapisa'
-Playing next video in 5 seconds.  Click to cancel: 'Reprodukcija sljedećeg videozapisa
-  za 5 sekundi. Pritisni za prekid.'
-Canceled next video autoplay: 'Automatska reprodukcija sljedećeg videozapisa je prekinuta'
+Playing Next Video: 'Reprodukcija sljedećeg videa'
+Playing Previous Video: 'Reprodukcija prethodnog videa'
+Playing next video in 5 seconds.  Click to cancel: 'Reprodukcija sljedećeg videa za
+  5 sekundi. Pritisni za prekid.'
+Canceled next video autoplay: 'Automatska reprodukcija sljedećeg videa je prekinuta'
 'The playlist has ended.  Enable loop to continue playing': 'Dosegnut je kraj zbirke.
  Aktiviraj ponavljanje za nastavljanje reprodukcije'

@ -556,25 +556,25 @@ Download From Site: Preuzmi s web-stranice
 Version $ is now available!  Click for more details: Dostupna je verzija $! Pritisni
  za prikaz detalja
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Ovaj
-  videozapis nije dostupan zbog nedostajućih formata. Uzrok tome može biti nedostupnost
-  zemlje.
+  video nije dostupan zbog nedostajućih formata. Uzrok tome može biti nedostupnost
+  u zemlji.
 Tooltips:
  Player Settings:
-    Default Video Format: Postavi formate za reprodukciju videozapisa. Dash formati
-      mogu reproducirati višu kvalitetu slike. Stari formati su ograničeni na 720
-      p, ali su zato brži. Audio formati emitiraju samo audiosnimke
-    Proxy Videos Through Invidious: Za slanje videozapisa povezat će se s Invidiousom
+    Default Video Format: Postavi formate za reprodukciju videa. Dash formati mogu
+      reproducirati višu kvalitetu slike. Stari formati su ograničeni na 720 p, ali
+      su zato brži. Audioformati sadrže samo audiosnimke
+    Proxy Videos Through Invidious: Za reprodukciju videa povezat će se s Invidiousom
      umjesto izravnog povezivanja s YouTubeom. Zanemaruje postavke sučelja
    Force Local Backend for Legacy Formats: Radi samo, kad postaviš Invidious kao
      standardno sučelje. Kad je aktivirano, lokalno sučelje će pokretati i koristiti
      stare formate umjesto onih koje dostavlja Invidious. Pomaže u slučajevima, kad
-      je reprodukcija videozapisa koje dostavlja Invidious u zemlji zabranjena/ograničena
+      je reprodukcija videa koje dostavlja Invidious u zemlji zabranjena/ograničena
  General Settings:
    Invidious Instance: Invidious primjerak na koji će se FreeTube povezati za pozive
      sučelja. Isprazni trenutačni primjerak za prikaz popisa javnih primjeraka koje
      možeš odabrati
    Thumbnail Preference: U FreeTubeu će se sve minijature zamijeniti s jednim kadrom
-      videozapisa umjesto standardne minijature
+      videa umjesto standardne minijature
    Fallback to Non-Preferred Backend on Failure: Ako primarno odabrano sučelje ima
      problema, FreeTube će automatski pokušati koristiti sekundarno sučelje kao zamjensku
      metodu, ako je aktivirano
@ -584,5 +584,5 @@ Tooltips:
  Subscription Settings:
    Fetch Feeds from RSS: Kad je aktivirano, FreeTube će koristiti RSS umjesto standardne
      metode za dohvaćanje tvog feeda pretplate. RSS je brži i sprečava blokiranje
-      IP adresa, ali ne pruža određene podatke kao što su trajanje videozapisa ili
-      stanja „uživo”
+      IP adresa, ali ne pruža određene podatke kao što su trajanje videa ili stanja
+      „uživo”
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@ -1,7 +1,7 @@
 FreeTube: 'FreeTube'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  アプリのこの部分は未完成です。完成後に操作してください。
+  アプリのこの部分は未完成です。完成後に再びここを開いてください。

 # Webkit Menu Bar
 File: 'ファイル'
@ -16,11 +16,11 @@ Delete: '削除'
 Select all: 'すべて選択'
 Reload: '再読み込み'
 Force Reload: '強制的に再読み込み'
-Toggle Developer Tools: '開発者ツールに変更'
+Toggle Developer Tools: '開発者ツールに切替'
 Actual size: '実際のサイズ'
 Zoom in: '拡大'
 Zoom out: '縮小'
-Toggle fullscreen: '全画面に変更'
+Toggle fullscreen: '全画面の切替'
 Window: 'ウィンドウ'
 Minimize: '最小化'
 Close: '閉じる'
@ -55,12 +55,12 @@ Search Filters:
  Duration:
    Duration: '長さ'
    All Durations: 'すべての長さ'
-    Short (< 4 minutes): '短編（4 分未満）'
-    Long (> 20 minutes): '長編（20 分以上）'
+    Short (< 4 minutes): '短編 (4 分未満)'
+    Long (> 20 minutes): '長編 (20 分以上)'
  # On Search Page
  Search Results: '検索結果'
  Fetching results. Please wait: '結果の取得中。お待ちください'
-  Fetch more results: 'もっと見る'
+  Fetch more results: 'さらに結果を取得'
 # Sidebar
 Subscriptions:
    # On Subscriptions Page
@ -68,13 +68,13 @@ Subscriptions:
  Latest Subscriptions: '最近の登録'
  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'まだチャンネル登録がありません。登録するとここに表示されます。'
  'Getting Subscriptions.  Please wait.': '登録を取得中。お待ちください...'
-  Refresh Subscriptions: 登録から更新
-  Getting Subscriptions. Please wait.: youtube から登録情報の取得中。しばらくお待ちください。
+  Refresh Subscriptions: 登録チャンネルの更新
+  Getting Subscriptions. Please wait.: 登録チャンネルの内容を取得中。お待ちください。
  This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: このプロファイルはチャンネル登録が多くなっています。接続制限の回避のため強制的な
    RSS にします
-  Load More Videos: もっと見る
+  Load More Videos: さらに動画を読み込む
 Trending: '急上昇'
-Most Popular: '最も人気'
+Most Popular: '人気'
 Playlists: '再生リスト'
 User Playlists:
  Your Playlists: 'あなたの再生リスト'
@ -88,12 +88,12 @@ Settings:
  Settings: '設定'
  General Settings:
    General Settings: '一般設定'
-    Fallback to Non-Preferred Backend on Failure: '問題の発生時には選択していない方法に切り替えて接続'
+    Fallback to Non-Preferred Backend on Failure: '失敗時に非優先の代替サービスに接続'
    Enable Search Suggestions: '検索候補の有効化'
    Default Landing Page: '起動時の表示'
    Locale Preference: '言語設定'
    Preferred API Backend:
-      Preferred API Backend: '取得方法の選択'
+      Preferred API Backend: '優先する API サービス'
      Local API: '内部 API'
      Invidious API: 'Invidious API'
    Video View Type:
@ -106,7 +106,7 @@ Settings:
      Beginning: '開始'
      Middle: '中間'
      End: '終了'
-    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious のインスタンス
+    'Invidious Instance (Default is https://invidious.snopyta.org)': 'Invidious の実体
      (初期値は https://invidious.snopyta.org)'
    Region for Trending: '地域内の急上昇'
        #! List countries
@ -114,14 +114,14 @@ Settings:
    Check for Updates: 最新版の確認
  Theme Settings:
    Theme Settings: 'テーマの設定'
-    Match Top Bar with Main Color: '上部のバーを第一配色に調和'
+    Match Top Bar with Main Color: '上部のバーを配色1に調和'
    Base Theme:
      Base Theme: 'テーマ'
      Black: '黒'
      Dark: 'ダーク'
      Light: 'ライト'
    Main Color Theme:
-      Main Color Theme: '第一配色'
+      Main Color Theme: '配色1'
      Red: '赤'
      Pink: '桃'
      Purple: '紫'
@ -138,16 +138,16 @@ Settings:
      Amber: '琥珀'
      Orange: 'オレンジ'
      Deep Orange: '濃いオレンジ'
-    Secondary Color Theme: '第二配色'
+    Secondary Color Theme: '配色2'
        #* Main Color Theme
-    UI Scale: UI の拡大率
+    UI Scale: UI の縮尺率
    Expand Side Bar by Default: サイドバーを展開して起動
    Disable Smooth Scrolling: 滑らかなスクロールの無効化
  Player Settings:
    Player Settings: 'プレイヤーの設定'
-    Force Local Backend for Legacy Formats: '旧形式は内部 API の強制使用'
+    Force Local Backend for Legacy Formats: '旧形式には内部 API を強制的に使用'
    Remember History: '履歴を記憶'
-    Play Next Video: '次の動画の自動再生'
+    Play Next Video: '次の動画を再生'
    Turn on Subtitles by Default: '最初から字幕を有効化'
    Autoplay Videos: '動画の自動再生'
    Proxy Videos Through Invidious: 'Invidious 経由で動画にプロキシを使用'
@ -184,7 +184,7 @@ Settings:
    Import Subscriptions: '登録のインポート'
    Export Subscriptions: '登録のエクスポート'
    How do I import my subscriptions?: 'どうやってインポートするのですか？'
-    Fetch Feeds from RSS: RSS から概要の取得
+    Fetch Feeds from RSS: RSS から情報を取得
  Advanced Settings:
    Advanced Settings: '高度な設定'
    Enable Debug Mode (Prints data to the console): 'デバッグモードの有効化 (コンソールにデータを出力)'
@ -194,7 +194,7 @@ Settings:
    Use Tor / Proxy for API calls: 'API 呼び出しに Tor/Proxy を使用'
    TEST PROXY: 'プロキシのテスト'
    #& Invidious Instance (Default is https://invidious.snopyta.org)
-    See Public Instances: '公開インスタンスを参照してください'
+    See Public Instances: '公開インスタンスを参照'
    Clear History:
      Clear History: '履歴の削除'
      # On Click
@ -252,7 +252,7 @@ Settings:
    Check for Legacy Subscriptions: 古い登録形式の確認
  Distraction Free Settings:
    Hide Live Chat: ライブチャットを非表示
-    Hide Popular Videos: 最も人気を非表示
+    Hide Popular Videos: 人気の動画を非表示
    Hide Trending Videos: 急上昇の動画を非表示
    Hide Recommended Videos: おすすめ動画を非表示
    Hide Comment Likes: コメントの評価を非表示
@ -263,7 +263,7 @@ Settings:
  The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
 About:
  #On About page
-  About: 'FreeTube について'
+  About: 'このソフト'
  #& About
  'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'このコピーレフトのソフトウェアは、AGPL-3.0
    の自由なライセンスです。'
@ -275,14 +275,14 @@ About:
    を実現させてくれている人々とプロジェクトに感謝！'

  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'チャットが必要なら私たちの
-    Element / Matrix に参加ください。参加前にルールの確認をお願いします。'
+    Element / Matrix に参加してください。参加前にルールの確認をお願いします。'

  'Looking for help? Check out our Wiki page.': 'ヘルプが必要なら私たちの Wiki をご覧ください。'

  Check out our Firefox extension!: 'Firefox 拡張機能をご覧ください！'

  'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'FreeTube
-    をお楽しみの方は、Liberapay か Bitcoin アドレスを通じて寄付をお願いします。'
+    を気に入っていただけていれば、ぜひ Liberapay かビットコインの寄付をお願いします。'

  #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS'

@ -303,7 +303,7 @@ Channel:
    Sort Types:
      Newest: '新しい'
      Oldest: '古い'
-      Most Popular: '最も人気'
+      Most Popular: '人気'
  Playlists:
    Playlists: '再生リスト'
    This channel does not currently have any playlists: 'このチャンネルには再生リストがありません'
@ -316,8 +316,8 @@ Channel:
    Channel Description: 'チャンネルの説明'
    Featured Channels: '注目のチャンネル'
  Added channel to your subscriptions: 登録にチャンネルを追加しました
-  Channel has been removed from your subscriptions: チャンネルを登録から削除しました
-  Removed subscription from $ other channel(s): 他の $ チャンネルから登録を削除しました
+  Channel has been removed from your subscriptions: 登録からチャンネルを削除しました
+  Removed subscription from $ other channel(s): ほかの $ チャンネルから登録を削除しました
 Video:
  Open in YouTube: 'YouTube で開く'
  Copy YouTube Link: 'YouTube のリンクをコピー'
@ -351,8 +351,8 @@ Video:
    Aug: '8月'
    Sep: '9月'
    Oct: '10月'
-    Nov: '11 月'
-    Dec: '12 月'
+    Nov: '11月'
+    Dec: '12月'
    Second: '秒'
    Seconds: '秒'
    Hour: '時間'
@ -371,7 +371,7 @@ Video:
    Minute: 分
  Published on: '公開日'
  # $ is replaced with the number and % with the unit (days, hours, minutes...)
-  Publicationtemplate: '$ % 前'
+  Publicationtemplate: '$ %前'
 #& Videos
  Video has been removed from your history: 動画を履歴から削除しました
  Remove From History: 履歴から削除
@ -383,7 +383,7 @@ Video:
  Reverse Playlist: 再生リストを逆順に
  Shuffle Playlist: 再生リストのシャッフル
  Loop Playlist: 再生リストのループ
-  Starting soon, please refresh the page to check again: まもなく開始されます。再読み込みしご確認ください
+  Starting soon, please refresh the page to check again: すぐに再生されます、ページを再読み込みしてお待ちください
  Audio:
    Best: 最適
    High: 高
@ -402,7 +402,7 @@ Videos:
 Playlist:
  #& About
  View Full Playlist: '完全な再生リストの表示'
-  Videos: '動画'
+  Videos: '本の動画'
  View: '回視聴'
  Views: '回視聴'
  Last Updated On: '最終更新日'
@ -416,7 +416,7 @@ Playlist:
 # On Video Watch Page
 #* Published
 #& Views
-Toggle Theatre Mode: 'シアターモードに切替'
+Toggle Theatre Mode: 'シアターモードの切替'
 Change Format:
  Change Video Formats: '動画形式の変更'
  Use Dash Formats: 'DASH 形式の使用'
@ -440,7 +440,7 @@ Mini Player: 'ミニプレーヤー'
 Comments:
  Comments: 'コメント'
  Click to View Comments: 'クリックしてコメント表示'
-  Getting comment replies, please wait: 'コメント返信の取得中。お待ちください'
+  Getting comment replies, please wait: 'コメント返信を取得中。お待ちください'
  Show Comments: 'コメントの表示'
  Hide Comments: 'コメントを非表示'
  # Context: View 10 Replies, View 1 Reply
@ -449,7 +449,7 @@ Comments:
  Replies: '返信'
  Reply: '返信'
  There are no comments available for this video: 'この動画へのコメントはありません'
-  Load More Comments: 'もっと見る'
+  Load More Comments: 'さらにコメントを読み込む'
  There are no more comments for this video: この動画へのコメントはまだありません
  Top comments: 評価順
  Newest first: 新しい順
@ -515,21 +515,20 @@ The playlist has been reversed: 再生リストを逆順にしました
 A new blog is now available, $. Click to view more: '新着のブログ記事があります。$ クリックでブログを開く'
 Download From Site: サイトからダウンロード
 Version $ is now available!  Click for more details: 最新バージョン $ が利用可能です！クリックで詳細表示
-This video is unavailable because of missing formats. This can happen due to country unavailability.: この動画は、形式の情報が利用できないため再生できません。再生が許可されていない国で発生します。
+This video is unavailable because of missing formats. This can happen due to country unavailability.: この動画は、動画形式の情報が利用できないため再生できません。再生許可のない国で発生します。
 Tooltips:
  Subscription Settings:
-    Fetch Feeds from RSS: 有効にすると、FreeTube は登録情報の取得を通常の方法ではなく RSS から取得します。RSS は高速であり、
-      IP 制限を回避しますが、動画の公開期間や詳細情報などは提供されていません
+    Fetch Feeds from RSS: 有効にすると、FreeTube は、登録チャンネルの情報を、通常の方法の代わりに RSS で取得します。RSS
+      は高速かつ IP 制限を回避できますが、動画の長さやライブ配信の状態などの詳細情報はありません
  Player Settings:
-    Default Video Format: 動画を再生するファイル形式を設定します。DASH 形式の方が品質が高くなります。旧形式では最大 720p に制限されますが、使用する帯域幅は狭くなります。音声形式とは音声のみの配信です
-    Force Local Backend for Legacy Formats: Invidious API の選択時にのみ機能します。有効にすると、Invidious
-      サーバーから取得したファイル形式の代わりに、内部 API で取得した旧形式を使用します。Invidious サーバーから取得した情報が、再生が許可されていない国の場合に便利です
-    Proxy Videos Through Invidious: YouTube に直接接続する代わりに、Invidious に接続して動画を取得します。API
-      設定の書き換え
+    Default Video Format: 再生に使う動画形式を設定します。DASH 形式がより高品質で再生します。旧形式は、最大 720p に制限されますが、使用する帯域幅を減らせます。音声形式は音声のみです
+    Force Local Backend for Legacy Formats: Invidious API 優先時にのみ機能します。有効にすると、Invidious
+      から取得した動画ではなく、内部 API で取得した旧形式を使用します。その国での再生許可がないため、Invidious からの動画が再生できない場合に利用できます
+    Proxy Videos Through Invidious: 動画を取得するため、YouTube ではなく Invidious に接続します。API 設定を書き換える
  General Settings:
-    Invidious Instance: FreeTube が Invidious サーバーの API に接続するための Invidious インスタンス。選択する公開インスタンスの一覧を表示するために、現在のインスタンスを破棄する
-    Preferred API Backend: FreeTube が youtube からデータを取得する方法を選択します。内部 API は搭載している取得プログラムです。Invidious
-      API は、Invidious サーバーに接続して取得します
-    Thumbnail Preference: FreeTube のすべてのサムネイルを、元のサムネイルの代わりに動画の 1 コマに置き換える
-    Fallback to Non-Preferred Backend on Failure: 選択した API に問題があれば、FreeTube は自動的に選択していない
-      API に切り替えて実行します
+    Invidious Instance: FreeTube が、API 呼び出しのために接続するInvidious のサーバーの実体です。指定されている実体を消去すると、選択用の公開インスタンスの一覧が表示されます
+    Preferred API Backend: FreeTube がデータの取得に使うサービスを選択します。内部 API はアプリ内蔵の機能です。Invidious
+      API は、Invidious のサーバーに接続する必要があります
+    Thumbnail Preference: FreeTube のすべてのサムネイルを、元のサムネイルの代わりに動画の 1 コマに置き換えます
+    Fallback to Non-Preferred Backend on Failure: 有効にすると、優先する API に問題が生じたら、 FreeTube
+      は代替手段として非優先の API の使用を自動で試みます
--- a/static/locales/nl.yaml
+++ b/static/locales/nl.yaml
@ -452,7 +452,7 @@ Playlist:
 #& Views
 Toggle Theatre Mode: 'Schakel Theatermodus In'
 Change Format:
-  Change Video Formats: 'Verander Video-indeling'
+  Change Video Formats: 'Verander Video indeling'
  Use Dash Formats: 'Gebruik Dash Indelingen'
  Use Legacy Formats: 'Gebruik Legacy Indelingen'
  Use Audio Formats: 'Gebruik Audio Indelingen'
@ -563,5 +563,36 @@ Download From Site: Download Van Website
 Version $ is now available!  Click for more details: Versie $ is nu beschikbaar! Klik
  voor meer informatie
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Deze
-  video is niet beschikbaar vanwege ontbrekende video-indelingen. Dit kan gebeuren
+  video is niet beschikbaar vanwege ontbrekende video indelingen. Dit kan gebeuren
  als de video niet in uw land beschikbaar is.
+Tooltips:
+  Player Settings:
+    Default Video Format: Selecteer de video indeling dat word gebruikt wanneer een
+      video afspeelt. Dash kan video's afspelen met hogere kwaliteit instellingen.
+      Legacy gaat niet hoger dan 720p maar gebruikt minder bandbreedte. Audio zal
+      alleen het geluid streamen
+    Force Local Backend for Legacy Formats: Dit zal alleen werken wanneer de Invidious
+      API is geselecteerd als standaard. Wanneer ingeschakeld zal de lokale API legacy
+      video indelingen verzamelen in plaats van de videoformaten die worden teruggegeven
+      door Invidious. Dit kan helpen wanneer een video die verzameld word via Invidious
+      niet afspeelt in verband met regio restricties
+    Proxy Videos Through Invidious: FreeTube zal verbinden met Invidious en daar de
+      video's weg halen in de plaats van ze zelf bij YouTube te halen. Dit overschrijft
+      de API voorkeur
+  Subscription Settings:
+    Fetch Feeds from RSS: Wanneer ingeschakeld zal FreeTube RSS gebruiken on de plaats
+      van de standaard methode om videolijsten van je abonnementen te verzamelen.
+      RSS is sneller en voorkomt dat je IP word geblokkeerd maar geeft geen toegang
+      tot sommige informatie zoals de videoduur en live status
+  General Settings:
+    Invidious Instance: Dit is de Invidious instantie waar FreeTube mee zal verbinden
+      om API calls te maken. Verwijder de momenteel geselecteerd instantie om een
+      lijst van publieke instanties te tonen
+    Thumbnail Preference: Alle thumbnails in FreeTube zullen worden vervangen met
+      een momentopname in plaats van de standaard thumbnail
+    Fallback to Non-Preferred Backend on Failure: Wanneer het API geselecteerd als
+      voorkeur problemen heeft dan zal FreeTube automatisch terugvallen op het alternatieve
+      niet-voorkeur API als dit is ingeschakeld
+    Preferred API Backend: Kies de backend die FreeTube gebruikt om data te verzamelen.
+      De lokale API is een ingebouwde extractor. De Invidious API moet worden verbonden
+      met een Invidious server
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@ -296,7 +296,7 @@ About:
    naszą stronę GitHub. Mile widziane pull requesty.

  Thank you very much to the People and Projects that make FreeTube possible!: 'Wielkie
-    dzięki za wszystkich ludzi i projekty dzięki którym istnienie FreeTube jest możliwe!'
+    dzięki za wszystkich ludzi i projekty, dzięki którym istnienie FreeTube jest możliwe!'

  'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Chcesz
    pogadać? Dołącz do naszej społeczności Element (serwer Matrix). Przejrzyj proszę
@ -419,7 +419,7 @@ Video:
  Shuffle Playlist: Losuj z playlisty
  Loop Playlist: Zapętl playlistę
  Starting soon, please refresh the page to check again: Wkrótce się zacznie, proszę
-    odświeżyć stronę , aby ponownie sprawdzić
+    odświeżyć stronę, aby ponownie sprawdzić
  Audio:
    Best: Najlepsza
    High: Wysoka
@ -568,3 +568,16 @@ Version $ is now available!  Click for more details: Wersja $ jest już dostępn
 This video is unavailable because of missing formats. This can happen due to country unavailability.: Ten
  film jest niedostępny z powodu brakujących formatów. Przyczyną może być blokada
  regionalna.
+Tooltips:
+  Subscription Settings:
+    Fetch Feeds from RSS: Po włączeniu FreeTube będzie używać RSS zamiast domyślnej
+      metody pobierania subskrypcji. RSS jest szybszy i zapobiega blokadzie IP, ale
+      nie dostarcza informacji, takich jak czas trwania filmu czy status transmisji
+      na żywo
+  General Settings:
+    Fallback to Non-Preferred Backend on Failure: Po włączeniu, kiedy twój preferowany
+      API napotka problem, FreeTube samoczynnie spróbuje użyć niepreferowanego API
+      jako metody zapasowej
+    Preferred API Backend: Wybierz back-end , który FreeTube użyje do uzyskiwania
+      danych. Lokalne API jest wbudowanym ekstraktorem. API Invidious wymaga połączenia
+      z serwerem Invidious.
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@ -512,3 +512,17 @@ A new blog is now available, $. Click to view more: 已有新的博客，$。点
 Download From Site: 从网站下载
 Version $ is now available!  Click for more details: 版本$已可使用！ 点击以取得更多信息
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 没有这个视频因为缺少格式。这个可能发生由于国家不可用。
+Tooltips:
+  Subscription Settings:
+    Fetch Feeds from RSS: 启用后，FreeTube将使用RSS而非默认方式来取得您的订阅推送。RSS更快而且可避免IP封锁，但不提供某些信息，如影片长度与即时状态
+  Player Settings:
+    Default Video Format: 设置要用于影片播放的格式。Dash格式有更高的质量。传统格式会限制在 720p但頻寬需求更低。音频格式为仅有音频的串流
+    Proxy Videos Through Invidious: 将连接到 Invidious而非直接连接到 YouTube 来提供影片。覆盖 API 偏好
+    Force Local Backend for Legacy Formats: 仅当 Invidious API是您默认 API 时才有效。启用后，本地API
+      将执行并使用由其回传的的传统格式，而非 Invidious 回传的格式。对因为国家地区限制而不能播放 Invidious回传的影片时有帮助
+  General Settings:
+    Invidious Instance: FreeTube将连接为 API呼叫的Invidious实例。清除当前的实例以查看可供选择的公共实例清单
+    Thumbnail Preference: FreeTube中所有缩略图都会被替换为影片画面而非默认缩略图
+    Fallback to Non-Preferred Backend on Failure: 当您的首选API有问题时，FreeTube将自动尝试使用您的非首选API
+      作为后备方案
+    Preferred API Backend: 选择FreeTube 要用于取得数据的后端。本地API 是内置提取器。Invidious API需要Invidious服务器才能连接
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@ -514,17 +514,15 @@ Version $ is now available!  Click for more details: 版本$已可使用！ 點
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 沒有這個影片因為缺少格式。這個可能發生由於國家不可用。
 Tooltips:
  Subscription Settings:
-    Fetch Feeds from RSS: 啟用後，FreeTube 將會使用 RSS 而非預設的方式來取得您的訂閱 feed。RSS 較快而且可避免 IP
-      封鎖，但不提供某些訊息，如影片長度與即時狀態
+    Fetch Feeds from RSS: 啟用後，FreeTube將使用RSS而非預設方式來取得您的訂閱推送。RSS更快而且可避免IP封鎖，但不提供某些訊息，如影片長度與即時狀態
  Player Settings:
-    Default Video Format: 設定要用於影片播放的格式。Dash 格式有較高的品質。舊版格式會限制在 720p 但頻寬需求較低。音訊格式為僅有音訊的串流
-    Proxy Videos Through Invidious: 將會連線到 Invidious 而非直接連線到 YouTube 來提供影片。覆寫 API 偏好設定
-    Force Local Backend for Legacy Formats: 僅當 Invidious API 是您的預設 API 時才有效。啟用後，本地的
-      API 將會執行並使用由其回傳的的舊格式，而非 Invidious 回傳的格式。對因為國家地區限制而無法播放 Invidious 回傳的影片時很有用
+    Default Video Format: 設定要用於影片播放的格式。Dash格式有更高的品質。傳統格式會限制在 720p但頻寬需求更低。音訊格式為僅有音訊的串流
+    Proxy Videos Through Invidious: 將連線到 Invidious而非直接連線到 YouTube 來提供影片。覆寫 API 偏好
+    Force Local Backend for Legacy Formats: 僅當 Invidious API是您預設 API 時才有效。啟用後，本地API
+      將會執行並使用由其回傳的的傳統格式，而非 Invidious 回傳的格式。對因為國家地區限制而無法播放 Invidious回傳的影片時有幫助
  General Settings:
-    Invidious Instance: FreeTube 連線到的 Invidious 站台將會提供 API 呼叫。清除目前的站台以檢視可供選擇的公開站台清單
-    Thumbnail Preference: FreeTube 中所有的畫面都會被替換為影片畫面而非預設的縮圖
-    Fallback to Non-Preferred Backend on Failure: 當您偏好的 API 有問題的時候，FreeTube 將會自動嘗試使用您非偏好的
-      API 作為汰退方案
-    Preferred API Backend: 選擇 FreeTube 要用於取得資料的後端。本地的 API 是內建的擷取器。Invidious API 需要
-      Invidious 伺服器才能連線
+    Invidious Instance: FreeTube將連線為 API呼叫的Invidious實例。清除目前的實例以檢視可供選擇的公用實例清單
+    Thumbnail Preference: FreeTube中所有缩略图都會被替換為影片畫面而非預設缩略图
+    Fallback to Non-Preferred Backend on Failure: 當您的偏好API 有問題時，FreeTube將自動嘗試使用您的非偏好API
+      作為汰退方案
+    Preferred API Backend: 選擇FreeTube 要用於取得資料的後端。本地API 是內建擷取器。Invidious API需要 Invidious伺服器才能連線