New translations messages.json (Chinese Simplified) (#331 )

Merge pull request #322 from ajayyy/react
Categories Improvements
2025-12-25 17:08:42 +03:00 · 2020-04-26 23:21:13 -04:00 · 2020-04-26 23:16:53 -04:00 · 2020-04-26 23:14:47 -04:00 · 2020-04-26 23:14:18 -04:00 · 2020-04-26 21:46:38 -04:00
20 changed files with 1745 additions and 339 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,11 +68,13 @@ jobs:
        with:
          args: builds/ChromeExtension.zip
          name: ChromeExtension.zip
+          path: ./builds/ChromeExtension.zip
          repo-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Upload to release
        uses: Shopify/upload-to-release@master
        with:
          args: builds/FirefoxExtension.zip
          name: FirefoxExtension.zip
+          path: ./builds/FirefoxExtension.zip
          repo-token: ${{ secrets.GITHUB_TOKEN }}

--- a/README.md
+++ b/README.md
@@ -34,6 +34,8 @@ SponsorBlock is an extension that will skip over sponsored segments of YouTube v

 Also support Invidio.us.

+**Translate:** [![Crowdin](https://badges.crowdin.net/sponsorblock/localized.svg)](https://crowdin.com/project/sponsorblock)
+
 # Important Links

 See the [Wiki](https://github.com/ajayyy/SponsorBlock/wiki) for important links.
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -1,7 +1,7 @@
 {
    "name": "__MSG_fullName__",
    "short_name": "__MSG_Name__",
-    "version": "1.2.26",
+    "version": "1.2.27",
    "default_locale": "en",
    "description": "__MSG_Description__",
    "content_scripts": [{
--- a/public/_locales/de/messages.json
+++ b/public/_locales/de/messages.json
@@ -1,4 +1,12 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock für YouTube - Überspringe Sponsor Anzeigen",
+        "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."
@@ -279,6 +287,12 @@
    "autoSkipDescription": {
        "message": "Auto-Überspringen überspringt gesponsorte Inhalte für dich. Wenn deaktiviert, fragt die Benachrichtigung, ob übersprungen werden soll."
    },
+    "audioNotification": {
+        "message": "Audio-Benachrichtigung beim Überspringen"
+    },
+    "audioNotificationDescription": {
+        "message": "Audio-Benachrichtigung beim Überspringen wird einen Ton abspielen, wenn ein Sponsor übersprungen wird. Wenn deaktiviert (oder wenn Automatisches-Überspringen deaktiviert ist), wird kein Ton abgespielt."
+    },
    "youHaveSkipped": {
        "message": "Du übersprangst "
    },
@@ -302,5 +316,216 @@
    },
    "youHaveSavedTimeEnd": {
        "message": " ihrer Zeit."
+    },
+    "guildlinesSummary": {
+        "message": "- Stellen Sie sicher, dass Ihr Segment nur kostenpflichtige Werbeaktionen enthält, nichts anderes.\n- Stellen Sie sicher, dass das Überspringen dieses Segments wertvolle Inhalte nicht abschneiden wird\n- Wenn das ganze Video ein Sponsor ist, bitte nicht melden. Ein vollständiges Video-Reporting-System wird bald herauskommen.\n- Bitte melde keine Haftungsausschlüsse, die Voreingenommenheit zeigen könnten (falls ein Bewertungsvideo gesponsert wird, überspringen Sie nicht, wenn sie dies erwähnen)."
+    },
+    "statusReminder": {
+        "message": "Überprüfen Sie status.sponsor.ajay.app für den Serverstatus."
+    },
+    "changeUserID": {
+        "message": "Benutzer ID importieren/exportieren"
+    },
+    "whatChangeUserID": {
+        "message": "Dies sollte privat gehalten werden. Dies ist wie ein Passwort und sollte nicht mit jemandem geteilt werden."
+    },
+    "setUserID": {
+        "message": "Benutzer ID festlegen"
+    },
+    "userIDChangeWarning": {
+        "message": "Warnung: Das Ändern der Benutzer ID ist permanent. Sind Sie sicher, dass Sie dies tun möchten? Stellen Sie sicher, dass Sie von Ihren alten Benutzer ID eine Sicherheitskopie machen, nur für den Fall."
+    },
+    "createdBy": {
+        "message": "Erstellt von"
+    },
+    "autoSkip": {
+        "message": "Automatisch überspringen"
+    },
+    "showSkipNotice": {
+        "message": "Zeige Hinweis nach dem Übersprung eines Sponsors"
+    },
+    "keybindCurrentlySet": {
+        "message": ". Es ist derzeit gesetzt auf:"
+    },
+    "supportInvidious": {
+        "message": "Unterstütze Invidious"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) ist ein Drittanbieter-YouTube-Client. Um Unterstützung zu aktivieren, müssen Sie die zusätzlichen Berechtigungen akzeptieren. Dies funktioniert NICHT im Incongnito-modus auf Chrome und anderen Chromium-Varianten."
+    },
+    "optionsInfo": {
+        "message": "Invidious Support aktivieren, Autoskip deaktivieren, Tasten ausblenden und vieles mehr."
+    },
+    "addInvidiousInstance": {
+        "message": "Invidious-Instanzen hinzufügen"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Fügen Sie eine benutzerdefinierte Instanz von Invidious hinzu. Dies muss mit NUR der Domain formatiert werden. Beispiel: invidious.ajay.app"
+    },
+    "add": {
+        "message": "Hinzufügen"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Dies ist eine ungültige Domain. Dies sollte NUR den Domain-Teil beinhalten. Beispiel: invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "Invidious Instanzliste zurücksetzen"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "Du bist dabei, die Liste der \"Invidious\" Instanzen zurückzusetzen"
+    },
+    "currentInstances": {
+        "message": "Aktuelle Instanzen:"
+    },
+    "enableAutoUpvote": {
+        "message": "Automatisches Liken"
+    },
+    "whatAutoUpvote": {
+        "message": "Wenn dies aktiviert ist, wird die Erweiterung alle Beiträge hochladen, die Sie ansehen, wenn Sie sie nicht melden. Wenn die Benachrichtigung deaktiviert ist, wird dies nicht geschehen."
+    },
+    "minDuration": {
+        "message": "Minimale Dauer (Sekunden):"
+    },
+    "minDurationDescription": {
+        "message": "Sponsor Segmente, die kürzer als der festgelegte Wert sind, werden nicht übersprungen oder im Player angezeigt."
+    },
+    "shortCheck": {
+        "message": "Die folgende Einreichung ist kürzer als Ihre Mindestdauer. Dies könnte bedeuten, dass dies bereits eingereicht wurde und aufgrund dieser Option einfach ignoriert wird. Sind Sie sicher, dass Sie einreichen möchten?"
+    },
+    "showUploadButton": {
+        "message": "Upload-Button anzeigen"
+    },
+    "whatUploadButton": {
+        "message": "Diese Schaltfläche erscheint auf dem YouTube-Player, nachdem Sie einen Zeitstempel ausgewählt haben und bereit sind zu senden."
+    },
+    "customServerAddress": {
+        "message": "SponsorBlock Server-Adresse"
+    },
+    "customServerAddressDescription": {
+        "message": "Die Ardesse die SponsorBlock verwendet um Anfragen an den Server zu senden. Solange sie keine eigene Serverinstanz haben sollte das nicht geändert werden."
+    },
+    "save": {
+        "message": "Speichern"
+    },
+    "reset": {
+        "message": "Zurücksetzen"
+    },
+    "customAddressError": {
+        "message": "Diese Adresse ist nicht in der richtigen Form. Stellen Sie sicher, dass Sie http:// oder https:// am Anfang haben und keine abschließenden Schrägstriche haben."
+    },
+    "areYouSureReset": {
+        "message": "Sind sie sicher dass sie das zurücksetzen wollen?"
+    },
+    "confirmPrivacy": {
+        "message": "Das Video wurde als ungelistet erkannt. Klicken Sie auf Abbrechen, wenn Sie nicht nach Sponsoren suchen möchten."
+    },
+    "unlistedCheck": {
+        "message": "Nicht gelistete Videos ignorieren"
+    },
+    "whatUnlistedCheck": {
+        "message": "Diese Einstellung verlangsamt den Sponsor-Block erheblich. Sponsor-Suchvorgänge erfordern das Senden der Video-ID an den Server. Wenn Sie sich Sorgen darüber machen, dass nicht gelistete Video-IDs über das Internet gesendet werden, aktivieren Sie diese Option."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com wird jetzt unterstützt"
+    },
+    "exportOptions": {
+        "message": "Import/Export aller Optionen"
+    },
+    "whatExportOptions": {
+        "message": "Dies ist Ihre gesamte Konfiguration in JSON. Dies schließt Ihre Benutzer-ID ein, also sollten Sie diese klug teilen."
+    },
+    "setOptions": {
+        "message": "Optionen einstellen"
+    },
+    "exportOptionsWarning": {
+        "message": "Warnung: Das Ändern der Benutzer ID ist permanent. Sind Sie sicher, dass Sie dies tun möchten? Stellen Sie sicher, dass Sie von Ihren alten Benutzer ID eine Sicherheitskopie machen, nur für den Fall."
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "Dieses JSON ist nicht korrekt formatiert. Ihre Einstellungen wurden nicht geändert."
+    },
+    "confirmNoticeTitle": {
+        "message": "Segment absenden"
+    },
+    "submit": {
+        "message": "Senden"
+    },
+    "cancel": {
+        "message": "Abbrechen"
+    },
+    "delete": {
+        "message": "Löschen"
+    },
+    "preview": {
+        "message": "Vorschau"
+    },
+    "edit": {
+        "message": "Bearbeiten"
+    },
+    "copyDebugInformation": {
+        "message": "Debug-Informationen in Zwischenablage kopieren"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Fehler beim Schreiben in die Zwischenablage"
+    },
+    "copyDebugInformationOptions": {
+        "message": "Kopiert Informationen in die Zwischenablage einem Entwickler zur Verfügung gestellt werden, wenn ein Bug / wenn ein Entwickler es anfordert. Sensitive Informationen wie Ihre Benutzer-ID, Kanäle auf der Whitelist-Liste und benutzerdefinierte Server-Adresse wurden entfernt. Es enthält jedoch Informationen wie den Useragent, den Browser, das Betriebssystem und die Versionsnummer der Erweiterung. "
+    },
+    "copyDebugInformationComplete": {
+        "message": "Die Debug-Informationen wurden in das Clip-Board kopiert. Sie können alle Informationen entfernen, die Sie nicht teilen möchten. Speichern Sie diese in einer Textdatei oder fügen Sie sie in den Fehlerbericht ein."
+    },
+    "theKey": {
+        "message": "Die Taste"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "wird bereits von Youtube verwendet. Bitte wählen Sie eine andere Taste."
+    },
+    "keyAlreadyUsed": {
+        "message": "an eine andere Aktion gebunden. Bitte wählen Sie eine andere Taste."
+    },
+    "to": {
+        "message": "bis",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Sponsor"
+    },
+    "category_intro": {
+        "message": "Intro"
+    },
+    "category_outro": {
+        "message": "Outro"
+    },
+    "category_interaction": {
+        "message": "Interaktion (Überflüssiges Liked, Abonniert, Folgt, usw.)"
+    },
+    "category_selfpromo": {
+        "message": "Eigenwerbung und Merchandise"
+    },
+    "category_offtopic": {
+        "message": "Vom Thema Abweichende Tangente (Subjektiv)"
+    },
+    "disable": {
+        "message": "Deaktivieren"
+    },
+    "manualSkip": {
+        "message": "Manueller Überspringen"
+    },
+    "showOverlay": {
+        "message": "Vor-/Rücklaufleiste anzeigen"
+    },
+    "enableTestingServer": {
+        "message": "Beta Testing Server aktivieren"
+    },
+    "whatEnableTestingServer": {
+        "message": "Deine Einreichungen und Stimmen werden NICHT für den Hauptserver geltend. Benutze dies nur für Tests."
+    },
+    "testingServerWarning": {
+        "message": "Alle Einreichungen und Stimmen werden NICHT ZÄHLEN gegenüber dem Hauptserver während der Verbindung zum Test-Server. Stellen Sie sicher, dass sie dies deaktivieren, wenn Sie echte Einreichungen machen möchten."
+    },
+    "bracketNow": {
+        "message": "(jetzt)"
+    },
+    "moreCategories": {
+        "message": "Weitere Kategorien"
    }
 }
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -7,14 +7,10 @@
        "message": "SponsorBlock for YouTube - Skip Sponsorships",
        "description": "Name of the extension."
    },
-
    "Description": {
        "message": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.",
        "description": "Description of the extension."
    },
-    "helpPage": {
-        "message": "index_en.html"
-    },
    "400": {
        "message": "Server said this request was invalid"
    },
@@ -193,7 +189,7 @@
        "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."
+        "message": "This hides the buttons that appear on the YouTube player to submit skip segments."
    },
    "showInfoButton": {
        "message": "Show Info Button On YouTube Player"
@@ -211,7 +207,7 @@
        "message": "Show Delete Button On YouTube Player"
    },
    "whatDeleteButton": {
-        "message": "This is the button that allows you to clear all sponsors on the YouTube player."
+        "message": "This is the button on the YouTube player that will clear all your un-submitted segments for the current video."
    },
    "disableViewTracking": {
        "message": "Disable Sponsor Skip Count Tracking"
@@ -424,10 +420,10 @@
        "message": "The video has been detected as unlisted. Click cancel if you do not want to check for sponsors."
    },
    "unlistedCheck": {
-        "message": "Ignore Unlisted Videos"
+        "message": "Ignore Unlisted/Private Videos"
    },
    "whatUnlistedCheck": {
-        "message": "This setting will significantly slow down SponsorBlock. Sponsor lookups require sending the video ID to the server. If you are concerned about unlisted video IDs being sent over the internet, enable this option."
+        "message": "This setting will slightly slow down SponsorBlock. Sponsor lookups require sending the video ID to the server. If you are concerned about unlisted video IDs being sent over the internet, enable this option."
    },
    "mobileUpdateInfo": {
        "message": "m.youtube.com is now supported"
@@ -531,5 +527,32 @@
    },
    "moreCategories": {
        "message": "More Categories"
+    },
+    "bracketEnd": {
+        "message": "(End)"
+    },
+    "hiddenDueToDownvote": {
+        "message": "hidden: downvote"
+    },
+    "hiddenDueToDuration": {
+        "message": "hidden: too short"
+    },
+    "channelDataNotFound": {
+        "message": "Channel ID not loaded yet."
+    },
+    "adblockerIssue": {
+        "message": "It seems that something is blocking SponsorBlock's ability to get video data. This is probably your ad blocker. Please check https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "If this keeps occuring, it could be caused by your ad blocker. Please check https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "forceChannelCheck": {
+        "message": "Force Channel Check Before Skipping Sponsors"
+    },
+    "whatForceChannelCheck": {
+        "message": "By default, it will skip sponsors right away before it even knows what the channel is. By default, some zero second sponsors might be skipped on whitelisted channels. Enabling this option will prevent this but making all skipping have a slight delay as getting the channelID can take some time. This delay might be unnoticeable if you have fast internet."
+    },
+    "forceChannelCheckPopup": {
+        "message": "Consider Enabling Force Channel Check Before Skipping Sponsors"
    }
 }
--- a/public/_locales/fr/messages.json
+++ b/public/_locales/fr/messages.json
@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
    "fullName": {
        "message": "SponsorBlock pour YouTube - Supprime les messages commerciaux et publicités intégrées",
        "description": "Name of the extension."
@@ -56,7 +60,7 @@
        "message": "Ne plus montrer"
    },
    "hitGoBack": {
-        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment commercial"
+        "message": "Cliquez sur revenir en arrière pour revenir avant le saut du segment commercial."
    },
    "unskip": {
        "message": "Revenir en arrière"
@@ -68,7 +72,7 @@
        "message": "En pause"
    },
    "confirmMSG": {
-        "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."
+        "message": "Pour 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) de vouloir supprimer vos soumissions ?\n\n"
@@ -234,7 +238,7 @@
        "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\"",
+        "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": {
@@ -326,10 +330,10 @@
        "message": "Gardez ça privé. C'est comme un mot de passe et ne devrait pas être partagé avec quiconque. Si quelqu'un l'obtiens, il peut vous usurper."
    },
    "setUserID": {
-        "message": "Définir l'ID utilisateur"
+        "message": "Définir \"UserID\""
    },
    "userIDChangeWarning": {
-        "message": "AVERTISSEMENT : La modification de l'ID d'utilisateur est permanente. Êtes-vous sûr de vouloir faire ça ? Assurez-vous de sauvegarder votre ancien au cas où."
+        "message": "Avertissement : La modification de \"UserID\" est permanente. Êtes-vous sûr de vouloir faire ça ? Assurez-vous de sauvegarder votre ancien au cas où."
    },
    "createdBy": {
        "message": "Créé par"
@@ -388,7 +392,62 @@
    "shortCheck": {
        "message": "Le segment suivant est plus court que votre option de durée minimale. Cela pourrait signifier qu'il est déjà soumis, et just ignoré par cette option. Êtes-vous sûr de vouloir soumettre ?"
    },
+    "showUploadButton": {
+        "message": "Afficher le bouton de téléchargement"
+    },
+    "customServerAddress": {
+        "message": "Adresse du serveur SponsorBlock"
+    },
+    "customServerAddressDescription": {
+        "message": "L'adresse que SponsorBlock utilise pour passer des appels vers le serveur.\nSauf si vous avez votre propre instance de serveur, cela ne devrait pas être changé."
+    },
+    "save": {
+        "message": "Sauvegarder"
+    },
    "reset": {
        "message": "Réinitialiser"
+    },
+    "unlistedCheck": {
+        "message": "Ignorer les vidéos non listées"
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com est maintenant pris en charge"
+    },
+    "exportOptions": {
+        "message": "Importer/Exporter toutes les options"
+    },
+    "submit": {
+        "message": "Soumettre"
+    },
+    "cancel": {
+        "message": "Annuler"
+    },
+    "delete": {
+        "message": "Supprimer"
+    },
+    "edit": {
+        "message": "Éditer"
+    },
+    "theKey": {
+        "message": "La clé"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "est déjà utilisé par youtube. Veuillez sélectionner une autre clé."
+    },
+    "keyAlreadyUsed": {
+        "message": "est lié à une autre action. Veuillez sélectionner une autre clé."
+    },
+    "to": {
+        "message": "à",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "enableTestingServer": {
+        "message": "Activer le serveur de test bêta"
+    },
+    "bracketNow": {
+        "message": "(Maintenant)"
+    },
+    "moreCategories": {
+        "message": "Autres catégories"
    }
 }
--- a/public/_locales/nl/messages.json
+++ b/public/_locales/nl/messages.json
@@ -1 +1,47 @@
-{}
+{
+    "paused": {
+        "message": "Gepauzeerd"
+    },
+    "clearThis": {
+        "message": "Weet je zeker dat je dit formulier wilt wissen?\n\n"
+    },
+    "sponsor404": {
+        "message": "Geen sponsors gevonden"
+    },
+    "sponsorStart": {
+        "message": "Sponsorschap"
+    },
+    "sponsorEnd": {
+        "message": "Sponshopschap eindigt nu"
+    },
+    "noVideoID": {
+        "message": "Er is geen YouTube-video gevonden op dit tabblad. Als je weet dat dit een YouTube-tabblad is, sluit je deze pop-up en open het opnieuw. Als dat niet werkt, probeer het tabblad opnieuw te laden."
+    },
+    "success": {
+        "message": "Succesvol!"
+    },
+    "voted": {
+        "message": "Gestemd!"
+    },
+    "voteFail": {
+        "message": "U hebt al eerder op deze manier gestemd."
+    },
+    "serverDown": {
+        "message": "Het lijkt erop dat de server niet draait. Contacteer de ontwikkelaar onmiddellijk."
+    },
+    "connectionError": {
+        "message": "Er is een verbindingsfout opgetreden. Foutcode: "
+    },
+    "wantToSubmit": {
+        "message": "Wilt u de sponsor tijden indienen voor video id"
+    },
+    "leftTimes": {
+        "message": "Het lijkt erop dat sommige sponsortijden niet ingezonden zijn. Ga terug naar die pagina om ze in te dienen (deze zijn niet verwijderd)."
+    },
+    "clearTimes": {
+        "message": "Sponsortijden wissen"
+    },
+    "here": {
+        "message": "hier"
+    }
+}
--- a/public/_locales/sv/messages.json
+++ b/public/_locales/sv/messages.json
@@ -1 +1,512 @@
-{}
+{
+    "fullName": {
+        "message": "SponsorBlock för YouTube - Hoppa över sponsring",
+        "description": "Name of the extension."
+    },
+    "Description": {
+        "message": "Hoppa över sponsormeddelanden på YouTube-videor. Rapportera sponsring på videor du ser på för att spara tid för andra.",
+        "description": "Description of the extension."
+    },
+    "400": {
+        "message": "Felaktigt anrop enligt servern"
+    },
+    "429": {
+        "message": "Du har rapporterat för många sponsormeddelanden för den här videon, är du säker att det finns så många?"
+    },
+    "409": {
+        "message": "Den här har redan blivit rapporterad."
+    },
+    "channelWhitelisted": {
+        "message": "Kanal vitlistad!"
+    },
+    "Sponsors": {
+        "message": "sponsorer"
+    },
+    "Segment": {
+        "message": "sponsorsegment"
+    },
+    "Segments": {
+        "message": "sponsorsegment"
+    },
+    "noticeTitle": {
+        "message": "Sponsormeddelande undvikt"
+    },
+    "reportButtonTitle": {
+        "message": "Rapportera"
+    },
+    "reportButtonInfo": {
+        "message": "Rapportera det här sponsorsegmentet som inkorrekt."
+    },
+    "Dismiss": {
+        "message": "Avfärda"
+    },
+    "Loading": {
+        "message": "Laddar..."
+    },
+    "Mins": {
+        "message": "Minuter"
+    },
+    "Secs": {
+        "message": "Sekunder"
+    },
+    "Hide": {
+        "message": "\"Visa aldrig\"-knappen. "
+    },
+    "hitGoBack": {
+        "message": "Tryck på Tillbaka för att ångra åtgärden."
+    },
+    "unskip": {
+        "message": "Tillbaka"
+    },
+    "reskip": {
+        "message": "Frammåt"
+    },
+    "paused": {
+        "message": "Pausad"
+    },
+    "confirmMSG": {
+        "message": "Klicka på infoknappen eller öppna popup-rutan genom att klicka på tilläggets ikon i hörnet uppe till höger för att redigera eller ta bort inviduella värden."
+    },
+    "clearThis": {
+        "message": "Är du säker på att du vill rensa detta?\n\n"
+    },
+    "Unknown": {
+        "message": "Ett fel uppstod vid rapportering av sponsorsegment, försök igen senare."
+    },
+    "sponsorFound": {
+        "message": "Den här videons sponsormeddelande finns i databasen!"
+    },
+    "sponsor404": {
+        "message": "Inga sponsormeddelanden hittades"
+    },
+    "sponsorStart": {
+        "message": "Sponsormeddelandet Börjar Nu"
+    },
+    "sponsorEnd": {
+        "message": "Sponsormeddelandet Slutar Nu"
+    },
+    "noVideoID": {
+        "message": "Kunde inte hitta någon YouTube-video i denna tab. Om du är säker på att detta är en Youtube-flik, stäng den här rutan och öppna den igen. Ladda om fliken om inte det funkar."
+    },
+    "success": {
+        "message": "Lyckades!"
+    },
+    "voted": {
+        "message": "Röstat!"
+    },
+    "voteFail": {
+        "message": "Du har redan röstat."
+    },
+    "serverDown": {
+        "message": "Det ser ut som att servern är nere. Kontakta utvecklaren med en gång."
+    },
+    "connectionError": {
+        "message": "Anslutningsfel. Felkod: "
+    },
+    "wantToSubmit": {
+        "message": "Vill du rapportera sponsortiderna för video id"
+    },
+    "leftTimes": {
+        "message": "Du har lämnat några sponsortider orapporterade. Gå tillbaka till den sidan för att rapportera dem (de är inte borttagna)."
+    },
+    "clearTimes": {
+        "message": "Rensa Sponsortider"
+    },
+    "openPopup": {
+        "message": "Öppna SponsorBlock Popup"
+    },
+    "SubmitTimes": {
+        "message": "Rapportera Sponsortider"
+    },
+    "submitCheck": {
+        "message": "Är du säker på att du vill rapportera detta?"
+    },
+    "whitelistChannel": {
+        "message": "Vitlista Kanal"
+    },
+    "removeFromWhitelist": {
+        "message": "Ta bort kanal från vitlistan"
+    },
+    "voteOnTime": {
+        "message": "Rösta på en sponsortid"
+    },
+    "recordTimes": {
+        "message": "Spela in sponsortider"
+    },
+    "soFarUHSubmited": {
+        "message": "Hitills har du rapporterat"
+    },
+    "savedPeopleFrom": {
+        "message": "Du har sparat andra "
+    },
+    "viewLeaderboard": {
+        "message": "Se leaderboarden"
+    },
+    "recordTimesDescription": {
+        "message": "Klicka på knappen nedan när sponsormeddelandet börjar och slutar för att spela in och rapportera till databasen."
+    },
+    "popupHint": {
+        "message": "Tips: Tryck på semikolon när fokus är på en video för att markera början/slutet av ett sponsormeddelande och citattecken för att rapportera till databasen. (Kan ändras under inställningar)"
+    },
+    "lastTimes": {
+        "message": "Senaste Sponsortiderna Valda."
+    },
+    "clearTimesButton": {
+        "message": "Rensa Tider"
+    },
+    "submitTimesButton": {
+        "message": "Rapportera Tider"
+    },
+    "publicStats": {
+        "message": "Detta kommer att användas på den publika statistiksidan för att visa hur mycket du har bidragit. Spana in den"
+    },
+    "setUsername": {
+        "message": "Ange Användarnamn"
+    },
+    "discordAdvert": {
+        "message": "Gå med i den officiella discordservern för att ge förslag och feedback!"
+    },
+    "hideThis": {
+        "message": "Dölj detta"
+    },
+    "Options": {
+        "message": "Inställningar"
+    },
+    "showButtons": {
+        "message": "Visa Knappar På YouTube-spelaren"
+    },
+    "hideButtons": {
+        "message": "Dölj Knappar På YouTube-spelaren"
+    },
+    "hideButtonsDescription": {
+        "message": "Detta döljer knapparna på YouTube-spelaren som du kan rapportera sponsormeddelanden med. Jag förstår att det kan se störande ut för en del. Istället för att ha knappen där kan den här popup-rutan användas för att rapportera sponsormeddelanden. För att dölja notisen som dyker upp, tryck på knappen som syns på notisen som säger \"Visa inte det här igen\". Du kan alltid slå på dessa inställningar igen senare."
+    },
+    "showInfoButton": {
+        "message": "Visa Infoknapp På YouTube-spelaren"
+    },
+    "hideInfoButton": {
+        "message": "Dölj Infoknapp På YouTube-spelaren"
+    },
+    "whatInfoButton": {
+        "message": "Detta är knappen som öppnar popup-rutan på YouTube-sidan."
+    },
+    "hideDeleteButton": {
+        "message": "Dölj \"Ta Bort\"-knappen På YouTube-spelaren"
+    },
+    "showDeleteButton": {
+        "message": "Visa \"Ta Bort\"-knappen På YouTube-spelaren"
+    },
+    "whatDeleteButton": {
+        "message": "Denna knappen tar bort alla sponsormeddelanden på YouTube-spelaren."
+    },
+    "disableViewTracking": {
+        "message": "Avaktivera Räkning Av Undvikta Sponsormeddelanden"
+    },
+    "enableViewTracking": {
+        "message": "Aktivera Räkning Av Undvikta Sponsormeddelanden"
+    },
+    "whatViewTracking": {
+        "message": "Den här funktionen håller koll på vilka sponsormeddelanden du har hoppat över för att uppskatta hur mycket tid en användare har sparat andra och används tillsammans med röster för att se till att spam inte läggs i databasen. Detta tillägg skickar ett meddelande till servern varje gång du hoppar över ett sponsormeddelande. Förhoppningsvis ändrar inte folk den här inställningen så statistiken hålls tillförlitlig. :)"
+    },
+    "showNotice": {
+        "message": "Visa Notisen Igen"
+    },
+    "longDescription": {
+        "message": "SponsorBlock är ett webbläsartillägg som hoppar över sponsormeddelanden på YouTube-videor. SponsorBlock är ett crowdsourcat webbläsartillägg som låter vem som hellst att rapportera start och sluttider för sponsorsegment på YouTube-videor. När informationen väl har rapporterats kommer alla andra med detta tillägg att hoppa över sponsorsegmentet.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Hemsida",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Källkod",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "Den här notisen har förbättrats!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Om du ändå inte gillar det, tryck på \"Visa aldrig\"-knappen.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Välj knapp att koppla till start av sponsormeddelande"
+    },
+    "setSubmitKeybind": {
+        "message": "Välj knapp att koppla till rapportering av sponsormeddelande"
+    },
+    "keybindDescription": {
+        "message": "Koppla knapp genom att trycka på den"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Kopplad till: "
+    },
+    "0": {
+        "message": "Anslutningsfel. Se över din internetanslutning. Om du kan komma åt internet så är servern förmodligen överbelastad eller nere."
+    },
+    "disableSkipping": {
+        "message": "Avaktivera SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "Aktivera SponsorBlock"
+    },
+    "yourWork": {
+        "message": "Ditt Bidrag",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "Servern verkar vara överbelastad. Försök igen om några sekunder."
+    },
+    "errorCode": {
+        "message": "Felkod: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Hoppa över sponsormeddelande?"
+    },
+    "skip": {
+        "message": "Hoppa över"
+    },
+    "disableAutoSkip": {
+        "message": "Avaktivera Hoppa Över Automatiskt"
+    },
+    "enableAutoSkip": {
+        "message": "Aktivera Hoppa Över Automatiskt"
+    },
+    "autoSkipDescription": {
+        "message": "Hoppa Över Automatiskt undviker att spela upp sponsormeddelanden för dig. Ifall det är avaktiverat dyker en notis upp som frågar om du vill hoppa över."
+    },
+    "audioNotification": {
+        "message": "Ljudeffekt vid hopp"
+    },
+    "audioNotificationDescription": {
+        "message": "Ljudeffekt vid hopp spelar upp en ljudeffekt när du hoppar över ett sponsormeddelande. Ifall det är avaktiverat (eller hoppa över automatiskt är avaktiverat), kommer inget ljud att spelas upp."
+    },
+    "youHaveSkipped": {
+        "message": "Du har hoppat över "
+    },
+    "youHaveSaved": {
+        "message": "Du har sparat "
+    },
+    "minLower": {
+        "message": "minuter"
+    },
+    "minsLower": {
+        "message": "minuter"
+    },
+    "hourLower": {
+        "message": "timma"
+    },
+    "hoursLower": {
+        "message": "timmar"
+    },
+    "youHaveSavedTime": {
+        "message": "Du har sparat andra"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " av deras liv."
+    },
+    "guildlinesSummary": {
+        "message": "- Se till att ditt sponsorsegment bara innehåller betald marknadsföring, inget annat.\n- Se till att inget värdefullt innehåll missas genom att hoppa över ditt sponsorsegment\n- Rapportera inte en video ifall hela videon är ett sponsormeddelande. Ett rapporteringssystem för hela videor kommer snart.\n- Se till att inte hoppa över delar som uppmärksammar partiskhet (om en recensionsvideo är sponsrad, hoppa inte över delen av videon där det nämns)."
+    },
+    "statusReminder": {
+        "message": "Gå till status.sponsor.ajay.app för serverstatus."
+    },
+    "changeUserID": {
+        "message": "Importera/Exportera Ditt AnvändarID"
+    },
+    "whatChangeUserID": {
+        "message": "Detta bör hållas hemligt. Det fungerar som ett lösenord och borde inte delas vidare med någon. Om någon kommer över detta kan den personen utge sig för att vara dig."
+    },
+    "setUserID": {
+        "message": "Ange AnvändarID"
+    },
+    "userIDChangeWarning": {
+        "message": "Varning: Ändring av AnvändarID är permanent. Är du säker att du vill göra det? Se till att ta en backup av ditt gamla för säkerhets skull."
+    },
+    "createdBy": {
+        "message": "Skapad av"
+    },
+    "autoSkip": {
+        "message": "Hoppa Över Automatiskt"
+    },
+    "showSkipNotice": {
+        "message": "Visa Notis Efter Sponsormeddelande Har Hoppats Över"
+    },
+    "keybindCurrentlySet": {
+        "message": ". Är just nu kopplat till:"
+    },
+    "supportInvidious": {
+        "message": "Stöd Invidious"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) är en tredjeparts YouTubeklient. För att aktivera stöd måste du acceptera de utökade rättigheterna. Detta kommer INTE att funka i incognito i Chrome och andra Cromium-varianter."
+    },
+    "optionsInfo": {
+        "message": "Aktivera Invidious stöd, avaktivera hoppa över automatiskt, dölj knappar och mer."
+    },
+    "addInvidiousInstance": {
+        "message": "Lägg Till Invidious Instans"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Lägg till en anpassad instans av Invidious. Denna måste vara formaterad med ENBART domänen. Exempelvis: invidious.ajay.app"
+    },
+    "add": {
+        "message": "Lägg till"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Detta är en individuell domän. Den måste ENBART inkludera domändelen. Exempelvis: invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "Rensa Invidious instanslista"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "Du kommer nu att rensa Invidious instanslista"
+    },
+    "currentInstances": {
+        "message": "Nuvarande Instanser:"
+    },
+    "enableAutoUpvote": {
+        "message": "Rösta Upp Automatiskt"
+    },
+    "whatAutoUpvote": {
+        "message": "Med detta aktiverat kommer tillägget att rösta upp alla rapporterade sponsormeddelanden om du inte rapporterar dem som felaktiga. Om notisen är avaktiverad så kommer det inte att ske."
+    },
+    "minDuration": {
+        "message": "Minsta varaktighet (sekunder):"
+    },
+    "minDurationDescription": {
+        "message": "Sponsorsegment som är kortare än det satta minstavärdet kommer inte att hoppas över eller visas i spelaren."
+    },
+    "shortCheck": {
+        "message": "Följande rapport är kortare än ditt minstavärde i inställningarna. Det skulle kunna betyda att det redan är rapporterat och bara ignorerat på grund av denna inställning. Är du säker på att du vill rapportera?"
+    },
+    "showUploadButton": {
+        "message": "Visa Uppladdningsknapp"
+    },
+    "whatUploadButton": {
+        "message": "Denna knapp visas på YouTube-spelaren efter att du har valt en tidpunkt och är redo att rapportera."
+    },
+    "customServerAddress": {
+        "message": "SponsorBlock Serveradress"
+    },
+    "customServerAddressDescription": {
+        "message": "Adressen SponsorBlock använder för att prata med servern.\nOm du inte har din egen serverinstans ska den här inställningen inte ändras."
+    },
+    "save": {
+        "message": "Spara"
+    },
+    "reset": {
+        "message": "Rensa"
+    },
+    "customAddressError": {
+        "message": "Denna adressen är inte korrekt formaterad. Se till att du har http:// eller https:// i början och inga snedstreck i slutet."
+    },
+    "areYouSureReset": {
+        "message": "Är du säker på att du vill rensa?"
+    },
+    "confirmPrivacy": {
+        "message": "Videon ser ut att vara olistad. Tryck på avbryt om du inte vill kolla efter sponsorer."
+    },
+    "unlistedCheck": {
+        "message": "Ignorera Olistade Videor"
+    },
+    "whatUnlistedCheck": {
+        "message": "Denna inställning kommer göra SponsorBlock märkbart långsammare. Uppslag av sponsormeddelanden kräver att video-ID skickas till servern. Om du är bekymrad över att olistade video-IDn skickas över internet, aktivera denna inställning."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com stöds nu"
+    },
+    "exportOptions": {
+        "message": "Importera/Exportera Alla Inställningar"
+    },
+    "whatExportOptions": {
+        "message": "Detta är alla dina inställningar i JSON-format. Det inkluderar ditt AnvändarID, så var nog med hur du hanterar datan."
+    },
+    "setOptions": {
+        "message": "Ange Inställningar"
+    },
+    "exportOptionsWarning": {
+        "message": "Varning: Att ändra inställningarna är permanent och kan förstöra din installation. Är du säker på att du vill göra detta? Se till att göra en backup för säkerhets skull."
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "Denna JSON är inte korrekt formaterad. Dina inställningar har inte ändrats."
+    },
+    "confirmNoticeTitle": {
+        "message": "Rapportera Segment"
+    },
+    "submit": {
+        "message": "Skicka"
+    },
+    "cancel": {
+        "message": "Avbryt"
+    },
+    "delete": {
+        "message": "Ta bort"
+    },
+    "preview": {
+        "message": "Förhandsgranska"
+    },
+    "edit": {
+        "message": "Redigera"
+    },
+    "copyDebugInformation": {
+        "message": "Kopiera Debuginformation Till Urklipp"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Misslyckades med att kopiera debuginformation till urklipp"
+    },
+    "copyDebugInformationOptions": {
+        "message": "Kopierar information till urklipp för att dela med en utvecklare vid rapportering av en bugg / när en utvecklare ber om det. Känslig data som AnvändarID, vitlistade kanaler, och anpassad serveradress följer inte med. Däremot innehåller det information om useragent, webbläsare, operativsystem, och tilläggsversion."
+    },
+    "copyDebugInformationComplete": {
+        "message": "Debuginformationen har kopierats till urklipp. Ta bort eventuell information du inte vill dela med dig av. Spara informationen i en textfil eller klistra in den i en buggrapport."
+    },
+    "theKey": {
+        "message": "Nyckeln"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "används redan av YouTube. Välj en annan nyckel."
+    },
+    "keyAlreadyUsed": {
+        "message": "är kopplad till en annan funktion. Välj en annan knapp."
+    },
+    "to": {
+        "message": "till",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Sponsormeddelande"
+    },
+    "category_interaction": {
+        "message": "Interaktion (Redundant Gilla, Prenumerera, Följ, etc.)"
+    },
+    "category_selfpromo": {
+        "message": "Självreklam och egna produkter"
+    },
+    "category_offtopic": {
+        "message": "Orelevant tangent (Subjektivt)"
+    },
+    "disable": {
+        "message": "Avaktivera"
+    },
+    "manualSkip": {
+        "message": "Hoppa Över Manuellt"
+    },
+    "showOverlay": {
+        "message": "Visa Lager Ovanpå Spelare"
+    },
+    "enableTestingServer": {
+        "message": "Aktivera Server För Betatestning"
+    },
+    "whatEnableTestingServer": {
+        "message": "Dina rapporter och röster KOMMER INTE RÄKNAS mot huvudservern. Använd endast detta för testning."
+    },
+    "testingServerWarning": {
+        "message": "Alla rapporter och röster KOMMER INTE RÄKNAS mot huvudservern så länge du är ansluten mot testservern. Se till att avaktivera detta när du vill rapportera ett riktigt sponsormeddelande."
+    },
+    "bracketNow": {
+        "message": "(Nu)"
+    }
+}
--- a/public/_locales/zh_CN/messages.json
+++ b/public/_locales/zh_CN/messages.json
@@ -1 +1,531 @@
-{}
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock for YouTube - 跳过赞助商广告",
+        "description": "Name of the extension."
+    },
+    "Description": {
+        "message": "跳过 YouTube 视频的赞助商广告。报告您观看的视频的赞助商广告以节省他人的时间。",
+        "description": "Description of the extension."
+    },
+    "400": {
+        "message": "服务器说此请求无效"
+    },
+    "429": {
+        "message": "您为这个视频提交了太长的赞助商广告时间，您确定有这么多吗？"
+    },
+    "409": {
+        "message": "它之前已经被提交过了"
+    },
+    "channelWhitelisted": {
+        "message": "频道已加入白名单！"
+    },
+    "Sponsor": {
+        "message": "赞助商广告"
+    },
+    "Sponsors": {
+        "message": "赞助商广告"
+    },
+    "Segment": {
+        "message": "赞助商广告片段"
+    },
+    "Segments": {
+        "message": "赞助商广告片段"
+    },
+    "noticeTitle": {
+        "message": "已跳过赞助商广告"
+    },
+    "reportButtonTitle": {
+        "message": "报告"
+    },
+    "reportButtonInfo": {
+        "message": "报告这个被提交的赞助商广告不正确。"
+    },
+    "Dismiss": {
+        "message": "忽略"
+    },
+    "Loading": {
+        "message": "加载中..."
+    },
+    "Mins": {
+        "message": "分钟"
+    },
+    "Secs": {
+        "message": "秒"
+    },
+    "Hide": {
+        "message": "不再显示"
+    },
+    "hitGoBack": {
+        "message": "点击取消跳过以回到您原来的样子。"
+    },
+    "unskip": {
+        "message": "取消跳过"
+    },
+    "reskip": {
+        "message": "继续跳过"
+    },
+    "paused": {
+        "message": "已暂停"
+    },
+    "confirmMSG": {
+        "message": "要编辑或删除个别值，请点击信息按钮或通过点击右上角的扩展图标打开扩展弹窗。"
+    },
+    "clearThis": {
+        "message": "您确定要清空它吗？\n\n"
+    },
+    "Unknown": {
+        "message": "提交您的赞助商广告时间时出错。请稍后再试。"
+    },
+    "sponsorFound": {
+        "message": "此视频的赞助商广告在数据库中！"
+    },
+    "sponsor404": {
+        "message": "未找到赞助商广告"
+    },
+    "sponsorStart": {
+        "message": "赞助商广告现在开始"
+    },
+    "sponsorEnd": {
+        "message": "赞助商广告现在结束"
+    },
+    "noVideoID": {
+        "message": "在此标签页未找到 Youtube 视频。如果您确定这是一个 Youtube 页面，请关闭此弹窗并重新打开。如果那没用，请尝试重新加载页面。"
+    },
+    "success": {
+        "message": "成功 ！"
+    },
+    "voted": {
+        "message": "已投票！"
+    },
+    "voteFail": {
+        "message": "您之前已经这样投过了。"
+    },
+    "serverDown": {
+        "message": "服务器似乎已宕机。请立即联系开发者。"
+    },
+    "connectionError": {
+        "message": "连接错误。错误代码： "
+    },
+    "wantToSubmit": {
+        "message": "您想要为此视频提交赞助商广告时间吗"
+    },
+    "leftTimes": {
+        "message": "您似乎还有一些赞助商广告时间未提交。请回到那个页面提交它们（它们未被删除）。"
+    },
+    "clearTimes": {
+        "message": "清除赞助商广告时间"
+    },
+    "openPopup": {
+        "message": "打开 SponsorBlock 弹窗"
+    },
+    "SubmitTimes": {
+        "message": "提交赞助商广告时间"
+    },
+    "submitCheck": {
+        "message": "您确定要提交它吗？"
+    },
+    "whitelistChannel": {
+        "message": "白名单频道"
+    },
+    "removeFromWhitelist": {
+        "message": "将频道移出白名单"
+    },
+    "voteOnTime": {
+        "message": "为赞助商广告时间投票"
+    },
+    "recordTimes": {
+        "message": "记录赞助商广告次数"
+    },
+    "soFarUHSubmited": {
+        "message": "您目前已提交"
+    },
+    "savedPeopleFrom": {
+        "message": "您已为人们节省了 "
+    },
+    "viewLeaderboard": {
+        "message": "查看排行榜"
+    },
+    "here": {
+        "message": "这里"
+    },
+    "recordTimesDescription": {
+        "message": "当赞助商广告开始和结束时，请点击下面的按钮记录并将其提交到数据库。"
+    },
+    "popupHint": {
+        "message": "提示：在观看视频时，按下分号键（；）以报告赞助商广告的开始/结束时间，按下引号键（’）提交。（可以在选项中更改）"
+    },
+    "lastTimes": {
+        "message": "选择的最新的赞助商广告信息时间"
+    },
+    "clearTimesButton": {
+        "message": "清除时间"
+    },
+    "submitTimesButton": {
+        "message": "提交时间"
+    },
+    "publicStats": {
+        "message": "这被用于在公开统计页面上展示您的贡献。查看它"
+    },
+    "setUsername": {
+        "message": "设定用户名"
+    },
+    "discordAdvert": {
+        "message": "快加入官方 Discord 服务器来提供建议与反馈！"
+    },
+    "hideThis": {
+        "message": "隐藏它"
+    },
+    "Options": {
+        "message": "选项"
+    },
+    "showButtons": {
+        "message": "在 Youtube 播放器上显示按钮"
+    },
+    "hideButtons": {
+        "message": "在 Youtube 播放器上隐藏按钮"
+    },
+    "hideButtonsDescription": {
+        "message": "这将隐藏在 YouTube 播放器上提交赞助商广告的按钮。我了解这个东西打扰到了某些人。除了使用那个按钮，这个弹窗也可以用来提交赞助商广告。 要隐藏出现的通知，请使用通知中显示的写着 ”不再显示“ 的按钮。您可以在以后再次启用这些设置。"
+    },
+    "showInfoButton": {
+        "message": "在 Youtube 播放器上显示信息按钮"
+    },
+    "hideInfoButton": {
+        "message": "在 Youtube 播放器上隐藏信息按钮"
+    },
+    "whatInfoButton": {
+        "message": "此按钮用于在 Youtube 页面中打开弹窗。"
+    },
+    "hideDeleteButton": {
+        "message": "在 Youtube 播放器上隐藏删除按钮"
+    },
+    "showDeleteButton": {
+        "message": "在 Youtube 播放器上显示删除按钮"
+    },
+    "whatDeleteButton": {
+        "message": "此按钮用于在 Youtube 播放器中清除所有赞助商广告。"
+    },
+    "disableViewTracking": {
+        "message": "禁用赞助商广告跳过统计跟踪"
+    },
+    "enableViewTracking": {
+        "message": "启用赞助商广告跳过统计跟踪"
+    },
+    "whatViewTracking": {
+        "message": "此功能追踪您跳过了哪些赞助商广告，以让用户知道他们提交的信息帮助了多少人，并与点赞一同作为依据，来确保垃圾信息不会进入数据库。在您每次跳过赞助商广告时，扩展都会向服务器发送一条消息。希望大部分人不要改变此设置，以使观看数字准确。:)"
+    },
+    "showNotice": {
+        "message": "重新显示通知"
+    },
+    "longDescription": {
+        "message": "SponsorBlock 是一个用于跳过 YouTube 视频的赞助商广告片段的扩展。SponsorBlock 是一个众包的浏览器扩展，可以让任何人提交 Youtube 视频的赞助商广告片段的开始和结束时间。一旦有人提交了信息，其他所有使用此扩展的人都能直接跳过赞助商广告片段。",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "网站",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "源代码",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "通知已升级！",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "如果您依然不喜欢它，请按下不再显示按钮。",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "设定赞助商广告开始的绑定按键"
+    },
+    "setSubmitKeybind": {
+        "message": "设定提交的绑定按键"
+    },
+    "keybindDescription": {
+        "message": "点击您想选择的按键"
+    },
+    "keybindDescriptionComplete": {
+        "message": "绑定按键已被设定为： "
+    },
+    "0": {
+        "message": "连接超时。请检查您的网络连接。如果您的网络运行正常，则可能是服务器过载或宕机。"
+    },
+    "disableSkipping": {
+        "message": "禁用 SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "启用 SponsorBlock"
+    },
+    "yourWork": {
+        "message": "您的成果",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "服务器似乎已过载。请稍后再试。"
+    },
+    "errorCode": {
+        "message": "错误代码： "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "跳过赞助商广告？"
+    },
+    "skip": {
+        "message": "跳过"
+    },
+    "disableAutoSkip": {
+        "message": "禁用自动跳过"
+    },
+    "enableAutoSkip": {
+        "message": "启用自动跳过"
+    },
+    "autoSkipDescription": {
+        "message": "自动跳过将会为您跳过赞助商广告。如果被禁用，将会显示一个通知询问您是否要跳过。"
+    },
+    "audioNotification": {
+        "message": "跳过时音频通知"
+    },
+    "audioNotificationDescription": {
+        "message": "跳过时音频通知会在跳过赞助商广告时播放声音。如果被禁用（或自动跳过被禁用），则不会播放声音。"
+    },
+    "youHaveSkipped": {
+        "message": "您已跳过 "
+    },
+    "youHaveSaved": {
+        "message": "您为自己节省了 "
+    },
+    "minLower": {
+        "message": "分钟"
+    },
+    "minsLower": {
+        "message": "分钟"
+    },
+    "hourLower": {
+        "message": "小时"
+    },
+    "hoursLower": {
+        "message": "小时"
+    },
+    "youHaveSavedTime": {
+        "message": "您为人们节省了"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " 的生命。"
+    },
+    "guildlinesSummary": {
+        "message": "- 请确保您的片段只包含付费推广片段，没有其他的东西。\n- 请确保跳过此片段不会跳过重要的内容\n- 如果整个视频本身就是赞助商广告，请不要报告它。完整视频报告系统将在不久后推出。\n- 请不要报告可能产生偏见的免责声明（如果评测视频有赞助商，请不要在他们提到这一点时跳过）。"
+    },
+    "statusReminder": {
+        "message": "在 status.sponsor.ajay.app 检查服务器状态。"
+    },
+    "changeUserID": {
+        "message": "导入/导出您的用户 ID"
+    },
+    "whatChangeUserID": {
+        "message": "这应该被保密。这就像一个密码，且不应该告诉任何人。如果有人拥有它，他就可以冒充您。"
+    },
+    "setUserID": {
+        "message": "设定用户 ID"
+    },
+    "userIDChangeWarning": {
+        "message": "警告：更改用户 ID 是永久性的。您确定要这么做吗？请务必备份您的旧用户 ID 以防万一。"
+    },
+    "createdBy": {
+        "message": "创建者"
+    },
+    "autoSkip": {
+        "message": "自动跳过"
+    },
+    "showSkipNotice": {
+        "message": "跳过赞助商广告后显示通知"
+    },
+    "keybindCurrentlySet": {
+        "message": "。目前被设定为："
+    },
+    "supportInvidious": {
+        "message": "支持 Invidious"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) 是一个第三方 Youtube 客户端。要启用支持，您必须允许额外的权限。在 Chrome 及其他 Chromium 变种的匿名模式中无法工作。"
+    },
+    "optionsInfo": {
+        "message": "启用 Invidious 支持，禁用自动跳过，隐藏按钮等等。"
+    },
+    "addInvidiousInstance": {
+        "message": "添加 Invidious 实例"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "添加一个 Invidious 自定义实例。它必须是只有域名的格式。例如：invidious.ajay.app"
+    },
+    "add": {
+        "message": "添加"
+    },
+    "addInvidiousInstanceError": {
+        "message": "这是一个无效的域名。它应该只包括域名部分。例如：invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "重置 Invidious 实例列表"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "您将会重置 Invidious 实例列表"
+    },
+    "currentInstances": {
+        "message": "当前实例："
+    },
+    "enableAutoUpvote": {
+        "message": "自动点赞"
+    },
+    "whatAutoUpvote": {
+        "message": "启用此选项后，扩展将会为所有您观看过的提交点赞，如果您没有报告它们的话。如果通知被禁用，那就不会出现。"
+    },
+    "minDuration": {
+        "message": "最小持续时间(秒)："
+    },
+    "minDurationDescription": {
+        "message": "短于设定值的赞助商广告片段将不会被跳过或显示在播放器中。"
+    },
+    "shortCheck": {
+        "message": "以下的提交短于您的最小持续时间选项。这代表它们可能已经被提交，只是由于该选项被忽略了。您确定要提交吗？"
+    },
+    "showUploadButton": {
+        "message": "显示上传按钮"
+    },
+    "whatUploadButton": {
+        "message": "在您选择了时间并准备提交后，此按钮会出现在 Youtube 播放器中。"
+    },
+    "customServerAddress": {
+        "message": "SponsorBlock 服务器地址"
+    },
+    "customServerAddressDescription": {
+        "message": "SponsorBlock 用于联系服务器的地址。\n除非您有自己的服务器实例，否则这不应该更改。"
+    },
+    "save": {
+        "message": "保存"
+    },
+    "reset": {
+        "message": "重置"
+    },
+    "customAddressError": {
+        "message": "此地址格式不正确。请确保开头有 http:// 或 https:// ，结尾没有斜杠 / 。"
+    },
+    "areYouSureReset": {
+        "message": "您确定要重置它吗？"
+    },
+    "confirmPrivacy": {
+        "message": "未检测到视频的记录。如果您不想检查赞助商广告，请点击取消。"
+    },
+    "unlistedCheck": {
+        "message": "忽略未找到记录的视频"
+    },
+    "whatUnlistedCheck": {
+        "message": "此设置将显著的减慢 SponsorBlock 。赞助商广告查找器需要向服务器发送未找到记录的视频 ID 。如果您对通过互联网发送视频 ID 有疑虑，请启用此选项。"
+    },
+    "mobileUpdateInfo": {
+        "message": "现已支持 m.youtube.com"
+    },
+    "exportOptions": {
+        "message": "导入/导出所有选项"
+    },
+    "whatExportOptions": {
+        "message": "这是您全部配置的 JSON 格式。它包含了您的用户 ID ，所以您一定要谨慎的保管它。"
+    },
+    "setOptions": {
+        "message": "设定选项"
+    },
+    "exportOptionsWarning": {
+        "message": "警告：更改选项是永久性的且可能破坏您安装的东西。您确定要这么做吗？请确保已备份旧文件以防万一。"
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "此 JSON 格式不正确。您的选项尚未更改。"
+    },
+    "confirmNoticeTitle": {
+        "message": "提交片段"
+    },
+    "submit": {
+        "message": "提交"
+    },
+    "cancel": {
+        "message": "取消"
+    },
+    "delete": {
+        "message": "删除"
+    },
+    "preview": {
+        "message": "预览"
+    },
+    "edit": {
+        "message": "编辑"
+    },
+    "copyDebugInformation": {
+        "message": "复制调试信息到剪贴板"
+    },
+    "copyDebugInformationFailed": {
+        "message": "复制到剪贴板失败"
+    },
+    "copyDebugInformationOptions": {
+        "message": "复制信息到剪贴板，在提交错误或开发者需要时提供给他。 敏感信息如：您的用户ID，白名单频道和自定义服务器地址等已被删除。然而，它仍然包含诸如您的 useragent ，浏览器，操作系统和扩展版本号等信息。 "
+    },
+    "copyDebugInformationComplete": {
+        "message": "调试信息已复制到剪切板中。 您可以随意移除任何您不想分享的信息。请将其另存为 .txt 文件或粘贴到错误报告中。"
+    },
+    "theKey": {
+        "message": "按键"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "已被 Youtube 使用。请选择其他按键。"
+    },
+    "keyAlreadyUsed": {
+        "message": "已绑定其他操作。请选择其他按键。"
+    },
+    "to": {
+        "message": "到",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "赞助商广告"
+    },
+    "category_intro": {
+        "message": "开头"
+    },
+    "category_outro": {
+        "message": "结尾"
+    },
+    "category_interaction": {
+        "message": "互动（重复多次提醒您点击喜欢，订阅，关注等）"
+    },
+    "category_selfpromo": {
+        "message": "自我推销和商品"
+    },
+    "category_offtopic": {
+        "message": "离题（主观的）"
+    },
+    "disable": {
+        "message": "禁用"
+    },
+    "manualSkip": {
+        "message": "手动跳过"
+    },
+    "showOverlay": {
+        "message": "在搜索栏中显示"
+    },
+    "enableTestingServer": {
+        "message": "启用 Beta 测试服务器"
+    },
+    "whatEnableTestingServer": {
+        "message": "您的提交和投票将不会计入主服务器。它只被用于测试。"
+    },
+    "testingServerWarning": {
+        "message": "当连接到测试服务器时，所有的提交和投票将不会计入主服务器。当您想要进行真实提交时，请确保禁用了此选项。"
+    },
+    "bracketNow": {
+        "message": "(现在)"
+    },
+    "moreCategories": {
+        "message": "更多类别"
+    }
+}
--- a/public/content.css
+++ b/public/content.css
@@ -83,6 +83,8 @@
 	border-spacing: 5px 10px;
 	padding-left: 5px;
 	padding-right: 5px;
+
+	border-collapse: unset;
 }

 .sponsorSkipNoticeFadeIn {
--- a/public/popup.css
+++ b/public/popup.css
@@ -39,10 +39,8 @@ sub.popupElement {
 	vertical-align: text-bottom;
 }

-.popupElement {
-    font-family: 'Source Sans Pro', sans-serif;
-
-    color: black;
+.logoText {
+	color: white;
 }

 h1.popupElement {
@@ -52,12 +50,21 @@ h1.popupElement {

 .popupBody {
 	font-size: 14px;
-	background-color: #ffd9d9;
+	background-color: #333;
 	padding: 0px 5px;
+
+	font-family: 'Source Sans Pro', sans-serif;
+
+	color: #dddddd;
+}
+
+.outerPopupBody {
+	background-color: #222626;
+	overflow-y: scroll;
 }

 .discreteLink.popupElement {
-	color: black;
+	color: #dddddd;
 }

 .recordingSubtitle.popupElement {
@@ -102,7 +109,7 @@ h1.popupElement {
 }

 .whitelistButton.popupElement {
-	background-color:#3acc3a;
+	background-color:#27a52d;
 	-moz-border-radius:28px;
 	-webkit-border-radius:28px;
 	border-radius:28px;
@@ -114,13 +121,15 @@ h1.popupElement {
 	padding:8px 37px;
 	text-decoration:none;
 	text-shadow:0px 0px 0px #27663c;
-    }
+
+	transition: 0.01s background-color;
+}
 .whitelistButton:hover.popupElement {
-    background-color:#218b26;
+    background-color:#3acc3a;
 }
 .whitelistButton:focus.popupElement {
    outline: none;
-    background-color:#218b26;
+    background-color:#3acc3a;
 }
 .whitelistButton:active.popupElement {
    position:relative;
@@ -128,25 +137,27 @@ h1.popupElement {
 }

 .greenButton.popupElement {
-    background-color:#ec1c1c;
+    background-color:#cc1717;
    -moz-border-radius:28px;
    -webkit-border-radius:28px;
    border-radius:28px;
-    border:1px solid #d31919;
+    border: none;
    display:inline-block;
    cursor:pointer;
    color:#ffffff;
    font-size:16px;
    padding:8px 37px;
    text-decoration:none;
-    text-shadow:0px 0px 0px #662727;
+	text-shadow:0px 0px 0px #662727;
+	
+	transition: 0.01s background-color;
 }
 .greenButton:hover.popupElement {
-    background-color:#bf2a2a;
+    background-color:#ec1c1c;
 }
 .greenButton:focus.popupElement {
 	outline: none;
-	background-color:#bf2a2a;
+	background-color:#ec1c1c;
 }
 .greenButton:active.popupElement {
    position:relative;
@@ -154,14 +165,11 @@ h1.popupElement {
 }

 .dangerButton.popupElement {
-	-moz-box-shadow:inset 0px 1px 0px 0px #cf866c;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cf866c;
-	box-shadow:inset 0px 1px 0px 0px #cf866c;
-	background-color:#d0451b;
+	background-color:#bc3315;
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
 	border-radius:3px;
-	border:1px solid #942911;
+	border: none;
 	display:inline-block;
 	cursor:pointer;
 	color:#ffffff;
@@ -171,11 +179,11 @@ h1.popupElement {
 	text-shadow:0px 1px 0px #854629;
 }
 .dangerButton:hover.popupElement {
-	background-color:#bc3315;
+	background-color:#d0451b;
 }
 .dangerButton:focus.popupElement {
 	outline: none;
-	background-color:#bc3315;
+	background-color:#d0451b;
 }
 .dangerButton:active.popupElement {
 	position:relative;
@@ -183,14 +191,11 @@ h1.popupElement {
 }

 .warningButton.popupElement {
-	-moz-box-shadow:inset 0px 1px 0px 0px #cfbd6c;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfbd6c;
-	box-shadow:inset 0px 1px 0px 0px #cfbd6c;
-	background-color:#d0821b;
+	background-color:#bc8215;
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
 	border-radius:3px;
-	border:1px solid #948b11;
+	border: none;
 	display:inline-block;
 	cursor:pointer;
 	color:#ffffff;
@@ -200,11 +205,11 @@ h1.popupElement {
 	text-shadow:0px 1px 0px #856829;
 }
 .warningButton:hover.popupElement {
-	background-color:#bc8215;
+	background-color:#d0821b;
 }
 .warningButton:focus.popupElement {
 	outline: none;
-	background-color:#bc8215;
+	background-color:#d0821b;
 }
 .warningButton:active.popupElement {
 	position:relative;
--- a/public/popup.html
+++ b/public/popup.html
@@ -5,10 +5,10 @@
    <link id="sponsorBlockStyleSheet" rel="stylesheet" type="text/css" href="popup.css"/>
  </head>

-  <body class="popupBody">
+  <body class="outerPopupBody">
    <center>
      <div id="app" class="popupBody sponsorBlockPageBody">
-          <h1 class="popupElement">
+          <h1 class="popupElement logoText">
            <img src="icons/IconSponsorBlocker256px.png" height="32px" id="sponsorBlockPopupLogo"/>
            __MSG_Name__
          </h1>
@@ -71,6 +71,10 @@

              <button id="whitelistChannel" class="whitelistButton popupElement">__MSG_whitelistChannel__</button>
              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">__MSG_removeFromWhitelist__</button>
+
+              <div id="whitelistForceCheck" style="text-decoration: underline; cursor: pointer;display: none">
+                __MSG_forceChannelCheckPopup__
+              </div>
            </div>

            <br/>
--- a/src/background.ts
+++ b/src/background.ts
@@ -31,11 +31,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
        case "openConfig":
            chrome.runtime.openOptionsPage();
            return
-        case "submitTimes":
-            submitTimes(request.videoID, callback);
-        
-            //this allows the callback to be called later by the submitTimes function
-            return true; 
        case "addSponsorTime":
            addSponsorTime(request.time, request.videoID, callback);
        
@@ -182,61 +177,4 @@ function submitVote(type, UUID, callback) {
        }

    });
-}
-
-async function submitTimes(videoID: string, callback) {
-    //get the video times from storage
-    let sponsorTimes = Config.config.sponsorTimes.get(videoID);
-    let userID = Config.config.userID;
-		
-    if (sponsorTimes != undefined && sponsorTimes.length > 0) {
-        let durationResult = <Types.VideoDurationResponse> await new Promise((resolve, reject) => {
-            chrome.tabs.query({
-                active: true,
-                currentWindow: true
-            }, function(tabs) {
-                chrome.tabs.sendMessage(tabs[0].id, {
-                    message: "getVideoDuration"
-                }, (response) => resolve(response));
-            });
-        });
-
-        //check if a sponsor exceeds the duration of the video
-        for (let i = 0; i < sponsorTimes.length; i++) {
-            if (sponsorTimes[i][1] > durationResult.duration) {
-                sponsorTimes[i][1] = durationResult.duration;
-            }
-        }
-
-        //submit these times
-        for (let i = 0; i < sponsorTimes.length; i++) {
-            //to prevent it from happeneing twice
-            let increasedContributionAmount = false;
-
-            //submit the sponsorTime
-            utils.sendRequestToServer("GET", "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
-                    + "&userID=" + userID, function(xmlhttp, error) {
-                if (xmlhttp.readyState == 4 && !error) {
-                    callback({
-                        statusCode: xmlhttp.status,
-                        responseText: xmlhttp.responseText
-                    });
-
-                    
-
-                    if (xmlhttp.status == 200) {
-                        //save the amount contributed
-                        if (!increasedContributionAmount) {
-                            increasedContributionAmount = true;
-                            Config.config.sponsorTimesContributed = Config.config.sponsorTimesContributed + sponsorTimes.length;
-                        }
-                    }
-                } else if (error) {
-                    callback({
-                        statusCode: -1
-                    });
-                }
-            });
-        }
-    }
 }
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import Config from "../config"
-import { ContentContainer } from "../types";
+import { ContentContainer, SponsorHideType } from "../types";

 import Utils from "../utils";
 var utils = new Utils();
@@ -269,7 +269,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                //this one is the one to hide
                
                //add this as a hidden sponsorTime
-                this.contentContainer().hiddenSponsorTimes.push(i);
+                this.contentContainer().sponsorTimes[i].hidden = SponsorHideType.Downvoted;
            
                this.contentContainer().updatePreviewBar();
                break;
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -47,6 +47,9 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
        document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('keydown', function (event) {
            event.stopPropagation();
        });
+
+        // Add as a config listener
+        Config.configListeners.push(this.configUpdate.bind(this));
    }

    render() {
@@ -130,6 +133,12 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                            onClick={() => this.setTimeToNow(1)}>
                                {chrome.i18n.getMessage("bracketNow")}
                        </span>
+
+                        <span id={"endButton" + this.idSuffix}
+                            className="sponsorNowButton"
+                            onClick={() => this.setTimeToEnd()}>
+                                {chrome.i18n.getMessage("bracketEnd")}
+                        </span>
                </div>
            );
        } else {
@@ -227,10 +236,18 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
    }

    setTimeToNow(index: number) {
+        this.setTimeTo(index, this.props.contentContainer().v.currentTime);
+    }
+
+    setTimeToEnd() {
+        this.setTimeTo(1, this.props.contentContainer().v.duration);
+    }
+
+    setTimeTo(index: number, time: number) {
        let sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];

        sponsorTime.segment[index] = 
-            this.props.contentContainer().v.currentTime;
+            time;

        this.setState({
            sponsorTimeEdits: this.getFormattedSponsorTimesEdits(sponsorTime)
@@ -319,6 +336,10 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
            this.props.submissionNotice.forceUpdate();
        }
    }
+
+    configUpdate() {
+        this.forceUpdate();
+    }
 }

 export default SponsorTimeEditComponent;
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,10 +1,14 @@
 import * as CompileConfig from "../config.json";
 import { CategorySelection, CategorySkipOption } from "./types";

+import Utils from "./utils";
+const utils = new Utils();
+
 interface SBConfig {
    userID: string,
    sponsorTimes: SBMap<string, any>,
-    whitelistedChannels: Array<any>,
+    whitelistedChannels: string[],
+    forceChannelCheck: boolean,
    startSponsorKeybind: string,
    submitKeybind: string,
    minutesSaved: number,
@@ -104,6 +108,7 @@ var Config: SBObject = {
        userID: null,
        sponsorTimes: new SBMap("sponsorTimes"),
        whitelistedChannels: [],
+        forceChannelCheck: false,
        startSponsorKeybind: ";",
        submitKeybind: "'",
        minutesSaved: 0,
@@ -236,7 +241,7 @@ function fetchConfig() {
    });
 }

-function migrateOldFormats() {
+async function migrateOldFormats() {
    if (Config.config["disableAutoSkip"]) {
        for (const selection of Config.config.categorySelections) {
            if (selection.name === "sponsor") {
@@ -246,6 +251,36 @@ function migrateOldFormats() {
            }
        }
    }
+
+    // Channel URLS
+    if (Config.config.whitelistedChannels.length > 0 && 
+            (Config.config.whitelistedChannels[0].includes("/") || Config.config.whitelistedChannels[0] == null)) {
+        let newChannelList: string[] = [];
+        for (const item of Config.config.whitelistedChannels) {
+            if (item != null) {
+                if (item.includes("/channel/")) {
+                    newChannelList.push(item.split("/")[2]);
+                } else if (item.includes("/user/") &&  utils.isContentScript()) {
+                    // Replace channel URL with channelID
+                    let response = await utils.asyncRequestToCustomServer("GET", "https://sponsor.ajay.app/invidious/api/v1/channels/" + item.split("/")[2] + "?fields=authorId");
+                
+                    if (response.ok) {
+                        newChannelList.push((await response.json()).authorId);
+                    } else {
+                        // Add it at the beginning so it gets converted later
+                        newChannelList.unshift(item);
+                    }
+                } else if (item.includes("/user/")) {
+                    // Add it at the beginning so it gets converted later (The API can only be called in the content script due to CORS issues)
+                    newChannelList.unshift(item);
+                } else {
+                    newChannelList.push(item);
+                }
+            }
+        }
+
+        Config.config.whitelistedChannels = newChannelList;
+    }
 }

 async function setupConfig() {
--- a/src/content.ts
+++ b/src/content.ts
@@ -1,6 +1,6 @@
 import Config from "./config";

-import { SponsorTime, CategorySkipOption, CategorySelection, VideoID } from "./types";
+import { SponsorTime, CategorySkipOption, CategorySelection, VideoID, SponsorHideType } from "./types";

 import { ContentContainer } from "./types";
 import Utils from "./utils";
@@ -24,15 +24,17 @@ var sponsorTimes: SponsorTime[] = null;
 //what video id are these sponsors for
 var sponsorVideoID: VideoID = null;

+// JSON video info 
+var videoInfo: any = null;
+//the channel this video is about
+var channelID;
+
 // Skips are scheduled to ensure precision.
 // Skips are rescheduled every seeking event.
 // Skips are canceled every seeking event
 var currentSkipSchedule: NodeJS.Timeout = null;
 var seekListenerSetUp = false

-//these are sponsors that have been downvoted
-var hiddenSponsorTimes: number[] = [];
-
 /** @type {Array[boolean]} Has the sponsor been skipped */
 var sponsorSkipped: boolean[] = [];

@@ -59,12 +61,6 @@ var switchingVideos = null;
 var lastCheckTime = 0;
 var lastCheckVideoTime = -1;

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

@@ -110,7 +106,6 @@ var skipNoticeContentContainer: ContentContainer = () => ({
    unskipSponsorTime,
    sponsorTimes,
    sponsorTimesSubmitting,
-    hiddenSponsorTimes,
    v: video,
    sponsorVideoID,
    reskipSponsorTime,
@@ -143,8 +138,7 @@ function messageListener(request: any, sender: any, sendResponse: (response: any
            //send the sponsor times along with if it's found
            sendResponse({
                found: sponsorDataFound,
-                sponsorTimes: sponsorTimes,
-                hiddenSponsorTimes: hiddenSponsorTimes
+                sponsorTimes: sponsorTimes
            });

            if (popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
@@ -188,9 +182,9 @@ function messageListener(request: any, sender: any, sendResponse: (response: any
            });

            break;
-        case "getChannelURL":
+        case "getChannelID":
            sendResponse({
-            channelURL: channelURL
+                channelID: channelID
            });

            break;
@@ -267,6 +261,10 @@ function resetValues() {
    sponsorTimes = null;
    sponsorLookupRetries = 0;

+    videoInfo = null;
+    channelWhitelisted = false;
+    channelID = null;
+
    //empty the preview bar
    if (previewBar !== null) {
        previewBar.set([], [], 0);
@@ -298,9 +296,16 @@ async function videoIDChange(id) {
    // Wait for options to be ready
    await utils.wait(() => Config.config !== null, 5000, 1);

+    // Get new video info
+    getVideoInfo();
+
    // If enabled, it will check if this video is private or unlisted and double check with the user if the sponsors should be looked up
    if (Config.config.checkForUnlistedVideos) {
-        await utils.wait(isPrivacyInfoAvailable);
+        try {
+            await utils.wait(() => !!videoInfo, 5000, 1);
+        } catch (err) {
+            alert(chrome.i18n.getMessage("adblockerIssue"));
+        }

        if (isUnlisted()) {
            let shouldContinue = confirm(chrome.i18n.getMessage("confirmPrivacy"));
@@ -308,10 +313,8 @@ async function videoIDChange(id) {
        }
    }

-    // TODO: Use a better method here than using type any
-    // This is done to be able to do channelIDPromise.isFulfilled and channelIDPromise.isRejected
-    let channelIDPromise: any = utils.wait(getChannelID);
-    channelIDPromise.then(() => channelIDPromise.isFulfilled = true).catch(() => channelIDPromise.isRejected  = true);
+    // Update whitelist data when the video data is loaded
+    utils.wait(() => !!videoInfo, 5000, 10).then(whitelistCheck);

    //setup the preview bar
    if (previewBar === null) {
@@ -351,7 +354,7 @@ async function videoIDChange(id) {
    //close popup
    closeInfoMenu();
 	
-    sponsorsLookup(id, channelIDPromise);
+    sponsorsLookup(id);

    //make sure everything is properly added
    updateVisibilityOfPlayerControlsButton().then(() => {
@@ -460,10 +463,12 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
    cancelSponsorSchedule();
    if (video.paused) return;

-    if (Config.config.disableSkipping || channelWhitelisted){
+    if (Config.config.disableSkipping || channelWhitelisted || (channelID === null && Config.config.forceChannelCheck)){
        return;
    }

+    if (incorrectVideoIDCheck()) return;
+
    if (currentTime === undefined || currentTime === null) currentTime = video.currentTime;

    let skipInfo = getNextSkipIndex(currentTime, includeIntersectingSegments);
@@ -481,27 +486,17 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
        let forcedSkipTime: number = null;
        let forcedIncludeIntersectingSegments = false;

+        if (incorrectVideoIDCheck()) return;
+
        if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
-            // Double check that the videoID is correct
-            // TODO: Remove this bug catching if statement when the bug is found
-            let currentVideoID = getYouTubeVideoID(document.URL);
-            if (currentVideoID == sponsorVideoID) {
-                skipToTime(video, skipInfo.endIndex, skipInfo.array, skipInfo.openNotice);
+            skipToTime(video, skipInfo.endIndex, skipInfo.array, skipInfo.openNotice);

-                // TODO: Know the autoSkip settings for ALL items being skipped
-                if (utils.getCategorySelection(currentSkip.category).option === CategorySkipOption.ManualSkip) {
-                    forcedSkipTime = skipTime[0] + 0.001;
-                } else {
-                    forcedSkipTime = skipTime[1];
-                    forcedIncludeIntersectingSegments = true;
-                }
+            // TODO: Know the autoSkip settings for ALL items being skipped
+            if (utils.getCategorySelection(currentSkip.category).option === CategorySkipOption.ManualSkip) {
+                forcedSkipTime = skipTime[0] + 0.001;
            } else {
-                // Something has really gone wrong
-                console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
-                console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID);
-
-                // Video ID change occured
-                videoIDChange(currentVideoID);
+                forcedSkipTime = skipTime[1];
+                forcedIncludeIntersectingSegments = true;
            }
        }

@@ -515,11 +510,32 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
    }
 }

-function sponsorsLookup(id: string, channelIDPromise?) {
+/**
+ * This makes sure the videoID is still correct
+ * 
+ * TODO: Remove this bug catching if statement when the bug is found
+ */
+function incorrectVideoIDCheck(): boolean {
+    let currentVideoID = getYouTubeVideoID(document.URL);
+    if (currentVideoID !== sponsorVideoID) {
+        // Something has really gone wrong
+        console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
+        console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID);
+
+        // Video ID change occured
+        videoIDChange(currentVideoID);
+
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function sponsorsLookup(id: string) {
    video = document.querySelector('video') // Youtube video player
    //there is no video here
    if (video == null) {
-        setTimeout(() => sponsorsLookup(id, channelIDPromise), 100);
+        setTimeout(() => sponsorsLookup(id), 100);
        return;
    }

@@ -578,18 +594,6 @@ function sponsorsLookup(id: string, channelIDPromise?) {
        startSponsorSchedule();
    }

-    if (channelIDPromise !== undefined) {
-        if (channelIDPromise.isFulfilled) {
-            whitelistCheck();
-        } else if (channelIDPromise.isRejected) {
-            //try again
-            utils.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;
@@ -624,43 +628,16 @@ function sponsorsLookup(id: string, channelIDPromise?) {

            sponsorTimes = recievedSegments;

-            // Remove all submissions smaller than the minimum duration
+            // Hide all submissions smaller than the minimum duration
            if (Config.config.minDuration !== 0) {
-                let smallSegments: SponsorTime[] = [];
-
                for (let i = 0; i < sponsorTimes.length; i++) {
-                    if (sponsorTimes[i].segment[1] - sponsorTimes[i].segment[0] >= Config.config.minDuration) {
-                        smallSegments.push(sponsorTimes[i]);
+                    if (sponsorTimes[i].segment[1] - sponsorTimes[i].segment[0] < Config.config.minDuration) {
+                        sponsorTimes[i].hidden = SponsorHideType.MinimumDuration;
                    }
                }
-
-                sponsorTimes = smallSegments;
            }

-            if (!switchingVideos) {
-                // See if there are any starting sponsors
-                let startingSponsor: number = -1;
-                for (const time of sponsorTimes) {
-                    if (time[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
-                        startingSponsor = time.segment[0];
-                        break;
-                    }
-                }
-                if (!startingSponsor) {
-                    for (const time of sponsorTimesSubmitting) {
-                        if (time.segment[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
-                            startingSponsor = time.segment[0];
-                            break;
-                        }
-                    }
-                }
-
-                if (startingSponsor !== -1) {
-                    startSponsorSchedule(false, startingSponsor);
-                } else {
-                    startSponsorSchedule();
-                }
-            }
+            startSkipScheduleCheckingForStartSponsors();

            // Reset skip save
            sponsorSkipped = [];
@@ -678,23 +655,13 @@ function sponsorsLookup(id: string, channelIDPromise?) {
            sponsorDataFound = false;

            //check if this video was uploaded recently
-            //use the invidious api to get the time published
-            sendRequestToCustomServer('GET', "https://www.youtube.com/get_video_info?video_id=" + id, function(xmlhttp, error) {
-                if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-                    let decodedData = decodeURIComponent(xmlhttp.responseText).match(/player_response=([^&]*)/)[1];
+            utils.wait(() => !!videoInfo).then(() => {
+                let dateUploaded = videoInfo.microformat.playerMicroformatRenderer.uploadDate;

-                    if (decodedData === undefined) {
-                        console.error("[SB] Failed at getting video upload date info from YouTube.");
-                        return;
-                    }
-
-                    let dateUploaded = JSON.parse(decodedData).microformat.playerMicroformatRenderer.uploadDate;
-
-                    //if less than 3 days old
-                    if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
-                        //TODO lower when server becomes better
-                        setTimeout(() => sponsorsLookup(id, channelIDPromise), 180000);
-                    }
+                //if less than 3 days old
+                if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
+                    //TODO lower when server becomes better
+                    setTimeout(() => sponsorsLookup(id), 180000);
                }
            });

@@ -704,13 +671,62 @@ function sponsorsLookup(id: string, channelIDPromise?) {

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

            sponsorLookupRetries++;
        }
    });
 }

+/**
+ * Only should be used when it is okay to skip a sponsor when in the middle of it 
+ * 
+ * Ex. When segments are first loaded
+ */
+function startSkipScheduleCheckingForStartSponsors() {
+    if (!switchingVideos) {
+        // See if there are any starting sponsors
+        let startingSponsor: number = -1;
+        for (const time of sponsorTimes) {
+            if (time.segment[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
+                startingSponsor = time.segment[0];
+                break;
+            }
+        }
+        if (startingSponsor === -1) {
+            for (const time of sponsorTimesSubmitting) {
+                if (time.segment[0] <= video.currentTime && time.segment[0] > startingSponsor && time.segment[1] > video.currentTime) {
+                    startingSponsor = time.segment[0];
+                    break;
+                }
+            }
+        }
+
+        if (startingSponsor !== -1) {
+            startSponsorSchedule(false, startingSponsor);
+        } else {
+            startSponsorSchedule();
+        }
+    }
+}
+
+/**
+ * Get the video info for the current tab from YouTube
+ */
+function getVideoInfo() {
+    sendRequestToCustomServer('GET', "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID, function(xmlhttp, error) {
+        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+            let decodedData = decodeURIComponent(xmlhttp.responseText).match(/player_response=([^&]*)/)[1];
+            if (!decodedData) {
+                console.error("[SB] Failed at getting video info from YouTube.");
+                return;
+            }
+
+            videoInfo = JSON.parse(decodedData);
+        }
+    });
+}
+
 function getYouTubeVideoID(url: string) {
    // For YouTube TV support
    if(url.startsWith("https://www.youtube.com/tv#/")) url = url.replace("#", "");
@@ -753,55 +769,6 @@ function getYouTubeVideoID(url: string) {
    return false;
 }

-function getChannelID() {
-    //get channel id
-    let channelURLContainer = null;
-
-    channelURLContainer = document.querySelector("#channel-name > #container > #text-container > #text");
-    if (channelURLContainer !== null) {
-        channelURLContainer = channelURLContainer.firstElementChild;
-    } else if (onInvidious) {
-        // Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers...
-        channelURLContainer = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a");
-    } else {
-        //old YouTube theme
-        let channelContainers = document.getElementsByClassName("yt-user-info");
-        if (channelContainers.length != 0) {
-            channelURLContainer = channelContainers[0].firstElementChild;
-        }
-    }
-
-    if (channelURLContainer === null) {
-        //try later
-        return false;
-    }
-
-    //first get the title to make sure a title change has occurred (otherwise the next video might still be loading)
-    let titleInfoContainer = document.getElementById("info-contents");
-    let currentTitle = "";
-    if (titleInfoContainer != null) {
-        currentTitle = (<HTMLElement> titleInfoContainer.firstElementChild.firstElementChild.querySelector(".title").firstElementChild).innerText;
-    } else if (onInvidious) {
-        // Unfortunately, the Invidious HTML doesn't have much in the way of element identifiers...
-        currentTitle = document.querySelector("body > div > div.pure-u-1.pure-u-md-20-24 div.pure-u-1.pure-u-lg-3-5 > div > a > div > span").textContent;
-    } else {
-        //old YouTube theme
-        currentTitle = document.getElementById("eow-title").innerText;
-    }
-
-    if (title == currentTitle) {
-        //video hasn't changed yet, wait
-        //try later
-        return false;
-    }
-    title = currentTitle;
-
-    channelURL = channelURLContainer.getAttribute("href");
-
-    //reset variables
-    channelWhitelisted = false;
-}
-
 /**
 * This function is required on mobile YouTube and will keep getting called whenever the preview bar disapears
 */
@@ -822,7 +789,7 @@ function updatePreviewBar() {
    //create an array of the sponsor types
    let types = [];
    for (let i = 0; i < localSponsorTimes.length; i++) {
-        if (!hiddenSponsorTimes.includes(i)) {
+        if (localSponsorTimes[i].hidden === SponsorHideType.Visible) {
            types.push(localSponsorTimes[i].category);
        } else {
            // Don't show this sponsor
@@ -841,12 +808,17 @@ function updatePreviewBar() {

 //checks if this channel is whitelisted, should be done only after the channelID has been loaded
 function whitelistCheck() {
+    channelID = videoInfo.videoDetails.channelId;
+
    //see if this is a whitelisted channel
    let whitelistedChannels = Config.config.whitelistedChannels;

-    if (whitelistedChannels != undefined && whitelistedChannels.includes(channelURL)) {
+    if (whitelistedChannels != undefined && whitelistedChannels.includes(channelID)) {
        channelWhitelisted = true;
    }
+
+    // check if the start of segments were missed
+    if (sponsorTimes && sponsorTimes.length > 0) startSkipScheduleCheckingForStartSponsors();
 }

 /**
@@ -856,13 +828,13 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool
        {array: SponsorTime[], index: number, endIndex: number, openNotice: boolean} {

    let sponsorStartTimes = getStartTimes(sponsorTimes, includeIntersectingSegments);
-    let sponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimes, includeIntersectingSegments, currentTime, true);
+    let sponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimes, includeIntersectingSegments, currentTime, true, true);

    let minSponsorTimeIndex = sponsorStartTimes.indexOf(Math.min(...sponsorStartTimesAfterCurrentTime));
    let endTimeIndex = getLatestEndTimeIndex(sponsorTimes, minSponsorTimeIndex);

    let previewSponsorStartTimes = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments);
-    let previewSponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, currentTime, false);
+    let previewSponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, currentTime, true, false);

    let minPreviewSponsorTimeIndex = previewSponsorStartTimes.indexOf(Math.min(...previewSponsorStartTimesAfterCurrentTime));
    let previewEndTimeIndex = getLatestEndTimeIndex(sponsorTimesSubmitting, minPreviewSponsorTimeIndex);
@@ -911,7 +883,7 @@ function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideH
        let latestEndTime = sponsorTimes[latestEndTimeIndex].segment[1];

        if (currentSegment[0] <= latestEndTime && currentSegment[1] > latestEndTime 
-            && (!hideHiddenSponsors || !hiddenSponsorTimes.includes(i))
+            && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible)
            && utils.getCategorySelection(sponsorTimes[i].category).option === CategorySkipOption.AutoSkip) {
                // Overlapping segment
                latestEndTimeIndex = i;
@@ -937,14 +909,16 @@ function getLatestEndTimeIndex(sponsorTimes: SponsorTime[], index: number, hideH
 *  the current time, but end after
 */
 function getStartTimes(sponsorTimes: SponsorTime[], includeIntersectingSegments: boolean, minimum?: number, 
-        hideHiddenSponsors: boolean = false): number[] {
+        onlySkippableSponsors: boolean = false, hideHiddenSponsors: boolean = false): number[] {
    if (sponsorTimes === null) return [];

    let startTimes: number[] = [];

    for (let i = 0; i < sponsorTimes.length; i++) {
        if ((minimum === undefined || (sponsorTimes[i].segment[0] >= minimum || (includeIntersectingSegments && sponsorTimes[i].segment[1] > minimum))) 
-                && (!hideHiddenSponsors || !hiddenSponsorTimes.includes(i))) {
+                && (!onlySkippableSponsors || utils.getCategorySelection(sponsorTimes[i].category).option !== CategorySkipOption.ShowOverlay)
+                && (!hideHiddenSponsors || sponsorTimes[i].hidden === SponsorHideType.Visible)) {
+
            startTimes.push(sponsorTimes[i].segment[0]);
        } 
    }
@@ -1490,6 +1464,9 @@ async function sendSubmitMessage(){
        
        sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);

+        // Increase contribution count
+        Config.config.sponsorTimesContributed = Config.config.sponsorTimesContributed + sponsorTimesSubmitting.length;
+
        // Empty the submitting times
        sponsorTimesSubmitting = [];

@@ -1525,30 +1502,12 @@ function getSegmentsMessage(segments: number[][]): string {
    return sponsorTimesMessage;
 }

-// Privacy utils
-function isPrivacyInfoAvailable(): boolean {
-    if(document.location.pathname.startsWith("/embed/")) return true;
-    return document.getElementsByClassName("style-scope ytd-badge-supported-renderer").length >= 2;
-}
-
-/**
- * What privacy level is this YouTube video?
- */
-function getPrivacy(): string {
-    if(document.location.pathname.startsWith("/embed/")) return "Public";
-
-    let privacyElement = <HTMLElement> document.getElementsByClassName("style-scope ytd-badge-supported-renderer")[2];
-    return privacyElement.innerText;
-}
-
 /**
 * Is this an unlisted YouTube video.
 * Assumes that the the privacy info is available.
 */
 function isUnlisted(): boolean {
-    let privacyElement = <HTMLElement> document.getElementsByClassName("style-scope ytd-badge-supported-renderer")[2];
-
-    return privacyElement.innerText.toLocaleLowerCase() === "unlisted";
+    return videoInfo.microformat.playerMicroformatRenderer.isUnlisted || videoInfo.videoDetails.isPrivate;
 }

 /**
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -1,7 +1,7 @@
 import Config from "./config";

 import Utils from "./utils";
-import { SponsorTime } from "./types";
+import { SponsorTime, SponsorHideType } from "./types";
 var utils = new Utils();

 interface MessageListener {
@@ -51,6 +51,7 @@ async function runThePopup(messageListener?: MessageListener) {
    // Top toggles
    "whitelistChannel",
    "unwhitelistChannel",
+    "whitelistForceCheck",
    "disableSkipping",
    "enableSkipping",
    // Options
@@ -102,6 +103,7 @@ async function runThePopup(messageListener?: MessageListener) {
    //setup click listeners
    PageElements.sponsorStart.addEventListener("click", sendSponsorStartMessage);
    PageElements.whitelistChannel.addEventListener("click", whitelistChannel);
+    PageElements.whitelistForceCheck.addEventListener("click", openOptions);
    PageElements.unwhitelistChannel.addEventListener("click", unwhitelistChannel);
    PageElements.disableSkipping.addEventListener("click", () => toggleSkipping(true));
    PageElements.enableSkipping.addEventListener("click", () => toggleSkipping(false));
@@ -273,7 +275,7 @@ async function runThePopup(messageListener?: MessageListener) {
        );
    }
  
-    function infoFound(request: {found: boolean, sponsorTimes: SponsorTime[], hiddenSponsorTimes: number[]}) {
+    function infoFound(request: {found: boolean, sponsorTimes: SponsorTime[]}) {
        if(chrome.runtime.lastError) {
            //This page doesn't have the injected content script, or at least not yet
            displayNoVideo();
@@ -364,7 +366,7 @@ async function runThePopup(messageListener?: MessageListener) {
    }
  
    //display the video times from the array at the top, in a different section
-    function displayDownloadedSponsorTimes(request: {found: boolean, sponsorTimes: SponsorTime[], hiddenSponsorTimes: number[]}) {
+    function displayDownloadedSponsorTimes(request: {found: boolean, sponsorTimes: SponsorTime[]}) {
        if (request.sponsorTimes != undefined) {
            //set it to the message
            if (PageElements.downloadedSponsorMessageTimes.innerText != chrome.i18n.getMessage("channelWhitelisted")) {
@@ -378,9 +380,12 @@ async function runThePopup(messageListener?: MessageListener) {
                sponsorTimeButton.className = "warningButton popupElement";

                let extraInfo = "";
-                if (request.hiddenSponsorTimes.includes(i)) {
-                    //this one is hidden
-                    extraInfo = " (hidden)";
+                if (request.sponsorTimes[i].hidden === SponsorHideType.Downvoted) {
+                    //this one is downvoted
+                    extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDownvote") + ")";
+                } else if (request.sponsorTimes[i].hidden === SponsorHideType.MinimumDuration) {
+                    //this one is too short
+                    extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
                }

                sponsorTimeButton.innerText = getFormattedTime(request.sponsorTimes[i].segment[0]) + " to " + getFormattedTime(request.sponsorTimes[i].segment[1]) + extraInfo;
@@ -444,6 +449,14 @@ async function runThePopup(messageListener?: MessageListener) {
                    //add commas if necessary
                    timeMessage = ", " + timeMessage;
                }
+
+                if (sponsorTimes[i].hidden === SponsorHideType.Downvoted) {
+                    //this one is downvoted
+                    timeMessage += " (" + chrome.i18n.getMessage("hiddenDueToDownvote") + ")";
+                } else if (sponsorTimes[i].hidden === SponsorHideType.MinimumDuration) {
+                    //this one is too short
+                    timeMessage += " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
+                }
  
                sponsorTimesMessage += timeMessage;
            }
@@ -908,39 +921,46 @@ async function runThePopup(messageListener?: MessageListener) {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'getChannelURL'},
+                {message: 'getChannelID'},
                function(response) {
+                    if (!response.channelID) {
+                        alert(chrome.i18n.getMessage("channelDataNotFound") + "\n\n" + 
+                            chrome.i18n.getMessage("itCouldBeAdblockerIssue"));
+                        return;
+                    }
+
                    //get whitelisted channels
-                        let whitelistedChannels = Config.config.whitelistedChannels;
-                        if (whitelistedChannels == undefined) {
-                            whitelistedChannels = [];
+                    let whitelistedChannels = Config.config.whitelistedChannels;
+                    if (whitelistedChannels == undefined) {
+                        whitelistedChannels = [];
+                    }
+
+                    //add on this channel
+                    whitelistedChannels.push(response.channelID);
+
+                    //change button
+                    PageElements.whitelistChannel.style.display = "none";
+                    PageElements.unwhitelistChannel.style.display = "unset";
+                    if (!Config.config.forceChannelCheck) PageElements.whitelistForceCheck.style.display = "unset";
+
+                    PageElements.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
+                    PageElements.downloadedSponsorMessageTimes.style.fontWeight = "bold";
+
+                    //save this
+                    Config.config.whitelistedChannels = whitelistedChannels;
+
+                    //send a message to the client
+                    messageHandler.query({
+                        active: true,
+                        currentWindow: true
+                    }, tabs => {
+                        messageHandler.sendMessage(
+                            tabs[0].id, {
+                                message: 'whitelistChange',
+                                value: true
+                            });
                        }
-
-                        //add on this channel
-                        whitelistedChannels.push(response.channelURL);
-
-                        //change button
-                        PageElements.whitelistChannel.style.display = "none";
-                        PageElements.unwhitelistChannel.style.display = "unset";
-
-                        PageElements.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
-                        PageElements.downloadedSponsorMessageTimes.style.fontWeight = "bold";
-
-                        //save this
-                        Config.config.whitelistedChannels = whitelistedChannels;
-
-                        //send a message to the client
-                        messageHandler.query({
-                            active: true,
-                            currentWindow: true
-                        }, tabs => {
-                            messageHandler.sendMessage(
-                                tabs[0].id, {
-                                    message: 'whitelistChange',
-                                    value: true
-                                });
-                            }
-                        );
+                    );
                }
            );
        });
@@ -954,7 +974,7 @@ async function runThePopup(messageListener?: MessageListener) {
        }, tabs => {
            messageHandler.sendMessage(
                tabs[0].id,
-                {message: 'getChannelURL'},
+                {message: 'getChannelID'},
                function(response) {
                    //get whitelisted channels
                        let whitelistedChannels = Config.config.whitelistedChannels;
@@ -963,7 +983,7 @@ async function runThePopup(messageListener?: MessageListener) {
                        }

                        //remove this channel
-                        let index = whitelistedChannels.indexOf(response.channelURL);
+                        let index = whitelistedChannels.indexOf(response.channelID);
                        whitelistedChannels.splice(index, 1);

                        //change button
--- a/src/types.ts
+++ b/src/types.ts
@@ -8,7 +8,6 @@ interface ContentContainer {
        unskipSponsorTime: (UUID: any) => void,
        sponsorTimes: SponsorTime[],
        sponsorTimesSubmitting: SponsorTime[],
-        hiddenSponsorTimes: number[],
        v: HTMLVideoElement,
        sponsorVideoID,
        reskipSponsorTime: (UUID: any) => void,
@@ -36,11 +35,19 @@ interface CategorySelection {
    option: CategorySkipOption
 }

+enum SponsorHideType {
+    Visible = undefined,
+    Downvoted = 1,
+    MinimumDuration
+}
+
 interface SponsorTime {
    segment: number[];
    UUID: string;

    category: string;
+
+    hidden?: SponsorHideType;
 }

 type VideoID = string;
@@ -51,5 +58,6 @@ export {
    CategorySelection,
    CategorySkipOption,
    SponsorTime,
-    VideoID
+    VideoID,
+    SponsorHideType
 };
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -270,27 +270,26 @@ class Utils {
    }

    /**
-     * Sends a request to the SponsorBlock server with address added as a query
+     * Sends a request to a custom server
     * 
     * @param type The request type. "GET", "POST", etc.
     * @param address The address to add to the SponsorBlock server address
     * @param callback 
     */    
-    async asyncRequestToServer(type: string, address: string, data = {}) {
-        let serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
+    async asyncRequestToCustomServer(type: string, url: string, data = {}) {

        // If GET, convert JSON to parameters
        if (type.toLowerCase() === "get") {
            for (const key in data) {
-                let seperator = address.includes("?") ? "&" : "?";
+                let seperator = url.includes("?") ? "&" : "?";
                let value = (typeof(data[key]) === "string") ? data[key]: JSON.stringify(data[key]);
-                address += seperator + key + "=" + value;
+                url += seperator + key + "=" + value;
            }

            data = null;
        }

-        const response = await fetch(serverAddress + address, {
+        const response = await fetch(url, {
            method: type,
            headers: {
                'Content-Type': 'application/json'
@@ -302,6 +301,19 @@ class Utils {
        return response;
    }

+    /**
+     * Sends a request to the SponsorBlock server with address added as a query
+     * 
+     * @param type The request type. "GET", "POST", etc.
+     * @param address The address to add to the SponsorBlock server address
+     * @param callback 
+     */    
+    async asyncRequestToServer(type: string, address: string, data = {}) {
+        let serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
+
+        return await (this.asyncRequestToCustomServer(type, serverAddress + address, data));
+    }
+
    /**
     * Sends a request to the SponsorBlock server with address added as a query
     * 
@@ -361,10 +373,14 @@ class Utils {
        return minutes * 60 + seconds;
    }

+    isContentScript(): boolean {
+        return window.location.protocol === "http:" || window.location.protocol === "https:";
+    }
+
    /**
     * Is this Firefox (web-extensions)
     */
-    isFirefox() {
+    isFirefox(): boolean {
        return typeof(browser) !== "undefined";
    }
 }
Author	SHA1	Message	Date
Ajay Ramachandran	885b38b682	New translations messages.json (Chinese Simplified) (#331 )	2020-04-26 23:21:13 -04:00
Ajay Ramachandran	938db4b8e0	Merge pull request #322 from ajayyy/react Categories Improvements	2020-04-26 23:16:53 -04:00
Ajay Ramachandran	ad361cdf28	Increase version number	2020-04-26 23:14:47 -04:00
Ajay Ramachandran	fbafb723cb	Added option to force a whitelist check before allowing skipping.	2020-04-26 23:14:18 -04:00
Ajay Ramachandran	797fbf563b	Fix start sponsor code not functioning as well as it should have	2020-04-26 21:46:38 -04:00
Ajay Ramachandran	d23c8b0e1f	Fix adblocker error messages and increased unlisted check time	2020-04-26 21:12:56 -04:00
Ajay Ramachandran	18852d16ac	isUnlisted now uses JSON data.	2020-04-26 20:40:11 -04:00
Ajay Ramachandran	6179278699	Improved options page descriptions	2020-04-26 18:18:55 -04:00
Ajay Ramachandran	8a6488f082	Added migration code for whitelisted channelIDs vs URLs	2020-04-26 18:07:10 -04:00
Ajay Ramachandran	89c4432b89	Revised delete button option description	2020-04-26 18:05:56 -04:00
Ajay Ramachandran	16896be97f	Changed whitelisting to use channel JSON instead of page scraping. It also only pulls data once. Uses channelID now instead of URLs. Resolves https://github.com/ajayyy/SponsorBlock/issues/275 TODO: Add migration method to use channelID instead of channelURL	2020-04-26 15:16:00 -04:00
Ajay Ramachandran	8a9a19efeb	Update README.md	2020-04-26 00:10:31 -04:00
Ajay Ramachandran	f3c786eb57	Fix Crowdin deleting translations >:( (#330 ) (Portuguese, Brazilian)	2020-04-26 00:04:26 -04:00
Ajay Ramachandran	19ab83fee9	New Crowdin translations (#327 ) * New translations messages.json (Chinese Simplified) * New translations messages.json (Portuguese, Brazilian) * New translations messages.json (French) * New translations messages.json (German) * New translations messages.json (Dutch)	2020-04-25 23:47:42 -04:00
Ajay Ramachandran	0f9e794428	Fix notice on old YouTube	2020-04-25 23:46:55 -04:00
Ajay Ramachandran	1b8af9da11	Redid hidden sponsor implementation + added info about being hid due to minimum duration Fixes https://github.com/ajayyy/SponsorBlock/issues/326 and https://github.com/ajayyy/SponsorBlock/issues/325	2020-04-25 23:41:08 -04:00
Ajay Ramachandran	0b90539372	Fixed incorrect videoID check being in reverse.	2020-04-24 21:28:08 -04:00
Ajay Ramachandran	4131442066	Properly reset hiddenSponsorTimes. Maybe related to https://github.com/ajayyy/SponsorBlock/issues/325	2020-04-24 21:27:45 -04:00
Ajay Ramachandran	e4f642e7d6	Merge pull request #324 from malmers/swedish Swedish translation	2020-04-23 12:10:26 -04:00
Ajay Ramachandran	a65e40a87d	Removed help page	2020-04-23 12:09:11 -04:00
Ajay Ramachandran	edf467a6b9	Removed help page	2020-04-23 12:07:29 -04:00
Pontus Malm	3fbb11191e	Swedish translation	2020-04-22 22:45:59 +02:00
Ajay Ramachandran	54a67e6aba	New Crowdin translations (#323 ) * New translations messages.json (French) * New translations messages.json (German)	2020-04-22 13:00:41 -04:00
Ajay Ramachandran	8912f88131	Fixed show on seekbar categories appearing in list of start times to skip.	2020-04-21 16:01:41 -04:00
Ajay Ramachandran	c31d30821b	Call incorrect videoID check when scheduling a skip.	2020-04-21 14:16:09 -04:00
Ajay Ramachandran	7eb6f1c482	Changed popup look	2020-04-20 16:56:12 -04:00
Ajay Ramachandran	a7e2f83033	Fix Firefox popup scrolling issues	2020-04-20 15:57:07 -04:00
Ajay Ramachandran	0cfe0dc90f	Fix submission count not being counted	2020-04-20 15:48:47 -04:00
Ajay Ramachandran	8c1d837770	Update README.md	2020-04-20 01:22:03 -04:00
Ajay Ramachandran	9a70599e60	Added end button to submission notice	2020-04-20 00:37:25 -04:00
Ajay Ramachandran	89f72c185c	Update submission UI whenever there is a config update.	2020-04-20 00:33:41 -04:00
Ajay Ramachandran	2f5c239c82	Added path to release CI	2020-04-19 20:59:36 -04:00