Pull dash URL from player response

Update translation & correct typos

CHANGELOG.md

@@ -1,3 +1,79 @@
+# 0.14.0 (2019-02-06)
+
+## Version 0.14.0: Community
+
+This last month several contributors have made improvements specifically for the people using this project. New pages have been added to the wiki, and there is now a [Matrix Server](https://riot.im/app/#/room/#invidious:matrix.org) and IRC channel so it's easier and faster for people to ask questions or chat. There have been [101 commits](https://github.com/omarroth/invidious/compare/0.13.0...0.14.0) since the last major release from 8 contributors.
+
+It has come to my attention in the past month how many people are self-hosting, and I would like to make it easier for them to do so.
+
+With that in mind, expect future releases to have a section for For Administrators (if any relevant changes) and For Developers (if any relevant changes).
+
+## For Administrators
+
+This month the most notable change for administrators is releases. As always, there will be a major release each month. However, a new minor release will be made whenever there are any critical bugs that need to be fixed.
+
+This past month is the first time there has been a minor release - `0.13.1` - which fixes a breaking change made by YouTube. Administrators using versioning for their instances will be able to rely on the latest version, and should have a system in place to upgrade their instance as soon as a new release is available.
+
+Several new pages have been added to the [wiki](https://github.com/omarroth/invidious/wiki#for-administrators) (as mentioned below) that will help administrators better setup their own instances. Configuration, maintenance, and instructions for updating are of note, as well as several common issues that are encountered when first setting up.
+
+## For Developers
+
+There's now a `pretty=1` parameter for most endpoints so you can view data easily from the browser, which is convenient for debugging and casual use. You can see an example [here](https://invidio.us/api/v1/videos/CvFH_6DNRCY?pretty=1).
+
+Unfortunately the `/api/v1/insights/:id` endpoint is no longer functional, as YouTube removed all publicly available analytics around a month ago. The YouTube endpoint now returns a 404, so it's unlikely it will be functional again.
+
+## Wiki
+
+There have been a sizable number of changes to the Wiki, including a [list of public Invidious instances](https://github.com/omarroth/invidious/wiki/Invidious-Instances), the [list of extensions](https://github.com/omarroth/invidious/wiki/Extensions), and documentation for administrators (as mentioned above) and developers.
+
+The wiki is editable by anyone so feel free to add anything you think is useful.
+
+## Matrix & IRC
+
+Thee is now a [Matrix Server](https://riot.im/app/#/room/#invidious:matrix.org) for Invidious, so please feel free to hop on if you have any questions or want to chat. There is also a registered IRC channel: #invidious on Freenode which is bridged to Matrix.
+
+## Features
+
+Several new features have been added, including a download button, creator hearts and comment colors, and a French translation.
+
+There have been fixes for Google logins, missing text in locales, invalid links to genre channels, and better error handling in the player, among others.
+
+Several fixes and features are omitted for space, so I'd recommend taking a look at the [compare tab](https://github.com/omarroth/invidious/compare/0.13.0...0.14.0) for more information.
+
+## Annotations Update
+
+Annotations were removed January 15th, 2019 around15:00 UTC. Before they were deleted we were able to archive annotations from around 1.4 billion videos. I'd very much recommend taking a look [here](https://www.reddit.com/r/DataHoarder/comments/al7exa/youtube_annotation_archive_update_and_preview/) for more information and a list of acknowledgements. I'm extremely thankful to everyone who was able to contribute and I'm glad we were able to save such a large part of internet history.
+
+There's been large strides in supporting them in the player as well, which you can follow in [#303](https://github.com/omarroth/invidious/pull/303). You can preview the functionality at https://dev.invidio.us . Before they are added to the main site expect to see an option to disable them, both site-wide and per video.
+
+Organizing this project has unfortunately taken up quite a bit of my time, and I've been very grateful for everyone's patience.
+
+## Finances
+
+### Donations
+
+- [Patreon](https://www.patreon.com/omarroth) : \$49.42
+- [Liberapay](https://liberapay.com/omarroth) : \$27.89
+- Crypto : ~\$0.00 (converted from BCH, BTC)
+- Total : \$77.31
+
+### Expenses
+
+invidious-load1 (nyc1) : $10.00 (load balancer)
+invidious-update1 (s-1vcpu-1gb) : $5.00 (updates feeds)
+invidious-node1 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node2 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node3 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-node4 (s-1vcpu-1gb) : $5.00 (web server)
+invidious-db1 (s-4vcpu-8gb) : $40.00 (database)
+Total : $75.00
+
+As always I'm grateful for everyone's contributions and support. I'll see you all in March.
+
+# 0.13.1 (2019-01-19)
+
+##
+
 # 0.13.0 (2019-01-06)
 
 ## Version 0.13.0: Translations, Annotations, and Tor

README.md

@@ -34,8 +34,17 @@ Onion links:
 
 [Alternative Invidious instances](https://github.com/omarroth/invidious/wiki/Invidious-Instances)
 
+## Screenshots
+
+| Player                                                                                                                  | Preferences                                                                                                             | Subscriptions                                                                                                               |
+| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
+| [<img src="screenshots/01_player.png?raw=true" height="140" width="280">](screenshots/01_player.png?raw=true)           | [<img src="screenshots/02_preferences.png?raw=true" height="140" width="280">](screenshots/02_preferences.png?raw=true) | [<img src="screenshots/03_subscriptions.png?raw=true" height="140" width="280">](screenshots/03_subscriptions.png?raw=true) |
+| [<img src="screenshots/04_description.png?raw=true" height="140" width="280">](screenshots/04_description.png?raw=true) | [<img src="screenshots/05_preferences.png?raw=true" height="140" width="280">](screenshots/05_preferences.png?raw=true) | [<img src="screenshots/06_subscriptions.png?raw=true" height="140" width="280">](screenshots/06_subscriptions.png?raw=true) |
+
 ## Installation
 
+See [Invidious-Updater](https://github.com/tmiland/Invidious-Updater) for a self-contained script that can automatically install and update Invidious.
+
 ### Docker:
 
 #### Build and start cluster:
@@ -98,6 +107,7 @@ $ psql invidious < /home/invidious/invidious/config/sql/channels.sql
 $ psql invidious < /home/invidious/invidious/config/sql/videos.sql
 $ psql invidious < /home/invidious/invidious/config/sql/channel_videos.sql
 $ psql invidious < /home/invidious/invidious/config/sql/users.sql
+$ psql invidious < /home/invidious/invidious/config/sql/session_ids.sql
 $ psql invidious < /home/invidious/invidious/config/sql/nonces.sql
 $ exit
 ```
@@ -115,6 +125,7 @@ $ exit
 ```
 
 #### systemd service
+
 ```bash
 $ sudo cp /home/invidious/invidious/invidious.service /etc/systemd/system/invidious.service
 $ sudo systemctl enable invidious.service
@@ -138,6 +149,7 @@ $ psql invidious < config/sql/channels.sql
 $ psql invidious < config/sql/videos.sql
 $ psql invidious < config/sql/channel_videos.sql
 $ psql invidious < config/sql/users.sql
+$ psql invidious < config/sql/session_ids.sql
 $ psql invidious < config/sql/nonces.sql
 
 # Setup Invidious
@@ -146,7 +158,8 @@ $ crystal build src/invidious.cr --release
 ```
 
 ## Update Invidious
-You can find information about how to update in the wiki: [Updating](https://github.com/omarroth/invidious/wiki/Updating).
+
+You can see how to update Invidious [here](https://github.com/omarroth/invidious/wiki/Updating).
 
 ## Usage:
 
@@ -178,16 +191,19 @@ $ ./sentry
 ```
 
 ## Documentation
+
 [Documentation](https://github.com/omarroth/invidious/wiki) can be found in the wiki.
 
 ## Extensions
-Extensions for Invidious and for integrating Invidious into other projects [are in the wiki](https://github.com/omarroth/invidious/wiki/Extensions)
+
+[Extensions](https://github.com/omarroth/invidious/wiki/Extensions) can be found in the wiki, as well as documentation for integrating it into other projects.
 
 ## Made with Invidious
 
 - [FreeTube](https://github.com/FreeTubeApp/FreeTube): An Open Source YouTube app for privacy.
 - [CloudTube](https://github.com/cloudrac3r/cadencegq): Website featuring pastebin, image host, and YouTube player
 - [PeerTubeify](https://gitlab.com/Ealhad/peertubeify): On YouTube, displays a link to the same video on PeerTube, if it exists.
+- [MusicPiped](https://github.com/deep-gaurav/MusicPiped): A materialistic music player that streams music from YouTube.
 
 ## Contributing
 

assets/css/default.css

@@ -1,41 +1,41 @@
 .channel-owner {
-  background-color: #008BEC;
+  background-color: #008bec;
   color: #fff;
   border-radius: 9px;
   padding: 1px 6px;
 }
 
 .creator-heart-container {
-    display: inline-block;
-    padding: 0px 7px 6px 0px;
-    margin: 0px -7px -4px 0px;
+  display: inline-block;
+  padding: 0px 7px 6px 0px;
+  margin: 0px -7px -4px 0px;
 }
 
 .creator-heart {
-    position: relative;
-    width: 16px;
-    height: 16px;
-    border: 2px none;
+  position: relative;
+  width: 16px;
+  height: 16px;
+  border: 2px none;
 }
 
 .creator-heart-background-hearted {
-    width: 16px;
-    height: 16px;
-    padding: 0px;
-    position: relative;
+  width: 16px;
+  height: 16px;
+  padding: 0px;
+  position: relative;
 }
 
 .creator-heart-small-hearted {
-    position: absolute;
-    right: -7px;
-    bottom: -4px;
+  position: absolute;
+  right: -7px;
+  bottom: -4px;
 }
 
 .creator-heart-small-container {
-    position: relative;
-    width: 13px;
-    height: 13px;
-    color: rgb(255, 0, 0);
+  position: relative;
+  width: 13px;
+  height: 13px;
+  color: rgb(255, 0, 0);
 }
 
 .h-box {
@@ -63,7 +63,8 @@ div {
 }
 
 button.pure-button-primary,
-a.pure-button-primary, .channel-owner:hover {
+a.pure-button-primary,
+.channel-owner:hover {
   background-color: #a0a0a0;
   color: rgba(35, 35, 35, 1);
 }
@@ -228,6 +229,13 @@ img.thumbnail {
 }
 
 /* Control Bar */
+@media screen and (max-width: 480px) {
+  .video-js .vjs-control-bar,
+  .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
+    overflow: -webkit-paged-x;
+  }
+}
+
 .video-js .vjs-control-bar,
 .vjs-menu-button-popup .vjs-menu .vjs-menu-content {
   background-color: rgba(35, 35, 35, 0.75);
@@ -302,11 +310,15 @@ img.thumbnail {
   height: 100%;
 }
 
+.player-dimensions.vjs-fluid {
+  padding-top: 46.86%;
+}
+
 #player-container {
   position: relative;
-  padding-bottom: 55.25%;
-  margin-left: 2em;
-  margin-right: 2em;
+  padding-bottom: 46.86%;
+  margin-left: 1em;
+  margin-right: 1em;
   height: 0;
 }
 

assets/css/lighttheme.css

@@ -1,9 +1,16 @@
 a:hover,
 a:active {
-  color: #167ac6;
+  color: #167ac6 !important;
 }
 
 a {
   color: #61809b;
   text-decoration: none;
 }
+
+/* All links that do not fit with the default color goes here */
+a > .icon,
+.pure-u-md-1-5 > .h-box > a[href^="/watch?"],
+.playlist-restricted > ol > li > a {
+  color: #303030;
+}

assets/js/watch.js

@@ -35,72 +35,18 @@ String.prototype.supplant = function(o) {
   });
 };
 
-function show_youtube_replies(target) {
+function show_youtube_replies(target, inner_text, sub_text) {
   body = target.parentNode.parentNode.children[1];
   body.style.display = "";
 
-  target.innerHTML = "Hide replies";
-  target.setAttribute("onclick", "hide_youtube_replies(this)");
+  target.innerHTML = inner_text;
+  target.setAttribute("onclick", "hide_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }
 
-function hide_youtube_replies(target) {
+function hide_youtube_replies(target, inner_text, sub_text) {
   body = target.parentNode.parentNode.children[1];
   body.style.display = "none";
 
-  target.innerHTML = "Show replies";
-  target.setAttribute("onclick", "show_youtube_replies(this)");
+  target.innerHTML = sub_text;
+  target.setAttribute("onclick", "show_youtube_replies(this, \'" + inner_text + "\', \'" + sub_text + "\')");
 }
-
-function download_video(target) {
-  var title = target.getAttribute("data-title");
-  var children = document.getElementById("download_widget").children;
-  var progress = document.getElementById("download-progress");
-  var url = "";
-
-  document.getElementById("progress-container").style.display = "";
-
-  for (i = 0; i < children.length; i++) {
-    if (children[i].selected) {
-      url = children[i].getAttribute("data-url");
-    }
-  }
-
-  var xhr = new XMLHttpRequest();
-  xhr.open("GET", url);
-  xhr.responseType = "arraybuffer";
-  
-  xhr.onprogress = function(event) {
-    if (event.lengthComputable) {
-      progress.style.width = "" + (event.loaded / event.total)*100 + "%";
-    }
-  };
-
-  xhr.onload = function(event) {
-    if (event.currentTarget.status != 200) {
-      console.log("Downloading " + title + " failed.")
-      document.getElementById("progress-container").style.display = "none";
-      progress.style.width = "0%";
-
-      return;
-    }
-
-    var data = new Blob([xhr.response], {'type' : 'video/mp4'});
-    var videoFile = window.URL.createObjectURL(data);
-
-    var link = document.createElement('a');
-    link.href = videoFile;
-    link.setAttribute('download', title);
-    document.body.appendChild(link);
-
-    window.requestAnimationFrame(function() {
-      var event = new MouseEvent('click');
-      link.dispatchEvent(event);
-      document.body.removeChild(link);
-    });
-
-    document.getElementById("progress-container").style.display = "none";
-    progress.style.width = "0%";
-  };
-
-  xhr.send(null);
-}

config/migrate-scripts/migrate-db-30e6d29.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+psql invidious -c "ALTER TABLE channels ADD COLUMN deleted bool;"
+psql invidious -c "UPDATE channels SET deleted = false;"

config/migrate-scripts/migrate-db-3646395.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+psql invidious < config/sql/session_ids.sql
+psql invidious -c "INSERT INTO session_ids (SELECT unnest(id), email, CURRENT_TIMESTAMP FROM users) ON CONFLICT (id) DO NOTHING"
+psql invidious -c "ALTER TABLE users DROP COLUMN id"

config/sql/channel_videos.sql

@@ -31,6 +31,6 @@ CREATE INDEX channel_videos_published_idx
 
 CREATE INDEX channel_videos_ucid_idx
   ON public.channel_videos
-  USING hash
+  USING btree
   (ucid COLLATE pg_catalog."default");
 

config/sql/channels.sql

@@ -7,6 +7,7 @@ CREATE TABLE public.channels
   id text NOT NULL,
   author text,
   updated timestamp with time zone,
+  deleted boolean,
   CONSTRAINT channels_id_key UNIQUE (id)
 );
 

config/sql/nonces.sql

@@ -5,10 +5,18 @@
 CREATE TABLE public.nonces
 (
   nonce text,
-  expire timestamp with time zone
-)
-WITH (
-  OIDS=FALSE
+  expire timestamp with time zone,
+  CONSTRAINT nonces_id_key UNIQUE (nonce)
 );
 
-GRANT ALL ON TABLE public.nonces TO kemal;
+GRANT ALL ON TABLE public.nonces TO kemal;
+
+-- Index: public.nonces_nonce_idx
+
+-- DROP INDEX public.nonces_nonce_idx;
+
+CREATE INDEX nonces_nonce_idx
+  ON public.nonces
+  USING btree
+  (nonce COLLATE pg_catalog."default");
+

config/sql/session_ids.sql

@@ -0,0 +1,23 @@
+-- Table: public.session_ids
+
+-- DROP TABLE public.session_ids;
+
+CREATE TABLE public.session_ids
+(
+  id text NOT NULL,
+  email text,
+  issued timestamp with time zone,
+  CONSTRAINT session_ids_pkey PRIMARY KEY (id)
+);
+
+GRANT ALL ON TABLE public.session_ids TO kemal;
+
+-- Index: public.session_ids_id_idx
+
+-- DROP INDEX public.session_ids_id_idx;
+
+CREATE INDEX session_ids_id_idx
+  ON public.session_ids
+  USING btree
+  (id COLLATE pg_catalog."default");
+

config/sql/users.sql

@@ -4,7 +4,6 @@
 
 CREATE TABLE public.users
 (
-  id text[] NOT NULL,
   updated timestamp with time zone,
   notifications text[],
   subscriptions text[],

docker/entrypoint.postgres.sh

@@ -16,6 +16,7 @@ if [ ! -f /var/lib/postgresql/data/setupFinished ]; then
     su postgres -c 'psql invidious < config/sql/videos.sql'
     su postgres -c 'psql invidious < config/sql/channel_videos.sql'
     su postgres -c 'psql invidious < config/sql/users.sql'
+    su postgres -c 'psql invidious < config/sql/session_ids.sql'
     su postgres -c 'psql invidious < config/sql/nonces.sql'
     touch /var/lib/postgresql/data/setupFinished
     echo "### invidious database setup finished"

locales/ar.json

@@ -280,5 +280,7 @@
   "%A %B %-d, %Y": "",
   "(edited)": "",
   "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/de.json

@@ -264,9 +264,9 @@
   "`x` hours": "`x` Stunden",
   "`x` minutes": "`x` Minuten",
   "`x` seconds": "`x` Sekunden",
-  "Fallback comments: ": "",
+  "Fallback comments: ": "Alternative Kommentare: ",
   "Popular": "Populär",
-  "Top": "",
+  "Top": "Top",
   "About": "Über",
   "Rating: ": "Bewertung: ",
   "Language: ": "Sprache: ",
@@ -280,5 +280,7 @@
   "%A %B %-d, %Y": "",
   "(edited)": "",
   "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/en-US.json

@@ -274,5 +274,7 @@
   "%A %B %-d, %Y": "%A %B %-d, %Y",
   "(edited)": "(edited)",
   "Youtube permalink of the comment": "Youtube permalink of the comment",
-  "`x` marked it with a ❤": "`x` marked it with a ❤"
+  "`x` marked it with a ❤": "`x` marked it with a ❤",
+  "Audio mode": "Audio mode",
+  "Video mode": "Video mode"
 }

locales/eu.json

@@ -274,5 +274,7 @@
   "%A %B %-d, %Y": "",
   "(edited)": "",
   "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/fr.json

@@ -1,152 +1,151 @@
 {
-  "`x` subscribers": "`x` souscripteurs",
+  "`x` subscribers": "`x` abonnés",
   "`x` videos": "`x` vidéos",
-  "LIVE": "LIVE",
+  "LIVE": "EN DIRECT",
   "Shared `x` ago": "Partagé il y a `x`",
   "Unsubscribe": "Se désabonner",
   "Subscribe": "S'abonner",
-  "Login to subscribe to `x`": "Se connecter pour s'abonner à `x`",
+  "Login to subscribe to `x`": "Vous devez vous connecter pour vous abonner à `x`",
   "View channel on YouTube": "Voir la chaîne sur YouTube",
-  "newest": "récent",
-  "oldest": "aînée",
-  "popular": "appréciés",
-  "Preview page": "Page de prévisualisation",
+  "newest": "Date d'ajout (la plus récente)",
+  "oldest": "Date d'ajout (la plus ancienne)",
+  "popular": "Les plus populaires",
   "Next page": "Page suivante",
-  "Clear watch history?": "L'histoire de la montre est claire?",
+  "Clear watch history?": "Êtes-vous sûr de vouloir supprimer l'historique des vidéos regardées ?",
   "Yes": "Oui",
-  "No": "Aucun",
-  "Import and Export Data": "Importation et exportation de données",
-  "Import": "Importation",
-  "Import Invidious data": "Importation de données invalides",
+  "No": "Non",
+  "Import and Export Data": "Importer et Exporter les Données",
+  "Import": "Importer",
+  "Import Invidious data": "Importer des données Invidious",
   "Import YouTube subscriptions": "Importer des abonnements YouTube",
   "Import FreeTube subscriptions (.db)": "Importer des abonnements FreeTube (.db)",
   "Import NewPipe subscriptions (.json)": "Importer des abonnements NewPipe (.json)",
   "Import NewPipe data (.zip)": "Importer des données NewPipe (.zip)",
   "Export": "Exporter",
-  "Export subscriptions as OPML": "Exporter les abonnements comme OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporter les abonnements comme OPML (pour NewPipe & FreeTube)",
+  "Export subscriptions as OPML": "Exporter les abonnements en OPML",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exporter les abonnements en OPML (pour NewPipe & FreeTube)",
   "Export data as JSON": "Exporter les données au format JSON",
-  "Delete account?": "Supprimer un compte ?",
-  "History": "Histoire",
+  "Delete account?": "Supprimer votre compte ?",
+  "History": "Historique",
   "Previous page": "Page précédente",
-  "An alternative front-end to YouTube": "Un frontal alternatif à YouTube",
-  "JavaScript license information": "Informations sur la licence JavaScript",
-  "source": "origine",
+  "An alternative front-end to YouTube": "Un front-end alternatif à YouTube",
+  "JavaScript license information": "Informations sur les licences JavaScript",
+  "source": "source",
   "Login": "Connexion",
   "Login/Register": "Connexion/S'inscrire",
   "Login to Google": "Se connecter à Google",
-  "User ID:": "ID utilisateur:",
-  "Password:": "Mot de passe:",
-  "Time (h:mm:ss):": "Temps (h:mm:ss):",
-  "Text CAPTCHA": "Texte CAPTCHA",
-  "Image CAPTCHA": "Image CAPTCHA",
+  "User ID:": "ID utilisateur :",
+  "Password:": "Mot de passe :",
+  "Time (h:mm:ss):": "Heure (h:mm:ss) :",
+  "Text CAPTCHA": "CAPTCHA Texte",
+  "Image CAPTCHA": "CAPTCHA Image",
   "Sign In": "S'identifier",
   "Register": "S'inscrire",
-  "Email:": "Courriel:",
-  "Google verification code:": "Code de vérification Google:",
+  "Email:": "Email :",
+  "Google verification code:": "Code de vérification Google :",
   "Preferences": "Préférences",
-  "Player preferences": "Joueur préférences",
-  "Always loop: ": "Toujours en boucle: ",
-  "Autoplay: ": "Autoplay: ",
-  "Autoplay next video: ": "Lecture automatique de la vidéo suivante: ",
-  "Listen by default: ": "Écouter par défaut: ",
-  "Default speed: ": "Vitesse par défaut: ",
-  "Preferred video quality: ": "Qualité vidéo préférée: ",
-  "Player volume: ": "Volume de lecteur: ",
-  "Default comments: ": "Commentaires par défaut: ",
-  "Default captions: ": "Légendes par défaut: ",
-  "Fallback captions: ": "Légendes de repli: ",
-  "Show related videos? ": "Voir les vidéos liées à ce sujet? ",
+  "Player preferences": "Préférences du Lecteur",
+  "Always loop: ": "Lire en boucle : ",
+  "Autoplay: ": "Lire Automatiquement : ",
+  "Autoplay next video: ": "Lire automatiquement la vidéo suivante : ",
+  "Listen by default: ": "Audio Uniquement par défaut : ",
+  "Default speed: ": "Vitesse par défaut : ",
+  "Preferred video quality: ": "Qualité vidéo souhaitée : ",
+  "Player volume: ": "Volume du lecteur : ",
+  "Default comments: ": "Source des Commentaires : ",
+  "Default captions: ": "Sous-titres principal : ",
+  "Fallback captions: ": "Sous-titres secondaire : ",
+  "Show related videos? ": "Voir les vidéos liées à ce sujet ? ",
   "Visual preferences": "Préférences visuelles",
-  "Dark mode: ": "Mode sombre: ",
-  "Thin mode: ": "Mode Thin: ",
-  "Subscription preferences": "Préférences d'abonnement",
-  "Redirect homepage to feed: ": "Rediriger la page d'accueil vers le flux: ",
-  "Number of videos shown in feed: ": "Nombre de vidéos montrées dans le flux: ",
-  "Sort videos by: ": "Trier les vidéos par: ",
-  "published": "publié",
-  "published - reverse": "publié - reverse",
+  "Dark mode: ": "Mode Sombre : ",
+  "Thin mode: ": "Mode Simplifié : ",
+  "Subscription preferences": "Préférences de la page d'abonnements",
+  "Redirect homepage to feed: ": "Rediriger la page d'accueil vers la page d'abonnements : ",
+  "Number of videos shown in feed: ": "Nombre de vidéos montrées dans la page d'abonnements : ",
+  "Sort videos by: ": "Trier les vidéos par : ",
+  "published": "publication",
+  "published - reverse": "publication - inversé",
   "alphabetically": "alphabétiquement",
-  "alphabetically - reverse": "alphabétiquement - contraire",
-  "channel name": "nom du canal",
-  "channel name - reverse": "nom du canal - contraire",
-  "Only show latest video from channel: ": "Afficher uniquement les dernières vidéos de la chaîne: ",
-  "Only show latest unwatched video from channel: ": "Afficher uniquement les dernières vidéos non regardées de la chaîne: ",
-  "Only show unwatched: ": "Afficher uniquement les images non surveillées: ",
-  "Only show notifications (if there are any): ": "Afficher uniquement les notifications (s'il y en a): ",
-  "Data preferences": "Préférences de données",
-  "Clear watch history": "Historique clair de la montre",
-  "Import/Export data": "Données d'importation/exportation",
+  "alphabetically - reverse": "alphabétiquement - inversé",
+  "channel name": "nom de la chaîne",
+  "channel name - reverse": "nom de la chaîne - inversé",
+  "Only show latest video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne : ",
+  "Only show latest unwatched video from channel: ": "Afficher uniquement la dernière vidéo de la chaîne non regardée : ",
+  "Only show unwatched: ": "Afficher uniquement les vidéos non regardées : ",
+  "Only show notifications (if there are any): ": "Afficher uniquement les notifications (s'il y en a) : ",
+  "Data preferences": "Préférences liées aux données",
+  "Clear watch history": "Supprimer l'historique des vidéos regardées",
+  "Import/Export data": "Importer/exporter les données",
   "Manage subscriptions": "Gérer les abonnements",
-  "Watch history": "Historique des montres",
-  "Delete account": "Supprimer un compte",
+  "Watch history": "Historique de visionnage",
+  "Delete account": "Supprimer votre compte",
   "Save preferences": "Enregistrer les préférences",
   "Subscription manager": "Gestionnaire d'abonnement",
   "`x` subscriptions": "`x` abonnements",
   "Import/Export": "Importer/Exporter",
   "unsubscribe": "se désabonner",
   "Subscriptions": "Abonnements",
-  "`x` unseen notifications": "`x` notifications invisibles",
-  "search": "perquisition",
+  "`x` unseen notifications": "`x` notifications non vues",
+  "search": "Rechercher",
   "Sign out": "Déconnexion",
-  "Released under the AGPLv3 by Omar Roth.": "Publié sous l'AGPLv3 par Omar Roth.",
-  "Source available here.": "Source disponible ici.",
-  "View JavaScript license information.": "Voir les informations de licence JavaScript.",
+  "Released under the AGPLv3 by Omar Roth.": "Publié sous licence AGPLv3 par Omar Roth.",
+  "Source available here.": "Code Source.",
+  "View JavaScript license information.": "Voir les informations des licences JavaScript.",
   "Trending": "Tendances",
   "Watch video on Youtube": "Voir la vidéo sur Youtube",
-  "Genre: ": "Genre: ",
-  "License: ": "Licence: ",
-  "Family friendly? ": "Convivialité familiale? ",
-  "Wilson score: ": "Wilson marque: ",
-  "Engagement: ": "Fiançailles: ",
-  "Whitelisted regions: ": "Régions en liste blanche: ",
-  "Blacklisted regions: ": "Régions sur liste noire: ",
+  "Genre: ": "Genre : ",
+  "License: ": "Licence : ",
+  "Family friendly? ": "Tout Public ? ",
+  "Wilson score: ": "Score de Wilson : ",
+  "Engagement: ": "Poucentage de spectateur aillant aimé Liker ou Disliker la vidéo : ",
+  "Whitelisted regions: ": "Régions en liste blanche : ",
+  "Blacklisted regions: ": "Régions sur liste noire : ",
   "Shared `x`": "Partagée `x`",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hi! On dirait que vous avez désactivé JavaScript. Cliquez ici pour voir les commentaires, gardez à l'esprit que le chargement peut prendre un peu plus de temps.",
-  "View YouTube comments": "Voir les commentaires sur YouTube",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Il semblerait que JavaScript sois désactivé. Cliquez ici pour voir les commentaires. Gardez à l'esprit que le chargement peut prendre plus de temps.",
+  "View YouTube comments": "Voir les commentaires YouTube",
   "View more comments on Reddit": "Voir plus de commentaires sur Reddit",
   "View `x` comments": "Voir `x` commentaires",
-  "View Reddit comments": "Voir Reddit commentaires",
+  "View Reddit comments": "Voir les commentaires Reddit",
   "Hide replies": "Masquer les réponses",
   "Show replies": "Afficher les réponses",
   "Incorrect password": "Mot de passe incorrect",
-  "Quota exceeded, try again in a few hours": "Quota dépassé, réessayez dans quelques heures",
+  "Quota exceeded, try again in a few hours": "Nombre de tentative de connexion dépassé, réessayez dans quelques heures",
   "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Si vous ne parvenez pas à vous connecter, assurez-vous que l'authentification à deux facteurs (Authenticator ou SMS) est activée.",
-  "Invalid TFA code": "Code TFA invalide",
+  "Invalid TFA code": "Code d'authentification à deux facteurs invalide",
   "Login failed. This may be because two-factor authentication is not enabled on your account.": "La connexion a échoué. Cela peut être dû au fait que l'authentification à deux facteurs n'est pas activée sur votre compte.",
   "Invalid answer": "Réponse non valide",
   "Invalid CAPTCHA": "CAPTCHA invalide",
-  "CAPTCHA is a required field": "CAPTCHA est un champ obligatoire",
-  "User ID is a required field": "Utilisateur ID est un champ obligatoire",
-  "Password is a required field": "Mot de passe est un champ obligatoire",
+  "CAPTCHA is a required field": "Veuillez rentrez un CAPTCHA",
+  "User ID is a required field": "Veuillez rentrez un Identifiant Utilisateur",
+  "Password is a required field": "Veuillez rentrez un Mot de passe",
   "Invalid username or password": "Nom d'utilisateur ou mot de passe invalide",
-  "Please sign in using 'Sign in with Google'": "Veuillez vous connecter en utilisant 'S'identifier avec Google'",
+  "Please sign in using 'Sign in with Google'": "Veuillez vous connecter en utilisant \"S'identifier avec Google\"",
   "Password cannot be empty": "Le mot de passe ne peut pas être vide",
-  "Password cannot be longer than 55 characters": "Le mot de passe ne doit pas comporter plus de 55 caractères.",
-  "Please sign in": "Veuillez ouvrir une session",
-  "Invidious Private Feed for `x`": "Flux privé Invidious pour `x`",
-  "channel:`x`": "chenal:`x`",
-  "Deleted or invalid channel": "Canal supprimé ou non valide",
-  "This channel does not exist.": "Ce canal n'existe pas.",
-  "Could not get channel info.": "Impossible d'obtenir des informations sur les chaînes.",
-  "Could not fetch comments": "Impossible d'aller chercher les commentaires",
+  "Password cannot be longer than 55 characters": "Le mot de passe ne doit pas comporter plus de 55 caractères",
+  "Please sign in": "Veuillez vous connecter",
+  "Invidious Private Feed for `x`": "Flux RSS privé pour `x`",
+  "channel:`x`": "chaîne:`x`",
+  "Deleted or invalid channel": "Chaîne supprimée ou invalide",
+  "This channel does not exist.": "Cette chaine n'existe pas.",
+  "Could not get channel info.": "Impossible de charger les informations de cette chaîne.",
+  "Could not fetch comments": "Impossible de charger les commentaires",
   "View `x` replies": "Voir `x` réponses",
   "`x` ago": "il y a `x`",
   "Load more": "Charger plus",
   "`x` points": "`x` points",
-  "Could not create mix.": "Impossible de créer du mixage.",
+  "Could not create mix.": "Impossible de charger cette liste de lecture.",
   "Playlist is empty": "La liste de lecture est vide",
   "Invalid playlist.": "Liste de lecture invalide.",
   "Playlist does not exist.": "La liste de lecture n'existe pas.",
-  "Could not pull trending pages.": "Impossible de tirer les pages de tendances.",
-  "Hidden field \"challenge\" is a required field": "Champ caché \"contestation\" est un champ obligatoire",
-  "Hidden field \"token\" is a required field": "Champ caché \"jeton\" est un champ obligatoire",
-  "Invalid challenge": "Contestation non valide",
-  "Invalid token": "Jeton non valide",
-  "Invalid user": "Iutilisateur non valide",
-  "Token is expired, please try again": "Le jeton est expiré, veuillez réessayer",
+  "Could not pull trending pages.": "Impossible de charger les pages de tendances.",
+  "Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
+  "Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
+  "Invalid challenge": "Invalid challenge",
+  "Invalid token": "Invalid token",
+  "Invalid user": "Invalid user",
+  "Token is expired, please try again": "Token is expired, please try again",
   "English": "Anglais",
-  "English (auto-generated)": "Anglais (auto-généré)",
+  "English (auto-generated)": "Anglais (générés automatiquement)",
   "Afrikaans": "Afrikaans",
   "Albanian": "Albanais",
   "Amharic": "Amharique",
@@ -258,21 +257,23 @@
   "`x` hours": "`x` heures",
   "`x` minutes": "`x` minutes",
   "`x` seconds": "`x` secondes",
-  "Fallback comments: ": "Commentaires de repli: ",
+  "Fallback comments: ": "Commentaires secondaires : ",
   "Popular": "Populaire",
-  "Top": "Haut",
-  "About": "Sur",
-  "Rating: ": "Évaluation: ",
-  "Language: ": "Langue: ",
-  "Default": "",
-  "Music": "",
-  "Gaming": "",
-  "News": "",
-  "Movies": "",
-  "Download": "",
-  "Download as: ": "",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "Top": "Top",
+  "About": "A Propos",
+  "Rating: ": "Évaluation : ",
+  "Language: ": "Langue : ",
+  "Default": "Défaut",
+  "Music": "Musique",
+  "Gaming": "Jeux Vidéo",
+  "News": "Actualités",
+  "Movies": "Films",
+  "Download": "Télécharger",
+  "Download as: ": "Télécharger en : ",
+  "%A %B %-d, %Y": "%A %-d %B %Y",
+  "(edited)": "(modifié)",
+  "Youtube permalink of the comment": "Lien YouTube permanent vers le commentaire",
+  "`x` marked it with a ❤": "`x` l'a marqué d'un ❤",
+  "Audio mode": "Mode Audio",
+  "Video mode": "Mode Vidéo"
 }

locales/it.json

@@ -0,0 +1,279 @@
+{
+  "`x` subscribers": "`x` iscritti",
+  "`x` videos": "`x` video",
+  "LIVE": "IN DIRETTA",
+  "Shared `x` ago": "Condiviso `x` fa",
+  "Unsubscribe": "Disiscriviti",
+  "Subscribe": "Iscriviti",
+  "Login to subscribe to `x`": "Accedi per iscriverti a `x`",
+  "View channel on YouTube": "Vedi canale su YouTube",
+  "newest": "Data di aggiunta (più recente)",
+  "oldest": "Data di aggiunta (più vecchia)",
+  "popular": "Tendenze",
+  "Next page": "Pagina successiva",
+  "Clear watch history?": "Sei sicuro di voler cancellare la cronologia dei video guardati?",
+  "Yes": "Si",
+  "No": "No",
+  "Import and Export Data": "Importazione ed esportazione dati",
+  "Import": "Importa",
+  "Import Invidious data": "Importa dati Invidious",
+  "Import YouTube subscriptions": "Importa le iscrizioni da YouTube",
+  "Import FreeTube subscriptions (.db)": "Importa le iscrizioni da FreeTube (.db)",
+  "Import NewPipe subscriptions (.json)": "Importa le iscrizioni da NewPipe (.json)",
+  "Import NewPipe data (.zip)": "Importa i dati di NewPipe (.zip)",
+  "Export": "Esporta",
+  "Export subscriptions as OPML": "Esporta gli abbonamenti come OPML",
+  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Esporta gli abbonamenti come OPML (per NewPipe e FreeTube)",
+  "Export data as JSON": "Esporta i dati in formato JSON",
+  "Delete account?": "Sei sicuro di voler cancellare l'account?",
+  "History": "Cronologia",
+  "Previous page": "Pagina precedente",
+  "An alternative front-end to YouTube": "Un'interfaccia alternativa per YouTube",
+  "JavaScript license information": "Info licenze JavaScript",
+  "source": "sorgente",
+  "Login": "Entra",
+  "Login/Register": "Entra/Registrati",
+  "Login to Google": "Entra con Google",
+  "User ID:": "ID utente:",
+  "Password:": "Password:",
+  "Time (h:mm:ss):": "Orario (h:mm:ss):",
+  "Text CAPTCHA": "Testo del CAPTCHA",
+  "Image CAPTCHA": "Immagine CAPTCHA",
+  "Sign In": "Entra",
+  "Register": "Registrati",
+  "Email:": "Email:",
+  "Google verification code:": "Codice di verifica Google:",
+  "Preferences": "Preferenze",
+  "Player preferences": "Preferenze del riproduttore",
+  "Always loop: ": "Ripeti sempre: ",
+  "Autoplay: ": "Riproduzione automatica: ",
+  "Autoplay next video: ": "Riproduci automaticamente il prossimo video: ",
+  "Listen by default: ": "Modalità solo audio come predefinita: ",
+  "Default speed: ": "Velocità di riproduzione predefinita: ",
+  "Preferred video quality: ": "Preferenza sulla qualità video: ",
+  "Player volume: ": "Volume di riproduzione: ",
+  "Default comments: ": "Origine dei commenti: ",
+  "Default captions: ": "Sottotitoli predefiniti: ",
+  "Fallback captions: ": "Sottotitoli alternativi: ",
+  "Show related videos? ": "Mostra video correlati? ",
+  "Visual preferences": "Preferenze grafiche",
+  "Dark mode: ": "Tema scuro: ",
+  "Thin mode: ": "Modalità per connessioni lente: ",
+  "Subscription preferences": "Preferenze iscrizioni",
+  "Redirect homepage to feed: ": "Reindirizza la pagina principale a quella delle iscrizioni: ",
+  "Number of videos shown in feed: ": "Numero di video da mostrare nelle iscrizioni: ",
+  "Sort videos by: ": "Ordinare i video per: ",
+  "published": "data di pubblicazione",
+  "published - reverse": "data di pubblicazione - decrescente",
+  "alphabetically": "ordine alfabetico",
+  "alphabetically - reverse": "ordine alfabetico - decrescente",
+  "channel name": "nome del canale",
+  "channel name - reverse": "nome del canale - decrescente",
+  "Only show latest video from channel: ": "Mostra solo il video più recente del canale: ",
+  "Only show latest unwatched video from channel: ": "Mostra solo il video più recente non guardato del canale: ",
+  "Only show unwatched: ": "Mostra solo i video non guardati: ",
+  "Only show notifications (if there are any): ": "Mostra solo le notifiche (se presenti): ",
+  "Data preferences": "Preferenze dati",
+  "Clear watch history": "Cancella la cronologia dei video guardati",
+  "Import/Export data": "Importazione/esportazione dati",
+  "Manage subscriptions": "Gestisci le iscrizioni",
+  "Watch history": "Cronologia dei video",
+  "Delete account": "Elimina l'account",
+  "Save preferences": "Salva le preferenze",
+  "Subscription manager": "Gestisci le iscrizioni",
+  "`x` subscriptions": "`x` iscrizioni",
+  "Import/Export": "Importa/esporta",
+  "unsubscribe": "disiscriviti",
+  "Subscriptions": "Iscrizioni",
+  "`x` unseen notifications": "`x` notifiche non visualizzate",
+  "search": "Cerca",
+  "Sign out": "Esci",
+  "Released under the AGPLv3 by Omar Roth.": "Pubblicato con licenza AGPLv3 da Omar Roth.",
+  "Source available here.": "Codice sorgente.",
+  "View JavaScript license information.": "Guarda le informazioni di licenza del codice JavaScript.",
+  "Trending": "Tendenze",
+  "Watch video on Youtube": "Guarda il video su YouTube",
+  "Genre: ": "Genere: ",
+  "License: ": "Licenza: ",
+  "Family friendly? ": "Per tutti? ",
+  "Wilson score: ": "Punteggio di Wilson: ",
+  "Engagement: ": "Tasso di coinvolgimento: ",
+  "Whitelisted regions: ": "Regioni nella lista bianca: ",
+  "Blacklisted regions: ": "Regioni nella lista nera: ",
+  "Shared `x`": "Condiviso `x`",
+  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Ciao! Sembra che tu abbia disattivato JavaScript. Clicca qui per visualizzare i commenti. Considera che potrebbe volerci più tempo.",
+  "View YouTube comments": "Visualizza i commenti da YouTube",
+  "View more comments on Reddit": "Visualizza più commenti su Reddit",
+  "View `x` comments": "Visualizza `x` commenti",
+  "View Reddit comments": "Visualizza i commenti da Reddit",
+  "Hide replies": "Nascondi le risposte",
+  "Show replies": "Mostra le risposte",
+  "Incorrect password": "Password sbagliata",
+  "Quota exceeded, try again in a few hours": "Limite superato, prova di nuovo fra qualche ora",
+  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Impossibile autenticarsi, controlla che l'autenticazione in due passaggi (Authenticator o SMS) sia attiva.",
+  "Invalid TFA code": "Codice di autenticazione a due fattori non valido",
+  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Login fallito. L'errore potrebbe essere causato dal fatto che la verifica in due passaggi non è attiva sul tuo account.",
+  "Invalid answer": "Risposta errata",
+  "Invalid CAPTCHA": "CAPTCHA errato",
+  "CAPTCHA is a required field": "Il CAPTCHA è un campo obbligatorio",
+  "User ID is a required field": "L'ID utente è obbligatorio",
+  "Password is a required field": "La password è un campo obbligatorio",
+  "Invalid username or password": "Nome utente o password errati",
+  "Please sign in using 'Sign in with Google'": "Per favore accedi con \"Entra con Google\"",
+  "Password cannot be empty": "La password non può essere vuota",
+  "Password cannot be longer than 55 characters": "La password non può contenere più di 55 caratteri",
+  "Please sign in": "Per favore, entra",
+  "Invidious Private Feed for `x`": "Feed privato Invidious per `x`",
+  "channel:`x`": "canale:`x`",
+  "Deleted or invalid channel": "Canale cancellato o invalido",
+  "This channel does not exist.": "Canale inesistente.",
+  "Could not get channel info.": "Impossibile ottenere le informazioni del canale.",
+  "Could not fetch comments": "Impossibile recuperare i commenti",
+  "View `x` replies": "Visualizza `x` risposte",
+  "`x` ago": "`x` fa",
+  "Load more": "Carica altro",
+  "`x` points": "`x` punti",
+  "Could not create mix.": "Impossibile creare il mix.",
+  "Playlist is empty": "Playlist vuota",
+  "Invalid playlist.": "Playlist invalida.",
+  "Playlist does not exist.": "Playlist inesistente.",
+  "Could not pull trending pages.": "Impossibile recuperare le tendenze.",
+  "Hidden field \"challenge\" is a required field": "Il campo nascosto \"challenge\" è obbligatorio",
+  "Hidden field \"token\" is a required field": "Il campo nascosto \"token\" è obbligatorio",
+  "Invalid challenge": "Campo \"challenge\" invalido",
+  "Invalid token": "Campo \"token\" invalido",
+  "Invalid user": "Utente invalido",
+  "Token is expired, please try again": "Token scaduto, riprova",
+  "English": "Inglese",
+  "English (auto-generated)": "Inglese (generati automaticamente)",
+  "Afrikaans": "Afrikaans",
+  "Albanian": "Albanese",
+  "Amharic": "Amarico",
+  "Arabic": "Arabo",
+  "Armenian": "Armeno",
+  "Azerbaijani": "Azero",
+  "Bangla": "Bengalese",
+  "Basque": "Basco",
+  "Belarusian": "Biellorusso",
+  "Bosnian": "Bosniaco",
+  "Bulgarian": "Bulgaro",
+  "Burmese": "Birmano",
+  "Catalan": "Catalano",
+  "Cebuano": "Sugbuanon",
+  "Chinese (Simplified)": "Cinese semplifiato",
+  "Chinese (Traditional)": "Cinese tradizionale",
+  "Corsican": "Corso",
+  "Croatian": "Croato",
+  "Czech": "Ceco",
+  "Danish": "Danese",
+  "Dutch": "Olandese",
+  "Esperanto": "Esperanto",
+  "Estonian": "Estone",
+  "Filipino": "Filippino",
+  "Finnish": "Finlandese",
+  "French": "Francese",
+  "Galician": "Galiziano",
+  "Georgian": "Georgiano",
+  "German": "Tedesco",
+  "Greek": "Greco",
+  "Gujarati": "Gujarati",
+  "Haitian Creole": "Creolo haitiano",
+  "Hausa": "Lingua hausa",
+  "Hawaiian": "Hawaiano",
+  "Hebrew": "Ebreo",
+  "Hindi": "Hindi",
+  "Hmong": "Hmong",
+  "Hungarian": "Ungarese",
+  "Icelandic": "Islandese",
+  "Igbo": "Igbo",
+  "Indonesian": "Indonesiano",
+  "Irish": "Irlandese",
+  "Italian": "Italiano",
+  "Japanese": "Giapponese",
+  "Javanese": "Giavanese",
+  "Kannada": "Kannada",
+  "Kazakh": "Kazaco",
+  "Khmer": "Khmer",
+  "Korean": "Coreano",
+  "Kurdish": "Curdo",
+  "Kyrgyz": "Kirghize",
+  "Lao": "Lao",
+  "Latin": "Latino",
+  "Latvian": "Lettone",
+  "Lithuanian": "Lituano",
+  "Luxembourgish": "Lussemburghese",
+  "Macedonian": "Macedone",
+  "Malagasy": "Malgascio",
+  "Malay": "Malese",
+  "Malayalam": "Lingua malayalam",
+  "Maltese": "Maltese",
+  "Maori": "Maori",
+  "Marathi": "Marathi",
+  "Mongolian": "Mongolo",
+  "Nepali": "Nepalese",
+  "Norwegian": "Norvegese",
+  "Nyanja": "Nyanja",
+  "Pashto": "Lingua pashtu",
+  "Persian": "Persiano",
+  "Polish": "Polacco",
+  "Portuguese": "Portoghese",
+  "Punjabi": "Punjabi",
+  "Romanian": "Rumeno",
+  "Russian": "Russo",
+  "Samoan": "Samoan",
+  "Scottish Gaelic": "Gaelico scozzese",
+  "Serbian": "Serbo",
+  "Shona": "Shona",
+  "Sindhi": "Sindhi",
+  "Sinhala": "Cingalese",
+  "Slovak": "Slovacco",
+  "Slovenian": "Sloveno",
+  "Somali": "Somalo",
+  "Southern Sotho": "Sotho del Sud",
+  "Spanish": "Spagnolo",
+  "Spanish (Latin America)": "Spagnolo (America latina)",
+  "Sundanese": "Sudanese",
+  "Swahili": "Swahili",
+  "Swedish": "Svedese",
+  "Tajik": "Tajik",
+  "Tamil": "Tamil",
+  "Telugu": "Telugu",
+  "Thai": "Thaï",
+  "Turkish": "Turco",
+  "Ukrainian": "Ucraino",
+  "Urdu": "Urdu",
+  "Uzbek": "Uzbeco",
+  "Vietnamese": "Vietnamese",
+  "Welsh": "Gallese",
+  "Western Frisian": "Frisone occidentale",
+  "Xhosa": "Xhosa",
+  "Yiddish": "Yiddish",
+  "Yoruba": "Yoruba",
+  "Zulu": "Zulu",
+  "`x` years": "`x` anni",
+  "`x` months": "`x` mesi",
+  "`x` weeks": "`x` settimane",
+  "`x` days": "`x` giorni",
+  "`x` hours": "`x` ore",
+  "`x` minutes": "`x` minuti",
+  "`x` seconds": "`x` secondi",
+  "Fallback comments: ": "Commenti alternativi: ",
+  "Popular": "Popolare",
+  "Top": "Top",
+  "About": "A proposito",
+  "Rating: ": "Punteggio: ",
+  "Language: ": "Lingua: ",
+  "Default": "Predefinito",
+  "Music": "Musica",
+  "Gaming": "Videogiochi",
+  "News": "Notizie",
+  "Movies": "Film",
+  "Download": "Scarica",
+  "Download as: ": "Scarica come: ",
+  "%A %B %-d, %Y": "%A %-d %B %Y",
+  "(edited)": "(modificato)",
+  "Youtube permalink of the comment": "Link permanente al commento di YouTube",
+  "`x` marked it with a ❤": "`x` l'ha contrassegnato con un ❤",
+  "Audio mode": "Modalità audio",
+  "Video mode": "Modalità video"
+}

locales/nb_NO.json

@@ -1,278 +1,280 @@
 {
-  "`x` subscribers": "`x` abonnenter",
-  "`x` videos": "`x` videoer",
-  "LIVE": "SANNTIDSVISNING",
-  "Shared `x` ago": "Delt for `x` siden",
-  "Unsubscribe": "Opphev abonnement",
-  "Subscribe": "Abonner",
-  "Login to subscribe to `x`": "Logg inn for å abonnere på `x`",
-  "View channel on YouTube": "Vis kanal på YouTube",
-  "newest": "nyeste",
-  "oldest": "eldste",
-  "popular": "populært",
-  "Preview page": "Forhåndsvis side",
-  "Next page": "Neste side",
-  "Clear watch history?": "Tøm visningshistorikk?",
-  "Yes": "Ja",
-  "No": "Nei",
-  "Import and Export Data": "Importer- og eksporter data",
-  "Import": "Importer",
-  "Import Invidious data": "Importer Invidious-data",
-  "Import YouTube subscriptions": "Importer YouTube-abonnenter",
-  "Import FreeTube subscriptions (.db)": "Importer FreeTube-abonnenter (.db)",
-  "Import NewPipe subscriptions (.json)": "Importer NewPipe-abonnenter (.json)",
-  "Import NewPipe data (.zip)": "Importer NewPipe-data (.zip)",
-  "Export": "Eksporter",
-  "Export subscriptions as OPML": "Eksporter abonnenter som OPML",
-  "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksporter abonnenter som OPML (for NewPipe og FreeTube)",
-  "Export data as JSON": "Eksporter data som JSON",
-  "Delete account?": "Slett konto?",
-  "History": "Historikk",
-  "Previous page": "Forrige side",
-  "An alternative front-end to YouTube": "En alternativ grenseflate for YouTube",
-  "JavaScript license information": "JavaScript-lisensinformasjon",
-  "source": "kilde",
-  "Login": "Logg inn",
-  "Login/Register": "Logg inn/registrer",
-  "Login to Google": "Logg inn med Google",
-  "User ID:": "Bruker-ID:",
-  "Password:": "Passord:",
-  "Time (h:mm:ss):": "Tid (h:mm:ss):",
-  "Text CAPTCHA": "Tekst-CAPTCHA",
-  "Image CAPTCHA": "Bilde-CAPTCHA",
-  "Sign In": "Innlogging",
-  "Register": "Registrer",
-  "Email:": "E-post:",
-  "Google verification code:": "Google-bekreftelseskode:",
-  "Preferences": "Innstillinger",
-  "Player preferences": "Avspillerinnstillinger",
-  "Always loop: ": "Alltid gjenta: ",
-  "Autoplay: ": "Autoavspilling: ",
-  "Autoplay next video: ": "Autospill neste video: ",
-  "Listen by default: ": "Lytt som forvalg: ",
-  "Default speed: ": "Forvalgt hastighet: ",
-  "Preferred video quality: ": "Foretrukket videokvalitet: ",
-  "Player volume: ": "Avspillerlydstyrke: ",
-  "Default comments: ": "Forvalgte kommentarer: ",
-  "Default captions: ": "Forvalgte undertitler: ",
-  "Fallback captions: ": "Tilbakefallsundertitler: ",
-  "Show related videos? ": "Vis relaterte videoer? ",
-  "Visual preferences": "Visuelle innstillinger",
-  "Dark mode: ": "Mørk drakt: ",
-  "Thin mode: ": "Tynt modus: ",
-  "Subscription preferences": "Abonnementsinnstillinger",
-  "Redirect homepage to feed: ": "Videresend hjemmeside til flyt: ",
-  "Number of videos shown in feed: ": "Antall videoer å vise i flyt: ",
-  "Sort videos by: ": "Sorter videoer etter: ",
-  "published": "publisert",
-  "published - reverse": "publisert - motsatt",
-  "alphabetically": "alfabetisk",
-  "alphabetically - reverse": "alfabetisk - motsatt",
-  "channel name": "kanalnavn",
-  "channel name - reverse": "kanalnavn - motsatt",
-  "Only show latest video from channel: ": "Kun vis siste video fra kanal: ",
-  "Only show latest unwatched video from channel: ": "Kun vis siste usette video fra kanal: ",
-  "Only show unwatched: ": "Kun vis usette: ",
-  "Only show notifications (if there are any): ": "Kun vis merknader (hvis det er noen): ",
-  "Data preferences": "Datainnstillinger",
-  "Clear watch history": "Tøm visningshistorikk",
-  "Import/Export data": "Importer/eksporter data",
-  "Manage subscriptions": "Behandle abonnementer",
-  "Watch history": "Visningshistorikk",
-  "Delete account": "Slett konto",
-  "Save preferences": "Lagre innstillinger",
-  "Subscription manager": "Abonnementsbehandler",
-  "`x` subscriptions": "`x` abonnementer",
-  "Import/Export": "Importer/eksporter",
-  "unsubscribe": "opphev abonnement",
-  "Subscriptions": "Abonnement",
-  "`x` unseen notifications": "`x` usette merknader",
-  "search": "søk",
-  "Sign out": "Logg ut",
-  "Released under the AGPLv3 by Omar Roth.": "Utgitt med AGPLv3+lisens av Omar Roth.",
-  "Source available here.": "Kildekode tilgjengelig her.",
-  "View JavaScript license information.": "Vis JavaScript-lisensinfo.",
-  "Trending": "Trendsettende",
-  "Watch video on Youtube": "Vis video på YouTube",
-  "Genre: ": "Sjanger: ",
-  "License: ": "Lisens: ",
-  "Family friendly? ": "Familievennlig? ",
-  "Wilson score: ": "Wilson-poengsum: ",
-  "Engagement: ": "Engasjement: ",
-  "Whitelisted regions: ": "Hvitlistede regioner: ",
-  "Blacklisted regions: ": "Svartelistede regioner: ",
-  "Shared `x`": "Delt `x`",
-  "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
-  "View YouTube comments": "Vis YouTube-kommentarer",
-  "View more comments on Reddit": "Vis flere kommenterer på Reddit",
-  "View `x` comments": "Vis `x` kommentarer",
-  "View Reddit comments": "Vis Reddit-kommentarer",
-  "Hide replies": "Skjul svar",
-  "Show replies": "Vis svar",
-  "Incorrect password": "Feil passord",
-  "Quota exceeded, try again in a few hours": "Kvote overskredet, prøv igjen om et par timer",
-  "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
-  "Invalid TFA code": "Ugyldig tofaktorkode",
-  "Login failed. This may be because two-factor authentication is not enabled on your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
-  "Invalid answer": "Ugyldig svar",
-  "Invalid CAPTCHA": "Ugyldig CAPTCHA",
-  "CAPTCHA is a required field": "CAPTCHA er et påkrevd felt",
-  "User ID is a required field": "Bruker-ID er et påkrevd felt",
-  "Password is a required field": "Passord er et påkrevd felt",
-  "Invalid username or password": "Ugyldig brukernavn eller passord",
-  "Please sign in using 'Sign in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
-  "Password cannot be empty": "Passordet kan ikke være tomt",
-  "Password cannot be longer than 55 characters": "Passordet kan ikke være lengre enn 55 tegn",
-  "Please sign in": "Logg inn",
-  "Invidious Private Feed for `x`": "Ugyldig privat flyt for `x`",
-  "channel:`x`": "kanal `x`",
-  "Deleted or invalid channel": "Slettet eller ugyldig kanal",
-  "This channel does not exist.": "Denne kanalen finnes ikke.",
-  "Could not get channel info.": "Kunne ikke innhente kanalinfo.",
-  "Could not fetch comments": "Kunne ikke hente kommentarer",
-  "View `x` replies": "Vis `x` svar",
-  "`x` ago": "`x` siden",
-  "Load more": "Last inn flere",
-  "`x` points": "`x` poeng",
-  "Could not create mix.": "Kunne ikke opprette miks.",
-  "Playlist is empty": "Spillelisten er tom",
-  "Invalid playlist.": "Ugyldig spilleliste.",
-  "Playlist does not exist.": "Spillelisten finnes ikke.",
-  "Could not pull trending pages.": "Kunne ikke hente trendsettende sider.",
-  "Hidden field \"challenge\" is a required field": "Skjult felt \"utfordring\" er et påkrevd felt",
-  "Hidden field \"token\" is a required field": "Skjult felt \"symbol\" er et påkrevd felt",
-  "Invalid challenge": "Ugyldig utfordring",
-  "Invalid token": "Ugyldig symbol",
-  "Invalid user": "Ugyldig bruker",
-  "Token is expired, please try again": "Symbol utløpt, prøv igjen",
-  "English": "Engelsk",
-  "English (auto-generated)": "Engelsk (auto-generert)",
-  "Afrikaans": "",
-  "Albanian": "Albansk",
-  "Amharic": "",
-  "Arabic": "Arabisk",
-  "Armenian": "Armensk",
-  "Azerbaijani": "",
-  "Bangla": "",
-  "Basque": "",
-  "Belarusian": "Hviterussisk",
-  "Bosnian": "Bosnisk",
-  "Bulgarian": "Bulgarsk",
-  "Burmese": "Burmesisk",
-  "Catalan": "Katalansk",
-  "Cebuano": "",
-  "Chinese (Simplified)": "",
-  "Chinese (Traditional)": "",
-  "Corsican": "",
-  "Croatian": "",
-  "Czech": "Tsjekkisk",
-  "Danish": "Dansk",
-  "Dutch": "",
-  "Esperanto": "Esperanto",
-  "Estonian": "",
-  "Filipino": "",
-  "Finnish": "Finsk",
-  "French": "Fransk",
-  "Galician": "",
-  "Georgian": "",
-  "German": "",
-  "Greek": "",
-  "Gujarati": "",
-  "Haitian Creole": "",
-  "Hausa": "",
-  "Hawaiian": "",
-  "Hebrew": "",
-  "Hindi": "",
-  "Hmong": "",
-  "Hungarian": "Ungarsk",
-  "Icelandic": "Islandsk",
-  "Igbo": "",
-  "Indonesian": "Indonesisk",
-  "Irish": "Irsk",
-  "Italian": "Italiensk",
-  "Japanese": "Japansk",
-  "Javanese": "",
-  "Kannada": "",
-  "Kazakh": "",
-  "Khmer": "",
-  "Korean": "",
-  "Kurdish": "",
-  "Kyrgyz": "",
-  "Lao": "",
-  "Latin": "",
-  "Latvian": "",
-  "Lithuanian": "",
-  "Luxembourgish": "",
-  "Macedonian": "",
-  "Malagasy": "",
-  "Malay": "",
-  "Malayalam": "",
-  "Maltese": "",
-  "Maori": "",
-  "Marathi": "",
-  "Mongolian": "",
-  "Nepali": "",
-  "Norwegian": "Norsk bokmål",
-  "Nyanja": "",
-  "Pashto": "",
-  "Persian": "",
-  "Polish": "",
-  "Portuguese": "",
-  "Punjabi": "",
-  "Romanian": "",
-  "Russian": "Russisk",
-  "Samoan": "",
-  "Scottish Gaelic": "",
-  "Serbian": "Serbisk",
-  "Shona": "",
-  "Sindhi": "",
-  "Sinhala": "",
-  "Slovak": "Slovakisk",
-  "Slovenian": "Slovensk",
-  "Somali": "Somali",
-  "Southern Sotho": "",
-  "Spanish": "Spansk",
-  "Spanish (Latin America)": "",
-  "Sundanese": "",
-  "Swahili": "",
-  "Swedish": "Svensk",
-  "Tajik": "",
-  "Tamil": "",
-  "Telugu": "",
-  "Thai": "",
-  "Turkish": "Tyrkisk",
-  "Ukrainian": "Ukrainsk",
-  "Urdu": "",
-  "Uzbek": "",
-  "Vietnamese": "Vietnamesisk",
-  "Welsh": "",
-  "Western Frisian": "",
-  "Xhosa": "",
-  "Yiddish": "",
-  "Yoruba": "",
-  "Zulu": "",
-  "`x` years": "`x` år",
-  "`x` months": "`x` måneder",
-  "`x` weeks": "`x` uker",
-  "`x` days": "`x` dager",
-  "`x` hours": "`x` timer",
-  "`x` minutes": "`x` minutter",
-  "`x` seconds": "`x` sekunder",
-  "Fallback comments: ": "Tilbakefallskommentarer: ",
-  "Popular": "Pupulært",
-  "Top": "Topp",
-  "About": "Om",
-  "Rating: ": "Vurdering: ",
-  "Language: ": "Språk: ",
-  "Default": "",
-  "Music": "",
-  "Gaming": "",
-  "News": "",
-  "Movies": "",
-  "Download": "",
-  "Download as: ": "",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+    "`x` subscribers": "`x` abonnenter",
+    "`x` videos": "`x` videoer",
+    "LIVE": "SANNTIDSVISNING",
+    "Shared `x` ago": "Delt for `x` siden",
+    "Unsubscribe": "Opphev abonnement",
+    "Subscribe": "Abonner",
+    "Login to subscribe to `x`": "Logg inn for å abonnere på `x`",
+    "View channel on YouTube": "Vis kanal på YouTube",
+    "newest": "nyeste",
+    "oldest": "eldste",
+    "popular": "populært",
+    "Preview page": "Forhåndsvis side",
+    "Next page": "Neste side",
+    "Clear watch history?": "Tøm visningshistorikk?",
+    "Yes": "Ja",
+    "No": "Nei",
+    "Import and Export Data": "Importer- og eksporter data",
+    "Import": "Importer",
+    "Import Invidious data": "Importer Invidious-data",
+    "Import YouTube subscriptions": "Importer YouTube-abonnenter",
+    "Import FreeTube subscriptions (.db)": "Importer FreeTube-abonnenter (.db)",
+    "Import NewPipe subscriptions (.json)": "Importer NewPipe-abonnenter (.json)",
+    "Import NewPipe data (.zip)": "Importer NewPipe-data (.zip)",
+    "Export": "Eksporter",
+    "Export subscriptions as OPML": "Eksporter abonnenter som OPML",
+    "Export subscriptions as OPML (for NewPipe & FreeTube)": "Eksporter abonnenter som OPML (for NewPipe og FreeTube)",
+    "Export data as JSON": "Eksporter data som JSON",
+    "Delete account?": "Slett konto?",
+    "History": "Historikk",
+    "Previous page": "Forrige side",
+    "An alternative front-end to YouTube": "En alternativ grenseflate for YouTube",
+    "JavaScript license information": "JavaScript-lisensinformasjon",
+    "source": "kilde",
+    "Login": "Logg inn",
+    "Login/Register": "Logg inn/registrer",
+    "Login to Google": "Logg inn med Google",
+    "User ID:": "Bruker-ID:",
+    "Password:": "Passord:",
+    "Time (h:mm:ss):": "Tid (h:mm:ss):",
+    "Text CAPTCHA": "Tekst-CAPTCHA",
+    "Image CAPTCHA": "Bilde-CAPTCHA",
+    "Sign In": "Innlogging",
+    "Register": "Registrer",
+    "Email:": "E-post:",
+    "Google verification code:": "Google-bekreftelseskode:",
+    "Preferences": "Innstillinger",
+    "Player preferences": "Avspillerinnstillinger",
+    "Always loop: ": "Alltid gjenta: ",
+    "Autoplay: ": "Autoavspilling: ",
+    "Autoplay next video: ": "Autospill neste video: ",
+    "Listen by default: ": "Lytt som forvalg: ",
+    "Default speed: ": "Forvalgt hastighet: ",
+    "Preferred video quality: ": "Foretrukket videokvalitet: ",
+    "Player volume: ": "Avspillerlydstyrke: ",
+    "Default comments: ": "Forvalgte kommentarer: ",
+    "Default captions: ": "Forvalgte undertitler: ",
+    "Fallback captions: ": "Tilbakefallsundertitler: ",
+    "Show related videos? ": "Vis relaterte videoer? ",
+    "Visual preferences": "Visuelle innstillinger",
+    "Dark mode: ": "Mørk drakt: ",
+    "Thin mode: ": "Tynt modus: ",
+    "Subscription preferences": "Abonnementsinnstillinger",
+    "Redirect homepage to feed: ": "Videresend hjemmeside til flyt: ",
+    "Number of videos shown in feed: ": "Antall videoer å vise i flyt: ",
+    "Sort videos by: ": "Sorter videoer etter: ",
+    "published": "publisert",
+    "published - reverse": "publisert - motsatt",
+    "alphabetically": "alfabetisk",
+    "alphabetically - reverse": "alfabetisk - motsatt",
+    "channel name": "kanalnavn",
+    "channel name - reverse": "kanalnavn - motsatt",
+    "Only show latest video from channel: ": "Kun vis siste video fra kanal: ",
+    "Only show latest unwatched video from channel: ": "Kun vis siste usette video fra kanal: ",
+    "Only show unwatched: ": "Kun vis usette: ",
+    "Only show notifications (if there are any): ": "Kun vis merknader (hvis det er noen): ",
+    "Data preferences": "Datainnstillinger",
+    "Clear watch history": "Tøm visningshistorikk",
+    "Import/Export data": "Importer/eksporter data",
+    "Manage subscriptions": "Behandle abonnementer",
+    "Watch history": "Visningshistorikk",
+    "Delete account": "Slett konto",
+    "Save preferences": "Lagre innstillinger",
+    "Subscription manager": "Abonnementsbehandler",
+    "`x` subscriptions": "`x` abonnementer",
+    "Import/Export": "Importer/eksporter",
+    "unsubscribe": "opphev abonnement",
+    "Subscriptions": "Abonnement",
+    "`x` unseen notifications": "`x` usette merknader",
+    "search": "søk",
+    "Sign out": "Logg ut",
+    "Released under the AGPLv3 by Omar Roth.": "Utgitt med AGPLv3+lisens av Omar Roth.",
+    "Source available here.": "Kildekode tilgjengelig her.",
+    "View JavaScript license information.": "Vis JavaScript-lisensinfo.",
+    "Trending": "Trendsettende",
+    "Watch video on Youtube": "Vis video på YouTube",
+    "Genre: ": "Sjanger: ",
+    "License: ": "Lisens: ",
+    "Family friendly? ": "Familievennlig? ",
+    "Wilson score: ": "Wilson-poengsum: ",
+    "Engagement: ": "Engasjement: ",
+    "Whitelisted regions: ": "Hvitlistede regioner: ",
+    "Blacklisted regions: ": "Svartelistede regioner: ",
+    "Shared `x`": "Delt `x`",
+    "Hi! Looks like you have JavaScript disabled. Click here to view comments, keep in mind it may take a bit longer to load.": "Hei. Det ser ut til at du har JavaScript avslått. Klikk her for å vise kommentarer, ha i minnet at innlasting tar lengre tid.",
+    "View YouTube comments": "Vis YouTube-kommentarer",
+    "View more comments on Reddit": "Vis flere kommenterer på Reddit",
+    "View `x` comments": "Vis `x` kommentarer",
+    "View Reddit comments": "Vis Reddit-kommentarer",
+    "Hide replies": "Skjul svar",
+    "Show replies": "Vis svar",
+    "Incorrect password": "Feil passord",
+    "Quota exceeded, try again in a few hours": "Kvote overskredet, prøv igjen om et par timer",
+    "Unable to login, make sure two-factor authentication (Authenticator or SMS) is enabled.": "Kunne ikke logge inn, forsikre deg om at tofaktor-identitetsbekreftelse (Authenticator eller SMS) er skrudd på.",
+    "Invalid TFA code": "Ugyldig tofaktorkode",
+    "Login failed. This may be because two-factor authentication is not enabled on your account.": "Innlogging mislyktes. Dette kan være fordi tofaktor-identitetsbekreftelse er skrudd av på kontoen din.",
+    "Invalid answer": "Ugyldig svar",
+    "Invalid CAPTCHA": "Ugyldig CAPTCHA",
+    "CAPTCHA is a required field": "CAPTCHA er et påkrevd felt",
+    "User ID is a required field": "Bruker-ID er et påkrevd felt",
+    "Password is a required field": "Passord er et påkrevd felt",
+    "Invalid username or password": "Ugyldig brukernavn eller passord",
+    "Please sign in using 'Sign in with Google'": "Logg inn ved bruk av \"Google-innlogging\"",
+    "Password cannot be empty": "Passordet kan ikke være tomt",
+    "Password cannot be longer than 55 characters": "Passordet kan ikke være lengre enn 55 tegn",
+    "Please sign in": "Logg inn",
+    "Invidious Private Feed for `x`": "Ugyldig privat flyt for `x`",
+    "channel:`x`": "kanal `x`",
+    "Deleted or invalid channel": "Slettet eller ugyldig kanal",
+    "This channel does not exist.": "Denne kanalen finnes ikke.",
+    "Could not get channel info.": "Kunne ikke innhente kanalinfo.",
+    "Could not fetch comments": "Kunne ikke hente kommentarer",
+    "View `x` replies": "Vis `x` svar",
+    "`x` ago": "`x` siden",
+    "Load more": "Last inn flere",
+    "`x` points": "`x` poeng",
+    "Could not create mix.": "Kunne ikke opprette miks.",
+    "Playlist is empty": "Spillelisten er tom",
+    "Invalid playlist.": "Ugyldig spilleliste.",
+    "Playlist does not exist.": "Spillelisten finnes ikke.",
+    "Could not pull trending pages.": "Kunne ikke hente trendsettende sider.",
+    "Hidden field \"challenge\" is a required field": "Skjult felt \"utfordring\" er et påkrevd felt",
+    "Hidden field \"token\" is a required field": "Skjult felt \"symbol\" er et påkrevd felt",
+    "Invalid challenge": "Ugyldig utfordring",
+    "Invalid token": "Ugyldig symbol",
+    "Invalid user": "Ugyldig bruker",
+    "Token is expired, please try again": "Symbol utløpt, prøv igjen",
+    "English": "Engelsk",
+    "English (auto-generated)": "Engelsk (auto-generert)",
+    "Afrikaans": "",
+    "Albanian": "Albansk",
+    "Amharic": "",
+    "Arabic": "Arabisk",
+    "Armenian": "Armensk",
+    "Azerbaijani": "",
+    "Bangla": "",
+    "Basque": "",
+    "Belarusian": "Hviterussisk",
+    "Bosnian": "Bosnisk",
+    "Bulgarian": "Bulgarsk",
+    "Burmese": "Burmesisk",
+    "Catalan": "Katalansk",
+    "Cebuano": "",
+    "Chinese (Simplified)": "",
+    "Chinese (Traditional)": "",
+    "Corsican": "",
+    "Croatian": "",
+    "Czech": "Tsjekkisk",
+    "Danish": "Dansk",
+    "Dutch": "",
+    "Esperanto": "Esperanto",
+    "Estonian": "",
+    "Filipino": "",
+    "Finnish": "Finsk",
+    "French": "Fransk",
+    "Galician": "",
+    "Georgian": "",
+    "German": "",
+    "Greek": "",
+    "Gujarati": "",
+    "Haitian Creole": "",
+    "Hausa": "",
+    "Hawaiian": "",
+    "Hebrew": "",
+    "Hindi": "",
+    "Hmong": "",
+    "Hungarian": "Ungarsk",
+    "Icelandic": "Islandsk",
+    "Igbo": "",
+    "Indonesian": "Indonesisk",
+    "Irish": "Irsk",
+    "Italian": "Italiensk",
+    "Japanese": "Japansk",
+    "Javanese": "",
+    "Kannada": "",
+    "Kazakh": "",
+    "Khmer": "",
+    "Korean": "",
+    "Kurdish": "",
+    "Kyrgyz": "",
+    "Lao": "",
+    "Latin": "",
+    "Latvian": "",
+    "Lithuanian": "",
+    "Luxembourgish": "",
+    "Macedonian": "",
+    "Malagasy": "",
+    "Malay": "",
+    "Malayalam": "",
+    "Maltese": "",
+    "Maori": "",
+    "Marathi": "",
+    "Mongolian": "",
+    "Nepali": "",
+    "Norwegian": "Norsk bokmål",
+    "Nyanja": "",
+    "Pashto": "",
+    "Persian": "",
+    "Polish": "",
+    "Portuguese": "",
+    "Punjabi": "",
+    "Romanian": "",
+    "Russian": "Russisk",
+    "Samoan": "",
+    "Scottish Gaelic": "",
+    "Serbian": "Serbisk",
+    "Shona": "",
+    "Sindhi": "",
+    "Sinhala": "",
+    "Slovak": "Slovakisk",
+    "Slovenian": "Slovensk",
+    "Somali": "Somali",
+    "Southern Sotho": "",
+    "Spanish": "Spansk",
+    "Spanish (Latin America)": "",
+    "Sundanese": "",
+    "Swahili": "",
+    "Swedish": "Svensk",
+    "Tajik": "",
+    "Tamil": "",
+    "Telugu": "",
+    "Thai": "",
+    "Turkish": "Tyrkisk",
+    "Ukrainian": "Ukrainsk",
+    "Urdu": "",
+    "Uzbek": "",
+    "Vietnamese": "Vietnamesisk",
+    "Welsh": "",
+    "Western Frisian": "",
+    "Xhosa": "",
+    "Yiddish": "",
+    "Yoruba": "",
+    "Zulu": "",
+    "`x` years": "`x` år",
+    "`x` months": "`x` måneder",
+    "`x` weeks": "`x` uker",
+    "`x` days": "`x` dager",
+    "`x` hours": "`x` timer",
+    "`x` minutes": "`x` minutter",
+    "`x` seconds": "`x` sekunder",
+    "Fallback comments: ": "Tilbakefallskommentarer: ",
+    "Popular": "Pupulært",
+    "Top": "Topp",
+    "About": "Om",
+    "Rating: ": "Vurdering: ",
+    "Language: ": "Språk: ",
+    "Default": "Forvalg",
+    "Music": "Musikk",
+    "Gaming": "Spill",
+    "News": "Nyheter",
+    "Movies": "Filmer",
+    "Download": "Last ned",
+    "Download as: ": "Last ned som: ",
+    "%A %B %-d, %Y": "",
+    "(edited)": "(redigert)",
+    "Youtube permalink of the comment": "Permanent YouTube-lenke til innholdet",
+    "`x` marked it with a ❤": "`x` levnet et ❤",
+    "Audio mode": "Lydmodus",
+    "Video mode": "Video-modus"
 }

locales/nl.json

@@ -274,5 +274,7 @@
   "%A %B %-d, %Y": "",
   "(edited)": "",
   "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/pl.json

@@ -274,5 +274,7 @@
   "%A %B %-d, %Y": "",
   "(edited)": "",
   "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "`x` marked it with a ❤": "",
+  "Audio mode": "",
+  "Video mode": ""
 }

locales/ru.json

@@ -277,8 +277,10 @@
   "Movies": "Фильмы",
   "Download": "Скачать",
   "Download as: ": "Скачать как: ",
-  "%A %B %-d, %Y": "",
-  "(edited)": "",
-  "Youtube permalink of the comment": "",
-  "`x` marked it with a ❤": ""
+  "%A %B %-d, %Y": "%-d %B %Y, %A",
+  "(edited)": "(изменено)",
+  "Youtube permalink of the comment": "Прямая ссылка на YouTube",
+  "`x` marked it with a ❤": "❤ от автора канала \"`x`\"",
+  "Audio mode": "",
+  "Video mode": ""
 }

shard.yml

@@ -1,5 +1,5 @@
 name: invidious
-version: 0.13.1
+version: 0.14.0
 
 authors:
   - Omar Roth <omarroth@hotmail.com>

spec/helpers_spec.cr

@@ -16,9 +16,9 @@ describe "Helpers" do
 
       produce_channel_videos_url(ucid: "UCXuqSBlHAE6Xw-yeJA0Tunw", page: 20).should eq("/browse_ajax?continuation=4qmFsgJEEhhVQ1h1cVNCbEhBRTZYdy15ZUpBMFR1bncaKEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQUFlZ0l5TUElM0QlM0Q%3D&gl=US&hl=en")
 
-      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", auto_generated: true).should eq("/browse_ajax?continuation=4qmFsgJIEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaLEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TlRRNU5qQXpOelE1&gl=US&hl=en")
+      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", auto_generated: true).should eq("/browse_ajax?continuation=4qmFsgJIEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaLEVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TlRVeU1ESXlPVFE1&gl=US&hl=en")
 
-      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", page: 20, auto_generated: true, sort_by: "popular").should eq("/browse_ajax?continuation=4qmFsgJOEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaMkVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TkRrNU5Ea3hOelE1R0FFJTNE&gl=US&hl=en")
+      produce_channel_videos_url(ucid: "UC-9-kyTW8ZkZNDHQJ6FgpwQ", page: 20, auto_generated: true, sort_by: "popular").should eq("/browse_ajax?continuation=4qmFsgJOEhhVQy05LWt5VFc4WmtaTkRIUUo2Rmdwd1EaMkVnWjJhV1JsYjNNd0FqZ0JZQUZxQUxnQkFDQTJlZ294TlRBeU1UY3dNVFE1R0FFJTNE&gl=US&hl=en")
     end
   end
 

src/invidious/channels.cr

@@ -3,6 +3,7 @@ class InvidiousChannel
     id:      String,
     author:  String,
     updated: Time,
+    deleted: Bool,
   })
 end
 
@@ -49,13 +50,11 @@ def get_batch_channels(channels, db, refresh = false, pull_all_videos = true, ma
 end
 
 def get_channel(id, db, refresh = true, pull_all_videos = true)
-  client = make_client(YT_URL)
-
   if db.query_one?("SELECT EXISTS (SELECT true FROM channels WHERE id = $1)", id, as: Bool)
     channel = db.query_one("SELECT * FROM channels WHERE id = $1", id, as: InvidiousChannel)
 
     if refresh && Time.now - channel.updated > 10.minutes
-      channel = fetch_channel(id, client, db, pull_all_videos: pull_all_videos)
+      channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
       channel_array = channel.to_a
       args = arg_array(channel_array)
 
@@ -63,7 +62,7 @@ def get_channel(id, db, refresh = true, pull_all_videos = true)
         ON CONFLICT (id) DO UPDATE SET author = $2, updated = $3", channel_array)
     end
   else
-    channel = fetch_channel(id, client, db, pull_all_videos: pull_all_videos)
+    channel = fetch_channel(id, db, pull_all_videos: pull_all_videos)
     channel_array = channel.to_a
     args = arg_array(channel_array)
 
@@ -73,7 +72,9 @@ def get_channel(id, db, refresh = true, pull_all_videos = true)
   return channel
 end
 
-def fetch_channel(ucid, client, db, pull_all_videos = true, locale = nil)
+def fetch_channel(ucid, db, pull_all_videos = true, locale = nil)
+  client = make_client(YT_URL)
+
   rss = client.get("/feeds/videos.xml?channel_id=#{ucid}").body
   rss = XML.parse_html(rss)
 
@@ -187,11 +188,70 @@ def fetch_channel(ucid, client, db, pull_all_videos = true, locale = nil)
     db.exec("DELETE FROM channel_videos * WHERE NOT id = ANY ('{#{ids.map { |id| %("#{id}") }.join(",")}}') AND ucid = $1", ucid)
   end
 
-  channel = InvidiousChannel.new(ucid, author, Time.now)
+  channel = InvidiousChannel.new(ucid, author, Time.now, false)
 
   return channel
 end
 
+def fetch_channel_playlists(ucid, author, auto_generated, continuation, sort_by)
+  client = make_client(YT_URL)
+
+  if continuation
+    url = produce_channel_playlists_url(ucid, continuation, sort_by, auto_generated)
+
+    response = client.get(url)
+    json = JSON.parse(response.body)
+
+    if json["load_more_widget_html"].as_s.empty?
+      return [] of SearchItem, nil
+    end
+
+    continuation = XML.parse_html(json["load_more_widget_html"].as_s)
+    continuation = continuation.xpath_node(%q(//button[@data-uix-load-more-href]))
+    if continuation
+      continuation = extract_channel_playlists_cursor(continuation["data-uix-load-more-href"], auto_generated)
+    end
+
+    html = XML.parse_html(json["content_html"].as_s)
+    nodeset = html.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+  else
+    url = "/channel/#{ucid}/playlists?disable_polymer=1&flow=list"
+
+    if auto_generated
+      url += "&view=50"
+    else
+      url += "&view=1"
+    end
+
+    case sort_by
+    when "last", "last_added"
+      #
+    when "oldest", "oldest_created"
+      url += "&sort=da"
+    when "newest", "newest_created"
+      url += "&sort=dd"
+    end
+
+    response = client.get(url)
+    html = XML.parse_html(response.body)
+
+    continuation = html.xpath_node(%q(//button[@data-uix-load-more-href]))
+    if continuation
+      continuation = extract_channel_playlists_cursor(continuation["data-uix-load-more-href"], auto_generated)
+    end
+
+    nodeset = html.xpath_nodes(%q(//ul[@id="browse-items-primary"]/li[contains(@class, "feed-item-container")]))
+  end
+
+  if auto_generated
+    items = extract_shelf_items(nodeset, ucid, author)
+  else
+    items = extract_items(nodeset, ucid, author)
+  end
+
+  return items, continuation
+end
+
 def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "newest")
   if auto_generated
     seed = Time.unix(1525757349)
@@ -218,7 +278,8 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "
   meta.write(Bytes[0x6a, 0x00])
   meta.write(Bytes[0xb8, 0x01, 0x00])
 
-  meta.write(Bytes[0x20, switch, 0x7a, page.size])
+  meta.write(Bytes[0x20, switch])
+  meta.write(Bytes[0x7a, page.size])
   meta.print(page)
 
   case sort_by
@@ -258,6 +319,132 @@ def produce_channel_videos_url(ucid, page = 1, auto_generated = nil, sort_by = "
   return url
 end
 
+def produce_channel_playlists_url(ucid, cursor, sort = "newest", auto_generated = false)
+  if !auto_generated
+    cursor = Base64.urlsafe_encode(cursor, false)
+  end
+
+  meta = IO::Memory.new
+
+  if auto_generated
+    meta.write(Bytes[0x08, 0x0a])
+  end
+
+  meta.write(Bytes[0x12, 0x09])
+  meta.print("playlists")
+
+  if auto_generated
+    meta.write(Bytes[0x20, 0x32])
+  else
+    # TODO: Look at 0x01, 0x00
+    case sort
+    when "oldest", "oldest_created"
+      meta.write(Bytes[0x18, 0x02])
+    when "newest", "newest_created"
+      meta.write(Bytes[0x18, 0x03])
+    when "last", "last_added"
+      meta.write(Bytes[0x18, 0x04])
+    end
+
+    meta.write(Bytes[0x20, 0x01])
+  end
+
+  meta.write(Bytes[0x30, 0x02])
+  meta.write(Bytes[0x38, 0x01])
+  meta.write(Bytes[0x60, 0x01])
+  meta.write(Bytes[0x6a, 0x00])
+
+  meta.write(Bytes[0x7a, cursor.size])
+  meta.print(cursor)
+
+  meta.write(Bytes[0xb8, 0x01, 0x00])
+
+  meta.rewind
+  meta = Base64.urlsafe_encode(meta.to_slice)
+  meta = URI.escape(meta)
+
+  continuation = IO::Memory.new
+  continuation.write(Bytes[0x12, ucid.size])
+  continuation.print(ucid)
+
+  continuation.write(Bytes[0x1a])
+  continuation.write(write_var_int(meta.size))
+  continuation.print(meta)
+
+  continuation.rewind
+  continuation = continuation.gets_to_end
+
+  wrapper = IO::Memory.new
+  wrapper.write(Bytes[0xe2, 0xa9, 0x85, 0xb2, 0x02])
+  wrapper.write(write_var_int(continuation.size))
+  wrapper.print(continuation)
+  wrapper.rewind
+
+  wrapper = Base64.urlsafe_encode(wrapper.to_slice)
+  wrapper = URI.escape(wrapper)
+
+  url = "/browse_ajax?continuation=#{wrapper}&gl=US&hl=en"
+
+  return url
+end
+
+def extract_channel_playlists_cursor(url, auto_generated)
+  wrapper = HTTP::Params.parse(URI.parse(url).query.not_nil!)["continuation"]
+
+  wrapper = URI.unescape(wrapper)
+  wrapper = Base64.decode(wrapper)
+
+  # 0xe2 0xa9 0x85 0xb2 0x02
+  wrapper += 5
+
+  continuation_size = read_var_int(wrapper[0, 4])
+  wrapper += write_var_int(continuation_size).size
+  continuation = wrapper[0, continuation_size]
+
+  # 0x12
+  continuation += 1
+  ucid_size = continuation[0]
+  continuation += 1
+  ucid = continuation[0, ucid_size]
+  continuation += ucid_size
+
+  # 0x1a
+  continuation += 1
+  meta_size = read_var_int(continuation[0, 4])
+  continuation += write_var_int(meta_size).size
+  meta = continuation[0, meta_size]
+  continuation += meta_size
+
+  meta = String.new(meta)
+  meta = URI.unescape(meta)
+  meta = Base64.decode(meta)
+
+  # 0x12 0x09 playlists
+  meta += 11
+
+  until meta[0] == 0x7a
+    tag = read_var_int(meta[0, 4])
+    meta += write_var_int(tag).size
+    value = meta[0]
+    meta += 1
+  end
+
+  # 0x7a
+  meta += 1
+  cursor_size = meta[0]
+  meta += 1
+  cursor = meta[0, cursor_size]
+
+  cursor = String.new(cursor)
+
+  if !auto_generated
+    cursor = URI.unescape(cursor)
+    cursor = Base64.decode_string(cursor)
+  end
+
+  return cursor
+end
+
 def get_about_info(ucid, locale)
   client = make_client(YT_URL)
 
@@ -288,7 +475,7 @@ def get_about_info(ucid, locale)
   sub_count ||= 0
 
   author = about.xpath_node(%q(//span[contains(@class,"qualified-channel-title-text")]/a)).not_nil!.content
-  ucid = about.xpath_node(%q(//link[@rel="canonical"])).not_nil!["href"].split("/")[-1]
+  ucid = about.xpath_node(%q(//meta[@itemprop="channelId"])).not_nil!["content"]
 
   # Auto-generated channels
   # https://support.google.com/youtube/answer/2579942
@@ -332,3 +519,21 @@ def get_60_videos(ucid, page, auto_generated, sort_by = "newest")
 
   return videos, count
 end
+
+def get_latest_videos(ucid)
+  client = make_client(YT_URL)
+  videos = [] of SearchVideo
+
+  url = produce_channel_videos_url(ucid, 0)
+  response = client.get(url)
+  json = JSON.parse(response.body)
+
+  if json["content_html"]? && !json["content_html"].as_s.empty?
+    document = XML.parse_html(json["content_html"].as_s)
+    nodeset = document.xpath_nodes(%q(//li[contains(@class, "feed-item-container")]))
+
+    videos = extract_videos(nodeset, ucid)
+  end
+
+  return videos
+end

src/invidious/comments.cr

@@ -56,72 +56,32 @@ class RedditListing
   })
 end
 
-def fetch_youtube_comments(id, continuation, proxies, format, locale)
-  client = make_client(YT_URL)
-  html = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-  headers = HTTP::Headers.new
-  headers["cookie"] = html.cookies.add_request_headers(headers)["cookie"]
-  body = html.body
+def fetch_youtube_comments(id, db, continuation, proxies, format, locale, region)
+  video = get_video(id, db, proxies, region: region)
 
-  session_token = body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
-  itct = body.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
-  ctoken = body.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
+  session_token = video.info["session_token"]?
+  itct = video.info["itct"]?
+  ctoken = video.info["ctoken"]?
+  continuation ||= ctoken
 
-  if body.match(/<meta itemprop="regionsAllowed" content="">/) && !body.match(/player-age-gate-content\">/)
-    bypass_channel = Channel({String, HTTPClient, HTTP::Headers} | Nil).new
-
-    proxies.each do |proxy_region, list|
-      spawn do
-        proxy_client = make_client(YT_URL, proxies, proxy_region)
-
-        response = proxy_client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-        proxy_headers = HTTP::Headers.new
-        proxy_headers["Cookie"] = response.cookies.add_request_headers(headers)["cookie"]
-        proxy_html = response.body
-
-        if !proxy_html.match(/<meta itemprop="regionsAllowed" content="">/) && !proxy_html.match(/player-age-gate-content\">/)
-          bypass_channel.send({proxy_html, proxy_client, proxy_headers})
-        else
-          bypass_channel.send(nil)
-        end
-      end
-    end
-
-    proxies.size.times do
-      response = bypass_channel.receive
-      if response
-        html, client, headers = response
-
-        session_token = html.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/).not_nil!["session_token"]
-        itct = html.match(/itct=(?<itct>[^"]+)"/).not_nil!["itct"]
-        ctoken = html.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
-
-        break
-      end
-    end
-  end
-
-  if !ctoken
+  if !continuation || !itct || !session_token
     if format == "json"
       return {"comments" => [] of String}.to_json
     else
       return {"contentHtml" => "", "commentCount" => 0}.to_json
     end
   end
-  ctoken = ctoken["ctoken"]
-
-  if !continuation.empty?
-    ctoken = continuation
-  else
-    continuation = ctoken
-  end
 
   post_req = {
-    "session_token" => session_token,
+    "session_token" => session_token.not_nil!,
   }
   post_req = HTTP::Params.encode(post_req)
 
+  client = make_client(YT_URL, proxies, video.info["region"]?)
+  headers = HTTP::Headers.new
+
   headers["content-type"] = "application/x-www-form-urlencoded"
+  headers["cookie"] = video.info["cookie"]
 
   headers["x-client-data"] = "CIi2yQEIpbbJAQipncoBCNedygEIqKPKAQ=="
   headers["x-spf-previous"] = "https://www.youtube.com/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999"
@@ -129,7 +89,8 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
 
   headers["x-youtube-client-name"] = "1"
   headers["x-youtube-client-version"] = "2.20180719"
-  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{ctoken}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
+
+  response = client.post("/comment_service_ajax?action_get_comments=1&pbj=1&ctoken=#{continuation}&continuation=#{continuation}&itct=#{itct}&hl=en&gl=US", headers, post_req)
   response = JSON.parse(response.body)
 
   if !response["response"]["continuationContents"]?
@@ -223,7 +184,7 @@ def fetch_youtube_comments(id, continuation, proxies, format, locale)
               json.field "content", content
               json.field "contentHtml", content_html
               json.field "published", published.to_unix
-              json.field "publishedText", translate(locale, "`x` ago", recode_date(published))
+              json.field "publishedText", translate(locale, "`x` ago", recode_date(published, locale))
               json.field "likeCount", node_comment["likeCount"]
               json.field "commentId", node_comment["commentId"]
               json.field "authorIsChannelOwner", node_comment["authorIsChannelOwner"]
@@ -291,7 +252,7 @@ end
 
 def fetch_reddit_comments(id)
   client = make_client(REDDIT_URL)
-  headers = HTTP::Headers{"User-Agent" => "web:invidio.us:v0.13.1 (by /u/omarroth)"}
+  headers = HTTP::Headers{"User-Agent" => "web:invidio.us:v0.14.0 (by /u/omarroth)"}
 
   query = "(url:3D#{id}%20OR%20url:#{id})%20(site:youtube.com%20OR%20site:youtu.be)"
   search_results = client.get("/search.json?q=#{query}", headers)
@@ -349,7 +310,7 @@ def template_youtube_comments(comments, locale)
             <a class="#{child["authorIsChannelOwner"] == true ? "channel-owner" : ""}" href="#{child["authorUrl"]}">#{child["author"]}</a>
           </b> 
           <p style="white-space:pre-wrap">#{child["contentHtml"]}</p>
-          <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64)))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
+          <span title="#{Time.unix(child["published"].as_i64).to_s(translate(locale, "%A %B %-d, %Y"))}">#{translate(locale, "`x` ago", recode_date(Time.unix(child["published"].as_i64), locale))} #{child["isEdited"] == true ? translate(locale, "(edited)") : ""}</span>
           |
           <a href="https://www.youtube.com/watch?v=#{comments["videoId"]}&lc=#{child["commentId"]}" title="#{translate(locale, "Youtube permalink of the comment")}">[YT]</a>
           | 
@@ -363,7 +324,7 @@ def template_youtube_comments(comments, locale)
               <div class="creator-heart">
                   <img class="creator-heart-background-hearted" src="#{creator_thumbnail}"></img>
                   <div class="creator-heart-small-hearted">
-                      <div class="creator-heart-small-container">🖤</div>
+                      <div class="icon ion-ios-heart creator-heart-small-container"></div>
                   </div>
               </div>
           </span>
@@ -414,7 +375,7 @@ def template_reddit_comments(root, locale)
         <a href="javascript:void(0)" onclick="toggle_parent(this)">[ - ]</a> 
         <b><a href="https://www.reddit.com/user/#{author}">#{author}</a></b> 
         #{translate(locale, "`x` points", number_with_separator(score))}
-        #{translate(locale, "`x` ago", recode_date(child.created_utc))}
+        #{translate(locale, "`x` ago", recode_date(child.created_utc, locale))}
       </p>
       <div>
       #{body_html}

src/invidious/helpers/helpers.cr

@@ -166,29 +166,11 @@ def extract_videos(nodeset, ucid = nil)
   videos.map { |video| video.as(SearchVideo) }
 end
 
-def extract_items(nodeset, ucid = nil)
+def extract_items(nodeset, ucid = nil, author_name = nil)
   # TODO: Make this a 'common', so it makes more sense to be used here
   items = [] of SearchItem
 
   nodeset.each do |node|
-    anchor = node.xpath_node(%q(.//h3[contains(@class,"yt-lockup-title")]/a))
-    if !anchor
-      next
-    end
-
-    if anchor["href"].starts_with? "https://www.googleadservices.com"
-      next
-    end
-
-    anchor = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-byline")]/a))
-    if !anchor
-      author = ""
-      author_id = ""
-    else
-      author = anchor.content.strip
-      author_id = anchor["href"].split("/")[-1]
-    end
-
     anchor = node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
     if !anchor
       next
@@ -196,6 +178,22 @@ def extract_items(nodeset, ucid = nil)
     title = anchor.content.strip
     id = anchor["href"]
 
+    if anchor["href"].starts_with? "https://www.googleadservices.com"
+      next
+    end
+
+    anchor = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-byline")]/a))
+    if anchor
+      author = anchor.content.strip
+      author_id = anchor["href"].split("/")[-1]
+    end
+
+    author ||= author_name
+    author_id ||= ucid
+
+    author ||= ""
+    author_id ||= ""
+
     description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
     description_html, description = html_to_content(description_html)
 
@@ -354,3 +352,94 @@ def extract_items(nodeset, ucid = nil)
 
   return items
 end
+
+def extract_shelf_items(nodeset, ucid = nil, author_name = nil)
+  items = [] of SearchPlaylist
+
+  nodeset.each do |shelf|
+    shelf_anchor = shelf.xpath_node(%q(.//h2[contains(@class, "branded-page-module-title")]))
+
+    if !shelf_anchor
+      next
+    end
+
+    title = shelf_anchor.xpath_node(%q(.//span[contains(@class, "branded-page-module-title-text")]))
+    if title
+      title = title.content.strip
+    end
+    title ||= ""
+
+    id = shelf_anchor.xpath_node(%q(.//a)).try &.["href"]
+    if !id
+      next
+    end
+
+    is_playlist = false
+    videos = [] of SearchPlaylistVideo
+
+    shelf.xpath_nodes(%q(.//ul[contains(@class, "yt-uix-shelfslider-list")]/li)).each do |child_node|
+      type = child_node.xpath_node(%q(./div))
+      if !type
+        next
+      end
+
+      case type["class"]
+      when .includes? "yt-lockup-video"
+        is_playlist = true
+
+        anchor = child_node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
+        if anchor
+          video_title = anchor.content.strip
+          video_id = HTTP::Params.parse(URI.parse(anchor["href"]).query.not_nil!)["v"]
+        end
+        video_title ||= ""
+        video_id ||= ""
+
+        anchor = child_node.xpath_node(%q(.//span[@class="video-time"]))
+        if anchor
+          length_seconds = decode_length_seconds(anchor.content)
+        end
+        length_seconds ||= 0
+
+        videos << SearchPlaylistVideo.new(
+          video_title,
+          video_id,
+          length_seconds
+        )
+      when .includes? "yt-lockup-playlist"
+        anchor = child_node.xpath_node(%q(.//h3[contains(@class, "yt-lockup-title")]/a))
+        if anchor
+          playlist_title = anchor.content.strip
+          params = HTTP::Params.parse(URI.parse(anchor["href"]).query.not_nil!)
+          plid = params["list"]
+        end
+        playlist_title ||= ""
+        plid ||= ""
+
+        items << SearchPlaylist.new(
+          playlist_title,
+          plid,
+          author_name,
+          ucid,
+          50,
+          Array(SearchPlaylistVideo).new
+        )
+      end
+    end
+
+    if is_playlist
+      plid = HTTP::Params.parse(URI.parse(id).query.not_nil!)["list"]
+
+      items << SearchPlaylist.new(
+        title,
+        plid,
+        author_name,
+        ucid,
+        videos.size,
+        videos
+      )
+    end
+  end
+
+  return items
+end

src/invidious/helpers/utils.cr

@@ -136,31 +136,26 @@ def decode_date(string : String)
   return Time.now - delta
 end
 
-def recode_date(time : Time)
+def recode_date(time : Time, locale)
   span = Time.now - time
 
   if span.total_days > 365.0
-    span = {span.total_days / 365, "year"}
+    span = translate(locale, "`x` years", (span.total_days.to_i / 365).to_s)
   elsif span.total_days > 30.0
-    span = {span.total_days / 30, "month"}
+    span = translate(locale, "`x` months", (span.total_days.to_i / 30).to_s)
   elsif span.total_days > 7.0
-    span = {span.total_days / 7, "week"}
+    span = translate(locale, "`x` weeks", (span.total_days.to_i / 7).to_s)
   elsif span.total_hours > 24.0
-    span = {span.total_days, "day"}
+    span = translate(locale, "`x` days", (span.total_days.to_i).to_s)
   elsif span.total_minutes > 60.0
-    span = {span.total_hours, "hour"}
+    span = translate(locale, "`x` hours", (span.total_hours.to_i).to_s)
   elsif span.total_seconds > 60.0
-    span = {span.total_minutes, "minute"}
+    span = translate(locale, "`x` minutes", (span.total_minutes.to_i).to_s)
   else
-    span = {span.total_seconds, "second"}
+    span = translate(locale, "`x` seconds", (span.total_seconds.to_i).to_s)
   end
 
-  span = {span[0].to_i, span[1]}
-  if span[0] > 1
-    span = {span[0], span[1] + "s"}
-  end
-
-  return span.join(" ")
+  return span
 end
 
 def number_with_separator(number)
@@ -240,21 +235,21 @@ def get_referer(env, fallback = "/")
 end
 
 def read_var_int(bytes)
-  numRead = 0
+  num_read = 0
   result = 0
 
-  read = bytes[numRead]
+  read = bytes[num_read]
 
   if bytes.size == 1
     result = bytes[0].to_i32
   else
     while ((read & 0b10000000) != 0)
-      read = bytes[numRead].to_u64
+      read = bytes[num_read].to_u64
       value = (read & 0b01111111)
-      result |= (value << (7 * numRead))
+      result |= (value << (7 * num_read))
 
-      numRead += 1
-      if numRead > 5
+      num_read += 1
+      if num_read > 5
         raise "VarInt is too big"
       end
     end

src/invidious/jobs.cr

@@ -68,11 +68,13 @@ def refresh_channels(db, logger, max_threads = 1, full_refresh = false)
           active_threads += 1
           spawn do
             begin
-              client = make_client(YT_URL)
-              channel = fetch_channel(id, client, db, full_refresh)
+              channel = fetch_channel(id, db, full_refresh)
 
-              db.exec("UPDATE channels SET updated = $1, author = $2 WHERE id = $3", Time.now, channel.author, id)
+              db.exec("UPDATE channels SET updated = $1, author = $2, deleted = false WHERE id = $3", Time.now, channel.author, id)
             rescue ex
+              if ex.message == "Deleted or invalid channel"
+                db.exec("UPDATE channels SET deleted = true WHERE id = $1", id)
+              end
               logger.write("#{id} : #{ex.message}\n")
             end
 

src/invidious/mixes.cr

@@ -43,8 +43,10 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
   mix_title = playlist["title"].as_s
 
   contents = playlist["contents"].as_a
-  until contents[0]["playlistPanelVideoRenderer"]["videoId"].as_s == video_id
-    contents.shift
+  if contents.map { |video| video["playlistPanelVideoRenderer"]["videoId"] }.includes? video_id
+    until contents[0]["playlistPanelVideoRenderer"]["videoId"].as_s == video_id
+      contents.shift
+    end
   end
 
   videos = [] of MixVideo
@@ -52,7 +54,10 @@ def fetch_mix(rdid, video_id, cookies = nil, locale = nil)
     item = item["playlistPanelVideoRenderer"]
 
     id = item["videoId"].as_s
-    title = item["title"]["simpleText"].as_s
+    title = item["title"]?.try &.["simpleText"].as_s
+    if !title
+      next
+    end
     author = item["longBylineText"]["runs"][0]["text"].as_s
     ucid = item["longBylineText"]["runs"][0]["navigationEndpoint"]["browseEndpoint"]["browseId"].as_s
     length_seconds = decode_length_seconds(item["lengthText"]["simpleText"].as_s)

src/invidious/search.cr

@@ -85,8 +85,8 @@ def channel_search(query, page, channel)
   return count, items
 end
 
-def search(query, page = 1, search_params = produce_search_params(content_type: "all"))
-  client = make_client(YT_URL)
+def search(query, page = 1, search_params = produce_search_params(content_type: "all"), proxies = nil, region = nil)
+  client = make_client(YT_URL, proxies, region)
   if query.empty?
     return {0, [] of SearchItem}
   end

src/invidious/signatures.cr

@@ -39,7 +39,12 @@ def fetch_decrypt_function(id = "CvFH_6DNRCY")
   return decrypt_function
 end
 
-def decrypt_signature(a, code)
+def decrypt_signature(fmt, code)
+  if !fmt["s"]?
+    return ""
+  end
+
+  a = fmt["s"]
   a = a.split("")
 
   code.each do |item|
@@ -53,7 +58,8 @@ def decrypt_signature(a, code)
     end
   end
 
-  return a.join("")
+  signature = a.join("")
+  return "&#{fmt["sp"]?}=#{signature}"
 end
 
 def splice(a, b)

src/invidious/users.cr

@@ -12,7 +12,6 @@ class User
   end
 
   add_mapping({
-    id:            Array(String),
     updated:       Time,
     notifications: Array(String),
     subscriptions: Array(String),
@@ -126,49 +125,55 @@ class Preferences
 end
 
 def get_user(sid, headers, db, refresh = true)
-  if db.query_one?("SELECT EXISTS (SELECT true FROM users WHERE $1 = ANY(id))", sid, as: Bool)
-    user = db.query_one("SELECT * FROM users WHERE $1 = ANY(id)", sid, as: User)
+  if email = db.query_one?("SELECT email FROM session_ids WHERE id = $1", sid, as: String)
+    user = db.query_one("SELECT * FROM users WHERE email = $1", email, as: User)
 
     if refresh && Time.now - user.updated > 1.minute
-      user = fetch_user(sid, headers, db)
+      user, sid = fetch_user(sid, headers, db)
       user_array = user.to_a
 
-      user_array[5] = user_array[5].to_json
+      user_array[4] = user_array[4].to_json
       args = arg_array(user_array)
 
       db.exec("INSERT INTO users VALUES (#{args}) \
-      ON CONFLICT (email) DO UPDATE SET id = users.id || $1, updated = $2, subscriptions = $4", user_array)
+      ON CONFLICT (email) DO UPDATE SET updated = $1, subscriptions = $3", user_array)
+
+      db.exec("INSERT INTO session_ids VALUES ($1,$2,$3) \
+      ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)
 
       begin
         view_name = "subscriptions_#{sha256(user.email)[0..7]}"
         PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
         SELECT * FROM channel_videos WHERE \
-        ucid = ANY ((SELECT subscriptions FROM users WHERE email = '#{user.email}')::text[]) \
+        ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
         ORDER BY published DESC;")
       rescue ex
       end
     end
   else
-    user = fetch_user(sid, headers, db)
+    user, sid = fetch_user(sid, headers, db)
     user_array = user.to_a
 
-    user_array[5] = user_array[5].to_json
+    user_array[4] = user_array[4].to_json
     args = arg_array(user.to_a)
 
     db.exec("INSERT INTO users VALUES (#{args}) \
-    ON CONFLICT (email) DO UPDATE SET id = users.id || $1, updated = $2, subscriptions = $4", user_array)
+    ON CONFLICT (email) DO UPDATE SET updated = $1, subscriptions = $3", user_array)
+
+    db.exec("INSERT INTO session_ids VALUES ($1,$2,$3) \
+    ON CONFLICT (id) DO NOTHING", sid, user.email, Time.now)
 
     begin
       view_name = "subscriptions_#{sha256(user.email)[0..7]}"
       PG_DB.exec("CREATE MATERIALIZED VIEW #{view_name} AS \
       SELECT * FROM channel_videos WHERE \
-      ucid = ANY ((SELECT subscriptions FROM users WHERE email = '#{user.email}')::text[]) \
+      ucid = ANY ((SELECT subscriptions FROM users WHERE email = E'#{user.email.gsub("'", "\\'")}')::text[]) \
       ORDER BY published DESC;")
     rescue ex
     end
   end
 
-  return user
+  return user, sid
 end
 
 def fetch_user(sid, headers, db)
@@ -196,17 +201,17 @@ def fetch_user(sid, headers, db)
 
   token = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
 
-  user = User.new([sid], Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
-  return user
+  user = User.new(Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
+  return user, sid
 end
 
 def create_user(sid, email, password)
   password = Crypto::Bcrypt::Password.create(password, cost: 10)
   token = Base64.urlsafe_encode(Random::Secure.random_bytes(32))
 
-  user = User.new([sid], Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token, [] of String)
+  user = User.new(Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token, [] of String)
 
-  return user
+  return user, sid
 end
 
 def create_response(user_id, operation, key, db, expire = 6.hours)

src/invidious/videos.cr

@@ -263,7 +263,7 @@ class Video
   end
 
   def keywords
-    keywords = self.player_response["videoDetails"]["keywords"]?.try &.as_a
+    keywords = self.player_response["videoDetails"]?.try &.["keywords"]?.try &.as_a
     keywords ||= [] of String
 
     return keywords
@@ -286,10 +286,8 @@ class Video
       end
     end
 
-    if streams[0]? && streams[0]["s"]?
-      streams.each do |fmt|
-        fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function)
-      end
+    streams.each do |fmt|
+      fmt["url"] += decrypt_signature(fmt, decrypt_function)
     end
 
     return streams
@@ -302,9 +300,9 @@ class Video
       self.info["adaptive_fmts"].split(",") do |string|
         adaptive_fmts << HTTP::Params.parse(string)
       end
-    elsif self.info.has_key?("dashmpd")
+    elsif dashmpd = self.player_response["streamingData"]["dashManifestUrl"]?.try &.as_s
       client = make_client(YT_URL)
-      response = client.get(self.info["dashmpd"])
+      response = client.get(dashmpd)
       document = XML.parse_html(response.body)
 
       document.xpath_nodes(%q(//adaptationset)).each do |adaptation_set|
@@ -381,10 +379,8 @@ class Video
       end
     end
 
-    if adaptive_fmts[0]? && adaptive_fmts[0]["s"]?
-      adaptive_fmts.each do |fmt|
-        fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function)
-      end
+    adaptive_fmts.each do |fmt|
+      fmt["url"] += decrypt_signature(fmt, decrypt_function)
     end
 
     return adaptive_fmts
@@ -542,53 +538,71 @@ def get_video(id, db, proxies = {} of String => Array({ip: String, port: Int32})
   return video
 end
 
+def extract_player_config(body, html)
+  params = HTTP::Params.new
+
+  if md = body.match(/'XSRF_TOKEN': "(?<session_token>[A-Za-z0-9\_\-\=]+)"/)
+    params["session_token"] = md["session_token"]
+  end
+
+  if md = body.match(/itct=(?<itct>[^"]+)"/)
+    params["itct"] = md["itct"]
+  end
+
+  if md = body.match(/'COMMENTS_TOKEN': "(?<ctoken>[^"]+)"/)
+    params["ctoken"] = md["ctoken"]
+  end
+
+  if md = body.match(/'RELATED_PLAYER_ARGS': (?<rvs>{"rvs":"[^"]+"})/)
+    params["rvs"] = JSON.parse(md["rvs"])["rvs"].as_s
+  end
+
+  html_info = body.match(/ytplayer\.config = (?<info>.*?);ytplayer\.load/).try &.["info"]
+
+  if html_info
+    JSON.parse(html_info)["args"].as_h.each do |key, value|
+      params[key] = value.to_s
+    end
+  else
+    error_message = html.xpath_node(%q(//h1[@id="unavailable-message"]))
+    if error_message
+      params["reason"] = error_message.content.strip
+    else
+      params["reason"] = "Could not extract video info."
+    end
+  end
+
+  return params
+end
+
 def fetch_video(id, proxies, region)
-  html_channel = Channel(XML::Node | String).new
-  info_channel = Channel(HTTP::Params).new
+  client = make_client(YT_URL, proxies, region)
+  response = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
 
-  spawn do
-    client = make_client(YT_URL, proxies, region)
-    html = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
-
-    if md = html.headers["location"]?.try &.match(/v=(?<id>[a-zA-Z0-9_-]{11})/)
-      next html_channel.send(md["id"])
-    end
-
-    html = XML.parse_html(html.body)
-    html_channel.send(html)
+  if md = response.headers["location"]?.try &.match(/v=(?<id>[a-zA-Z0-9_-]{11})/)
+    raise VideoRedirect.new(md["id"])
   end
 
-  spawn do
-    client = make_client(YT_URL, proxies, region)
-    info = client.get("/get_video_info?video_id=#{id}&el=detailpage&ps=default&eurl=&gl=US&hl=en&disable_polymer=1")
-    info = HTTP::Params.parse(info.body)
-
-    if info["reason"]?
-      info = client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1")
-      info = HTTP::Params.parse(info.body)
-    end
-
-    info_channel.send(info)
-  end
-
-  html = html_channel.receive
-  if html.as?(String)
-    raise VideoRedirect.new("#{html.as(String)}")
-  end
-  html = html.as(XML::Node)
-
-  info = info_channel.receive
+  html = XML.parse_html(response.body)
+  info = extract_player_config(response.body, html)
+  info["cookie"] = response.cookies.to_h.map { |name, cookie| "#{name}=#{cookie.value}" }.join("; ")
 
+  # Try to use proxies for region-blocked videos
   if info["reason"]? && info["reason"].includes? "your country"
-    bypass_channel = Channel({HTTPClient, String} | Nil).new
+    bypass_channel = Channel({XML::Node, HTTP::Params} | Nil).new
 
     proxies.each do |proxy_region, list|
       spawn do
         client = make_client(YT_URL, proxies, proxy_region)
+        proxy_response = client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999")
 
-        info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
-        if !info["reason"]?
-          bypass_channel.send({client, proxy_region})
+        proxy_html = XML.parse_html(proxy_response.body)
+        proxy_info = extract_player_config(proxy_response.body, proxy_html)
+
+        if !proxy_info["reason"]?
+          proxy_info["region"] = proxy_region
+          proxy_info["cookie"] = proxy_response.cookies.to_h.map { |name, cookie| "#{name}=#{cookie.value}" }.join("; ")
+          bypass_channel.send({proxy_html, proxy_info})
         else
           bypass_channel.send(nil)
         end
@@ -598,37 +612,21 @@ def fetch_video(id, proxies, region)
     proxies.size.times do
       response = bypass_channel.receive
       if response
-        begin
-          client, proxy_region = response
-
-          html = XML.parse_html(client.get("/watch?v=#{id}&gl=US&hl=en&disable_polymer=1&has_verified=1&bpctr=9999999999").body)
-          info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&el=detailpage&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
-
-          if info["reason"]?
-            info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
-          end
-
-          info["region"] = proxy_region
-
-          break
-        rescue ex
-        end
+        html, info = response
+        break
       end
     end
   end
 
+  # Try to pull streams from embed URL
   if info["reason"]?
-    html_info = html.to_s.match(/ytplayer\.config = (?<info>.*?);ytplayer\.load/).try &.["info"]
-    if html_info
-      html_info = JSON.parse(html_info)["args"].as_h
-      info.delete("reason")
+    embed_info = HTTP::Params.parse(client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body)
 
-      html_info.each do |k, v|
-        info[k] = v.to_s
+    if !embed_info["reason"]?
+      embed_info.each do |key, value|
+        info[key] = value.to_s
       end
-    end
-
-    if info["reason"]?
+    else
       raise info["reason"]
     end
   end
@@ -668,6 +666,7 @@ def fetch_video(id, proxies, region)
 
   allowed_regions = html.xpath_node(%q(//meta[@itemprop="regionsAllowed"])).try &.["content"].split(",")
   allowed_regions ||= [] of String
+
   is_family_friendly = html.xpath_node(%q(//meta[@itemprop="isFamilyFriendly"])).try &.["content"] == "True"
   is_family_friendly ||= true
 

src/invidious/views/channel.ecr

@@ -46,7 +46,7 @@
 </div>
 
 <div class="pure-g">
-<% videos.each_slice(4) do |slice| %>
+<% items.each_slice(4) do |slice| %>
     <% slice.each do |item| %>
         <%= rendered "components/item" %>
     <% end %>

src/invidious/views/components/feed_menu.ecr

@@ -0,0 +1,19 @@
+<div class="h-box pure-g">
+    <div class="pure-u-1-4"></div>
+    <div class="pure-u-1 pure-u-md-1-2">
+        <div class="pure-g">
+            <% feeds = ["Popular", "Top", "Trending"] %>
+            <% if env.get? "user" %>
+            <% feeds << "Subscriptions" %>
+            <% end %>
+            <% feeds.each do |feed| %>
+            <div class="pure-u-1-<%= feeds.size %>">
+                <a href="/feed/<%= feed.downcase %>" style="text-align:center;" class="pure-menu-heading">
+                    <%= translate(locale, feed) %>
+                </a>
+            </div>
+            <% end %>
+        </div>
+    </div>
+    <div class="pure-u-1-4"></div>
+</div>

src/invidious/views/components/item.ecr

@@ -53,20 +53,21 @@
             <% else %>
             <div class="thumbnail">
                 <img class="thumbnail" src="/vi/<%= item.id %>/mqdefault.jpg"/>
+                <% if item.responds_to?(:live_now) && item.live_now %>
+                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                <% else %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <% end %>
             </div>
             <% end %>
             <p><%= item.title %></p>
         </a>
-        <% if item.responds_to?(:live_now) && item.live_now %>
-        <p><%= translate(locale, "LIVE") %></p>
-        <% end %>
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
         
         <% if Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published)) %></h5>
+        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
         <% end %>
     <% else %>
         <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
@@ -81,26 +82,27 @@
                         onmouseenter='this["href"]="javascript:void(0)"'
                         href="/mark_watched?id=<%= item.id %>">
                         <i onmouseenter='this.setAttribute("class", "icon ion-ios-eye-off")'
-                            onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
-                            class="icon ion-ios-eye">
+                           onmouseleave='this.setAttribute("class", "icon ion-ios-eye")'
+                           class="icon ion-ios-eye">
                         </i>
                     </a>
                 </p>
                 <% end %>
+                <% if item.responds_to?(:live_now) && item.live_now %>
+                <p class="length"><i class="icon ion-ios-play-circle"></i> <%= translate(locale, "LIVE") %></p>
+                <% else %>
                 <p class="length"><%= recode_length_seconds(item.length_seconds) %></p>
+                <% end %>
             </div>
         </a>
         <% end %>
         <p><a href="/watch?v=<%= item.id %>"><%= item.title %></a></p>
-        <% if item.responds_to?(:live_now) && item.live_now %>
-        <p><%= translate(locale, "LIVE") %></p>
-        <% end %>
         <p>
             <b><a style="width:100%;" href="/channel/<%= item.ucid %>"><%= item.author %></a></b>
         </p>
         
         <% if Time.now - item.published > 1.minute %>
-        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published)) %></h5>
+        <h5><%= translate(locale, "Shared `x` ago", recode_date(item.published, locale)) %></h5>
         <% end %>
     <% end %>
     </div>

src/invidious/views/components/subscribe_widget_script.ecr

@@ -20,7 +20,7 @@ function subscribe(timeouts = 0) {
 
     var fallback = subscribe_button.innerHTML;
     subscribe_button.onclick = unsubscribe;
-    subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe") %> | <%= sub_count_text %></b>'
+    subscribe_button.innerHTML = '<b><%= translate(locale, "Unsubscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
     
     xhr.onreadystatechange = function() {
         if (xhr.readyState == 4) {
@@ -55,7 +55,7 @@ function unsubscribe(timeouts = 0) {
 
     var fallback = subscribe_button.innerHTML;
     subscribe_button.onclick = subscribe;
-    subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe") %> | <%= sub_count_text %></b>'
+    subscribe_button.innerHTML = '<b><%= translate(locale, "Subscribe").gsub("'", "\\'") %> | <%= sub_count_text %></b>'
 
     xhr.onreadystatechange = function() {
         if (xhr.readyState == 4) {

src/invidious/views/index.ecr

@@ -3,29 +3,7 @@
 <title>Invidious</title>
 <% end %>
 
-<div class="h-box pure-g">
-    <div class="pure-u-1-4"></div>
-    <div class="pure-u-1 pure-u-md-1-2">
-        <div class="pure-g">
-            <div class="pure-u-1-3">
-                <a href="/feed/popular" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Popular") %>
-                </a>
-            </div>
-            <div class="pure-u-1-3">
-                <a href="/feed/top" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Top") %>
-                </a>
-            </div>
-            <div class="pure-u-1-3">
-                <a href="/feed/trending" style="text-align:center;" class="pure-menu-heading">
-                    <%= translate(locale, "Trending") %>
-                </a>
-            </div>
-        </div>
-    </div>
-    <div class="pure-u-1-4"></div>
-</div>
+<%= rendered "components/feed_menu" %>
 
 <div class="pure-g">
 <% top_videos.each_slice(4) do |slice| %>

src/invidious/views/popular.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
 <title><%= translate(locale, "Popular") %> - Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g">
 <% popular_videos.each_slice(4) do |slice| %>
         <% slice.each do |item| %>

src/invidious/views/preferences.ecr

@@ -15,29 +15,29 @@ function update_value(element) {
 
             <div class="pure-control-group">
                 <label for="video_loop"><%= translate(locale, "Always loop: ") %></label>
-                <input name="video_loop" id="video_loop" type="checkbox" <% if user.preferences.video_loop %>checked<% end %>>
+                <input name="video_loop" id="video_loop" type="checkbox" <% if preferences.video_loop %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="autoplay"><%= translate(locale, "Autoplay: ") %></label>
-                <input name="autoplay" id="autoplay" type="checkbox" <% if user.preferences.autoplay %>checked<% end %>>
+                <input name="autoplay" id="autoplay" type="checkbox" <% if preferences.autoplay %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="continue"><%= translate(locale, "Autoplay next video: ") %></label>
-                <input name="continue" id="continue" type="checkbox" <% if user.preferences.continue %>checked<% end %>>
+                <input name="continue" id="continue" type="checkbox" <% if preferences.continue %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="listen"><%= translate(locale, "Listen by default: ") %></label>
-                <input name="listen" id="listen" type="checkbox" <% if user.preferences.listen %>checked<% end %>>
+                <input name="listen" id="listen" type="checkbox" <% if preferences.listen %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="speed"><%= translate(locale, "Default speed: ") %></label>
                 <select name="speed" id="speed">
                 <% {2.0, 1.5, 1.0, 0.5}.each do |option| %>
-                    <option <% if user.preferences.speed == option %> selected <% end %>><%= option %></option>
+                    <option <% if preferences.speed == option %> selected <% end %>><%= option %></option>
                 <% end %>
                 </select>
             </div>
@@ -46,22 +46,22 @@ function update_value(element) {
                 <label for="quality"><%= translate(locale, "Preferred video quality: ") %></label>
                 <select name="quality" id="quality">
                 <% {"dash", "hd720", "medium", "small"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.quality == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="volume"><%= translate(locale, "Player volume: ") %></label>
-                <input name="volume" id="volume" oninput="update_value(this);" type="range" min="0" max="100" step="5" value="<%= user.preferences.volume %>">
-                <span class="pure-form-message-inline" id="volume-value"><%= user.preferences.volume %></span>
+                <input name="volume" id="volume" oninput="update_value(this);" type="range" min="0" max="100" step="5" value="<%= preferences.volume %>">
+                <span class="pure-form-message-inline" id="volume-value"><%= preferences.volume %></span>
             </div>
 
             <div class="pure-control-group">
                 <label for="comments_0"><%= translate(locale, "Default comments: ") %></label>
                 <select name="comments_0" id="comments_0">
                 <% {"", "youtube", "reddit"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.comments[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.comments[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
@@ -70,7 +70,7 @@ function update_value(element) {
                 <label for="comments_1"><%= translate(locale, "Fallback comments: ") %></label>
                 <select name="comments_1" id="comments_1">
                 <% {"", "youtube", "reddit"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.comments[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.comments[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
@@ -79,7 +79,7 @@ function update_value(element) {
                 <label for="captions_0"><%= translate(locale, "Default captions: ") %></label>
                 <select class="pure-u-1-5" name="captions_0" id="captions_0">
                 <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.captions[0] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
@@ -88,20 +88,20 @@ function update_value(element) {
                 <label for="captions_fallback"><%= translate(locale, "Fallback captions: ") %></label>
                 <select class="pure-u-1-5" name="captions_1" id="captions_1">
                 <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.captions[1] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
 
                 <select class="pure-u-1-5" name="captions_2" id="captions_2">
                 <% CAPTION_LANGUAGES.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.captions[2] == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.captions[2] == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="related_videos"><%= translate(locale, "Show related videos? ") %></label>
-                <input name="related_videos" id="related_videos" type="checkbox" <% if user.preferences.related_videos %>checked<% end %>>
+                <input name="related_videos" id="related_videos" type="checkbox" <% if preferences.related_videos %>checked<% end %>>
             </div>
 
             <legend><%= translate(locale, "Visual preferences") %></legend>
@@ -110,61 +110,64 @@ function update_value(element) {
                 <label for="locale"><%= translate(locale, "Language: ") %></label>
                 <select name="locale" id="locale">
                 <% LOCALES.each_key do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.locale == option %> selected <% end %>><%= option %></option>
+                    <option value="<%= option %>" <% if preferences.locale == option %> selected <% end %>><%= option %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
                 <label for="dark_mode"><%= translate(locale, "Dark mode: ") %></label>
-                <input name="dark_mode" id="dark_mode" type="checkbox" <% if user.preferences.dark_mode %>checked<% end %>>
+                <input name="dark_mode" id="dark_mode" type="checkbox" <% if preferences.dark_mode %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="thin_mode"><%= translate(locale, "Thin mode: ") %></label>
-                <input name="thin_mode" id="thin_mode" type="checkbox" <% if user.preferences.thin_mode %>checked<% end %>>
+                <input name="thin_mode" id="thin_mode" type="checkbox" <% if preferences.thin_mode %>checked<% end %>>
             </div>
 
+            <% if env.get? "user" %>
             <legend><%= translate(locale, "Subscription preferences") %></legend>
 
             <div class="pure-control-group">
                 <label for="redirect_feed"><%= translate(locale, "Redirect homepage to feed: ") %></label>
-                <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if user.preferences.redirect_feed %>checked<% end %>>
+                <input name="redirect_feed" id="redirect_feed" type="checkbox" <% if preferences.redirect_feed %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="max_results"><%= translate(locale, "Number of videos shown in feed: ") %></label>
-                <input name="max_results" id="max_results" type="number" value="<%= user.preferences.max_results %>">
+                <input name="max_results" id="max_results" type="number" value="<%= preferences.max_results %>">
             </div>
 
             <div class="pure-control-group">
                 <label for="sort"><%= translate(locale, "Sort videos by: ") %></label>
                 <select name="sort" id="sort">
                 <% {"published", "published - reverse", "alphabetically", "alphabetically - reverse", "channel name", "channel name - reverse"}.each do |option| %>
-                    <option value="<%= option %>" <% if user.preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
+                    <option value="<%= option %>" <% if preferences.sort == option %> selected <% end %>><%= translate(locale, option) %></option>
                 <% end %>
                 </select>
             </div>
 
             <div class="pure-control-group">
-                <% if user.preferences.unseen_only %>
+                <% if preferences.unseen_only %>
                 <label for="latest_only"><%= translate(locale, "Only show latest unwatched video from channel: ") %></label>
                 <% else %>
                 <label for="latest_only"><%= translate(locale, "Only show latest video from channel: ") %></label>
                 <% end %>
-                <input name="latest_only" id="latest_only" type="checkbox" <% if user.preferences.latest_only %>checked<% end %>>
+                <input name="latest_only" id="latest_only" type="checkbox" <% if preferences.latest_only %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="unseen_only"><%= translate(locale, "Only show unwatched: ") %></label>
-                <input name="unseen_only" id="unseen_only" type="checkbox" <% if user.preferences.unseen_only %>checked<% end %>>
+                <input name="unseen_only" id="unseen_only" type="checkbox" <% if preferences.unseen_only %>checked<% end %>>
             </div>
 
             <div class="pure-control-group">
                 <label for="notifications_only"><%= translate(locale, "Only show notifications (if there are any): ") %></label>
-                <input name="notifications_only" id="notifications_only" type="checkbox" <% if user.preferences.notifications_only %>checked<% end %>>
+                <input name="notifications_only" id="notifications_only" type="checkbox" <% if preferences.notifications_only %>checked<% end %>>
             </div>
+            <% end %>
 
+            <% if env.get? "user" %>
             <legend><%= translate(locale, "Data preferences") %></legend>
 
             <div class="pure-control-group">
@@ -186,6 +189,7 @@ function update_value(element) {
             <div class="pure-control-group">
                 <a href="/delete_account?referer=<%= URI.escape(referer) %>"><%= translate(locale, "Delete account") %></a>
             </div>
+            <% end %>
 
             <div class="pure-controls">
                 <button type="submit" class="pure-button pure-button-primary"><%= translate(locale, "Save preferences") %></button>

src/invidious/views/subscriptions.ecr

@@ -2,6 +2,8 @@
 <title><%= translate(locale, "Subscriptions") %> - Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g h-box">
     <div class="pure-u-1-3">
         <h3>

src/invidious/views/template.ecr

@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="/css/grids-responsive-min.css">
   <link rel="stylesheet" href="/css/ionicons.min.css">
   <link rel="stylesheet" href="/css/default.css">
-  <% if env.get?("user") && env.get("user").as(User).preferences.dark_mode %>
+  <% if env.get?("preferences").try &.as(Preferences).dark_mode %>
   <link rel="stylesheet" href="/css/darktheme.css">
   <% else %>
   <link rel="stylesheet" href="/css/lighttheme.css">
@@ -38,7 +38,7 @@
         <div class="pure-u-1 pure-u-md-12-24 searchbar">
           <form class="pure-form" action="/search" method="get">
             <fieldset>
-              <input type="search" style="width:100%;" name="q" placeholder="search" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
+              <input type="search" style="width:100%;" name="q" placeholder="<%= translate(locale, "search") %>" value="<%= env.get?("search").try {|x| HTML.escape(x.as(String)) } || env.params.query["q"]?.try {|x| HTML.escape(x)} %>">
             </fieldset>
           </form>
         </div>
@@ -55,7 +55,7 @@
           </a>
         </div>
         <div class="pure-u-1-4">
-          <a href="/feed/subscriptions" class="pure-menu-heading">
+          <a title="<%= translate(locale, "Subscriptions") %>" href="/feed/subscriptions" class="pure-menu-heading">
             <% notification_count = env.get("user").as(User).notifications.size %>
             <% if notification_count > 0 %>
             <%= notification_count %> <i class="icon ion-ios-notifications"></i>
@@ -65,7 +65,7 @@
           </a>
         </div>
         <div class="pure-u-1-4">
-          <a href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
             <i class="icon ion-ios-cog"></i>
           </a>
         </div>
@@ -75,9 +75,25 @@
           </a>
         </div>
         <% else %>
+        <div class="pure-u-1-3">
+          <a href="/toggle_theme?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+            <% if env.get?("preferences").try &.as(Preferences).dark_mode %>
+            <i class="icon ion-ios-sunny"></i>
+            <% else %>
+            <i class="icon ion-ios-moon"></i>
+            <% end %>
+          </a>
+        </div>
+        <div class="pure-u-1-3">
+          <a title="<%= translate(locale, "Preferences") %>" href="/preferences?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
+            <i class="icon ion-ios-cog"></i>
+          </a>
+        </div>
+        <div class="pure-u-1-3">
           <a href="/login?referer=<%= env.get?("current_page") %>" class="pure-menu-heading">
             <%= translate(locale, "Login") %>
           </a>
+        </div>
         <% end %>
         </div>
       </div>

src/invidious/views/top.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
 <title><%= translate(locale, "Top") %> - Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g">
 <% top_videos.each_slice(4) do |slice| %>
         <% slice.each do |item| %>

src/invidious/views/trending.ecr

@@ -1,7 +1,10 @@
 <% content_for "header" do %>
+<meta name="description" content="<%= translate(locale, "An alternative front-end to YouTube") %>">
 <title><%= translate(locale, "Trending") %> - Invidious</title>
 <% end %>
 
+<%= rendered "components/feed_menu" %>
+
 <div class="pure-g h-box">
     <div class="pure-u-2-3">
         <form class="pure-form pure-form-aligned" action="/feed/trending" method="get">

src/invidious/views/watch.ecr

@@ -35,11 +35,11 @@
 <h1>
     <%= HTML.escape(video.title) %> 
     <% if params[:listen] %>
-    <a href="/watch?<%= env.params.query %>&listen=0">
+    <a title="<%=translate(locale, "Video mode")%>" href="/watch?<%= env.params.query %>&listen=0">
         <i class="icon ion-ios-videocam"></i>
     </a>
     <% else %>
-    <a href="/watch?<%= env.params.query %>&listen=1">
+    <a title="<%=translate(locale, "Audio mode")%>" href="/watch?<%= env.params.query %>&listen=1">
         <i class="icon ion-ios-volume-high"></i>
     </a>
     <% end %>
@@ -54,29 +54,29 @@
         <div class="h-box">
             <p><a href="https://www.youtube.com/watch?v=<%= video.id %>"><%= translate(locale, "Watch video on Youtube") %></a></p>
         
-            <form class="pure-form pure-form-stacked">
+            <form class="pure-form pure-form-stacked" action="/latest_version" method="get" rel="noopener" target="_blank">
                 <div class="pure-control-group">
                     <label for="download_widget"><%= translate(locale, "Download as: ") %></label>
                     <select style="width:100%" name="download_widget" id="download_widget">
                     <% video_streams.each do |option| %>
-                        <option data-url="/latest_version?id=<%= video.id %>&itag=<%= option["itag"] %>&local=true"><%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only</option>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= video.title.dump_unquoted %>-<%= video.id %>.mp4"}'>
+                            <%= option["quality_label"] %> - <%= option["type"].split(";")[0] %> @ <%= option["fps"] %>fps - video only
+                        </option>
                     <% end %>
                     <% audio_streams.each do |option| %>
-                        <option data-url="/latest_version?id=<%= video.id %>&itag=<%= option["itag"] %>&local=true"><%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only</option>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= video.title.dump_unquoted %>-<%= video.id %>.mp4"}'>
+                            <%= option["type"].split(";")[0] %> @ <%= option["bitrate"] %>k - audio only
+                        </option>
                     <% end %>
                     <% fmt_stream.each do |option| %>
-                        <option data-url="/latest_version?id=<%= video.id %>&itag=<%= option["itag"] %>&local=true"><%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %></option>
+                        <option value='{"id":"<%= video.id %>","itag":"<%= option["itag"] %>","title":"<%= video.title.dump_unquoted %>-<%= video.id %>.mp4"}'>
+                            <%= itag_to_metadata?(option["itag"]).try &.["height"]? || "~240" %>p - <%= option["type"].split(";")[0] %>
+                        </option>
                     <% end %>
                     </select>
                 </div>
 
-                <div id="progress-container" style="width:100%; display:none">
-                    <div id="download-progress">
-                    </div>
-                </div>
-
-                <button type="button" data-title="<%= video.title.dump_unquoted %>-<%= video.id %>.mp4" onclick="download_video(this)"
-                    class="pure-button pure-button-primary">
+                <button type="submit" class="pure-button pure-button-primary">
                     <b><%= translate(locale, "Download") %></b>
                 </button>
             </form>
@@ -460,7 +460,7 @@ function get_youtube_replies(target, load_more) {
         } else {
             body.innerHTML = ' \
                 <p><a href="javascript:void(0)" \
-                    onclick="hide_youtube_replies(this)"><%= translate(locale, "Hide replies") %> \
+                    onclick="hide_youtube_replies(this, \'<%= translate(locale, "Hide replies") %>\', \'<%= translate(locale, "Show replies") %>\')"><%= translate(locale, "Hide replies") %> \
                 </a></p> \
                 <div>{contentHtml}</div>'.supplant({
                 contentHtml: xhr.response.contentHtml,