Merge pull request #356 from ajayyy/react

Fix preview sponsors not skipping

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - run: npm install
       - name: Copy configuration
         run: cp config.json.example config.json
-
+      
       # Create Chrome artifacts
       - name: Create Chrome artifacts
         run: npm run build:chrome
@@ -26,9 +26,8 @@ jobs:
           name: ChromeExtension
           path: dist
       - run: mkdir ./builds
-      - uses: montudor/action-zip@v0.1.0
+      - name: Zip Artifacts
-        with:
+        run: cd ./dist ; zip -r ../builds/ChromeExtension.zip *
-          args: zip -qq -r ./builds/ChromeExtension.zip ./dist
 
       # Create Firefox artifacts
       - name: Create Firefox artifacts
@@ -37,9 +36,8 @@ jobs:
         with:
           name: FirefoxExtension
           path: dist
-      - uses: montudor/action-zip@v0.1.0
+      - name: Zip Artifacts
-        with:
+        run: cd ./dist ; zip -r ../builds/FirefoxExtension.zip *
-          args: zip -qq -r ./builds/FirefoxExtension.zip ./dist
 
       # Create Beta artifacts (Builds with the name changed to beta)
       - name: Create Chrome Beta artifacts
@@ -48,9 +46,8 @@ jobs:
         with:
           name: ChromeExtensionBeta
           path: dist
-      - uses: montudor/action-zip@v0.1.0
+      - name: Zip Artifacts
-        with:
+        run: cd ./dist ; zip -r ../builds/ChromeExtensionBeta.zip *
-          args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist
 
       - name: Create Firefox Beta artifacts
         run: npm run build:firefox -- --env.stream=beta
@@ -58,9 +55,23 @@ jobs:
         with:
           name: FirefoxExtensionBeta
           path: dist
-      - uses: montudor/action-zip@v0.1.0
+      - name: Zip Artifacts
+        run: cd ./dist ; zip -r ../builds/FirefoxExtensionBeta.zip *
+
+      # Create Firefox Signed Beta version
+      - name: Create Firefox Signed Beta artifacts
+        run: npm run web-sign
+        env:
+          WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
+          WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
+      - name: Install rename
+        run: sudo apt-get install rename
+      - name: Install signed file
+        run: cd ./web-ext-artifacts ; rename 's/.*/FirefoxSignedInstaller.xpi/' *
+      - uses: actions/upload-artifact@v1
         with:
-          args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist
+          name: FirefoxExtensionSigned.xpi
+          path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi
 
       # Upload each release asset
       - name: Upload to release
@@ -68,11 +79,27 @@ 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/ChromeExtensionBeta.zip
+          name: ChromeExtensionBeta.zip
+          path: ./builds/ChromeExtensionBeta.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 }}
+      - name: Upload to release
+        uses: Shopify/upload-to-release@master
+        with:
+          args: web-ext-artifacts/FirefoxSignedInstaller.xpi
+          name: FirefoxSignedInstaller.xpi
+          path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

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.
@@ -56,6 +58,8 @@ You can read the API docs [here](https://github.com/ajayyy/SponsorBlockServer#ap
 
 # Building
 
+Rename `config.json.example` to `config.json` and adjust configuration as desired.
+
 There are also other build scripts available. Install `npm`, then run `npm install` in the repository to install dependencies. 
 
 Run `npm run build` to generate a Chrome extension.

config.json.example

@@ -2,5 +2,5 @@
     "serverAddress": "https://sponsor.ajay.app",
     "testingServerAddress": "https://sponsor.ajay.app/test",
     "serverAddressComment": "This specifies the default SponsorBlock server to conect to",
-    "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "offtopic"]
+    "categoryList": ["sponsor", "intro", "outro", "interaction", "selfpromo", "music_offtopic"]
 }

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "__MSG_Name__",
-    "version": "1.2.26",
+    "version": "1.2.28.4",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "content_scripts": [{

package.json

@@ -15,7 +15,7 @@
     "react-dom": "^16.12.0"
   },
   "devDependencies": {
-    "web-ext": "^4.0.0",
+    "web-ext": "^4.2.0",
     "@types/chrome": "0.0.91",
     "@types/firefox-webext-browser": "70.0.1",
     "@types/jest": "^24.0.23",
@@ -32,6 +32,7 @@
   },
   "scripts": {
     "web-run": "npm run web-run:chrome",
+    "web-sign": "web-ext sign -s dist",
     "web-run:firefox": "cd dist && web-ext run --start-url https://addons.mozilla.org/firefox/addon/ublock-origin/",
     "web-run:chrome": "cd dist && web-ext run --start-url https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm -t chromium",
     "build": "npm run build:chrome",

public/_locales/cs/messages.json

@@ -1 +1,8 @@
-{}
+{
+    "Sponsor": {
+        "message": "sponzor"
+    },
+    "Sponsors": {
+        "message": "sponzoři"
+    }
+}

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,201 @@
     },
     "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"
+    },
+    "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_selfpromo": {
+        "message": "Eigenwerbung und Merchandise"
+    },
+    "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"
     }
 }

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"
     },
@@ -39,9 +35,6 @@
     "Segments": {
         "message": "sponsor segments"
     },
-    "noticeTitle": {
-        "message": "Sponsor Skipped"
-    },
     "reportButtonTitle": {
         "message": "Report"
     },
@@ -75,6 +68,9 @@
     "paused": {
         "message": "Paused"
     },
+    "manualPaused": {
+        "message": "Timer Stopped"
+    },
     "confirmMSG": {
         "message": "To edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
     },
@@ -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"
@@ -276,12 +272,12 @@
     "errorCode": {
         "message": "Error Code: "
     },
-    "noticeTitleNotSkipped": {
-        "message": "Skip Sponsor?"
-    },
     "skip": {
         "message": "Skip"
     },
+    "skipped": {
+        "message": "Skipped"
+    },
     "disableAutoSkip": {
         "message": "Disable Auto Skip"
     },
@@ -355,7 +351,7 @@
         "message": "Support Invidious"
     },
     "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) is a third party YouTube client. To enable support, you must accept the extra permissions. This does NOT work in incongnito on Chrome and other Chromium variants."
+        "message": "Invidious (invidio.us) is a third party YouTube client. To enable support, you must accept the extra permissions. This does NOT work in incognito on Chrome and other Chromium variants."
     },
     "optionsInfo": {
         "message": "Enable Invidious support, disable autoskip, hide buttons and more."
@@ -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"
@@ -494,19 +490,22 @@
         "message": "Sponsor"
     },
     "category_intro": {
-        "message": "Intro"
+        "message": "Intro Animation"
     },
     "category_outro": {
-        "message": "Outro"
+        "message": "Endcards/Credits"
     },
     "category_interaction": {
-        "message": "Interaction (Redundant Like, Subscribe, Follow, etc.)"
+        "message": "Interaction Reminder (Subscribe)"
     },
     "category_selfpromo": {
         "message": "Self-Promotion and Merchandise"
     },
-    "category_offtopic": {
+    "category_music_offtopic": {
-        "message": "Offtopic tangent (Subjective)"
+        "message": "Music: Non-Music Section"
+    },
+    "category_livestream_messages": {
+        "message": "Livestream: Donation/Message Readings"
     },
     "disable": {
         "message": "Disable"
@@ -531,5 +530,41 @@
     },
     "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"
+    },
+    "downvoteDescription": {
+        "message": "Incorrect/Wrong Timing"
+    },
+    "incorrectCategory": {
+        "message": "Wrong Category"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "This video is categorized as music. Are you sure you would like to submit segments with non-music categories? Unless this video is not actually music, you should not be submitting this segment. Please read the guidelines if you are confused."
     }
 }

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"
@@ -346,9 +350,6 @@
     "supportInvidious": {
         "message": "Soutenir Invidious"
     },
-    "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) est un client YouTube tiers. Pour l'activer, vous devez accepter les autorisations supplémentaires. Cela ne fonctionne PAS en mode incongnito sur Chrome et d'autres variantes de Chromium."
-    },
     "optionsInfo": {
         "message": "Activer Invidious, désactiver le passage automatique, masquer les boutons et plus encore."
     },
@@ -388,7 +389,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"
     }
 }

public/_locales/hu/messages.json

@@ -1 +1,29 @@
-{}
+{
+    "Loading": {
+        "message": "Betöltés..."
+    },
+    "Hide": {
+        "message": "Sose mutassa"
+    },
+    "paused": {
+        "message": "Szüneteltetve"
+    },
+    "save": {
+        "message": "Mentés"
+    },
+    "reset": {
+        "message": "Visszaállítás"
+    },
+    "cancel": {
+        "message": "Mégse"
+    },
+    "delete": {
+        "message": "Törlés"
+    },
+    "preview": {
+        "message": "Előnézet"
+    },
+    "edit": {
+        "message": "Szerkesztés"
+    }
+}

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"
+    }
+}

public/_locales/pl_PL/messages.json

@@ -337,9 +337,6 @@
     "supportInvidious": {
         "message": "Wesprzyj Invidious"
     },
-    "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) to nieoficjalny klient YouTube. Aby go wesprzeć musisz przyznać dodatkowe uprawnienia rozszerzeniowi. Ta opcja nie działa w incognito i innych wersjach Chromium."
-    },
     "optionsInfo": {
         "message": "Wesprzyj Invidious, wyłącz auto przewijanie, ukryj guziki i więcej."
     },

public/_locales/pt_BR/messages.json

@@ -1,4 +1,8 @@
 {
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
     "fullName": {
         "message": "SponsorBlock para YouTube - Pule patrocínios",
         "description": "Name of the extension."
@@ -149,22 +153,22 @@
         "message": "aqui"
     },
     "recordTimesDescription": {
-        "message": "Carregue neste botão abaixo quando o patrocínio começar e quando\n acabar para registar e submetê-lo à base de dados"
+        "message": "Clique no botão abaixo quando o patrocínio começar e quando terminar para registrar e submetê-lo à base de dados."
     },
     "popupHint": {
-        "message": "Dica: Carregue na tecla ; enquanto num vídeo para registar o começo/fim de um patrocínio e \" para submeter"
+        "message": "Dica: Aperte a tecla ; enquanto reproduzir o vídeo para registar o começo/fim de um patrocínio e \" para enviar. (Essa configuração pode ser mudada em opções.)"
     },
     "lastTimes": {
-        "message": "Intervalos de Patrocínios Escolhidos mais Recentemente"
+        "message": "Últimos Intervalos de Patrocínios Seleciados"
     },
     "clearTimesButton": {
         "message": "Limpar Intervalos"
     },
     "submitTimesButton": {
-        "message": "Submeter Intervalos"
+        "message": "Enviar Intervalos"
     },
     "publicStats": {
-        "message": "Isto é usado na página pública de estatísticas que mostra o quanto já contríbuíu. Veje-a"
+        "message": "Isso é usado na página pública de estatísticas que mostra o quanto você já contríbuíu. Veja-a"
     },
     "setUsername": {
         "message": "Criar nomde de utilizador"
@@ -228,5 +232,339 @@
     "sourceCode": {
         "message": "Código fonte",
         "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "A notificação foi atualizada!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Se você ainda não gostar dessa, aperte o botão não mostrar novamente.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Defina a tecla para que marca o início do patrocínio"
+    },
+    "setSubmitKeybind": {
+        "message": "Defina a tecla para enviar o segmento de patrocínio"
+    },
+    "keybindDescription": {
+        "message": "Selecione uma tecla apertando-a"
+    },
+    "keybindDescriptionComplete": {
+        "message": "A tecla foi definida para: "
+    },
+    "0": {
+        "message": "Tempo limite de conexão excedida. Cheque a sua conexão de internet. Se a sua internet estiver funcionando, o servidor está sobrecarregado ou fora do ar."
+    },
+    "disableSkipping": {
+        "message": "Desativar SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "Ativar SponsorBlock"
+    },
+    "yourWork": {
+        "message": "Suas submissões",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "O servidor parece estar sobrecarregado. Tente novamente em alguns segundos."
+    },
+    "errorCode": {
+        "message": "Código de erro: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Pular patrocinador?"
+    },
+    "skip": {
+        "message": "Pular"
+    },
+    "disableAutoSkip": {
+        "message": "Desativar Salto Automático"
+    },
+    "enableAutoSkip": {
+        "message": "Ativar Salto Automático"
+    },
+    "autoSkipDescription": {
+        "message": "Pular automaticamente irá pular patrocínios por você. Se desabilitado, um aviso irá aparecer perguntando se deseja pular o anúncio."
+    },
+    "audioNotification": {
+        "message": "Notificação de áudio ao pular"
+    },
+    "audioNotificationDescription": {
+        "message": "A notificação de áudio ao pular irá tocar um som sempre que um patrocínio for ignorado. Se desativado (ou o pulo automático estiver desativado), nenhum som será reproduzido."
+    },
+    "youHaveSkipped": {
+        "message": "Você pulou "
+    },
+    "youHaveSaved": {
+        "message": "Você poupou "
+    },
+    "minLower": {
+        "message": "minuto"
+    },
+    "minsLower": {
+        "message": "minutos"
+    },
+    "hourLower": {
+        "message": "hora"
+    },
+    "hoursLower": {
+        "message": "horas"
+    },
+    "youHaveSavedTime": {
+        "message": "Você poupou outros"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " de suas vidas."
+    },
+    "guildlinesSummary": {
+        "message": "- Certifique-se de que seu segmento contém apenas patrocínio, nada mais.\n- Certifique-se de que pular esse segmento não vai pular conteúdo importante.\n- Se todo o vídeo for patrocinado, por favor não o denuncie. Um sistema completo de relatório de vídeo virá em breve.\n- Por favor, não denuncie avisos de parcialidade do vídeo (se um vídeo de avaliação for patrocinado, não pule quando eles mencionarem que é patrocinado)."
+    },
+    "statusReminder": {
+        "message": "Verifique status.sponsor.ajay.app para o status do servidor."
+    },
+    "changeUserID": {
+        "message": "Importar/Exportar seu ID de usuário"
+    },
+    "whatChangeUserID": {
+        "message": "Isso deve ser mantido em segredo. É como se fosse uma senha e não deve ser compartilhado com ninguém. Se alguém tiver isso, poderá se passar por você."
+    },
+    "setUserID": {
+        "message": "Definir ID de usuário"
+    },
+    "userIDChangeWarning": {
+        "message": "Atenção: A alteração do ID de usuário é permanente. Você tem certeza que deseja fazer isso? Certifique-se de fazer backup de seu ID antigo por precaução."
+    },
+    "createdBy": {
+        "message": "Criado por"
+    },
+    "autoSkip": {
+        "message": "Pular automaticamente"
+    },
+    "showSkipNotice": {
+        "message": "Mostrar aviso após um patrocínio ser ignorado"
+    },
+    "keybindCurrentlySet": {
+        "message": ". Atualmente, está definido para:"
+    },
+    "supportInvidious": {
+        "message": "Apoiar Invidious"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) é um cliente para YouTube de terceiros. Para ativar o apoio, você precisa aceitar as permissões adicionais. Isso não funciona em modo anônimo no Chrome ou em outras variantes do Chromium."
+    },
+    "optionsInfo": {
+        "message": "Ativar apoio ao Invidious, desabilitar pular automaticamente, ocultar botões e mais."
+    },
+    "addInvidiousInstance": {
+        "message": "Adicionar instância do Invidious"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Adicionar uma instância personalizada do Invidious. Deve ser formatado com APENAS o domínio. Exemplo: invidious.ajay.app"
+    },
+    "add": {
+        "message": "Adicionar"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Este é um domínio inválido. Ele deve incluir APENAS a parte do domínio. Exemplo: invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "Redefinir Lista de Instâncias do Invidious"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "Você está prestes a redefinir a lista de instâncias do Invidious"
+    },
+    "currentInstances": {
+        "message": "Instâncias Atuais:"
+    },
+    "enableAutoUpvote": {
+        "message": "Upvote automático"
+    },
+    "whatAutoUpvote": {
+        "message": "Com isto habilitado, a extensão dará upvote em todas as submissões que você ver se você não reportar. Não funcionará se o aviso estiver desativado."
+    },
+    "minDuration": {
+        "message": "Duração mínima (segundos):"
+    },
+    "minDurationDescription": {
+        "message": "Segmentos de patrocinadores menores do que o valor definido não serão pulados ou mostrados no reprodutor."
+    },
+    "shortCheck": {
+        "message": "A seguinte submissão é mais curta do que sua opção de duração mínima. Isto significa que já foi enviada e que está sendo ignorada devido a esta opção. Tem certeza que deseja enviar mesmo assim?"
+    },
+    "showUploadButton": {
+        "message": "Mostrar botão de envio"
+    },
+    "whatUploadButton": {
+        "message": "Este botão aparece no reprodutor do YouTube depois de ter selecionado um carimbo de data/hora e está pronto para ser enviado."
+    },
+    "customServerAddress": {
+        "message": "Endereço do servidor do SponsorBlock"
+    },
+    "customServerAddressDescription": {
+        "message": "Endereço que o SponsorBlock usa para fazer chamadas ao servidor.\nA menos que você tenha sua própria instância de servidor, isso não deve ser alterado."
+    },
+    "save": {
+        "message": "Salvar"
+    },
+    "reset": {
+        "message": "Redefinir"
+    },
+    "customAddressError": {
+        "message": "Este endereço não está na forma correta. Certifique-se de que possui http:// ou https:// no início e sem barras no final."
+    },
+    "areYouSureReset": {
+        "message": "Tem certeza que deseja redefinir?"
+    },
+    "confirmPrivacy": {
+        "message": "O este vídeo está marcado como não listado. Clique em cancelar se você não deseja verificar se há patrocínios."
+    },
+    "unlistedCheck": {
+        "message": "Ignorar vídeos não listados/privados"
+    },
+    "whatUnlistedCheck": {
+        "message": "Esta configuração irá diminuir um pouco o desempenho do SponsorBlock. As pesquisas do patrocinador exigem que se envie o ID do vídeo para o servidor. Se você estiver preocupado com o envio de IDs de vídeo não listados pela internet, habilite essa opção."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com agora é suportado"
+    },
+    "exportOptions": {
+        "message": "Importar/Exportar Todas as Opções"
+    },
+    "whatExportOptions": {
+        "message": "Essa suas preferências em JSON. Isso inclui seu ID de usuário, então lembre-se de compartilhar com cuidado."
+    },
+    "setOptions": {
+        "message": "Definir Opções"
+    },
+    "exportOptionsWarning": {
+        "message": "Aviso: Alterar as opções é permanente e pode fazer a extensão parar de funcionar. Tem certeza que deseja fazer isso? Certifique-se de fazer um backup de seu antigo por precaução."
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "Este JSON não está formatado corretamente. Suas opções não foram alteradas."
+    },
+    "confirmNoticeTitle": {
+        "message": "Enviar Segmento"
+    },
+    "submit": {
+        "message": "Enviar"
+    },
+    "cancel": {
+        "message": "Cancelar"
+    },
+    "delete": {
+        "message": "Deletar"
+    },
+    "preview": {
+        "message": "Pré-visualizar"
+    },
+    "edit": {
+        "message": "Editar"
+    },
+    "copyDebugInformation": {
+        "message": "Copiar Informações de Depuração Para Área de Transferência"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Erro ao copiar para a área de transferência"
+    },
+    "copyDebugInformationOptions": {
+        "message": "Copia informações para a área de transferência para serem fornecidas a um desenvolvedor quando houver um bug / quando um solicitado pelo desenvolvedor. Informações sensíveis como seu ID de usuário, canais na lista de permissões e endereço personalizado do servidor foram removidos. No entanto, ele contém informações como seu useragent, navegador, sistema operacional e número de versão de extensão. "
+    },
+    "copyDebugInformationComplete": {
+        "message": "A informação de depuração foi copiada para a área de transferência. Sinta-se à vontade para remover qualquer informação que prefira não compartilhar. Salve em um arquivo de texto ou cole-a no relatório de bug."
+    },
+    "theKey": {
+        "message": "A tecla"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "já está sendo usado pelo youtube. Por favor, selecione outra tecla."
+    },
+    "keyAlreadyUsed": {
+        "message": "está vinculado a outra ação. Por favor, selecione outra tecla."
+    },
+    "to": {
+        "message": "até",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Patrocinador"
+    },
+    "category_intro": {
+        "message": "Animação de Introdução"
+    },
+    "category_outro": {
+        "message": "Finalização/Créditos"
+    },
+    "category_interaction": {
+        "message": "Lembrete de interação (inscrever-se)"
+    },
+    "category_selfpromo": {
+        "message": "Auto-Promoção e Mercadorias"
+    },
+    "category_music_offtopic": {
+        "message": "Música: Seção sem música"
+    },
+    "category_livestream_messages": {
+        "message": "Livestream: Leituras de Doação/Mensagem"
+    },
+    "disable": {
+        "message": "Desativar"
+    },
+    "manualSkip": {
+        "message": "Pular manualmente"
+    },
+    "showOverlay": {
+        "message": "Mostrar barra de progresso"
+    },
+    "enableTestingServer": {
+        "message": "Habilitar Servidor em teste Beta"
+    },
+    "whatEnableTestingServer": {
+        "message": "Seus envios e votos NÃO SERÃO ENVIADOS para o servidor principal. Use isso apenas para testes."
+    },
+    "testingServerWarning": {
+        "message": "Todas os envios e votos NÃO SERÃO ENVIADOS para o servidor principal enquanto se conecta ao servidor de teste. Certifique-se de desativar isso quando você quiser fazer envios reais."
+    },
+    "bracketNow": {
+        "message": "(agora)"
+    },
+    "moreCategories": {
+        "message": "Mais categorias"
+    },
+    "bracketEnd": {
+        "message": "(Fim)"
+    },
+    "hiddenDueToDownvote": {
+        "message": "oculto: Downvote"
+    },
+    "hiddenDueToDuration": {
+        "message": "oculto: muito curto"
+    },
+    "channelDataNotFound": {
+        "message": "ID do canal ainda não carregado."
+    },
+    "adblockerIssue": {
+        "message": "Parece que algo está bloqueando o SponsorBlock de obter dados de vídeo. Isso é provavelmente o seu bloqueador de anúncios. Por favor, verifique https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "Se isso continuar acontecendo, pode ser causado pelo seu bloqueador de anúncios. Por favor, verifique https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock-Requests"
+    },
+    "forceChannelCheck": {
+        "message": "Forçar verificação do canal antes de pular os patrocínios"
+    },
+    "whatForceChannelCheck": {
+        "message": "Por padrão, isso pulará os patrocínios imediatamente mesmo antes de saber qual é o canal. Por padrão, alguns patrocinadores de zero segundo podem ser ignorados nos canais da lista branca. Habilitar esta opção evitará isso, mas irá fazer com que todos os saltos tenham um ligeiro atraso, já que obter o channelID pode levar algum tempo. Este atraso pode não ser perceptível se você tiver internet rápida."
+    },
+    "forceChannelCheckPopup": {
+        "message": "Considere habilitar a verificação de canal forçada antes de pular os patrocinadores"
+    },
+    "downvoteDescription": {
+        "message": "Incorreto"
+    },
+    "incorrectCategory": {
+        "message": "Categoria errada"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "Este vídeo é classificado como música. Você tem certeza que deseja enviar segmentos com categorias que não são músicas? A menos que esse vídeo não seja de fato música, você não deve enviar esse segmento. Por favor leia as orientações se estiver em dúvidas."
     }
 }

public/_locales/ru/messages.json

@@ -331,9 +331,6 @@
     "supportInvidious": {
         "message": "Поддержка Invidious"
     },
-    "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) — это неофициальный клиент YouTube. Чтобы включить поддержку, Вам понадобится принять дополнительные разрешения. Это НЕ работает в приватном режиме в Chrome и других вариантах Chromium."
-    },
     "optionsInfo": {
         "message": "Включить поддержку Invidious, выключить автоматический пропуск, скрыть кнопки и не только."
     },

public/_locales/sk/messages.json

@@ -1 +1,148 @@
-{}
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "Sponsor": {
+        "message": "sponzor"
+    },
+    "Sponsors": {
+        "message": "sponzori"
+    },
+    "noticeTitle": {
+        "message": "Sponzor bol Preskočený"
+    },
+    "reportButtonTitle": {
+        "message": "Nahlásiť"
+    },
+    "Loading": {
+        "message": "Načitávanie..."
+    },
+    "Mins": {
+        "message": "Minúty"
+    },
+    "Secs": {
+        "message": "Sekundy"
+    },
+    "Hide": {
+        "message": "Nikdy nezobrazovať"
+    },
+    "paused": {
+        "message": "Pozastavené"
+    },
+    "here": {
+        "message": "tu"
+    },
+    "hideThis": {
+        "message": "Skryť Toto"
+    },
+    "Options": {
+        "message": "Nastavenia"
+    },
+    "website": {
+        "message": "Webstránka",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Zdrojový Kód",
+        "description": "Used on Firefox Store Page"
+    },
+    "yourWork": {
+        "message": "Vaša Práca",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "errorCode": {
+        "message": "Kód chyby: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Preskočiť Sponzor?"
+    },
+    "skip": {
+        "message": "Preskočiť"
+    },
+    "disableAutoSkip": {
+        "message": "Zakázať Automatické Preskočenie"
+    },
+    "enableAutoSkip": {
+        "message": "Povoliť Automatické Preskočenie"
+    },
+    "minLower": {
+        "message": "minúta"
+    },
+    "minsLower": {
+        "message": "minúty"
+    },
+    "hourLower": {
+        "message": "hodina"
+    },
+    "hoursLower": {
+        "message": "hodiny"
+    },
+    "setUserID": {
+        "message": "Nastaviť Používateľove ID"
+    },
+    "createdBy": {
+        "message": "Vytvoril"
+    },
+    "autoSkip": {
+        "message": "Automatické Preskočenie"
+    },
+    "add": {
+        "message": "Pridať"
+    },
+    "showUploadButton": {
+        "message": "Ukázať Nahrávacie Tlačidlo"
+    },
+    "save": {
+        "message": "Uložiť"
+    },
+    "reset": {
+        "message": "Vynulovať"
+    },
+    "setOptions": {
+        "message": "Nastaviť Nastavenia"
+    },
+    "submit": {
+        "message": "Poslať"
+    },
+    "cancel": {
+        "message": "Zrušiť"
+    },
+    "delete": {
+        "message": "Odstrániť"
+    },
+    "preview": {
+        "message": "Ukážka"
+    },
+    "edit": {
+        "message": "Upraviť"
+    },
+    "theKey": {
+        "message": "Kľúč"
+    },
+    "to": {
+        "message": "pre",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Sponzor"
+    },
+    "disable": {
+        "message": "Zakázať"
+    },
+    "manualSkip": {
+        "message": "Manuálne Preskočenie"
+    },
+    "bracketNow": {
+        "message": "(Teraz)"
+    },
+    "moreCategories": {
+        "message": "Viac Kategórií"
+    },
+    "bracketEnd": {
+        "message": "(Koniec)"
+    },
+    "channelDataNotFound": {
+        "message": "ID kanála nie je zatiaľ načítané."
+    }
+}

public/_locales/sv/messages.json

@@ -1 +1,518 @@
-{}
+{
+    "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"
+    },
+    "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_selfpromo": {
+        "message": "Självreklam och egna produkter"
+    },
+    "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)"
+    },
+    "moreCategories": {
+        "message": "Fler Kategorier"
+    },
+    "bracketEnd": {
+        "message": "(Slut)"
+    },
+    "channelDataNotFound": {
+        "message": "Kanal-ID är inte inladdat än."
+    },
+    "adblockerIssue": {
+        "message": "Det verkar som om något blockerar SponsorBlocks från att hämta videodata. Det beror förmodligen på din annonsblockerare. Vänligen kontrollera https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "Om detta fortsätter att inträffa, kan orsaken vara din annonsblockerare. Vänligen kontrollera https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    }
+}

public/_locales/tr/messages.json

@@ -1 +1,570 @@
-{}
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "Youtube için SponsorBlock - Sponsorlukları Atla",
+        "description": "Name of the extension."
+    },
+    "Description": {
+        "message": "YouTube videolarındaki sponsorlukları atla. İzlediğin videolardaki sponsorları diğerlerine zaman kazandırmak için raporla.",
+        "description": "Description of the extension."
+    },
+    "400": {
+        "message": "Sunucu isteğin geçersiz olduğunu iletti"
+    },
+    "429": {
+        "message": "Sadece bu video için çok fazla sponsor süresi belirtti, bu kadar fazla olduğuna emin misin?"
+    },
+    "409": {
+        "message": "Bu daha önce zaten gönderilmiş"
+    },
+    "channelWhitelisted": {
+        "message": "Kanal beyazlistede!"
+    },
+    "Sponsor": {
+        "message": "sponsor"
+    },
+    "Sponsors": {
+        "message": "sponsorlar"
+    },
+    "Segment": {
+        "message": "sponsor bölümü"
+    },
+    "Segments": {
+        "message": "sponsor bölümleri"
+    },
+    "noticeTitle": {
+        "message": "Sponsor Geçildi"
+    },
+    "reportButtonTitle": {
+        "message": "Raporla"
+    },
+    "reportButtonInfo": {
+        "message": "Bu sponsor bölümünü hatalı olarak rapor et."
+    },
+    "Dismiss": {
+        "message": "Yoksay"
+    },
+    "Loading": {
+        "message": "Yükleniyor..."
+    },
+    "Mins": {
+        "message": "Dakika"
+    },
+    "Secs": {
+        "message": "Saniye"
+    },
+    "Hide": {
+        "message": "Asla Gösterme"
+    },
+    "hitGoBack": {
+        "message": "Geldiğiniz yere dönmek istiyorsanız atlama'ya basın."
+    },
+    "unskip": {
+        "message": "Atlama"
+    },
+    "reskip": {
+        "message": "Tekrar atla"
+    },
+    "paused": {
+        "message": "Duraklatıldı"
+    },
+    "confirmMSG": {
+        "message": "Değerleri tek başına düzenlemek ve silmek için, bilgi butonuna basın veya sağ yukarıdaki eklenti simgesine tıklayarak eklenti menüsünü açın."
+    },
+    "clearThis": {
+        "message": "Bunu silmek istediğinize emin misiniz?\n\n"
+    },
+    "Unknown": {
+        "message": "Sponsor sürelerini yollarken bir sorun oluştur, lütfen tekrar deneyin."
+    },
+    "sponsorFound": {
+        "message": "Bu videonun sponsorları veritabanında mevcut!"
+    },
+    "sponsor404": {
+        "message": "Sponsor bulunamadı"
+    },
+    "sponsorStart": {
+        "message": "Sponsorluk Şimdi Başlıyor"
+    },
+    "sponsorEnd": {
+        "message": "Sponsorluk Şimdi Bitiyor"
+    },
+    "noVideoID": {
+        "message": "Bu sekmede YouTube videosu bulunamadı. Bu sekmenin bir YouTube sekmesi olduğundan eminseniz, bu pencereyi kapatıp, tekrar açın. Eğer o da işe yaramazsa, sekmeyi yenilemeyi deneyin."
+    },
+    "success": {
+        "message": "Başarılı!"
+    },
+    "voted": {
+        "message": "Oylandı!"
+    },
+    "voteFail": {
+        "message": "Bu şekilde zaten oy kullanmıştın."
+    },
+    "serverDown": {
+        "message": "Sunucu çökmüş gibi duruyor. Derhal geliştiriciyle iletişime geçin."
+    },
+    "connectionError": {
+        "message": "Bağlantı hatası oluştu. Hata kodu: "
+    },
+    "wantToSubmit": {
+        "message": "Bu video için sponsor sürelerini göndermek istiyor musunuz"
+    },
+    "leftTimes": {
+        "message": "Bazı sponsor sürelerini göndermediğinizi görüyoruz. Göndermek için sayfaya geri dönebilirsiniz (hala mevcutlar)."
+    },
+    "clearTimes": {
+        "message": "Sponsor Sürelerini Temizle"
+    },
+    "openPopup": {
+        "message": "SponsorBlock Penceresini Aç"
+    },
+    "SubmitTimes": {
+        "message": "Sponsor Sürelerini Gönder"
+    },
+    "submitCheck": {
+        "message": "Bunu göndermek istediğinize emin misiniz?"
+    },
+    "whitelistChannel": {
+        "message": "Kanalı Beyazlisteye Ekle"
+    },
+    "removeFromWhitelist": {
+        "message": "Kanalı Beyazlisteden Kaldır"
+    },
+    "voteOnTime": {
+        "message": "Sponsor Süresi için Oy Kullan"
+    },
+    "recordTimes": {
+        "message": "Sponsor Süresini Kaydet"
+    },
+    "soFarUHSubmited": {
+        "message": "Şu an kadar yolladığınız"
+    },
+    "savedPeopleFrom": {
+        "message": "İnsanların şu kadar vaktini kurtardınız "
+    },
+    "viewLeaderboard": {
+        "message": "Liderlik tablosunu görüntüle"
+    },
+    "here": {
+        "message": "burada"
+    },
+    "recordTimesDescription": {
+        "message": "Kaydetmek ve veritabanına yollamak için sponsorluk başladığında ve bittiğinde aşağıdaki butona tıklayın."
+    },
+    "popupHint": {
+        "message": "İpuçu: Sponsorluk süresinin başını ve sonunu raporlamak için video üzerindeyken noktalı virgül tuşuna, yollamak için tırnak tuşuna basınız. (Bu ayarlardan değiştirilebilir.)"
+    },
+    "lastTimes": {
+        "message": "Son Sponsor Mesajı Süresi Seçildi"
+    },
+    "clearTimesButton": {
+        "message": "Süreleri Temizle"
+    },
+    "submitTimesButton": {
+        "message": "Süreleri Gönder"
+    },
+    "publicStats": {
+        "message": "Bu, ne kadar katkı sağladığınızı göstermek için herkese açık istatistik sayfasında kullanılacaktır. Görün"
+    },
+    "setUsername": {
+        "message": "Kullanıcı Adı Belirle"
+    },
+    "discordAdvert": {
+        "message": "Öneri ve geri bildirimleriniz için resmi Discord serverımıza katılın!"
+    },
+    "hideThis": {
+        "message": "Bunu sakla"
+    },
+    "Options": {
+        "message": "Ayarlar"
+    },
+    "showButtons": {
+        "message": "YouTube oynatıcısında Butonları Göster"
+    },
+    "hideButtons": {
+        "message": "YouTube Oynatıcısındaki Butonları Gizle"
+    },
+    "hideButtonsDescription": {
+        "message": "Bu YouTube oynatıcısındaki bölüm geçişlerini yolladığınız butonları saklayacaktır."
+    },
+    "showInfoButton": {
+        "message": "YouTube Oynatıcısındaki Bilgi Butonunu Göster"
+    },
+    "hideInfoButton": {
+        "message": "YouTube Oynatıcısındaki Bilgi Butonunu Gizle"
+    },
+    "whatInfoButton": {
+        "message": "Bu, YouTube sayfasında açılan pencereyi açan butondur."
+    },
+    "hideDeleteButton": {
+        "message": "YouTube Oynatıcısında Silme Tuşunu Gizle"
+    },
+    "showDeleteButton": {
+        "message": "YouTube Oynatıcısında Silme Tuşunu Göster"
+    },
+    "whatDeleteButton": {
+        "message": "Bu, YouTube oynatıcısındaki mevcut video için gönderilmemiş bölümleri temizleyen butondur."
+    },
+    "disableViewTracking": {
+        "message": "Sponsor Atlama Takip Sayacını Devredışı Bırak"
+    },
+    "enableViewTracking": {
+        "message": "Sponsor Atlama Takip Sayacını Devreye Sok"
+    },
+    "whatViewTracking": {
+        "message": "Bu özellik, önerinizin diğerlerine ne kadar işe yaradığını bildirmek için atladığınız sponsorları kaydeder ve istenmeyen önerilerin veritabanına girmesini engellemek adına bir ölçü olarak kullanılır. Her sponsor atladığınızda eklenti sunucuya bir mesaj yollar. Umarım bu ayarı birçok kişi değiştirmez ve böylece görüntülenme sayıları doğru kalır. :)"
+    },
+    "showNotice": {
+        "message": "Uyarıyı Tekrar Göster"
+    },
+    "longDescription": {
+        "message": "SponsorBlock, YouTube'da sponsorlu bölümleri atlamanıza yardımcı olan bir eklentidir. SponsorBlock, herkesin YouTube videolarında bulunan sponsorlu bölümlerin başını ve sonunu göndermesine izin veren kitlekaynaklı bir tarayıcı eklentisidir. Bu bilgiyi biri yolladığında, bu sponsorlu bölüm herkeste atlanır.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Kaynak Kodu",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "Uyarı güncellendi!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Eğer hala beğenmediyseniz, asla gösterme butonuna basın.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Sponsor bölümünün başlangıcı için bir tuş belirleyin"
+    },
+    "setSubmitKeybind": {
+        "message": "Gönderim için bir tuş belirleyin"
+    },
+    "keybindDescription": {
+        "message": "Yazarak bir tuş seçin"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Tuş seçimi şu tuşa ayarlandı: "
+    },
+    "0": {
+        "message": "Bağlantı zaman aşımına uğradı. İnternet bağlantınızı kontrol ediniz. Eğer internetiniz çalışıyor ise, büyük ihtimalle sunucuya erişilemiyor veya sunucuya aşırı yüklenilmiş olabilir."
+    },
+    "disableSkipping": {
+        "message": "SponsorBlock'u Devredışı Bırak"
+    },
+    "enableSkipping": {
+        "message": "SponsorBlock'u Devreye Sok"
+    },
+    "yourWork": {
+        "message": "Çalışmalarınız",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "Sunucuya aşırı yüklenilmiş gibi gözüküyor. Birazdan tekrar deneyin."
+    },
+    "errorCode": {
+        "message": "Hata Kodu: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Sponsoru Atla?"
+    },
+    "skip": {
+        "message": "Atla"
+    },
+    "disableAutoSkip": {
+        "message": "Otomatik Atlamayı Devredışı Bırak"
+    },
+    "enableAutoSkip": {
+        "message": "Otomatik Atlamayı Devreye Sok"
+    },
+    "autoSkipDescription": {
+        "message": "Otomatik atlama sponsorları sizin için atlayacak. Kapalı olduğunda, atlamak istediğinizi soran bir uyarı ekranı belirecek."
+    },
+    "audioNotification": {
+        "message": "Atlamada Sesli Bildirim"
+    },
+    "audioNotificationDescription": {
+        "message": "Atlamada sesli bildirim, bir sponsor bölümü atlandığında bir ses çalar. Eğer devredışı bırakıldıysa (veya otomatik atlama devredışı bırakıldıysa), herhangi bir ses çalmayacak."
+    },
+    "youHaveSkipped": {
+        "message": "Bunu atladınız "
+    },
+    "youHaveSaved": {
+        "message": "Şu kadar süre kazandınız "
+    },
+    "minLower": {
+        "message": "dakika"
+    },
+    "minsLower": {
+        "message": "dakika"
+    },
+    "hourLower": {
+        "message": "saat"
+    },
+    "hoursLower": {
+        "message": "saat"
+    },
+    "youHaveSavedTime": {
+        "message": "İnsanların"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " kadar vaktini kurtardınız."
+    },
+    "guildlinesSummary": {
+        "message": "- Bölümünüzün sadece ücretli tanıtım bölümü olduğundan emin olun.\n- Bu bölümü atlamanın önemli içerik bölümlerini de atlamayacağından emin olun. \n- Eğer tüm bölüm sponsor ise, lütfen raporlamayın. Tüm video rapor sistemimiz yakında gelecek.\n- Eğer videoda taraflılık içeren bir uyarı var raporlamayın (Eğer bir inceleme videosu sponsorluysa, bundan bahsettikleri kısmı atlatmayın)."
+    },
+    "statusReminder": {
+        "message": "Sunucu durumu için status.sponsor.ajay.app kontrol edin."
+    },
+    "changeUserID": {
+        "message": "Kullanıcı kimliğini Dışarı/İçeri Aktar"
+    },
+    "whatChangeUserID": {
+        "message": "Bu gizli tutulmalıdır. Bu bir şifreye benzer ve diğerleriyle paylaşılmaması gerekir. Birinin eline geçerse, sizi taklit edebilir."
+    },
+    "setUserID": {
+        "message": "Kullanıcı kimliği Belirle"
+    },
+    "userIDChangeWarning": {
+        "message": "Uyarı: Kullanıcı kimliği değiştirmek kalıcıdır. Bunu yapmak istediğinizden emin misiniz? Eskisini yedeklediğinizden emin olun."
+    },
+    "createdBy": {
+        "message": "Oluşturan"
+    },
+    "autoSkip": {
+        "message": "Otomatik Atla"
+    },
+    "showSkipNotice": {
+        "message": "Sponsor Atladıktan Sonra Uyarı Göster"
+    },
+    "keybindCurrentlySet": {
+        "message": ". Şu an buna ayarlı:"
+    },
+    "supportInvidious": {
+        "message": "Invidious'a Destek Ver"
+    },
+    "supportInvidiousDescription": {
+        "message": "Invidious (invidio.us) üçüncü parti YouTube istemcisidir. Desteği etkinleştirmek için fazladan izinlere onay vermelisiniz. Bu Chrome ve Chromium bazlı tarayıcılarda gizli pencere modunda ÇALIŞMAZ."
+    },
+    "optionsInfo": {
+        "message": "Invidious desteğini, otomatik atlamayı, butonları saklamayı ve daha fazlasını etkinleştir."
+    },
+    "addInvidiousInstance": {
+        "message": "Invidious Oluşumu Ekle"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Özel Indivious oluşumu ekle. Bu SADECE alan adıyla düzenlenmelidir. Örnek: invidious.ajay.app"
+    },
+    "add": {
+        "message": "Ekle"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Bu geçersiz bir alan adı. Bu SADECE alan adı kısmını içermelidir. Örnek: invidious.ajay.app"
+    },
+    "resetInvidiousInstance": {
+        "message": "Invidious Oluşum Listesini Sıfırla"
+    },
+    "resetInvidiousInstanceAlert": {
+        "message": "Invidious Oluşum listesini sıfırlamak üzeresiniz"
+    },
+    "currentInstances": {
+        "message": "Mevcut Oluşumlar:"
+    },
+    "enableAutoUpvote": {
+        "message": "Otomatik Oy Ver"
+    },
+    "whatAutoUpvote": {
+        "message": "Eğer bu ayar açıksa, eklenti eğer rapor etmediyseniz gördüğünüz tüm önerileri oylayacaktır. Eğer bildirim kapalıysa, bu gerçekleşmeyecektir."
+    },
+    "minDuration": {
+        "message": "Minimum süre (saniye):"
+    },
+    "minDurationDescription": {
+        "message": "Belirlenen değerden kısa olan sponsor bölümleri atlanmayacak veya oynatıcıda gözükmeyecektir."
+    },
+    "shortCheck": {
+        "message": "Sıradaki öneri belirlediğiniz minimum süre ayarından daha kısa. Bu zaten yollandığı ve bu ayardan dolayı yok sayıldığı anlamına gelebilir. Göndermek istediğinizden emin misiniz?"
+    },
+    "showUploadButton": {
+        "message": "Karşıya Yükleme Butonunu Göster"
+    },
+    "whatUploadButton": {
+        "message": "Bu buton, YouTube oynatıcısında bir zaman seçtiğiniz ve göndermeye hazır olduğunuzda gözükür."
+    },
+    "customServerAddress": {
+        "message": "SponsorBlock Sunucu Adresi"
+    },
+    "customServerAddressDescription": {
+        "message": "SponsorBlock'un sunucu ile iletişimi sağlamak için kullandığı adres.\nKendi sunucu kopyanız olmadığı sürece bu değiştirilmemelidir."
+    },
+    "save": {
+        "message": "Kaydet"
+    },
+    "reset": {
+        "message": "Sıfırla"
+    },
+    "customAddressError": {
+        "message": "Bu adres doğru formatta değil. Başında http:// veya https:// olduğundan ve sonda / işareti olmadığından emin olun."
+    },
+    "areYouSureReset": {
+        "message": "Bunu sıfırlamak istediğinize emin misiniz?"
+    },
+    "confirmPrivacy": {
+        "message": "Bu videonun listede olmadığı belirlendi. Bu videoyu sponsorlar için kontrol etmek istemiyorsanız iptale basınız."
+    },
+    "unlistedCheck": {
+        "message": "Listedışı/Özel Videoları Görmezden Gel"
+    },
+    "whatUnlistedCheck": {
+        "message": "Bu ayar SponsorBlock eklentisini az miktarda yavaşlatacaktır. Sponsor kontrolleri, sunucuya video kimlik numarası göndermeyi gerektirir. Eğer listedışı videoların, video kimlik numaralarının internet üzerinden gönderilmesini istemiyorsanız bu seçeneği aktive edin."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com şu an desteklenmektedir"
+    },
+    "exportOptions": {
+        "message": "Bütün Ayarlarını İçe/Dışa Aktar"
+    },
+    "whatExportOptions": {
+        "message": "Bu, JSON formatında bütün kurulumunuzu gösterir. Kullanıcı kimliğinizi içerir, bu sebeple paylaşırken dikkatli olun."
+    },
+    "setOptions": {
+        "message": "Seçenekleri Ayarla"
+    },
+    "exportOptionsWarning": {
+        "message": "Uyarı: Ayarları değiştirmek kalıcıdır ve yüklemenizi bozabilir. Bunu yapmak istediğinizden emin misiniz? Eskisini yenilediğinizden emin olun."
+    },
+    "incorrectlyFormattedOptions": {
+        "message": "Bu JSON doğru formatlanmamış. Ayarlarınız değiştirilmedi."
+    },
+    "confirmNoticeTitle": {
+        "message": "Bölüm Gönder"
+    },
+    "submit": {
+        "message": "Gönder"
+    },
+    "cancel": {
+        "message": "İptal"
+    },
+    "delete": {
+        "message": "Sil"
+    },
+    "preview": {
+        "message": "Önizle"
+    },
+    "edit": {
+        "message": "Düzenle"
+    },
+    "copyDebugInformation": {
+        "message": "Onarım Bilgisini Panoya Kopyala"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Panoya kopyalanamadı"
+    },
+    "copyDebugInformationOptions": {
+        "message": "Panoya, geliştiricinin hata gideriminde veya ulaşmak istediğinde geliştiriciye sağlamak üzerine bilgileri kaydeder. Kullanıcı kimliği, beyaz listenizdeki kanallar ve düzenlenmiş sunucu adresleri gibi hassas bilgiler silinmiştir. Ancak tarayıcı bilgileri, işletim sisteminiz ve eklenti numaranız gibi bilgileri içerebilir. "
+    },
+    "copyDebugInformationComplete": {
+        "message": "Bu çözüm bilgisi panoya kopyalandı. Paylaşmak istemediğiniz herhangi bir bilgiyi silmekte özgürsünüz. Bir yazı dosyası olarak kaydedin veya hata raporuna kopyalayın."
+    },
+    "theKey": {
+        "message": "Anahtar"
+    },
+    "keyAlreadyUsedByYouTube": {
+        "message": "YouTube tarafından zaten kullanımda. Lütfen başka bir anahtar seçin."
+    },
+    "keyAlreadyUsed": {
+        "message": "başka bir eyleme bağlı. Lütfen başka bir anahtar seçin."
+    },
+    "to": {
+        "message": "'e",
+        "description": "Used between sponsor times. Example: 1:20 to 1:30"
+    },
+    "category_sponsor": {
+        "message": "Sponsor"
+    },
+    "category_intro": {
+        "message": "Giriş Animasyonu"
+    },
+    "category_outro": {
+        "message": "Bitiş Ekranı/Jenerik"
+    },
+    "category_interaction": {
+        "message": "Etkileşim Hatırlatıcısı (Abonelik)"
+    },
+    "category_selfpromo": {
+        "message": "Kendi Reklamını Yapma ve Ürün"
+    },
+    "category_music_offtopic": {
+        "message": "Müzik: Müzik Olmayan Bölüm"
+    },
+    "category_livestream_messages": {
+        "message": "Canlı Yayın: Bağış/Mesaj Okuma"
+    },
+    "disable": {
+        "message": "Devredışı"
+    },
+    "manualSkip": {
+        "message": "Elle Atla"
+    },
+    "showOverlay": {
+        "message": "Arama Çubuğunda Göster"
+    },
+    "enableTestingServer": {
+        "message": "Beta Deneme Sunucusunu Devreye Sok"
+    },
+    "whatEnableTestingServer": {
+        "message": "Önerileriniz ve oylarınız ana sunucuya GÖNDERİLMEYECEKTİR. Bunu sadece deneme amacıyla kullanın."
+    },
+    "testingServerWarning": {
+        "message": "Tüm öneriler ve oylar, test sunucusuna bağlandığınız sürece ana sunucuya iletilmeyecektir. Gerçek öneriler yapmak istediğinizde bu ayarı kapatmayı unutmayın."
+    },
+    "bracketNow": {
+        "message": "(Şimdi)"
+    },
+    "moreCategories": {
+        "message": "Daha Fazla Kategori"
+    },
+    "bracketEnd": {
+        "message": "(Son)"
+    },
+    "hiddenDueToDownvote": {
+        "message": "gizlendi: eksile"
+    },
+    "hiddenDueToDuration": {
+        "message": "gizlendi: çok kısa"
+    },
+    "channelDataNotFound": {
+        "message": "Kanal kimliği henüz yüklenmedi."
+    },
+    "adblockerIssue": {
+        "message": "Bir şeyin SponsorBlock'un video bilgisi almasını engelliyor gibi görünüyor. Bu reklam engelleyiciniz olabilir. Lütfen şu adresi kontrol edin https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "Bunu sürekli yaşıyorsanız, reklam engelleyiciniz tarafından gerçekleşiyor olabilir. https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests adresini kontrol edin."
+    },
+    "forceChannelCheck": {
+        "message": "Sponsorları Atlamadan Önce Kanal Kontrolünü Zorla"
+    },
+    "whatForceChannelCheck": {
+        "message": "Varsayılan olarak, eklenti kanalın ne olduğunu bilmeden önce sponsorları atlayacaktır. Varsayılan olarak, beyaz listede olan kanallarda sıfır saniyelik sponsor bölümleri atlanacaktır. Bu ayarı aktifleştirmek bunu engelleyecektir ancak kanal kimlik bilgisini almak biraz vakit alacağından atlamalarda gecikmeler yaratabilir. Eğer hızlı bir internetiniz varsa bu gecikmeler farkedilmeyebilir."
+    },
+    "forceChannelCheckPopup": {
+        "message": "Sponsorları Atlamadan Önce Kanal Kontrolünü Zorlamayı Gözden Geçir"
+    },
+    "downvoteDescription": {
+        "message": "Hatalı"
+    },
+    "incorrectCategory": {
+        "message": "Yanlış Kategori"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "Bu videonun kategorisi müzik olarak belirlenmiş. Müzik içermeyen bölümleri göndermek istediğinize emin misiniz? Eğer bu bir müzik videosu değilse, bu bölümleri göndermemelisiniz. Eğer ayırt edemiyorsanız, lütfen rehberi okuyunuz."
+    }
+}

public/_locales/uk/messages.json

@@ -1 +1,449 @@
-{}
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock для 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, або Ви натиснули занадто рано.\n  Якщо це вкладка YouTube,\n  закрийте це спливаюче вікно і відкрийте його знову."
+    },
+    "success": {
+        "message": "Успіх!"
+    },
+    "voted": {
+        "message": "Голос зарахований!"
+    },
+    "voteFail": {
+        "message": "Ви вже проголосували таким чином раніше."
+    },
+    "serverDown": {
+        "message": "Здається, сервер не працює. Зв'яжіться з розробником."
+    },
+    "connectionError": {
+        "message": "Помилка з'єднання. Код помилки: "
+    },
+    "wantToSubmit": {
+        "message": "Ви точно хочете надіслати звіт про спонсорські вставки у відео з ідентифікатором"
+    },
+    "leftTimes": {
+        "message": "Ви ще не надіслали звіти про деякі спонсорські вставки. Хочете повернутися на цю сторінку, щоб надіслати їх (вони не видаляються)."
+    },
+    "submitCheck": {
+        "message": "Ви впевнені, що хочете надіслати цю інформацію?"
+    },
+    "whitelistChannel": {
+        "message": "Додати канал в білий список"
+    },
+    "removeFromWhitelist": {
+        "message": "Видалити канал з білого списку"
+    },
+    "voteOnTime": {
+        "message": "Проголосувати за час спонсорської вставки"
+    },
+    "recordTimes": {
+        "message": "Записати час спонсорської вставки"
+    },
+    "soFarUHSubmited": {
+        "message": "На даний момент Ви надіслали"
+    },
+    "savedPeopleFrom": {
+        "message": "Ви допомогли людям заощадити "
+    },
+    "viewLeaderboard": {
+        "message": "Подивитися дошку пошани"
+    },
+    "here": {
+        "message": "тут"
+    },
+    "recordTimesDescription": {
+        "message": "Натисніть кнопку нижче, коли спонсорська вставка починається і закінчується, щоб записати\nі надіслати її в базу даних."
+    },
+    "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": "Автоматичний пропуск буде пропускати спонсорські вставки за Вас. Якщо вимкнено, буде показуватися повідомлення з пропозицією пропустити."
+    },
+    "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": "Імпортувати/Експортувати Ваш ідентифікатор користувача"
+    },
+    "whatChangeUserID": {
+        "message": "Це потрібно тримати в секреті. Це як пароль, не варто ним ні з ким ділитися. Якщо він у кого-то є, він зможе видати себе за Вас."
+    },
+    "setUserID": {
+        "message": "Встановити ідентифікатор користувача"
+    },
+    "userIDChangeWarning": {
+        "message": "Увага: зміна ідентифікатора користувача є незворотнім. Ви дійсно хочете це зробити? Зробіть резервну копію вашого старого про всяк випадок."
+    },
+    "createdBy": {
+        "message": "Створено"
+    },
+    "autoSkip": {
+        "message": "Автоматичний пропуск"
+    },
+    "showSkipNotice": {
+        "message": "Показувати сповіщення після пропуску спонсорської вставки"
+    },
+    "keybindCurrentlySet": {
+        "message": ". Він зараз призначений на:"
+    },
+    "supportInvidious": {
+        "message": "Підтримка Invidious"
+    },
+    "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. Пошук спонсорів вимагає надсилання ідентифікатора відео на сервер. Якщо Вас турбує відправка ідентифікаторів непублічних відео по інтернету, увімкніть це налаштування."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com тепер підтримується"
+    },
+    "confirmNoticeTitle": {
+        "message": "Надіслати сегмент"
+    },
+    "submit": {
+        "message": "Надіслати"
+    },
+    "cancel": {
+        "message": "Скасувати"
+    },
+    "delete": {
+        "message": "Видалити"
+    },
+    "preview": {
+        "message": "Попередній перегляд"
+    },
+    "edit": {
+        "message": "Редагувати"
+    },
+    "category_sponsor": {
+        "message": "Спонсор"
+    },
+    "disable": {
+        "message": "Вимкнути"
+    },
+    "manualSkip": {
+        "message": "Пропуск вручну"
+    },
+    "bracketNow": {
+        "message": "(Зараз)"
+    },
+    "moreCategories": {
+        "message": "Більше категорій"
+    },
+    "bracketEnd": {
+        "message": "(Кінець)"
+    }
+}

public/_locales/zh_CN/messages.json

@@ -1 +1,567 @@
-{}
+{
+    "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_interaction": {
+        "message": "互动提醒（订阅）"
+    },
+    "category_selfpromo": {
+        "message": "自我推销和商品"
+    },
+    "category_music_offtopic": {
+        "message": "音乐：非音乐部分"
+    },
+    "category_livestream_messages": {
+        "message": "直播：捐赠/消息阅读"
+    },
+    "disable": {
+        "message": "禁用"
+    },
+    "manualSkip": {
+        "message": "手动跳过"
+    },
+    "showOverlay": {
+        "message": "在搜索栏中显示"
+    },
+    "enableTestingServer": {
+        "message": "启用 Beta 测试服务器"
+    },
+    "whatEnableTestingServer": {
+        "message": "您的提交和投票将不会计入主服务器。它只被用于测试。"
+    },
+    "testingServerWarning": {
+        "message": "当连接到测试服务器时，所有的提交和投票将不会计入主服务器。当您想要进行真实提交时，请确保禁用了此选项。"
+    },
+    "bracketNow": {
+        "message": "(现在)"
+    },
+    "moreCategories": {
+        "message": "更多类别"
+    },
+    "bracketEnd": {
+        "message": "（结束）"
+    },
+    "hiddenDueToDownvote": {
+        "message": "隐藏：差评"
+    },
+    "hiddenDueToDuration": {
+        "message": "隐藏：过短"
+    },
+    "channelDataNotFound": {
+        "message": "频道 ID 尚未加载。"
+    },
+    "adblockerIssue": {
+        "message": "似乎某些东西正在阻止 SponsorBlock 获取视频数据的功能。它很可能是您的广告拦截器。请查看 https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "itCouldBeAdblockerIssue": {
+        "message": "如果这种情况不断发生，它可能是由您的广告拦截器引起的。请查看 https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    },
+    "forceChannelCheck": {
+        "message": "跳过赞助商广告前强制进行频道检查"
+    },
+    "whatForceChannelCheck": {
+        "message": "默认情况下，即使还未检测出当前是什么频道，也会立即跳过赞助商广告。默认情况下，即使在白名单中的频道，一些在开头的赞助商广告也可能被跳过。启用此选项将防止这种情况，但所有的跳过将会产生轻微的延迟，因为获取频道 ID 需要一点时间。如果您的网速很快，那延迟可能非常短。"
+    },
+    "forceChannelCheckPopup": {
+        "message": "请考虑启用跳过赞助商广告前强制进行频道检查"
+    },
+    "downvoteDescription": {
+        "message": "不正确"
+    },
+    "incorrectCategory": {
+        "message": "错误的类别"
+    },
+    "nonMusicCategoryOnMusic": {
+        "message": "此视频被归类为音乐。您确定要提交带有非音乐类别的片段吗？除非此视频实际上不是音乐，否则您不应提交此片段。如果您感到困惑，请阅读指南。"
+    }
+}

public/content.css

@@ -11,11 +11,28 @@
 	z-index: 40;
 }
 
+.sbHidden {
+	display: none !important;
+}
+
+
 .previewbar {
 	display: inline-block;
 	height: 100%;
 }
 
+/* Preview Bar page hacks */
+
+.sbTooltipTwoTitleThumbnailOffset {
+	bottom: -5px !important;
+}
+
+.sbTooltipOneTitleThumbnailOffset {
+	bottom: 10px !important;
+}
+
+/*  */
+
 .popup {
     z-index: 10;
     width: 100%;
@@ -83,6 +100,8 @@
 	border-spacing: 5px 10px;
 	padding-left: 5px;
 	padding-right: 5px;
+
+	border-collapse: unset;
 }
 
 .sponsorSkipNoticeFadeIn {

public/popup.css

@@ -39,10 +39,8 @@ sub.popupElement {
 	vertical-align: text-bottom;
 }
 
-.popupElement {
+.logoText {
-    font-family: 'Source Sans Pro', sans-serif;
+	color: white;
-
-    color: black;
 }
 
 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;
+	background-color:#bc3315;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cf866c;
-	box-shadow:inset 0px 1px 0px 0px #cf866c;
-	background-color:#d0451b;
 	-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;
+	background-color:#bc8215;
-	-webkit-box-shadow:inset 0px 1px 0px 0px #cfbd6c;
-	box-shadow:inset 0px 1px 0px 0px #cfbd6c;
-	background-color:#d0821b;
 	-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;

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/>
@@ -131,7 +135,7 @@
               <span id="sponsorTimesSkipsDoneDisplay" class="popupElement">
                 0
               </span>
-              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span> (since February).
+              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span>
             </div>
 
             <div id="sponsorTimeSavedContainer"  class="popupElement" style="display: none">

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);
         
@@ -52,7 +47,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
             //this allows the callback to be called later
             return true;
         case "submitVote":
-            submitVote(request.type, request.UUID, callback);
+            submitVote(request.type, request.UUID, request.category, callback);
         
             //this allows the callback to be called later
             return true;
@@ -152,7 +147,7 @@ function addSponsorTime(time, videoID, callback) {
     });
 }
 
-function submitVote(type, UUID, callback) {
+function submitVote(type, UUID, category, callback) {
     let userID = Config.config.userID;
 
     if (userID == undefined || userID === "undefined") {
@@ -161,8 +156,10 @@ function submitVote(type, UUID, callback) {
         Config.config.userID = userID;
     }
 
+    let typeSection = (type !== undefined) ? "&type=" + type : "&category=" + category;
+
     //publish this vote
-    utils.sendRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
+    utils.sendRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + typeSection, function(xmlhttp, error) {
         if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
             callback({
                 successType: 1
@@ -182,61 +179,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
-                    });
-                }
-            });
-        }
-    }
 }

src/components/NoticeComponent.tsx

@@ -23,6 +23,7 @@ export interface NoticeState {
 
     countdownTime: number,
     countdownText: string,
+    countdownManuallyPaused: boolean,
 }
 
 class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
@@ -55,6 +56,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
             //the countdown until this notice closes
             countdownTime: maxCountdownTime(),
             countdownText: null,
+            countdownManuallyPaused: false
         }
     }
 
@@ -71,8 +73,8 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
             <table id={"sponsorSkipNotice" + this.idSuffix} 
                 className={"sponsorSkipObject sponsorSkipNotice" + (this.props.fadeIn ? " sponsorSkipNoticeFadeIn" : "")}
                 style={noticeStyle}
-                onMouseEnter={this.pauseCountdown.bind(this)}
+                onMouseEnter={() => this.timerMouseEnter()}
-                onMouseLeave={this.startCountdown.bind(this)}> 
+                onMouseLeave={() => this.timerMouseLeave()}> 
                 <tbody>
 
                     {/* First row */}
@@ -99,6 +101,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                             {/* Time left */}
                             {this.props.timed ? ( 
                                 <span id={"sponsorSkipNoticeTimeLeft" + this.idSuffix}
+                                    onClick={() => this.toggleManualPause()}
                                     className="sponsorSkipObject sponsorSkipNoticeTimeLeft">
 
                                     {this.state.countdownText || (this.state.countdownTime + "s")}
@@ -121,6 +124,30 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
         );
     }
 
+    timerMouseEnter() {
+        if (this.state.countdownManuallyPaused) return;
+
+        this.pauseCountdown();
+    }
+
+    timerMouseLeave() {
+        if (this.state.countdownManuallyPaused) return;
+
+        this.startCountdown();
+    }
+
+    toggleManualPause() {
+        this.setState({
+            countdownManuallyPaused: !this.state.countdownManuallyPaused
+        }, () => {
+            if (this.state.countdownManuallyPaused) {
+                this.pauseCountdown();
+            } else {
+                this.startCountdown();
+            }
+        });
+    }
+
     //called every second to lower the countdown before hiding the notice
     countdown() {
         if (!this.props.timed) return;
@@ -159,7 +186,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
         //reset countdown and inform the user
         this.setState({
             countdownTime: this.state.maxCountdownTime(),
-            countdownText: chrome.i18n.getMessage("paused")
+            countdownText: this.state.countdownManuallyPaused ? chrome.i18n.getMessage("manualPaused") : chrome.i18n.getMessage("paused")
         });
         
         //remove the fade out class if it exists

src/components/SkipNoticeComponent.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
+import * as CompileConfig from "../../config.json";
 import Config from "../config"
-import { ContentContainer } from "../types";
+import { ContentContainer, SponsorHideType } from "../types";
 
 import Utils from "../utils";
 var utils = new Utils();
@@ -19,16 +20,19 @@ export interface SkipNoticeProps {
 }
 
 export interface SkipNoticeState {
-    noticeTitle: string,
+    noticeTitle: string;
 
-    messages: string[],
+    messages: string[];
 
-    countdownTime: number,
+    countdownTime: number;
     maxCountdownTime: () => number;
-    countdownText: string,
+    countdownText: string;
 
-    unskipText: string,
+    unskipText: string;
-    unskipCallback: () => void
+    unskipCallback: () => void;
+
+    downvoting: boolean;
+    choosingCategory: boolean;
 }
 
 class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeState> {
@@ -43,20 +47,25 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
     idSuffix: any;
 
     noticeRef: React.MutableRefObject<NoticeComponent>;
+    categoryOptionRef: React.RefObject<HTMLSelectElement>;
+
+    // Used to update on config change
+    configListener: () => void;
 
     constructor(props: SkipNoticeProps) {
         super(props);
         this.noticeRef = React.createRef();
+        this.categoryOptionRef = React.createRef();
 
         this.UUID = props.UUID;
         this.autoSkip = props.autoSkip;
         this.contentContainer = props.contentContainer;
         this.audio = null;
     
-        let noticeTitle = chrome.i18n.getMessage("noticeTitle");
+        let noticeTitle = chrome.i18n.getMessage("category_" + this.getSponsorTime().category) + " " + chrome.i18n.getMessage("skipped");
     
         if (!this.autoSkip) {
-            noticeTitle = chrome.i18n.getMessage("noticeTitleNotSkipped");
+            noticeTitle = chrome.i18n.getMessage("skip") + " " + chrome.i18n.getMessage("category_" + this.getSponsorTime().category) + "?";
         }
     
         //add notice
@@ -83,7 +92,10 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
             countdownText: null,
 
             unskipText: chrome.i18n.getMessage("unskip"),
-            unskipCallback: this.unskip.bind(this)
+            unskipCallback: this.unskip.bind(this),
+
+            downvoting: false,
+            choosingCategory: false
         }
 
         if (!this.autoSkip) {
@@ -91,6 +103,11 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         }
     }
 
+    // Helper method
+    getSponsorTime() {
+        return utils.getSponsorTimeFromUUID(this.contentContainer().sponsorTimes, this.UUID);
+    }
+
     componentDidMount() {
         if (Config.config.audioNotificationOnSkip && this.audio) {
             this.audio.volume = this.contentContainer().v.volume * 0.1;
@@ -115,7 +132,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 timed={true}
                 maxCountdownTime={this.state.maxCountdownTime}
                 ref={this.noticeRef}
-                closeListener={this.props.closeListener}>
+                closeListener={() => this.closeListener()}>
                     
                 {(Config.config.audioNotificationOnSkip) && <audio ref={(source) => { this.audio = source; }}>
                     <source src={chrome.extension.getURL("icons/beep.ogg")} type="audio/ogg"></source>
@@ -124,7 +141,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 {/* Text Boxes */}
                 {this.getMessageBoxes()}
               
-                {/* Last Row */}
+                {/* Bottom Row */}
                 <tr id={"sponsorSkipNoticeSecondRow" + this.idSuffix}>
 
                     {/* Vote Button Container */}
@@ -145,7 +162,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                             className="sponsorSkipObject voteButton"
                             src={chrome.extension.getURL("icons/report.png")}
                             title={chrome.i18n.getMessage("reportButtonInfo")}
-                            onClick={() => this.contentContainer().vote(0, this.UUID, this)}>
+                            onClick={() => this.adjustDownvotingState(true)}>
                         
                         </img>
 
@@ -174,6 +191,52 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                     }
                 </tr>
 
+                {/* Downvote Options Row */}
+                {this.state.downvoting &&
+                    <tr id={"sponsorSkipNoticeDownvoteOptionsRow" + this.idSuffix}>
+                        <td id={"sponsorTimesDownvoteOptionsContainer" + this.idSuffix}>
+
+                            {/* Normal downvote */}
+                            <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                                    onClick={() => this.contentContainer().vote(0, this.UUID, undefined, this)}>
+                                {chrome.i18n.getMessage("downvoteDescription")}
+                            </button>
+
+                            {/* Category vote */}
+                            <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                                    onClick={() => this.openCategoryChooser()}>
+
+                                {chrome.i18n.getMessage("incorrectCategory")}
+                            </button>
+                        </td>
+
+                    </tr>
+                }
+
+                {/* Category Chooser Row */}
+                {this.state.choosingCategory &&
+                    <tr id={"sponsorSkipNoticeCategoryChooserRow" + this.idSuffix}>
+                        <td>
+                            {/* Category Selector */}
+                            <select id={"sponsorTimeCategories" + this.idSuffix}
+                                    className="sponsorTimeCategories"
+                                    defaultValue={this.getSponsorTime().category}
+                                    ref={this.categoryOptionRef}
+                                    onChange={this.categorySelectionChange.bind(this)}>
+
+                                {this.getCategoryOptions()}
+                            </select>
+
+                            {/* Submit Button */}
+                            <button className="sponsorSkipObject sponsorSkipNoticeButton"
+                                    onClick={() => this.contentContainer().vote(undefined, this.UUID, this.categoryOptionRef.current.value, this)}>
+
+                                {chrome.i18n.getMessage("submit")}
+                            </button>
+                        </td>
+                    </tr>
+                }
+
             </NoticeComponent>
         );
     }
@@ -202,6 +265,70 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         return elements;
     }
 
+    adjustDownvotingState(value: boolean) {
+        if (!value) this.clearConfigListener();
+
+        this.setState({
+            downvoting: value,
+            choosingCategory: false
+        });
+    }
+
+    clearConfigListener() {
+        if (this.configListener) {
+            Config.configListeners.splice(Config.configListeners.indexOf(this.configListener), 1);
+            this.configListener = null;
+        }
+    }
+
+    openCategoryChooser() {
+        // Add as a config listener
+        this.configListener = () => this.forceUpdate();
+        Config.configListeners.push(this.configListener);
+
+        this.setState({
+            choosingCategory: true,
+            downvoting: false
+        });
+    }
+
+    getCategoryOptions() {
+        let elements = [];
+
+        for (const category of Config.config.categorySelections) {
+            elements.push(
+                <option value={category.name}
+                        key={category.name}>
+                    {chrome.i18n.getMessage("category_" + category.name)}
+                </option>
+            );
+        }
+
+        if (elements.length < CompileConfig.categoryList.length) {
+            // Add show more button
+            elements.push(
+                <option value={"moreCategories"}
+                        key={"moreCategories"}>
+                    {chrome.i18n.getMessage("moreCategories")}
+                </option>
+            );
+        }
+
+        return elements;
+    }
+
+    categorySelectionChange(event: React.ChangeEvent<HTMLSelectElement>) {
+        // See if show more categories was pressed
+        if (event.target.value === "moreCategories") {
+            // Open options page
+            chrome.runtime.sendMessage({"message": "openConfig"});
+
+            // Reset option to original
+            event.target.value = this.getSponsorTime().category;
+            return;
+        }
+    }
+
     unskip() {
         this.contentContainer().unskipSponsorTime(this.UUID);
 
@@ -218,7 +345,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
 
     getUnskippedModeInfo(buttonText: string) {
         let maxCountdownTime = function() {
-            let sponsorTime = utils.getSponsorTimeFromUUID(this.contentContainer().sponsorTimes, this.UUID);
+            let sponsorTime = this.getSponsorTime();
             let duration = Math.round((sponsorTime.segment[1] - this.contentContainer().v.currentTime) * (1 / this.contentContainer().v.playbackRate));
 
             return Math.max(duration, 4);
@@ -258,22 +385,22 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         }
     }
 
-    afterDownvote() {
+    afterDownvote(type: number, category: string) {
         this.addVoteButtonInfo(chrome.i18n.getMessage("voted"));
         this.setNoticeInfoMessage(chrome.i18n.getMessage("hitGoBack"));
+
+        this.adjustDownvotingState(false);
         
-        //remove this sponsor from the sponsors looked up
+        // Change the sponsor locally
-        //find which one it is
+        let sponsorTime = this.getSponsorTime();
-        for (let i = 0; i < this.contentContainer().sponsorTimes.length; i++) {
+        if (sponsorTime) {
-            if (this.contentContainer().sponsorTimes[i].UUID == this.UUID) {
+            if (type === 0) {
-                //this one is the one to hide
+                sponsorTime.hidden = SponsorHideType.Downvoted;
-                
+            } else if (category) {
-                //add this as a hidden sponsorTime
+                sponsorTime.category = category;
-                this.contentContainer().hiddenSponsorTimes.push(i);
-            
-                this.contentContainer().updatePreviewBar();
-                break;
             }
+
+            this.contentContainer().updatePreviewBar();
         }
     }
 
@@ -316,6 +443,12 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         //show button again
         document.getElementById("sponsorTimesDownvoteButtonsContainer" + this.idSuffix).style.removeProperty("display");
     }
+
+    closeListener() {
+        this.clearConfigListener();
+
+        this.props.closeListener();
+    }
 }
 
 export default SkipNoticeComponent;

src/components/SponsorTimeEditComponent.tsx

@@ -29,6 +29,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
     categoryOptionRef: React.RefObject<HTMLSelectElement>;
 
+    configUpdateListener: () => void;
+
     constructor(props: SponsorTimeEditProps) {
         super(props);
 
@@ -47,6 +49,18 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         document.getElementById("sponsorTimesContainer" + this.idSuffix).addEventListener('keydown', function (event) {
             event.stopPropagation();
         });
+
+        // Add as a config listener
+        if (!this.configUpdateListener) {
+            this.configUpdateListener = () => this.configUpdate();
+            Config.configListeners.push(this.configUpdate.bind(this));
+        }
+    }
+
+    componentWillUnmount() {
+        if (this.configUpdateListener) {
+            Config.configListeners.splice(Config.configListeners.indexOf(this.configUpdate.bind(this)), 1);
+        }
     }
 
     render() {
@@ -58,6 +72,15 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
             style.marginTop = "15px";
         }
 
+        // This method is required to get !important
+        // https://stackoverflow.com/a/45669262/1985387
+        let oldYouTubeDarkStyles = (node) => {
+            if (node) {
+                node.style.setProperty("color", "black", "important");
+                node.style.setProperty("text-shadow", "none", "important");
+            }
+        };
+
         // Create time display
         let timeDisplay: JSX.Element;
         let sponsorTime = this.props.contentContainer().sponsorTimesSubmitting[this.props.index];
@@ -75,6 +98,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
                         <input id={"submittingTimeMinutes0" + this.idSuffix}
                             className="sponsorTimeEdit sponsorTimeEditMinutes"
+                            ref={oldYouTubeDarkStyles}
                             type="number"
                             value={this.state.sponsorTimeEdits[0][0]}
                             onChange={(e) => {
@@ -87,6 +111,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
                         <input id={"submittingTimeSeconds0" + this.idSuffix}
                             className="sponsorTimeEdit sponsorTimeEditSeconds"
+                            ref={oldYouTubeDarkStyles}
                             type="number"
                             value={this.state.sponsorTimeEdits[0][1]}
                             onChange={(e) => {
@@ -103,6 +128,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
                         <input id={"submittingTimeMinutes1" + this.idSuffix}
                             className="sponsorTimeEdit sponsorTimeEditMinutes"
+                            ref={oldYouTubeDarkStyles}
                             type="text"
                             value={this.state.sponsorTimeEdits[1][0]}
                             onChange={(e) => {
@@ -115,6 +141,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
                         <input id={"submittingTimeSeconds1" + this.idSuffix}
                             className="sponsorTimeEdit sponsorTimeEditSeconds"
+                            ref={oldYouTubeDarkStyles}
                             type="text"
                             value={this.state.sponsorTimeEdits[1][1]}
                             onChange={(e) => {
@@ -130,6 +157,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 +260,18 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     }
 
     setTimeToNow(index: number) {
+        this.setTimeTo(index, this.props.contentContainer().getRealCurrentTime());
+    }
+
+    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 +360,10 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
             this.props.submissionNotice.forceUpdate();
         }
     }
+
+    configUpdate() {
+        this.forceUpdate();
+    }
 }
 
 export default SponsorTimeEditComponent;

src/components/SubmissionNoticeComponent.tsx

@@ -93,13 +93,6 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
                     <td className="sponsorSkipNoticeRightSection"
                         style={{position: "relative"}}>
 
-                        {/* Cancel Button */}
-                        <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
-                            onClick={this.cancel.bind(this)}>
-
-                            {chrome.i18n.getMessage("cancel")}
-                        </button>
-
                         {/* Submit Button */}
                         <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
                             onClick={this.submit.bind(this)}>
@@ -167,6 +160,18 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
             ref.current.saveEditTimes();
         }
 
+        // Check if any non music categories are being used on a music video
+        if (this.contentContainer().videoInfo?.microformat?.playerMicroformatRenderer?.category === "Music") {
+            let sponsorTimesSubmitting = this.props.contentContainer().sponsorTimesSubmitting;
+            for (const sponsorTime of sponsorTimesSubmitting) {
+                if (!sponsorTime.category.startsWith("music_")) {
+                    if (!confirm(chrome.i18n.getMessage("nonMusicCategoryOnMusic"))) return;
+
+                    break;
+                }
+            }
+        }
+
         this.props.callback();
 
         this.cancel();

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,
@@ -118,7 +123,7 @@ var Config: SBObject = {
         hideUploadButtonPlayerControls: false,
         hideDiscordLaunches: 0,
         hideDiscordLink: false,
-        invidiousInstances: ["invidio.us", "invidiou.sh", "invidious.snopyta.org"],
+        invidiousInstances: ["invidio.us", "invidious.snopyta.org"],
         autoUpvote: true,
         supportInvidious: false,
         serverAddress: CompileConfig.serverAddress,
@@ -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,46 @@ function migrateOldFormats() {
             }
         }
     }
+
+    // Channel URLS
+    if (Config.config.whitelistedChannels.length > 0 && 
+            (Config.config.whitelistedChannels[0] == null || Config.config.whitelistedChannels[0].includes("/"))) {
+        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;
+    }
+
+    // Check if off-topic category needs to be removed
+    for (let i = 0; i < Config.config.categorySelections.length; i++) {
+        if (Config.config.categorySelections[i].name === "offtopic") {
+            Config.config.categorySelections.splice(i, 1);
+            // Call set listener
+            Config.config.categorySelections = Config.config.categorySelections;
+            break;
+        }
+    }
 }
 
 async function setupConfig() {

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,24 +24,23 @@ 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[] = [];
 
 //the video
 var video: HTMLVideoElement;
 
-/** The last time this video was seeking to */
-var lastVideoTime: number = null;
-
 var onInvidious;
 var onMobileYouTube;
 
@@ -59,12 +58,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;
 
@@ -103,6 +96,9 @@ var popupInitialised = false;
 
 var submissionNotice: SubmissionNotice = null;
 
+// If there is an advert playing (or about to be played), this is true
+var isAdPlaying = false;
+
 // Contains all of the functions and variables needed by the skip notice
 var skipNoticeContentContainer: ContentContainer = () => ({
     vote,
@@ -110,7 +106,6 @@ var skipNoticeContentContainer: ContentContainer = () => ({
     unskipSponsorTime,
     sponsorTimes,
     sponsorTimesSubmitting,
-    hiddenSponsorTimes,
     v: video,
     sponsorVideoID,
     reskipSponsorTime,
@@ -119,7 +114,9 @@ var skipNoticeContentContainer: ContentContainer = () => ({
     sponsorSubmissionNotice: submissionNotice,
     resetSponsorSubmissionNotice,
     changeStartSponsorButton,
-    previewTime
+    previewTime,
+    videoInfo,
+    getRealCurrentTime: getRealCurrentTime
 });
 
 //get messages from the background script and the popup
@@ -143,8 +140,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,
+                sponsorTimes: sponsorTimes
-                hiddenSponsorTimes: hiddenSponsorTimes
             });
 
             if (popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
@@ -184,13 +180,13 @@ function messageListener(request: any, sender: any, sendResponse: (response: any
             return
         case "getCurrentTime":
             sendResponse({
-                currentTime: video.currentTime
+                currentTime: getRealCurrentTime()
             });
 
             break;
-        case "getChannelURL":
+        case "getChannelID":
             sendResponse({
-            channelURL: channelURL
+                channelID: channelID
             });
 
             break;
@@ -267,6 +263,10 @@ function resetValues() {
     sponsorTimes = null;
     sponsorLookupRetries = 0;
 
+    videoInfo = null;
+    channelWhitelisted = false;
+    channelID = null;
+
     //empty the preview bar
     if (previewBar !== null) {
         previewBar.set([], [], 0);
@@ -281,6 +281,9 @@ function resetValues() {
     } else {
         switchingVideos = true;
     }
+
+    // Reset advert playing flag
+    isAdPlaying = false;
 }
 
 async function videoIDChange(id) {
@@ -298,9 +301,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 +318,8 @@ async function videoIDChange(id) {
         }
     }
 
-    // TODO: Use a better method here than using type any
+    // Update whitelist data when the video data is loaded
-    // This is done to be able to do channelIDPromise.isFulfilled and channelIDPromise.isRejected
+    utils.wait(() => !!videoInfo, 5000, 10).then(whitelistCheck);
-    let channelIDPromise: any = utils.wait(getChannelID);
-    channelIDPromise.then(() => channelIDPromise.isFulfilled = true).catch(() => channelIDPromise.isRejected  = true);
 
     //setup the preview bar
     if (previewBar === null) {
@@ -351,7 +359,7 @@ async function videoIDChange(id) {
     //close popup
     closeInfoMenu();
 	
-    sponsorsLookup(id, channelIDPromise);
+    sponsorsLookup(id);
 
     //make sure everything is properly added
     updateVisibilityOfPlayerControlsButton().then(() => {
@@ -441,6 +449,7 @@ function createPreviewBar(): void {
  * This happens when the resolution changes or at random time to clear memory.
  */
 function durationChangeListener() {
+    updateAdFlag();
     updatePreviewBar();
 }
 
@@ -458,12 +467,24 @@ function cancelSponsorSchedule(): void {
  */
 function startSponsorSchedule(includeIntersectingSegments: boolean = false, currentTime?: number): void {
     cancelSponsorSchedule();
-    if (video.paused) return;
 
-    if (Config.config.disableSkipping || channelWhitelisted){
+    // Don't skip if advert playing and reset last checked time
+    if (isAdPlaying) {
+        // Reset lastCheckVideoTime
+        lastCheckVideoTime = -1;
+        lastCheckTime = 0;
+
         return;
     }
 
+    if (video.paused) return;
+
+    if (Config.config.disableSkipping || channelWhitelisted || (channelID === null && Config.config.forceChannelCheck)){
+        return;
+    }
+
+    if (incorrectVideoCheck()) return;
+
     if (currentTime === undefined || currentTime === null) currentTime = video.currentTime;
 
     let skipInfo = getNextSkipIndex(currentTime, includeIntersectingSegments);
@@ -473,6 +494,7 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
     let currentSkip = skipInfo.array[skipInfo.index];
     let skipTime: number[] = [currentSkip.segment[0], skipInfo.array[skipInfo.endIndex].segment[1]];
     let timeUntilSponsor = skipTime[0] - currentTime;
+    let videoID = sponsorVideoID;
 
     // Don't skip if this category should not be skipped
     if (utils.getCategorySelection(currentSkip.category).option === CategorySkipOption.ShowOverlay) return;
@@ -481,27 +503,17 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
         let forcedSkipTime: number = null;
         let forcedIncludeIntersectingSegments = false;
 
+        if (incorrectVideoCheck(videoID, currentSkip)) return;
+
         if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
-            // Double check that the videoID is correct
+            skipToTime(video, skipInfo.endIndex, skipInfo.array, skipInfo.openNotice);
-            // 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);
 
-                // TODO: Know the autoSkip settings for ALL items being skipped
+            // TODO: Know the autoSkip settings for ALL items being skipped
-                if (utils.getCategorySelection(currentSkip.category).option === CategorySkipOption.ManualSkip) {
+            if (utils.getCategorySelection(currentSkip.category).option === CategorySkipOption.ManualSkip) {
-                    forcedSkipTime = skipTime[0] + 0.001;
+                forcedSkipTime = skipTime[0] + 0.001;
-                } else {
-                    forcedSkipTime = skipTime[1];
-                    forcedIncludeIntersectingSegments = true;
-                }
             } else {
-                // Something has really gone wrong
+                forcedSkipTime = skipTime[1];
-                console.error("[SponsorBlock] The videoID recorded when trying to skip is different than what it should be.");
+                forcedIncludeIntersectingSegments = true;
-                console.error("[SponsorBlock] VideoID recorded: " + sponsorVideoID + ". Actual VideoID: " + currentVideoID);
-
-                // Video ID change occured
-                videoIDChange(currentVideoID);
             }
         }
 
@@ -515,11 +527,30 @@ function startSponsorSchedule(includeIntersectingSegments: boolean = false, curr
     }
 }
 
-function sponsorsLookup(id: string, channelIDPromise?) {
+/**
+ * This makes sure the videoID is still correct and if the sponsorTime is included
+ */
+function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boolean {
+    let currentVideoID = getYouTubeVideoID(document.URL);
+    if (currentVideoID !== (videoID || sponsorVideoID) || (sponsorTime && (!sponsorTimes || !sponsorTimes.includes(sponsorTime)) && !sponsorTimesSubmitting.includes(sponsorTime))) {
+        // 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;
     }
 
@@ -536,6 +567,9 @@ function sponsorsLookup(id: string, channelIDPromise?) {
         video.addEventListener('play', () => {
             switchingVideos = false;
 
+            // Check if an ad is playing
+            updateAdFlag();
+
              // Make sure it doesn't get double called with the playing event
              if (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000) {
                 lastCheckTime = Date.now();
@@ -543,6 +577,7 @@ function sponsorsLookup(id: string, channelIDPromise?) {
 
                 startSponsorSchedule();
             }
+
         });
         video.addEventListener('playing', () => {
             // Make sure it doesn't get double called with the play event
@@ -558,8 +593,6 @@ function sponsorsLookup(id: string, channelIDPromise?) {
             lastCheckVideoTime = -1
             lastCheckTime = 0;
 
-            lastVideoTime = video.currentTime;
-
             if (!video.paused){
                 startSponsorSchedule();
             }
@@ -570,26 +603,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
             lastCheckVideoTime = -1;
             lastCheckTime = 0;
 
-            lastVideoTime = video.currentTime;
-
             cancelSponsorSchedule();
         });
 
         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 +643,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) {
+                    if (sponsorTimes[i].segment[1] - sponsorTimes[i].segment[0] < Config.config.minDuration) {
-                        smallSegments.push(sponsorTimes[i]);
+                        sponsorTimes[i].hidden = SponsorHideType.MinimumDuration;
                     }
                 }
-
-                sponsorTimes = smallSegments;
             }
 
-            if (!switchingVideos) {
+            startSkipScheduleCheckingForStartSponsors();
-                // 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();
-                }
-            }
 
             // Reset skip save
             sponsorSkipped = [];
@@ -678,23 +670,13 @@ function sponsorsLookup(id: string, channelIDPromise?) {
             sponsorDataFound = false;
 
             //check if this video was uploaded recently
-            //use the invidious api to get the time published
+            utils.wait(() => !!videoInfo).then(() => {
-            sendRequestToCustomServer('GET', "https://www.youtube.com/get_video_info?video_id=" + id, function(xmlhttp, error) {
+                let dateUploaded = videoInfo?.microformat?.playerMicroformatRenderer?.uploadDate;
-                if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-                    let decodedData = decodeURIComponent(xmlhttp.responseText).match(/player_response=([^&]*)/)[1];
 
-                    if (decodedData === undefined) {
+                //if less than 3 days old
-                        console.error("[SB] Failed at getting video upload date info from YouTube.");
+                if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
-                        return;
+                    //TODO lower when server becomes better
-                    }
+                    setTimeout(() => sponsorsLookup(id), 180000);
-
-                    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);
-                    }
                 }
             });
 
@@ -704,13 +686,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 +784,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
  */
@@ -812,6 +794,11 @@ function updatePreviewBarPositionMobile(parent: Element) {
 }
 
 function updatePreviewBar() {
+    if(isAdPlaying) {
+        previewBar.set([], [], 0);
+        return;
+    }
+
     if (previewBar === null || video === null) return;
 
     let localSponsorTimes = sponsorTimes;
@@ -822,7 +809,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 +828,22 @@ function updatePreviewBar() {
 
 //checks if this channel is whitelisted, should be done only after the channelID has been loaded
 function whitelistCheck() {
+    channelID = videoInfo?.videoDetails?.channelId;
+    if (!channelID) {
+        channelID = null;
+
+        return;
+    }
+
     //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 +853,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 +908,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 +934,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]);
         } 
     }
@@ -993,7 +992,7 @@ function skipToTime(v: HTMLVideoElement, index: number, sponsorTimes: SponsorTim
 
             //auto-upvote this sponsor
             if (Config.config.trackViewCount && autoSkip && Config.config.autoUpvote) {
-                vote(1, currentUUID, null);
+                vote(1, currentUUID);
             }
         }
 
@@ -1143,6 +1142,24 @@ async function updateVisibilityOfPlayerControlsButton(): Promise<boolean> {
     return createdButtons;
 }
 
+/**
+ * Used for submitting. This will use the HTML displayed number when required as the video's
+ * current time is out of date while scrubbing or at the end of the video. This is not needed
+ * for sponsor skipping as the video is not playing during these times.
+ */
+function getRealCurrentTime(): number {
+    // Used to check if replay button
+    let playButtonSVGData = document.querySelector(".ytp-play-button")?.querySelector(".ytp-svg-fill")?.getAttribute("d");
+    let replaceSVGData = "M 18,11 V 7 l -5,5 5,5 v -4 c 3.3,0 6,2.7 6,6 0,3.3 -2.7,6 -6,6 -3.3,0 -6,-2.7 -6,-6 h -2 c 0,4.4 3.6,8 8,8 4.4,0 8,-3.6 8,-8 0,-4.4 -3.6,-8 -8,-8 z";
+
+    if (playButtonSVGData === replaceSVGData) {
+        // At the end of the video
+        return video.duration;
+    } else {
+        return video.currentTime;
+    }
+}
+
 function startSponsorClicked() {
     //it can't update to this info yet
     closeInfoMenu();
@@ -1152,11 +1169,11 @@ function startSponsorClicked() {
     //add to sponsorTimes
     if (sponsorTimesSubmitting.length > 0 && sponsorTimesSubmitting[sponsorTimesSubmitting.length - 1].segment.length < 2) {
         //it is an end time
-        sponsorTimesSubmitting[sponsorTimesSubmitting.length - 1].segment[1] = video.currentTime;
+        sponsorTimesSubmitting[sponsorTimesSubmitting.length - 1].segment[1] = getRealCurrentTime();
     } else {
         //it is a start time
         sponsorTimesSubmitting.push({
-            segment: [video.currentTime],
+            segment: [getRealCurrentTime()],
             UUID: null,
             // Default to sponsor
             category: "sponsor"
@@ -1332,7 +1349,7 @@ function clearSponsorTimes() {
 }
 
 //if skipNotice is null, it will not affect the UI
-function vote(type, UUID, skipNotice?: SkipNoticeComponent) {
+function vote(type: number, UUID: string, category?: string, skipNotice?: SkipNoticeComponent) {
     if (skipNotice !== null && skipNotice !== undefined) {
         //add loading info
         skipNotice.addVoteButtonInfo.bind(skipNotice)("Loading...")
@@ -1345,7 +1362,7 @@ function vote(type, UUID, skipNotice?: SkipNoticeComponent) {
     if (sponsorIndex == -1 || sponsorTimes[sponsorIndex].UUID === null) return;
 
     // See if the local time saved count and skip count should be saved
-    if (type == 0 && sponsorSkipped[sponsorIndex] || type == 1 && !sponsorSkipped[sponsorIndex]) {
+    if (type === 0 && sponsorSkipped[sponsorIndex] || type === 1 && !sponsorSkipped[sponsorIndex]) {
         let factor = 1;
         if (type == 0) {
             factor = -1;
@@ -1362,15 +1379,16 @@ function vote(type, UUID, skipNotice?: SkipNoticeComponent) {
     chrome.runtime.sendMessage({
         message: "submitVote",
         type: type,
-        UUID: UUID
+        UUID: UUID,
+        category: category
     }, function(response) {
         if (response != undefined) {
             //see if it was a success or failure
             if (skipNotice != null) {
                 if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
                     //success (treat rate limits as a success)
-                    if (type == 0) {
+                    if (type === 0 || category) {
-                        skipNotice.afterDownvote.bind(skipNotice)();
+                        skipNotice.afterDownvote.bind(skipNotice)(type, category);
                     }
                 } else if (response.successType == 0) {
                     //failure: duplicate vote
@@ -1490,6 +1508,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 +1546,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 videoInfo?.microformat?.playerMicroformatRenderer?.isUnlisted || videoInfo?.videoDetails?.isPrivate;
-
-    return privacyElement.innerText.toLocaleLowerCase() === "unlisted";
 }
 
 /**
@@ -1590,3 +1593,16 @@ function sendRequestToCustomServer(type, fullAddress, callback) {
     //submit this request
     xmlhttp.send();
 }
+
+/**
+ * Update the isAdPlaying flag and hide preview bar/controls if ad is playing
+ */
+function updateAdFlag() {
+    let wasAdPlaying = isAdPlaying;
+    isAdPlaying = document.getElementsByClassName('ad-showing').length > 0;
+
+    if(wasAdPlaying != isAdPlaying) {
+        updatePreviewBar();
+        updateVisibilityOfPlayerControlsButton();
+    }
+}

src/js-components/previewBar.ts

@@ -50,11 +50,11 @@ let barTypes = {
 		color: "#bfbf35",
 		opacity: "0.7"
 	},
-	"offtopic": {
+	"music_offtopic": {
 		color: "#ff9900",
 		opacity: "0.7"
 	},
-	"preview-offtopic": {
+	"preview-music_offtopic": {
 		color: "#a6634a",
 		opacity: "0.7"
 	}
@@ -65,6 +65,9 @@ class PreviewBar {
 	parent: any;
 	onMobileYouTube: boolean;
 
+	timestamps: number[][];
+	types: string;
+
 	constructor(parent, onMobileYouTube) {
 		this.container = document.createElement('ul');
 		this.container.id = 'previewbar';
@@ -73,6 +76,87 @@ class PreviewBar {
 		this.onMobileYouTube = onMobileYouTube;
 
 		this.updatePosition(parent);
+
+		this.setupHoverText();
+	}
+
+	setupHoverText() {
+		let seekBar = document.querySelector(".ytp-progress-bar-container");
+
+		// Create label placeholder
+		let tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper");
+		let titleTooltip = document.querySelector(".ytp-tooltip-title");
+		let categoryTooltip = document.createElement("div");
+		categoryTooltip.className = "sbHidden ytp-tooltip-title";
+		categoryTooltip.id = "sponsor-block-category-tooltip"
+
+		tooltipTextWrapper.insertBefore(categoryTooltip, titleTooltip.nextSibling);
+
+		let mouseOnSeekBar = false;
+
+		seekBar.addEventListener("mouseenter", (event) => {
+			mouseOnSeekBar = true;
+		});
+
+		seekBar.addEventListener("mouseleave", (event) => {
+			mouseOnSeekBar = false;
+			categoryTooltip.classList.add("sbHidden");
+		});
+
+		const observer = new MutationObserver((mutations, observer) => {
+			if (!mouseOnSeekBar) return;
+
+			// See if mutation observed is only this ID (if so, ignore)
+			if (mutations.length == 1 && (mutations[0].target as HTMLElement).id === "sponsor-block-category-tooltip") {
+				return;
+			}
+
+			let tooltips = document.querySelectorAll(".ytp-tooltip-text");
+			for (const tooltip of tooltips) {
+				let splitData = tooltip.textContent.split(":");
+				if (splitData.length === 2 && !isNaN(parseInt(splitData[0])) && !isNaN(parseInt(splitData[1]))) {
+					// Add label
+					let timeInSeconds = parseInt(splitData[0]) * 60 + parseInt(splitData[1]);
+
+					// Find category at that location
+					let category = null;
+					for (let i = 0; i < this.timestamps?.length; i++) {
+						if (this.timestamps[i][0] < timeInSeconds && this.timestamps[i][1] > timeInSeconds){
+							category = this.types[i];
+						} 
+					}
+
+					if (category === null && !categoryTooltip.classList.contains("sbHidden")) {
+						categoryTooltip.classList.add("sbHidden");
+						tooltipTextWrapper.classList.remove("sbTooltipTwoTitleThumbnailOffset");
+						tooltipTextWrapper.classList.remove("sbTooltipOneTitleThumbnailOffset");
+					} else if (category !== null) {
+						categoryTooltip.classList.remove("sbHidden");
+						categoryTooltip.textContent = chrome.i18n.getMessage("category_" + category) 
+							|| (chrome.i18n.getMessage("preview") + " " + chrome.i18n.getMessage("category_" + category.split("preview-")[1]));
+
+						// There is a title now
+						tooltip.classList.remove("ytp-tooltip-text-no-title");
+
+						// Add the correct offset for the number of titles there are
+						if (titleTooltip.textContent !== "") {
+							if (!tooltipTextWrapper.classList.contains("sbTooltipTwoTitleThumbnailOffset")) {
+								tooltipTextWrapper.classList.add("sbTooltipTwoTitleThumbnailOffset");
+							}
+						} else if (!tooltipTextWrapper.classList.contains("sbTooltipOneTitleThumbnailOffset")) {
+							tooltipTextWrapper.classList.add("sbTooltipOneTitleThumbnailOffset");
+						}
+					}
+
+					break;
+				}
+			}
+		});
+
+		observer.observe(tooltipTextWrapper, {
+			childList: true,
+			subtree: true
+		});
 	}
 
 	updatePosition(parent) {
@@ -109,6 +193,9 @@ class PreviewBar {
 			return;
 		}
 
+		this.timestamps = timestamps;
+		this.types = types;
+
 		// to avoid rounding error resulting in width more than 100% 
 		duration = Math.floor(duration * 100) / 100;
 		let width;

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)) {
+                if (request.sponsorTimes[i].hidden === SponsorHideType.Downvoted) {
-                    //this one is hidden
+                    //this one is downvoted
-                    extraInfo = " (hidden)";
+                    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;
+                    let whitelistedChannels = Config.config.whitelistedChannels;
-                        if (whitelistedChannels == undefined) {
+                    if (whitelistedChannels == undefined) {
-                            whitelistedChannels = [];
+                        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

src/types.ts

@@ -3,12 +3,11 @@ import SkipNoticeComponent from "./components/SkipNoticeComponent";
 
 interface ContentContainer {
     (): {
-        vote: (type: any, UUID: any, skipNotice?: SkipNoticeComponent) => void,
+        vote: (type: any, UUID: any, category?: string, skipNotice?: SkipNoticeComponent) => void,
         dontShowNoticeAgain: () => void,
         unskipSponsorTime: (UUID: any) => void,
         sponsorTimes: SponsorTime[],
         sponsorTimesSubmitting: SponsorTime[],
-        hiddenSponsorTimes: number[],
         v: HTMLVideoElement,
         sponsorVideoID,
         reskipSponsorTime: (UUID: any) => void,
@@ -17,7 +16,9 @@ interface ContentContainer {
         sponsorSubmissionNotice: SubmissionNotice,
         resetSponsorSubmissionNotice: () => void,
         changeStartSponsorButton: (showStartSponsor: any, uploadButtonVisible: any) => Promise<boolean>,
-        previewTime: (time: number) => void
+        previewTime: (time: number) => void,
+        videoInfo: any,
+        getRealCurrentTime: () => number
     }
 }
 
@@ -36,11 +37,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 +60,6 @@ export {
     CategorySelection,
     CategorySkipOption,
     SponsorTime,
-    VideoID
+    VideoID,
+    SponsorHideType
 };

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 = {}) {
+    async asyncRequestToCustomServer(type: string, url: string, data = {}) {
-        let serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
 
         // 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";
     }
 }