Remove vendor references

Show Full-Video Labels on thumbnails

.github/workflows/update-oss-attribution.yml

@@ -22,10 +22,13 @@ jobs:
           npm i -g oss-attribution-generator
           generate-attribution
           mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt
+      - name: Prettify attributions
+        run: |
+          cd ci && npx ts-node prettify.ts
 
       - name: Create pull request to update list
-        uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7
-        # v4.2.0
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+        # v4.2.3
         with:
           commit-message: Update OSS Attribution
           author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/updateInvidous.yml

@@ -18,8 +18,8 @@ jobs:
         run: npm run ci:invidious
 
       - name: Create pull request to update list
-        uses: peter-evans/create-pull-request@b4d51739f96fca8047ad065eccef63442d8e99f7
-        # v4.2.0
+        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+        # v4.2.3
         with:
           commit-message: Update Invidious List
           author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

ci/invidiousCI.ts

@@ -16,10 +16,10 @@ if (!existsSync(join(__dirname, "data.json"))) {
 import * as data from "../ci/data.json";
 
 type instanceMap = {
-  name: string,
-  url: string,
-  dailyRatios: {ratio: string, label: string }[],
-  thirtyDayUptime: string
+  name: string;
+  url: string;
+  dailyRatios: {ratio: string; label: string }[];
+  thirtyDayUptime: string;
 }[]
 
 // only https servers

ci/invidiouslist.json

@@ -1 +1 @@
-["inv.bp.projectsegfau.lt","inv.odyssey346.dev","inv.riverside.rocks","inv.vern.cc","invidio.xamh.de","invidious.baczek.me","invidious.dhusch.de","invidious.drivet.xyz","invidious.esmailelbob.xyz","invidious.flokinet.to","invidious.namazso.eu","invidious.nerdvpn.de","invidious.privacydev.net","invidious.silur.me","invidious.slipfox.xyz","invidious.snopyta.org","invidious.tiekoetter.com","invidious.weblibre.org","vid.puffyan.us","y.com.sb","yewtu.be","yt.artemislena.eu","yt.funami.tech"]
+["inv.bp.projectsegfau.lt","inv.odyssey346.dev","inv.riverside.rocks","inv.vern.cc","invidious.baczek.me","invidious.epicsite.xyz","invidious.esmailelbob.xyz","invidious.flokinet.to","invidious.lidarshield.cloud","invidious.nerdvpn.de","invidious.privacydev.net","invidious.snopyta.org","invidious.tiekoetter.com","invidious.weblibre.org","iv.melmac.space","vid.puffyan.us","watch.thekitty.zone","y.com.sb","yewtu.be","yt.artemislena.eu","yt.funami.tech","yt.oelrichsgarcia.de"]

ci/prettify.ts

@@ -0,0 +1,6 @@
+import { writeFile } from 'fs';
+
+import * as license from "../oss-attribution/licenseInfos.json";
+
+const result = JSON.stringify(license, null, 2);
+writeFile("../oss-attribution/licenseInfos.json", result, err => { if (err) return console.log(err) } );

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.1.13",
+    "version": "5.4.0",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",
@@ -13,7 +13,6 @@
         ],
         "all_frames": true,
         "js": [
-            "./js/vendor.js",
             "./js/content.js"
         ],
         "css": [
@@ -84,7 +83,8 @@
         "https://sponsor.ajay.app/*"
     ],
     "optional_permissions": [
-        "*://*/*"
+        "*://*/*",
+        "webNavigation"
     ],
     "browser_action": {
         "default_title": "SponsorBlock",
@@ -120,7 +120,6 @@
     }, 
     "background": {
         "scripts":[
-        "./js/vendor.js",
         "./js/background.js"
         ]
     },

package.json

@@ -4,38 +4,38 @@
   "description": "",
   "main": "background.js",
   "dependencies": {
+    "@ajayyy/maze-utils": "1.1.10",
+    "content-scripts-register-polyfill": "^4.0.2",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "@ajayyy/maze-utils": "^1.0.3"
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@types/chrome": "^0.0.199",
-    "@types/firefox-webext-browser": "^94.0.1",
-    "@types/jest": "^29.2.0",
-    "@types/react": "^18.0.21",
-    "@types/react-dom": "^18.0.6",
-    "@types/selenium-webdriver": "^4.1.6",
+    "@types/chrome": "^0.0.220",
+    "@types/firefox-webext-browser": "^111.0.0",
+    "@types/jest": "^29.4.0",
+    "@types/react": "^18.0.28",
+    "@types/react-dom": "^18.0.11",
+    "@types/selenium-webdriver": "^4.1.13",
     "@types/wicg-mediasession": "^1.1.4",
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
-    "chromedriver": "^106.0.1",
-    "concurrently": "^7.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
+    "chromedriver": "^110.0.0",
+    "concurrently": "^7.6.0",
     "copy-webpack-plugin": "^11.0.0",
-    "eslint": "^8.25.0",
-    "eslint-plugin-react": "^7.31.10",
-    "fork-ts-checker-webpack-plugin": "^7.2.13",
-    "jest": "^29.2.1",
-    "jest-environment-jsdom": "^29.2.1",
-    "rimraf": "^3.0.2",
+    "eslint": "^8.35.0",
+    "eslint-plugin-react": "^7.32.2",
+    "fork-ts-checker-webpack-plugin": "^7.3.0",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
+    "rimraf": "^4.3.1",
     "schema-utils": "^4.0.0",
-    "selenium-webdriver": "^4.5.0",
-    "speed-measure-webpack-plugin": "^1.5.0",
-    "ts-jest": "^29.0.3",
-    "ts-loader": "^9.4.1",
+    "selenium-webdriver": "^4.8.1",
+    "ts-jest": "^29.0.5",
+    "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.8",
-    "web-ext": "^7.3.1",
-    "webpack": "^5.74.0",
+    "typescript": "4.9",
+    "web-ext": "^7.5.0",
+    "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
   },

public/_locales/ar/messages.json

@@ -25,6 +25,9 @@
     "Segments": {
         "message": "أجزاء"
     },
+    "SegmentsCap": {
+        "message": "أجزاء من المقطع"
+    },
     "Chapters": {
         "message": "الفصول"
     },
@@ -115,8 +118,11 @@
     "closePopup": {
         "message": "إغلاق النافذة المنبثقة"
     },
-    "SubmitTimes": {
-        "message": "إرسال الأجزاء"
+    "closeIcon": {
+        "message": "أيقونة الإغلاق"
+    },
+    "sortSegments": {
+        "message": "ترتيب الأجزاء"
     },
     "submitCheck": {
         "message": "هل أنت متأكد أنك تريد إرسال هذا؟"
@@ -152,9 +158,6 @@
     "clearTimesButton": {
         "message": "مسح الأوقات"
     },
-    "submitTimesButton": {
-        "message": "إرسال الأوقات"
-    },
     "publicStats": {
         "message": "يستخدم هذا في صفحة الإحصائيات العامة لإظهار مقدار مساهمتك. قم برؤيتها"
     },
@@ -321,12 +324,24 @@
     "add": {
         "message": "أضِف"
     },
+    "showUploadButton": {
+        "message": "إظهار زر الرفع"
+    },
     "save": {
         "message": "حفظ"
     },
     "reset": {
         "message": "إعادة تعيين"
     },
+    "areYouSureReset": {
+        "message": "هل أنت متيقِّن من رغبتك في إعادة تعيين هذا؟"
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com مدعوم الآن"
+    },
+    "exportOptions": {
+        "message": "إستيراد/تصدير جميع الإعدادات"
+    },
     "exportOptionsCopy": {
         "message": "تعديل/نسخ"
     },
@@ -394,6 +409,9 @@
     "category_preview": {
         "message": "معاينة/خلاصة"
     },
+    "category_preview_guideline2": {
+        "message": "موجز الفيديو السابق"
+    },
     "category_filler_short": {
         "message": "حشو"
     },
@@ -406,6 +424,15 @@
     "category_poi_highlight": {
         "message": "ابراز"
     },
+    "category_poi_highlight_guideline3": {
+        "message": "يمكن التخطي إلى عنوان المقطع أو الصورة المصغرة"
+    },
+    "category_chapter": {
+        "message": "فصل"
+    },
+    "category_chapter_guideline1": {
+        "message": "لا تذكر أسماء العلامة التجارية الراعية"
+    },
     "category_livestream_messages_short": {
         "message": "قراءة الرسالة"
     },
@@ -462,6 +489,10 @@
     "bracketEnd": {
         "message": "(النهاية)"
     },
+    "End": {
+        "message": "النهاية",
+        "description": "Button that skips to the end of a segment"
+    },
     "hiddenDueToDownvote": {
         "message": "مخفي: تصويت سلبي"
     },
@@ -471,15 +502,31 @@
     "manuallyHidden": {
         "message": "مخفي يدوياً"
     },
+    "acceptPermission": {
+        "message": "قَبُول الإذن"
+    },
     "permissionRequestSuccess": {
         "message": "نجح طلب الإذن!"
     },
     "permissionRequestFailed": {
         "message": "فشل طلب الإذن ، هل نقرت على رفض؟"
     },
+    "adblockerIssueWhitelist": {
+        "message": "إذا كنت غير قادر على حل هذا، عطل إعداد \"فرض قناة التحقق قبل التخطي\"، لأن SponsorBlock غير قادر على استرداد معلومات القناة لهذا المقطع"
+    },
+    "forceChannelCheck": {
+        "message": "إجبار القناة على التحقق قبل التخطي"
+    },
     "downvoteDescription": {
         "message": "خاطئ/التوقيت غير صحيح"
     },
+    "incorrectVote": {
+        "message": "غير صحيح"
+    },
+    "harmfulVote": {
+        "message": "ضار",
+        "description": "Used for chapter segments when the text is harmful/offensive to remove it faster"
+    },
     "incorrectCategory": {
         "message": "تغيير الفئة"
     },
@@ -533,6 +580,9 @@
     "helpPageReviewOptions": {
         "message": "يرجى مراجعة الخيارات أدناه"
     },
+    "helpPageFeatureDisclaimer": {
+        "message": "العديد من الميزات معطلة بشكل تلقائي. إذا كنت ترغب في تخطي المقدمة و الخاتمة و استخدام الدعوات و إلخ. يمكنك تمكين هذه الميزات بالأسفل. يمكنك أيضًا إخفاء و إظهار عناصر واجهة المستخدم."
+    },
     "helpPageHowSkippingWorks": {
         "message": "كيف يعمل التخطي"
     },
@@ -557,6 +607,9 @@
     "helpPageSourceCode": {
         "message": "أين يمكنني الحصول على شفرة المصدر؟"
     },
+    "Credits": {
+        "message": "المساهمون في العمل"
+    },
     "LearnMore": {
         "message": "معرفة المزيد"
     },
@@ -581,6 +634,9 @@
     "hideSegment": {
         "message": "إخفاء المقطع"
     },
+    "playChapter": {
+        "message": "شغل الفصل"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "استخدم عجلة الماوس أثناء التمرير فوق مربع التعديل لضبط الوقت بسرعة. يمكن استخدام مجموعات مفتاح ctrl أو Shift لضبط التغييرات."
     },
@@ -640,5 +696,55 @@
     },
     "confirmResetToDefault": {
         "message": "هل أنت متأكد من أنك تريد إعادة تعيين كافة الإعدادات إلى حالتها الافتراضية؟ لا يمكنك التراجع عن ذلك."
+    },
+    "Import": {
+        "message": "استورد",
+        "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
+    },
+    "chooseACountry": {
+        "message": "اختر البلد"
+    },
+    "noDiscount": {
+        "message": "أنت لست مؤهلاً للحصول على خصم"
+    },
+    "discountLink": {
+        "message": "رابط الخصم (انظر إلى السعر الوردي)"
+    },
+    "selectYourCountry": {
+        "message": "اختر بلدك"
+    },
+    "alreadyDonated": {
+        "message": "إذا تبرعت بأي مبلغ قبل الآن، يمكنك الحصول على إمكانية الوصول عبر التواصل مع البريد الإلكتروني:",
+        "description": "After the colon is an email address"
+    },
+    "patreonSignIn": {
+        "message": "سجل مع بيتريون (Patreon)"
+    },
+    "unsubmittedSegmentCounts": {
+        "message": "لديك حاليا {0} على {1}",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
+    },
+    "videosSingular": {
+        "message": "مقطع",
+        "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"
+    },
+    "videosPlural": {
+        "message": "مقاطع",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
+    },
+    "showUnsubmittedSegments": {
+        "message": "أظهر الأجزاء",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "videoID": {
+        "message": "معرف المقطع",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "actions": {
+        "message": "قائمة الأوامر",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "exportSegmentsAsURL": {
+        "message": "شارك كرابط"
     }
 }

public/_locales/bg/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Икона - затваряне"
     },
-    "SubmitTimes": {
-        "message": "Изпращане на сегментите"
+    "OpenSubmissionMenu": {
+        "message": "Отваряне на менюто за изпращане"
     },
     "sortSegments": {
         "message": "Сортиране на сегментите"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Изчистване на времената"
     },
-    "submitTimesButton": {
-        "message": "Изпращане на времената"
-    },
     "publicStats": {
         "message": "Това се използва на страницата с публичната статистика, за да покаже колко сте допринесли. Вижте го"
     },
@@ -442,7 +439,7 @@
         "message": "Поддръжка на YouTube-сайтове на трети страни"
     },
     "supportOtherSitesDescription": {
-        "message": "Поддръжка на клиенти за YouTube на трети страни. За да активирате поддръжката, трябва да приемете допълнителните разрешения. Това НЕ работи в режим инкогнито в Chrome и други варианти на Chromium.",
+        "message": "Поддръжка на клиенти на трети страни за YouTube. За да активирате поддръжката, трябва да приемете допълнителните разрешения.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/bn/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "বন্ধ করার চিহ্ন"
     },
-    "SubmitTimes": {
-        "message": "সেগমেন্ট জমা দিন"
+    "OpenSubmissionMenu": {
+        "message": "সাবমিশন মেন্যু খুলুন"
     },
     "sortSegments": {
         "message": "সংক্ষিপ্ত অংশ"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "সময় মুছুন"
     },
-    "submitTimesButton": {
-        "message": "সময় জমা দিন"
-    },
     "publicStats": {
         "message": "আপনি কতটা অবদান রেখেছেন তা দেখানোর জন্য এটি সর্বজনীন পরিসংখ্যান পৃষ্ঠায় ব্যবহার করা হয়। এটা দেখ"
     },
@@ -442,7 +439,7 @@
         "message": "এটি ৩য় পক্ষের ইউটইউব সাইট সাপোর্ট করে"
     },
     "supportOtherSitesDescription": {
-        "message": "তৃতীয় পক্ষের ইউটিউব ক্লায়েন্টদের সমর্থন করুন। সমর্থন সক্ষম করতে, আপনাকে অবশ্যই অতিরিক্ত অনুমতিগুলি গ্রহণ করতে হবে। এটি ক্রোম এবং অন্যান্য ক্রোমিয়াম ভেরিয়েন্টগুলিতে ছদ্মবেশে কাজ করে না।",
+        "message": "তৃতীয় পক্ষ YouTube ক্লায়েন্ট সমর্থন করে। এটি চালু করার জন্য আপনাকে কিছু অতিরিক্ত পারমিশনে সম্মতি দিতে হবে।",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -1026,9 +1023,18 @@
         "message": "আমদানী",
         "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
     },
+    "redeemFailed": {
+        "message": "লাইসেন্স কী অবৈধ"
+    },
     "chooseACountry": {
         "message": "দেশ নির্বাচন করুন"
     },
+    "discountLink": {
+        "message": "মূল্যছাড় লিঙ্ক (পিংক মূল্য দেখুন)"
+    },
+    "selectYourCountry": {
+        "message": "আপনার দেশ নির্বাচন করুন"
+    },
     "videosSingular": {
         "message": "ভিডিও",
         "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"

public/_locales/ca/messages.json

@@ -112,9 +112,6 @@
     "closePopup": {
         "message": "Tanca la finestra"
     },
-    "SubmitTimes": {
-        "message": "Envia els segments"
-    },
     "submitCheck": {
         "message": "Segur que voleu enviar això?"
     },
@@ -149,9 +146,6 @@
     "clearTimesButton": {
         "message": "Esborra temps"
     },
-    "submitTimesButton": {
-        "message": "Envia temps"
-    },
     "publicStats": {
         "message": "Això s'utilitza a la pàgina d'estadístiques pública per fatxendejar de quant heu contribuït. Vegeu"
     },

public/_locales/cs/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Ikona pro zavření"
     },
-    "SubmitTimes": {
-        "message": "Odeslat segmenty"
+    "OpenSubmissionMenu": {
+        "message": "Otevřít nabídku příspěvků"
     },
     "sortSegments": {
         "message": "Seřadit segmenty"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Vymazat časy"
     },
-    "submitTimesButton": {
-        "message": "Odeslat časy"
-    },
     "publicStats": {
         "message": "Toto se používá ve veřejném žebříčku k ukázání jak moc jste přispěli. Podívejte se na něj"
     },
@@ -442,7 +439,7 @@
         "message": "Podpora pro weby YouTube třetích stran"
     },
     "supportOtherSitesDescription": {
-        "message": "Podpora pro YouTube klienty třetích stran. Chcete-li povolit podporu, musíte přijmout další oprávnění. Toto NEFUNGUJE v anonymním režimu v Chromu a dalších Chromium prohlížečích.",
+        "message": "Podporovat klienty YouTube třetích stran. Pro povolení podpory musíte přijmout dodatečná oprávnění.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/da/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Luk ikon"
     },
-    "SubmitTimes": {
-        "message": "Indsend Segmenter"
-    },
     "sortSegments": {
         "message": "Sortér Segmenter"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Ryd Tider"
     },
-    "submitTimesButton": {
-        "message": "Indsend Tider"
-    },
     "publicStats": {
         "message": "Dette bruges på siden med offentlige statistikker til at vise, hvor meget du har bidraget. Se det"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Understøtter tredjeparts YouTube sider"
     },
-    "supportOtherSitesDescription": {
-        "message": "Understøt tredjeparts YouTube klienter. For at aktivere understøttelse, skal du acceptere de ekstra tilladelser. Dette virker IKKE i inkognito på Chrome og andre Chromium varianter.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Understøttede Sider: "
     },

public/_locales/de/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Symbol schließen"
     },
-    "SubmitTimes": {
-        "message": "Senden"
+    "OpenSubmissionMenu": {
+        "message": "Einreichungsmenü öffnen"
     },
     "sortSegments": {
         "message": "Segmente sortieren"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Zeiten löschen"
     },
-    "submitTimesButton": {
-        "message": "Zeiten übermitteln"
-    },
     "publicStats": {
         "message": "So wirst du in der öffentlichen Rangliste angezeigt. Siehe"
     },
@@ -372,7 +369,7 @@
         "description": "Example: Sponsor Skipped"
     },
     "muted": {
-        "message": "{0} stummgeschalten",
+        "message": "{0} stummgeschaltet",
         "description": "Example: Sponsor Muted"
     },
     "skipped_to_category": {
@@ -442,7 +439,7 @@
         "message": "Unterstütze Drittanbieter YouTube-Seiten"
     },
     "supportOtherSitesDescription": {
-        "message": "Unterstütze Drittanbieter YouTube Clients. Zum unterstützen müssen zusätzlichliche Berechtigungen akzeptiert werden. Dies funktioniert NICHT im Incognitomodus auf Chrome oder anderen Chromium Varianten.",
+        "message": "Unterstütze YouTube-Clients von Drittanbietern. Um die Unterstützung zu aktivieren, müssen Sie die zusätzlichen Berechtigungen akzeptieren.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/el/messages.json

@@ -122,9 +122,6 @@
     "closePopup": {
         "message": "Κλείσιμο αναδυόμενου παραθύρου"
     },
-    "SubmitTimes": {
-        "message": "Υποβολή Τμημάτων"
-    },
     "sortSegments": {
         "message": "Ταξινόμηση Τμημάτων"
     },
@@ -162,9 +159,6 @@
     "clearTimesButton": {
         "message": "Σβήσιμο τμημάτων"
     },
-    "submitTimesButton": {
-        "message": "Υποβολή τμημάτων"
-    },
     "publicStats": {
         "message": "Χρησιμοποιείται στη δημόσια σελίδα στατιστικών για να αναδειχθεί πόσο έχετε συμβάλει. Δείτε το"
     },
@@ -409,10 +403,6 @@
     "supportOtherSites": {
         "message": "Υποστήριξη 3των ιστοσελίδων τύπου YouTube"
     },
-    "supportOtherSitesDescription": {
-        "message": "Υποστήριξη 3των πελατών διακομιστή YouTube. Για να ενεργοποιήσετε την υποστήριξη πρέπει να αποδεχτείτε επιπλέον άδειες. Αυτό ΔΕ λειτουργεί σε καρτέλες ανώνυμης περιήγησης του Chrome ή άλλων Chromium εκδοχών.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Υποστηριζόμενες Ιστοσελίδες: "
     },

public/_locales/en/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Close Icon"
     },
-    "SubmitTimes": {
-        "message": "Submit Segments"
+    "OpenSubmissionMenu": {
+        "message": "Open Submission Menu"
     },
     "sortSegments": {
         "message": "Sort Segments"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Clear Times"
     },
-    "submitTimesButton": {
-        "message": "Submit Times"
-    },
     "publicStats": {
         "message": "This is used on the public stats page to show off how much you've contributed. See it"
     },
@@ -442,7 +439,7 @@
         "message": "Support 3rd Party YouTube-Sites"
     },
     "supportOtherSitesDescription": {
-        "message": "Support third party YouTube clients. To enable support, you must accept the extra permissions. This does NOT work in incognito on Chrome and other Chromium variants.",
+        "message": "Support third party YouTube clients. To enable support, you must accept the extra permissions.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -800,6 +797,10 @@
         "message": "Show an icon when a video is entirely an advertisement",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Show labels on video thumbnails as well",
+        "description": "Referring to the category pill that is shown on videos that are entirely sponsor or entirely selfpromo on recommended videos, in searches or on the homepage."
+    },
     "previewColor": {
         "message": "Unsubmitted Color",
         "description": "Referring to submissions that have not been sent to the server yet."

public/_locales/es/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Icono de cerrar"
     },
-    "SubmitTimes": {
-        "message": "Enviar Segmentos"
-    },
     "sortSegments": {
         "message": "Ordenar Segmentos"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Eliminar Tiempos"
     },
-    "submitTimesButton": {
-        "message": "Enviar Tiempos"
-    },
     "publicStats": {
         "message": "Esto se utiliza en la página de estadísticas públicas para mostrar cuánto has contribuido. Véala"
     },
@@ -424,16 +418,16 @@
         "message": "Comprueba status.sponsor.ajay.app para ver el estado del servidor."
     },
     "changeUserID": {
-        "message": "Importar/Exportar su ID de usuario Privado"
+        "message": "Importar/Exportar su ID de usuario privado"
     },
     "whatChangeUserID": {
         "message": "Esto se debería mantener privado. Esto es como una contraseña y no debe ser compartido con nadie. Si alguien tiene esto, puede suplantarte. Si estás buscando tu ID de usuario Público, haz clic en el icono de portapapeles en la ventana emergente."
     },
     "setUserID": {
-        "message": "Establecer ID de usuario Privado"
+        "message": "Establecer ID de usuario privado"
     },
     "userIDChangeWarning": {
-        "message": "Advertencia: El cambio del ID de usuario Privado es permanente. ¿Está seguro/a de que desea hacer esto? Asegúrese de respaldar el antiguo por si acaso."
+        "message": "Advertencia: El cambio del ID de usuario privado es permanente. ¿Está seguro/a de que desea hacer esto? Asegúrese de respaldar el antiguo por si acaso."
     },
     "createdBy": {
         "message": "Creado Por"
@@ -442,7 +436,7 @@
         "message": "Soportar sitios de YouTube de terceros"
     },
     "supportOtherSitesDescription": {
-        "message": "Soportar clientes de YouTube de terceros. Para habilitar el soporte, debes aceptar los permisos extra. Esto NO funciona en incógnito en Chrome y otras variantes de Chromium.",
+        "message": "Admite clientes de YouTube de terceros. Para activar la compatibilidad, debes aceptar los permisos adicionales.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -595,7 +589,7 @@
         "message": "Incluye transiciones entre segmentos"
     },
     "generic_guideline2": {
-        "message": "Se reproduce como si no se hubiera omitido nada"
+        "message": "Reproduce como si nada se omitiera"
     },
     "category_sponsor": {
         "message": "Sponsor"
@@ -607,7 +601,7 @@
         "message": "Promociones pagadas"
     },
     "category_sponsor_guideline2": {
-        "message": "No para donaciones o mercancía personalizada"
+        "message": "No para donaciones o merchandising"
     },
     "category_selfpromo": {
         "message": "Promoción Propia/No Remunerada"
@@ -616,13 +610,13 @@
         "message": "Similar a \"sponsor\", excepto que para la promoción propia o no remunerada. Esto incluye secciones sobre mercancía, donaciones o información sobre con quiénes colaboraron."
     },
     "category_selfpromo_guideline1": {
-        "message": "Donaciones, membresías y mercancía personalizada"
+        "message": "Donaciones, afiliaciones y merchandising"
     },
     "category_selfpromo_guideline2": {
-        "message": "Agradecimientos gratuitos que no contribuyen al video"
+        "message": "Comentarios inútiles que no aportan nada al vídeo"
     },
     "category_selfpromo_guideline3": {
-        "message": "No para productos ni mercancía diseñados por empresas"
+        "message": "No para productos y merchandising de empresas"
     },
     "category_exclusive_access": {
         "message": "Acceso Exclusivo"
@@ -644,13 +638,13 @@
         "message": "Cuando hay un breve recordatorio para dar me gusta, suscribirse o seguirlos en medio del contenido. Si es largo o sobre algo específico, debería estar bajo promoción propia en su lugar."
     },
     "category_interaction_guideline1": {
-        "message": "Breve recordatorio para dar me gusta, suscribirse o seguir"
+        "message": "Recordatorios breves para darle a me gusta, suscribirse o seguir"
     },
     "category_interaction_guideline2": {
         "message": "Incluye recordatorios indirectos para comentar"
     },
     "category_interaction_guideline3": {
-        "message": "No para promoción general, solo llamadas a la acción"
+        "message": "No para promoción general, solo peticiones de actuación"
     },
     "category_interaction_short": {
         "message": "Recordatorio de Interacción"
@@ -677,19 +671,19 @@
         "message": "Créditos o cuando aparecen las tarjetas finales de YouTube. No para conclusiones con información."
     },
     "category_outro_guideline1": {
-        "message": "No incluyas contenido, aun si las tarjetas finales están en pantalla"
+        "message": "No incluyas contenido, aunque se estén mostrando las tarjetas finales"
     },
     "category_preview": {
         "message": "Vista previa/Recapitulación"
     },
     "category_preview_description": {
-        "message": "Colección de clips que muestran lo que vendrá en este video u otros videos en una serie en la cual toda la información es repetida en el video."
+        "message": "Colección de vídeos que muestran lo que se verá en este vídeo o en otros vídeos de una serie en la que toda esta información se repite más adelante en el vídeo."
     },
     "category_preview_guideline1": {
-        "message": "Clips que aparecen más tarde o en un video futuro"
+        "message": "Vídeos que aparecen más tarde, o en un vídeo futuro"
     },
     "category_preview_guideline2": {
-        "message": "Recapitulación de un video anterior"
+        "message": "Recopilación de un vídeo anterior"
     },
     "category_preview_guideline3": {
         "message": "No para secciones que añaden contenido adicional"
@@ -698,7 +692,7 @@
         "message": "Tangentes de Relleno/Chistes"
     },
     "category_filler_description": {
-        "message": "Escenas tangenciales añadidas solo de relleno o humor que no son necesarias para entender el contenido principal del video. Esto no debe incluir segmentos que proporcionen contexto o detalles de fondo. Esta es una categoría muy agresiva para cuando no está de humor para la \"diversión\"."
+        "message": "Escenas tangenciales añadidas solo como relleno o humor que no son necesarias para entender el contenido principal del vídeo. Esto no debería incluir segmentos que proporcionen contexto o detalles de fondo. Es una categoría muy agresiva pensada para cuando no se está de humor para «divertirse»."
     },
     "category_filler_short": {
         "message": "Relleno"
@@ -707,7 +701,7 @@
         "message": "Escenas tangenciales solo de relleno o humor"
     },
     "category_filler_guideline2": {
-        "message": "Distracciones, bloopers, repeticiones"
+        "message": "Distracciones, meteduras de pata, repeticiones"
     },
     "category_filler_guideline3": {
         "message": "No para escenas requeridas para entender el tema"
@@ -725,7 +719,7 @@
         "message": "Secciones que no están en versiones oficiales"
     },
     "category_music_offtopic_guideline2": {
-        "message": "Secciones sin música en un espectáculo en vivo"
+        "message": "Sin música en un espectáculo en directo"
     },
     "category_poi_highlight": {
         "message": "Destacado"
@@ -734,7 +728,7 @@
         "message": "La parte del video que la mayoría de gente está buscando. Similar a los comentarios que dicen \"El video comienza en x\"."
     },
     "category_poi_highlight_guideline1": {
-        "message": "La sección que la mayoría de personas están buscando"
+        "message": "Sección que busca la mayoría"
     },
     "category_poi_highlight_guideline2": {
         "message": "Puede omitir contexto"
@@ -1170,7 +1164,7 @@
         "message": "Canjear"
     },
     "joinOnPatreon": {
-        "message": "Danos tu apoyo en Patreon"
+        "message": "Suscríbete en Patreon"
     },
     "oneTimePurchase": {
         "message": "Compra única"
@@ -1179,18 +1173,18 @@
         "message": "Ingresar clave de licencia"
     },
     "chaptersPage1": {
-        "message": "La característica de los capítulos de origen de SponsorBlock sólo está disponible para personas que compran una licencia, o para las personas a las que se les concede acceso gratis debido a sus contribuciones anteriores"
+        "message": "La función de capítulos colaborativos de SponsorBlock solo está disponible para las personas que adquieran una licencia o para aquellas a las que se les conceda acceso gratuito debido a sus contribuciones anteriores"
     },
     "chaptersPage2": {
-        "message": "Nota: El permiso para enviar capítulos todavía está basado en la reputación calculada. Comprar una licencia solo le permite ver los capítulos enviados por otros",
+        "message": "Nota: el permiso para enviar capítulos sigue basándose en la reputación calculada. La compra de una licencia solo te permite ver los capítulos enviados por otros usuarios",
         "description": "On the chapters page for getting access to the paid chapters feature"
     },
     "chapterNewFeature": {
-        "message": "Nueva Función: Capítulos personalizados marcados por la comunidad. Estos son secciones con nombres personalizados en los videos que pueden ser acumulados para ser cada vez más precisos. Compre una licencia para ver los capítulos enviados en este video, como: ",
+        "message": "Nueva función: capítulos personalizados creados por la comunidad. Se trata de secciones con nombres personalizados que se pueden superponer en los vídeos para obtener una mayor precisión. Adquiere una licencia para ver los capítulos presentados en este vídeo como: ",
         "description": "After the comma, a list of chapters for this video will appear"
     },
     "chapterNewFeature2": {
-        "message": "Nueva Función: Capítulos personalizados marcados por la comunidad. Estos son secciones con nombres personalizados en los videos que pueden ser acumulados para ser cada vez más precisos. Tiene acceso gratuito, habilítelo en opciones."
+        "message": "Nueva función: capítulos personalizados creados por la comunidad. Se trata de secciones con nombres personalizados que se pueden superponer en los vídeos para obtener una mayor precisión. Tienes acceso de forma gratuita, se activa en las opciones."
     },
     "unsubmittedSegmentCounts": {
         "message": "Actualmente tienes {0} en {1}",

public/_locales/et/messages.json

@@ -36,7 +36,7 @@
         "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
     },
     "showSegmentNameInChapterBar": {
-        "message": "Kuva Praegune Segment Video Kestvuse Kõrval"
+        "message": "Kuva praegune segment video aja kõrval"
     },
     "upvoteButtonInfo": {
         "message": "Anna segmendile poolthääl"
@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Sulgemisikoon"
     },
-    "SubmitTimes": {
-        "message": "Esita segmendid"
-    },
     "sortSegments": {
         "message": "Sorteeri segmendid"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Tühjenda ajad"
     },
-    "submitTimesButton": {
-        "message": "Saada ajad"
-    },
     "publicStats": {
         "message": "Seda kasutatakse avaliku statistika lehel, et näidata välja, kui palju oled panustanud. Vaata seda"
     },
@@ -424,16 +418,16 @@
         "message": "Serveri oleku saamiseks vaata status.sponsor.ajay.app"
     },
     "changeUserID": {
-        "message": "Impordi/ekspordi oma isiklik UserID"
+        "message": "Impordi/ekspordi oma privaatne UserID"
     },
     "whatChangeUserID": {
         "message": "Seda tuleks privaatsena hoida. See on nagu parool ning seda ei tohiks kellegagi jagada. Kui kellelgi see on, saavad nad sinuna esineda.\nKui otsid avalikku UserID'd, klõpsa hüpikus olevat lõikelaua ikooni."
     },
     "setUserID": {
-        "message": "Muutke oma isiklik UserID"
+        "message": "Määra privaatne UserID"
     },
     "userIDChangeWarning": {
-        "message": "Tähelepanu: Isikliku UserID muutmine on lõplik. Kas soovid kindlasti seda teha? Igaks juhuks soovitame eelmise UserID varundada."
+        "message": "Tähelepanu: privaatse UserID muutmine on lõplik. Kas soovid kindlasti seda teha? Igaks juhuks soovitame eelmise UserID varundada."
     },
     "createdBy": {
         "message": "Autor"
@@ -442,7 +436,7 @@
         "message": "Toeta 3. osapoole YouTube-saite"
     },
     "supportOtherSitesDescription": {
-        "message": "Kolmanda osapoole YouTube'i klientide tugi. Selle toe lubamiseks pead nõustuma lisalubadega. See EI tööta inkognito-režiimis nii Chromes kui ka teistes Chromiumi brauserites.",
+        "message": "Kolmanda osapoole YouTube'i klientide tugi. Selle toe lubamiseks pead nõustuma lisalubadega.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -533,7 +527,7 @@
         "message": "Laadi failist"
     },
     "whatExportOptions": {
-        "message": "See on teie seadistusinformatsioon JSON-formaadis. See sisaldab teie isiklikku UserID-d, seega olge tähelepanelik, kellega seda jagate."
+        "message": "See on sinu terve seadistus JSON-formaadis. See sisaldab sinu privaatset UserID-d, seega ole tähelepanelik, kellega seda jagad."
     },
     "setOptions": {
         "message": "Määra valikud"

public/_locales/fa/messages.json

@@ -109,9 +109,6 @@
     "closePopup": {
         "message": "بستن پنجره"
     },
-    "SubmitTimes": {
-        "message": "ثبت بخش‌ها"
-    },
     "submitCheck": {
         "message": "مطمئن هستید که میخواهید این را ثبت کنید؟"
     },
@@ -139,9 +136,6 @@
     "clearTimesButton": {
         "message": "حذف دفعات"
     },
-    "submitTimesButton": {
-        "message": "ثبت دفعات"
-    },
     "Username": {
         "message": "نام‌کاربری"
     },

public/_locales/fi/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Sulkukuvake"
     },
-    "SubmitTimes": {
-        "message": "Lähetä osiot"
+    "OpenSubmissionMenu": {
+        "message": "Avaa Lähetykset-valikko"
     },
     "sortSegments": {
         "message": "Järjestä osiot"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Tyhjennä ajat"
     },
-    "submitTimesButton": {
-        "message": "Lähetä ajat"
-    },
     "publicStats": {
         "message": "Tätä käytetään julkisella tilastosivulla näyttääksesi kuinka paljon olet osallistunut. Näytä"
     },
@@ -442,7 +439,7 @@
         "message": "Tue kolmansien osapuolien YouTube-sivustoja"
     },
     "supportOtherSitesDescription": {
-        "message": "Tue kolmannen osapuolen YouTube-asiakasohjelmia. Jotta voit ottaa käyttöön tuen, sinun täytyy hyväksyä lisäkäyttöoikeudet. Tämä EI toimi incognitossa Chromessa ja muissa Chromium varianteissa.",
+        "message": "Tue kolmannen osapuolen YouTube-sovelluksia. Ottaaksesi tuen käyttöön, sinun on hyväksyttävä tarvittavat käyttöoikeudet.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/fil/messages.json

@@ -106,9 +106,6 @@
     "closePopup": {
         "message": "Isara ang Popup"
     },
-    "SubmitTimes": {
-        "message": "I-submit ang mga segments"
-    },
     "submitCheck": {
         "message": "Sigurado ka bang gusto mong isumite ito?"
     },

public/_locales/fr/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Icône \"Fermer\""
     },
-    "SubmitTimes": {
-        "message": "Soumettre des segments"
+    "OpenSubmissionMenu": {
+        "message": "Ouvrir le menu Contribution"
     },
     "sortSegments": {
         "message": "Trier les segments"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Supprimer les temps"
     },
-    "submitTimesButton": {
-        "message": "Soumettre les temps"
-    },
     "publicStats": {
         "message": "Votre pseudo est inscrit dans le classement public pour afficher vos contributions. Le consulter"
     },
@@ -235,7 +232,7 @@
         "message": "Activer le suivi du nombre de sauts dans les onglets privés/incognito"
     },
     "enableTrackDownvotes": {
-        "message": "Enregistrer les segments contre lesquels vous avez voté"
+        "message": "Enregistrer les segments votés négativement"
     },
     "whatTrackDownvotes": {
         "message": "Tous les segments votés négativement resteront cachés même après rafraîchissement de la page"
@@ -442,7 +439,7 @@
         "message": "Support de sites tiers YouTube"
     },
     "supportOtherSitesDescription": {
-        "message": "Support de clients YouTube tierces. Pour habiliter le support, vous devez accepter les autorisations supplémentaires. Cela ne fonctionne PAS en incognito sur Chrome et d'autres variantes de Chromium.",
+        "message": "Soutenez les clients tiers pour YouTube. Pour activer le soutien, vous devez accepter les autorisations supplémentaires.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/he/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "סגירת סמליל"
     },
-    "SubmitTimes": {
-        "message": "הגש מקטעים"
+    "OpenSubmissionMenu": {
+        "message": "פתיחת תפריט הגשה"
     },
     "sortSegments": {
         "message": "מיון מקטעים"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "ניקוי זמנים"
     },
-    "submitTimesButton": {
-        "message": "הגשת זמנים"
-    },
     "publicStats": {
         "message": "זה משמש בדף הסטטיסטיקה הציבורי כדי להראות כמה תרמת. ניתן לצפות בזה"
     },
@@ -225,9 +222,15 @@
     "showDeleteButton": {
         "message": "הצגת כפתור מחיקה על הנגן של יוטיוב"
     },
+    "enableViewTracking": {
+        "message": "אפשר מעקב ספירת דילוגים"
+    },
     "whatViewTracking": {
         "message": "תכונה זו עוקבת אחר אילו מקטעים דילגת כדי לאפשר למשתמשים לדעת עד כמה ההגשה שלהם עזרה לאחרים והשתמשה כמדד יחד עם הצבעות בעד כדי להבטיח שספאם לא ייכנס למסד הנתונים. התוסף שולח הודעה לשרת בכל פעם שאתה מדלג על קטע. אני מקווה שרוב האנשים לא ישנו את ההגדרה הזו כדי שמספרי התצוגה יהיו מדויקים. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "אפשר מעקב ספירת דילוגים בכרטיסיות גלישה פרטית/גלישה בסתר"
+    },
     "enableTrackDownvotes": {
         "message": "שמור דירוג קטעים"
     },
@@ -237,6 +240,9 @@
     "trackDownvotesWarning": {
         "message": "אזהרה: ביטול השמירה ימחק את הדירוגים שנשמרו"
     },
+    "whatQueryByHashPrefix": {
+        "message": "במקום לבקש מקטעים מהשרת לפי מזהה סרטון, נשלחים ארבעת התווים הראשונים של ה-hash של מזהה הסרטון. שרת זה ישלח בחזרה נתונים לכל הסרטונים עם hash מתאים."
+    },
     "enableRefetchWhenNotFound": {
         "message": "השג מקטעים של סרטונים חדשים"
     },
@@ -252,6 +258,12 @@
     "showNotice": {
         "message": "הראה הודעה שוב"
     },
+    "showSkipNotice": {
+        "message": "הצג הודעה לאחר דילוג על מקטע"
+    },
+    "showCategoryGuidelines": {
+        "message": "הצג עזרה לקטגוריה"
+    },
     "website": {
         "message": "אתר",
         "description": "Used on Firefox Store Page"

public/_locales/hi/messages.json

@@ -128,9 +128,6 @@
     "closeIcon": {
         "message": "आइकॉन बंद करें"
     },
-    "SubmitTimes": {
-        "message": "खंड दर्ज करें"
-    },
     "sortSegments": {
         "message": "खंड छांटें"
     },

public/_locales/hr/messages.json

@@ -125,8 +125,8 @@
     "closePopup": {
         "message": "Zatvori izbornik"
     },
-    "SubmitTimes": {
-        "message": "Podnesi isječke"
+    "closeIcon": {
+        "message": "Ikona za zatvaranje"
     },
     "sortSegments": {
         "message": "Razvrstaj isječke"
@@ -165,9 +165,6 @@
     "clearTimesButton": {
         "message": "Očisti vremena"
     },
-    "submitTimesButton": {
-        "message": "Unesi vremena"
-    },
     "publicStats": {
         "message": "Ovo se koristi na stranici sa javnim statistikama da se pokaže koliko se pridonijeli. Pogledajte"
     },
@@ -788,6 +785,12 @@
     "ChangeCategoryTooltip": {
         "message": "Ovo će se odmah primijeniti na vaše isječke"
     },
+    "downvote": {
+        "message": "Glasaj protiv"
+    },
+    "upvote": {
+        "message": "Glasaj za"
+    },
     "hideSegment": {
         "message": "Sakri odsječak"
     },
@@ -913,6 +916,10 @@
         "message": "ID videa",
         "description": "Header of the unsubmitted segments list"
     },
+    "segmentCount": {
+        "message": "Broj segmenata",
+        "description": "Header of the unsubmitted segments list"
+    },
     "actions": {
         "message": "Radnje",
         "description": "Header of the unsubmitted segments list"

public/_locales/hu/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Bezárás ikon"
     },
-    "SubmitTimes": {
-        "message": "Szegmensek beküldése"
+    "OpenSubmissionMenu": {
+        "message": "Beküldés menü megnyitása"
     },
     "sortSegments": {
         "message": "Szegmensek rendezése"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Időpontok törlése"
     },
-    "submitTimesButton": {
-        "message": "Időpontok beküldése"
-    },
     "publicStats": {
         "message": "Ez a nyilvános ranglistán használatos, ami mutatja, mennyit segítettél. Nézd meg"
     },
@@ -442,7 +439,7 @@
         "message": "Harmadik fél Youtube oldalainak támogatása"
     },
     "supportOtherSitesDescription": {
-        "message": "Harmadik fél YouTube oldalainak támogatása. A támogatás bekapcsolásához el kell fogadnod az extra engedélyeket. NEM működik inkognitó módban Chrome-ban és egyéb Chromium változatokban.",
+        "message": "Harmadik fél YouTube klienseineik támogatása. A támogatáshoz el kell fogadni az extra engedélyeket.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/id/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Tutup Ikon"
     },
-    "SubmitTimes": {
-        "message": "Kirim Segmen"
-    },
     "sortSegments": {
         "message": "Urutkan Segmen"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Hapus Waktu"
     },
-    "submitTimesButton": {
-        "message": "Kirim Waktu"
-    },
     "publicStats": {
         "message": "Ini digunakan di halaman statistik publik untuk menampilkan berapa banyak anda berkontribusi. Lihat disini"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Dukung Situs Youtube Pihak Ketiga"
     },
-    "supportOtherSitesDescription": {
-        "message": "Dukung klien YouTube pihak ketiga. Untuk mengaktifkan dukungan, Anda harus menerima izin tambahan. Ini tidak akan bekerja di Mode Samaran di Chrome dan varian Chromium lainnya.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Situs yang didukung: "
     },

public/_locales/it/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Icona Chiudi"
     },
-    "SubmitTimes": {
-        "message": "Invia i segmenti"
-    },
     "sortSegments": {
         "message": "Ordina Segmenti"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Cancella minutaggio"
     },
-    "submitTimesButton": {
-        "message": "Invia minutaggio"
-    },
     "publicStats": {
         "message": "Questo è usato nelle pagine pubbliche delle statistiche per mostrare quanto hai contribuito. Vedilo"
     },
@@ -442,7 +436,7 @@
         "message": "Supporta siti di YouTube di terze parti"
     },
     "supportOtherSitesDescription": {
-        "message": "Supporta client YouTube di terze parti. Per abilitare il supporto, devi accettare i permessi aggiuntivi. Questo NON funziona in incognito su Chrome e altre varianti di Chromium.",
+        "message": "Supporta client YouTube di terze parti. Per abilitare il supporto, devi accettare i permessi aggiuntivi.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/ja/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "閉じるアイコン"
     },
-    "SubmitTimes": {
-        "message": "セグメントを送信"
-    },
     "sortSegments": {
         "message": "セグメントを並び替え"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "時間を消去"
     },
-    "submitTimesButton": {
-        "message": "時間を提出"
-    },
     "publicStats": {
         "message": "これは公開の統計ページであなたがどれだけ貢献したかを示すために使用され、ここで確認することができます: "
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "第三者製のYouTube関連サイトに対応"
     },
-    "supportOtherSitesDescription": {
-        "message": "第三者製のYouTubeクライアントに対応しました。有効にするには，追加の権限を受け入れる必要があります。これはChromeやその他のChromium系列の匿名閲覧状態では動作しません。",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "対応サイト: "
     },

public/_locales/ko/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "닫기 아이콘"
     },
-    "SubmitTimes": {
-        "message": "구간 제출"
+    "OpenSubmissionMenu": {
+        "message": "제출 메뉴 열기"
     },
     "sortSegments": {
         "message": "구간 정렬"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "구간 초기화"
     },
-    "submitTimesButton": {
-        "message": "구간 제출"
-    },
     "publicStats": {
         "message": "얼마나 기여했는지 확인할 수 있는 공개 통계 페이지로 다음에서 확인하실 수 있어요."
     },
@@ -442,7 +439,7 @@
         "message": "제3자 YouTube 사이트 지원"
     },
     "supportOtherSitesDescription": {
-        "message": "제3자 YouTube 클라이언트에서도 기능을 지원하도록 해요. 이 기능을 사용하려면 추가 권한을 허용해야 해요. Chrome 및 다른 Chromium 계열 브라우저의 시크릿 모드에서는 작동하지 않아요. ",
+        "message": "제삼자 YouTube 클라이언트에서도 기능을 지원하도록 해요. 이 기능을 사용하려면 추가 권한을 허용해야 해요.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/ml/messages.json

@@ -103,9 +103,6 @@
     "closePopup": {
         "message": "പോപ്പ്അപ്പ് അടയ്‌ക്കുക"
     },
-    "SubmitTimes": {
-        "message": "സെഗ്‌മെന്റുകൾ സമർപ്പിക്കുക"
-    },
     "submitCheck": {
         "message": "ഇത് സമർപ്പിക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?"
     },
@@ -140,9 +137,6 @@
     "clearTimesButton": {
         "message": "ടൈംസ് മായ്‌ക്കുക"
     },
-    "submitTimesButton": {
-        "message": "സമയം സമർപ്പിക്കുക"
-    },
     "publicStats": {
         "message": "നിങ്ങൾ എത്രമാത്രം സംഭാവന നൽകി എന്ന് കാണിക്കുന്നതിന് ഇത് പൊതു സ്ഥിതിവിവരക്കണക്ക് പേജിൽ ഉപയോഗിക്കുന്നു. അത് കാണുക"
     },

public/_locales/ms/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Tutup Ikon"
     },
-    "SubmitTimes": {
-        "message": "Hantar Segmen"
-    },
     "sortSegments": {
         "message": "Susun Segmen"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Jelas Masa"
     },
-    "submitTimesButton": {
-        "message": "Hantar Masa"
-    },
     "publicStats": {
         "message": "Ini digunakan di halaman statistik awam untuk menunjukkan berapa banyak yang anda sumbangkan. Lihatlah"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Sokong Pihak Ke-3 Laman YouTube"
     },
-    "supportOtherSitesDescription": {
-        "message": "Sokong klien pihak ketiga YouTube. Untuk membolehkan sokong, anda perlu menerima kebenaran tambahan. Ini TIDAK berfungsi dalam inkognito pada Chrome dan varian Chromium lain.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Laman Disokong: "
     },

public/_locales/nl/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Pictogram voor sluiten"
     },
-    "SubmitTimes": {
-        "message": "Segmenten indienen"
+    "OpenSubmissionMenu": {
+        "message": "Inzending-menu openen"
     },
     "sortSegments": {
         "message": "Segmenten sorteren"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Tijdstippen wissen"
     },
-    "submitTimesButton": {
-        "message": "Tijdstippen indienen"
-    },
     "publicStats": {
         "message": "Dit wordt gebruikt op de publieke statistiekenpagina om te laten zien hoeveel u heeft bijgedragen. Bekijk het"
     },
@@ -442,7 +439,7 @@
         "message": "Ondersteuning voor YouTube-sites van derden"
     },
     "supportOtherSitesDescription": {
-        "message": "Ondersteuning voor YouTube-clients van derden. Om ondersteuning in te schakelen moet u de extra machtigingen accepteren. Dit werkt NIET in incognito in Chrome en andere Chromium-varianten.",
+        "message": "YouTube-clients van derden ondersteunen. Om ondersteuning in te schakelen, moet u de extra machtigingen accepteren.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/no/messages.json

@@ -112,9 +112,6 @@
     "closePopup": {
         "message": "Lukk oppsprett"
     },
-    "SubmitTimes": {
-        "message": "Send inn segmenter"
-    },
     "submitCheck": {
         "message": "Er du sikker på at du vil sende inn dette?"
     },
@@ -149,9 +146,6 @@
     "clearTimesButton": {
         "message": "Tøm tidspunkter"
     },
-    "submitTimesButton": {
-        "message": "Send inn tidspunkter"
-    },
     "publicStats": {
         "message": "Dette brukes på den offentlige statistikksiden for å vise hvor mye du har bidratt med. Se den"
     },
@@ -381,10 +375,6 @@
     "supportOtherSites": {
         "message": "Støtt tredjeparts YouTube-nettsteder"
     },
-    "supportOtherSitesDescription": {
-        "message": "Støtt tredjeparts YouTube-klienter. For å aktivere støtte må du akseptere ytterlige vilkår. Dette fungerer IKKE i inkognitomodus i Chrome og andre Chromium-varianter.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Støttede nettsteder: "
     },

public/_locales/pl/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Wyłącz ikonę"
     },
-    "SubmitTimes": {
-        "message": "Prześlij segmenty"
-    },
     "sortSegments": {
         "message": "Sortuj segmenty"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Usuń czasy"
     },
-    "submitTimesButton": {
-        "message": "Wyślij czasy"
-    },
     "publicStats": {
         "message": "Ten dane są używane na naszej stronie żeby pokazać twój wkład. Zobacz to"
     },
@@ -442,7 +436,7 @@
         "message": "Obsługa stron YouTube firm trzecich"
     },
     "supportOtherSitesDescription": {
-        "message": "Wspieraj nieoficjalne klienty YouTube'a. Aby włączyć dla nich wsparcie, musisz przyznać dodatkowe uprawnienia. Ta opcja nie działa w trybie incognito w Chrome i innych przeglądarkach bazujących na Chromium.",
+        "message": "Obsługa zewnętrznych klientów YouTube. Aby włączyć obsługę, należy zaakceptować dodatkowe uprawnienia.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -941,6 +935,9 @@
     "hideForever": {
         "message": "Schowaj na zawsze"
     },
+    "warningChatInfo": {
+        "message": "Zauważyliśmy, że popełniłeś pewne powszechne błędy. Bardzo doceniamy dotychczasową pracę, ale dążymy tutaj do doskonałości, więc nawet bardzo małe błędy mają znaczenie :)"
+    },
     "warningTitle": {
         "message": "Otrzymałeś ostrzeżenie"
     },
@@ -1246,5 +1243,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Ostrzeżenie: Serwer nie odpowiedział jeszcze na segmenty. Być może segmenty na tym filmie są już wysłane, ale po prostu nie otrzymałeś ich z powodu problemów z serwerem."
+    },
+    "allowScrollingToEdit": {
+        "message": "Zezwalaj na scroll'owanie do edycji czasów"
     }
 }

public/_locales/pt_BR/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Ícone de Fechar"
     },
-    "SubmitTimes": {
-        "message": "Enviar Segmentos"
-    },
     "sortSegments": {
         "message": "Organizar Segmentos"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Limpar Intervalos"
     },
-    "submitTimesButton": {
-        "message": "Enviar Intervalos"
-    },
     "publicStats": {
         "message": "Isso é usado na página pública de estatísticas que mostra o quanto você já contribuiu. Veja-a"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Suporte a Sites do YouTube de Terceiros"
     },
-    "supportOtherSitesDescription": {
-        "message": "Suporte a clientes de terceiros do YouTube. Para habilitar o suporte, você deve aceitar as permissões extras. Isso NÃO funciona em incógnito no Chrome e outras variantes do Chromium.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Sites Suportados: "
     },
@@ -1000,7 +990,7 @@
         "message": "Copiar e dar voto negativo"
     },
     "ContinueVoting": {
-        "message": "Continuar Votando"
+        "message": "Continuar votando"
     },
     "ChangeCategoryTooltip": {
         "message": "Isto irá aplicar instantaneamente seus segmentos"

public/_locales/pt_PT/messages.json

@@ -128,9 +128,6 @@
     "closePopup": {
         "message": "Fechar Popup"
     },
-    "SubmitTimes": {
-        "message": "Submeter Segmentos"
-    },
     "sortSegments": {
         "message": "Ordenar Segmentos"
     },
@@ -168,9 +165,6 @@
     "clearTimesButton": {
         "message": "Limpar Intervalos"
     },
-    "submitTimesButton": {
-        "message": "Submeter Intervalos"
-    },
     "publicStats": {
         "message": "Isto é usado na página pública de estatísticas que mostra o quanto já contríbuíu. Veje-a"
     },
@@ -252,12 +246,18 @@
     "whatRefetchWhenNotFound": {
         "message": "Se o vídeo for novo e nenhum segmento for encontrado, continuaremos a monitorizar enquanto assiste."
     },
+    "whatShowCategoryWithoutPermission": {
+        "message": "Algumas categorias requerem permissão para submeter devido aos requisitos mínimos de reputação"
+    },
     "showNotice": {
         "message": "Mostrar notificação outra vez"
     },
     "showSkipNotice": {
         "message": "Mostrar aviso após um segmento ser ignorado"
     },
+    "showCategoryGuidelines": {
+        "message": "Mostrar Categoria de Ajuda"
+    },
     "noticeVisibilityMode0": {
         "message": "Avisos de ignorar em tamanho inteiro"
     },
@@ -279,6 +279,10 @@
         "message": "Iniciar/parar segmento",
         "description": "Keybind label"
     },
+    "setSubmitKeybind": {
+        "message": "Enviar segmentos",
+        "description": "Keybind label"
+    },
     "nextChapterKeybind": {
         "message": "Próximo capítulo",
         "description": "Keybind label"
@@ -347,6 +351,10 @@
     "createdBy": {
         "message": "Criado por"
     },
+    "supportOtherSitesDescription": {
+        "message": "Apoie clientes de terceiros do YouTube. Para ativar o suporte, deve aceitar as permissões adicionais.",
+        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
+    },
     "supportedSites": {
         "message": "Sites suportados: "
     },

public/_locales/ro/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Închide pictograma"
     },
-    "SubmitTimes": {
-        "message": "Trimite segmente"
-    },
     "sortSegments": {
         "message": "Sortare Segmente"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Șterge Timpii"
     },
-    "submitTimesButton": {
-        "message": "Trimite Timpii"
-    },
     "publicStats": {
         "message": "Acest lucru este folosit pe pagina publică de statistici pentru a arăta cât de mult ai contribuit. Vezi pagina"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Sprijină Site-uri YouTube 3rd Party"
     },
-    "supportOtherSitesDescription": {
-        "message": "Sprijină Clienți YouTube 3rd party. Pentru a activa setarea, trebuie să acceptați permisiunile suprimentare. Această funcție NU funcționează în incognito pe Chrome sau în alte variante Chromium.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Site-uri cu Sprijin: "
     },

public/_locales/ru/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Кнопка закрытия"
     },
-    "SubmitTimes": {
-        "message": "Отправить сегменты"
+    "OpenSubmissionMenu": {
+        "message": "Открыть меню отправки"
     },
     "sortSegments": {
         "message": "Сортировать сегменты"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Очистить время"
     },
-    "submitTimesButton": {
-        "message": "Отправить сегменты"
-    },
     "publicStats": {
         "message": "Оно используется на публичной странице статистики, чтобы показать Ваш вклад. Её можно посмотреть "
     },
@@ -442,7 +439,7 @@
         "message": "Поддерживать сторонние YouTube-сайты"
     },
     "supportOtherSitesDescription": {
-        "message": "Поддерживать сторонние клиенты для YouTube. Чтобы включить поддержку, Вам понадобится принять дополнительные разрешения. Эта функция НЕ работает в режиме \"инкогнито\" в Chrome и браузерах, основанных на Chromium.",
+        "message": "Поддержка сторонних клиентов YouTube. Чтобы включить поддержку, вы должны принять дополнительные разрешения.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
@@ -1141,7 +1138,7 @@
         "message": "Ключ лицензии недействителен"
     },
     "hideUpsells": {
-        "message": "Скрыть опции, не доступные без дополнительной платы"
+        "message": "Скрыть опции, недоступные без дополнительной платы"
     },
     "chooseACountry": {
         "message": "Выберите страну"

public/_locales/sk/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Ikona pre zatvorenie"
     },
-    "SubmitTimes": {
-        "message": "Odoslať segmenty"
-    },
     "sortSegments": {
         "message": "Triedenie segmentov"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Vymazať časy"
     },
-    "submitTimesButton": {
-        "message": "Odoslať časy"
-    },
     "publicStats": {
         "message": "Toto sa používa vo verejnom rebríčku pre zobrazenie vášho príspevku. Pozrite si ho"
     },
@@ -442,7 +436,7 @@
         "message": "Podpora alternatívnych Youtube webov"
     },
     "supportOtherSitesDescription": {
-        "message": "Podpora alternatívnych Youtube klientov. Pre zapnutie podpory musíte povoliť zvláštne oprávnenia. Nefunguje v anonymnom režime v prehliadači Chrome ani v Chromium variantoch.",
+        "message": "Podpora Youtube aplikácií tretích strán. Pre jej zapnutie musíte odsúhlasiť zvláštne oprávnenia.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/sv/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Stäng ikon"
     },
-    "SubmitTimes": {
-        "message": "Skicka in segment"
+    "OpenSubmissionMenu": {
+        "message": "Öppna inlämningsmenyn"
     },
     "sortSegments": {
         "message": "Sortera segment"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Rensa tider"
     },
-    "submitTimesButton": {
-        "message": "Skicka in tider"
-    },
     "publicStats": {
         "message": "Detta används på den offentliga statistiksidan för att visa hur mycket du har bidragit. Ta en titt"
     },
@@ -442,7 +439,7 @@
         "message": "Stöd för tredjeparts YouTube-webbplatser"
     },
     "supportOtherSitesDescription": {
-        "message": "Stöd tredjeparts YouTube-klienter. För att aktivera support måste du acceptera de extra behörigheterna. Detta fungerar INTE i inkognito på Chrome och andra Chromium-varianter.",
+        "message": "Stöd tredjeparts YouTube-klienter. För att aktivera support måste du acceptera de extra behörigheterna.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/ta/messages.json

@@ -112,9 +112,6 @@
     "closePopup": {
         "message": "பாப்அப்பை மூடு"
     },
-    "SubmitTimes": {
-        "message": "பிரிவுகளைச் சமர்ப்பிக்கவும்"
-    },
     "submitCheck": {
         "message": "இதை நிச்சயமாக சமர்ப்பிக்க விரும்புகிறீர்களா?"
     },
@@ -149,9 +146,6 @@
     "clearTimesButton": {
         "message": "நேரங்களை அழி"
     },
-    "submitTimesButton": {
-        "message": "நேரங்களைச் சமர்ப்பிக்கவும்"
-    },
     "publicStats": {
         "message": "நீங்கள் எவ்வளவு பங்களித்தீர்கள் என்பதைக் காட்ட இது பொது புள்ளிவிவரங்கள் பக்கத்தில் பயன்படுத்தப்படுகிறது. அதை பார்"
     },
@@ -390,10 +384,6 @@
     "supportOtherSites": {
         "message": "3 வது தரப்பு YouTube-தளங்களை ஆதரிக்கவும்"
     },
-    "supportOtherSitesDescription": {
-        "message": "மூன்றாம் தரப்பு YouTube தளங்களை ஆதரிக்கவும். ஆதரவை இயக்க, நீங்கள் கூடுதல் அனுமதிகளை ஏற்க வேண்டும். இது Chrome மற்றும் பிற Chromium வகைகளில் தனிப்பட்ட தாவல்களில் வேலை செய்யாது.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "ஆதரிக்கப்படும் தளங்கள்: "
     },

public/_locales/te/messages.json

@@ -103,9 +103,6 @@
     "closePopup": {
         "message": "పాపప్ మూసివేయండి"
     },
-    "SubmitTimes": {
-        "message": "విభాగాలను సమర్పించండి"
-    },
     "submitCheck": {
         "message": "మీరు దీన్ని ఖచ్చితంగా సమర్పించాలనుకుంటున్నారా?"
     },
@@ -140,9 +137,6 @@
     "clearTimesButton": {
         "message": "టైమ్స్ క్లియర్"
     },
-    "submitTimesButton": {
-        "message": "టైమ్స్ సమర్పించండి"
-    },
     "publicStats": {
         "message": "మీరు ఎంత సహకరించారో చూపించడానికి ఇది పబ్లిక్ గణాంకాల పేజీలో ఉపయోగించబడుతుంది. ఇది చూడు"
     },

public/_locales/th/messages.json

@@ -72,5 +72,9 @@
     },
     "clearTimesButton": {
         "message": "ล้างเวลา"
+    },
+    "supportOtherSitesDescription": {
+        "message": "สนับสนุนลูกค้า YouTube บุคคลที่สาม.\nในการเปิดใช้งานการสนับสนุน คุณต้องยอมรับการอนุญาตพิเศษ!",
+        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     }
 }

public/_locales/tr/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Kapat Simgesi"
     },
-    "SubmitTimes": {
-        "message": "Kısımları gönder"
+    "OpenSubmissionMenu": {
+        "message": "Gönderiler Menüsünü Aç"
     },
     "sortSegments": {
         "message": "Kısımları Sırala"
@@ -171,9 +171,6 @@
     "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"
     },
@@ -442,7 +439,7 @@
         "message": "3. Taraf Youtube Sitelerini Destekle"
     },
     "supportOtherSitesDescription": {
-        "message": "Üçüncü taraf YouTube istemci desteği. Desteği etkinleştirmek için özel izinleri kabul etmelisiniz. Bu özellik Chrome ve diğer Chromium tarayıcılarda gizli modda çalışmaz.",
+        "message": "3. taraflarca yazılmış YouTube istemcileri desteği. Kullanabilmek için ilave izinler vermelisiniz.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {

public/_locales/uk/messages.json

@@ -131,9 +131,6 @@
     "closeIcon": {
         "message": "Закрити іконку"
     },
-    "SubmitTimes": {
-        "message": "Надіслати сегменти"
-    },
     "sortSegments": {
         "message": "Сортувати сегменти"
     },
@@ -171,9 +168,6 @@
     "clearTimesButton": {
         "message": "Очистити час"
     },
-    "submitTimesButton": {
-        "message": "Надіслати час"
-    },
     "publicStats": {
         "message": "Воно використовується на публічній сторінці статистики, щоб показати Ваш внесок. Її можна подивитися"
     },
@@ -441,10 +435,6 @@
     "supportOtherSites": {
         "message": "Підтримувати сторонні YouTube-сайти"
     },
-    "supportOtherSitesDescription": {
-        "message": "Підтримувати сторонні клієнти для YouTube. Щоб включити підтримку, Вам знадобиться прийняти додаткові дозволи. Ця функція НЕ працює в режимі \"інкогніто\" в Chrome і браузерах, заснованих на Chromium.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Підтримувані сайти: "
     },

public/_locales/vi/messages.json

@@ -125,9 +125,6 @@
     "closePopup": {
         "message": "Đóng bảng popup"
     },
-    "SubmitTimes": {
-        "message": "Gửi phân đoạn"
-    },
     "sortSegments": {
         "message": "Sắp xếp phân đoạn"
     },
@@ -165,9 +162,6 @@
     "clearTimesButton": {
         "message": "Xóa thời gian"
     },
-    "submitTimesButton": {
-        "message": "Gửi thời gian"
-    },
     "publicStats": {
         "message": "Tên này được dùng tại trang thông tin công khai để thể hiện lượng đóng góp của bạn. Xem"
     },
@@ -420,10 +414,6 @@
     "supportOtherSites": {
         "message": "Hỗ trợ các trang web Youtube thuộc bên thứ 3"
     },
-    "supportOtherSitesDescription": {
-        "message": "Bật hỗ trợ các ứng dụng/trang web Youtube của bên thứ ba. Để bật hỗ trợ cho ứng dụng này, bạn phải chấp nhận các yêu cầu cho phép bổ sung. Nó KHÔNG CÓ tác dụng trong chế độ ẩn danh của Chrome và các trình duyệt có nền tảng Chromium.",
-        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
-    },
     "supportedSites": {
         "message": "Các trang web được hỗ trợ: "
     },

public/_locales/zh_CN/messages.json

@@ -131,11 +131,11 @@
     "closeIcon": {
         "message": "关闭图标"
     },
-    "SubmitTimes": {
-        "message": "提交片段"
+    "OpenSubmissionMenu": {
+        "message": "打开提交菜单"
     },
     "sortSegments": {
-        "message": "分类段"
+        "message": "排序片段"
     },
     "submitCheck": {
         "message": "您确定要提交它吗？"
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "清除时间"
     },
-    "submitTimesButton": {
-        "message": "提交时间"
-    },
     "publicStats": {
         "message": "这被用于在公开统计页面上展示您的贡献。查看它"
     },
@@ -184,7 +181,7 @@
         "message": "设定用户名"
     },
     "copyPublicID": {
-        "message": "复制公共用户ID"
+        "message": "复制公开的用户ID"
     },
     "copySegmentID": {
         "message": "复制片段 ID"
@@ -208,7 +205,7 @@
         "message": "这将隐藏在 YouTube 播放器上提交赞助商广告的按钮。我了解这个东西打扰到了某些人。除了使用那个按钮，这个弹窗也可以用来提交赞助商广告。 要隐藏出现的通知，请使用通知中显示的写着 ”不再显示“ 的按钮。您可以在以后再次启用这些设置。"
     },
     "showSkipButton": {
-        "message": "保持播放器上的跳过高亮按钮"
+        "message": "播放器显示跳至精华片段按钮"
     },
     "showInfoButton": {
         "message": "在 Youtube 播放器上显示信息按钮"
@@ -235,13 +232,13 @@
         "message": "在私人/隐身标签中启用跳过计数跟踪"
     },
     "enableTrackDownvotes": {
-        "message": "商店部分的下线"
+        "message": "保存差评片段"
     },
     "whatTrackDownvotes": {
-        "message": "任何被你降权的片段，即使在刷新后也会保持隐藏状态"
+        "message": "任何被你差评的片段，即使在刷新后也会保持隐藏"
     },
     "trackDownvotesWarning": {
-        "message": "警告。禁用此功能将删除所有先前存储的降级投票"
+        "message": "警告：禁用此功能将删除所有先前保存的差评"
     },
     "enableQueryByHashPrefix": {
         "message": "按哈希前缀查询"
@@ -274,16 +271,16 @@
         "message": "全尺寸的跳过通知"
     },
     "noticeVisibilityMode1": {
-        "message": "自动跳车的小跳车通知"
+        "message": "缩小自动跳过的提醒"
     },
     "noticeVisibilityMode2": {
-        "message": "所有的小跳槽通知"
+        "message": "缩小所有的跳过提醒"
     },
     "noticeVisibilityMode3": {
-        "message": "褪色的自动跳车通知书"
+        "message": "减弱自动跳过的提醒"
     },
     "noticeVisibilityMode4": {
-        "message": "所有褪色的跳过通知"
+        "message": "减弱所有的跳过提醒"
     },
     "longDescription": {
         "message": "SponsorBlock 可帮您跳过 YouTube 视频中的赞助商广告、开场、结尾、订阅提醒和其他烦人片段。SponsorBlock 是一个众包的浏览器扩展，可以让任何人提交 YouTube 视频的赞助商广告和其他片段的开始和结束时间。若有一人提交了信息，其他所有使用此扩展的人都能直接跳过赞助商广告片段。您也可以跳过音乐视频中的非音乐部分。",
@@ -306,17 +303,28 @@
         "description": "The second line of the message displayed after the notice was upgraded."
     },
     "setSkipShortcut": {
-        "message": "跳过部分",
+        "message": "跳过片段",
         "description": "Keybind label"
     },
     "setStartSponsorShortcut": {
-        "message": "启动/停止部分",
+        "message": "片段开始/停止",
         "description": "Keybind label"
     },
     "setSubmitKeybind": {
         "message": "提交片段",
         "description": "Keybind label"
     },
+    "nextChapterKeybind": {
+        "message": "下一章节",
+        "description": "Keybind label"
+    },
+    "previousChapterKeybind": {
+        "message": "上一章节",
+        "description": "Keybind label"
+    },
+    "keybindDescription": {
+        "message": "请按下想绑定的按键。如果您想使用组合快捷键，请勾选左侧的选项。"
+    },
     "0": {
         "message": "连接超时。请检查您的网络连接。如果您的网络运行正常，则可能是服务器过载或宕机。"
     },
@@ -349,6 +357,25 @@
     "skip_category": {
         "message": "跳过{0}？"
     },
+    "mute_category": {
+        "message": "要静音 {0} 吗?"
+    },
+    "skip_to_category": {
+        "message": "要跳到 {0} 吗?",
+        "description": "Used for skipping to things (Skip to Highlight)"
+    },
+    "skipped": {
+        "message": "{0} 已跳过",
+        "description": "Example: Sponsor Skipped"
+    },
+    "muted": {
+        "message": "{0} 已静音",
+        "description": "Example: Sponsor Muted"
+    },
+    "skipped_to_category": {
+        "message": "已跳至 {0}",
+        "description": "Used for skipping to things (Skipped to Highlight)"
+    },
     "disableAutoSkip": {
         "message": "禁用自动跳过"
     },
@@ -393,18 +420,40 @@
     "statusReminder": {
         "message": "在 status.sponsor.ajay.app 检查服务器状态。"
     },
+    "changeUserID": {
+        "message": "导入/导出您的私人用户ID"
+    },
+    "whatChangeUserID": {
+        "message": "这应该被保密。这就像一个密码，且不应该告诉任何人。如果有人拥有它，他就可以冒充您。如果您要找的是公开用户ID，请单击弹出窗口中的剪贴板图标。"
+    },
+    "setUserID": {
+        "message": "设置私人用户ID"
+    },
+    "userIDChangeWarning": {
+        "message": "警告：更改私人用户 ID 是永久性的。您确定要这么做吗？请务必备份您的旧用户 ID 以防万一。"
+    },
     "createdBy": {
         "message": "创建者"
     },
     "supportOtherSites": {
         "message": "支持第三方 YouTube 网站"
     },
+    "supportOtherSitesDescription": {
+        "message": "支持第三方 YouTube 客户端。要启用支持，您必须允许额外的权限。",
+        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
+    },
     "supportedSites": {
         "message": "支持的站点： "
     },
     "optionsInfo": {
         "message": "启用 Invidious 支持，禁用自动跳过，隐藏按钮等等。"
     },
+    "addInvidiousInstance": {
+        "message": "添加第三方客户端实例"
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "添加自定义实例。它必须只包含域名。例如：invidious.ajay.app"
+    },
     "add": {
         "message": "添加"
     },
@@ -426,9 +475,24 @@
     "minDurationDescription": {
         "message": "短于设定值的片段将不会被跳过或显示在播放器中。"
     },
+    "enableManualSkipOnFullVideo": {
+        "message": "当整个视频都是相同内容时使用手动跳过"
+    },
+    "whatManualSkipOnFullVideo": {
+        "message": "用于在观看整个视频都是赞助商广告或自我推广时不受打扰"
+    },
+    "skipNoticeDuration": {
+        "message": "跳过提醒持续时间（秒）："
+    },
+    "skipNoticeDurationDescription": {
+        "message": "跳过提醒将显示至少这么多秒。手动跳过的提醒可能会显示更久。"
+    },
     "shortCheck": {
         "message": "以下的提交短于您的最小持续时间选项。这代表它们可能已经被提交，只是由于该选项被忽略了。您确定要提交吗？"
     },
+    "liveOrPremiere": {
+        "message": "无法在进行中的直播或首播提交片段。请等待直播结束后刷新页面并确认片段仍然有效，再次提交。"
+    },
     "showUploadButton": {
         "message": "显示上传按钮"
     },
@@ -465,6 +529,9 @@
     "exportOptionsUpload": {
         "message": "从文件加载"
     },
+    "whatExportOptions": {
+        "message": "这是您所有设置的 JSON 格式。它包含了您的私人用户 ID ，所以您一定要谨慎的保管它。"
+    },
     "setOptions": {
         "message": "设定选项"
     },
@@ -505,7 +572,7 @@
         "message": "复制到剪贴板失败"
     },
     "copyDebugInformationOptions": {
-        "message": "复制信息到剪贴板，在提交错误或开发者需要时提供给他。 敏感信息如：您的用户ID，白名单频道和自定义服务器地址等已被删除。然而，它仍然包含诸如您的 useragent ，浏览器，操作系统和扩展版本号等信息。 "
+        "message": "复制信息到剪贴板，在提交错误或开发者需要时提供给他。 敏感信息如：您的用户ID，白名单频道和自定义服务器地址等已被删除。然而，它仍然包含诸如您的 useragent ，浏览器，操作系统和插件版本号等信息。 "
     },
     "copyDebugInformationComplete": {
         "message": "调试信息已复制到剪切板中。 您可以随意移除任何您不想分享的信息。请将其另存为 .txt 文件或粘贴到错误报告中。"
@@ -521,6 +588,12 @@
         "message": "复制成功！",
         "description": "Used after something has been copied to the clipboard. Example: 'Copied!'"
     },
+    "generic_guideline1": {
+        "message": "包括衔接转场"
+    },
+    "generic_guideline2": {
+        "message": "装成没有跳过内容一样播放"
+    },
     "category_sponsor": {
         "message": "赞助商广告"
     },
@@ -534,7 +607,7 @@
         "message": "捐赠或自制周边不属于此项"
     },
     "category_selfpromo": {
-        "message": "未收钱的/自我推销"
+        "message": "无偿的/自我推广"
     },
     "category_selfpromo_description": {
         "message": "类似于 “赞助商广告” ，但为无报酬或自我推广。包括有关商品、捐赠的部分或合作者的信息。"
@@ -542,12 +615,40 @@
     "category_selfpromo_guideline1": {
         "message": "捐赠、会员和自制周边"
     },
+    "category_selfpromo_guideline2": {
+        "message": "与视频无关的免费推广"
+    },
+    "category_selfpromo_guideline3": {
+        "message": "不是公司设计的产品和周边"
+    },
+    "category_exclusive_access": {
+        "message": "独家限定"
+    },
+    "category_exclusive_access_description": {
+        "message": "仅用于标记整个视频。当视频展示了免费或被帮助以获得产品、服务或访问地点时使用。"
+    },
+    "category_exclusive_access_pill": {
+        "message": "此视频展示了免费或被帮助以获得产品、服务或访问地点",
+        "description": "Short description for this category"
+    },
+    "category_exclusive_access_guideline1": {
+        "message": "整个视频都在展示免费/受助以获得和访问的事物"
+    },
     "category_interaction": {
         "message": "互动提醒（订阅）"
     },
     "category_interaction_description": {
         "message": "视频中间简短提醒观众来点赞、订阅或关注。 如果片段较长，或是关于某个具体事物，则应分类为自我推广。"
     },
+    "category_interaction_guideline1": {
+        "message": "短暂提醒要喜欢、订阅或关注"
+    },
+    "category_interaction_guideline2": {
+        "message": "包括提醒发表评论，即使是间接的"
+    },
+    "category_interaction_guideline3": {
+        "message": "不是常见的推广互动，只是行动呼吁"
+    },
     "category_interaction_short": {
         "message": "互动提醒"
     },
@@ -560,12 +661,54 @@
     "category_intro_short": {
         "message": "过场"
     },
+    "category_intro_guideline1": {
+        "message": "无实际内容的片段"
+    },
+    "category_intro_guideline2": {
+        "message": "不包括含有信息的转场"
+    },
     "category_outro": {
         "message": "结束画面/结尾职员表"
     },
     "category_outro_description": {
         "message": "鸣谢画面或出现 YouTube 片尾画面。不应用于包含信息的结尾。"
     },
+    "category_outro_guideline1": {
+        "message": "不应包含内容，即使结尾演职员表已经出现。"
+    },
+    "category_preview": {
+        "message": "预览/概要"
+    },
+    "category_preview_description": {
+        "message": "展示此视频或同系列后续视频将出现的画面集锦，所有内容都将在之后再次出现。"
+    },
+    "category_preview_guideline1": {
+        "message": "在之后或未来视频会出现的片段"
+    },
+    "category_preview_guideline2": {
+        "message": "往期视频的回顾总结"
+    },
+    "category_preview_guideline3": {
+        "message": "不含有新添加的内容"
+    },
+    "category_filler": {
+        "message": "离题的闲聊/笑话"
+    },
+    "category_filler_description": {
+        "message": "离题片段标签仅在出现不需要理解视频主要内容的拖时间/无关笑话片段时使用。此标签不能包含有意义的内容或背景细节。这是非常激进的类别，代表您没有心情娱乐。"
+    },
+    "category_filler_short": {
+        "message": "离题"
+    },
+    "category_filler_guideline1": {
+        "message": "拖时间/无意义笑话等离题片段"
+    },
+    "category_filler_guideline2": {
+        "message": "分心、花絮、重播"
+    },
+    "category_filler_guideline3": {
+        "message": "不需要理解主题的片段"
+    },
     "category_music_offtopic": {
         "message": "音乐：非音乐部分"
     },
@@ -573,7 +716,43 @@
         "message": "仅用于音乐视频。此分类只能用于音乐视频中未包括于其他分类的部分。"
     },
     "category_music_offtopic_short": {
-        "message": "无音乐"
+        "message": "非音乐"
+    },
+    "category_music_offtopic_guideline1": {
+        "message": "不在官方版本中的部分"
+    },
+    "category_music_offtopic_guideline2": {
+        "message": "现场表演中的非音乐片段"
+    },
+    "category_poi_highlight": {
+        "message": "精彩时刻"
+    },
+    "category_poi_highlight_description": {
+        "message": "大部分人都在寻找的视频片段。类似于“封面在12:34”的评论。"
+    },
+    "category_poi_highlight_guideline1": {
+        "message": "大部分人想看的片段"
+    },
+    "category_poi_highlight_guideline2": {
+        "message": "可以帮助略过之前的内容"
+    },
+    "category_poi_highlight_guideline3": {
+        "message": "可以跳到标题或封面"
+    },
+    "category_chapter": {
+        "message": "章节"
+    },
+    "category_chapter_description": {
+        "message": "自定义命名章节描述了视频的主要部分。"
+    },
+    "category_chapter_guideline1": {
+        "message": "不要提到赞助商品牌名称"
+    },
+    "category_chapter_guideline2": {
+        "message": "在一般普通的环节使用较长的章节"
+    },
+    "category_chapter_guideline3": {
+        "message": "小章节可以放在大章节内"
     },
     "category_livestream_messages": {
         "message": "直播：捐赠/消息阅读"
@@ -588,13 +767,42 @@
         "message": "手动跳过"
     },
     "showOverlay": {
-        "message": "在搜索栏中显示"
+        "message": "在进度条中显示"
     },
     "disable": {
         "message": "禁用"
     },
+    "autoSkip_POI": {
+        "message": "跳至开始位置"
+    },
+    "manualSkip_POI": {
+        "message": "视频加载时询问"
+    },
+    "showOverlay_POI": {
+        "message": "在进度条中显示"
+    },
+    "showOverlay_full": {
+        "message": "显示标签"
+    },
+    "showOverlay_chapter": {
+        "message": "显示章节"
+    },
+    "autoSkipOnMusicVideos": {
+        "message": "自动跳过所有非音乐片段"
+    },
+    "muteSegments": {
+        "message": "允许静音的片段而不是跳过"
+    },
+    "fullVideoSegments": {
+        "message": "当整个视频都是广告时显示图标",
+        "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
+    },
+    "previewColor": {
+        "message": "未提交颜色",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
     "seekBarColor": {
-        "message": "拖动条颜色"
+        "message": "进度条颜色"
     },
     "category": {
         "message": "类别"
@@ -625,24 +833,47 @@
         "message": "要提交“{0}”类别的片段，您必须在选项中启用此类别。现在将重定向到选项。",
         "description": "Used when submitting segments to only let them select a certain category if they have it enabled in the options."
     },
+    "poiOnlyOneSegment": {
+        "message": "警告：此类型的片段一次最多只能使用一个。提交多个片段将随机显示。"
+    },
     "youMustSelectACategory": {
         "message": "您必须为所有您要提交的片段选择类别！"
     },
     "bracketEnd": {
         "message": "（结束）"
     },
+    "End": {
+        "message": "结束",
+        "description": "Button that skips to the end of a segment"
+    },
     "hiddenDueToDownvote": {
         "message": "隐藏：差评"
     },
     "hiddenDueToDuration": {
         "message": "隐藏：过短"
     },
+    "manuallyHidden": {
+        "message": "手动隐藏"
+    },
+    "channelDataNotFound": {
+        "description": "This error appears in an alert when they try to whitelist a channel and the extension is unable to determine what channel they are looking at.",
+        "message": "未检测到频道ID。如果您正在使用嵌入式视频播放器，请转到 Youtube 网站观看。也可能是 Youtube 更改了页面布局，如果您认为是此问题，请在此评论："
+    },
+    "invidiousPermissionRefresh": {
+        "message": "浏览器已撤销在 Invidious 及其他第三方网站运行所需的权限。请点击下方按钮重新激活权限。"
+    },
     "acceptPermission": {
         "message": "接受权限"
     },
     "permissionRequestSuccess": {
         "message": "权限请求成功！"
     },
+    "permissionRequestFailed": {
+        "message": "权限请求失败，您是否点击拒绝？"
+    },
+    "adblockerIssueWhitelist": {
+        "message": "如果您无法解决这个问题，请禁用“跳过前强制进行频道检查”选项，因为 SponsorBlock 无法获得此视频的频道信息"
+    },
     "forceChannelCheck": {
         "message": "跳过前强制进行频道检查"
     },
@@ -655,6 +886,16 @@
     "downvoteDescription": {
         "message": "不正确/错误的时间"
     },
+    "incorrectVote": {
+        "message": "不正确"
+    },
+    "harmfulVote": {
+        "message": "有害的",
+        "description": "Used for chapter segments when the text is harmful/offensive to remove it faster"
+    },
+    "incorrectCategory": {
+        "message": "更改类别"
+    },
     "nonMusicCategoryOnMusic": {
         "message": "此视频的分类为音乐。 您确定其中包含赞助商广告吗？如果这是“非音乐片段”，请打开扩展选项并启用此类别。 之后，您可以以“非音乐”而不是赞助商广告类别提交此片段。如果您不太明白，请阅读指南。"
     },
@@ -672,9 +913,341 @@
         "message": "类别在这里！"
     },
     "categoryUpdate2": {
-        "message": "打开选项，跳过开头，结尾，商业等。"
+        "message": "开启选项以跳过开头、结尾和商业等内容。"
     },
     "help": {
         "message": "帮助"
+    },
+    "GotIt": {
+        "message": "明白了",
+        "description": "Used as the button to dismiss a tooltip"
+    },
+    "fullVideoTooltipWarning": {
+        "message": "片段过长。如果整个视频都是关于同一个主题，请将“跳过”改成“整个视频”标签。查看指南了解详情。"
+    },
+    "categoryPillTitleText": {
+        "message": "整个视频都被标记为此分类且内容过于紧凑，无法分开。"
+    },
+    "chapterNameTooltipWarning": {
+        "message": "提交的章节名称与现有类别名称相似。如果已经存在分类，您应该优先使用它。"
+    },
+    "experiementOptOut": {
+        "message": "关闭所有实验性功能",
+        "description": "This is used in a popup about a new experiment to get a list of unlisted videos to back up since all unlisted videos uploaded before 2017 will be set to private."
+    },
+    "hideForever": {
+        "message": "永远隐藏"
+    },
+    "warningChatInfo": {
+        "message": "我们注意到你犯了一些常见错误。我们非常赞赏你迄今所做的工作，但我们努力追求完美，所以即使是非常小的错误，也需要重视:)"
+    },
+    "warningTitle": {
+        "message": "你收到了警告"
+    },
+    "questionButton": {
+        "message": "我有疑问"
+    },
+    "warningConfirmButton": {
+        "message": "我理解原因"
+    },
+    "warningError": {
+        "message": "尝试确认警告时发生错误："
+    },
+    "Donate": {
+        "message": "捐赠"
+    },
+    "considerDonating": {
+        "message": "资助开发"
+    },
+    "hideDonationLink": {
+        "message": "隐藏捐赠链接"
+    },
+    "darkModeOptionsPage": {
+        "message": "深色模式选项页面"
+    },
+    "helpPageThanksForInstalling": {
+        "message": "感谢安装 SponsorBlock。"
+    },
+    "helpPageReviewOptions": {
+        "message": "请查看下面的选项"
+    },
+    "helpPageFeatureDisclaimer": {
+        "message": "许多功能默认禁用。如果您想跳过开头、结尾或使用 Invidious 等，请在下方开启。您也可以显示/隐藏界面内容。"
+    },
+    "helpPageHowSkippingWorks": {
+        "message": "跳过是如何运作的"
+    },
+    "helpPageHowSkippingWorks1": {
+        "message": "视频片段如果在数据库中存在将被自动跳过。您可以点击插件图标打开弹窗查看预览。"
+    },
+    "helpPageHowSkippingWorks2": {
+        "message": "当跳过片段时，您会收到提醒。如果时间不对，请点击差评！您也可以在插件弹窗中投票。"
+    },
+    "Submitting": {
+        "message": "提交中"
+    },
+    "helpPageSubmitting1": {
+        "message": "您可以使用插件弹窗中的“片段现在开始”按钮或播放器中的按钮提交片段。"
+    },
+    "helpPageSubmitting2": {
+        "message": "点击播放按钮标记片段开始，点击停止按钮标记片段结束。您可以一次提交多个片段。点击上传按钮会提交片段。点击垃圾桶按钮会删除片段。"
+    },
+    "Editing": {
+        "message": "正在编辑"
+    },
+    "helpPageEditing1": {
+        "message": "如果您选错了，您可以点击左侧箭头按钮编辑或删除您的片段。"
+    },
+    "helpPageTooSlow": {
+        "message": "太慢了"
+    },
+    "helpPageTooSlow1": {
+        "message": "常用功能支持快捷键。按下分号键“；”标记赞助商广告片段开始和结束，按下撇号“ ’ ”提交。可以在选项中更改按键。如果您使用的不是QWERTY序列键盘，您可能需要更改键位绑定。"
+    },
+    "helpPageCopyOfDatabase": {
+        "message": "我可以下载数据库吗？如果你人没了会怎样？"
+    },
+    "helpPageCopyOfDatabase1": {
+        "message": "数据库是公开的，在此访问："
+    },
+    "helpPageCopyOfDatabase2": {
+        "message": "源代码是免费公开的。所以即使我出了什么事，你的提交也不会丢失。"
+    },
+    "helpPageNews": {
+        "message": "新闻和更新记录"
+    },
+    "helpPageSourceCode": {
+        "message": "在哪里可以获得源代码？"
+    },
+    "Credits": {
+        "message": "鸣谢"
+    },
+    "LearnMore": {
+        "message": "了解详情"
+    },
+    "FullDetails": {
+        "message": "全部细节"
+    },
+    "CopyDownvoteButtonInfo": {
+        "message": "差评并创建本地副本供您再次提交"
+    },
+    "OpenCategoryWikiPage": {
+        "message": "打开此类别的百科页面。"
+    },
+    "CopyAndDownvote": {
+        "message": "复制并差评"
+    },
+    "ContinueVoting": {
+        "message": "继续投票"
+    },
+    "ChangeCategoryTooltip": {
+        "message": "这会立即应用到您所有的片段"
+    },
+    "downvote": {
+        "message": "差评"
+    },
+    "upvote": {
+        "message": "点赞"
+    },
+    "hideSegment": {
+        "message": "隐藏片段"
+    },
+    "skipSegment": {
+        "message": "跳过片段"
+    },
+    "playChapter": {
+        "message": "播放章节"
+    },
+    "SponsorTimeEditScrollNewFeature": {
+        "message": "将鼠标悬停在编辑框上，操作鼠标滚轮可以快速调整时间。包含 Ctrl 和 Shift 的组合快捷键可以微调时间。"
+    },
+    "categoryPillNewFeature": {
+        "message": "新功能！知道视频是否完全是赞助广告或自我推广"
+    },
+    "dayAbbreviation": {
+        "message": "天",
+        "description": "100d"
+    },
+    "hourAbbreviation": {
+        "message": "小时",
+        "description": "100h"
+    },
+    "optionsTabBehavior": {
+        "message": "行为",
+        "description": "Appears in Options as a tab header for options related to categories and skipping behavior. To fit inside the button, it should not be longer than ~20-25 characters (depending on their width)."
+    },
+    "optionsTabInterface": {
+        "message": "界面",
+        "description": "Appears in Options as a tab header for options related to GUI and sounds. To fit inside the button, it should not be longer than ~20-25 characters (depending on their width)."
+    },
+    "optionsTabKeyBinds": {
+        "message": "快捷键",
+        "description": "Appears in Options as a tab header for keybinds. To fit inside the button, it should not be longer than ~20-25 characters (depending on their width)."
+    },
+    "optionsTabBackup": {
+        "message": "备份/恢复",
+        "description": "Appears in Options as a tab header for options related to saving/restoring your settings. To fit inside the button, it should not be longer than ~20-25 characters (depending on their width)."
+    },
+    "optionsTabAdvanced": {
+        "message": "其他",
+        "description": "Appears in Options as a tab header for advanced/niche options. To fit inside the button, it should not be longer than ~20-25 characters (depending on their width)."
+    },
+    "noticeVisibilityLabel": {
+        "message": "跳过提醒外观",
+        "description": "Option label"
+    },
+    "unbind": {
+        "message": "解除绑定",
+        "description": "Unbind keyboard shortcut"
+    },
+    "notSet": {
+        "message": "未设置"
+    },
+    "change": {
+        "message": "更改"
+    },
+    "youtubeKeybindWarning": {
+        "message": "这是 Youtube 内置的快捷方式。您确定要使用吗？"
+    },
+    "betaServerWarning": {
+        "message": "测试服务器已启用！"
+    },
+    "openOptionsPage": {
+        "message": "打开选项页面"
+    },
+    "resetToDefault": {
+        "message": "重置所有设置"
+    },
+    "confirmResetToDefault": {
+        "message": "您确定要将所有设置重置为默认值吗？此操作无法撤销。"
+    },
+    "exportSegments": {
+        "message": "导出片段"
+    },
+    "importSegments": {
+        "message": "导入片段"
+    },
+    "Import": {
+        "message": "导入",
+        "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
+    },
+    "redeemSuccess": {
+        "message": "兑换成功！"
+    },
+    "redeemFailed": {
+        "message": "注册码无效"
+    },
+    "hideUpsells": {
+        "message": "隐藏需要额外付费才能使用的选项"
+    },
+    "chooseACountry": {
+        "message": "选择国家/地区"
+    },
+    "noDiscount": {
+        "message": "您无法使用折扣"
+    },
+    "discountLink": {
+        "message": "优惠折扣链接（查看粉色价格）"
+    },
+    "selectYourCountry": {
+        "message": "选择所在国家/地区"
+    },
+    "alreadyDonated": {
+        "message": "如果您以前曾捐赠过任何金额，您可以通过电子邮件联系以获得使用权限：",
+        "description": "After the colon is an email address"
+    },
+    "cantAfford": {
+        "message": "如果您无法负担得起许可证的价格，请点击 {here} 查看您是否有资格获得折扣",
+        "description": "Keep the curly braces. The word 'here' should be translated as well."
+    },
+    "patreonSignIn": {
+        "message": "使用 Patreon 登录"
+    },
+    "redeem": {
+        "message": "兑换"
+    },
+    "joinOnPatreon": {
+        "message": "在 Patreon 上支持我"
+    },
+    "oneTimePurchase": {
+        "message": "一次性购买"
+    },
+    "enterLicenseKey": {
+        "message": "输入注册码"
+    },
+    "chaptersPage1": {
+        "message": "SponsorBlock 的众包章节功能仅供付费或贡献突出的用户使用"
+    },
+    "chaptersPage2": {
+        "message": "注意：提交章节的权限仍然基于信誉积分。购买许可证只允许您查看他人提交的章节",
+        "description": "On the chapters page for getting access to the paid chapters feature"
+    },
+    "chapterNewFeature": {
+        "message": "新功能：众包自定义章节。这些视频中自定义命名的部分可以叠加并获得更精确的信息。购买许可证以查看此视频的章节，例如：",
+        "description": "After the comma, a list of chapters for this video will appear"
+    },
+    "chapterNewFeature2": {
+        "message": "新功能：众包自定义章节。这些视频中自定义命名的部分可以叠加并获得更精确的信息。您有免费使用权限，请在选项中开启。"
+    },
+    "unsubmittedSegmentCounts": {
+        "message": "您在 {1} 中有 {0}",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
+    },
+    "unsubmittedSegmentCountsZero": {
+        "message": "您目前没有未提交的片段",
+        "description": "Replaces 'unsubmittedSegmentCounts' string when there are no unsubmitted segments"
+    },
+    "unsubmittedSegmentsSingular": {
+        "message": "未提交的片段",
+        "description": "Example: You currently have 1 *unsubmitted segment* on 1 video"
+    },
+    "unsubmittedSegmentsPlural": {
+        "message": "未提交的片段",
+        "description": "Example: You currently have 12 *unsubmitted segments* on 5 videos"
+    },
+    "videosSingular": {
+        "message": "视频",
+        "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"
+    },
+    "videosPlural": {
+        "message": "视频",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
+    },
+    "clearUnsubmittedSegments": {
+        "message": "清除所有片段",
+        "description": "Label for a button in settings"
+    },
+    "clearUnsubmittedSegmentsConfirm": {
+        "message": "您确定要清除所有未提交的片段吗？",
+        "description": "Confirmation message for the Clear unsubmitted segments button"
+    },
+    "showUnsubmittedSegments": {
+        "message": "显示片段",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "hideUnsubmittedSegments": {
+        "message": "隐藏片段",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "videoID": {
+        "message": "视频ID",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "segmentCount": {
+        "message": "片段数",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "actions": {
+        "message": "操作",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "exportSegmentsAsURL": {
+        "message": "分享链接"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "警告：服务器未响应。片段可能已提交，只是由于服务器问题您未收到回应。"
+    },
+    "allowScrollingToEdit": {
+        "message": "允许滚动编辑时间"
     }
 }

public/_locales/zh_TW/messages.json

@@ -35,6 +35,9 @@
         "message": "以章節渲染片段",
         "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
     },
+    "showSegmentNameInChapterBar": {
+        "message": "在影片時間旁顯示目前片段"
+    },
     "upvoteButtonInfo": {
         "message": "為這個提交按讚"
     },
@@ -113,6 +116,9 @@
     "connectionError": {
         "message": "已發生連線錯誤。錯誤碼： "
     },
+    "segmentsStillLoading": {
+        "message": "片段還在載入..."
+    },
     "clearTimes": {
         "message": "清除片段"
     },
@@ -122,8 +128,8 @@
     "closePopup": {
         "message": "關閉彈出視窗"
     },
-    "SubmitTimes": {
-        "message": "提交分段"
+    "closeIcon": {
+        "message": "關閉圖示"
     },
     "sortSegments": {
         "message": "排序片段"
@@ -162,9 +168,6 @@
     "clearTimesButton": {
         "message": "清除時間"
     },
-    "submitTimesButton": {
-        "message": "提交時間"
-    },
     "publicStats": {
         "message": "這會被公開的統計頁面來展示您的貢獻。查看它"
     },
@@ -408,9 +411,18 @@
     "statusReminder": {
         "message": "在 status.sponsor.ajay.app 檢查伺服器狀態"
     },
+    "changeUserID": {
+        "message": "匯入/匯出您的密鑰 ID"
+    },
     "whatChangeUserID": {
         "message": "密鑰應被保密。它就像是密碼，不應與他人分享。若密鑰落入他人手中，他人將可以冒充你。若你在尋找你的公開使用者ID，點擊彈出視窗上的剪貼簿圖示"
     },
+    "setUserID": {
+        "message": "設定密鑰 ID"
+    },
+    "userIDChangeWarning": {
+        "message": "警告：更改用戶 ID 是永久性的。您確定要這麼做嗎？請務必備份您的舊用戶 ID 來以防萬一。"
+    },
     "createdBy": {
         "message": "作者"
     },
@@ -508,6 +520,9 @@
     "exportOptionsUpload": {
         "message": "從檔案載入"
     },
+    "whatExportOptions": {
+        "message": "這是您全部設定的 JSON 格式。它包含了您的密鑰 ID ，所以您一定要謹慎的保管它。"
+    },
     "setOptions": {
         "message": "設定選項"
     },
@@ -833,7 +848,7 @@
         "message": "未偵測到頻道ID，如果您正在使用嵌入式YouTube播放器，請移至YouTube網站上觀看本影片。此問題亦有可能是由於YouTube改變了系統架構，如果你認為這是造成此問題的原因，請留言告訴我們："
     },
     "invidiousPermissionRefresh": {
-        "message": "瀏覽器已收回存取第三方網頁 (例如 Invidious) 的權限，請點擊下方按鈕以重新給予此權限。"
+        "message": "瀏覽器已撤銷在 Invidious 和其他第三方網站上運行所需的權限。請點擊下方按鈕以重新給予此權限。"
     },
     "acceptPermission": {
         "message": "允許權限"
@@ -1022,6 +1037,12 @@
     "hideSegment": {
         "message": "隱藏片段"
     },
+    "skipSegment": {
+        "message": "略過片段"
+    },
+    "playChapter": {
+        "message": "播放章節"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "在滑鼠鼠標放在編輯框上時使用滾輪以快速調製時間。Ctrl和Shift可以用於精密調整"
     },
@@ -1088,6 +1109,9 @@
     "exportSegments": {
         "message": "匯出片段"
     },
+    "importSegments": {
+        "message": "匯入片段"
+    },
     "Import": {
         "message": "匯入",
         "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
@@ -1108,13 +1132,13 @@
         "message": "你不能使用優惠"
     },
     "discountLink": {
-        "message": "優惠連結 (看粉色的價格)"
+        "message": "優惠連結（看粉色的價格）"
     },
     "selectYourCountry": {
         "message": "選擇國家"
     },
     "alreadyDonated": {
-        "message": "如果你在之前捐獻過 (任何金額)，你可以發送電子郵件到以下地址以獲得免費存取權：",
+        "message": "如果你在之前捐獻過任何金額，你可以發送電子郵件到以下地址以獲得免費存取權：",
         "description": "After the colon is an email address"
     },
     "cantAfford": {
@@ -1180,7 +1204,7 @@
         "description": "Show/hide button for the unsubmitted segments list"
     },
     "videoID": {
-        "message": "影片ID",
+        "message": "影片 ID",
         "description": "Header of the unsubmitted segments list"
     },
     "segmentCount": {
@@ -1193,5 +1217,8 @@
     },
     "exportSegmentsAsURL": {
         "message": "分享連結"
+    },
+    "allowScrollingToEdit": {
+        "message": "允許在編輯時滾動"
     }
 }

public/content.css

@@ -803,3 +803,44 @@ input::-webkit-inner-spin-button {
 	color: #fff;
 	opacity: .7;
 }
+
+/* full video labels on thumbnails */
+.sponsorThumbnailLabel {
+	display: none;
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: 0.5em;
+	margin: 0.5em;
+	border-radius: 2em;
+	z-index: 1000;
+	background-color: var(--category-color, #000);
+	opacity: 0.7;
+	box-shadow: 0 0 8px 2px #333;
+	font-size: 10px;
+}
+
+.sponsorThumbnailLabel.sponsorThumbnailLabelVisible {
+	display: flex;
+}
+
+.sponsorThumbnailLabel svg {
+	height: 2em;
+	fill: var(--category-text-color, #fff);
+}
+
+.sponsorThumbnailLabel span {
+	display: none;
+	padding-left: 0.25em;
+	font-size: 1.5em;
+	color: var(--category-text-color, #fff);
+}
+
+.sponsorThumbnailLabel:hover {
+	border-radius: 0.25em;
+	opacity: 1;
+}
+
+.sponsorThumbnailLabel:hover span {
+	display: inline;
+}

public/help/index.html

@@ -8,7 +8,6 @@
 
   <link href="styles.css" rel="stylesheet"/>
 
-  <script src="../js/vendor.js"></script>
   <script src="../js/help.js"></script>
 </head>
 

public/options/options.css

@@ -696,4 +696,9 @@ svg {
 .upsellButton {
     cursor: pointer;
     vertical-align: middle;
+}
+
+.no-bottom-border {
+    border: none !important;
+    padding: 20px 0px 0px 0px !important;
 }

public/options/options.html

@@ -9,7 +9,6 @@
   
   <link href="options.css" rel="stylesheet"/>
 
-  <script src="../js/vendor.js"></script>
   <script src="../js/options.js"></script>
 </head>
 
@@ -78,7 +77,7 @@
 					</div>
 				</div>
 				
-				<div data-type="toggle" data-sync="fullVideoSegments">
+				<div data-type="toggle" data-sync="fullVideoSegments" class="no-bottom-border">
 					<div class="switch-container">
 						<label class="switch">
 							<input id="fullVideoSegments" type="checkbox" checked>
@@ -90,6 +89,19 @@
 					</div>
 				</div>
 
+				<div data-type="toggle" data-sync="fullVideoLabelsOnThumbnails" 
+						data-dependent-on="fullVideoSegments">
+					<div class="switch-container">
+						<label class="switch">
+							<input id="fullVideoLabelsOnThumbnails" type="checkbox" checked>
+							<span class="slider round"></span>
+						</label>
+						<label class="switch-label" for="fullVideoLabelsOnThumbnails">
+							__MSG_fullVideoLabelsOnThumbnails__
+						</label>
+					</div>
+				</div>
+
 				<div data-type="number-change" data-sync="minDuration">
 					<label class="number-container">
 						<span class="optionLabel">__MSG_minDuration__</span>
@@ -442,7 +454,7 @@
 
 			<div id="advanced" class="option-group hidden">
 
-				<div id="support-invidious" data-type="toggle" data-sync="supportInvidious" data-no-safari="true">
+				<div id="support-invidious" data-type="toggle" data-sync="supportInvidious">
 					<div class="switch-container">
 						<label class="switch">
 							<input id="supportInvidious" type="checkbox">
@@ -457,7 +469,7 @@
 					<div class="small-description">__MSG_supportOtherSitesDescription__ </div>
 				</div>
 	
-				<div data-type="private-text-change" data-sync="invidiousInstances" data-no-safari="true" data-dependent-on="supportInvidious">
+				<div data-type="private-text-change" data-sync="invidiousInstances" data-dependent-on="supportInvidious">
 					<div class="option-button trigger-button">
 						__MSG_addInvidiousInstance__
 					</div>

public/oss-attribution/attribution.txt

@@ -1,5 +1,5 @@
 @ajayyy/maze-utils
-1.0.3 <https://github.com/ajayyy/SponsorBlock>
+1.1.7 <https://github.com/ajayyy/SponsorBlock>
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -167,6 +167,36 @@ permanent authorization for you to choose that version for the
 Library.
 
 
+******************************
+
+content-scripts-register-polyfill
+4.0.2 <https://github.com/fregante/content-scripts-register-polyfill>
+MIT License
+
+Copyright (c) Federico Brigante <me@fregante.com> (https://fregante.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+escape-string-regexp
+5.0.0 <https://github.com/sindresorhus/escape-string-regexp>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 ******************************
 
 js-tokens
@@ -300,3 +330,48 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+******************************
+
+webext-content-scripts
+2.5.2 <https://github.com/fregante/webext-content-scripts>
+MIT License
+
+Copyright (c) Federico Brigante <me@fregante.com> (https://fregante.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+webext-patterns
+1.3.0 <https://github.com/fregante/webext-patterns>
+MIT License
+
+Copyright (c) Federico Brigante <me@fregante.com> (https://fregante.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+webext-polyfill-kinda
+1.0.0 <https://github.com/fregante/webext-polyfill-kinda>
+MIT License
+
+Copyright (c) Federico Brigante <me@fregante.com> (https://fregante.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

public/permissions/index.html

@@ -6,7 +6,6 @@
 
   <link href="styles.css" rel="stylesheet"/>
 
-  <script src="../js/vendor.js"></script>
   <script src="../js/permissions.js"></script>
 </head>
 

public/popup.html

@@ -105,7 +105,7 @@
         <sub class="sponsorStartHint grey-text">__MSG_popupHint__</sub>
         <div style="text-align: center; margin: 8px 0;">
           <button id="sponsorStart" class="sbMediumButton" style="margin-right: 8px">__MSG_sponsorStart__</button>
-          <button id="submitTimes" class="sbMediumButton" style="display: none">__MSG_submitTimesButton__</button>
+          <button id="submitTimes" class="sbMediumButton" style="display: none">__MSG_OpenSubmissionMenu__</button>
         </div>
         <span id="submissionHint" style="display: none">__MSG_submissionEditHint__</span>
       </div>
@@ -202,7 +202,6 @@
 
     </div>
     <!-- Scripts that need to load after the html -->
-    <script src="./js/vendor.js" async></script>
     <script src="./js/popup.js" async></script>
   </body>
 </html>

public/upsell/index.html

@@ -6,7 +6,6 @@
 
 	<link href="styles.css" rel="stylesheet" />
 
-	<script src="../js/vendor.js"></script>
 	<script src="../js/upsell.js"></script>
 </head>
 

src/background.ts

@@ -2,13 +2,16 @@ import * as CompileConfig from "../config.json";
 
 import Config from "./config";
 import { Registration } from "./types";
+import "content-scripts-register-polyfill";
+import { sendRealRequestToCustomServer, setupBackgroundRequestProxy } from "@ajayyy/maze-utils/lib/background-request-proxy";
+import { setupTabUpdates } from "@ajayyy/maze-utils/lib/tab-updates";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 // Make the config public for debugging purposes
 
 window.SB = Config;
 
 import Utils from "./utils";
-import { GenericUtils } from "./utils/genericUtils";
 const utils = new Utils({
     registerFirefoxContentScript,
     unregisterFirefoxContentScript
@@ -20,40 +23,12 @@ const popupPort: Record<string, chrome.runtime.Port> = {};
 const contentScriptRegistrations = {};
 
 // Register content script if needed
-if (utils.isFirefox()) {
-    utils.wait(() => Config.config !== null).then(function() {
-        if (Config.config.supportInvidious) utils.setupExtraSiteContentScripts();
-    });
-}
-
-function onTabUpdatedListener(tabId: number) {
-    chrome.tabs.sendMessage(tabId, {
-        message: 'update',
-    }, () => void chrome.runtime.lastError ); // Suppress error on Firefox
-}
-
-function onNavigationApiAvailableChange(changes: {[key: string]: chrome.storage.StorageChange}) {
-    if (changes.navigationApiAvailable) {
-        if (changes.navigationApiAvailable.newValue) {
-            chrome.tabs.onUpdated.removeListener(onTabUpdatedListener);
-        } else {
-            chrome.tabs.onUpdated.addListener(onTabUpdatedListener);
-        }
-    }
-}
-
-// If Navigation API is not supported, then background has to inform content script about video change.
-// This happens on Safari, Firefox, and Chromium 101 (inclusive) and below.
-chrome.tabs.onUpdated.addListener(onTabUpdatedListener);
-utils.wait(() => Config.local !== null).then(() => {
-    if (Config.local.navigationApiAvailable) {
-        chrome.tabs.onUpdated.removeListener(onTabUpdatedListener);
-    }
+utils.wait(() => Config.config !== null).then(function() {
+    if (Config.config.supportInvidious) utils.setupExtraSiteContentScripts();
 });
 
-if (!Config.configSyncListeners.includes(onNavigationApiAvailableChange)) {
-        Config.configSyncListeners.push(onNavigationApiAvailableChange);
-}
+setupBackgroundRequestProxy();
+setupTabUpdates(Config);
 
 chrome.runtime.onMessage.addListener(function (request, sender, callback) {
     switch(request.message) {
@@ -69,16 +44,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
         case "openPage":
             chrome.tabs.create({url: chrome.runtime.getURL(request.url)});
             return false;
-        case "sendRequest":
-            sendRequestToCustomServer(request.type, request.url, request.data).then(async (response) => {
-                callback({
-                    responseText: await response.text(),
-                    status: response.status,
-                    ok: response.ok
-                });
-            });
-
-            return true;
         case "submitVote":
             submitVote(request.type, request.UUID, request.category).then(callback);
 
@@ -141,7 +106,7 @@ chrome.runtime.onInstalled.addListener(function () {
             chrome.tabs.create({url: chrome.extension.getURL("/help/index.html")});
 
             //generate a userID
-            const newUserID = GenericUtils.generateUserID();
+            const newUserID = generateUserID();
             //save this UUID
             Config.config.userID = newUserID;
 
@@ -167,7 +132,7 @@ function registerFirefoxContentScript(options: Registration) {
     const oldRegistration = contentScriptRegistrations[options.id];
     if (oldRegistration) oldRegistration.unregister();
 
-    browser.contentScripts.register({
+    chrome.contentScripts.register({
         allFrames: options.allFrames,
         js: options.js,
         css: options.css,
@@ -181,8 +146,10 @@ function registerFirefoxContentScript(options: Registration) {
  *
  */
 function unregisterFirefoxContentScript(id: string) {
-    contentScriptRegistrations[id].unregister();
-    delete contentScriptRegistrations[id];
+    if (contentScriptRegistrations[id]) {
+        contentScriptRegistrations[id].unregister();
+        delete contentScriptRegistrations[id];
+    }
 }
 
 async function submitVote(type: number, UUID: string, category: string) {
@@ -190,7 +157,7 @@ async function submitVote(type: number, UUID: string, category: string) {
 
     if (userID == undefined || userID === "undefined") {
         //generate one
-        userID = GenericUtils.generateUserID();
+        userID = generateUserID();
         Config.config.userID = userID;
     }
 
@@ -221,35 +188,9 @@ async function submitVote(type: number, UUID: string, category: string) {
     }
 }
 
+
 async function asyncRequestToServer(type: string, address: string, data = {}) {
     const serverAddress = Config.config.testingServer ? CompileConfig.testingServerAddress : Config.config.serverAddress;
 
-    return await (sendRequestToCustomServer(type, serverAddress + address, data));
-}
-
-/**
- * Sends a request to the specified url
- *
- * @param type The request type "GET", "POST", etc.
- * @param address The address to add to the SponsorBlock server address
- * @param callback
- */
-async function sendRequestToCustomServer(type: string, url: string, data = {}) {
-    // If GET, convert JSON to parameters
-    if (type.toLowerCase() === "get") {
-        url = GenericUtils.objectToURI(url, data, true);
-
-        data = null;
-    }
-
-    const response = await fetch(url, {
-        method: type,
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        redirect: 'follow',
-        body: data ? JSON.stringify(data) : null
-    });
-
-    return response;
-}
+    return await (sendRealRequestToCustomServer(type, serverAddress + address, data));
+}

src/components/CategoryPillComponent.tsx

@@ -115,28 +115,15 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
     }
 
     private getColor(): string {
-        const configObject = Config.config.barTypes["preview-" + this.state.segment?.category] 
-            || Config.config.barTypes[this.state.segment?.category];
-        return configObject?.color;
+        // Handled by setCategoryColorCSSVariables() of content.ts
+        const category = this.state.segment?.category;
+        return `var(--sb-category-preview-${category}, var(--sb-category-${category}))`;
     }
 
     private getTextColor(): string {
-        const color = this.getColor();
-        if (!color) return null;
-
-        const existingCalculatedColor = Config.config.categoryPillColors[this.state.segment?.category];
-        if (existingCalculatedColor && existingCalculatedColor.lastColor === color) {
-            return existingCalculatedColor.textColor;
-        } else {
-            const luminance = GenericUtils.getLuminance(color);
-            const textColor = luminance > 128 ? "black" : "white";
-            Config.config.categoryPillColors[this.state.segment?.category] = {
-                lastColor: color,
-                textColor
-            };
-
-            return textColor;
-        }
+        // Handled by setCategoryColorCSSVariables() of content.ts
+        const category = this.state.segment?.category;
+        return `var(--sb-category-text-preview-${category}, var(--sb-category-text-${category}))`;
     }
 
     private openTooltip(): void {

src/components/SkipNoticeComponent.tsx

@@ -13,7 +13,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import PencilSvg from "../svg-icons/pencil_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
-import { GenericUtils } from "../utils/genericUtils";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 enum SkipButtonState {
     Undo, // Unskip
@@ -542,7 +542,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         const sponsorVideoID = this.props.contentContainer().sponsorVideoID;
         const sponsorTimesSubmitting : SponsorTime = {
             segment: this.segments[index].segment,
-            UUID: GenericUtils.generateUserID() as SegmentUUID,
+            UUID: generateUserID() as SegmentUUID,
             category: this.segments[index].category,
             actionType: this.segments[index].actionType,
             source: SponsorSourceType.Local

src/config.ts

@@ -1,7 +1,9 @@
 import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
-import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, StorageChangesObject, Keybind, HashedValue, VideoID, SponsorHideType } from "./types";
+import { Category, CategorySelection, CategorySkipOption, NoticeVisbilityMode, PreviewBarOption, SponsorTime, Keybind, VideoID, SponsorHideType } from "./types";
 import { keybindEquals } from "./utils/configUtils";
+import { ProtoConfig } from "@ajayyy/maze-utils/lib/config";
+import { HashedValue } from "@ajayyy/maze-utils/lib/hash";
 
 export interface Permission {
     canSubmit: boolean;
@@ -25,6 +27,7 @@ interface SBConfig {
     disableSkipping: boolean;
     muteSegments: boolean;
     fullVideoSegments: boolean;
+    fullVideoLabelsOnThumbnails: boolean;
     manualSkipOnFullVideo: boolean;
     trackViewCount: boolean;
     trackViewCountInPrivate: boolean;
@@ -121,7 +124,7 @@ interface SBConfig {
     };
 }
 
-export type VideoDownvotes = { segments: { uuid: HashedValue; hidden: SponsorHideType }[] ; lastAccess: number };
+export type VideoDownvotes = { segments: { uuid: HashedValue; hidden: SponsorHideType }[]; lastAccess: number };
 
 interface SBStorage {
     /* VideoID prefixes to UUID prefixes */
@@ -129,336 +132,16 @@ interface SBStorage {
     navigationApiAvailable: boolean;
 }
 
-export interface SBObject {
-    configLocalListeners: Array<(changes: StorageChangesObject) => unknown>;
-    configSyncListeners: Array<(changes: StorageChangesObject) => unknown>;
-    syncDefaults: SBConfig;
-    localDefaults: SBStorage;
-    cachedSyncConfig: SBConfig;
-    cachedLocalStorage: SBStorage;
-    config: SBConfig;
-    local: SBStorage;
-    forceSyncUpdate(prop: string): void;
-    forceLocalUpdate(prop: string): void;
-    resetToDefault(): void;
-}
-
-const Config: SBObject = {
-    /**
-     * Callback function when an option is updated
-     */
-    configLocalListeners: [],
-    configSyncListeners: [],
-    syncDefaults: {
-        userID: null,
-        isVip: false,
-        permissions: {},
-        unsubmittedSegments: {},
-        defaultCategory: "chooseACategory" as Category,
-        renderSegmentsAsChapters: false,
-        whitelistedChannels: [],
-        forceChannelCheck: false,
-        minutesSaved: 0,
-        skipCount: 0,
-        sponsorTimesContributed: 0,
-        submissionCountSinceCategories: 0,
-        showTimeWithSkips: true,
-        disableSkipping: false,
-        muteSegments: true,
-        fullVideoSegments: true,
-        manualSkipOnFullVideo: false,
-        trackViewCount: true,
-        trackViewCountInPrivate: true,
-        trackDownvotes: true,
-        dontShowNotice: false,
-        noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
-        hideVideoPlayerControls: false,
-        hideInfoButtonPlayerControls: false,
-        hideDeleteButtonPlayerControls: false,
-        hideUploadButtonPlayerControls: false,
-        hideSkipButtonPlayerControls: false,
-        hideDiscordLaunches: 0,
-        hideDiscordLink: false,
-        invidiousInstances: ["invidious.snopyta.org"], // leave as default
-        supportInvidious: false,
-        serverAddress: CompileConfig.serverAddress,
-        minDuration: 0,
-        skipNoticeDuration: 4,
-        audioNotificationOnSkip: false,
-        checkForUnlistedVideos: false,
-        testingServer: false,
-        refetchWhenNotFound: true,
-        ytInfoPermissionGranted: false,
-        allowExpirements: true,
-        showDonationLink: true,
-        showPopupDonationCount: 0,
-        showUpsells: true,
-        donateClicked: 0,
-        autoHideInfoButton: true,
-        autoSkipOnMusicVideos: false,
-        scrollToEditTimeUpdate: false, // false means the tooltip will be shown
-        categoryPillUpdate: false,
-        showChapterInfoMessage: true,
-        darkMode: true,
-        showCategoryGuidelines: true,
-        showCategoryWithoutPermission: false,
-        showSegmentNameInChapterBar: true,
-        useVirtualTime: true,
-        showSegmentFailedToFetchWarning: true,
-        allowScrollingToEdit: true,
-
-        categoryPillColors: {},
-
-        /**
-         * Default keybinds should not set "code" as that's gonna be different based on the user's locale. They should also only use EITHER ctrl OR alt modifiers (or none).
-         * Using ctrl+alt, or shift may produce a different character that we will not be able to recognize in different locales.
-         * The exception for shift is letters, where it only capitalizes. So shift+A is fine, but shift+1 isn't.
-         * Don't forget to add the new keybind to the checks in "KeybindDialogComponent.isKeybindAvailable()" and in "migrateOldFormats()"!
-         *      TODO: Find a way to skip having to update these checks. Maybe storing keybinds in a Map?
-         */
-        skipKeybind: {key: "Enter"},
-        startSponsorKeybind: {key: ";"},
-        submitKeybind: {key: "'"},
-        nextChapterKeybind: {key: "ArrowRight", ctrl: true},
-        previousChapterKeybind: {key: "ArrowLeft", ctrl: true},
-
-        categorySelections: [{
-            name: "sponsor" as Category,
-            option: CategorySkipOption.AutoSkip
-        }, {
-            name: "poi_highlight" as Category,
-            option: CategorySkipOption.ManualSkip
-        }, {
-            name: "exclusive_access" as Category,
-            option: CategorySkipOption.ShowOverlay
-        }],
-
-        payments: {
-            licenseKey: null,
-            lastCheck: 0,
-            lastFreeCheck: 0,
-            freeAccess: false,
-            chaptersAllowed: false
-        },
-
-        colorPalette: {
-            red: "#780303",
-            white: "#ffffff",
-            locked: "#ffc83d"
-        },
-
-        // Preview bar
-        barTypes: {
-            "preview-chooseACategory": {
-                color: "#ffffff",
-                opacity: "0.7"
-            },
-            "sponsor": {
-                color: "#00d400",
-                opacity: "0.7"
-            },
-            "preview-sponsor": {
-                color: "#007800",
-                opacity: "0.7"
-            },
-            "selfpromo": {
-                color: "#ffff00",
-                opacity: "0.7"
-            },
-            "preview-selfpromo": {
-                color: "#bfbf35",
-                opacity: "0.7"
-            },
-            "exclusive_access": {
-                color: "#008a5c",
-                opacity: "0.7"
-            },
-            "interaction": {
-                color: "#cc00ff",
-                opacity: "0.7"
-            },
-            "preview-interaction": {
-                color: "#6c0087",
-                opacity: "0.7"
-            },
-            "intro": {
-                color: "#00ffff",
-                opacity: "0.7"
-            },
-            "preview-intro": {
-                color: "#008080",
-                opacity: "0.7"
-            },
-            "outro": {
-                color: "#0202ed",
-                opacity: "0.7"
-            },
-            "preview-outro": {
-                color: "#000070",
-                opacity: "0.7"
-            },
-            "preview": {
-                color: "#008fd6",
-                opacity: "0.7"
-            },
-            "preview-preview": {
-                color: "#005799",
-                opacity: "0.7"
-            },
-            "music_offtopic": {
-                color: "#ff9900",
-                opacity: "0.7"
-            },
-            "preview-music_offtopic": {
-                color: "#a6634a",
-                opacity: "0.7"
-            },
-            "poi_highlight": {
-                color: "#ff1684",
-                opacity: "0.7"
-            },
-            "preview-poi_highlight": {
-                color: "#9b044c",
-                opacity: "0.7"
-            },
-            "filler": {
-                color: "#7300FF",
-                opacity: "0.9"
-            },
-            "preview-filler": {
-                color: "#2E0066",
-                opacity: "0.7"
-            }
-        }
-    },
-    localDefaults: {
-        downvotedSegments: {},
-        navigationApiAvailable: null
-    },
-    cachedSyncConfig: null,
-    cachedLocalStorage: null,
-    config: null,
-    local: null,
-    forceSyncUpdate,
-    forceLocalUpdate,
-    resetToDefault
-};
-
-// Function setup
-
-function configProxy(): { sync: SBConfig; local: SBStorage } {
-    chrome.storage.onChanged.addListener((changes: {[key: string]: chrome.storage.StorageChange}, areaName) => {
-        if (areaName === "sync") {
-            for (const key in changes) {
-                Config.cachedSyncConfig[key] = changes[key].newValue;
-            }
-
-            for (const callback of Config.configSyncListeners) {
-                callback(changes);
-            }
-        } else if (areaName === "local") {
-            for (const key in changes) {
-                Config.cachedLocalStorage[key] = changes[key].newValue;
-            }
-
-            for (const callback of Config.configLocalListeners) {
-                callback(changes);
-            }
-        }
-    });
-
-    const syncHandler: ProxyHandler<SBConfig> = {
-        set<K extends keyof SBConfig>(obj: SBConfig, prop: K, value: SBConfig[K]) {
-            Config.cachedSyncConfig[prop] = value;
-
-            chrome.storage.sync.set({
-                [prop]: value
-            });
-
-            return true;
-        },
-
-        get<K extends keyof SBConfig>(obj: SBConfig, prop: K): SBConfig[K] {
-            const data = Config.cachedSyncConfig[prop];
-
-            return obj[prop] || data;
-        },
-
-        deleteProperty(obj: SBConfig, prop: keyof SBConfig) {
-            chrome.storage.sync.remove(<string> prop);
-
-            return true;
-        }
-
-    };
-
-    const localHandler: ProxyHandler<SBStorage> = {
-        set<K extends keyof SBStorage>(obj: SBStorage, prop: K, value: SBStorage[K]) {
-            Config.cachedLocalStorage[prop] = value;
-
-            chrome.storage.local.set({
-                [prop]: value
-            });
-
-            return true;
-        },
-
-        get<K extends keyof SBStorage>(obj: SBStorage, prop: K): SBStorage[K] {
-            const data = Config.cachedLocalStorage[prop];
-
-            return obj[prop] || data;
-        },
-
-        deleteProperty(obj: SBStorage, prop: keyof SBStorage) {
-            chrome.storage.local.remove(<string> prop);
-
-            return true;
-        }
-
-    };
-
-    return {
-        sync: new Proxy<SBConfig>({ handler: syncHandler } as unknown as SBConfig, syncHandler),
-        local: new Proxy<SBStorage>({ handler: localHandler } as unknown as SBStorage, localHandler)
-    };
-}
-
-function forceSyncUpdate(prop: string): void {
-    const value = Config.cachedSyncConfig[prop];
-    if (prop === "unsubmittedSegments") {
-        // Early to be safe
-        if (JSON.stringify(value).length + prop.length > 8000) {
-            for (const key in value) {
-                if (!value[key] || value[key].length <= 0) {
-                    delete value[key];
-                }
-            }
-        }
+class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
+    resetToDefault() {
+        chrome.storage.sync.set({
+            ...this.syncDefaults,
+            userID: this.config.userID,
+            minutesSaved: this.config.minutesSaved,
+            skipCount: this.config.skipCount,
+            sponsorTimesContributed: this.config.sponsorTimesContributed
+        });
     }
-
-    chrome.storage.sync.set({
-        [prop]: value
-    });
-}
-
-function forceLocalUpdate(prop: string): void {
-    chrome.storage.local.set({
-        [prop]: Config.cachedLocalStorage[prop]
-    });
-}
-
-async function fetchConfig(): Promise<void> {
-    await Promise.all([new Promise<void>((resolve) => {
-        chrome.storage.sync.get(null, function(items) {
-            Config.cachedSyncConfig = <SBConfig> <unknown> items;
-            resolve();
-        });
-    }), new Promise<void>((resolve) => {
-        chrome.storage.local.get(null, function(items) {
-            Config.cachedLocalStorage = <SBStorage> <unknown> items;
-            resolve();
-        });
-    })]);
 }
 
 function migrateOldSyncFormats(config: SBConfig) {
@@ -500,7 +183,7 @@ function migrateOldSyncFormats(config: SBConfig) {
         config["autoSkipOnMusicVideosUpdate"] = true;
         for (const selection of config.categorySelections) {
             if (selection.name === "music_offtopic"
-                    && selection.option === CategorySkipOption.AutoSkip) {
+                && selection.option === CategorySkipOption.AutoSkip) {
 
                 config.autoSkipOnMusicVideos = true;
                 break;
@@ -519,20 +202,20 @@ function migrateOldSyncFormats(config: SBConfig) {
     }
 
     if (typeof config["skipKeybind"] == "string") {
-        config["skipKeybind"] = {key: config["skipKeybind"]};
+        config["skipKeybind"] = { key: config["skipKeybind"] };
     }
 
     if (typeof config["startSponsorKeybind"] == "string") {
-        config["startSponsorKeybind"] = {key: config["startSponsorKeybind"]};
+        config["startSponsorKeybind"] = { key: config["startSponsorKeybind"] };
     }
 
     if (typeof config["submitKeybind"] == "string") {
-        config["submitKeybind"] = {key: config["submitKeybind"]};
+        config["submitKeybind"] = { key: config["submitKeybind"] };
     }
 
     // Unbind key if it matches a previous one set by the user (should be ordered oldest to newest)
     const keybinds = ["skipKeybind", "startSponsorKeybind", "submitKeybind"];
-    for (let i = keybinds.length-1; i >= 0; i--) {
+    for (let i = keybinds.length - 1; i >= 0; i--) {
         for (let j = 0; j < keybinds.length; j++) {
             if (i == j)
                 continue;
@@ -550,59 +233,203 @@ function migrateOldSyncFormats(config: SBConfig) {
     }
 
     // populate invidiousInstances with new instances if 3p support is **DISABLED**
-    if (!config["supportInvidious"] && config["invidiousInstances"].length !== invidiousList.length) {
-        config["invidiousInstances"] = invidiousList;
+    if (!config["supportInvidious"] && config["invidiousInstances"].length < invidiousList.length) {
+        config["invidiousInstances"] = [...new Set([...invidiousList, ...config["invidiousInstances"]])];
     }
-    
+
     if (config["lastIsVipUpdate"]) {
         chrome.storage.sync.remove("lastIsVipUpdate");
     }
 }
 
-async function setupConfig() {
-    if (typeof(chrome) === "undefined") return;
+const syncDefaults = {
+    userID: null,
+    isVip: false,
+    permissions: {},
+    unsubmittedSegments: {},
+    defaultCategory: "chooseACategory" as Category,
+    renderSegmentsAsChapters: false,
+    whitelistedChannels: [],
+    forceChannelCheck: false,
+    minutesSaved: 0,
+    skipCount: 0,
+    sponsorTimesContributed: 0,
+    submissionCountSinceCategories: 0,
+    showTimeWithSkips: true,
+    disableSkipping: false,
+    muteSegments: true,
+    fullVideoSegments: true,
+    fullVideoLabelsOnThumbnails: true,
+    manualSkipOnFullVideo: false,
+    trackViewCount: true,
+    trackViewCountInPrivate: true,
+    trackDownvotes: true,
+    dontShowNotice: false,
+    noticeVisibilityMode: NoticeVisbilityMode.FadedForAutoSkip,
+    hideVideoPlayerControls: false,
+    hideInfoButtonPlayerControls: false,
+    hideDeleteButtonPlayerControls: false,
+    hideUploadButtonPlayerControls: false,
+    hideSkipButtonPlayerControls: false,
+    hideDiscordLaunches: 0,
+    hideDiscordLink: false,
+    invidiousInstances: ["invidious.snopyta.org"], // leave as default
+    supportInvidious: false,
+    serverAddress: CompileConfig.serverAddress,
+    minDuration: 0,
+    skipNoticeDuration: 4,
+    audioNotificationOnSkip: false,
+    checkForUnlistedVideos: false,
+    testingServer: false,
+    refetchWhenNotFound: true,
+    ytInfoPermissionGranted: false,
+    allowExpirements: true,
+    showDonationLink: true,
+    showPopupDonationCount: 0,
+    showUpsells: true,
+    donateClicked: 0,
+    autoHideInfoButton: true,
+    autoSkipOnMusicVideos: false,
+    scrollToEditTimeUpdate: false, // false means the tooltip will be shown
+    categoryPillUpdate: false,
+    showChapterInfoMessage: true,
+    darkMode: true,
+    showCategoryGuidelines: true,
+    showCategoryWithoutPermission: false,
+    showSegmentNameInChapterBar: true,
+    useVirtualTime: true,
+    showSegmentFailedToFetchWarning: true,
+    allowScrollingToEdit: true,
 
-    await fetchConfig();
-    addDefaults();
-    const config = configProxy();
-    migrateOldSyncFormats(config.sync);
+    categoryPillColors: {},
 
-    Config.config = config.sync;
-    Config.local = config.local;
-}
+    /**
+     * Default keybinds should not set "code" as that's gonna be different based on the user's locale. They should also only use EITHER ctrl OR alt modifiers (or none).
+     * Using ctrl+alt, or shift may produce a different character that we will not be able to recognize in different locales.
+     * The exception for shift is letters, where it only capitalizes. So shift+A is fine, but shift+1 isn't.
+     * Don't forget to add the new keybind to the checks in "KeybindDialogComponent.isKeybindAvailable()" and in "migrateOldFormats()"!
+     *      TODO: Find a way to skip having to update these checks. Maybe storing keybinds in a Map?
+     */
+    skipKeybind: { key: "Enter" },
+    startSponsorKeybind: { key: ";" },
+    submitKeybind: { key: "'" },
+    nextChapterKeybind: { key: "ArrowRight", ctrl: true },
+    previousChapterKeybind: { key: "ArrowLeft", ctrl: true },
 
-// Add defaults
-function addDefaults() {
-    for (const key in Config.syncDefaults) {
-        if(!Object.prototype.hasOwnProperty.call(Config.cachedSyncConfig, key)) {
-            Config.cachedSyncConfig[key] = Config.syncDefaults[key];
-        } else if (key === "barTypes") {
-            for (const key2 in Config.syncDefaults[key]) {
-                if(!Object.prototype.hasOwnProperty.call(Config.cachedSyncConfig[key], key2)) {
-                    Config.cachedSyncConfig[key][key2] = Config.syncDefaults[key][key2];
-                }
-            }
+    categorySelections: [{
+        name: "sponsor" as Category,
+        option: CategorySkipOption.AutoSkip
+    }, {
+        name: "poi_highlight" as Category,
+        option: CategorySkipOption.ManualSkip
+    }, {
+        name: "exclusive_access" as Category,
+        option: CategorySkipOption.ShowOverlay
+    }],
+
+    payments: {
+        licenseKey: null,
+        lastCheck: 0,
+        lastFreeCheck: 0,
+        freeAccess: false,
+        chaptersAllowed: false
+    },
+
+    colorPalette: {
+        red: "#780303",
+        white: "#ffffff",
+        locked: "#ffc83d"
+    },
+
+    // Preview bar
+    barTypes: {
+        "preview-chooseACategory": {
+            color: "#ffffff",
+            opacity: "0.7"
+        },
+        "sponsor": {
+            color: "#00d400",
+            opacity: "0.7"
+        },
+        "preview-sponsor": {
+            color: "#007800",
+            opacity: "0.7"
+        },
+        "selfpromo": {
+            color: "#ffff00",
+            opacity: "0.7"
+        },
+        "preview-selfpromo": {
+            color: "#bfbf35",
+            opacity: "0.7"
+        },
+        "exclusive_access": {
+            color: "#008a5c",
+            opacity: "0.7"
+        },
+        "interaction": {
+            color: "#cc00ff",
+            opacity: "0.7"
+        },
+        "preview-interaction": {
+            color: "#6c0087",
+            opacity: "0.7"
+        },
+        "intro": {
+            color: "#00ffff",
+            opacity: "0.7"
+        },
+        "preview-intro": {
+            color: "#008080",
+            opacity: "0.7"
+        },
+        "outro": {
+            color: "#0202ed",
+            opacity: "0.7"
+        },
+        "preview-outro": {
+            color: "#000070",
+            opacity: "0.7"
+        },
+        "preview": {
+            color: "#008fd6",
+            opacity: "0.7"
+        },
+        "preview-preview": {
+            color: "#005799",
+            opacity: "0.7"
+        },
+        "music_offtopic": {
+            color: "#ff9900",
+            opacity: "0.7"
+        },
+        "preview-music_offtopic": {
+            color: "#a6634a",
+            opacity: "0.7"
+        },
+        "poi_highlight": {
+            color: "#ff1684",
+            opacity: "0.7"
+        },
+        "preview-poi_highlight": {
+            color: "#9b044c",
+            opacity: "0.7"
+        },
+        "filler": {
+            color: "#7300FF",
+            opacity: "0.9"
+        },
+        "preview-filler": {
+            color: "#2E0066",
+            opacity: "0.7"
         }
     }
+};
 
-    for (const key in Config.localDefaults) {
-        if(!Object.prototype.hasOwnProperty.call(Config.cachedLocalStorage, key)) {
-            Config.cachedLocalStorage[key] = Config.localDefaults[key];
-        }
-    }
-}
+const localDefaults = {
+    downvotedSegments: {},
+    navigationApiAvailable: null
+};
 
-function resetToDefault() {
-    chrome.storage.sync.set({
-        ...Config.syncDefaults,
-        userID: Config.config.userID,
-        minutesSaved: Config.config.minutesSaved,
-        skipCount: Config.config.skipCount,
-        sponsorTimesContributed: Config.config.sponsorTimesContributed
-    });
-}
-
-// Sync config
-setupConfig();
-
-export default Config;
+const Config = new ConfigClass(syncDefaults, localDefaults, migrateOldSyncFormats);
+export default Config;

src/document.ts

@@ -1,95 +1,3 @@
-/*
-  Content script are run in an isolated DOM so it is not possible to access some key details that are sanitized when passed cross-dom
-  This script is used to get the details from the page and make them available for the content script by being injected directly into the page
-*/
+import { init } from "@ajayyy/maze-utils/lib/injected/document";
 
-import { PageType } from "./types";
-
-interface StartMessage {
-    type: "navigation";
-    pageType: PageType;
-    videoID: string | null;
-}
-
-interface FinishMessage extends StartMessage {
-    channelID: string;
-    channelTitle: string;
-}
-
-interface AdMessage {
-    type: "ad";
-    playing: boolean;
-}
-
-interface VideoData {
-    type: "data";
-    videoID: string;
-    isLive: boolean;
-    isPremiere: boolean;
-}
-
-type WindowMessage = StartMessage | FinishMessage | AdMessage | VideoData;
-
-// global playerClient - too difficult to type
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let playerClient: any;
-let lastVideo = "";
-
-const sendMessage = (message: WindowMessage): void => {
-    window.postMessage({ source: "sponsorblock", ...message }, "/");
-}
-
-function setupPlayerClient(e: CustomEvent): void {
-    if (playerClient) return; // early exit if already defined
-    
-    playerClient = e.detail;
-    sendVideoData(); // send playerData after setup
-
-    e.detail.addEventListener('onAdStart', () => sendMessage({ type: "ad", playing: true } as AdMessage));
-    e.detail.addEventListener('onAdFinish', () => sendMessage({ type: "ad", playing: false } as AdMessage));
-}
-
-document.addEventListener("yt-player-updated", setupPlayerClient);
-document.addEventListener("yt-navigate-start", navigationStartSend);
-document.addEventListener("yt-navigate-finish", navigateFinishSend);
-
-function navigationParser(event: CustomEvent): StartMessage {
-    const pageType: PageType = event.detail.pageType;
-    if (pageType) {
-        const result: StartMessage = { type: "navigation", pageType, videoID: null };
-        if (pageType === "shorts" || pageType === "watch") {
-            const endpoint = event.detail.endpoint
-            if (!endpoint) return null;
-            
-            result.videoID = (pageType === "shorts" ? endpoint.reelWatchEndpoint : endpoint.watchEndpoint).videoId;
-        }
-
-        return result;
-    } else {
-        return null;
-    }
-}
-
-function navigationStartSend(event: CustomEvent): void {
-    const message = navigationParser(event) as StartMessage;
-    if (message) {
-        sendMessage(message);
-    }
-}
-
-function navigateFinishSend(event: CustomEvent): void {
-    sendVideoData(); // arrived at new video, send video data
-    const videoDetails = event.detail?.response?.playerResponse?.videoDetails;
-    if (videoDetails) {
-        sendMessage({ channelID: videoDetails.channelId, channelTitle: videoDetails.author, ...navigationParser(event) } as FinishMessage);
-    }
-}
-
-function sendVideoData(): void {
-    if (!playerClient) return;
-    const videoData = playerClient.getVideoData();
-    if (videoData && videoData.video_id !== lastVideo) {
-        lastVideo = videoData.video_id;
-        sendMessage({ type: "data", videoID: videoData.video_id, isLive: videoData.isLive, isPremiere: videoData.isPremiere } as VideoData);
-    }
-}
+init();

src/js-components/previewBar.ts

@@ -11,8 +11,8 @@ import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceT
 import { partition } from "../utils/arrayUtils";
 import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
 import { normalizeChapterName } from "../utils/exporter";
-import { findValidElement } from "../utils/pageUtils";
 import { getFormattedTimeToSeconds } from "@ajayyy/maze-utils/lib/formating";
+import { findValidElement } from "@ajayyy/maze-utils/lib/dom";
 
 const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 const MIN_CHAPTER_SIZE = 0.003;
@@ -331,7 +331,8 @@ class PreviewBar {
         const fullCategoryName = (unsubmitted ? 'preview-' : '') + category;
         bar.setAttribute('sponsorblock-category', fullCategoryName);
 
-        bar.style.backgroundColor = Config.config.barTypes[fullCategoryName]?.color;
+        // Handled by setCategoryColorCSSVariables() of content.ts
+        bar.style.backgroundColor = `var(--sb-category-${fullCategoryName})`;
         if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[fullCategoryName]?.opacity;
 
         bar.style.position = "absolute";

src/options.ts

@@ -14,7 +14,8 @@ import UnsubmittedVideos from "./render/UnsubmittedVideos";
 import KeybindComponent from "./components/options/KeybindComponent";
 import { showDonationLink } from "./utils/configUtils";
 import { localizeHtmlPage } from "./utils/pageUtils";
-import { StorageChangesObject } from "./types";
+import { StorageChangesObject } from "@ajayyy/maze-utils/lib/config";
+import { getHash } from "@ajayyy/maze-utils/lib/hash";
 const utils = new Utils();
 let embed = false;
 
@@ -430,7 +431,7 @@ function invidiousInstanceAddInit(element: HTMLElement, option: string) {
             let instanceList = Config.config[option];
             if (!instanceList) instanceList = [];
 
-            instanceList.push(textBox.value);
+            instanceList.push(textBox.value.trim().toLowerCase());
 
             Config.config[option] = instanceList;
 
@@ -532,7 +533,7 @@ function activatePrivateTextChange(element: HTMLElement) {
         case "userID":
             if (Config.config[option]) {
                 utils.asyncRequestToServer("GET", "/api/userInfo", {
-                    publicUserID: utils.getHash(Config.config[option]),
+                    publicUserID: getHash(Config.config[option]),
                     values: ["warnings", "banned"]
                 }).then((result) => {
                     const userInfo = JSON.parse(result.responseText);

src/popup.ts

@@ -7,7 +7,6 @@ import {
     SponsorHideType,
     SponsorSourceType,
     SponsorTime,
-    StorageChangesObject,
 } from "./types";
 import {
     GetChannelIDResponse,
@@ -28,6 +27,8 @@ import { exportTimes } from "./utils/exporter";
 import GenericNotice from "./render/GenericNotice";
 import { noRefreshFetchingChaptersAllowed } from "./utils/licenseKey";
 import { getFormattedTime } from "@ajayyy/maze-utils/lib/formating";
+import { StorageChangesObject } from "@ajayyy/maze-utils/lib/config";
+import { getHash } from "@ajayyy/maze-utils/lib/hash";
 
 const utils = new Utils();
 
@@ -231,7 +232,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     PageElements.optionsButton.addEventListener("click", openOptions);
     PageElements.helpButton.addEventListener("click", openHelp);
     PageElements.refreshSegmentsButton.addEventListener("click", refreshSegments);
-    PageElements.sbPopupIconCopyUserID.addEventListener("click", async () => copyToClipboard(await utils.getHash(Config.config.userID)));
+    PageElements.sbPopupIconCopyUserID.addEventListener("click", async () => copyToClipboard(await getHash(Config.config.userID)));
 
     // Forward click events
     if (window !== window.top) {
@@ -284,7 +285,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     if (!Config.config.payments.freeAccess && !noRefreshFetchingChaptersAllowed()) values.push("freeChaptersAccess");
 
     utils.asyncRequestToServer("GET", "/api/userInfo", {
-        publicUserID: await utils.getHash(Config.config.userID),
+        publicUserID: await getHash(Config.config.userID),
         values
     }).then((res) => {
         if (res.status === 200) {

src/render/CategoryPill.tsx

@@ -8,14 +8,19 @@ import { Tooltip } from "./Tooltip";
 import { waitFor } from "@ajayyy/maze-utils";
 import { getYouTubeTitleNode } from "@ajayyy/maze-utils/lib/elements";
 
+const id = "categoryPill";
+
 export class CategoryPill {
     container: HTMLElement;
     ref: React.RefObject<CategoryPillComponent>;
     root: Root;
 
-    unsavedState: CategoryPillState;
+    lastState: CategoryPillState;
 
     mutationObserver?: MutationObserver;
+    onMobileYouTube: boolean;
+    onInvidious: boolean;
+    vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>;
     
     constructor() {
         this.ref = React.createRef();
@@ -23,26 +28,35 @@ export class CategoryPill {
 
     async attachToPage(onMobileYouTube: boolean, onInvidious: boolean,
             vote: (type: number, UUID: SegmentUUID, category?: Category) => Promise<VoteResponse>): Promise<void> {
+        this.onMobileYouTube = onMobileYouTube;
+        this.onInvidious = onInvidious;
+        this.vote = vote;
+
+        this.attachToPageInternal();
+    }
+
+    private async attachToPageInternal(): Promise<void> {
         const referenceNode = 
             await waitFor(() => getYouTubeTitleNode());
 
         if (referenceNode && !referenceNode.contains(this.container)) {
             if (!this.container) {
                 this.container = document.createElement('span');
-                this.container.id = "categoryPill";
+                this.container.id = id;
                 this.container.style.display = "relative";
 
                 this.root = createRoot(this.container);
-                this.root.render(<CategoryPillComponent ref={this.ref} vote={vote} />);
+                this.ref = React.createRef();
+                this.root.render(<CategoryPillComponent ref={this.ref} vote={this.vote} />);
 
-                if (onMobileYouTube) {
+                if (this.onMobileYouTube) {
                     if (this.mutationObserver) {
                         this.mutationObserver.disconnect();
                     }
                     
                     this.mutationObserver = new MutationObserver((changes) => {
                         if (changes.some((change) => change.removedNodes.length > 0)) {
-                            this.attachToPage(onMobileYouTube, onInvidious, vote);
+                            this.attachToPageInternal();
                         }
                     });
     
@@ -53,13 +67,18 @@ export class CategoryPill {
                 }
             }
 
-            if (this.unsavedState) {
+            if (this.lastState) {
                 waitFor(() => this.ref.current).then(() => {
-                    this.ref.current?.setState(this.unsavedState);
+                    this.ref.current?.setState(this.lastState);
                 });
             }
-            
-            referenceNode.prepend(this.container);
+
+            // Use a parent because YouTube does weird things to the top level object
+            // react would have to rerender if container was the top level
+            const parent = document.createElement("span");
+            parent.appendChild(this.container);
+
+            referenceNode.prepend(parent);
             referenceNode.style.display = "flex";
         }
     }
@@ -75,11 +94,8 @@ export class CategoryPill {
             open: show ? this.ref.current?.state.open : false
         };
 
-        if (this.ref.current) {
-            this.ref.current?.setState(newState);
-        } else {
-            this.unsavedState = newState;
-        }
+        this.ref.current?.setState(newState);
+        this.lastState = newState;
     }
 
     async setSegment(segment: SponsorTime): Promise<void> {
@@ -90,11 +106,8 @@ export class CategoryPill {
                 open: false
             };
 
-            if (this.ref.current) {
-                this.ref.current?.setState(newState);
-            } else {
-                this.unsavedState = newState;
-            }
+            this.ref.current?.setState(newState);
+            this.lastState = newState;
 
             if (!Config.config.categoryPillUpdate) {
                 Config.config.categoryPillUpdate = true;
@@ -113,5 +126,9 @@ export class CategoryPill {
                 }
             }
         }
+
+        if (this.onMobileYouTube && !document.contains(this.container)) {
+            this.attachToPageInternal();
+        }
     }
 }

src/types.ts

@@ -26,14 +26,6 @@ export interface ContentContainer {
     };
 }
 
-export interface FetchResponse {
-    responseText: string;
-    status: number;
-    ok: boolean;
-}
-
-export type HashedValue = string & { __hashBrand: unknown };
-
 export interface VideoDurationResponse {
     duration: number;
 }
@@ -194,8 +186,6 @@ export interface VideoInfo {
 
 export type VideoID = string;
 
-export type StorageChangesObject = { [key: string]: chrome.storage.StorageChange };
-
 export type UnEncodedSegmentTimes = [string, SponsorTime[]][];
 
 export enum ChannelIDStatus {
@@ -239,15 +229,6 @@ export type Keybind = {
     shift?: boolean;
 }
 
-export enum PageType {
-    Shorts = "shorts",
-    Watch = "watch",
-    Search = "search",
-    Browse = "browse",
-    Channel = "channel",
-    Embed = "embed"
-}
-
 export interface ButtonListener {
     name: string;
     listener: (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;

src/utils.ts

@@ -1,9 +1,12 @@
 import Config, { VideoDownvotes } from "./config";
-import { CategorySelection, SponsorTime, FetchResponse, BackgroundScriptContainer, Registration, HashedValue, VideoID, SponsorHideType } from "./types";
+import { CategorySelection, SponsorTime, BackgroundScriptContainer, Registration, VideoID, SponsorHideType } from "./types";
 
+import { getHash, HashedValue } from "@ajayyy/maze-utils/lib/hash";
 import * as CompileConfig from "../config.json";
-import { findValidElement, findValidElementFromSelector } from "./utils/pageUtils";
 import { waitFor } from "@ajayyy/maze-utils";
+import { isSafari } from "./utils/configUtils";
+import { findValidElementFromSelector } from "@ajayyy/maze-utils/lib/dom";
+import { FetchResponse, sendRequestToCustomServer } from "@ajayyy/maze-utils/lib/background-request-proxy"
 
 export default class Utils {
     
@@ -12,7 +15,6 @@ export default class Utils {
 
     // Used to add content scripts and CSS required
     js = [
-        "./js/vendor.js",
         "./js/content.js"
     ];
     css = [
@@ -22,11 +24,6 @@ export default class Utils {
         "shared.css"
     ];
 
-    /* Used for waitForElement */
-    creatingWaitingMutationObserver = false;
-    waitingMutationObserver: MutationObserver = null;
-    waitingElements: { selector: string; visibleCheck: boolean; callback: (element: Element) => void }[] = [];
-
     constructor(backgroundScriptContainer: BackgroundScriptContainer = null) {
         this.backgroundScriptContainer = backgroundScriptContainer;
     }
@@ -35,74 +32,6 @@ export default class Utils {
         return waitFor(condition, timeout, check);
     }
 
-    /* Uses a mutation observer to wait asynchronously */
-    async waitForElement(selector: string, visibleCheck = false): Promise<Element> {
-        return await new Promise((resolve) => {
-            const initialElement = this.getElement(selector, visibleCheck);
-            if (initialElement) {
-                resolve(initialElement);
-                return;
-            }
-
-            this.waitingElements.push({
-                selector,
-                visibleCheck,
-                callback: resolve
-            });
-
-            if (!this.creatingWaitingMutationObserver) {
-                this.creatingWaitingMutationObserver = true;
-
-                if (document.body) {
-                    this.setupWaitingMutationListener();
-                } else {
-                    window.addEventListener("DOMContentLoaded", () => {
-                        this.setupWaitingMutationListener();
-                    });
-                }
-            }
-        });
-    }
-
-    private setupWaitingMutationListener(): void {
-        if (!this.waitingMutationObserver) {
-            const checkForObjects = () => {
-                const foundSelectors = [];
-                for (const { selector, visibleCheck, callback } of this.waitingElements) {
-                    const element = this.getElement(selector, visibleCheck);
-                    if (element) {
-                        callback(element);
-                        foundSelectors.push(selector);
-                    }
-                }
-
-                this.waitingElements = this.waitingElements.filter((element) => !foundSelectors.includes(element.selector));
-                
-                if (this.waitingElements.length === 0) {
-                    this.waitingMutationObserver?.disconnect();
-                    this.waitingMutationObserver = null;
-                    this.creatingWaitingMutationObserver = false;
-                }
-            };
-
-            // Do an initial check over all objects
-            checkForObjects();
-
-            if (this.waitingElements.length > 0) {
-                this.waitingMutationObserver = new MutationObserver(checkForObjects);
-
-                this.waitingMutationObserver.observe(document.body, {
-                    childList: true,
-                    subtree: true
-                });
-            }
-        }
-    }
-
-    private getElement(selector: string, visibleCheck: boolean) {
-        return visibleCheck ? findValidElement(document.querySelectorAll(selector)) : document.querySelector(selector);
-    }
-
     containsPermission(permissions: chrome.permissions.Permissions): Promise<boolean> {
         return new Promise((resolve) => {
             chrome.permissions.contains(permissions, resolve)
@@ -118,9 +47,9 @@ export default class Utils {
      * @param {CallableFunction} callback
      */
     setupExtraSitePermissions(callback: (granted: boolean) => void): void {
-        // Request permission
-        let permissions = ["declarativeContent"];
-        if (this.isFirefox()) permissions = [];        
+        let permissions = ["webNavigation"];
+        if (!isSafari()) permissions.push("declarativeContent");
+        if (this.isFirefox() && !isSafari()) permissions = [];
 
         chrome.permissions.request({
             origins: this.getPermissionRegex(),
@@ -144,52 +73,28 @@ export default class Utils {
      * For now, it is just SB.config.invidiousInstances.
      */
     setupExtraSiteContentScripts(): void {
-        if (this.isFirefox()) {
-            const firefoxJS = [];
-            for (const file of this.js) {
-                firefoxJS.push({file});
-            }
-            const firefoxCSS = [];
-            for (const file of this.css) {
-                firefoxCSS.push({file});
-            }
+        const firefoxJS = [];
+        for (const file of this.js) {
+            firefoxJS.push({file});
+        }
+        const firefoxCSS = [];
+        for (const file of this.css) {
+            firefoxCSS.push({file});
+        }
 
-            const registration: Registration = {
-                message: "registerContentScript",
-                id: "invidious",
-                allFrames: true,
-                js: firefoxJS,
-                css: firefoxCSS,
-                matches: this.getPermissionRegex()
-            };
+        const registration: Registration = {
+            message: "registerContentScript",
+            id: "invidious",
+            allFrames: true,
+            js: firefoxJS,
+            css: firefoxCSS,
+            matches: this.getPermissionRegex()
+        };
 
-            if (this.backgroundScriptContainer) {
-                this.backgroundScriptContainer.registerFirefoxContentScript(registration);
-            } else {
-                chrome.runtime.sendMessage(registration);
-            }
+        if (this.backgroundScriptContainer) {
+            this.backgroundScriptContainer.registerFirefoxContentScript(registration);
         } else {
-            chrome.declarativeContent.onPageChanged.removeRules(["invidious"], () => {
-                const conditions = [];
-                for (const regex of this.getPermissionRegex()) {
-                    conditions.push(new chrome.declarativeContent.PageStateMatcher({
-                        pageUrl: { urlMatches: regex }
-                    }));
-                }
-
-                // Add page rule
-                const rule = {
-                    id: "invidious",
-                    conditions,
-                    actions: [new chrome.declarativeContent.RequestContentScript({
-                        allFrames: true,
-                        js: this.js,
-                        css: this.css
-                    })]
-                };
-                
-                chrome.declarativeContent.onPageChanged.addRules([rule]);
-            });
+            chrome.runtime.sendMessage(registration);
         }
     }
 
@@ -197,18 +102,18 @@ export default class Utils {
      * Removes the permission and content script registration.
      */
     removeExtraSiteRegistration(): void {
-        if (this.isFirefox()) {
-            const id = "invidious";
+        const id = "invidious";
 
-            if (this.backgroundScriptContainer) {
-                this.backgroundScriptContainer.unregisterFirefoxContentScript(id);
-            } else {
-                chrome.runtime.sendMessage({
-                    message: "unregisterContentScript",
-                    id: id
-                });
-            }
-        } else if (chrome.declarativeContent) {
+        if (this.backgroundScriptContainer) {
+            this.backgroundScriptContainer.unregisterFirefoxContentScript(id);
+        } else {
+            chrome.runtime.sendMessage({
+                message: "unregisterContentScript",
+                id: id
+            });
+        }
+
+        if (!this.isFirefox() && chrome.declarativeContent) {
             // Only if we have permission
             chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
         }
@@ -347,18 +252,8 @@ export default class Utils {
      * @param address The address to add to the SponsorBlock server address
      * @param callback 
      */    
-    async asyncRequestToCustomServer(type: string, url: string, data = {}): Promise<FetchResponse> {
-        return new Promise((resolve) => {
-            // Ask the background script to do the work
-            chrome.runtime.sendMessage({
-                message: "sendRequest",
-                type,
-                url,
-                data
-            }, (response) => {
-                resolve(response);
-            });
-        });
+    asyncRequestToCustomServer(type: string, url: string, data = {}): Promise<FetchResponse> {
+        return sendRequestToCustomServer(type, url, data);
     }
 
     /**
@@ -441,25 +336,11 @@ export default class Utils {
         return typeof(browser) !== "undefined";
     }
 
-    async getHash<T extends string>(value: T, times = 5000): Promise<T & HashedValue> {
-        if (times <= 0) return "" as T & HashedValue;
-
-        let hashHex: string = value;
-        for (let i = 0; i < times; i++) {
-            const hashBuffer = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(hashHex).buffer);
-
-            const hashArray = Array.from(new Uint8Array(hashBuffer));
-            hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-        }
-
-        return hashHex as T & HashedValue;
-    }
-
     async addHiddenSegment(videoID: VideoID, segmentUUID: string, hidden: SponsorHideType) {
         if (chrome.extension.inIncognitoContext || !Config.config.trackDownvotes) return;
 
-        const hashedVideoID = (await this.getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
-        const UUIDHash = await this.getHash(segmentUUID, 1);
+        const hashedVideoID = (await getHash(videoID, 1)).slice(0, 4) as VideoID & HashedValue;
+        const UUIDHash = await getHash(segmentUUID, 1);
 
         const allDownvotes = Config.local.downvotedSegments;
         const currentVideoData = allDownvotes[hashedVideoID] || { segments: [], lastAccess: 0 };
@@ -467,7 +348,11 @@ export default class Utils {
         currentVideoData.lastAccess = Date.now();
         const existingData = currentVideoData.segments.find((segment) => segment.uuid === UUIDHash);
         if (hidden === SponsorHideType.Visible) {
-            delete allDownvotes[hashedVideoID];
+            currentVideoData.segments.splice(currentVideoData.segments.indexOf(existingData), 1);
+
+            if (currentVideoData.segments.length === 0) {
+                delete allDownvotes[hashedVideoID];
+            }
         } else {
             if (existingData) {
                 existingData.hidden = hidden;

src/utils/configUtils.ts

@@ -6,7 +6,7 @@ export function showDonationLink(): boolean {
 }
 
 export function isSafari(): boolean {
-    return navigator.vendor === "Apple Computer, Inc.";
+    return typeof(navigator) !== "undefined" && navigator.vendor === "Apple Computer, Inc.";
 }
 
 export function keybindEquals(first: Keybind, second: Keybind): boolean {

src/utils/exporter.ts

@@ -1,8 +1,8 @@
 import { ActionType, Category, SegmentUUID, SponsorSourceType, SponsorTime } from "../types";
 import { shortCategoryName } from "./categoryUtils";
-import { GenericUtils } from "./genericUtils";
 import * as CompileConfig from "../../config.json";
 import { getFormattedTime, getFormattedTimeToSeconds } from "@ajayyy/maze-utils/lib/formating";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 const inTest = typeof chrome === "undefined";
 
@@ -62,7 +62,7 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
                         actionType: determinedCategory ? ActionType.Skip : ActionType.Chapter,
                         description: title,
                         source: SponsorSourceType.Local,
-                        UUID: GenericUtils.generateUserID() as SegmentUUID
+                        UUID: generateUserID() as SegmentUUID
                     };
 
                     if (result.length > 0 && result[result.length - 1].segment[1] === null) {

src/utils/genericUtils.ts

@@ -49,41 +49,8 @@ function indexesOf<T>(array: T[], value: T): number[] {
     return array.map((v, i) => v === value ? i : -1).filter(i => i !== -1);
 }
 
-function objectToURI<T>(url: string, data: T, includeQuestionMark: boolean): string {
-    let counter = 0;
-    for (const key in data) {
-        const seperator = (url.includes("?") || counter > 0) ? "&" : (includeQuestionMark ? "?" : "");
-        const value = (typeof(data[key]) === "string") ? data[key] as unknown as string : JSON.stringify(data[key]);
-        url += seperator + encodeURIComponent(key) + "=" + encodeURIComponent(value);
-
-        counter++;
-    }
-
-    return url;
-}
-
-function generateUserID(length = 36): string {
-    const charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    let result = "";
-    if (window.crypto && window.crypto.getRandomValues) {
-            const values = new Uint32Array(length);
-            window.crypto.getRandomValues(values);
-            for (let i = 0; i < length; i++) {
-                    result += charset[values[i] % charset.length];
-            }
-            return result;
-    } else {
-            for (let i = 0; i < length; i++) {
-                result += charset[Math.floor(Math.random() * charset.length)];
-            }
-            return result;
-    }
-}
-
 export const GenericUtils = {
     getErrorMessage,
     getLuminance,
-    generateUserID,
-    indexesOf,
-    objectToURI
+    indexesOf
 }

src/utils/licenseKey.ts

@@ -1,6 +1,7 @@
 import Config from "../config";
 import Utils from "../utils";
 import * as CompileConfig from "../../config.json";
+import { getHash } from "@ajayyy/maze-utils/lib/hash";
 
 const utils = new Utils();
 
@@ -53,7 +54,7 @@ export async function fetchingChaptersAllowed(): Promise<boolean> {
         // Check for free access if no license key, and it is the first time
         const result = await utils.asyncRequestToServer("GET", "/api/userInfo", {
             value: "freeChaptersAccess",
-            publicUserID: await utils.getHash(Config.config.userID)
+            publicUserID: await getHash(Config.config.userID)
         });
 
         try {

src/utils/pageUtils.ts

@@ -28,25 +28,6 @@ export function isVisible(element: HTMLElement): boolean {
     return element && element.offsetWidth > 0 && element.offsetHeight > 0;
 }
 
-export function findValidElementFromSelector(selectors: string[]): HTMLElement {
-    return findValidElementFromGenerator(selectors, (selector) => document.querySelector(selector));
-}
-
-export function findValidElement(elements: HTMLElement[] | NodeListOf<HTMLElement>): HTMLElement {
-    return findValidElementFromGenerator(elements);
-}
-
-function findValidElementFromGenerator<T>(objects: T[] | NodeListOf<HTMLElement>, generator?: (obj: T) => HTMLElement): HTMLElement {
-    for (const obj of objects) {
-        const element = generator ? generator(obj as T) : obj as HTMLElement;
-        if (element && isVisible(element)) {
-            return element;
-        }
-    }
-
-    return null;
-}
-
 export function getHashParams(): Record<string, unknown> {
     const windowHash = window.location.hash.slice(1);
     if (windowHash) {
@@ -82,7 +63,7 @@ export function getExistingChapters(currentVideoID: VideoID, duration: number):
             const timeElement = link.querySelector("#time") as HTMLElement;
             const description = link.querySelector("#details h4") as HTMLElement;
             if (timeElement && description?.innerText?.length > 0 && link.getAttribute("href")?.includes(currentVideoID)) {
-                const time = getFormattedTimeToSeconds(timeElement.innerText);
+                const time = getFormattedTimeToSeconds(timeElement.innerText.replace(".", ":"));
                 if (time === null) return [];
                 
                 if (lastSegment) {

src/utils/thumbnails.ts

@@ -0,0 +1,131 @@
+import { waitFor } from "@ajayyy/maze-utils";
+import { newThumbnails } from "@ajayyy/maze-utils/lib/thumbnailManagement";
+import { isOnInvidious, parseYouTubeVideoIDFromURL } from "@ajayyy/maze-utils/lib/video";
+import Config from "../config";
+import { getVideoLabel } from "./videoLabels";
+
+export async function labelThumbnails(thumbnails: HTMLImageElement[]): Promise<void> {
+    await Promise.all(thumbnails.map((t) => labelThumbnail(t)));
+}
+
+export async function labelThumbnail(thumbnail: HTMLImageElement): Promise<HTMLElement | null> {
+    if (!Config.config?.fullVideoSegments || !Config.config?.fullVideoLabelsOnThumbnails) {
+        hideThumbnailLabel(thumbnail);
+        return null;
+    }
+    
+    const link = (isOnInvidious() ? thumbnail.parentElement : thumbnail.querySelector("#thumbnail")) as HTMLAnchorElement
+    if (!link || link.nodeName !== "A" || !link.href) return null; // no link found
+    const videoID = parseYouTubeVideoIDFromURL(link.href)?.videoID;
+    if (!videoID) {
+        hideThumbnailLabel(thumbnail);
+        return null;
+    }
+
+    const category = await getVideoLabel(videoID);
+    if (!category) {
+        hideThumbnailLabel(thumbnail);
+        return null;
+    }
+
+    const { overlay, text } = createOrGetThumbnail(thumbnail);
+
+    overlay.style.setProperty('--category-color', `var(--sb-category-preview-${category}, var(--sb-category-${category}))`);
+    overlay.style.setProperty('--category-text-color', `var(--sb-category-text-preview-${category}, var(--sb-category-text-${category}))`);
+    text.innerText = chrome.i18n.getMessage(`category_${category}`);
+    overlay.classList.add("sponsorThumbnailLabelVisible");
+
+    return overlay;
+}
+
+function getOldThumbnailLabel(thumbnail: HTMLImageElement): HTMLElement | null {
+    return thumbnail.querySelector(".sponsorThumbnailLabel") as HTMLElement | null;
+}   
+
+function hideThumbnailLabel(thumbnail: HTMLImageElement): void {
+    const oldLabel = getOldThumbnailLabel(thumbnail);
+    if (oldLabel) {
+        oldLabel.classList.remove("sponsorThumbnailLabelVisible");
+    }
+}
+
+function createOrGetThumbnail(thumbnail: HTMLImageElement): { overlay: HTMLElement; text: HTMLElement } {
+    const oldElement = getOldThumbnailLabel(thumbnail);
+    if (oldElement) {
+        return {
+            overlay: oldElement as HTMLElement,
+            text: oldElement.querySelector("span") as HTMLElement
+        };
+    }
+
+    const overlay = document.createElement("div") as HTMLElement;
+    overlay.classList.add("sponsorThumbnailLabel");
+    // Disable hover autoplay
+    overlay.addEventListener("pointerenter", (e) => {
+        e.stopPropagation();
+        thumbnail.dispatchEvent(new PointerEvent("pointerleave", { bubbles: true }));
+    });
+    overlay.addEventListener("pointerleave", (e) => {
+        e.stopPropagation();
+        thumbnail.dispatchEvent(new PointerEvent("pointerenter", { bubbles: true }));
+    });
+
+    const icon = createSBIconElement();
+    const text = document.createElement("span");
+    overlay.appendChild(icon);
+    overlay.appendChild(text);
+    thumbnail.appendChild(overlay);
+
+    return {
+        overlay,
+        text
+    };
+}
+
+function createSBIconElement(): SVGSVGElement {
+    const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+    svg.setAttribute("viewBox", "0 0 565.15 568");
+    const use = document.createElementNS("http://www.w3.org/2000/svg", "use");
+    use.setAttribute("href", "#SponsorBlockIcon");
+    svg.appendChild(use);
+    return svg;
+}
+
+
+// Inserts the icon svg definition, so it can be used elsewhere
+function insertSBIconDefinition() {
+    const container = document.createElement("span");
+
+    // svg from /public/icons/PlayerStartIconSponsorBlocker.svg, with useless stuff removed
+    container.innerHTML = `
+<svg viewBox="0 0 565.15 568" style="display: none">
+  <defs>
+    <g id="SponsorBlockIcon">
+      <path d="M282.58,568a65,65,0,0,1-34.14-9.66C95.41,463.94,2.54,300.46,0,121A64.91,64.91,0,0,1,34,62.91a522.56,522.56,0,0,1,497.16,0,64.91,64.91,0,0,1,34,58.12c-2.53,179.43-95.4,342.91-248.42,437.3A65,65,0,0,1,282.58,568Zm0-548.31A502.24,502.24,0,0,0,43.4,80.22a45.27,45.27,0,0,0-23.7,40.53c2.44,172.67,91.81,330,239.07,420.83a46.19,46.19,0,0,0,47.61,0C453.64,450.73,543,293.42,545.45,120.75a45.26,45.26,0,0,0-23.7-40.54A502.26,502.26,0,0,0,282.58,19.69Z"/>
+      <path d="M 284.70508 42.693359 A 479.9 479.9 0 0 0 54.369141 100.41992 A 22.53 22.53 0 0 0 42.669922 120.41992 C 45.069922 290.25992 135.67008 438.63977 270.83008 522.00977 A 22.48 22.48 0 0 0 294.32031 522.00977 C 429.48031 438.63977 520.08047 290.25992 522.48047 120.41992 A 22.53 22.53 0 0 0 510.7793 100.41992 A 479.9 479.9 0 0 0 284.70508 42.693359 z M 220.41016 145.74023 L 411.2793 255.93945 L 220.41016 366.14062 L 220.41016 145.74023 z "/>
+    </g>
+  </defs>
+</svg>`;
+    document.body.appendChild(container.children[0]);
+}
+
+export function setupThumbnailPageLoadListener(): void {
+    const onLoad = () => {
+        insertSBIconDefinition();
+
+        // Label thumbnails on load if on Invidious (wait for variable initialization before checking)
+        waitFor(() => isOnInvidious() !== null).then(() => {
+            if (isOnInvidious()) newThumbnails();
+        });
+    };
+
+    if (document.readyState === "complete") {
+        onLoad();
+    } else {
+        window.addEventListener("load", onLoad);
+    }
+
+    waitFor(() => Config.isReady(), 5000, 10).then(() => {
+        newThumbnails();
+    });
+}

src/utils/videoLabels.ts

@@ -0,0 +1,65 @@
+import { Category, VideoID } from "../types";
+import { getHash } from "@ajayyy/maze-utils/lib/hash";
+import Utils from "../utils";
+import { logWarn } from "./logger";
+
+const utils = new Utils();
+
+export interface LabelCacheEntry {
+    timestamp: number;
+    videos: Record<VideoID, Category>;
+}
+
+const labelCache: Record<string, LabelCacheEntry> = {};
+const cacheLimit = 1000;
+
+async function getLabelHashBlock(hashPrefix: string): Promise<LabelCacheEntry | null> {
+    // Check cache
+    const cachedEntry = labelCache[hashPrefix];
+    if (cachedEntry) {
+        return cachedEntry;
+    }
+
+    const response = await utils.asyncRequestToServer("GET", `/api/videoLabels/${hashPrefix}`);
+    if (response.status !== 200) {
+        // No video labels or server down
+        labelCache[hashPrefix] = {
+            timestamp: Date.now(),
+            videos: {},
+        };
+        return null;
+    }
+
+    try {
+        const data = JSON.parse(response.responseText);
+
+        const newEntry: LabelCacheEntry = {
+            timestamp: Date.now(),
+            videos: Object.fromEntries(data.map(video => [video.videoID, video.segments[0].category])),
+        };
+        labelCache[hashPrefix] = newEntry;
+
+        if (Object.keys(labelCache).length > cacheLimit) {
+            // Remove oldest entry
+            const oldestEntry = Object.entries(labelCache).reduce((a, b) => a[1].timestamp < b[1].timestamp ? a : b);
+            delete labelCache[oldestEntry[0]];
+        }
+
+        return newEntry;
+    } catch (e) {
+        logWarn(`Error parsing video labels: ${e}`);
+
+        return null;
+    }
+}
+
+export async function getVideoLabel(videoID: VideoID): Promise<Category | null> {
+    const prefix = (await getHash(videoID, 1)).slice(0, 3);
+    const result = await getLabelHashBlock(prefix);
+
+    if (result) {
+        return result.videos[videoID] ?? null;
+    }
+
+    return null;
+}

src/utils/warnings.ts

@@ -1,8 +1,9 @@
+import { objectToURI } from "@ajayyy/maze-utils";
+import { getHash } from "@ajayyy/maze-utils/lib/hash";
 import Config from "../config";
 import GenericNotice, { NoticeOptions } from "../render/GenericNotice";
 import { ContentContainer } from "../types";
 import Utils from "../utils";
-import { GenericUtils } from "./genericUtils";
 const utils = new Utils();
 
 export interface ChatConfig {
@@ -13,7 +14,7 @@ export interface ChatConfig {
 
 export async function openWarningDialog(contentContainer: ContentContainer): Promise<void> {
     const userInfo = await utils.asyncRequestToServer("GET", "/api/userInfo", {
-        publicUserID: await utils.getHash(Config.config.userID),
+        publicUserID: await getHash(Config.config.userID),
         values: ["warningReason"]
     });
 
@@ -21,7 +22,7 @@ export async function openWarningDialog(contentContainer: ContentContainer): Pro
         const warningReason = JSON.parse(userInfo.responseText)?.warningReason;
         const userNameData = await utils.asyncRequestToServer("GET", "/api/getUsername?userID=" + Config.config.userID);
         const userName = userNameData.ok ? JSON.parse(userNameData.responseText).userName : "";
-        const publicUserID = await utils.getHash(Config.config.userID);
+        const publicUserID = await getHash(Config.config.userID);
 
         let notice: GenericNotice = null;
         const options: NoticeOptions = {
@@ -62,5 +63,5 @@ export async function openWarningDialog(contentContainer: ContentContainer): Pro
 }
 
 export function openChat(config: ChatConfig): void {
-    window.open("https://chat.sponsor.ajay.app/#" + GenericUtils.objectToURI("", config, false));
+    window.open("https://chat.sponsor.ajay.app/#" + objectToURI("", config, false));
 }

test/selenium.test.ts

@@ -41,7 +41,7 @@ test("Selenium Chrome test", async () => {
         // Save file incase there is a layout change
         const source = await driver.getPageSource();
 
-        fs.mkdirSync("./test-results"); 
+        if (!fs.existsSync("./test-results")) fs.mkdirSync("./test-results"); 
         fs.writeFileSync("./test-results/source.html", source);
         
         throw e;
@@ -55,7 +55,7 @@ async function setup(): Promise<WebDriver> {
     options.addArguments("--load-extension=" + Path.join(__dirname, "../dist/"));
     options.addArguments("--mute-audio");
     options.addArguments("--disable-features=PreloadMediaEngagementData, MediaEngagementBypassAutoplayPolicies");
-    options.addArguments("--headless=chrome");
+    options.addArguments("--headless=new");
     options.addArguments("--window-size=1920,1080");
 
     const driver = await new Builder().forBrowser("chrome").setChromeOptions(options).build();

webpack/webpack.common.js

@@ -25,99 +25,168 @@ const edgeLanguages = [
     "zh_CN"
 ]
 
-module.exports = env => ({
-    entry: {
-        popup: path.join(__dirname, srcDir + 'popup.ts'),
-        background: path.join(__dirname, srcDir + 'background.ts'),
-        content: path.join(__dirname, srcDir + 'content.ts'),
-        options: path.join(__dirname, srcDir + 'options.ts'),
-        help: path.join(__dirname, srcDir + 'help.ts'),
-        permissions: path.join(__dirname, srcDir + 'permissions.ts'),
-        document: path.join(__dirname, srcDir + 'document.ts'),
-        upsell:  path.join(__dirname, srcDir + 'upsell.ts')
-    },
-    output: {
-        path: path.join(__dirname, '../dist/js'),
-    },
-    optimization: {
-        splitChunks: {
-            name: 'vendor',
-            chunks: "initial"
-        }
-    },
-    module: {
-        rules: [
-            {
-                test: /\.tsx?$/,
-                loader: 'ts-loader',
-                exclude: /node_modules/,
-                options: {
-                    // disable type checker for user in fork plugin
-                    transpileOnly: true,
-                    configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json"
-                }
-            }
-        ]
-    },
-    resolve: {
-        extensions: ['.ts', '.tsx', '.js']
-    },
-    plugins: [
-        // fork TS checker
-        new ForkTsCheckerWebpackPlugin(),
-        // exclude locale files in moment
-        new CopyPlugin({
-            patterns: [
+
+
+module.exports = env => {
+    const documentScriptBuild = webpack({
+        entry: {
+            document: {
+                import: path.join(__dirname, srcDir + 'document.ts'),
+            },
+        },
+        output: {
+            path: path.join(__dirname, '../dist/js'),
+        },
+        module: {
+            rules: [
                 {
-                    from: '.',
-                    to: '../',
-                    globOptions: {
-                    ignore: ['manifest.json'],
-                    },
-                    context: './public',
-                    filter: async (path) => {
-                        if (path.match(/\/_locales\/.+/)) {
-                            if (env.browser.toLowerCase() === "edge" 
-                                    && !edgeLanguages.includes(path.match(/(?<=\/_locales\/)[^/]+(?=\/[^/]+$)/)[0])) {
-                                return false;
-                            }
-
-                            const data = await fs.promises.readFile(path);
-                            const parsed = JSON.parse(data.toString());
-
-                            return parsed.fullName && parsed.Description;
-                        } else {
-                            return true;
-                        }
-                    },
-                    transform(content, path) {
-                        if (path.match(/\/_locales\/.+/)) {
-                            const parsed = JSON.parse(content.toString());
-                            if (env.browser.toLowerCase() === "safari") {
-                                parsed.fullName.message = parsed.fullName.message.match(/^.+(?= -)/)?.[0] || parsed.fullName.message;
-                                if (parsed.fullName.message.length > 50) {
-                                    parsed.fullName.message = parsed.fullName.message.slice(0, 47) + "...";
-                                }
-
-                                parsed.Description.message = parsed.Description.message.match(/^.+(?=\. )/)?.[0] || parsed.Description.message;
-                                if (parsed.Description.message.length > 80) {
-                                    parsed.Description.message = parsed.Description.message.slice(0, 77) + "...";
-                                }
-                            }
-            
-                            return Buffer.from(JSON.stringify(parsed));
-                        }
-
-                        return content;
+                    test: /\.tsx?$/,
+                    loader: 'ts-loader',
+                    exclude: /node_modules/,
+                    resourceQuery: { not: [/raw/] },
+                    options: {
+                        // disable type checker for user in fork plugin
+                        transpileOnly: true,
+                        configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json"
                     }
+                },
+            ]
+        },
+        resolve: {
+            extensions: ['.ts', '.tsx', '.js']
+        },
+        plugins: [
+            // Don't fork TS checker for document script to speed up
+            // new ForkTsCheckerWebpackPlugin()
+        ]
+    });
+
+    class DocumentScriptCompiler {
+        currentWatching = null;
+
+        /**
+         * 
+         * @param {webpack.Compiler} compiler 
+         */
+        apply(compiler) {
+            compiler.hooks.beforeCompile.tapAsync({ name: 'DocumentScriptCompiler' }, (compiler, callback) => {
+                if (env.WEBPACK_WATCH) {
+                    let first = true;
+                    if (!this.currentWatching) {
+                        this.currentWatching = documentScriptBuild.watch({}, () => {
+                            if (first) {
+                                first = false;
+                                callback();
+                            }
+                        });
+                    } else {
+                        callback();
+                    }
+                } else {
+                    documentScriptBuild.close(() => {
+                        documentScriptBuild.run(() => {
+                            callback();
+                        });
+                    });
+                }
+            });
+        }
+    }
+
+    return {
+        entry: {
+            popup: path.join(__dirname, srcDir + 'popup.ts'),
+            background: path.join(__dirname, srcDir + 'background.ts'),
+            content: path.join(__dirname, srcDir + 'content.ts'),
+            options: path.join(__dirname, srcDir + 'options.ts'),
+            help: path.join(__dirname, srcDir + 'help.ts'),
+            permissions: path.join(__dirname, srcDir + 'permissions.ts'),
+            upsell:  path.join(__dirname, srcDir + 'upsell.ts')
+        },
+        output: {
+            path: path.join(__dirname, '../dist/js'),
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.tsx?$/,
+                    loader: 'ts-loader',
+                    exclude: /node_modules/,
+                    resourceQuery: { not: [/raw/] },
+                    options: {
+                        // disable type checker for user in fork plugin
+                        transpileOnly: true,
+                        configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json"
+                    }
+                },
+                {
+                    test: /js\/document\.js$/,
+                    type: 'asset/source'
                 }
             ]
-        }),
-        new BuildManifest({
-            browser: env.browser,
-            pretty: env.mode === "production",
-            stream: env.stream
-        }),
-        new configDiffPlugin()
-    ]
-});
+        },
+        resolve: {
+            extensions: ['.ts', '.tsx', '.js']
+        },
+        plugins: [
+            // Prehook to start building document script before normal build
+            new DocumentScriptCompiler(),
+            // fork TS checker
+            new ForkTsCheckerWebpackPlugin(),
+            // exclude locale files in moment
+            new CopyPlugin({
+                patterns: [
+                    {
+                        from: '.',
+                        to: '../',
+                        globOptions: {
+                        ignore: ['manifest.json'],
+                        },
+                        context: './public',
+                        filter: async (path) => {
+                            if (path.match(/\/_locales\/.+/)) {
+                                if (env.browser.toLowerCase() === "edge" 
+                                        && !edgeLanguages.includes(path.match(/(?<=\/_locales\/)[^/]+(?=\/[^/]+$)/)[0])) {
+                                    return false;
+                                }
+
+                                const data = await fs.promises.readFile(path);
+                                const parsed = JSON.parse(data.toString());
+
+                                return parsed.fullName && parsed.Description;
+                            } else {
+                                return true;
+                            }
+                        },
+                        transform(content, path) {
+                            if (path.match(/\/_locales\/.+/)) {
+                                const parsed = JSON.parse(content.toString());
+                                if (env.browser.toLowerCase() === "safari") {
+                                    parsed.fullName.message = parsed.fullName.message.match(/^.+(?= -)/)?.[0] || parsed.fullName.message;
+                                    if (parsed.fullName.message.length > 50) {
+                                        parsed.fullName.message = parsed.fullName.message.slice(0, 47) + "...";
+                                    }
+
+                                    parsed.Description.message = parsed.Description.message.match(/^.+(?=\. )/)?.[0] || parsed.Description.message;
+                                    if (parsed.Description.message.length > 80) {
+                                        parsed.Description.message = parsed.Description.message.slice(0, 77) + "...";
+                                    }
+                                }
+                
+                                return Buffer.from(JSON.stringify(parsed));
+                            }
+
+                            return content;
+                        }
+                    }
+                ]
+            }),
+            new BuildManifest({
+                browser: env.browser,
+                pretty: env.mode === "production",
+                stream: env.stream
+            }),
+            new configDiffPlugin()
+        ]
+    };
+};

webpack/webpack.manifest.js

@@ -3,7 +3,6 @@
 const webpack = require("webpack");
 const path = require('path');
 const { validate } = require('schema-utils');
-
 const fs = require('fs');
 
 const manifest = require("../manifest/manifest.json");