Merge pull request #198 from ajayyy/experimental-ajay

German translation + fixes
Upped version number
2025-12-07 12:07:11 +03:00 · 2019-12-19 00:09:46 -05:00 · 2019-12-19 00:08:31 -05:00 · 2019-12-19 00:08:07 -05:00 · 2019-12-17 18:32:20 -05:00 · 2019-12-17 18:32:01 -05:00
18 changed files with 1166 additions and 368 deletions
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img>
+  <a href="https://sponsor.ajay.app"><img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img></a>
  
  <br/>
  <sub>Logo by <a href="https://github.com/munadikieh">@munadikieh</a></sub>
@@ -8,12 +8,18 @@
 <h1 align="center">SponsorBlock</h1>

 <p align="center">
+  <b>Download:</b>
  <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">
+  <b>Unofficial Ports:</b>
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</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>
@@ -48,6 +54,8 @@ You can load this project as an unpacked extension. Make sure to rename the `con

 The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) is used to grab the time the video was published.

+Original code from [YTSponsorSkip](https://github.com/OfficialNoob/YTSponsorSkip), but not much of the code is left.
+
 Some icons made by <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a>

 Some icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a>
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -0,0 +1,318 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock for YouTube - Skip Sponsorships",
+        "description": "Name of the extension."
+    },
+
+    "Description": {
+        "message": "Überspringe die gesponserten Inhalte in YouTube-Videos. Melde gesponsorte Inhalte in den von dir angesehenen Videos und erspare anderen die Zeit.",
+        "description": "Description of the extension."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Ungültige Anforderung"
+    },
+    "429": {
+        "message": "Du hast zu viele Segmente in diesem Video eingereicht. Bist du dir sicher?"
+    },
+    "409": {
+        "message": "Dieser Inhalt wurde bereits eingereicht."
+    },
+    "channelWhitelisted": {
+        "message": "Kanal auf Whitelist gesetzt!"
+    },
+    "Sponsor": {
+        "message": "Sponsor"
+    },
+    "Sponsors": {
+        "message": "Sponsoren"
+    },
+   "Segment": {
+        "message": "gesponsorter Inhalt"
+    },
+    "Segments": {
+        "message": "gesponsorte Inhalte"
+    },
+    "noticeTitle": {
+        "message": "Sponsor übersprungen"
+    },
+    "reportButtonTitle": {
+        "message": "Melden"
+    },
+    "reportButtonInfo": {
+        "message": "Melde dieses Segment als unzulässig."
+    },
+    "Dismiss": {
+        "message": "Abbrechen"
+    },
+    "Loading": {
+        "message": "Laden..."
+    },
+    "Mins": {
+        "message": "Minuten"
+    },
+    "Secs": {
+        "message": "Sekunden"
+    },
+    "Hide": {
+        "message": "Verstecken"
+    },
+    "hitGoBack": {
+        "message": "Klicke Zurück um die Aktion rückgängig zu machen."
+    },
+    "unskip": {
+        "message": "Zurück"
+    },
+    "reskip": {
+        "message": "Vorwärts"
+    },
+    "paused": {
+        "message": "Pausiert"
+    },
+    "confirmMSG": {
+        "message": "\n\nUm einzelne Werte zu löschen oder zu ändern, klicke auf den Info-Button, oder öffne die Erweiterungs-Übersicht, indem du das Erweiterungssymbol in der rechten oberen Ecke anklickst."
+    },
+    "clearThis": {
+        "message": "Bist du sicher, dass du Folgendes löschen möchtest?\n\n"
+    },
+    "Unknown": {
+        "message": "Deine Segmente konnte nicht gesendet werden, bitte versuche es später erneut."
+    },
+    "sponsorFound": {
+        "message": "Die gesponsorten Inhalte dieses Videos befindet sich bereits in der Datenbank!"
+    },
+    "sponsor404": {
+        "message": "Keine Sponsoren gefunden"
+    },
+    "sponsorStart": {
+        "message": "Gesponserter Inhalt beginnt"
+    },
+    "sponsorEnd": {
+        "message": "Gesponserter Inhalt endet"
+    },
+    "noVideoID": {
+        "message": "Keine YouTube-Videos in diesem Tab gefunden. Wenn dies ein Youtube-Tab ist, schließe dieses Pop-up und öffne es erneut. Wenn das nicht hilft, versuche den Tab neu zu laden."
+    },
+    "success": {
+        "message": "Erfolg!"
+    },
+    "voted": {
+        "message": "Abgestimmt!"
+    },
+    "voteFail": {
+        "message": "Du hast bereits so abgestimmt."
+    },
+    "serverDown": {
+        "message": "Der Server ist scheinbar offline. Bitte unverzüglich dem Entwickler melden."
+    },
+    "connectionError": {
+        "message": "Ein Verbindungsfehler ist aufgetreten. Fehlermeldung: "
+    },
+    "wantToSubmit": {
+        "message": "Möchtest du die Segmente für die Video ID senden?"
+    },
+    "leftTimes": {
+        "message": "Scheinbar hast du einige Segmente noch nicht gesendet. Kehre zur Seite zurück um sie zu senden (sie sind noch gespeichert)."
+    },
+    "clearTimes": {
+        "message": "Lösche Auswahl"
+    },
+    "openPopup": {
+        "message": "Öffne SponsorBlock-Popup"
+    },
+    "SubmitTimes": {
+        "message": "Sende Auswahl"
+    },
+    "submitCheck": {
+        "message": "Bist du sicher, dass die Auswahl abgeschickt werden soll?"
+    },
+    "whitelistChannel": {
+         "message": "Kanal auf Whitelist setzen "
+    },
+    "removeFromWhitelist": {
+         "message": "Kanal von Whitelist entfernen"
+    },
+    "voteOnTime": {
+         "message": "Stimme für Zeiten ab"
+    },
+    "recordTimes": {
+         "message": "Lege das Zeitfenster eines gesponsorten Inhalts fest"
+    },
+    "soFarUHSubmited": {
+         "message": "Gemeldet wurden von dir bisher"
+    },
+    "savedPeopleFrom": {
+         "message": "Du hast andere Benutzer bewahrt vor"
+    },
+    "viewLeaderboard": {
+         "message": "Siehe Rangliste"
+    },
+    "here": {
+        "message": "hier"
+    },
+    "recordTimesDescription": {
+         "message": "Klicke den Knopf unten, wenn der gesponsorte Inhalt beginnt und endet, um aufzunehmen und\n einzusenden"
+    },
+    "popupHint": {
+         "message": "Hinweis: In den Optionen lässt sich eine Taste für das Festlegen von Anfang/Ende des gesponsorten Inhalts, sowie für das Einsenden festlegen"
+    },
+    "lastTimes": {
+         "message": "Letzte ausgewählte Zeitabschnitte"
+    },
+    "clearTimesButton": {
+        "message": "Zeiten löschen"
+    },
+    "submitTimesButton": {
+        "message": "Zeiten einsenden"
+    },
+    "publicStats": {
+        "message": "Dies ist wichtig für die öffentliche Nutzerstatistik. Siehe"
+    },
+    "setUsername": {
+        "message": "Alias festlegen"
+    },
+    "discordAdvert": {
+        "message": "Tritt dem offiziellen Discord-Kanal bei und teile Anregungen und Feedback!"
+    },
+    "hideThis": {
+        "message": "Verstecken"
+    },
+    "Options": {
+        "message": "Optionen"
+    },
+    "showButtons": {
+        "message": "Knöpfe in YouTube-Leiste zeigen"
+    },
+    "hideButtons": {
+        "message": "Knöpfe in YouTube-Leiste verstecken"
+    },
+    "hideButtonsDescription": {
+        "message": "Die Einstellung versteckt den Einsende-Knopf in der Youtube-Leiste. Ich kann verstehen, weshalb manchen diese Funktion\n an dieser Stelle stört. Stattdessen kann dafür dieses Pop-up genutzt werden. Um die transparente Benachrichtigung zu verstecken, klicke auf den \"Verstecken\"-Knopf \n der Benachrichtigung. Diese Einstellungen können wieder rückgängig gemacht werden."
+    },
+    "showInfoButton": {
+        "message": "Zeige Info-Knopf in Youtube-Leiste"
+    },
+    "hideInfoButton": {
+        "message": "Verstecke Info-Knopf in Youtube-Leiste"
+    },
+    "whatInfoButton": {
+        "message": "Dieser Knopf öffnet ein Pop-up auf der Youtube-Seite."
+    },
+    "hideDeleteButton": {
+        "message": "Verstecke Löschen-Knopf in Youtube Leiste"
+    },
+    "showDeleteButton": {
+        "message": "Zeige Löschen-Knopf in Youtube Leiste"
+    },
+    "whatDeleteButton": {
+        "message": "Dieser Knopf entfernt sämtlich Segmente in der Youtube-Zeitleiste."
+    },
+    "disableViewTracking": {
+        "message": "Deaktiviere mitzählen übersprungener Sponsoren"
+    },
+    "enableViewTracking": {
+        "message": "Aktiviere mitzählen übersprungener Sponsoren"
+    },
+    "whatViewTracking": {
+        "message": "Diese Funktion hält fest, welche Sponsoren von dir übersprungen wurden und hilft anderen zu erfahren, was ihre Einsendungen bewirkt haben.\n Außerdem dienen die Werte zusammen mit positiven Rückmeldungen als Anti-Spam-Schutz. \n Wenn ein gesponsorter Inhalt übersprungen wird, sendet die Erweiterung eine Nachricht an den Server. \n Hoffentlich wird diese Funktion auch weiterhin genutzt, damit der Algorithmus funktioniert. :)"
+    },
+    "showNotice": {
+        "message": "Benachrichtigung wieder zeigen"
+    },
+    "longDescription": {
+        "message": "SponsorBlock ist eine Erweiterung, die gesponsorte Segmente in YouTube-Videos überspringt. SponsorBlock ist ein Benutzernetzwerk, bei dem jeder Anfang und Ende eines Werbeblocks einreichen kann. Sobald die Information von einem Nutzer eingereicht wurde, überspringen die Erweiterungen der anderen dieses Segment automatisch.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Webseite",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Quellcode",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "Die Benachrichtigung wurde verbessert!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Gefällt dir immer noch nicht? Dann klicke den Verstecken-Knopf.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Segment aufnehmen Taste festlegen"
+    },
+    "setSubmitKeybind": {
+        "message": "Segment einsenden Taste festlegen"
+    },
+    "keybindDescription": {
+        "message": "Taste drücken, um festzulegen"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Die Taste wurde festgelegt auf: "
+    },
+    "0": {
+        "message": "Verbindungsüberschreibung. Überprüfe deine Internetverbindung. Bist du mit dem Internet verbunden, ist der Server wahrscheinlich offline."
+    },
+    "disableSkipping": {
+        "message": "SponsorBlock ausschalten"
+    },
+    "enableSkipping": {
+        "message": "SponsorBlock einschalten"
+    },
+    "yourWork": {
+        "message": "Deine Statistik",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "Der Server scheint überlastet zu sein. Probiere es in ein paar Sekunden erneut."
+    },
+    "errorCode": {
+        "message": "Fehlermeldung: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Sponsor überspringen?"
+    },
+    "skip": {
+        "message": "Überspringen"
+    },
+    "disableAutoSkip": {
+        "message": "Auto-Überspringen deaktivieren"
+    },
+    "enableAutoSkip": {
+        "message": "Auto-Überspringen aktivieren"
+    },
+    "autoSkipDescription": {
+        "message": "Auto-Überspringen überspringt gesponsorte Inhalte für dich. Wenn deaktiviert, fragt die Benachrichtigung, ob übersprungen werden soll."
+    },
+    "youHaveSkipped": {
+        "message": "Du hast übersprungen "
+    },
+    "youHaveSaved": {
+        "message": "Du hast dir erspart "
+    },
+    "minLower": {
+        "message": "Minute"
+    },
+    "minsLower": {
+        "message": "Minuten"
+    },
+    "hourLower": {
+        "message": "Stunde"
+    },
+    "hoursLower": {
+        "message": "Stunden"
+    },
+    "youHaveSavedTime": {
+        "message": "Du erspartest anderen"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " ihrer Zeit."
+    }
+}
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -24,9 +24,6 @@
    "409": {
        "message": "This has already been submitted before"
    },
-    "502": {
-        "message": "It seems the server is down. Contact the dev to inform them."
-    },
    "channelWhitelisted": {
        "message": "Channel Whitelisted!"
    },
@@ -79,7 +76,7 @@
        "message": "Paused"
    },
    "confirmMSG": {
-        "message": "\n\nTo edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+        "message": "To edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
    },
    "clearThis": {
        "message": "Are you sure you want to clear this?\n\n"
@@ -100,7 +97,7 @@
        "message": "Sponsorship Ends Now"
    },
    "noVideoID": {
-        "message": "This probably isn't a YouTube tab, or you clicked too early. \n If you know this is a YouTube tab,\n close this popup and open it again."
+        "message": "No YouTube video found at this tab. If you know this is a YouTube tab, close this popup and open it again. If that does not work, try reloading the tab."
    },
    "success": {
        "message": "Success!"
@@ -141,9 +138,6 @@
    "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"
    },
@@ -193,10 +187,10 @@
        "message": "Options"
    },
    "showButtons": {
-        "message": "Hide Buttons On YouTube Player"
+        "message": "Show Buttons On YouTube Player"
    },
    "hideButtons": {
-        "message": "Show Buttons On YouTube Player"
+        "message": "Hide 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."
@@ -220,10 +214,10 @@
        "message": "This is the button that allows you to clear all sponsors on the YouTube player."
    },
    "disableViewTracking": {
-        "message": "Disable Sponsor View Tracking"
+        "message": "Disable Sponsor Skip Count Tracking"
    },
    "enableViewTracking": {
-        "message": "Enable Sponsor View Tracking"
+        "message": "Enable Sponsor Skip Count 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. :)"
@@ -262,5 +256,69 @@
    },
    "keybindDescriptionComplete": {
        "message": "The keybind has been set to: "
+    },
+    "0": {
+        "message": "Connection Timeout. Check your internet connection. If your internet is working, the server is probably overloaded or down."
+    },
+    "disableSkipping": {
+        "message": "Disable SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "Enable SponsorBlock"
+    },
+    "yourWork": {
+        "message": "Your Work",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "The server seems to be overloaded. Try again in a few seconds."
+    },
+    "errorCode": {
+        "message": "Error Code: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Skip Sponsor?"
+    },
+    "skip": {
+        "message": "Skip"
+    },
+    "disableAutoSkip": {
+        "message": "Disable Auto Skip"
+    },
+    "enableAutoSkip": {
+        "message": "Enable Auto Skip"
+    },
+    "autoSkipDescription": {
+        "message": "Auto skip will skip sponsors for you. If disabled, a notice will appear asking if you'd like to skip."
+    },
+    "youHaveSkipped": {
+        "message": "You have skipped "
+    },
+    "youHaveSaved": {
+        "message": "You have saved yourself "
+    },
+    "minLower": {
+        "message": "minute"
+    },
+    "minsLower": {
+        "message": "minutes"
+    },
+    "hourLower": {
+        "message": "hour"
+    },
+    "hoursLower": {
+        "message": "hours"
+    },
+    "youHaveSavedTime": {
+        "message": "You have saved people"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " of their lives."
+    },
+    "guildlinesSummary": {
+        "message": "- Make sure your segment only contains paid promotion segment, nothing else.\n- Make sure skipping this segment will not skip valuable content\n- If the whole video is a sponsor, please do not report it. A full video reporting system will come out soon.\n- Please do not report disclaimers that could show bias (if a review video is sponsored, don't skip when they mention that)."
+    },
+    "statusReminder": {
+        "message": "Check status.sponsor.ajay.app for server status."
    }
 }
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -4,7 +4,7 @@
        "description": "Name of the extension."
    },
    "fullName": {
-        "message": "SponsorBlock pour YouTube - Enlève les messages commerciaux et publicités intégrées",
+        "message": "SponsorBlock pour YouTube - Supprime les messages commerciaux et publicités intégrées",
        "description": "Name of the extension."
    },

@@ -19,16 +19,13 @@
        "message": "Soumission invalide"
    },
    "429": {
-        "message": "Vous cherchez à envoyer beaucoup de segments, il y en a vraiment autant ?"
+        "message": "Vous cherchez à envoyer beaucoup de segments, y en a-t-il 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 !"
+        "message": "Cette chaîne est sur la liste blanche !"
    },
    "Sponsor": {
        "message": "message commercial"
@@ -37,19 +34,19 @@
        "message": "messages commerciaux"
    },
    "Segment": {
-        "message": "segment de message commercial"
+        "message": "segment commercial"
    },
    "Segments": {
-        "message": "segments de message commercial"
+        "message": "segments commerciaux"
    },
    "noticeTitle": {
-        "message": "Message passé"
+        "message": "Message commercial passé"
    },
    "reportButtonTitle": {
        "message": "Incorrect"
    },
    "reportButtonInfo": {
-        "message": "Signaler que ce segment est incorrect ou n'existe pas."
+        "message": "Signaler que ce segment commercial est incorrect ou n'existe pas."
    },
    "Dismiss": {
        "message": "Fermer"
@@ -67,7 +64,7 @@
        "message": "Ne plus montrer"
    },
    "hitGoBack": {
-        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment"
+        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment commercial"
    },
    "unskip": {
        "message": "Revenir en arrière"
@@ -79,28 +76,28 @@
        "message": "En pause"
    },
    "confirmMSG": {
-        "message": "\n\nPour modifier ou enlever des soumissions, cliquez sur le bouton d'info."
+        "message": "\n\nPour modifier ou supprimer des soumissions, cliquez sur le bouton d'info ou ouvrez la fenêtre de l'extension en cliquant sur son icône dans le coin en haut à droite."
    },
    "clearThis": {
-        "message": "Êtes-vous certain(e) que vous voulez enlever vos soumissions ?\n\n"
+        "message": "Êtes-vous certain(e) de vouloir supprimer vos soumissions ?\n\n"
    },
    "Unknown": {
-        "message": "Erreur, essayer plus tard."
+        "message": "Une erreur s'est produite lors de la soumission, veuillez ré-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"
+        "message": "Pas de messages commerciaux trouvés"
    },
    "sponsorStart": {
-        "message": "Début du message"
+        "message": "Début du message commercial"
    },
    "sponsorEnd": {
-        "message": "Fin du message"
+        "message": "Fin du message commercial"
    },
    "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."
+        "message": "Ceci n'est pas un onglet YouTube, ou vous avez cliqué trop tôt. \n Si vous êtes sûr(e) que c'est un onglet YouTube, fermez cette fenêtre et réessayez."
    },
    "success": {
        "message": "Succès !"
@@ -109,21 +106,158 @@
        "message": "A voté !"
    },
    "voteFail": {
-        "message": "Vous avez déjà voté pour ce choix auparavant."
+        "message": "Vous avez déjà voté pour ce choix."
    },
    "serverDown": {
        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
    },
    "connectionError": {
-        "message": "Erreur de connexion, Code : "
+        "message": "Erreur de connexion. Code d'erreur : "
    },
    "wantToSubmit": {
-        "message": "Voulez-vous soumettre les messages pour cette vidéo"
+        "message": "Voulez-vous soumettre les segments commerciaux 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)."
+        "message": "Vous avez laissé des segments commerciaux non soumis. Retournez sur la vidéo pour les soumettre (ils ont été conservés)."
+    },
+    "clearTimes": {
+        "message": "Supprimer les segments commerciaux"
+    },
+    "openPopup": {
+        "message": "Ouvrir l'encart SponsorBlock"
+    },
+    "SubmitTimes": {
+        "message": "Soumettre les segments commerciaux"
    },
    "submitCheck": {
-        "message": "Soumettre ce(s) message(s) ?"
+        "message": "Êtes-vous sûr de vouloir soumettre ces segments?"
+    },
+    "whitelistChannel": {
+        "message": "Ajouter la chaîne à la liste blanche"
+    },
+    "removeFromWhitelist": {
+        "message": "Supprimer la chaîne de la liste blanche"
+    },
+    "whitelistDescription": {
+        "message": "Ajouter à la liste blanche les chaînes qui publient des messages commerciaux de façon éthique pour encourager les bons comportements, ou qui publient des messages commerciaux divertissants ou drôles. Ou pas, c'est votre choix."
+    },
+    "voteOnTime": {
+        "message": "Voter sur un segment commercial"
+    },
+    "recordTimes": {
+        "message": "Enregistrer un segment commercial"
+    },
+    "soFarUHSubmited": {
+        "message": "Vous avez soumis jusqu'à présent"
+    },
+    "savedPeopleFrom": {
+        "message": "Vous avez fait gagner aux autres "
+    },
+    "viewLeaderboard": {
+        "message": "Consulter le classement"
+    },
+    "here": {
+        "message": "ici"
+    },
+    "recordTimesDescription": {
+        "message": "Cliquez sur le bouton ci-dessous quand le segment commercial commence puis \nse termine pour l'enregistrer et le soumettre à la base de données."
+    },
+    "popupHint": {
+        "message": "Astuce : utilisez la touche point-virgule lorsque la vidéo est sélectionnée pour enregistrer le début et la fin d'un segment commercial; utilisez la touche guillemet pour le soumettre. (Les touches peuvent être modifiées dans les options)"
+    },
+    "lastTimes": {
+        "message": "Derniers temps choisis pour le segment commercial"
+    },
+    "clearTimesButton": {
+        "message": "Supprimer les temps"
+    },
+    "submitTimesButton": {
+        "message": "Soumettre les temps"
+    },
+    "publicStats": {
+        "message": "Affiché sur le classement public pour montrer vos contributions. Voir sur"
+    },
+    "setUsername": {
+        "message": "Choisir pseudo"
+    },
+    "discordAdvert": {
+        "message": "Rejoignez le serveur Discord officiel pour toutes suggestions ou remarques!"
+    },
+    "hideThis": {
+        "message": "Cacher"
+    },
+    "Options": {
+        "message": "Options"
+    },
+    "showButtons": {
+        "message": "Montrer les boutons sur le lecteur YouTube"
+    },
+    "hideButtons": {
+        "message": "Cacher les boutons sur le lecteur YouTube"
+    },
+    "hideButtonsDescription": {
+        "message": "Cela permet de cacher du lecteur YouTube les boutons utilisés pour soumettre des segments commerciaux. Je peux \ncomprendre que certaines personnes les trouvent perturbants. Au lieu d'utiliser ces boutons, cette fenêtre peut être utilisée \npour soumettre des segments commerciaux. Pour cacher la notification, utilisez le bouton \"Ne plus montrer\" sur la notification. Vous pouvez toujours réactiver ces paramètres plus tard."
+    },
+    "showInfoButton": {
+        "message": "Montrer le bouton Info sur le lecteur YouTube"
+    },
+    "hideInfoButton": {
+        "message": "Cacher le bouton Info sur le lecteur YouTube"
+    },
+    "whatInfoButton": {
+        "message": "Il s'agit du bouton qui ouvre l'encart sur la page YouTube."
+    },
+    "hideDeleteButton": {
+        "message": "Cacher le bouton Supprimer sur le lecteur YouTube"
+    },
+    "showDeleteButton": {
+        "message": "Montrer le bouton Supprimer sur le lecteur YouTube"
+    },
+    "whatDeleteButton": {
+        "message": "Il s'agit du bouton qui permet de supprimer tous les segments commerciaux depuis le lecteur YouTube."
+    },
+    "disableViewTracking": {
+        "message": "Désactiver le suivi des vues de segments commerciaux"
+    },
+    "enableViewTracking": {
+        "message": "Activer le suivi des vues de segments commerciaux"
+    },
+    "whatViewTracking": {
+        "message": "Cette fonctionnalité suit quels segments commerciaux vous avez sautés afin de calculer le bénéfice des soumissions des \nautres utilisateurs. Elle est également utilisée comme métrique, avec les haut-votes, afin de s'assurer que les spams \nsont ignorés. L'extension envoie un message au serveur à chauqe fois qu'un segment commercial est sauté. Avec un peu de chance, peu de personnes désactiveront cette fonctionnalité afin d'obtenir des nombres de vues exacts. :)"
+    },
+    "showNotice": {
+        "message": "Afficher la notification"
+    },
+    "longDescription": {
+        "message": "SponsorBlock est une extension qui permet de passer les messages commerciaux des vidéos YouTube. SponsorBlock est une extension pour navigateur basée sur le crowdsourcing permettant à n'importe qui de soumettre le début et la fin des segments commerciaux sur les vidéos YouTube. Dès qu'une personne a soumis ces informations, les autres utilisateurs de l'extension en bénéficieront et verront les messages commerciaux automatiquement sautés.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Site web",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Code source",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "La notification a été mise à jour !",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Si elle ne vous plaît pas, cliquez sur le bouton \"Ne plus montrer\"",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Changer le raccourci pour enregistrer un segment"
+    },
+    "setSubmitKeybind": {
+        "message": "Changer le raccourci pour soumettre les segments"
+    },
+    "keybindDescription": {
+        "message": "Appuyez sur une touche"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Le raccourci choisi est : "
    }
 }
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -24,9 +24,6 @@
    "409": {
        "message": "Questo spezzone è già stato inviato"
    },
-    "502": {
-        "message": "Sembra che il server non funzioni. Contatta lo sviluppatore."
-    },
    "channelWhitelisted": {
        "message": "Canale aggiunto alla whitelist!"
    },
@@ -194,10 +191,10 @@
        "message": "Opzioni"
    },
    "showButtons": {
-        "message": "Nascondi i Pulsanti nel Lettore di YouTube"
+        "message": "Mostra i Pulsanti nel Lettore di YouTube"
    },
    "hideButtons": {
-        "message": "Mostra i Pulsanti nel Lettore di YouTube"
+        "message": "Nascondi 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."
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -24,9 +24,6 @@
    "409": {
        "message": "Isso já foi enviado antes"
    },
-    "502": {
-        "message": "Parece que o servidor caiu. Contate o desenvolvedor para informá-los."
-    },
    "channelWhitelisted": {
        "message": "Canal adicionado à lista branca!"
    },
@@ -194,10 +191,10 @@
        "message": "Opções"
    },
    "showButtons": {
-        "message": "Esconder botões no player do Youtube"
+        "message": "Mostrar botões no player do Youtube"
    },
    "hideButtons": {
-        "message": "Mostrar botões no player do Youtube"
+        "message": "Esconder botões no player do Youtube"
    },
    "hideButtonsDescription": {
        "message": "Isto esconde os botões que aparecem no player do Youtube para submeter patrocínios. Entendemos que possa ser\n incómodo a algumas pessoas. Em vez de usar esses botões pode usar os do popup. Para esconder a mensagem que aparece, \n ususe o botão na mesma que diz \"Don't show this again\". Pode sempre reactivar estas definições novamente."
--- a/_locales/pt_pt/messages.json
+++ b/_locales/pt_pt/messages.json
@@ -24,9 +24,6 @@
    "409": {
        "message": "Isso já foi enviado antes"
    },
-    "502": {
-        "message": "Parece que o servidor caiu. Contacte o desenvolvedor para o informar."
-    },
    "channelWhitelisted": {
        "message": "Canal adicionado à whitelist!"
    },
@@ -193,10 +190,10 @@
        "message": "Opções"
    },
    "showButtons": {
-        "message": "Esconder botões no player do Youtube"
+        "message": "Mostrar botões no player do Youtube"
    },
    "hideButtons": {
-        "message": "Mostrar botões no player do Youtube"
+        "message": "Esconder botões no player do Youtube"
    },
    "hideButtonsDescription": {
        "message": "Isto esconde os botões que aparecem no player do Youtube para submeter patrocínios. Entendemos que possa ser\n incómodo a algumas pessoas. Em vez de usar esses botões pode usar os do popup. Para esconder a mensagem que aparece, \n ususe o botão na mesma que diz \"Don't show this again\". Pode sempre reactivar estas definições novamente."
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -24,9 +24,6 @@
    "409": {
        "message": "Этот запрос был отправлен ранее."
    },
-    "502": {
-        "message": "Сервер недоступен. Свяжитесь с разработчиком и сообщите ему об этом."
-    },
    "channelWhitelisted": {
        "message": "Канал добавлен в белый список!"
    },
--- a/background.js
+++ b/background.js
@@ -33,7 +33,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
    case "alertPrevious":
 			chrome.notifications.create("stillThere" + Math.random(), {
        type: "basic",
-        title: chrome.i18n.getMessage("wantToSubmit") + request.previousVideoID + "?",
+        title: chrome.i18n.getMessage("wantToSubmit") + " " + request.previousVideoID + "?",
        message: chrome.i18n.getMessage("leftTimes"),
        iconUrl: "./icons/LogoSponsorBlocker256px.png"
 			});
@@ -42,22 +42,24 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {

 //add help page on install
 chrome.runtime.onInstalled.addListener(function (object) {
-    chrome.storage.sync.get(["userID", "shownInstallPage"], function(result) {
-        const userID = result.userID;
+    setTimeout(function() {
+        chrome.storage.sync.get(["userID"], function(result) {
+            const userID = result.userID;

-        // If there is no userID, then it is the first install.
-        if (!userID){
-            //open up the install page
-            chrome.tabs.create({url: chrome.extension.getURL("/help/"+chrome.i18n.getMessage("helpPage"))});
+            // If there is no userID, then it is the first install.
+            if (!userID){
+                //open up the install page
+                chrome.tabs.create({url: chrome.extension.getURL("/help/index_en.html")});

-            //generate a userID
-            const newUserID = generateUserID();
-            //save this UUID
-            chrome.storage.sync.set({
-                "userID": newUserID
-            });
-        }
-    });
+                //generate a userID
+                const newUserID = generateUserID();
+                //save this UUID
+                chrome.storage.sync.set({
+                    "userID": newUserID
+                });
+            }
+        });
+    }, 1500);
 });

 //gets the sponsor times from memory
@@ -157,6 +159,9 @@ function submitTimes(videoID, callback) {

            //submit these times
            for (let i = 0; i < sponsorTimes.length; i++) {
+                    //to prevent it from happeneing twice
+                    let increasedContributionAmount = false;
+
                    //submit the sponsorTime
                    sendRequestToServer("GET", "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
                    + "&userID=" + userID, function(xmlhttp, error) {
@@ -175,7 +180,11 @@ function submitTimes(videoID, callback) {
                                    }

                                    //save the amount contributed
-                                    chrome.storage.sync.set({"sponsorTimesContributed": currentContributionAmount + sponsorTimes.length});
+                                    if (!increasedContributionAmount) {
+                                        increasedContributionAmount = true;
+                                        
+                                        chrome.storage.sync.set({"sponsorTimesContributed": currentContributionAmount + sponsorTimes.length});
+                                    }
                                });
                            }
                        } else if (error) {
@@ -206,22 +215,4 @@ function sendRequestToServer(type, address, callback) {

    //submit this request
    xmlhttp.send();
-}
-
-function generateUserID(length = 36) {
-        let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-        let result = "";
-        if (window.crypto && window.crypto.getRandomValues) {
-                values = new Uint32Array(length);
-                window.crypto.getRandomValues(values);
-                for (i = 0; i < length; i++) {
-                        result += charset[values[i] % charset.length];
-                }
-                return result;
-        } else {
-                for (let i = 0; i < length; i++) {
-                    result += charset[Math.floor(Math.random() * charset.length)];
-                }
-                return result;
-        }
-}
+}
--- a/content.js
+++ b/content.js
@@ -10,6 +10,9 @@ var sponsorVideoID = null;
 //these are sponsors that have been downvoted
 var hiddenSponsorTimes = [];

+/** @type {Array[boolean]} Has the sponsor been skipped */
+var sponsorSkipped = [];
+
 //the video
 var v;

@@ -67,6 +70,24 @@ var sponsorTimesSubmitting = [];
 //this is used to close the popup on YouTube when the other popup opens
 var popupInitialised = false;

+//should skips happen at all
+var disableSkipping = false;
+chrome.storage.sync.get(["disableSkipping"], function(result) {
+    let disableSkippingStorage = result.disableSkipping;
+    if (disableSkippingStorage != undefined) {
+        disableSkipping = disableSkippingStorage;
+    }
+});
+
+//should skips be manual
+var disableAutoSkip = false;
+chrome.storage.sync.get(["disableAutoSkip"], function(result) {
+    let disableAutoSkipStorage = result.disableAutoSkip;
+    if (disableAutoSkipStorage != undefined) {
+        disableAutoSkip = disableAutoSkipStorage;
+    }
+});
+
 //should view counts be tracked
 var trackViewCount = false;
 chrome.storage.sync.get(["trackViewCount"], function(result) {
@@ -378,6 +399,18 @@ function sponsorsLookup(id, channelIDPromise) {
        v.addEventListener('durationchange', updatePreviewBar);
    }

+    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);
+        }
+    }
+
    //check database for sponsor times
    //made true once a setTimeout has been created to try again after a server error
    let recheckStarted = false;
@@ -388,6 +421,9 @@ function sponsorsLookup(id, channelIDPromise) {
            sponsorTimes = JSON.parse(xmlhttp.responseText).sponsorTimes;
            UUIDs = JSON.parse(xmlhttp.responseText).UUIDs;

+            // Reset skip save
+            sponsorSkipped = [];
+
            //update the preview bar
            //leave the type blank for now until categories are added
            if (lastPreviewBarUpdate == id || (lastPreviewBarUpdate == null && !isNaN(v.duration))) {
@@ -396,18 +432,6 @@ function sponsorsLookup(id, channelIDPromise) {
                updatePreviewBar();
            }

-            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) {
            sponsorDataFound = false;
@@ -420,7 +444,8 @@ function sponsorsLookup(id, channelIDPromise) {

                    //if less than 3 days old
                    if ((Date.now() / 1000) - unixTimePublished < 259200) {
-                        setTimeout(() => sponsorsLookup(id), 10000);
+                        //TODO lower when server becomes better
+                        setTimeout(() => sponsorsLookup(id), 180000);
                    }
                }
            });
@@ -429,17 +454,20 @@ function sponsorsLookup(id, channelIDPromise) {
        } else if (xmlhttp.readyState == 4 && sponsorLookupRetries < 90 && !recheckStarted) {
            recheckStarted = true;

+            //TODO lower when server becomes better (back to 1 second)
            //some error occurred, try again in a second
-            setTimeout(() => sponsorsLookup(id), 1000);
+            setTimeout(() => sponsorsLookup(id), 10000);

            sponsorLookupRetries++;
        }
    });

    //add the event to run on the videos "ontimeupdate"
-    v.ontimeupdate = function () { 
-        sponsorCheck();
-    };
+    if (!disableSkipping) {
+        v.ontimeupdate = function () { 
+            sponsorCheck();
+        };
+    }
 }

 function updatePreviewBar() {
@@ -451,7 +479,12 @@ function updatePreviewBar() {
    //create an array of the sponsor types
    let types = [];
    for (let i = 0; i < localSponsorTimes.length; i++) {
-        types.push("sponsor");
+        if (!hiddenSponsorTimes.includes(i)) {
+            types.push("sponsor");
+        } else {
+            // Don't show this sponsor
+            types.push(null);
+        }
    }
    for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
        types.push("previewSponsor");
@@ -465,25 +498,24 @@ function updatePreviewBar() {

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

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

-    if (channelContainers.length == 0) {
+    let channelURLContainer = channelNameContainer.querySelector("#container").querySelector("#text-container").querySelector("#text").firstElementChild;
+
+    if (channelURLContainer === null) {
        //old YouTube theme
-        channelContainers = document.getElementsByClassName("yt-user-info");
+        let channelContainers = document.getElementsByClassName("yt-user-info");
        if (channelContainers.length != 0) {
            channelURLContainer = channelContainers[0].firstElementChild;
        }
    }

-    if (channelURLContainer == null) {
+    if (channelURLContainer === null) {
        //try later
        return false;
    }
@@ -517,35 +549,24 @@ function whitelistCheck() {
    chrome.storage.sync.get(["whitelistedChannels"], function(result) {
        let whitelistedChannels = result.whitelistedChannels;

+        console.log(channelURL)
+
        if (whitelistedChannels != undefined && whitelistedChannels.includes(channelURL)) {
-            //reset sponsor times to nothing
-            sponsorTimes = [];
-            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});
-            }
        }
    });
 }

 //video skipping
 function sponsorCheck() {
+    if (disableSkipping) {
+        // Make sure this isn't called again
+        v.ontimeupdate = null;
+        return;
+    } else if (channelWhitelisted) {
+        return;
+    }
+
    let skipHappened = false;

    if (sponsorTimes != null) {
@@ -604,7 +625,9 @@ function checkIfTimeToSkip(currentVideoTime, startTime, endTime) {

 //skip fromt he start time to the end time for a certain index sponsor time
 function skipToTime(v, index, sponsorTimes, openNotice) {
-    v.currentTime = sponsorTimes[index][1];
+    if (!disableAutoSkip) {
+        v.currentTime = sponsorTimes[index][1];
+    }

    lastSponsorTimeSkipped = sponsorTimes[index][0];
  
@@ -614,7 +637,7 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
    if (openNotice) {
        //send out the message saying that a sponsor message was skipped
        if (!dontShowNotice) {
-            let skipNotice = new SkipNotice(this, currentUUID);
+            let skipNotice = new SkipNotice(this, currentUUID, disableAutoSkip);

            if (dontShowNoticeOld) {
                //show why this notice is showing
@@ -626,15 +649,31 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
            }

            //auto-upvote this sponsor
-            if (trackViewCount) {
+            if (trackViewCount && !disableAutoSkip) {
                vote(1, currentUUID, null);
            }
        }
    }

    //send telemetry that a this sponsor was skipped happened
-    if (trackViewCount) {
+    if (trackViewCount && !sponsorSkipped[index]) {
        sendRequestToServer("GET", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
+
+        if (!disableAutoSkip) {
+            // Count this as a skip
+            chrome.storage.sync.get(["minutesSaved"], function(result) {
+                if (result.minutesSaved === undefined) result.minutesSaved = 0;
+
+                chrome.storage.sync.set({"minutesSaved": result.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60 });
+            });
+            chrome.storage.sync.get(["skipCount"], function(result) {
+                if (result.skipCount === undefined) result.skipCount = 0;
+
+                chrome.storage.sync.set({"skipCount": result.skipCount + 1 });
+            });
+
+            sponsorSkipped[index] = true;
+        }
    }
 }

@@ -903,6 +942,30 @@ function vote(type, UUID, skipNotice) {
        skipNotice.resetNoticeInfoMessage.bind(skipNotice)();
    }

+    let sponsorIndex = UUIDs.indexOf(UUID);
+
+    // See if the local time saved count and skip count should be reverted
+    if (type == 0 && sponsorSkipped[sponsorIndex] || type == 1 && !sponsorSkipped[sponsorIndex]) {
+        let factor = 1;
+        if (type == 0) {
+            factor = -1;
+        }
+
+        // Count this as a skip
+        chrome.storage.sync.get(["minutesSaved"], function(result) {
+            if (result.minutesSaved === undefined) result.minutesSaved = 0;
+
+            chrome.storage.sync.set({"minutesSaved": result.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60 });
+        });
+        chrome.storage.sync.get(["skipCount"], function(result) {
+            if (result.skipCount === undefined) result.skipCount = 0;
+
+            chrome.storage.sync.set({"skipCount": result.skipCount + factor * 1 });
+        });
+
+        sponsorSkipped[sponsorIndex] = !sponsorSkipped[sponsorIndex];
+    }
+ 
    chrome.runtime.sendMessage({
        message: "submitVote",
        type: type,
@@ -921,14 +984,8 @@ function vote(type, UUID, skipNotice) {
                    skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("voteFail"))
                    skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                } else if (response.successType == -1) {
-                    if (response.statusCode == 502) {
-                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("serverDown"))
-                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
-                    } else {
-                        //failure: unknown error
-                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("connectionError") + response.statusCode);
-                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
-                    }
+                    skipNotice.addNoticeInfoMessage.bind(skipNotice)(getErrorMessage(response.statusCode))
+                    skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                }
            }
        }
@@ -988,8 +1045,11 @@ function submitSponsorTimes() {
            //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");
+            //update sponsorTimesSubmitting
+            sponsorTimesSubmitting = sponsorTimes;
+
+            let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes)
+                                    + "\n\n" + chrome.i18n.getMessage("confirmMSG")  + "\n\n" + chrome.i18n.getMessage("guildlinesSummary");
            if(!confirm(confirmMessage)) return;

            sendSubmitMessage();
@@ -1032,18 +1092,23 @@ function sendSubmitMessage(){
                let sponsorTimeKey = "sponsorTimes" + currentVideoID;
                chrome.storage.sync.set({[sponsorTimeKey]: []});

-                //request the sponsors from the server again
-                sponsorsLookup(currentVideoID);
+                //add submissions to current sponsors list
+                sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);
+                for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
+                    // Add some random IDs
+                    UUIDs.push(generateUserID());
+                }
+
+                // Empty the submitting times
+                sponsorTimesSubmitting = [];
+
+                updatePreviewBar();
            } else {
                //show that the upload failed
                document.getElementById("submitButton").style.animation = "unset";
                document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");

-                if([400,429,409,502].includes(response.statusCode)) {
-                    alert(chrome.i18n.getMessage(response.statusCode));
-                } else {
-                    alert(chrome.i18n.getMessage("connectionError") + response.statusCode);
-                }
+                alert(getErrorMessage(response.statusCode));
            }
        }
    });
--- a/help/index_en.html
+++ b/help/index_en.html
@@ -39,7 +39,7 @@
      <br/>
      <br/>

-      Whenever you skip a video, you will get a notice report that submission. If the timing seems wrong, report it! You can also vote in the popup. The extension auto upvotes it if you don't report it, so make sure to report when necessary.
+      Whenever you skip a video, you will get a notice report that submission. If the timing seems wrong, report it! You can also vote in the popup. The extension auto upvotes it if you don't report it, so make sure to report when necessary (this can be disabled in the options).
    </p>

    <center><img height="120px" src="https://user-images.githubusercontent.com/12688112/63067735-5a638700-bede-11e9-8147-f321b57527ec.gif"></center>
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
  "name": "__MSG_fullName__",
  "short_name": "__MSG_Name__",
-  "version": "1.1.9.2",
+  "version": "1.2.0",
  "default_locale": "en",
  "description": "__MSG_Description__",
  "content_scripts": [
--- a/popup.css
+++ b/popup.css
@@ -35,6 +35,10 @@ sub.popupElement {
 }
 /* end reset */

+#sponsorBlockPopupLogo {
+	vertical-align: text-bottom;
+}
+
 .popupElement {
    font-family: 'Source Sans Pro', sans-serif;

@@ -43,12 +47,13 @@ sub.popupElement {

 h1.popupElement {
 	margin-top: 0px;
+	margin-bottom: 10px;
 }

 .popupBody {
 	font-size: 14px;
 	background-color: #ffd9d9;
-	padding: 5px;
+	padding: 0px 5px;
 }

 .discreteLink.popupElement {
--- a/popup.html
+++ b/popup.html
@@ -8,88 +8,35 @@
  <body class="popupBody">
    <center>
      <div id="app" class="popupBody">
-          <img src="icons/LogoSponsorBlocker256px.png" height="64px" id="sponsorBlockPopupLogo"/>
-
-          <h1 class="popupElement">__MSG_Name__</h1>
+          <h1 class="popupElement">
+            <img src="icons/IconSponsorBlocker256px.png" height="32px" id="sponsorBlockPopupLogo"/>
+            __MSG_Name__
+          </h1>

          <!-- Loading text -->
-          <p id="loadingIndicator" class="popupElement">__MSG_Loading__</p>
-
+          <p id="loadingIndicator" class="popupElement">__MSG_noVideoID__</p>
+          
          <!-- Hidden until loading complete -->
          <div id="mainControls" class="main popupElement" style="display: none">
            <!-- If the video was found in the database -->
            <div id="videoFound">
-                
+                  
            </div>

            <div id="downloadedSponsorMessageTimes" class="popupElement">
-
+  
            </div>
-            
-            <br/>
-
-            <div>
-              <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">
-              __MSG_whitelistDescription__
-            </sub>
-
-            <br/>
-            <br/>
-
-            <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>
-
-            <div id="issueReporterContainer"  class="popupElement" style="display: none">
-
-              <h3 style="margin-top: 0px" class="popupElement">__MSG_voteOnTime__</h3>
-
-              <div id="issueReporterTimeButtons" class="popupElement">
-
-              </div>
-
-            </div>
-
-            <h2 class="recordingSubtitle popupElement">__MSG_recordTimes__</h2>
-
-            <p class="popupElement">
-              <span id=sponsorTimesContributionsContainer  class="popupElement" style="display: none">
-                  __MSG_soFarUHSubmited__
-                  <span id="sponsorTimesContributionsDisplay" class="popupElement">
-                    0
-                  </span>
-                  <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">
-                    __MSG_Sponsors__.
-                  </span>
-              </span>
-
-              <span id=sponsorTimesViewsContainer  class="popupElement" style="display: none">
-                  __MSG_savedPeopleFrom__
-                  <span id="sponsorTimesViewsDisplay" class="popupElement">
-                    0
-                  </span>
-                  <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">
-                     __MSG_Segments__.
-                     __MSG_savedPeopleFrom__
-                  </span>
-              </span>
-
-              <div class="popupElement">
-                __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
-              </div>
-            </p>

            <p class="popupElement"> 
              __MSG_recordTimesDescription__
            </p>
-    
+  
            <div>
              <button id="sponsorStart" class="greenButton popupElement">__MSG_sponsorStart__</button>
            </div>
-
+  
            <sub class="popupElement">__MSG_popupHint__</sub>
-    
+
            <div id="submissionSection"  class="popupElement" style="display: none">
              <h3 class="popupElement">__MSG_lastTimes__</h3>
              <b>
@@ -102,10 +49,11 @@
      
              <button id="clearTimes" class="smallButton popupElement">__MSG_clearTimesButton__</button>
      
-              <br/>
-              <br/>
-
              <div id="submitTimesContainer" class="popupElement" style="display: none">
+
+                <br/>
+                <br/>
+
                <button id="submitTimes" class="smallButton popupElement">__MSG_submitTimesButton__</button>

                <div id="submitTimesInfoMessageContainer" class="popupElement" style="display: none">
@@ -115,36 +63,7 @@
                </div>

              </div>
-      
-            </div>

-            <div id="setUsernameContainer" class="popupElement">
-              <br/>
-              <br/>
-    
-              <button id="setUsernameButton" class="warningButton popupElement">__MSG_setUsername__</button>
-              <br/>
-              <sub class="popupElement">
-                __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>__MSG_setUsername__</h3>
-
-                <div id="setUsernameStatusContainer" style="display: none">
-                    <h2 id="setUsernameStatus"></h2>
-                </div>
-
-
-                <input id="usernameInput" hint="Username"></input>
-
-                <br/>
-                <br/>
-
-                <button id="submitUsername" class="warningButton popupElement">Submit Username</button>
            </div>

            <div id="discordButtonContainer" class="popupElement" style="display: none">
@@ -161,73 +80,190 @@
              <span id="hideDiscordButton" class="smallLink popupElement">__MSG_hideThis__</span>
            </div>

-            <div id="optionsButtonContainer" class="popupElement">
-                <br/>
-                <br/>
-      
-                <button id="optionsButton" class="dangerButton popupElement">__MSG_Options__</button>
+            <div>
+              <br/>
+
+              <button id="whitelistChannel" class="whitelistButton popupElement">__MSG_whitelistChannel__</button>
+              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">__MSG_removeFromWhitelist__</button>
            </div>

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

-                <h3>__MSG_Options__</h3>
+            <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>

-                <span id="keybindButtons">
-                  <button id="setStartSponsorKeybind" class="warningButton popupElement">__MSG_setStartSponsorShortcut__</button>
-                  <br/>
-                  <br/>
-                  <button id="setSubmitKeybind" class="warningButton popupElement">__MSG_setSubmitKeybind__</button>
-                  <br/>
+            <div id="issueReporterContainer"  class="popupElement" style="display: none">
+
+              <h3 style="margin-top: 0px" class="popupElement">__MSG_voteOnTime__</h3>
+
+              <div id="issueReporterTimeButtons" class="popupElement">
+
+              </div>
+
+            </div>
+
+            <br/>
+            <br/>
+
+          </div>
+
+          <div>
+            <button id="disableSkipping" class="greenButton popupElement">__MSG_disableSkipping__</button>
+            <button id="enableSkipping" class="whitelistButton popupElement" style="display: none">__MSG_enableSkipping__</button>
+          </div>
+
+          <h2 class="recordingSubtitle popupElement">__MSG_yourWork__</h2>
+
+          <p class="popupElement">
+            <span id="sponsorTimesContributionsContainer"  class="popupElement" style="display: none">
+                __MSG_soFarUHSubmited__
+                <span id="sponsorTimesContributionsDisplay" class="popupElement">
+                  0
                </span>
-                
-                <h2 id="keybindDescription" style="display: none" class="popupElement">__MSG_keybindDescription__</h2>
+                <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">__MSG_Sponsors__</span>.
+            </span>

-                <br/>
-                <br/>
-      
-                <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">
-                  __MSG_hideButtonsDescription__
-                </sub>
+            <span id="sponsorTimesViewsContainer"  class="popupElement" style="display: none">
+                __MSG_savedPeopleFrom__
+                <span id="sponsorTimesViewsDisplay" class="popupElement">
+                  0
+                </span>
+                <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">__MSG_Segments__</span>.
+            </span>

-                <br/>
-                <br/>
+            <span id="sponsorTimesOthersTimeSavedContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSavedTime__
+              <span id="sponsorTimesOthersTimeSavedDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimesOthersTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span>

-                <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">
-                  __MSG_whatInfoButton__
-                </sub>
+              <span class="popupElement">__MSG_youHaveSavedTimeEnd__</span>
+            </span>

-                <br/>
-                <br/>
-
-                <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">
-                  __MSG_whatDeleteButton__
-                </sub>
-
-                <br/>
-                <br/>
-
-                <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">
-                  __MSG_whatViewTracking__
-                </sub>
-      
-                <br/>
-                <br/>
-
-                <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
+            <div id="sponsorTimesSkipsDoneContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSkipped__
+              <span id="sponsorTimesSkipsDoneDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span> since December 5th.
            </div>
+
+            <div id="sponsorTimeSavedContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSaved__
+              <span id="sponsorTimeSavedDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span> since December 5th.
+
+              </br/>
+              </br/>
+            </div>
+
+            <div class="popupElement">
+              __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
+            </div>
+          </p>
+
+          <div id="setUsernameContainer" class="popupElement">
+  
+            <button id="setUsernameButton" class="warningButton popupElement">__MSG_setUsername__</button>
+            <br/>
+            <sub class="popupElement">
+              __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">
+              <h3>__MSG_setUsername__</h3>
+
+              <div id="setUsernameStatusContainer" style="display: none">
+                  <h2 id="setUsernameStatus"></h2>
+              </div>
+
+              <input id="usernameInput" hint="Username"></input>
+
+              <br/>
+              <br/>
+
+              <button id="submitUsername" class="warningButton popupElement">__MSG_setUsername__</button>
+          </div>
+
+          <div id="optionsButtonContainer" class="popupElement">
+              <br/>
+              <br/>
+    
+              <button id="optionsButton" class="dangerButton popupElement">__MSG_Options__</button>
+          </div>
+
+          <div id="options" class="popupElement" style="display: none">
+              <br/>
+
+              <h3>__MSG_Options__</h3>
+
+              <button id="disableAutoSkip" class="warningButton popupElement">__MSG_disableAutoSkip__</button>
+              <button id="enableAutoSkip" style="display: none" class="warningButton popupElement">__MSG_enableAutoSkip__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_autoSkipDescription__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <span id="keybindButtons">
+                <button id="setStartSponsorKeybind" class="warningButton popupElement">__MSG_setStartSponsorShortcut__</button>
+                <br/>
+                <br/>
+                <button id="setSubmitKeybind" class="warningButton popupElement">__MSG_setSubmitKeybind__</button>
+                <br/>
+              </span>
+              
+              <h2 id="keybindDescription" style="display: none" class="popupElement">__MSG_keybindDescription__</h2>
+
+              <br/>
+              <br/>
+    
+              <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">
+                __MSG_hideButtonsDescription__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <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">
+                __MSG_whatInfoButton__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <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">
+                __MSG_whatDeleteButton__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <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">
+                __MSG_whatViewTracking__
+              </sub>
+    
+              <br/>
+              <br/>
+
+              <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
          </div>
        </div>
    </center>
--- a/popup.js
+++ b/popup.js
@@ -26,11 +26,18 @@ function runThePopup() {
    var SB = {};

    ["sponsorStart",
+    // Top toggles
    "whitelistChannel",
    "unwhitelistChannel",
+    "disableSkipping",
+    "enableSkipping",
+    // More controls
    "clearTimes",
    "submitTimes",
+    // options
    "showNoticeAgain",
+    "disableAutoSkip",
+    "enableAutoSkip",
    "hideVideoPlayerControls",
    "showVideoPlayerControls",
    "hideInfoButtonPlayerControls",
@@ -49,6 +56,18 @@ function runThePopup() {
    "sponsorTimesViewsContainer",
    "sponsorTimesViewsDisplay",
    "sponsorTimesViewsDisplayEndWord",
+    // sponsorTimesOthersTimeSaved
+    "sponsorTimesOthersTimeSavedContainer",
+    "sponsorTimesOthersTimeSavedDisplay",
+    "sponsorTimesOthersTimeSavedEndWord",
+    // sponsorTimesSkipsDone
+    "sponsorTimesSkipsDoneContainer",
+    "sponsorTimesSkipsDoneDisplay",
+    "sponsorTimesSkipsDoneEndWord",
+    // sponsorTimeSaved
+    "sponsorTimeSavedContainer",
+    "sponsorTimeSavedDisplay",
+    "sponsorTimeSavedEndWord",
    // discordButtons
    "discordButtonContainer",
    "hideDiscordButton",
@@ -80,9 +99,13 @@ function runThePopup() {
    SB.sponsorStart.addEventListener("click", sendSponsorStartMessage);
    SB.whitelistChannel.addEventListener("click", whitelistChannel);
    SB.unwhitelistChannel.addEventListener("click", unwhitelistChannel);
+    SB.disableSkipping.addEventListener("click", () => toggleSkipping(true));
+    SB.enableSkipping.addEventListener("click", () => toggleSkipping(false));
    SB.clearTimes.addEventListener("click", clearTimes);
    SB.submitTimes.addEventListener("click", submitTimes);
    SB.showNoticeAgain.addEventListener("click", showNoticeAgain);
+    SB.disableAutoSkip.addEventListener("click", () => setAutoSkip(true));
+    SB.enableAutoSkip.addEventListener("click", () => setAutoSkip(false));
    SB.setStartSponsorKeybind.addEventListener("click", () => setKeybind(true));
    SB.setSubmitKeybind.addEventListener("click", () => setKeybind(false));
    SB.hideVideoPlayerControls.addEventListener("click", hideVideoPlayerControls);
@@ -120,21 +143,30 @@ function runThePopup() {
        if (hideDiscordLink == undefined || !hideDiscordLink) {
            chrome.storage.sync.get(["hideDiscordLaunches"], function(result) {
                let hideDiscordLaunches = result.hideDiscordLaunches;
-                //only if less than 5 launches
+                //only if less than 10 launches
                if (hideDiscordLaunches == undefined || hideDiscordLaunches < 10) {
                    SB.discordButtonContainer.style.display = null;
          
                    if (hideDiscordLaunches == undefined) {
-                        hideDiscordButton = 1;
+                        hideDiscordLaunches = 1;
                    }
  
-                    chrome.storage.sync.set({"hideDiscordLaunches": hideDiscordButton + 1});
+                    chrome.storage.sync.set({"hideDiscordLaunches": hideDiscordLaunches + 1});
                }
            });
        }
    });

-    //if the don't show notice again letiable is true, an option to 
+    //show proper disable skipping button
+    chrome.storage.sync.get(["disableSkipping"], function(result) {
+        let disableSkipping = result.disableSkipping;
+        if (disableSkipping != undefined && disableSkipping) {
+            SB.disableSkipping.style.display = "none";
+            SB.enableSkipping.style.display = "unset";
+        }
+    });
+
+    //if the don't show notice again variable is true, an option to 
    //  disable should be available
    chrome.storage.sync.get(["dontShowNotice"], function(result) {
        let dontShowNotice = result.dontShowNotice;
@@ -142,6 +174,15 @@ function runThePopup() {
            SB.showNoticeAgain.style.display = "unset";
        }
    });
+
+    //show proper auto skip option
+    chrome.storage.sync.get(["disableAutoSkip"], function(result) {
+        let disableAutoSkip = result.disableAutoSkip;
+        if (disableAutoSkip != undefined && disableAutoSkip) {
+            SB.disableAutoSkip.style.display = "none";
+            SB.enableAutoSkip.style.display = "unset";
+        }
+    });
  
    //show proper video player controls options
    chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
@@ -207,10 +248,55 @@ function runThePopup() {
                            }
                        }
                    });
+
+                    //get this time in minutes
+                    sendRequestToServer("GET", "/api/getSavedTimeForUser?userID=" + userID, function(xmlhttp) {
+                        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+                            let minutesSaved = JSON.parse(xmlhttp.responseText).timeSaved;
+                            if (minutesSaved != 0) {
+                                if (minutesSaved != 1) {
+                                    SB.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+                                } else {
+                                    SB.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+                                }
+
+                                SB.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
+                                SB.sponsorTimesOthersTimeSavedContainer.style.display = "unset";
+                            }
+                        }
+                    });
                }
            });
        }
    });
+
+    //get the amount of times this user has skipped a sponsor
+    chrome.storage.sync.get(["skipCount"], function(result) {
+        if (result.skipCount != undefined) {
+            if (result.skipCount != 1) {
+                SB.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Sponsors");
+            } else {
+                SB.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Sponsor");
+            }
+
+            SB.sponsorTimesSkipsDoneDisplay.innerText = result.skipCount;
+            SB.sponsorTimesSkipsDoneContainer.style.display = "unset";
+        }
+    });
+
+    //get the amount of time this user has saved.
+    chrome.storage.sync.get(["minutesSaved"], function(result) {
+        if (result.minutesSaved != undefined) {
+            if (result.minutesSaved != 1) {
+                SB.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+            } else {
+                SB.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+            }
+
+            SB.sponsorTimeSavedDisplay.innerText = getFormattedHours(result.minutesSaved);
+            SB.sponsorTimeSavedContainer.style.display = "unset";
+        }
+    });
  
    chrome.tabs.query({
            active: true,
@@ -280,7 +366,7 @@ function runThePopup() {
  
            //remove loading text
            SB.mainControls.style.display = "unset"
-            SB.loadingIndicator.innerHTML = "";
+            SB.loadingIndicator.style.display = "none";

            if (request.found) {
                SB.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
@@ -304,7 +390,7 @@ function runThePopup() {
                        SB.whitelistChannel.style.display = "none";
                        SB.unwhitelistChannel.style.display = "unset";

-                        SB.downloadedSponsorMessageTimes.innerText = "Channel Whitelisted!";
+                        SB.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
                        SB.downloadedSponsorMessageTimes.style.fontWeight = "bold";
                    }
                });
@@ -809,15 +895,7 @@ function runThePopup() {

                        clearTimes();
                    } else {
-                        let errorMessage = "";
-                        
-                        if([400,429,409,502].includes(response.statusCode)) {
-                            errorMessage = chrome.i18n.getMessage(response.statusCode);
-                        } else {
-                            errorMessage = chrome.i18n.getMessage("connectionError") + response.statusCode;
-                        }
-
-                        document.getElementById("submitTimesInfoMessage").innerText = errorMessage;
+                        document.getElementById("submitTimesInfoMessage").innerText = getErrorMessage(response.statusCode);
                        document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";

                        SB.submitTimesInfoMessageContainer.style.display = "unset";
@@ -841,6 +919,21 @@ function runThePopup() {
  
        SB.showNoticeAgain.style.display = "none";
    }
+
+    function setAutoSkip(value) {
+        chrome.storage.sync.set({"disableAutoSkip": value});
+
+        if (value) {
+            // If it isn't shown, they can't manually skip
+            showNoticeAgain();
+
+            SB.disableAutoSkip.style.display = "none";
+            SB.enableAutoSkip.style.display = "unset";
+        } else {
+            SB.enableAutoSkip.style.display = "none";
+            SB.disableAutoSkip.style.display = "unset";
+        }
+    }
  
    function hideVideoPlayerControls() {
        chrome.storage.sync.set({"hideVideoPlayerControls": true});
@@ -1034,7 +1127,7 @@ function runThePopup() {
                    SB.usernameInput.style.display = "none";

                    SB.setUsernameStatusContainer.style.display = "unset";
-                    SB.setUsernameStatus.innerText = "Couldn't connect to server. Error code: " + xmlhttp.status;
+                    SB.setUsernameStatus.innerText = getErrorMessage(xmlhttp.status);
                }
            });
        });
@@ -1056,15 +1149,7 @@ function runThePopup() {

                    SB.setUsernameStatus.innerText = chrome.i18n.getMessage("success");
                } else if (xmlhttp.readyState == 4) {
-                    let errorMessage = "";
-                        
-                    if([400, 429, 409, 502].includes(xmlhttp.status)) {
-                        errorMessage = chrome.i18n.getMessage(xmlhttp.status);
-                    } else {
-                        errorMessage = chrome.i18n.getMessage("connectionError") + xmlhttp.status;
-                    }
-
-                    SB.setUsernameStatus.innerText = errorMessage;
+                    SB.setUsernameStatus.innerText = getErrorMessageI(xmlhttp.status);
                }
            });
        });
@@ -1109,8 +1194,10 @@ function runThePopup() {
            type: type,
            UUID: UUID
        }, function(response) {
+            console.log(response)
            if (response != undefined) {
                //see if it was a success or failure
+                console.log(response)
                if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
                    //success (treat rate limits as a success)
                    addVoteMessage(chrome.i18n.getMessage("voted"), UUID)
@@ -1118,19 +1205,14 @@ function runThePopup() {
                    //failure: duplicate vote
                    addVoteMessage(chrome.i18n.getMessage("voteFail"), UUID)
                } else if (response.successType == -1) {
-                    if (response.statusCode == 502) {
-                        addVoteMessage(chrome.i18n.getMessage("serverDown"), UUID)
-                    } else {
-                        //failure: unknown error
-                        addVoteMessage(chrome.i18n.getMessage("connectionError") + response.statusCode, UUID)
-                    }
+                    addVoteMessage(getErrorMessage(response.statusCode), UUID)
                }
            }
        });
    }
  
    function hideDiscordButton() {
-        chrome.storage.sync.set({"hideDiscordLink": false});
+        chrome.storage.sync.set({"hideDiscordLink": true});
  
        SB.discordButtonContainer.style.display = "none";
    }
@@ -1173,7 +1255,7 @@ function runThePopup() {
                        SB.whitelistChannel.style.display = "none";
                        SB.unwhitelistChannel.style.display = "unset";

-                        SB.downloadedSponsorMessageTimes.innerText = "Channel Whitelisted!";
+                        SB.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
                        SB.downloadedSponsorMessageTimes.style.fontWeight = "bold";

                        //save this
@@ -1246,6 +1328,24 @@ function runThePopup() {
        });
    }

+    /**
+     * Should skipping be disabled (visuals stay)
+     */
+    function toggleSkipping(disabled) {
+        chrome.storage.sync.set({"disableSkipping": disabled});
+
+        let hiddenButton = SB.disableSkipping;
+        let shownButton = SB.enableSkipping;
+
+        if (!disabled) {
+            hiddenButton = SB.enableSkipping;
+            shownButton = SB.disableSkipping;
+        }
+
+        shownButton.style.display = "unset";
+        hiddenButton.style.display = "none";
+    }
+
    function setKeybind(startSponsorKeybind) {
        document.getElementById("keybindButtons").style.display = "none";

@@ -1310,6 +1410,18 @@ function runThePopup() {
        //submit this request
        xmlhttp.send();
    }
+
+    /**
+     * Converts time in hours to 5h 25.1
+     * If less than 1 hour, just returns minutes
+     * 
+     * @param {float} seconds 
+     * @returns {string}
+     */
+    function getFormattedHours(minues) {
+        let hours = Math.floor(minues / 60);
+        return (hours > 0 ? hours + "h " : "") + (minues % 60).toFixed(1);
+    }
  
 //end of function
 }
--- a/utils.js
+++ b/utils.js
@@ -66,3 +66,42 @@ function localizeHtmlPage() {
    }
 }

+function generateUserID(length = 36) {
+    let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    let result = "";
+    if (window.crypto && window.crypto.getRandomValues) {
+            values = new Uint32Array(length);
+            window.crypto.getRandomValues(values);
+            for (i = 0; i < length; i++) {
+                    result += charset[values[i] % charset.length];
+            }
+            return result;
+    } else {
+            for (let i = 0; i < length; i++) {
+                result += charset[Math.floor(Math.random() * charset.length)];
+            }
+            return result;
+    }
+}
+
+/**
+ * Gets the error message in a nice string
+ * 
+ * @param {int} statusCode 
+ * @returns {string} errorMessage
+ */
+function getErrorMessage(statusCode) {
+    let errorMessage = "";
+                        
+    if([400, 429, 409, 502, 0].includes(statusCode)) {
+        //treat them the same
+        if (statusCode == 503) statusCode = 502;
+
+        errorMessage = chrome.i18n.getMessage(statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + statusCode
+                        + "\n\n" + chrome.i18n.getMessage("statusReminder");
+    } else {
+        errorMessage = chrome.i18n.getMessage("connectionError") + statusCode;
+    }
+
+    return errorMessage;
+}
--- a/utils/previewBar.js
+++ b/utils/previewBar.js
@@ -59,6 +59,8 @@ class PreviewBar {
 		duration = Math.floor(duration * 100) / 100;
 		let width;
 		for (let i = 0; i < timestamps.length; i++) {
+			if (types[i] == null) continue;
+
 			width = (timestamps[i][1] - timestamps[i][0]) / duration * 100;
 			width = Math.floor(width * 100) / 100;

--- a/utils/skipNotice.js
+++ b/utils/skipNotice.js
@@ -1,10 +1,25 @@
 'use strict';

-//The notice that tells the user that a sponsor was just skipped
+/**
+ * The notice that tells the user that a sponsor was just skipped
+ */
 class SkipNotice {
-	constructor(parent, UUID) {
+    /**
+     * @param {HTMLElement} parent
+     * @param {String} UUID 
+     * @param {String} noticeTitle 
+     * @param {boolean} manualSkip 
+     */
+	constructor(parent, UUID, manualSkip = false) {
        this.parent = parent;
        this.UUID = UUID;
+        this.manualSkip = manualSkip;
+
+        let noticeTitle = chrome.i18n.getMessage("noticeTitle");
+
+        if (manualSkip) {
+            noticeTitle = chrome.i18n.getMessage("noticeTitleNotSkipped");
+        }

        this.maxCountdownTime = () => 4;
        //the countdown until this notice closes
@@ -54,7 +69,7 @@ class SkipNotice {
        noticeMessage.id = "sponsorSkipMessage" + this.idSuffix;
        noticeMessage.classList.add("sponsorSkipMessage");
        noticeMessage.classList.add("sponsorSkipObject");
-        noticeMessage.innerText = chrome.i18n.getMessage("noticeTitle");
+        noticeMessage.innerText = noticeTitle;

        //create the first column
        logoColumn.appendChild(logoElement);
@@ -136,7 +151,10 @@ class SkipNotice {
        dontShowAgainButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton";
        dontShowAgainButton.addEventListener("click", dontShowNoticeAgain);

-        dontshowContainer.appendChild(dontShowAgainButton);
+        // Don't let them hide it if manually skipping
+        if (!this.manualSkip) {
+            dontshowContainer.appendChild(dontShowAgainButton);
+        }

        //add to row
        secondRow.appendChild(voteButtonsContainer);
@@ -165,6 +183,10 @@ class SkipNotice {

        referenceNode.prepend(noticeElement);

+        if (manualSkip) {
+            this.unskippedMode(chrome.i18n.getMessage("skip"));
+        }
+
        this.startCountdown();
    }

@@ -228,10 +250,13 @@ class SkipNotice {
    unskip() {
        unskipSponsorTime(this.UUID);

+        this.unskippedMode(chrome.i18n.getMessage("reskip"));
+    }
+
+    /** Sets up notice to be not skipped yet */
+    unskippedMode(buttonText) {
        //change unskip button to a reskip button
-        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
-        unskipButton.innerText = chrome.i18n.getMessage("reskip");
-        unskipButton.removeEventListener("click", this.unskipCallback);
+        let unskipButton = this.changeUnskipButton(buttonText);

        //setup new callback
        this.unskipCallback = this.reskip.bind(this);
@@ -252,10 +277,8 @@ class SkipNotice {
    reskip() {
        reskipSponsorTime(this.UUID);

-        //change unskip button to a reskip button
-        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
-        unskipButton.innerText = chrome.i18n.getMessage("unskip");
-        unskipButton.removeEventListener("click", this.unskipCallback);
+        //change reskip button to a unskip button
+        let unskipButton = this.changeUnskipButton(chrome.i18n.getMessage("unskip"));

        //setup new callback
        this.unskipCallback = this.unskip.bind(this);
@@ -265,6 +288,27 @@ class SkipNotice {
        this.maxCountdownTime = () => 4;
        this.countdownTime = this.maxCountdownTime();
        this.updateTimerDisplay();
+
+        // See if the title should be changed
+        if (this.manualSkip) {
+            this.changeNoticeTitle(chrome.i18n.getMessage("noticeTitle"));
+
+            vote(1, this.UUID, this);
+        }
+    }
+
+    /**
+     * Changes the text on the reskip button
+     * 
+     * @param {string} text 
+     * @returns {HTMLElement} unskipButton
+     */
+    changeUnskipButton(text) {
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
+        unskipButton.innerText = text;
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        return unskipButton;
    }

    afterDownvote() {
@@ -280,19 +324,17 @@ class SkipNotice {
                //add this as a hidden sponsorTime
                hiddenSponsorTimes.push(i);
            
-                let sponsorTimesLeft = sponsorTimes.slice();
-                for (let j = 0; j < hiddenSponsorTimes.length; j++) {
-                    //remove this sponsor time
-                    sponsorTimesLeft.splice(hiddenSponsorTimes[j], 1);
-                }
-            
-                //update the preview
-                previewBar.set(sponsorTimesLeft, [], v.duration);
-            
+                updatePreviewBar();
                break;
            }
        }
    }
+
+    changeNoticeTitle(title) {
+        let noticeElement = document.getElementById("sponsorSkipMessage" + this.idSuffix);
+
+        noticeElement.innerText = title;
+    }
    
    addNoticeInfoMessage(message, message2) {
        let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + this.idSuffix);
Author	SHA1	Message	Date
Ajay Ramachandran	c17e47ddd3	Merge pull request #198 from ajayyy/experimental-ajay German translation + fixes	2019-12-19 00:09:46 -05:00
Ajay Ramachandran	81bf54c42d	Upped version number	2019-12-19 00:08:31 -05:00
Ajay Ramachandran	5b693e81fd	Added german translation thanks to Floatinger.	2019-12-19 00:08:07 -05:00
Ajay Ramachandran	00115cd707	Fixed string not using language file.	2019-12-17 18:32:20 -05:00
Ajay Ramachandran	e992844fa2	Fixed channel parsing error. Fixes whitelisting issues.	2019-12-17 18:32:01 -05:00
Ajay Ramachandran	b30acaac78	Merge pull request #195 from ajayyy/experimental-ajay Small Fixes	2019-12-13 23:37:11 -05:00
Ajay Ramachandran	46ac654224	Update version number	2019-12-13 23:35:17 -05:00
Ajay Ramachandran	8578e96c3a	Fixed channel whitelisting and channel finding on new YouTube layout.	2019-12-13 23:21:21 -05:00
Ajay Ramachandran	b42bdc6e6f	Fixed popup stats padding.	2019-12-13 22:45:40 -05:00
Ajay Ramachandran	369364f574	Fixed downvoted sponsors reappearing.	2019-12-13 22:38:00 -05:00
Ajay Ramachandran	a5baebab3f	Fixed new submissions getting added to the downloaded submissions.	2019-12-13 21:55:43 -05:00
Ajay Ramachandran	b34e6076e4	Moved error message handling to a util file and added a link to the status site.	2019-12-13 21:32:57 -05:00
Ajay Ramachandran	226c5d601c	Added space to notification.	2019-12-10 18:17:07 -05:00
Ajay Ramachandran	cc1a12e1a2	Clarified that auto-upvote can be disabled.	2019-12-09 17:06:30 -05:00
Ajay Ramachandran	1d342b21fd	Added small guideline reminder to submission confirmation dialog.	2019-12-08 12:08:36 -05:00
Ajay Ramachandran	3d01ffee1b	Merge pull request #179 from ajayyy/experimental-ajay Added better local stats.	2019-12-04 23:53:26 -05:00
Ajay Ramachandran	9c51df9159	Increased version number.	2019-12-04 23:51:47 -05:00
Ajay Ramachandran	3a29fcc3d8	Added time the user saved others from plus better time formatting.	2019-12-04 23:51:20 -05:00
Ajay Ramachandran	b18f2ae60d	Made it show how much time you have saved yourself.	2019-12-04 23:38:07 -05:00
Ajay Ramachandran	ab07478e25	Updated build number	2019-12-03 17:01:34 -05:00
Ajay Ramachandran	d6aeec933a	Merge pull request #176 from ajayyy/experimental-ajay Better error messages and manual skipping	2019-12-03 00:02:07 -05:00
Ajay Ramachandran	cd5207f816	Added ability to disable auto skip. Resolves https://github.com/ajayyy/SponsorBlock/issues/131 and https://github.com/ajayyy/SponsorBlock/issues/162	2019-12-02 23:58:29 -05:00
Ajay Ramachandran	381c11ed99	Updated error messages.	2019-11-28 18:03:33 -05:00
Ajay Ramachandran	62d4b365c2	Merge pull request #173 from ajayyy/experimental-ajay Made the popup work on non YouTube tabs	2019-11-24 01:16:56 -05:00
Ajay Ramachandran	524df6389a	Update version number.	2019-11-24 01:14:55 -05:00
Ajay Ramachandran	24292e771b	Made the popup work on non YouTube tabs.	2019-11-24 01:13:52 -05:00
Ajay Ramachandran	f35d34a807	Merge pull request #172 from ajayyy/experimental-ajay Small features and bug fixes	2019-11-24 00:55:04 -05:00
Ajay Ramachandran	468e33eff7	Update version number.	2019-11-24 00:53:51 -05:00
Ajay Ramachandran	600f9e4b85	Changed order of popup. Also fixed discord link. Resolves https://github.com/ajayyy/SponsorBlock/issues/156.	2019-11-24 00:48:35 -05:00
Ajay Ramachandran	9cb3da4a7f	Added a button to disable skipping. Also changed up popup look. Resolves https://github.com/ajayyy/SponsorBlock/issues/167	2019-11-24 00:05:35 -05:00
Ajay Ramachandran	a66c7c8063	Properly added submissions to sponsor times when done.	2019-11-23 18:05:42 -05:00
Ajay Ramachandran	0a84dbd3a5	Improved speed of whitelist check.	2019-11-23 17:53:04 -05:00
Ajay Ramachandran	2fa412e574	Removed deprecated code to fix whitelist array.	2019-11-23 17:44:22 -05:00
Ajay Ramachandran	f240416886	Fixed reversed strings. Resolves https://github.com/ajayyy/SponsorBlock/issues/170.	2019-11-23 14:35:33 -05:00
Ajay Ramachandran	2a025b7977	Fixed formatting in readme	2019-11-23 13:33:55 -05:00
Ajay Ramachandran	f44d2b67e5	Added link to MPV port	2019-11-23 13:33:22 -05:00
Ajay Ramachandran	6b15ebac99	Added link in readme	2019-11-23 12:54:34 -05:00
Ajay Ramachandran	ff41251f17	Merge pull request #171 from ajayyy/experimental-ajay Fixed error message, prevented double counting contributions and delayed userID generation	2019-11-23 12:49:19 -05:00
Ajay Ramachandran	c7c1cb79a8	Increased version number.	2019-11-23 12:48:10 -05:00
Ajay Ramachandran	fc155ccdfa	Prevented contributions from counting twice.	2019-11-23 12:47:00 -05:00
Ajay Ramachandran	dfad1a5636	Added delayed startup after install.	2019-11-23 12:44:38 -05:00
Ajay Ramachandran	6790952f86	Fixed error messages not working. Added message for error 503 and 0.	2019-11-23 12:26:24 -05:00
Ajay Ramachandran	1a28f714a1	Update README.md	2019-11-17 21:32:31 -05:00
Ajay Ramachandran	55a55fefba	Update README.md	2019-11-17 21:32:01 -05:00
Ajay Ramachandran	fe74f7caa3	Merge pull request #169 from ajayyy/experimental-ajay Decreased requests to help with server load issues	2019-11-14 15:05:57 -05:00
Ajay Ramachandran	108aac0e79	Improved non YouTube tab message.	2019-11-14 15:04:46 -05:00
Ajay Ramachandran	008c07acc3	Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into experimental-ajay	2019-11-14 14:59:55 -05:00
Ajay Ramachandran	831a3c1b5a	Increased retry timeout when the server is down.	2019-11-14 14:59:44 -05:00
Ajay Ramachandran	dc7b63d735	Merge pull request #164 from Otiel/french-translation Improve French translation	2019-11-14 14:58:50 -05:00
Ajay Ramachandran	9267f36165	Raised retry time from 10 seconds to 180 seconds (3 mins).	2019-11-14 14:53:40 -05:00
Otiel	d4bd5313fc	french: add missing translation	2019-10-31 21:07:37 +01:00
Otiel	c69fe53ea6	french: improve existing translation	2019-10-31 21:07:12 +01:00
Otiel	d7c496847f	french: fix spelling	2019-10-31 20:20:48 +01:00