Merge pull request #145 from ajayyy/experimental-ajay

Fixed info button + videoChannelID errors
Update version number
2025-12-11 14:07:13 +03:00 · 2019-09-02 21:33:36 -04:00 · 2019-09-02 21:33:14 -04:00 · 2019-09-02 10:54:49 -04:00 · 2019-09-01 22:41:52 -04:00 · 2019-09-01 22:40:18 -04:00
15 changed files with 1264 additions and 420 deletions
--- a/README.md
+++ b/README.md
@@ -1,16 +1,31 @@
-![Logo](icons/LogoSponsorBlocker256px.png)
-<br/><sub>Logo by [@munadikieh](https://github.com/munadikieh)</sub>
+<p align="center">
+  <img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img>
+  
+  <br/>
+  <sub>Logo by <a href="https://github.com/munadikieh">@munadikieh</a></sub>
+</p>
+
+<h1 align="center">SponsorBlock</h1>
+
+<p align="center">
+  <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone">Chrome/Chromium</a> |
+  <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github">Firefox</a> |
+  <a href="https://sponsor.ajay.app">Website</a> |
+  <a href="https://sponsor.ajay.app/stats">Stats</a>
+</p>
+
+<p align="center">
+    <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github"><img src="https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users" alt="Badge"></img></a>
+    <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users" alt="Badge"></img></a>
+    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Sponsors%20Submitted&query=totalSubmissions&suffix=%20sponsors&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkred" alt="Badge"></img></a>
+    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Contributing%20Users&query=userCount&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetTotalStats&color=darkblue" alt="Badge"></img></a>
+    <a href="https://sponsor.ajay.app/stats"><img src="https://img.shields.io/badge/dynamic/json?label=Time%20Saved%20From%20Skips&query=daysSaved&url=http%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgetDaysSavedFormatted&color=darkgreen&suffix=%20days" alt="Badge"></img></a>
+</p>
+

-# SponsorBlock

 SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.

-# Available for Chrome and Firefox
-
-Chrome: https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone
-
-Firefox: https://addons.mozilla.org/addon/sponsorblock/
-
 # Server

 The backend server code is available here: https://github.com/ajayyy/SponsorBlockServer
@@ -25,10 +40,6 @@ Hopefully this project can be combined with projects like [this](https://github.

 You can read the API docs [here](https://github.com/ajayyy/SponsorBlockServer#api-docs).

-# Previous extension
-
-This project is partially based off of [this experimental extension](https://github.com/OfficialNoob/YTSponsorSkip), which has the basic video skipping functionality.
-
 # Build Yourself

 You can load this project as an unpacked extension. Make sure to rename the `config.js.example` file to `config.js` before installing.
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -31,10 +31,10 @@
        "message": "Channel Whitelisted!"
    },
    "Sponsor": {
-        "message": "Sponsor"
+        "message": "sponsor"
    },
    "Sponsors": {
-        "message": "Sponsors"
+        "message": "sponsors"
    },
   "Segment": {
        "message": "sponsor segment"
@@ -123,5 +123,125 @@
    },
    "leftTimes": {
        "message": "You seem to have left some sponsor times unsubmitted. Go back to that page to submit them (they are not deleted)."
+    },
+    "clearTimes": {
+        "message": "Clear Sponsor Times"
+    },
+    "openPopup": {
+        "message": "Open SponsorBlock Popup"
+    },
+    "SubmitTimes": {
+        "message": "Submit Sponsor Times"
+    },
+    "submitCheck": {
+        "message": "Are you sure you want to submit this?"
+    },
+    "whitelistChannel": {
+         "message": "Whitelist Channel"
+    },
+    "removeFromWhitelist": {
+         "message": "Remove Channel From Whitelist"
+    },
+    "whitelistDescription": {
+         "message": "Whitelist the channels who do sponsorships ethically to encourage good behavior, or maybe if they are just entertaining and funny. Or don't, that's your call."
+    },
+    "voteOnTime": {
+         "message": "Vote On A Sponsor Time"
+    },
+    "recordTimes": {
+         "message": "Record the times of a sponsorship"
+    },
+    "soFarUHSubmited": {
+         "message": "So far, you've submitted"
+    },
+    "savedPeopleFrom": {
+         "message": "You have saved people from "
+    },
+    "viewLeaderboard": {
+         "message": "View the leaderboard"
+    },
+    "here": {
+        "message": "here"
+    },
+    "recordTimesDescription": {
+         "message": "Click the button below when the sponsorship starts and ends to record and\nsubmit it to the database."
+    },
+    "popupHint": {
+         "message": "Hint: Press the semicolon key while focused on a video report the start/end of a sponsor and quote to submit."
+    },
+    "lastTimes": {
+         "message": "Latest Sponsor Message Times Chosen"
+    },
+    "clearTimesButton": {
+        "message": "Clear Times"
+    },
+    "submitTimesButton": {
+        "message": "Submit Times"
+    },
+    "publicStats": {
+        "message": "This is used on the public stats page to show off how much you've contributed. See it"
+    },
+    "setUsername": {
+        "message": "Set Username"
+    },
+    "discordAdvert": {
+        "message": "Come join the official discord server to give suggestions and feedback!"
+    },
+    "hideThis": {
+        "message": "Hide this"
+    },
+    "Options": {
+        "message": "Options"
+    },
+    "showButtons": {
+        "message": "Hide Buttons On YouTube Player"
+    },
+    "hideButtons": {
+        "message": "Show Buttons On YouTube Player"
+    },
+    "hideButtonsDescription": {
+        "message": "This hides the buttons that appear on the YouTube player to submit sponsors. I can see this being annoying for some\n people. Instead of using the button there, this popup can be used to submit sponsors. To hide the notice that appears, \n use the button that appears on the notice saying \"Don't show this again\". You can always enable these settings again later."
+    },
+    "showInfoButton": {
+        "message": "Show Info Button On YouTube Player"
+    },
+    "hideInfoButton": {
+        "message": "Hide Info Button On YouTube Player"
+    },
+    "whatInfoButton": {
+        "message": "This is the button that opens up a popup in the YouTube page."
+    },
+    "hideDeleteButton": {
+        "message": "Hide Delete Button On YouTube Player"
+    },
+    "showDeleteButton": {
+        "message": "Show Delete Button On YouTube Player"
+    },
+    "whatDeleteButton": {
+        "message": "This is the button that allows you to clear all sponsors on the YouTube player."
+    },
+    "disableViewTracking": {
+        "message": "Disable Sponsor View Tracking"
+    },
+    "enableViewTracking": {
+        "message": "Enable Sponsor View Tracking"
+    },
+    "whatViewTracking": {
+        "message": "This feature tracks which sponsors you have skipped to let users know how much their submission has helped others and\nused as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message\nto the server each time you skip a sponsor. Hopefully most people don't change this setting so that the view numbers are accurate. :)"
+    },
+    "showNotice": {
+        "message": "Show Notice Again"
+    },
+    "longDescription": {
+        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that let's anyone submit the start and end time's of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Source Code",
+        "description": "Used on Firefox Store Page"
    }
 }
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -0,0 +1,129 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock pour YouTube - Enlève les messages commerciaux et publicités intégrées",
+        "description": "Name of the extension."
+    },
+
+    "Description": {
+        "message": "Passe automatiquement les messages commerciaux intégrés dans les vidéos YouTube. Soumettez les segments commerciaux dans les vidéos que vous regardez pour aidez les autres.",
+        "description": "Description of the extension."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Soumission invalide"
+    },
+    "429": {
+        "message": "Vous cherchez à envoyer beaucoup de segments, il y en a vraiment autant ?"
+    },
+    "409": {
+        "message": "Déja soumis"
+    },
+    "502": {
+        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
+    },
+    "channelWhitelisted": {
+        "message": "Cette chaine est sur la liste blanche !"
+    },
+    "Sponsor": {
+        "message": "message commercial"
+    },
+    "Sponsors": {
+        "message": "messages commerciaux"
+    },
+    "Segment": {
+        "message": "segment de message commercial"
+    },
+    "Segments": {
+        "message": "segments de message commercial"
+    },
+    "noticeTitle": {
+        "message": "Message passé"
+    },
+    "reportButtonTitle": {
+        "message": "Incorrect"
+    },
+    "reportButtonInfo": {
+        "message": "Signaler que ce segment est incorrect ou n'existe pas."
+    },
+    "Dismiss": {
+        "message": "Fermer"
+    },
+    "Loading": {
+        "message": "Chargement en cours..."
+    },
+    "Mins": {
+        "message": "Minutes"
+    },
+    "Secs": {
+        "message": "Secondes"
+    },
+    "Hide": {
+        "message": "Ne plus montrer"
+    },
+    "hitGoBack": {
+        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment"
+    },
+    "unskip": {
+        "message": "Revenir en arrière"
+    },
+    "reskip": {
+        "message": "Sauter"
+    },
+    "paused": {
+        "message": "En pause"
+    },
+    "confirmMSG": {
+        "message": "\n\nPour modifier ou enlever des soumissions, cliquez sur le bouton d'info."
+    },
+    "clearThis": {
+        "message": "Êtes-vous certain(e) que vous voulez enlever vos soumissions ?\n\n"
+    },
+    "Unknown": {
+        "message": "Erreur, essayer plus tard."
+    },
+    "sponsorFound": {
+        "message": "Les messages commerciaux sont déjà dans notre base de donnée pour cette vidéo !"
+    },
+    "sponsor404": {
+        "message": "Pas de messages trouvés"
+    },
+    "sponsorStart": {
+        "message": "Début du message"
+    },
+    "sponsorEnd": {
+        "message": "Fin du message"
+    },
+    "noVideoID": {
+        "message": "Ceci n'est pas un onglet YouTube, ou vous avez cliqué trop tôt. \n Si vous êtes sur(e) que c'est un onglet YouTube, fermez ce menu et réessayer."
+    },
+    "success": {
+        "message": "Succès !"
+    },
+    "voted": {
+        "message": "A voté !"
+    },
+    "voteFail": {
+        "message": "Vous avez déjà voté pour ce choix auparavant."
+    },
+    "serverDown": {
+        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
+    },
+    "connectionError": {
+        "message": "Erreur de connexion, Code : "
+    },
+    "wantToSubmit": {
+        "message": "Voulez-vous soumettre les messages pour cette vidéo"
+    },
+    "leftTimes": {
+        "message": "Vous avez laissé des messages non soumis. Retournez sur la vidéo pour les soumettre (ils ont été conservés)."
+    },
+    "submitCheck": {
+        "message": "Soumettre ce(s) message(s) ?"
+    }
+}
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -0,0 +1,247 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock per YouTube - Salta gli sponsor",
+        "description": "Name of the extension."
+    },
+
+    "Description": {
+        "message": "Salta i contenuti sponsorizzati nei video di YouTube. Segnala gli annunci incorporati nei video che guardi per far risparmiare tempo agli altri.",
+        "description": "Description of the extension."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Richiesta non valida"
+    },
+    "429": {
+        "message": "Stai inviando troppi spezzoni per questo video, sei sicuro che ce ne siano così tanti?"
+    },
+    "409": {
+        "message": "Questo spezzone è già stato inviato"
+    },
+    "502": {
+        "message": "Sembra che il server non funzioni. Contatta lo sviluppatore."
+    },
+    "channelWhitelisted": {
+        "message": "Canale aggiunto alla whitelist!"
+    },
+    "Sponsor": {
+        "message": "sponsorizzazione"
+    },
+    "Sponsors": {
+        "message": "sponsorizzazioni"
+    },
+   "Segment": {
+        "message": "spezzone sponsorizzato"
+    },
+    "Segments": {
+        "message": "spezzoni sponsorizzati"
+    },
+    "noticeTitle": {
+        "message": "Sponsorizzazione Saltata"
+    },
+    "reportButtonTitle": {
+        "message": "Segnala"
+    },
+    "reportButtonInfo": {
+        "message": "Segnala questo spezzone come non corretto."
+    },
+    "Dismiss": {
+        "message": "Chiudi"
+    },
+    "Loading": {
+        "message": "Caricamento..."
+    },
+    "Mins": {
+        "message": "Minuti"
+    },
+    "Secs": {
+        "message": "Secondi"
+    },
+    "Hide": {
+        "message": "Non mostrare più"
+    },
+    "hitGoBack": {
+        "message": "Premi non saltare per tornare da dove sei venuto."
+    },
+    "unskip": {
+        "message": "Non saltare"
+    },
+    "reskip": {
+        "message": "Salta ancora"
+    },
+    "paused": {
+        "message": "In pausa"
+    },
+    "confirmMSG": {
+        "message": "\n\nPer modificare o eliminare valori specifici, premi il pulsante delle informazioni o apri il popup cliccando l'icona dell'estensione nell'angolo in alto a destra."
+    },
+    "clearThis": {
+        "message": "Sei sicuro di volerlo cancellare?\n\n"
+    },
+    "Unknown": {
+        "message": "Si è verificato un errore durante l'invio dello spezzone sponsorizzato, per favore riprova più tardi."
+    },
+  
+    "sponsorFound": {
+        "message": "I contenuti sponsorizzati di questo video sono nel database!"
+    },
+    "sponsor404": {
+        "message": "Nessuna sponsorizzazione trovata"
+    },
+    "sponsorStart": {
+        "message": "La sponsorizzazione inizia adesso"
+    },
+    "sponsorEnd": {
+        "message": "La sponsorizzazione finisce adesso"
+    },
+    "noVideoID": {
+        "message": "Probabilmente questa non è una scheda di YouTube, oppure hai cliccato troppo presto. \nSe sei sicuro di essere in una scheda di YouTube,\n riapri questo popup."
+    },
+    "success": {
+        "message": "Successo!"
+    },
+    "voted": {
+        "message": "Votato!"
+    },
+    "voteFail": {
+        "message": "Hai già votato."
+    },
+    "serverDown": {
+        "message": "Sembra che il server non funzioni. Contatta subito lo sviluppatore."
+    },
+    "connectionError": {
+        "message": "Si è verificato un errore durante la connessione. Codice errore: "
+    },
+    "wantToSubmit": {
+        "message": "Vuoi inviare gli spezzoni sponsorizzati per il video con id"
+    },
+    "leftTimes": {
+        "message": "Sembra che tu non abbia inviato alcuni spezzoni sponsorizzati. Ritorna alla pagina precedente per inviarli (non sono stati eliminati)."
+    },
+    "clearTimes": {
+        "message": "Cancella gli Spezzoni Sponsorizzati"
+    },
+    "openPopup": {
+        "message": "Apri il Popup di SponsorBlock"
+    },
+    "SubmitTimes": {
+        "message": "Invia gli Spezzoni Sponsorizzati"
+    },
+    "submitCheck": {
+        "message": "Sei sicuro di volerlo inviare?"
+    },
+    "whitelistChannel": {
+         "message": "Aggiungi Canale alla Whitelist"
+    },
+    "removeFromWhitelist": {
+         "message": "Rimuovi Canale dalla Whitelist"
+    },
+    "whitelistDescription": {
+         "message": "Aggiungi alla whitelist i canali che sponsorizzano eticamente per incoraggiare ad un comportamento corretto, oppure se sono semplicemente intrattenenti e divertenti. Oppure non farlo, decidi tu."
+    },
+    "voteOnTime": {
+         "message": "Vota uno Spezzone Sponsorizzato"
+    },
+    "recordTimes": {
+         "message": "Registra uno Spezzone Sponsorizzato"
+    },
+    "soFarUHSubmited": {
+         "message": "Fino ad ora hai inviato"
+    },
+    "savedPeopleFrom": {
+         "message": "Hai salvato le persone da "
+    },
+    "viewLeaderboard": {
+         "message": "Guarda la classifica"
+    },
+    "here": {
+        "message": "qui"
+    },
+    "recordTimesDescription": {
+         "message": "Premi il pulsante qui sotto quando inizia e finisce la sponsorizzazione per registrarla e\ninviarla al database."
+    },
+    "popupHint": {
+         "message": "Suggerimento: Premi il tasto punto e virgola mentre il video è attivo per segnalare l'inizio/fine di una sponsorizzazione e virgolette per inviare."
+    },
+    "lastTimes": {
+         "message": "Ultimi minutaggi sponsorizzati scelti"
+    },
+    "clearTimesButton": {
+        "message": "Cancella Minutaggi"
+    },
+    "submitTimesButton": {
+        "message": "Invia Minutaggi"
+    },
+    "publicStats": {
+        "message": "Viene utilizzato nelle pagine delle statistiche pubbliche che mostrano quanto hai contribuito. Vedi"
+    },
+    "setUsername": {
+        "message": "Imposta Username"
+    },
+    "discordAdvert": {
+        "message": "Entra nel server Discord ufficiale per darci suggerimenti e feedback!"
+    },
+    "hideThis": {
+        "message": "Nascondi"
+    },
+    "Options": {
+        "message": "Opzioni"
+    },
+    "showButtons": {
+        "message": "Nascondi i Pulsanti nel Lettore di YouTube"
+    },
+    "hideButtons": {
+        "message": "Mostra i Pulsanti nel Lettore di YouTube"
+    },
+    "hideButtonsDescription": {
+		"message": "Nasconde i pulsanti che appaiono nel lettore di YouTube per inviare spezzoni sponsorizzati. Capisco che può essere fastidioso per alcune\n persone. Invece di utilizzare quei pulsanti, è possibile utilizzare questo popup per inviare gli spezzoni sponsorizzati. Per nascondere l'avviso che appare, \nusa il bottone \"Non mostrare più\" nell'avviso. Potrai sempre abilitare nuovamente queste impostazioni in futuro."
+    },
+    "showInfoButton": {
+        "message": "Mostra il Pulsante Informazioni nel Lettore di YouTube"
+    },
+    "hideInfoButton": {
+        "message": "Nascondi il Pulsante Informazioni nel Lettore di YouTube"
+    },
+    "whatInfoButton": {
+        "message": "Questo è il pulsante che apre un popup nella pagina YouTube."
+    },
+    "hideDeleteButton": {
+        "message": "Nascondi il Pulsante Elimina nel Lettore di YouTube"
+    },
+    "showDeleteButton": {
+        "message": "Mostra il Pulsante Elimina nel Lettore di YouTube"
+    },
+    "whatDeleteButton": {
+        "message": "Questo è il pulsante che ti permette di cancellare tutti gli spezzoni sponsorizzati nel lettore di YouTube."
+    },
+    "disableViewTracking": {
+        "message": "Disattiva il Monitoraggio delle Sponsorizzazioni"
+    },
+    "enableViewTracking": {
+        "message": "Disattiva il Monitoraggio delle Sponsorizzazioni"
+    },
+    "whatViewTracking": {
+        "message": "Questa funzione tiene traccia di quali sponsorizzazioni hai saltato per far sapere agli utenti quanto è stato d'aiuto agli altri il loro contributo e\nviene utilizzato come metrica assieme ai voti positivi per filtrare lo spam dal database. L'estensione invia un messaggio\nal server ogni volta che salti una sponsorizzazione. Si spera che la maggior parte delle persone non modifichi questa impostazione così i numeri sono accurati. :)"
+    },
+    "showNotice": {
+        "message": "Mostra di Nuovo l'Avviso"
+    },
+    "longDescription": {
+        "message": "SponsorBlock è un'estensione che salta gli spezzoni con contenuti sponsorizzati nei video di YouTube. SponsorBlock è un'estensione crowdsourced per i browser che permette a chiunque di inviare i minutaggi degli spezzoni sponsorizzati nei video di YouTube. Quando una persona avrà inviato questa informazione, tutti gli utenti che utilizzano questa estensione potranno saltare lo spezzone sponsorizzato.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Sito Web",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Codice Sorgente",
+        "description": "Used on Firefox Store Page"
+    }
+}
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -0,0 +1,127 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Nome da extensão."
+    },
+    "fullName": {
+        "message": "SponsorBlock para YouTube - Pule patrocínios",
+        "description": "Nome da extensão."
+    },
+
+    "Description": {
+        "message": "Pule patrocinadores em vídeos do YouTube. Reporte patrocinadores em videos que você assiste para salvar o tempo dos outros.",
+        "description": "Descrição da extensão."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "O servidor disse que esse pedido foi inválido"
+    },
+    "429": {
+        "message": "Você enviou muitos segmentos para esse vídeo, tem certeza que tem tantos assim?"
+    },
+    "409": {
+        "message": "Isso já foi enviado antes"
+    },
+    "502": {
+        "message": "Parece que o servidor caiu. Contate o desenvolvedor para informá-los."
+    },
+    "channelWhitelisted": {
+        "message": "Canal adicionado a lista branca!"
+    },
+    "Sponsor": {
+        "message": "patrocinador"
+    },
+    "Sponsors": {
+        "message": "patrocinadores"
+    },
+   "Segment": {
+        "message": "segmento de patrocinador"
+    },
+    "Segments": {
+        "message": "segmento de patrocinadores"
+    },
+    "noticeTitle": {
+        "message": "Patrocinador pulado"
+    },
+    "reportButtonTitle": {
+        "message": "Reportar"
+    },
+    "reportButtonInfo": {
+        "message": "Reportar essa subimissão como inválida."
+    },
+    "Dismiss": {
+        "message": "Ignorar"
+    },
+    "Loading": {
+        "message": "Carregando..."
+    },
+    "Mins": {
+        "message": "Minutos"
+    },
+    "Secs": {
+        "message": "Segundos"
+    },
+    "Hide": {
+        "message": "Nunca mostrar"
+    },
+    "hitGoBack": {
+        "message": "Aperta reverter pulo para voltar onde estava"
+    },
+    "unskip": {
+        "message": "Reverter pulo"
+    },
+    "reskip": {
+        "message": "Pular novamente"
+    },
+    "paused": {
+        "message": "Pausado"
+    },
+    "confirmMSG": {
+        "message": "\n\nPara editar ou remover linhas individuais, clique com o botão direito ou abra o popup da extensão pelo icone no canto superior direito."
+    },
+    "clearThis": {
+        "message": "Tem certeza que quer limpar isso?\n\n"
+    },
+    "Unknown": {
+        "message": "Teve um erro ao enviar seus segmentos, tente novamente depois"
+    },
+  
+    "sponsorFound": {
+        "message": "Os patrocinadores desse vídeo estão no banco de dados!"
+    },
+    "sponsor404": {
+        "message": "Nenhum patrocinador encontrado"
+    },
+    "sponsorStart": {
+        "message": "Patrocínio começa agora"
+    },
+    "sponsorEnd": {
+        "message": "Patrocínio termina agora"
+    },
+    "noVideoID": {
+        "message": "Isso provavelmente não é uma tab do YouTube, ou você clicou muito cedo. \n Se sabe que é uma tab do YouTube,\n fecha esse popup e abre de novo."
+    },
+    "success": {
+        "message": "Sucesso!"
+    },
+    "voted": {
+        "message": "Votado!"
+    },
+    "voteFail": {
+        "message": "Você já votou antes."
+    },
+    "serverDown": {
+        "message": "Parece que o servidor caiu. Contate o desenvolvedor o quanto antes."
+    },
+    "connectionError": {
+        "message": "Um erro de conexão aconteceu: Código: "
+    },
+    "wantToSubmit": {
+        "message": "Quer enviar os segmentos para o vídeo de ID"
+    },
+    "leftTimes": {
+        "message": "Parece que você esqueceu de enviar alguns segmentos. Volta pra página para enviar eles (não foram deletados)."
+    }
+}
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -0,0 +1,130 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Название расширения, не переводится."
+    },
+    "fullName": {
+        "message": "SponsorBlock для YouTube - Пропускайте спонсорские вставки",
+        "description": "Название расширения."
+    },
+
+    "Description": {
+        "message": "Пропускайте спонсорские вставки в видео на YouTube. Сообщайте о спонсорских вставках в видео, которые Вы смотрите, чтобы сэкономить время других пользователей.",
+        "description": "Описание раширения."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Сервер отклонил этот запрос."
+    },
+    "429": {
+        "message": "Вы отправили слишком много спонсоров для этого видео. Вы уверены, что их так много?"
+    },
+    "409": {
+        "message": "Этот запрос был отправлен ранее."
+    },
+    "502": {
+        "message": "Сервер недоступен. Свяжитесь с разработчиком и сообщите ему об этом."
+    },
+    "channelWhitelisted": {
+        "message": "Канал добавлен в белый список!"
+    },
+    "Sponsor": {
+        "message": "Спонсор"
+    },
+    "Sponsors": {
+        "message": "Спонсоры"
+    },
+   "Segment": {
+        "message": "спонсорская вставка"
+    },
+    "Segments": {
+        "message": "спонсорские вставки"
+    },
+    "noticeTitle": {
+        "message": "Спонсор пропущен"
+    },
+    "reportButtonTitle": {
+        "message": "Ошибка"
+    },
+    "reportButtonInfo": {
+        "message": "Сообщить, что информация об этом спонсорском сегменте ошибочна."
+    },
+    "Dismiss": {
+        "message": "Закрыть"
+    },
+    "Loading": {
+        "message": "Загрузка..."
+    },
+    "Mins": {
+        "message": "мин"
+    },
+    "Secs": {
+        "message": "сек"
+    },
+    "Hide": {
+        "message": "Не показывать"
+    },
+    "hitGoBack": {
+        "message": "Нажмите «Назад», чтобы вернуться обратно."
+    },
+    "unskip": {
+        "message": "Назад"
+    },
+    "reskip": {
+        "message": "Пропустить"
+    },
+    "paused": {
+        "message": "Пауза"
+    },
+    "confirmMSG": {
+        "message": "\n\nЧтобы изменить или удалить отдельные значения, нажмите кнопку «Информация» или откройте всплывающее окно расширения, щелкнув значок расширения в правом верхнем углу."
+    },
+    "clearThis": {
+        "message": "Вы уверены, что хотите удалить эту информацию?\n\n"
+    },
+    "Unknown": {
+        "message": "При отправке отчета о спонсорском сегменте произошла ошибка. Попытайтесь отправить его позже."
+    },
+  
+    "sponsorFound": {
+        "message": "Спонсоры этого видео уже находятся в базе данных!"
+    },
+    "sponsor404": {
+        "message": "Спонсорские вставки не найдены"
+    },
+    "sponsorStart": {
+        "message": "Спонсорская вставка начинается сейчас"
+    },
+    "sponsorEnd": {
+        "message": "Спонсорская вставка оканчивается сейчас"
+    },
+    "noVideoID": {
+        "message": "Возможно, это не вкладка YouTube, или Вы нажали слишком рано. \n Если это вкладка YouTube,\n закройте это всплывающее окно и откройте его снова."
+    },
+    "success": {
+        "message": "Успех!"
+    },
+    "voted": {
+        "message": "Голос засчитан!"
+    },
+    "voteFail": {
+        "message": "Вы уже проголосовали таким образом раньше."
+    },
+    "serverDown": {
+        "message": "Кажется, сервер не работает. Свяжитесь с разработчиком."
+    },
+    "connectionError": {
+        "message": "Ошибка соединения. Код ошибки: "
+    },
+    "wantToSubmit": {
+        "message": "Вы точно хотите отправить отчёт о спонсорских вставках в видео с идентификатором"
+    },
+    "leftTimes": {
+        "message": "Вы ещё не отправили отчёты о некоторых спонсорских вставках. Хотите вернуться на эту страницу, чтобы отправить их (они не удаляются)."
+    },
+    "submitCheck": {
+        "message": "Вы уверены, что хотите отправить эту информацию?"
+    }
+}
--- a/background.js
+++ b/background.js
@@ -1,40 +1,40 @@
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
 	chrome.tabs.sendMessage(tabId, {
-    message: 'update',
+        message: 'update',
 	});
 });

 chrome.runtime.onMessage.addListener(function (request, sender, callback) {
 	switch(request.message) {
    case "submitTimes":
-			submitTimes(request.videoID, callback);
-        
-			//this allows the callback to be called later by the submitTimes function
-			return true; 
+        submitTimes(request.videoID, callback);
+    
+        //this allows the callback to be called later by the submitTimes function
+        return true; 
    case "addSponsorTime":
-			addSponsorTime(request.time, request.videoID, callback);
-        
-			//this allows the callback to be called later
-			return true; 
+        addSponsorTime(request.time, request.videoID, callback);
+    
+        //this allows the callback to be called later
+        return true; 
    case "getSponsorTimes":
-			getSponsorTimes(request.videoID, function(sponsorTimes) {
-        callback({
-					sponsorTimes: sponsorTimes
-        })
-			});
-        
-			//this allows the callback to be called later
-			return true;
+        getSponsorTimes(request.videoID, function(sponsorTimes) {
+            callback({
+                        sponsorTimes: sponsorTimes
+            })
+        });
+    
+        //this allows the callback to be called later
+        return true;
    case "submitVote":
-			submitVote(request.type, request.UUID, callback);
-        
-			//this allows the callback to be called later
-			return true;
+        submitVote(request.type, request.UUID, callback);
+    
+        //this allows the callback to be called later
+        return true;
    case "alertPrevious":
 			chrome.notifications.create("stillThere" + Math.random(), {
        type: "basic",
-        title: "Do you want to submit the sponsor times for video id " + request.previousVideoID + "?",
-        message: "You seem to have left some sponsor times unsubmitted. Go back to that page to submit them (they are not deleted).",
+        title: chrome.i18n.getMessage("wantToSubmit") + request.previousVideoID + "?",
+        message: chrome.i18n.getMessage("leftTimes"),
        iconUrl: "./icons/LogoSponsorBlocker256px.png"
 			});
 	}
@@ -56,7 +56,6 @@ chrome.runtime.onInstalled.addListener(function (object) {
            // TODO (shownInstallPage): remove this if statement, but leave contents
            if (!shownInstallPage){
                //open up the install page
-                
                chrome.tabs.create({url: chrome.extension.getURL("/help/"+chrome.i18n.getMessage("helpPage"))});
            }

@@ -67,13 +66,10 @@ chrome.runtime.onInstalled.addListener(function (object) {
            }

            //generate a userID
-            const newUserID = generateUUID();
+            const newUserID = generateUserID();
            //save this UUID
            chrome.storage.sync.set({
-                "userID": newUserID,
-                //the last video id loaded, to make sure it is a video id change
-                "sponsorVideoID": null,
-                "previousVideoID": null
+                "userID": newUserID
            });
        }
    });
@@ -117,6 +113,14 @@ function submitVote(type, UUID, callback) {
    chrome.storage.sync.get(["userID"], function(result) {
        let userID = result.userID;

+        if (userID == undefined || userID === "undefined") {
+            //generate one
+            userID = generateUserID();
+            chrome.storage.sync.set({
+                "userID": userID
+            });
+        }
+
        //publish this vote
        sendRequestToServer("GET", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
            if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
@@ -143,11 +147,29 @@ function submitVote(type, UUID, callback) {
 function submitTimes(videoID, callback) {
    //get the video times from storage
    let sponsorTimeKey = 'sponsorTimes' + videoID;
-    chrome.storage.sync.get([sponsorTimeKey, "userID"], function(result) {
+    chrome.storage.sync.get([sponsorTimeKey, "userID"], async function(result) {
        let sponsorTimes = result[sponsorTimeKey];
        let userID = result.userID;

        if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+            let durationResult = await new Promise((resolve, reject) => {
+                chrome.tabs.query({
+                    active: true,
+                    currentWindow: true
+                }, function(tabs) {
+                    chrome.tabs.sendMessage(tabs[0].id, {
+                        message: "getVideoDuration"
+                    }, (response) => resolve(response));
+                });
+            });
+
+            //check if a sponsor exceeds the duration of the video
+            for (let i = 0; i < sponsorTimes.length; i++) {
+                if (sponsorTimes[i][1] > durationResult.duration) {
+                    sponsorTimes[i][1] = durationResult.duration;
+                }
+            }
+
            //submit these times
            for (let i = 0; i < sponsorTimes.length; i++) {
                    //submit the sponsorTime
@@ -201,10 +223,9 @@ function sendRequestToServer(type, address, callback) {
    xmlhttp.send();
 }

-function generateUUID(length = 36) {
+function generateUserID(length = 36) {
        let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
        let result = "";
-        let isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
        if (window.crypto && window.crypto.getRandomValues) {
                values = new Uint32Array(length);
                window.crypto.getRandomValues(values);
--- a/content.css
+++ b/content.css
@@ -71,7 +71,7 @@
 }

 .sponsorSkipNotice {
-    min-width: 280px;
+    min-width: 300px;
    background-color: rgba(28, 28, 28, 0.9);
    position: absolute;
 	right: 5px;
--- a/content.js
+++ b/content.js
@@ -10,9 +10,6 @@ var sponsorVideoID = null;
 //these are sponsors that have been downvoted
 var hiddenSponsorTimes = [];

-//the time this video is starting at when first played, if not zero
-var youtubeVideoStartTime = null;
-
 //the video
 var v;

@@ -27,15 +24,20 @@ var durationListenerSetUp = false;
 //the channel this video is about
 var channelURL;

+//the title of the last video loaded. Used to make sure the channel URL has been updated yet.
+var title;
+
 //is this channel whitelised from getting sponsors skipped
 var channelWhitelisted = false;

 // create preview bar
-var previewBar;
+var previewBar = null;

-if (id = getYouTubeVideoID(document.URL)) { // Direct Links
-    videoIDChange(id);
-}
+//the player controls on the YouTube player
+var controls = null;
+
+// Direct Links
+videoIDChange(getYouTubeVideoID(document.URL));

 //the last time looked at (used to see if this time is in the interval)
 var lastTime = -1;
@@ -91,113 +93,120 @@ chrome.runtime.onMessage.addListener(messageListener);
  
 function messageListener(request, sender, sendResponse) {
        //messages from popup script
-  
-        if (request.message == "update") {
-            if(id = getYouTubeVideoID(document.URL)){
-                videoIDChange(id);
-            } else {
-                resetValues();
-            }
-        }
-  
-        if (request.message == "sponsorStart") {
-            sponsorMessageStarted(sendResponse);
-        }
+        switch(request.message){
+            case "update":
+                videoIDChange(getYouTubeVideoID(document.URL));

-        if (request.message == "sponsorDataChanged") {
-            updateSponsorTimesSubmitting();
-        }
+                break;
+            case "sponsorStart":
+                sponsorMessageStarted(sendResponse);

-        if (request.message == "isInfoFound") {
-            //send the sponsor times along with if it's found
-            sendResponse({
-                found: sponsorDataFound,
-                sponsorTimes: sponsorTimes,
-                hiddenSponsorTimes: hiddenSponsorTimes,
-                UUIDs: UUIDs
-            });
+                break;
+            case "sponsorDataChanged":
+                updateSponsorTimesSubmitting();

-            if (popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
-                //the popup should be closed now that another is opening
-                closeInfoMenu();
-            }
+                break;
+            case "isInfoFound":
+                //send the sponsor times along with if it's found
+                sendResponse({
+                    found: sponsorDataFound,
+                    sponsorTimes: sponsorTimes,
+                    hiddenSponsorTimes: hiddenSponsorTimes,
+                    UUIDs: UUIDs
+                });

-            popupInitialised = true;
-        }
+                if (popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
+                    //the popup should be closed now that another is opening
+                    closeInfoMenu();
+                }

-        if (request.message == "getVideoID") {
-            sendResponse({
-                videoID: getYouTubeVideoID(document.URL)
-            })
-        }
+                popupInitialised = true;
+                break;
+            case "getVideoID":
+                sendResponse({
+                    videoID: sponsorVideoID
+                });

-        if (request.message == "skipToTime") {
-            v.currentTime = request.time;
-        }
+                break;
+            case "getVideoDuration":
+                sendResponse({
+                duration: v.duration
+                });

-        if (request.message == "getCurrentTime") {
-            sendResponse({
-                currentTime: v.currentTime
-            });
-        }
+                break;
+            case "skipToTime":
+                v.currentTime = request.time;
+                return
+            case "getCurrentTime":
+                sendResponse({
+                    currentTime: v.currentTime
+                });

-        if (request.message == "getChannelURL") {
-            sendResponse({
+                break;
+            case "getChannelURL":
+                sendResponse({
                channelURL: channelURL
-            })
-        }
+                });

-        if (request.message == "isChannelWhitelisted") {
-            sendResponse({
-                value: channelWhitelisted
-            })
-        }
+                break;
+            case "isChannelWhitelisted":
+                sendResponse({
+                    value: channelWhitelisted
+                });

-        if (request.message == "whitelistChange") {
-            channelWhitelisted = request.value;
-            sponsorsLookup(getYouTubeVideoID(document.URL));
-        }
+                break;
+            case "whitelistChange":
+                channelWhitelisted = request.value;
+                sponsorsLookup(sponsorVideoID);

-        if (request.message == "showNoticeAgain") {
-            dontShowNotice = false;
-        }
+                break;
+            case "dontShowNotice":
+                dontShowNotice = false;

-        if (request.message == "changeStartSponsorButton") {
-            changeStartSponsorButton(request.showStartSponsor, request.uploadButtonVisible);
-        }
+                break;
+            case "changeStartSponsorButton":
+                changeStartSponsorButton(request.showStartSponsor, request.uploadButtonVisible);

-        if (request.message == "changeVideoPlayerControlsVisibility") {
-            hideVideoPlayerControls = request.value;
+                break;
+            case "showNoticeAgain":
+                dontShowNotice = false;
+                
+                break;
+            case "changeVideoPlayerControlsVisibility":
+                hideVideoPlayerControls = request.value;
+                updateVisibilityOfPlayerControlsButton();

-            updateVisibilityOfPlayerControlsButton();
-        } else if (request.message == "changeInfoButtonPlayerControlsVisibility") {
-            hideInfoButtonPlayerControls = request.value;
+                break;
+            case "changeInfoButtonPlayerControlsVisibility":
+                hideInfoButtonPlayerControls = request.value;
+                updateVisibilityOfPlayerControlsButton();

-            updateVisibilityOfPlayerControlsButton();
-        } else if (request.message == "changeDeleteButtonPlayerControlsVisibility") {
-            hideDeleteButtonPlayerControls = request.value;
+                break;
+            case "changeDeleteButtonPlayerControlsVisibility":
+                hideDeleteButtonPlayerControls = request.value;
+                updateVisibilityOfPlayerControlsButton();

-            updateVisibilityOfPlayerControlsButton();
-        }
+                break;
+            case "trackViewCount":
+                trackViewCount = request.value;

-        if (request.message == "trackViewCount") {
-            trackViewCount = request.value;
+                break;
        }
 }

 //check for hotkey pressed
 document.onkeydown = function(e){
    e = e || window.event;
-    var key = e.which || e.keyCode;
+    var key = e.key;

    let video = document.getElementById("movie_player");

    //is the video in focus, otherwise they could be typing a comment
    if (document.activeElement === video) {
-        if(key == 186){
+        if(key == ';'){
            //semicolon
            startSponsorClicked();
-        } else if (key == 222) {
+        } else if (key == "'") {
            //single quote
            submitSponsorTimes();
        }
@@ -211,24 +220,39 @@ function resetValues() {
    //reset sponsor times
    sponsorTimes = null;
    UUIDs = null;
-    sponsorVideoID = id;
    sponsorLookupRetries = 0;

    //empty the preview bar
-    previewBar.set([], [], 0);
+    if (previewBar !== null) {
+        previewBar.set([], [], 0);
+    }

    //reset sponsor data found check
    sponsorDataFound = false;
 }

 function videoIDChange(id) {
-    //not a url change
-    if (sponsorVideoID == id) return;
+    //if the id has not changed return
+    if (sponsorVideoID === id) return;

+    //set the global videoID
+    sponsorVideoID = id;
+
+    resetValues();
+    
+	//id is not valid
+    if (!id) return;
+
+    let channelIDPromise = wait(getChannelID);
+    channelIDPromise.then(() => channelIDPromise.isFulfilled = true).catch(() => channelIDPromise.isRejected  = true);
+
+    //setup the preview bar
    if (previewBar == null) {
        //create it
-        let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
-        previewBar = new PreviewBar(progressBar);
+        wait(getControls).then(result => {
+            let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
+            previewBar = new PreviewBar(progressBar);
+        });
    }

    //warn them if they had unsubmitted times
@@ -256,41 +280,40 @@ function videoIDChange(id) {
  
    //close popup
    closeInfoMenu();
-
-    resetValues();
-
-    //see if there is a video start time
-    youtubeVideoStartTime = getYouTubeVideoStartTime(document.URL);
-
-    sponsorsLookup(id);
+	
+    sponsorsLookup(id, channelIDPromise);

    //make sure everything is properly added
-    updateVisibilityOfPlayerControlsButton(true);
+    updateVisibilityOfPlayerControlsButton();

    //reset sponsor times submitting
    sponsorTimesSubmitting = [];

    //see if the onvideo control image needs to be changed
-    chrome.runtime.sendMessage({
-        message: "getSponsorTimes",
-        videoID: id
-    }, function(response) {
-        if (response != undefined) {
-            let sponsorTimes = response.sponsorTimes;
-            if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length >= 2) {
-                changeStartSponsorButton(true, true);
-            } else if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) {
-                changeStartSponsorButton(false, true);
-            } else {
-                changeStartSponsorButton(true, false);
-            }
-
-            //see if this data should be saved in the sponsorTimesSubmitting variable
-            if (sponsorTimes != undefined && sponsorTimes.length > 0) {
-                sponsorTimesSubmitting = sponsorTimes;
-            }
-        }
-    });
+	wait(getControls).then(result => {
+		chrome.runtime.sendMessage({
+			message: "getSponsorTimes",
+			videoID: id
+		}, function(response) {
+			if (response != undefined) {
+				let sponsorTimes = response.sponsorTimes;
+				if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length >= 2) {
+					changeStartSponsorButton(true, true);
+				} else if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) {
+                    changeStartSponsorButton(false, true);
+				} else {
+					changeStartSponsorButton(true, false);
+                }
+                
+				//see if this data should be saved in the sponsorTimesSubmitting variable
+				if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+					sponsorTimesSubmitting = sponsorTimes;
+          
+                    updatePreviewBar();
+				}
+			}
+		});
+	});

    //see if video controls buttons should be added
    chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
@@ -317,7 +340,7 @@ function videoIDChange(id) {
  
 }

-function sponsorsLookup(id) {
+function sponsorsLookup(id, channelIDPromise) {
    v = document.querySelector('video') // Youtube video player
    //there is no video here
    if (v == null) {
@@ -331,8 +354,10 @@ function sponsorsLookup(id) {
        //wait until it is loaded
        v.addEventListener('durationchange', updatePreviewBar);
    }
-  
+
    //check database for sponsor times
+    //made true once a setTimeout has been created to try again after a server error
+    let recheckStarted = false;
    sendRequestToServer('GET', "/api/getVideoSponsorTimes?videoID=" + id, function(xmlhttp) {
        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
            sponsorDataFound = true;
@@ -348,7 +373,17 @@ function sponsorsLookup(id) {
                updatePreviewBar();
            }

-            getChannelID();
+            if (channelIDPromise != null) {
+                if (channelIDPromise.isFulfilled) {
+                    whitelistCheck();
+                } else if (channelIDPromise.isRejected) {
+                    //try again
+                    wait(getChannelID).then(whitelistCheck).catch();
+                } else {
+                    //add it as a then statement
+                    channelIDPromise.then(whitelistCheck);
+                }
+            }

            sponsorLookupRetries = 0;
        } else if (xmlhttp.readyState == 4 && xmlhttp.status == 404) {
@@ -356,7 +391,7 @@ function sponsorsLookup(id) {

            //check if this video was uploaded recently
            //use the invidious api to get the time published
-            sendRequestToCustomServer('GET', "https://invidio.us/api/v1/videos/" + id, function(xmlhttp, error) {
+            sendRequestToCustomServer('GET', "https://invidio.us/api/v1/videos/" + id + '?fields=published', function(xmlhttp, error) {
                if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
                    let unixTimePublished = JSON.parse(xmlhttp.responseText).published;

@@ -368,7 +403,9 @@ function sponsorsLookup(id) {
            });

            sponsorLookupRetries = 0;
-        } else if (xmlhttp.readyState == 4 && sponsorLookupRetries < 90) {
+        } else if (xmlhttp.readyState == 4 && sponsorLookupRetries < 90 && !recheckStarted) {
+            recheckStarted = true;
+
            //some error occurred, try again in a second
            setTimeout(() => sponsorsLookup(id), 1000);

@@ -383,20 +420,35 @@ function sponsorsLookup(id) {
 }

 function updatePreviewBar() {
-    previewBar.set(sponsorTimes, [], v.duration);
+    let localSponsorTimes = sponsorTimes;
+    if (localSponsorTimes == null) localSponsorTimes = [];
+
+    let allSponsorTimes = localSponsorTimes.concat(sponsorTimesSubmitting);
+
+    //create an array of the sponsor types
+    let types = [];
+    for (let i = 0; i < localSponsorTimes.length; i++) {
+        types.push("sponsor");
+    }
+    for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
+        types.push("previewSponsor");
+    }
+
+    wait(() => previewBar !== null).then((result) => previewBar.set(allSponsorTimes, types, v.duration));

    //update last video id
-    lastPreviewBarUpdate = getYouTubeVideoID(document.URL);
+    lastPreviewBarUpdate = sponsorVideoID;
 }

 function getChannelID() {
    //get channel id
-    let channelContainers = document.querySelectorAll("#owner-name");
+    let channelContainers = document.querySelectorAll(".ytd-channel-name#text");
    let channelURLContainer = null;

    for (let i = 0; i < channelContainers.length; i++) {
-        if (channelContainers[i].firstElementChild != null) {
-            channelURLContainer = channelContainers[i].firstElementChild;
+        let child = channelContainers[i].firstElementChild;
+        if (child != null && child.getAttribute("href") != "") {
+            channelURLContainer = child;
        }
    }

@@ -410,12 +462,34 @@ function getChannelID() {

    if (channelURLContainer == null) {
        //try later
-        setTimeout(getChannelID, 100);
-        return;
+        return false;
    }

+    //first get the title to make sure a title change has occurred (otherwise the next video might still be loading)
+    let titleInfoContainer = document.getElementById("info-contents");
+    let currentTitle = "";
+    if (titleInfoContainer != null) {
+        currentTitle = titleInfoContainer.firstElementChild.firstElementChild.querySelector(".title").firstElementChild.innerText;
+    } else {
+        //old YouTube theme
+        currentTitle = document.getElementById("eow-title").innerText;
+    }
+
+    if (title == currentTitle) {
+        //video hasn't changed yet, wait
+        //try later
+        return false;
+    }
+    title = currentTitle;
+
    channelURL = channelURLContainer.getAttribute("href");

+    //reset variables
+    channelWhitelisted = false;
+}
+
+//checks if this channel is whitelisted, should be done only after the channelID has been loaded
+function whitelistCheck() {
    //see if this is a whitelisted channel
    chrome.storage.sync.get(["whitelistedChannels"], function(result) {
        let whitelistedChannels = result.whitelistedChannels;
@@ -426,6 +500,23 @@ function getChannelID() {
            UUIDs = [];

            channelWhitelisted = true;
+
+            //make sure the whitelistedChannels array isn't broken and full of null entries
+            //TODO: remove this at some point in the future as the bug that caused this should be patched
+            if (whitelistedChannels.some((el) => el === null)) {
+                //remove the entries that are null
+                let cleanWhitelistedChannelsArray = [];
+                for (let i = 0; i < whitelistedChannels.length; i++) {
+                    let channelURL = whitelistedChannels[i];
+                    if (channelURL !== null) {
+                        //add it
+                        cleanWhitelistedChannelsArray.push(channelURL);
+                    }
+                }
+
+                //save this value
+                chrome.storage.sync.set({"whitelistedChannels": cleanWhitelistedChannelsArray});
+            }
        }
    });
 }
@@ -468,7 +559,7 @@ function checkSponsorTime(sponsorTimes, index, openNotice) {
        lastTime = v.currentTime - 0.0001;
    }

-    if (checkIfTimeToSkip(v.currentTime, sponsorTimes[index][0]) && !hiddenSponsorTimes.includes(index)) {
+    if (checkIfTimeToSkip(v.currentTime, sponsorTimes[index][0], sponsorTimes[index][1]) && !hiddenSponsorTimes.includes(index)) {
        //skip it
        skipToTime(v, index, sponsorTimes, openNotice);

@@ -479,13 +570,13 @@ function checkSponsorTime(sponsorTimes, index, openNotice) {
    return false;
 }

-function checkIfTimeToSkip(currentVideoTime, startTime) {
+function checkIfTimeToSkip(currentVideoTime, startTime, endTime) {
    //If the sponsor time is in between these times, skip it
    //Checks if the last time skipped to is not too close to now, to make sure not to get too many
    //  sponsor times in a row (from one troll)
    //the last term makes 0 second start times possible only if the video is not setup to start at a different time from zero
    return (Math.abs(currentVideoTime - startTime) < 3 && startTime >= lastTime && startTime <= currentVideoTime) || 
-                (lastTime == -1 && startTime == 0 && youtubeVideoStartTime == null)
+                (lastTime == -1 && startTime == 0 && currentVideoTime < endTime)
 }

 //skip fromt he start time to the end time for a certain index sponsor time
@@ -529,57 +620,68 @@ function reskipSponsorTime(UUID) {
    }
 }

-//Adds a sponsorship starts button to the player controls
-function addPlayerControlsButton() {
-    if (document.getElementById("startSponsorButton") != null) {
-        //it's already added
-        return;
-    }
-
-    let startSponsorButton = document.createElement("button");
-    startSponsorButton.id = "startSponsorButton";
-    startSponsorButton.className = "ytp-button playerButton";
-    startSponsorButton.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
-    startSponsorButton.addEventListener("click", startSponsorClicked);
-
-    let startSponsorImage = document.createElement("img");
-    startSponsorImage.id = "startSponsorImage";
-    startSponsorImage.className = "playerButtonImage";
-    startSponsorImage.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
-
-    //add the image to the button
-    startSponsorButton.appendChild(startSponsorImage);
-
-    let controls = document.getElementsByClassName("ytp-right-controls");
-    let referenceNode = controls[controls.length - 1];
-
-    if (referenceNode == undefined) {
-        //page not loaded yet
-        setTimeout(addPlayerControlsButton, 100);
-        return;
-    }
-
-    referenceNode.prepend(startSponsorButton);
-}
-
 function removePlayerControlsButton() {
+    if (!sponsorVideoID) return;
+
    document.getElementById("startSponsorButton").style.display = "none";
    document.getElementById("submitButton").style.display = "none";
 }

-//adds or removes the player controls button to what it should be
-function updateVisibilityOfPlayerControlsButton() {
-    //not on a proper video yet
-    if (!getYouTubeVideoID(document.URL)) return;
+function createButton(baseID, title, callback, imageName, isDraggable=false) {
+    if (document.getElementById(baseID + "Button") != null) return;

-    addPlayerControlsButton();
-    addInfoButton();
-    addDeleteButton();
-    addSubmitButton();
+    // Button HTML
+    let newButton = document.createElement("button");
+    newButton.draggable = isDraggable;
+    newButton.id = baseID + "Button";
+    newButton.className = "ytp-button playerButton";
+    newButton.setAttribute("title", chrome.i18n.getMessage(title));
+    newButton.addEventListener("click", callback);
+
+    // Image HTML
+    let newButtonImage = document.createElement("img");
+    newButton.draggable = isDraggable;
+    newButtonImage.id = baseID + "Image";
+    newButtonImage.className = "playerButtonImage";
+    newButtonImage.src = chrome.extension.getURL("icons/" + imageName);
+
+    // Append image to button
+    newButton.appendChild(newButtonImage);
+
+    // Add the button to player
+    controls.prepend(newButton);
+}
+
+function getControls() {
+    let controls = document.getElementsByClassName("ytp-right-controls");
+    return (!controls || controls.length === 0) ? false : controls[controls.length - 1]
+};
+
+//adds all the player controls buttons
+async function createButtons() {
+    let result = await wait(getControls).catch();
+
+    //set global controls variable
+    controls = result;
+
+    // Add button if does not already exist in html
+    createButton("startSponsor", "sponsorStart", startSponsorClicked, "PlayerStartIconSponsorBlocker256px.png");	  
+    createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker256px.png")
+    createButton("delete", "clearTimes", clearSponsorTimes, "PlayerDeleteIconSponsorBlocker256px.png");
+    createButton("submit", "SubmitTimes", submitSponsorTimes, "PlayerUploadIconSponsorBlocker256px.png");
+}
+//adds or removes the player controls button to what it should be
+async function updateVisibilityOfPlayerControlsButton() {
+    //not on a proper video yet
+    if (!sponsorVideoID) return;
+
+    await createButtons();
+	
    if (hideVideoPlayerControls) {
        removePlayerControlsButton();
    }
-    if (hideInfoButtonPlayerControls) {
+    //don't show the info button on embeds
+    if (hideInfoButtonPlayerControls || document.URL.includes("/embed/")) {
        document.getElementById("infoButton").style.display = "none";
    }
    if (hideDeleteButtonPlayerControls) {
@@ -597,7 +699,7 @@ function startSponsorClicked() {
    chrome.runtime.sendMessage({
        message: "addSponsorTime",
        time: v.currentTime,
-        videoID: getYouTubeVideoID(document.URL)
+        videoID: sponsorVideoID
    }, function(response) {
        //see if the sponsorTimesSubmitting needs to be updated
        updateSponsorTimesSubmitting();
@@ -607,7 +709,7 @@ function startSponsorClicked() {
 function updateSponsorTimesSubmitting() {
    chrome.runtime.sendMessage({
        message: "getSponsorTimes",
-        videoID: getYouTubeVideoID(document.URL)
+        videoID: sponsorVideoID
    }, function(response) {
        if (response != undefined) {
            let sponsorTimes = response.sponsorTimes;
@@ -615,18 +717,27 @@ function updateSponsorTimesSubmitting() {
            //see if this data should be saved in the sponsorTimesSubmitting variable
            if (sponsorTimes != undefined) {
                sponsorTimesSubmitting = sponsorTimes;
+
+                updatePreviewBar();
            }
        }
    });
 }

-function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+//is the submit button on the player loaded yet
+function isSubmitButtonLoaded() {
+    return document.getElementById("submitButton") !== null;
+}
+
+async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+    if(!sponsorVideoID) return false;
+    
+    //make sure submit button is loaded
+    await wait(isSubmitButtonLoaded);
+    
    //if it isn't visible, there is no data
-    if (uploadButtonVisible && !hideDeleteButtonPlayerControls) {
-        document.getElementById("deleteButton").style.display = "unset";
-    } else {
-        document.getElementById("deleteButton").style.display = "none";
-    }
+    let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none"
+    document.getElementById("deleteButton").style.display = shouldHide;

    if (showStartSponsor) {
        showingStartSponsor = true;
@@ -653,112 +764,6 @@ function toggleStartSponsorButton() {
    changeStartSponsorButton(!showingStartSponsor, true);
 }

-//shows the info button on the video player
-function addInfoButton() {
-    if (document.getElementById("infoButton") != null) {
-        //it's already added
-        return;
-    }
-  
-    //make a submit button
-    let infoButton = document.createElement("button");
-    infoButton.id = "infoButton";
-    infoButton.className = "ytp-button playerButton";
-    infoButton.setAttribute("title", "Open SponsorBlock Popup");
-    infoButton.addEventListener("click", openInfoMenu);
-
-    let infoImage = document.createElement("img");
-    infoImage.id = "infoButtonImage";
-    infoImage.className = "playerButtonImage";
-    infoImage.src = chrome.extension.getURL("icons/PlayerInfoIconSponsorBlocker256px.png");
-
-    //add the image to the button
-    infoButton.appendChild(infoImage);
-
-    let controls = document.getElementsByClassName("ytp-right-controls");
-    let referenceNode = controls[controls.length - 1];
-
-    if (referenceNode == undefined) {
-        //page not loaded yet
-        setTimeout(addInfoButton, 100);
-        return;
-    }
-
-    referenceNode.prepend(infoButton);
-}
-
-//shows the delete button on the video player
-function addDeleteButton() {
-    if (document.getElementById("deleteButton") != null) {
-        //it's already added
-        return;
-    }
-  
-    //make a submit button
-    let deleteButton = document.createElement("button");
-    deleteButton.id = "deleteButton";
-    deleteButton.className = "ytp-button playerButton";
-    deleteButton.setAttribute("title", "Clear Sponsor Times");
-    deleteButton.addEventListener("click", clearSponsorTimes);
-    //hide it at the start
-    deleteButton.style.display = "none";
-
-    let deleteImage = document.createElement("img");
-    deleteImage.id = "deleteButtonImage";
-    deleteImage.className = "playerButtonImage";
-    deleteImage.src = chrome.extension.getURL("icons/PlayerDeleteIconSponsorBlocker256px.png");
-
-    //add the image to the button
-    deleteButton.appendChild(deleteImage);
-
-    let controls = document.getElementsByClassName("ytp-right-controls");
-    let referenceNode = controls[controls.length - 1];
-  
-    if (referenceNode == undefined) {
-        //page not loaded yet
-        setTimeout(addDeleteButton, 100);
-        return;
-    }
-
-    referenceNode.prepend(deleteButton);
-}
-
-//shows the submit button on the video player
-function addSubmitButton() {
-    if (document.getElementById("submitButton") != null) {
-        //it's already added
-        return;
-    }
-  
-    //make a submit button
-    let submitButton = document.createElement("button");
-    submitButton.id = "submitButton";
-    submitButton.className = "ytp-button playerButton";
-    submitButton.setAttribute("title", "Submit Sponsor Times");
-    submitButton.addEventListener("click", submitSponsorTimes);
-    //hide it at the start
-    submitButton.style.display = "none";
-
-    let submitImage = document.createElement("img");
-    submitImage.id = "submitButtonImage";
-    submitImage.className = "playerButtonImage";
-    submitImage.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
-
-    //add the image to the button
-    submitButton.appendChild(submitImage);
-
-    let controls = document.getElementsByClassName("ytp-right-controls");
-    let referenceNode = controls[controls.length - 1];
-
-    if (referenceNode == undefined) {
-        //page not loaded yet
-        setTimeout(addSubmitButton, 100);
-        return;
-    }
-  
-    referenceNode.prepend(submitButton);
-}
-
 function openInfoMenu() {
    if (document.getElementById("sponsorBlockPopupContainer") != null) {
        //it's already added
@@ -786,11 +791,18 @@ function openInfoMenu() {
            //add the close button
            popup.prepend(closeButton);
    
-            let parentNode = document.getElementById("secondary");
+            let parentNodes = document.querySelectorAll("#secondary");
+            let parentNode = null;
+            for (let i = 0; i < parentNodes.length; i++) {
+                if (parentNodes[i].firstElementChild !== null) {
+                    parentNode = parentNodes[i];
+                }
+            }
            if (parentNode == null) {
                //old youtube theme
                parentNode = document.getElementById("watch7-sidebar-contents");
            }
+                

            //make the logo source not 404
            //query selector must be used since getElementByID doesn't work on a node and this isn't added to the document yet
@@ -814,8 +826,10 @@ function closeInfoMenu() {
    if (popup != null) {
        popup.remove();

-        //show info button
-        document.getElementById("infoButton").style.display = "unset";
+        //show info button if it's not an embed
+        if (!document.URL.includes("/embed/")) {
+            document.getElementById("infoButton").style.display = "unset";
+        }
    }
 }

@@ -823,7 +837,7 @@ function clearSponsorTimes() {
    //it can't update to this info yet
    closeInfoMenu();

-    let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
    chrome.storage.sync.get([sponsorTimeKey], function(result) {
@@ -841,6 +855,8 @@ function clearSponsorTimes() {
            //clear sponsor times submitting
            sponsorTimesSubmitting = [];

+            updatePreviewBar();
+
            //set buttons to be correct
            changeStartSponsorButton(true, false);
        }
@@ -924,15 +940,24 @@ function submitSponsorTimes() {
    //it can't update to this info yet
    closeInfoMenu();

-    let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
    chrome.storage.sync.get([sponsorTimeKey], function(result) {
        let sponsorTimes = result[sponsorTimeKey];

        if (sponsorTimes != undefined && sponsorTimes.length > 0) {
-            let confirmMessage = "Are you sure you want to submit this?\n\n" + getSponsorTimesMessage(sponsorTimes);
-            confirmMessage += "\n\nTo edit or delete values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+            //check if a sponsor exceeds the duration of the video
+            for (let i = 0; i < sponsorTimes.length; i++) {
+                if (sponsorTimes[i][1] > v.duration) {
+                    sponsorTimes[i][1] = v.duration;
+                }
+            }
+            //update sponsorTimes
+            chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
+
+            let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes);
+            confirmMessage += "\n\n" + chrome.i18n.getMessage("confirmMSG");
            if(!confirm(confirmMessage)) return;

            sendSubmitMessage();
@@ -945,10 +970,10 @@ function submitSponsorTimes() {
 //called after all the checks have been made that it's okay to do so
 function sendSubmitMessage(){
    //add loading animation
-    document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
+    document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
    document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite";

-    let currentVideoID = getYouTubeVideoID(document.URL);
+    let currentVideoID = sponsorVideoID;

    chrome.runtime.sendMessage({
        message: "submitTimes",
@@ -980,7 +1005,7 @@ function sendSubmitMessage(){
            } else {
                //show that the upload failed
                document.getElementById("submitButton").style.animation = "unset";
-                document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");
+                document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");

                if([400,429,409,502].includes(response.statusCode)) {
                    alert(chrome.i18n.getMessage(response.statusCode));
--- a/manifest.json
+++ b/manifest.json
@@ -1,13 +1,14 @@
 {
  "name": "__MSG_fullName__",
  "short_name": "__MSG_Name__",
-  "version": "1.1.0",
+  "version": "1.1.9",
  "default_locale": "en",
  "description": "__MSG_Description__",
  "content_scripts": [
    {
      "matches": [
-        "https://*.youtube.com/*"
+        "https://*.youtube.com/*",
+        "https://www.youtube-nocookie.com/embed/*"
      ],
      "all_frames": true,
      "js": [
--- a/popup.html
+++ b/popup.html
@@ -1,6 +1,6 @@
 <html>
  <head>
-    <title>SponsorBlock Popup</title>
+    <title>__MSG_openPopup__</title>
    <link id="sponorBlockPopupFont" rel="stylesheet" type="text/css" href="/libs/Source+Sans+Pro.css"/>
    <link id="sponorBlockStyleSheet" rel="stylesheet" type="text/css" href="popup.css"/>
  </head>
@@ -10,10 +10,10 @@
      <div id="app" class="popupBody">
          <img src="icons/LogoSponsorBlocker256px.png" height="64px" id="sponsorBlockPopupLogo"/>

-          <h1 class="popupElement">SponsorBlock</h1>
+          <h1 class="popupElement">__MSG_Name__</h1>

          <!-- Loading text -->
-          <p id="loadingIndicator" class="popupElement">Loading...</p>
+          <p id="loadingIndicator" class="popupElement">__MSG_Loading__</p>

          <!-- Hidden until loading complete -->
          <div id="mainControls" class="main popupElement" style="display: none">
@@ -29,21 +29,21 @@
            <br/>

            <div>
-              <button id="whitelistChannel" class="whitelistButton popupElement">Whitelist Channel</button>
-              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">Remove Channel From Whitelist</button>
+              <button id="whitelistChannel" class="whitelistButton popupElement">__MSG_whitelistChannel__</button>
+              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">__MSG_removeFromWhitelist__</button>
            </div>
            <sub class="popupElement">
-              Whitelist the channels who do sponsorships ethically to encourage good behavior, or maybe if they are just entertaining and funny. Or don't, that's your call.
+              __MSG_whitelistDescription__
            </sub>

            <br/>
            <br/>

-            <button id="reportAnIssue" class="dangerButton popupElement">Vote On A Sponsor Time</button>
+            <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>

            <div id="issueReporterContainer"  class="popupElement" style="display: none">

-              <h3 style="margin-top: 0px" class="popupElement">Vote On A Sponsor Time</h3>
+              <h3 style="margin-top: 0px" class="popupElement">__MSG_voteOnTime__</h3>

              <div id="issueReporterTimeButtons" class="popupElement">

@@ -51,47 +51,47 @@

            </div>

-            <h2 class="recordingSubtitle popupElement">Record the times of a sponsorship</h2>
+            <h2 class="recordingSubtitle popupElement">__MSG_recordTimes__</h2>

            <p class="popupElement">
              <span id=sponsorTimesContributionsContainer  class="popupElement" style="display: none">
-                  So far, you've submitted
+                  __MSG_soFarUHSubmited__
                  <span id="sponsorTimesContributionsDisplay" class="popupElement">
                    0
                  </span>
                  <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">
-                    sponsors.
+                    __MSG_Sponsors__.
                  </span>
              </span>

              <span id=sponsorTimesViewsContainer  class="popupElement" style="display: none">
-                  You have saved people from 
+                  __MSG_savedPeopleFrom__
                  <span id="sponsorTimesViewsDisplay" class="popupElement">
                    0
                  </span>
                  <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">
-                    sponsor segments.
+                     __MSG_Segments__.
+                     __MSG_savedPeopleFrom__
                  </span>
              </span>

              <div class="popupElement">
-                View the leaderboard <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">here</a>.
+                __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
              </div>
            </p>

            <p class="popupElement"> 
-              Click the button below when the sponsorship starts and ends to record and 
-              submit it to the database.
+              __MSG_recordTimesDescription__
            </p>
    
            <div>
-              <button id="sponsorStart" class="greenButton popupElement">Sponsorship Starts Now</button>
+              <button id="sponsorStart" class="greenButton popupElement">__MSG_sponsorStart__</button>
            </div>

-            <sub class="popupElement">Hint: Press the semicolon key while focused on a video report the start/end of a sponsor and quote to submit.</sub>
+            <sub class="popupElement">__MSG_popupHint__</sub>
    
            <div id="submissionSection"  class="popupElement" style="display: none">
-              <h3 class="popupElement">Latest Sponsor Message Times Chosen</h3>
+              <h3 class="popupElement">__MSG_lastTimes__</h3>
              <b>
                <div id="sponsorMessageTimes" class="popupElement">
        
@@ -100,13 +100,13 @@

              <br/>
      
-              <button id="clearTimes" class="smallButton popupElement">Clear Times</button>
+              <button id="clearTimes" class="smallButton popupElement">__MSG_clearTimesButton__</button>
      
              <br/>
              <br/>

              <div id="submitTimesContainer" class="popupElement" style="display: none">
-                <button id="submitTimes" class="smallButton popupElement">Submit Times</button>
+                <button id="submitTimes" class="smallButton popupElement">__MSG_submitTimesButton__</button>

                <div id="submitTimesInfoMessageContainer" class="popupElement" style="display: none">
                  <h3 id="submitTimesInfoMessage" class="popupElement">
@@ -122,17 +122,17 @@
              <br/>
              <br/>
    
-              <button id="setUsernameButton" class="warningButton popupElement">Set Username</button>
+              <button id="setUsernameButton" class="warningButton popupElement">__MSG_setUsername__</button>
              <br/>
              <sub class="popupElement">
-                This is used on the public stats page to show off how much you've contributed. See it <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">here</a>.
+                __MSG_publicStats__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
              </sub>
            </div>

            <div id="setUsername" class="popupElement" style="display: none">
                <br/>

-                <h3>Set Username</h3>
+                <h3>__MSG_setUsername__</h3>

                <div id="setUsernameStatusContainer" style="display: none">
                    <h2 id="setUsernameStatus"></h2>
@@ -154,72 +154,66 @@

              <br/>

-                Come join the official discord server to give suggestions and feedback!
+                __MSG_discordAdvert__

              <br/>

-              <span id="hideDiscordButton" class="smallLink popupElement">Hide this</span>
+              <span id="hideDiscordButton" class="smallLink popupElement">__MSG_hideThis__</span>
            </div>

            <div id="optionsButtonContainer" class="popupElement">
                <br/>
                <br/>
      
-                <button id="optionsButton" class="dangerButton popupElement">Options</button>
+                <button id="optionsButton" class="dangerButton popupElement">__MSG_Options__</button>
            </div>

            <div id="options" class="popupElement" style="display: none">
                <br/>

-                <h3>Options</h3>
+                <h3>__MSG_Options__</h3>
      
-                <button id="hideVideoPlayerControls" class="warningButton popupElement">Hide Buttons On YouTube Player</button>
-                <button id="showVideoPlayerControls" style="display: none" class="warningButton popupElement">Show Buttons On YouTube Player</button>
+                <button id="hideVideoPlayerControls" class="warningButton popupElement">__MSG_hideButtons__</button>
+                <button id="showVideoPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showButtons__</button>
                <br/>
                <sub class="popupElement">
-                  This hides the buttons that appear on the YouTube player to submit sponsors. I can see this being annoying for some 
-                  people. Instead of using the button there, this popup can be used to submit sponsors. To hide the notice that appears, 
-                  use the button that appears on the notice saying "Don't show this again". You can always enable these settings again 
-                  later.
+                  __MSG_hideButtonsDescription__
                </sub>

                <br/>
                <br/>

-                <button id="hideInfoButtonPlayerControls" class="warningButton popupElement">Hide Info Button On YouTube Player</button>
-                <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton popupElement">Show Info Button On YouTube Player</button>
+                <button id="hideInfoButtonPlayerControls" class="warningButton popupElement">__MSG_hideInfoButton__</button>
+                <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showInfoButton__</button>
                <br/>
                <sub class="popupElement">
-                  This is the button that opens up a popup in the YouTube page.
+                  __MSG_whatInfoButton__
                </sub>

                <br/>
                <br/>

-                <button id="hideDeleteButtonPlayerControls" class="warningButton popupElement">Hide Delete Button On YouTube Player</button>
-                <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton popupElement">Show Delete Button On YouTube Player</button>
+                <button id="hideDeleteButtonPlayerControls" class="warningButton popupElement">__MSG_hideDeleteButton__</button>
+                <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showDeleteButton__</button>
                <br/>
                <sub class="popupElement">
-                  This is the button that allows you to clear all sponsors on the YouTube player.
+                  __MSG_whatDeleteButton__
                </sub>

                <br/>
                <br/>

-                <button id="disableSponsorViewTracking" class="warningButton popupElement">Disable Sponsor View Tracking</button>
-                <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">Enable Sponsor View Tracking</button>
+                <button id="disableSponsorViewTracking" class="warningButton popupElement">__MSG_disableViewTracking__</button>
+                <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">__MSG_enableViewTracking__</button>
                <br/>
                <sub class="popupElement">
-                  This feature tracks which sponsors you have skipped to let users know how much their submission has helped others and
-                  used as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message
-                  to the server each time you skip a sponsor. Hopefully most people don't change this setting so that the view numbers
-                  are accurate. :)
+                  __MSG_whatViewTracking__
                </sub>
      
                <br/>
                <br/>

-                <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">Show Notice Again</button>
+                <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
            </div>
          </div>
        </div>
--- a/popup.js
+++ b/popup.js
@@ -1,6 +1,7 @@

 //make this a function to allow this to run on the content page
 function runThePopup() {
+    localizeHtmlPage();

    //is it in the popup or content script
    var inPopup = true;
@@ -981,7 +982,7 @@ function runThePopup() {
    //set it to false
    function resetStartTimeChosen() {
        startTimeChosen = false;
-        SB.sponsorStart.innerHTML = "SP_START";
+        SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorStart");
    }
  
    //hides and shows the submit times button when needed
@@ -1278,7 +1279,7 @@ function runThePopup() {

 if (chrome.tabs != undefined) {
    //add the width restriction (because Firefox)
-    document.getElementById("sponorBlockStyleSheet").sheet.insertRule('.popupBody { width: 300 }', 0);
+    document.getElementById("sponorBlockStyleSheet").sheet.insertRule('.popupBody { width: 325 }', 0);

    //this means it is actually opened in the popup
    runThePopup();
--- a/utils.js
+++ b/utils.js
@@ -1,37 +1,68 @@
+// Function that can be used to wait for a condition before returning
+async function wait(condition, timeout = 5000, check = 100) { 
+    return await new Promise((resolve, reject) => {
+        setTimeout(() => reject("TIMEOUT"), timeout);
+
+        let intervalCheck = () => {
+            let result = condition();
+            if (result !== false) {
+                resolve(result);
+                clearInterval(interval);
+            };
+        };
+
+        let interval = setInterval(intervalCheck, check);
+        
+        //run the check once first, this speeds it up a lot
+        intervalCheck();
+    });
+}
+
 function getYouTubeVideoID(url) {
    //Attempt to parse url
    let urlObject = null;
    try { 
-        urlObject = new URL(url);
+            urlObject = new URL(url);
    } catch (e) {      
-        console.error("[SB] Unable to parse URL: " + url);
-        return false
+            console.error("[SB] Unable to parse URL: " + url);
+            return false;
    }
-  
+
    //Check if valid hostname
    if(!["www.youtube.com","www.youtube-nocookie.com"].includes(urlObject.host)) return false; 
-    
+
    //Get ID from searchParam
    if ((urlObject.pathname == "/watch" || urlObject.pathname == "/watch/") && urlObject.searchParams.has("v")) {
-      id = urlObject.searchParams.get("v"); 
-      return id.length == 11 ? id : false;
+        id = urlObject.searchParams.get("v"); 
+        return id.length == 11 ? id : false;
    } else if (urlObject.pathname.startsWith("/embed/")) {
-      try {
-        return urlObject.pathname.substr(7, 11);
-      } catch (e) {
-        console.error("[SB] Video ID not valid for " + url);
-        return false;
-      }
+        try {
+            return urlObject.pathname.substr(7, 11);
+        } catch (e) {
+            console.error("[SB] Video ID not valid for " + url);
+            return false;
+        }
+    }
+  
+	return false;
+}
+
+function localizeHtmlPage() {
+    //Localize by replacing __MSG_***__ meta tags
+    var objects = document.getElementsByClassName("popupBody")[0].children;
+    for (var j = 0; j < objects.length; j++) {
+        var obj = objects[j];
+
+        var valStrH = obj.innerHTML.toString();
+        var valNewH = valStrH.replace(/__MSG_(\w+)__/g, function(match, v1)
+        {
+            return v1 ? chrome.i18n.getMessage(v1) : "";
+        });
+
+        if(valNewH != valStrH)
+        {
+            obj.innerHTML = valNewH;
+        }
    }
 }

-//returns the start time of the video if there was one specified (ex. ?t=5s)
-function getYouTubeVideoStartTime(url) {
-  let searchParams = new URL(url).searchParams;
-  let startTime = searchParams.get("t");
-  if (startTime == null) {
-    startTime = searchParams.get("time_continue");
-  }
-
-  return startTime;
-}
--- a/utils/previewBar.js
+++ b/utils/previewBar.js
@@ -13,6 +13,10 @@ let barTypes = {
 	"sponsor": {
 		color: "#00d400",
 		opacity: "0.5"
+	},
+	"previewSponsor": {
+		color: "#0000d4",
+		opacity: "0.5"
 	}
 };

--- a/utils/skipNotice.js
+++ b/utils/skipNotice.js
@@ -359,6 +359,9 @@ class SkipNotice {
        if (notice != null) {
            notice.remove();
        }
+
+        //remove setInterval
+        if (this.countdownInterval != -1) clearInterval(this.countdownInterval);
    }

 }
Author	SHA1	Message	Date
Ajay Ramachandran	1782376e3d	Merge pull request #145 from ajayyy/experimental-ajay Fixed info button + videoChannelID errors	2019-09-02 21:33:36 -04:00
Ajay Ramachandran	ef1b96bbf1	Update version number	2019-09-02 21:33:14 -04:00
Ajay Ramachandran	7deea5d648	Made getChannelID only get called if there is a valid YouTube page.	2019-09-02 10:54:49 -04:00
Ajay Ramachandran	c6460b006f	Update README.md	2019-09-01 22:41:52 -04:00
Ajay Ramachandran	4352667b1c	Added days saved	2019-09-01 22:40:18 -04:00
Ajay Ramachandran	a84502dc92	Update README.md	2019-09-01 21:54:52 -04:00
Ajay Ramachandran	d7c67fb481	Update README.md	2019-09-01 21:52:14 -04:00
Ajay Ramachandran	adc9748d4d	Update README.md	2019-09-01 21:51:31 -04:00
Ajay Ramachandran	f310c53f88	Made sure info menu is not placed in the incorrect container.	2019-09-01 21:08:29 -04:00
Ajay Ramachandran	f2c2fd0d29	Merge pull request #144 from Strappazzon/i18n-it Add Italian translation	2019-09-01 14:47:40 -04:00
Strappazzon	1b0cd0f485	Shorter title	2019-09-01 19:17:33 +02:00
Strappazzon	48f6f2f66c	Add Italian translation	2019-09-01 18:52:24 +02:00
Ajay Ramachandran	85b70f8ad7	Merge pull request #143 from ajayyy/experimental-ajay More Localisation + Fixed Whitelisting	2019-08-31 22:07:41 -04:00
Ajay Ramachandran	3e32f28d2e	Update version number.	2019-08-31 22:07:22 -04:00
Ajay Ramachandran	9bd1b03504	Made the info button not appear on embeds. Also fixed issues with the buttons changing visibility before being added.	2019-08-31 21:32:48 -04:00
Ajay Ramachandran	cdccc43b31	Revert "Fancy tooltip for player controls" This reverts commit `0c2ceb134b`.	2019-08-31 21:21:01 -04:00
Ajay Ramachandran	21ce614bd9	Made the function clear whitelisted channels that were null.	2019-08-31 21:17:07 -04:00
Ajay Ramachandran	7f56ec238f	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-31 21:04:19 -04:00
Ajay Ramachandran	e1625437d4	Fixed getting the channel URL for whitelisting.	2019-08-31 21:04:08 -04:00
Ajay Ramachandran	5b9afebd4e	Merge pull request #142 from omarroth/fields-api Only request published field from Invidious API	2019-08-31 17:14:31 -04:00
Ajay Ramachandran	93afc06717	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-31 17:13:59 -04:00
Omar Roth	cfbf1f8995	Only request published field from Invidious API	2019-08-31 16:44:46 -04:00
Ajay Ramachandran	516e5077a9	Merge pull request #141 from FisheyLP/experimental Fancy tooltip for player controls	2019-08-31 14:06:40 -04:00
FisheyLP	0c2ceb134b	Fancy tooltip for player controls	2019-08-31 18:37:29 +02:00
Ajay Ramachandran	02bcb0b213	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-28 18:12:59 -04:00
Ajay Ramachandran	35c6ed81b5	Updated hotkey handling.	2019-08-28 18:11:29 -04:00
Ajay Ramachandran	a229aee2cc	Merge pull request #134 from OfficialNoob/patch-23 Content.js messageListener switch	2019-08-27 21:17:46 -04:00
Ajay Ramachandran	f91c6d5f9d	Change return to break.	2019-08-27 21:17:21 -04:00
Ajay Ramachandran	0e93fb6f57	Merge pull request #135 from OfficialNoob/patch-24 Popup i18n support	2019-08-27 21:14:13 -04:00
Ajay Ramachandran	1f491d2031	Updated naming	2019-08-27 21:13:37 -04:00
Ajay Ramachandran	32dd7d43d7	Updated it to make it work in the info menu (on page popup).	2019-08-27 21:10:35 -04:00
Ajay Ramachandran	284efe9902	Merge branch 'experimental' into patch-24	2019-08-27 21:04:05 -04:00
Ajay Ramachandran	4e795c8fb1	Merge pull request #139 from ajayyy/experimental-ajay Fixed preview bar causing issues	2019-08-27 21:01:48 -04:00
Ajay Ramachandran	c83eb589ea	Updated version number.	2019-08-27 21:00:00 -04:00
Ajay Ramachandran	7cd6b324b9	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-27 20:59:36 -04:00
Ajay Ramachandran	5891fccacb	Updated shield links	2019-08-26 16:10:25 -04:00
Ajay Ramachandran	59233f3307	Update README.md	2019-08-26 16:09:26 -04:00
Ajay Ramachandran	796466a72a	Added some shields	2019-08-26 16:08:33 -04:00
Ajay Ramachandran	3f35642010	Made the preview bar wait for it to not be null.	2019-08-26 14:35:49 -04:00
Ajay Ramachandran	5bbfcf742d	Fixed preview bar bar loading too early	2019-08-26 14:30:55 -04:00
Ajay Ramachandran	aaf79fda0d	Added more language strings	2019-08-25 23:22:35 -04:00
Ajay Ramachandran	8604788d27	Merge branch 'experimental' into patch-24	2019-08-24 14:03:04 -04:00
Ajay Ramachandran	519a822751	Merge pull request #138 from ajayyy/experimental-ajay Improved away function	2019-08-24 14:01:35 -04:00
Ajay Ramachandran	fef31c399b	Update version number.	2019-08-24 14:00:15 -04:00
Ajay Ramachandran	5802e05228	Update utils.js	2019-08-24 13:59:53 -04:00
Ajay Ramachandran	da21081a12	Merge branch 'patch-21' into experimental-ajay	2019-08-24 13:54:24 -04:00
Official Noob	6d739de57c	Fixed html	2019-08-24 18:22:04 +01:00
Official Noob	edcd328743	Added localizeHtmlPage(); to popup.js	2019-08-24 18:18:16 +01:00
Official Noob	5c9e6cac0e	Removed localizeHtmlPage();	2019-08-24 18:17:36 +01:00
Official Noob	7ab5e2cf52	Added localizeHtmlPage()	2019-08-24 18:08:22 +01:00
Official Noob	42dcdb40cf	Added localizeHtmlPage	2019-08-24 18:06:25 +01:00
Ajay Ramachandran	896357a943	Merge pull request #136 from ajayyy/experimental-ajay Fixed submissions being broken on the video player	2019-08-24 12:32:56 -04:00
Ajay Ramachandran	2d96c24b13	Update version number	2019-08-24 12:30:03 -04:00
Ajay Ramachandran	1753f58120	Fixed submissions being broken.	2019-08-24 12:29:51 -04:00
Official Noob	7244ca8f5e	Update messages.json	2019-08-24 15:16:29 +01:00
Official Noob	ec0c989066	Added stuff for popup	2019-08-24 15:07:05 +01:00
Official Noob	c801b1fecd	Update popup.html	2019-08-24 15:03:19 +01:00
Official Noob	57b50106d1	Popup i18n support	2019-08-24 14:50:02 +01:00
Official Noob	871ba63f67	Content.js messageListener switch	2019-08-24 12:55:42 +01:00
Ajay Ramachandran	f0888faf78	Merge pull request #133 from ajayyy/experimental Update master	2019-08-23 23:30:11 -04:00
Ajay Ramachandran	23fbbebc9e	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-23 23:28:56 -04:00
Ajay Ramachandran	9951a19478	Updated version number.	2019-08-23 23:27:42 -04:00
Ajay Ramachandran	dd4ab2f38a	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-23 21:13:37 -04:00
Ajay Ramachandran	6bcdb3e272	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-23 21:13:23 -04:00
Ajay Ramachandran	227bec4d8e	Merge pull request #83 from OfficialNoob/patch-16 Added youtube-nocookie.com	2019-08-23 21:13:03 -04:00
Ajay Ramachandran	556b4f88d2	Merge pull request #122 from OfficialNoob/patch-21 Added addButtons	2019-08-23 21:11:04 -04:00
Ajay Ramachandran	2d12f957bc	Improved await function.	2019-08-23 21:10:28 -04:00
Ajay Ramachandran	c1efe02614	Improved promise calling in button updating function.	2019-08-23 21:06:00 -04:00
Ajay Ramachandran	f0e1979aab	Renamed addButtons and defined controls.	2019-08-23 21:03:43 -04:00
Ajay Ramachandran	989db6d6b6	Added more spacing.	2019-08-23 21:02:17 -04:00
Ajay Ramachandran	781096c290	Fixed cut off text.	2019-08-23 21:01:31 -04:00
Ajay Ramachandran	536c6e3e41	Removed new line from messages.	2019-08-23 21:00:07 -04:00
Ajay Ramachandran	de376176db	Fixed preview bar being added too soon.	2019-08-23 20:59:13 -04:00
Ajay Ramachandran	e63389cfa3	Fixed buttons appearing too early not hidden (submit and clear button).	2019-08-23 20:52:12 -04:00
Ajay Ramachandran	1c4ca8da26	Fixed formatting issues + previewBar not displaying. Also changed the isSubmitButtonLoaded function to be checking for the right button and fixed the startSponsorButton not hiding. Useless function was removed.	2019-08-23 20:50:10 -04:00
Ajay Ramachandran	dcbd7ba4cd	Merge pull request #132 from ajayyy/experimental-ajay More checks + popup fix	2019-08-23 20:31:29 -04:00
Ajay Ramachandran	9fc8d385ab	Fixed popup getting cut off.	2019-08-23 14:23:34 -04:00
Ajay Ramachandran	07e878e065	Fixed missing language call.	2019-08-23 14:22:16 -04:00
Official Noob	a2af4dba52	Added back getYouTubeVideoStartTime	2019-08-23 17:19:44 +01:00
Ajay Ramachandran	2fbafb6b10	Added duration check to popup as well.	2019-08-22 23:12:30 -04:00
Ajay Ramachandran	98eb72ef1f	Made sure rechecks didn't happen twice.	2019-08-22 22:43:55 -04:00
Ajay Ramachandran	89d127c5c5	Added a check to make sure the time doesn't exceed the duration of the video.	2019-08-22 22:43:19 -04:00
Ajay Ramachandran	a784c8a850	Merge pull request #130 from doubouil/patch-1 Better french translation	2019-08-22 21:29:45 -04:00
Ajay Ramachandran	a533aaf5cf	Updated French translation	2019-08-22 21:28:52 -04:00
doubouil	434b5bdbad	Better french translation Native speaker here, the machine based translation was not great so here's a first draft. I choose to use "message commercial" (commercial message) and not "publicité" (advertisement) since ads feels to me to be more a legal status than a definite thing. "Endossement" is not a valid french word in this context, and endorsements would be translated to "sponsors" or "mécénat" in fr_FR, but again this are more legal category than pure identifying terms and fr_CA strongly dislikes frenglish. But I left it in the extension name since this is a good keyword for people looking for adblocking-related extensions.	2019-08-22 21:10:41 +00:00
Ajay Ramachandran	d1f1f9213e	Merge pull request #129 from ajayyy/experimental-ajay UserID undefined checks	2019-08-22 16:10:50 -04:00
Ajay Ramachandran	d498c107a8	Update version number.	2019-08-22 16:08:38 -04:00
Ajay Ramachandran	f12b44762e	Added new check to setup a proper userID if undefined while voting.	2019-08-22 16:08:16 -04:00
Official Noob	fc4da038e9	Merge branch 'experimental' into patch-21	2019-08-22 19:48:59 +01:00
Official Noob	d5999ad330	Added isDraggable	2019-08-22 19:39:17 +01:00
Official Noob	146ece3bff	Fixed JSON error	2019-08-22 19:36:30 +01:00
Ajay Ramachandran	92095acf36	Merge pull request #128 from Revadike/fix-draggable Disallow dragging of button	2019-08-22 12:34:18 -04:00
Revadike	279c10d555	Disallow dragging of button	2019-08-22 15:52:45 +02:00
Ajay Ramachandran	0ae3820681	Merge pull request #127 from ajayyy/experimental Update master	2019-08-21 20:01:43 -04:00
Ajay Ramachandran	283e4d053e	Merge pull request #126 from ajayyy/experimental-ajay Translations + Unsubmitted sponsor preview	2019-08-21 20:01:18 -04:00
Ajay Ramachandran	6dbb2f9d10	Update version number.	2019-08-21 19:58:44 -04:00
Ajay Ramachandran	c657bb763b	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-08-21 19:57:40 -04:00
Ajay Ramachandran	259cdb1abe	Merge pull request #123 from bershanskiy/russian Russian translation	2019-08-21 19:57:30 -04:00
Ajay Ramachandran	86e96e59af	Update README.md	2019-08-21 19:21:06 -04:00
Official Noob	9ba30dbafa	Moved to bottom	2019-08-21 20:21:39 +01:00
Anton Bershanskiy	2907db705c	Update messages.json	2019-08-21 14:03:46 -05:00
Ajay Ramachandran	a6a0f917e0	Fixed preview not working when no sponsors are found.	2019-08-21 14:35:46 -04:00
Official Noob	bcdba798d9	Added locals for buttons	2019-08-21 19:29:24 +01:00
Ajay Ramachandran	32884372fa	Unsubmitted sponsors are now in the preview.	2019-08-21 14:27:25 -04:00
Official Noob	9b2364cfb7	fixed isSubmitLoaded	2019-08-21 19:22:59 +01:00
Ajay Ramachandran	c1aebf45c8	Removed the need for getYouTubeVideoStartTime and made it check the current video time instead.	2019-08-21 14:16:52 -04:00
Official Noob	6e0c6332cc	Fixed title in createButton	2019-08-21 19:15:35 +01:00
Official Noob	47d0d340d4	Requested changes	2019-08-21 19:10:49 +01:00
Ajay Ramachandran	118804e139	Added confirm language to translations. Increased size of notice. Updated translations.	2019-08-21 14:04:05 -04:00
Ajay Ramachandran	0bef50e259	Merge pull request #121 from OfficialNoob/patch-18 Added wait function	2019-08-21 13:47:57 -04:00
Official Noob	bfb876af8b	Changed button exists check	2019-08-21 18:29:41 +01:00
Official Noob	84d5d3124c	Update content.js	2019-08-21 18:17:30 +01:00
Official Noob	825d997d6d	Update content.js	2019-08-20 23:37:40 +01:00
Official Noob	8e9e5bfddb	Update content.js	2019-08-20 23:26:35 +01:00
Official Noob	05765682a5	Update content.js	2019-08-20 23:11:18 +01:00
Official Noob	2b5d56942a	Update content.js	2019-08-20 22:59:34 +01:00
Ajay Ramachandran	f097ff60aa	Fixed indentation	2019-08-20 17:47:31 -04:00
Anton Bershanskiy	655691a28f	Russian translation	2019-08-20 15:10:21 -05:00
Ajay Ramachandran	7ddef8d519	Update README.md	2019-08-20 16:09:47 -04:00
Ajay Ramachandran	2fb79f0066	Update README.md	2019-08-20 16:09:22 -04:00
Ajay Ramachandran	655d87ce0f	Update README.md	2019-08-20 16:08:27 -04:00
Ajay Ramachandran	ed7c98afa8	Update README.md	2019-08-20 16:06:29 -04:00
Ajay Ramachandran	41bf0c9697	Update README.md	2019-08-20 16:05:47 -04:00
Ajay Ramachandran	5eb0132660	Update README.md	2019-08-20 16:05:25 -04:00
Ajay Ramachandran	c43695e596	Update README.md	2019-08-20 16:04:47 -04:00
Ajay Ramachandran	9aeda25136	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-20 15:54:51 -04:00
Ajay Ramachandran	90e671ebf8	Updated french translation	2019-08-20 15:54:40 -04:00
Ajay Ramachandran	3ecc180d06	Added french translation + fixed i18n not being used for the notification.	2019-08-20 15:46:00 -04:00
Official Noob	7ac9ec37ef	Adding addButtons and using sponsorVideoID more	2019-08-20 20:27:30 +01:00
Ajay Ramachandran	e176a9f241	Fixed it linking to non existent file	2019-08-20 15:07:36 -04:00
Ajay Ramachandran	91bd910c40	Added Brazilian Portuguese translation by @Geroyuni Co-authored-by: Geroyuni <Geroyuni@users.noreply.github.com>	2019-08-20 15:04:13 -04:00
Official Noob	a6c77185de	Added wait function	2019-08-20 17:46:05 +01:00
Ajay Ramachandran	b871d721db	Update version number.	2019-08-19 22:27:42 -04:00
Ajay Ramachandran	85f9bb1d34	Removed setInterval when removing the notice.	2019-08-19 22:26:49 -04:00
Ajay Ramachandran	adb60c6357	Update README.md	2019-08-19 20:57:31 -04:00
Ajay Ramachandran	4db6593681	Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental	2019-08-19 20:20:08 -04:00
Official Noob	d75a7ca897	Added youtube-nocookie.com	2019-08-06 21:40:23 +01:00