bump version

Don't attach controls to inline preview players

.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.cthd.icu","inv.riverside.rocks","invidio.xamh.de","invidious.kavin.rocks","invidious.namazso.eu","invidious.osi.kr","invidious.snopyta.org","vid.puffyan.us","yewtu.be","youtube.076.ne.jp","yt.artemislena.eu"]
+["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.8",
+    "version": "5.4.1",
     "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": [
@@ -69,15 +68,23 @@
         "icons/PlayerInfoIconSponsorBlocker.svg",
         "icons/PlayerDeleteIconSponsorBlocker.svg",
         "popup.html",
+        "popup.css",
         "content.css",
-        "js/document.js"
+        "shared.css",
+        "js/document.js",
+        "libs/Source+Sans+Pro.css",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
     ],
     "permissions": [
         "storage",
         "https://sponsor.ajay.app/*"
     ],
     "optional_permissions": [
-        "*://*/*"
+        "*://*/*",
+        "webNavigation"
     ],
     "browser_action": {
         "default_title": "SponsorBlock",
@@ -85,8 +92,8 @@
         "default_icon": {
             "16": "icons/IconSponsorBlocker16px.png",
             "32": "icons/IconSponsorBlocker32px.png",
-            "64": "icons/LogoSponsorBlocker64px.png",
-            "128": "icons/LogoSponsorBlocker128px.png"
+            "64": "icons/IconSponsorBlocker64px.png",
+            "128": "icons/IconSponsorBlocker128px.png"
         },
         "theme_icons": [
             {
@@ -100,31 +107,30 @@
                 "size": 32
             },
             {
-                "light": "icons/LogoSponsorBlocker64px.png",
-                "dark": "icons/LogoSponsorBlocker64px.png",
+                "light": "icons/IconSponsorBlocker64px.png",
+                "dark": "icons/IconSponsorBlocker64px.png",
                 "size": 64
             },
             {
-                "light": "icons/LogoSponsorBlocker128px.png",
-                "dark": "icons/LogoSponsorBlocker128px.png",
+                "light": "icons/IconSponsorBlocker128px.png",
+                "dark": "icons/IconSponsorBlocker128px.png",
                 "size": 128
             }
         ]
     }, 
     "background": {
         "scripts":[
-        "./js/vendor.js",
         "./js/background.js"
         ]
     },
     "icons": {
         "16": "icons/IconSponsorBlocker16px.png",
         "32": "icons/IconSponsorBlocker32px.png",
-        "64": "icons/LogoSponsorBlocker64px.png",
-        "128": "icons/LogoSponsorBlocker128px.png",
-        "256": "icons/LogoSponsorBlocker256px.png",
-        "512": "icons/LogoSponsorBlocker512px.png",
-        "1024": "icons/LogoSponsorBlocker1024px.png"
+        "64": "icons/IconSponsorBlocker64px.png",
+        "128": "icons/IconSponsorBlocker128px.png",
+        "256": "icons/IconSponsorBlocker256px.png",
+        "512": "icons/IconSponsorBlocker512px.png",
+        "1024": "icons/IconSponsorBlocker1024px.png"
     },
     "options_ui": {
         "page": "options/options.html",

package.json

@@ -4,37 +4,38 @@
   "description": "",
   "main": "background.js",
   "dependencies": {
+    "@ajayyy/maze-utils": "1.1.11",
+    "content-scripts-register-polyfill": "^4.0.2",
     "react": "^18.2.0",
     "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,51 @@
     },
     "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": "اختر بلدك"
+    },
+    "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": {
@@ -800,6 +797,10 @@
         "message": "Показване на икона, когато видеоклипът е изцяло реклама",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Показване на етикети на миниатюрите на видеоклиповете",
+        "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": "Цвят на неизпратен сегмент",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Скриване завинаги"
     },
     "warningChatInfo": {
-        "message": "Забелязахме, че правите някои често срещани грешки, които не са злонамерени"
+        "message": "Забелязахме, че допускате някои често срещани грешки. Оценяваме високо досегашната ви работа, но тук се стремим към съвършенство, така че дори и много малките грешки са от значение :)"
     },
     "warningTitle": {
         "message": "Имате предупреждение"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Изберете вашата държава"
     },
-    "alreadyDonated": {
-        "message": "Ако сте дарили някаква сума преди, можете да осребрите безплатен достъп чрез имейл:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Ако не можете да си позволите да закупите лиценз, щракнете {тук}, за да видите дали отговаряте на условията за отстъпка",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "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": "В момента имате {0} в {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Внимание: сървърът все още не е отговорил със сегменти. В действителност може да има вече изпратени сегменти в този видеоклип, но просто не сте ги получили поради проблеми със сървъра."
+    },
+    "allowScrollingToEdit": {
+        "message": "Разрешаване на превъртане за редактиране на времената"
     }
 }

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

@@ -4,7 +4,7 @@
         "description": "Name of the extension."
     },
     "Description": {
-        "message": "Přeskoč sponzorství, žadonění o odběr a další v YouTube videích. Nahlaš sponzorované segmenty na videích co sleduješ a ušetři ostatním čas.",
+        "message": "Přeskočte sponzorství, žádosti o odběr a další ve videích na YouTube. Nahlaste sponzorované segmenty ve videích, která sledujete a ušetřete ostatním čas.",
         "description": "Description of the extension."
     },
     "400": {
@@ -99,7 +99,7 @@
         "message": "Zrušit vytváření segmentu"
     },
     "noVideoID": {
-        "message": "Nebylo nalezeno žádné YouTube video.\nPokud je to špatně, obnovte záložku."
+        "message": "Nebylo nalezeno žádné YouTube video.\nPokud je to špatně, obnovte kartu."
     },
     "refreshSegments": {
         "message": "Aktualizovat segmenty"
@@ -111,7 +111,7 @@
         "message": "Hlasováno!"
     },
     "serverDown": {
-        "message": "Zdá se, že server nefunguje. Obraťte se okamžitě na vývojáře."
+        "message": "Zdá se, že server je offline. Okamžitě kontaktujte vývojáře."
     },
     "connectionError": {
         "message": "Došlo k chybě připojení. Kód chyby: "
@@ -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"
     },
@@ -250,7 +247,7 @@
         "message": "Místo žádání o segmenty ze serveru pomocí videoID jsou poslány první 4 charaktery hashe ve videoID. Tento server odešle zpět data pro všechna videa s podobnými hashy."
     },
     "enableRefetchWhenNotFound": {
-        "message": "Refetovat segmenty na nových videích"
+        "message": "Automaticky znovu načítat segmenty na nových videích"
     },
     "whatRefetchWhenNotFound": {
         "message": "Pokud je video nové a nejsou nalezeny žádné segmenty, bude rozšíření každých několik minut refetchovat data, zatímco sledujete video."
@@ -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": {
@@ -800,6 +797,10 @@
         "message": "Zobrazit ikonu, když je celé video reklama",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Zobrazit štítky i u náhledů videí",
+        "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": "Barva neodeslaného segmentu",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Skrýt napořád"
     },
     "warningChatInfo": {
-        "message": "Všimli jsme si, že děláte některé běžné chyby, které nejsou úmyslně zlé"
+        "message": "Všimli jsme si, že děláte některé běžné chyby. Velmi si vážíme vaší dosavadní práce, ale snažíme se zde o dokonalost, takže i na velmi malých chybách záleží :)"
     },
     "warningTitle": {
         "message": "Dostali jste varování"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Vyberte vaši zemi"
     },
-    "alreadyDonated": {
-        "message": "Pokud jste již přispěli jakoukoli částkou, můžete získat bezplatný přístup odesláním e-mailu na:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Pokud si nemůžete dovolit zakoupení licence, klikněte {sem}, abyste zjistili, zda máte nárok na slevu",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Zadejte licenční klíč"
     },
-    "chaptersPage1": {
-        "message": "Funkce komunitních kapitol je dostupná pouze lidem, kteří si zakoupili licenci, nebo lidem, kteří získali přístup zdarma díky jejich příspěvkům"
-    },
-    "chaptersPage2": {
-        "message": "Poznámka: Oprávnění k odesílání kapitol je stále založené na vypočítané reputaci. Zakoupení licence vám pouze umožní zobrazit si kapitoly odeslané ostatními uživateli",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Nová funkce: komunitní vlastní kapitoly. Jedná se o komunitou vytvořené sekce ve videích, které lze slučovat, aby byly stále přesnější. Zakupte si licenci pro zobrazení kapitol u tohoto videa, jako například: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Nová funkce: komunitní vlastní kapitoly. Jedná se o komunitou vytvořené sekce ve videích, které lze slučovat, aby byly stále přesnější. Přístup máte zdarma, povolte jej v možnostech."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Momentálně máte {0} na {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Varování: Server zatím neodpověděl se segmenty. U tohoto videa se již mohou nacházet odeslané segmenty, ale vy jste je neobdrželi kvůli chybě na serveru."
+    },
+    "allowScrollingToEdit": {
+        "message": "Povolit skrolování k časům úprav"
     }
 }

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: "
     },
@@ -941,9 +931,6 @@
     "hideForever": {
         "message": "Skjul for evigt"
     },
-    "warningChatInfo": {
-        "message": "Vi bemærkede, at du lavede nogle almindelige fejl, som ikke er ondsindede"
-    },
     "warningTitle": {
         "message": "Du fik en advarsel"
     },
@@ -1155,10 +1142,6 @@
     "selectYourCountry": {
         "message": "Vælg dit land"
     },
-    "alreadyDonated": {
-        "message": "Hvis du har doneret et beløb før, kan du indløse gratis adgang via e-mail:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Hvis du ikke har råd til at købe en licens, så klik på {here} for at se, om du er berettiget til en rabat",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1161,6 @@
     "enterLicenseKey": {
         "message": "Indtast Licensnøgle"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlock crowd-sourced kapitler funktion er kun tilgængelig for personer, der køber en licens, eller for personer, der har fået gratis adgang på grund af deres tidligere bidrag"
-    },
-    "chaptersPage2": {
-        "message": "Bemærk: Tilladelse til at indsende kapitler er stadig baseret på beregnet omdømme. Indkøb af en licens giver dig kun mulighed for at se kapitler indsendt af andre",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Ny funktion: Crowd-sourced brugerdefinerede kapitler. Disse er brugerdefinerede sektioner i videoer, der kan stables for at få mere og mere præcise. Køb en licens til at se kapitlerne indsendt på denne video såsom: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Ny funktion: Crowd-sourced brugerdefinerede kapitler. Disse er brugerdefinerede sektioner i videoer, der kan stables for at få mere og mere præcise. Du har gratis adgang, aktiver i indstillinger."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Du har lige nu {0} på {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"

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"
     },
@@ -241,7 +238,7 @@
         "message": "Alle von dir negativ bewerteten Segmente bleiben auch nach neu laden der Seite verborgen"
     },
     "trackDownvotesWarning": {
-        "message": "Warnung: Das Deaktivieren wird alle zuvor gespeicherten negativen Bewertungen löschen"
+        "message": "Warnung: Das Deaktivieren dieser Option wird alle zuvor gespeicherten negativen Bewertungen löschen"
     },
     "enableQueryByHashPrefix": {
         "message": "Abfrage nach Hash-Präfix"
@@ -259,7 +256,7 @@
         "message": "Zeige Kategorien im Einsendungsmenü auch ohne Einreichungsberechtigungen"
     },
     "whatShowCategoryWithoutPermission": {
-        "message": "Einige Kategorien benötigen Erlaubnis zum Übermitteln aufgrund von Mindestanforderungen an Reputation"
+        "message": "Einige Kategorien erfordern eine Freigabe zur Einreichung aufgrund von Mindestanforderungen an die Reputation"
     },
     "showNotice": {
         "message": "Hinweis erneut anzeigen"
@@ -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": {
@@ -524,7 +521,7 @@
         "message": "Alle Einstellungen importieren/exportieren"
     },
     "exportOptionsCopy": {
-        "message": "Bearbeiten/kopieren"
+        "message": "Bearbeiten/Kopieren"
     },
     "exportOptionsDownload": {
         "message": "Als Datei speichern"
@@ -797,9 +794,13 @@
         "message": "Segmente zulassen, die den Ton ausschalten anstatt zu überspringen"
     },
     "fullVideoSegments": {
-        "message": "Zeige ein Icon, wenn ein ganzes Video Werbung ist",
+        "message": "Ein Symbol anzeigen, wenn ein Video vollständig aus Werbung besteht",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Label auch auf Video-Thumbnails anzeigen",
+        "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": "Nicht eingereichte Farbe",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Dauerhaft verbergen"
     },
     "warningChatInfo": {
-        "message": "Wir haben bemerkt, dass du einige häufige Fehler machst welche nicht bösartig sind"
+        "message": "Wir haben festgestellt, dass du einige häufig gemacht Fehler machst. Wir schätzen deine bisherige Arbeit sehr, streben aber hier aber auch nach Perfektion, sodass es auch wichtig ist kleine Fehler zu korrigieren :)"
     },
     "warningTitle": {
         "message": "Du hast eine Verwarnung erhalten"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Wähle dein Land"
     },
-    "alreadyDonated": {
-        "message": "Wenn du zuvor etwas gespendet hast, kannst du einen kostenlosen Zugang per E-Mail einlösen:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Wenn du dir keine Lizenz leisten kannst, klicke {hier} um zu sehen, ob du für einen Rabatt in Frage kommen",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Lizenzschlüssel eingeben"
     },
-    "chaptersPage1": {
-        "message": "Die Crowd-sourced Kapitel-Funktion von SponsorBlock ist nur für Personen verfügbar, welche eine Lizenz kaufen, oder gratis Zugriff für Ihre bisherigen Beiträge erhalten haben"
-    },
-    "chaptersPage2": {
-        "message": "Hinweis: Erlaubnis zum Einreichen von Kapiteln basiert immer noch auf dem berechneten Ruf. Der kauf einer Lizenz berechtigt dich nur, die eingereichten Kapitel der anderen zu sehen",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Neues Feature: Crowdsourced benutzerdefinierte Kapitel. Dies sind benutzerdefinierte Abschnitte in Videos, die gestapelt werden können, um mehr und mehr präzise zu werden. Kauf eine Lizenz, um Kapitel, die in diesem Video eingereicht wurden, anzusehen: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Neues Feature: Crowd-gesourcte benutzerdefinierte Kapitel. Dies sind benutzerdefiniert benannte Abschnitte in Videos, die gestapelt werden können, um mehr und mehr präzise zu werden. Du hast kostenlosen Zugang, aktiviere es in den Optionen."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Du hast derzeit {0} in {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Warnung: Der Server hat noch nicht mit Segmenten geantwortet. Möglicherweise gibt es bereits Segmente zu diesem Video, aber du hast sie aufgrund von Problemen mit dem Server noch nicht erhalten."
+    },
+    "allowScrollingToEdit": {
+        "message": "Scrollen zum Bearbeiten von Zeiten erlauben"
     }
 }

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": "Υποστηριζόμενες Ιστοσελίδες: "
     },
@@ -855,9 +845,6 @@
     "hideForever": {
         "message": "Απόκρυψη για πάντα"
     },
-    "warningChatInfo": {
-        "message": "Παρατηρήσαμε ότι κάνατε συνηθισμένα μη κακόβουλα λάθη"
-    },
     "warningTitle": {
         "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."
@@ -942,7 +943,7 @@
         "message": "Hide forever"
     },
     "warningChatInfo": {
-        "message": "We noticed you were making some common mistakes that are not malicious"
+        "message": "We noticed you were making some common mistakes. We very much appreciate your work so far, but we strive towards perfection here, so even very small mistakes matter :)"
     },
     "warningTitle": {
         "message": "You got a warning"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Select your country"
     },
-    "alreadyDonated": {
-        "message": "If you've donated any amount before now, you may redeem free access by emailing:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "If you can't afford to purchase a license, click {here} to see if you are eligible for a discount",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Enter License Key"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlock crowd-sourced chapters feature is only available to people who purchase a license, or for people who are granted access for free due their past contributions"
-    },
-    "chaptersPage2": {
-        "message": "Note: Permission to submit chapters is still based on calculated reputation. Purchasing a license only allows you to view chapters submitted by others",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "New Feature: Crowd-sourced custom chapters. These are custom-named sections in videos that can be stacked to get more and more precise. Purchase a license to view the chapters submitted on this video such as: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "New Feature: Crowd-sourced custom chapters. These are custom-named sections in videos that can be stacked to get more and more precise. You have access for free, enable in options."
-    },
     "unsubmittedSegmentCounts": {
         "message": "You currently have {0} on {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Warning: The server hasn't responded with segments yet. There might actually be segments on this video already submitted but you just haven't recieved them due to issues with the server."
+    },
+    "allowScrollingToEdit": {
+        "message": "Allow Scrolling To Edit Times"
     }
 }

public/_locales/es/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Icono de cerrar"
     },
-    "SubmitTimes": {
-        "message": "Enviar Segmentos"
+    "OpenSubmissionMenu": {
+        "message": "Abrir Menú de Envíos"
     },
     "sortSegments": {
         "message": "Ordenar Segmentos"
@@ -171,9 +171,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 +421,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 +439,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 +592,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 +604,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 +613,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 +641,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 +674,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 +695,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 +704,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 +722,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 +731,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"
@@ -800,6 +797,10 @@
         "message": "Mostrar un icono cuando un video es enteramente un anuncio",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "También mostrar etiquetas en las miniaturas de los vídeos",
+        "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": "Color No Enviado",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Ocultar para siempre"
     },
     "warningChatInfo": {
-        "message": "Hemos notado que has estado cometiendo algunos errores comunes que no son maliciosos"
+        "message": "Nos hemos dado cuenta de que cometías algunos errores comunes. Apreciamos mucho tu trabajo hasta ahora, pero aquí nos esforzamos por alcanzar la perfección, así que incluso los errores más pequeños importan :)"
     },
     "warningTitle": {
         "message": "Tienes una advertencia"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Seleccione su país"
     },
-    "alreadyDonated": {
-        "message": "Si has donado cualquier cantidad antes de ahora, puedes canjear el acceso gratuito vía correo electrónico:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Si no puedes permitirte comprar una licencia, haz clic {aquí} para ver si eres elegible para un descuento",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1170,7 +1167,7 @@
         "message": "Canjear"
     },
     "joinOnPatreon": {
-        "message": "Danos tu apoyo en Patreon"
+        "message": "Suscríbete en Patreon"
     },
     "oneTimePurchase": {
         "message": "Compra única"
@@ -1178,26 +1175,12 @@
     "enterLicenseKey": {
         "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"
-    },
-    "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",
-        "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: ",
-        "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."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Actualmente tienes {0} en {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
     },
     "unsubmittedSegmentCountsZero": {
-        "message": "Actualmente no tiene segmentos sin enviar",
+        "message": "Actualmente, no tiene segmentos sin enviar",
         "description": "Replaces 'unsubmittedSegmentCounts' string when there are no unsubmitted segments"
     },
     "unsubmittedSegmentsSingular": {
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Advertencia: El servidor aún no ha respondido con segmentos. Es posible que haya segmentos en este video ya enviados, pero no los ha recibido debido a problemas con el servidor."
+    },
+    "allowScrollingToEdit": {
+        "message": "Permitir desplazamiento para editar tiempos"
     }
 }

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 kõrval"
+        "message": "Kuva praegune segment video aja kõrval"
     },
     "upvoteButtonInfo": {
         "message": "Anna segmendile poolthääl"
@@ -117,7 +117,7 @@
         "message": "Ühendusega esines tõrge. Veakood: "
     },
     "segmentsStillLoading": {
-        "message": "Segmendid on veel laadimas..."
+        "message": "Segmente veel laetakse..."
     },
     "clearTimes": {
         "message": "Tühjenda segmendid"
@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Sulgemisikoon"
     },
-    "SubmitTimes": {
-        "message": "Esita segmendid"
+    "OpenSubmissionMenu": {
+        "message": "Ava saatmise menüü"
     },
     "sortSegments": {
         "message": "Sorteeri segmendid"
@@ -171,9 +171,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"
     },
@@ -255,6 +252,12 @@
     "whatRefetchWhenNotFound": {
         "message": "Kui video on uus ning segmente ei leitud, proovitakse vaatamise ajal iga paari minuti tagant uuesti segmente tuua."
     },
+    "enableShowCategoryWithoutPermission": {
+        "message": "Näita segmentide menüüs ka ilma saatmise loata kategooriaid"
+    },
+    "whatShowCategoryWithoutPermission": {
+        "message": "Osade kategooriate esitamiseks on minimaalse reputatsiooni nõuete tõttu vajalik luba"
+    },
     "showNotice": {
         "message": "Kuva märkus uuesti"
     },
@@ -319,6 +322,9 @@
         "message": "Eelmine peatükk",
         "description": "Keybind label"
     },
+    "keybindDescription": {
+        "message": "Valige klahv vajutades sellele, seejärel valige need teisendklahvid, mida soovite kasutada."
+    },
     "0": {
         "message": "Ühenduse ajalõpp. Kontrolli oma võrguühendust. Kui internet töötab, on ilmselt server ülekoormatud või maas."
     },
@@ -414,9 +420,18 @@
     "statusReminder": {
         "message": "Serveri oleku saamiseks vaata status.sponsor.ajay.app"
     },
+    "changeUserID": {
+        "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": "Määra privaatne UserID"
+    },
+    "userIDChangeWarning": {
+        "message": "Tähelepanu: privaatse UserID muutmine on lõplik. Kas soovid kindlasti seda teha? Igaks juhuks soovitame eelmise UserID varundada."
+    },
     "createdBy": {
         "message": "Autor"
     },
@@ -424,7 +439,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": {
@@ -460,6 +475,12 @@
     "minDurationDescription": {
         "message": "Segmendid, mis on lühemad kui määratud väärtus ei jäeta vahele või ei kuvata mängijal."
     },
+    "enableManualSkipOnFullVideo": {
+        "message": "Jäta käsitsi vahele, kui eksisteerib terve video silt"
+    },
+    "whatManualSkipOnFullVideo": {
+        "message": "Inimestele, kes soovivad vaadata (enese-)reklaami sisaldavat videot segamatult."
+    },
     "skipNoticeDuration": {
         "message": "Vahelejätmise teavituse kestus (sekundites):"
     },
@@ -469,6 +490,9 @@
     "shortCheck": {
         "message": "See saadetav segment on lühem, kui sinu lühima pikkuse valik. See võib tähendada, et see on juba saadetud ning on selle valiku tõttu lihtsalt ignoreeritud. Kas soovid kindlasti seda saata?"
     },
+    "liveOrPremiere": {
+        "message": "Käimasolevale otseülekandele segmentide esitamine pole lubatud. Palun oodake kuni otseülekanne lõpeb, värskendage lehte ja kontrollige siis, kas segmendid on jätkuvalt kehtivad."
+    },
     "showUploadButton": {
         "message": "Kuva üleslaadimisnupp"
     },
@@ -505,6 +529,9 @@
     "exportOptionsUpload": {
         "message": "Laadi failist"
     },
+    "whatExportOptions": {
+        "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"
     },
@@ -550,6 +577,9 @@
     "copyDebugInformationComplete": {
         "message": "Silumisinfo on lõikelauale kopeeritud. Võid sellelt vabalt eemaldada mistahes info, mida ei soovi jagada. Salvesta see tekstifaili või kleebi vearaportisse."
     },
+    "keyAlreadyUsed": {
+        "message": "See kiirkombinatsioon on juba kasutuses teise toimingu poolt. Palun valige teine kiirkombinatsioon."
+    },
     "to": {
         "message": "kuni",
         "description": "Used between segments. Example: 1:20 to 1:30"
@@ -664,6 +694,9 @@
     "category_filler": {
         "message": "Täitesisu/naljad"
     },
+    "category_filler_description": {
+        "message": "Video täiteks või huumori eesmärgil lisatud sisu, mis ei ole vajalik video põhieesmärgi mõistmiseks. Selle alla ei kuulu segmendid, mis annavad kontekstiteavet või taustainfot. See on väga agressiivne kategooria, mis on mõeldud olukorraks, kui te pole \"parimas tujus\"."
+    },
     "category_filler_short": {
         "message": "Täide"
     },
@@ -709,9 +742,18 @@
     "category_chapter": {
         "message": "Peatükk"
     },
+    "category_chapter_description": {
+        "message": "Isikupärastatava pealkirjaga peatükid, mis kirjeldavad tähtsamaid video osi."
+    },
     "category_chapter_guideline1": {
         "message": "Ära maini sponsorite brändi nimesid"
     },
+    "category_chapter_guideline2": {
+        "message": "Kasutage suuri peatükke peamiste osade jaoks"
+    },
+    "category_chapter_guideline3": {
+        "message": "Lühikesemaid peatükke saab paigutada suurtemate peatükkide sisse"
+    },
     "category_livestream_messages": {
         "message": "Otseülekanne: annetuste ja sõnumite lugemine"
     },
@@ -755,6 +797,10 @@
         "message": "Kuva ikoon, kui terve video on reklaam",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Kuva silte ka videote pisipiltidel",
+        "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": "Saatmata värv",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -817,6 +863,9 @@
         "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": "Kanali ID pole veel laaditud. Kui vaatad manustatud videot, proovi seda vaadata YouTube'i kodulehelt. See võib olla põhjustatud ka YouTube'i paigutuse muudatustest - kui arvad et see nii on, kommenteeri siin:"
     },
+    "invidiousPermissionRefresh": {
+        "message": "Teie veebilehitseja on eemaldanud loa, mis on vajalik korrektseks tööks Invidious platformil ja muudel kolmandate osapoolte lehtedel. Vajutage allolevat nuppu, et taaskäivitada see luba."
+    },
     "acceptPermission": {
         "message": "Nõustu loaga"
     },
@@ -877,9 +926,15 @@
         "message": "Sain aru",
         "description": "Used as the button to dismiss a tooltip"
     },
+    "fullVideoTooltipWarning": {
+        "message": "See segment on üsna suur. Kui kogu video vältel käsitletakse üht teemat, muutke seade \"jäta vahele\" seadeks \"Täis video\". Vaadake juhiseid rohkema info jaoks."
+    },
     "categoryPillTitleText": {
         "message": "See terve video on selle kategooriaga sildistatud ning on liiga tihedalt integreeritud, et eraldada saaks"
     },
+    "chapterNameTooltipWarning": {
+        "message": "Üks teie peatükkidest sarnaneb kategooriaga. Kui võimalik, kasutage kategooriaid."
+    },
     "experiementOptOut": {
         "message": "Keeldu kõigist tulevikus tehtavatatest eksperimentidest",
         "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."
@@ -888,7 +943,7 @@
         "message": "Peida igaveseks"
     },
     "warningChatInfo": {
-        "message": "Panime tähele, et tegid teatud sagedasi vigu, mis ei olnud pahatahtlikud"
+        "message": "Märkasime, et olete teinud paar üsna tavalist viga. Oleme teie töö eest väga tänulikud, aga me püüdleme täiuslikkuse poole, seega iga väike viga loeb :)"
     },
     "warningTitle": {
         "message": "Sa said hoiatuse"
@@ -921,20 +976,38 @@
         "message": "Palun vaata allolevad valikud üle"
     },
     "helpPageFeatureDisclaimer": {
-        "message": "Paljud funktsioonid on vaikimisi välja lülitatud. Kui sa soovid jätta vahele vaheaejad, kasutada Invidioust jms, lülita need allpool sisse. Sa saad ka peita/kuvada kasutajaliidese elemente."
+        "message": "Paljud funktsioonid on vaikimisi välja lülitatud. Kui te soovite jätta vahele sissejutatused, kokkuvõtted, kasutada Invidioust jms, lülitage need allpool sisse. Te saate ka peita/kuvada kasutajaliidese elemente."
     },
     "helpPageHowSkippingWorks": {
         "message": "Kuidas vahelejätmine töötab"
     },
+    "helpPageHowSkippingWorks1": {
+        "message": "Video segmendid jäetakse automaatselt vahele, kui nendele vastavad segmendid leitakse andmebaasist. Saate avada hüpikakna vajutades SponsorBlock-i logo peale - nii saate näha eelvaadet nendest segmentidest."
+    },
+    "helpPageHowSkippingWorks2": {
+        "message": "Iga kord, kui jätate segmendi vahele, saadetakse teie teavitus. Kui segmendi ajastus tundub vale või ebatäpsena - hääletage see valeks vajutades vastuhäälele. Hääletamine on võimalik ka hüpikakna abil."
+    },
     "Submitting": {
         "message": "Saatmine"
     },
+    "helpPageSubmitting1": {
+        "message": "Segmentide esitamine on võimalik kas käsitsi hüpikakna abil, vajutades \"Segment algab siit\" või läbi videopleieri kasutades pleieriribas olevaid kahte nuppu."
+    },
+    "helpPageSubmitting2": {
+        "message": "Vajutades play-nuppu märgite segmendi alguse ning stop-nuppu vajutades märgite segmendi lõpu. Võite märkida mitu sponsorit enne \"saada\" vajutamist. Vajutades üleslaadimisnupule laetakse teie loodud segmendid andmebaasi. Vajutades prügikastile kustutatakse teie märgitud segmendid."
+    },
     "Editing": {
         "message": "Redigeerimine"
     },
+    "helpPageEditing1": {
+        "message": "Juhul, kui tegite vea, saate muuta või kustutada oma segmente vajutades üles näitavat noolt."
+    },
     "helpPageTooSlow": {
         "message": "See on liiga aeglane"
     },
+    "helpPageTooSlow1": {
+        "message": "Kiirklahvid on saadaval, kui soovite neid kasutada. Vajutage semikooloniga klahvi, et märkida segmendi algus või lõpp ning vajutage ülakomaga klahvi, et oma segmendid esitada. Need kiirklahvid on muudetavad seadetest. Kui te ei kasuta QWERTY-klaviatuuri, tuleb teil tõenäoliselt muuta klahviseoseid."
+    },
     "helpPageCopyOfDatabase": {
         "message": "Kas ma saaksin andmebaasist koopia? Mis juhtub, kui sa kaod?"
     },
@@ -1068,15 +1141,25 @@
     "redeemFailed": {
         "message": "Litsentsivõti on sobimatu"
     },
+    "hideUpsells": {
+        "message": "Peida valikud, mis on saadaval vaid lisatasu eest"
+    },
     "chooseACountry": {
         "message": "Vali riik"
     },
+    "noDiscount": {
+        "message": "Te ei kvalifitseeru allahindluse saamiseks"
+    },
     "discountLink": {
         "message": "Soodushinna link (vaata roosat hinda)"
     },
     "selectYourCountry": {
         "message": "Vali oma riik"
     },
+    "cantAfford": {
+        "message": "Kui te ei saa lubada endale litsensi soetamist, vajutage {here}, et uurida, kas kvalifitseerute allahindluse saamisele",
+        "description": "Keep the curly braces. The word 'here' should be translated as well."
+    },
     "patreonSignIn": {
         "message": "Logi Patreoniga sisse"
     },
@@ -1092,9 +1175,6 @@
     "enterLicenseKey": {
         "message": "Sisesta litsentsivõti"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlocki kogukonna-loodud peatükkide funktsioon on saadaval vaid inimestele, kes ostavad litsentsi või neile, kes saavad tasuta ligipääsu varasemate panuste tõttu"
-    },
     "unsubmittedSegmentCounts": {
         "message": "Sul on hetkel {0} {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1151,6 +1231,9 @@
         "message": "Jaga URLina"
     },
     "segmentFetchFailureWarning": {
-        "message": "Hoiatus: Server ei ole veel segmentidega vastanud. Sellel videol võivad juba olla saadetud segmendid, aga sa ei ole veel neid serveri vea tõttu saanud."
+        "message": "Tähelepanu: Server ei ole veel segmente edastanud. Sellel videol võivad olla esitatud segmendid, aga te pole neid serveri tõrke tõttu kätte saanud."
+    },
+    "allowScrollingToEdit": {
+        "message": "Luba aegade muutmiseks kerimine"
     }
 }

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ä"
     },
@@ -241,7 +238,7 @@
         "message": "Negatiivisesti äänestämäsi osiot pysyvät piilotettuina myös päivityksen jälkeen"
     },
     "trackDownvotesWarning": {
-        "message": "Varoitus: Tämän poistaminen käytöstä poistaa kaikki aiemmin tallennetut alaäänet"
+        "message": "Varoitus: Tämän käytöstä poisto poistaa kaikki aiemmat negatiiviset äänet"
     },
     "enableQueryByHashPrefix": {
         "message": "Kysely tiiviste-etuliittellä"
@@ -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": {
@@ -800,6 +797,10 @@
         "message": "Näytä kuvake, kun video on kokonaan mainos",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Näytä tunnisteet myös videoiden pienoiskuvissa",
+        "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": "Lähettämättömien väri",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -890,7 +891,7 @@
         "message": "Virheellinen/väärä aika"
     },
     "incorrectVote": {
-        "message": "Väärä"
+        "message": "Virheellinen"
     },
     "harmfulVote": {
         "message": "Haitallinen",
@@ -942,7 +943,7 @@
         "message": "Piilota ikuisesti"
     },
     "warningChatInfo": {
-        "message": "Huomasimme, että teit joitakin yleisiä virheitä, jotka eivät ole tahalleen tehtyjä"
+        "message": "Huomasimme, että teit joitakin yleisiä virheitä. Arvostamme työtäsi erittäin paljon, mutta pyrimme täydellisyyteen, joten pienilläkin virheillä on väliä :)"
     },
     "warningTitle": {
         "message": "Sait varoituksen"
@@ -1100,7 +1101,7 @@
         "description": "Option label"
     },
     "unbind": {
-        "message": "Poista kytkös",
+        "message": "Poista liitos",
         "description": "Unbind keyboard shortcut"
     },
     "notSet": {
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Valitse maasi"
     },
-    "alreadyDonated": {
-        "message": "Jos olet aiemmin lahjoittanut jonkin summan, voit lunastaa käyttöoikeuden veloituksetta sähköpostitse:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Jos sinulla ei ole varaa lisenssiin, paina {tästä} nähdäksesi oletko oikeutettu alennukseen",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Syötä lisenssiavain"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlockin joukkolähteinen kappaletoiminto on vain lisenssin ostaneiden tai aiempien tukien perusteella veloituksettoman käyttöoikeuden saaneiden henkilöiden käytettävissä"
-    },
-    "chaptersPage2": {
-        "message": "Huomioi: Kappaleiden lähetysoikeus perustuu edelleen laskettuun maineeseen. Lisenssin hankinta sallii sinun ainoastaan tarkastella muiden lähettämiä kappaleita",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Uusi ominaisuus: Joukkolähteisesti nimetyt kappaleet. Nämä ovat nimettyjä osia videoissa, joita voi pinota yhä paremman tarkkuuden saavuttamiseksi. Osta lisenssi nähdäksesi tähän videoon lisätyt kappaleet, kuten: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Uusi ominaisuus: Joukkolähteisesti nimetyt kappaleet. Nämä ovat nimettyjä osia videoissa, joita voi pinota yhä paremman tarkkuuden saavuttamiseksi. Sinulla on pääsy ominaisuuteen ilmaiseksi, ota se käyttöön asetuksissa."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Sinulla on tällä hetkellä {0} {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Varoitus: Palvelin ei ole vielä toimittanut osiotietoja. Video saattaa sisältää jo lähetettyjä osioita, mutta et vain ole vielä vastaanottanut niitä palvelinongelmien takia."
+    },
+    "allowScrollingToEdit": {
+        "message": "Salli aikojen muokkaaminen skrollaamalla"
     }
 }

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

@@ -8,10 +8,10 @@
         "description": "Description of the extension."
     },
     "400": {
-        "message": "Soumission invalide"
+        "message": "Le serveur indique que cette requête est invalide"
     },
     "429": {
-        "message": "Vous cherchez à envoyer beaucoup de segments, y en a-t-il vraiment autant ?"
+        "message": "Vous cherchez à soummettre trop de segments pour cette vidéo, êtes vous sûr-e de ne pas avoir fait une erreur ?"
     },
     "409": {
         "message": "Ce segment a déjà été soumis auparavant"
@@ -63,7 +63,7 @@
         "message": "Revenir en arrière"
     },
     "reskip": {
-        "message": "Sauter"
+        "message": "Passer"
     },
     "unmute": {
         "message": "Réactiver le son"
@@ -75,16 +75,16 @@
         "message": "Minuteur arrêté"
     },
     "confirmMSG": {
-        "message": "Pour modifier ou supprimer des soumissions, cliquez sur le bouton d'info ou ouvrez la fenêtre de l'extension en cliquant sur son icône dans le coin en haut à droite."
+        "message": "Pour modifier ou supprimer des soumissions, cliquez sur le bouton d'information ou ouvrez la fenêtre de l'extension en cliquant sur son icône dans le coin en haut à droite."
     },
     "clearThis": {
-        "message": "Êtes-vous certain(e) de vouloir supprimer vos soumissions ?\n\n"
+        "message": "Êtes-vous certain-e de vouloir supprimer ceci ?\n\n"
     },
     "Unknown": {
         "message": "Une erreur s'est produite lors de la soumission, veuillez réessayer plus tard."
     },
     "sponsorFound": {
-        "message": "Cette vidéo a des segments dans la base de données!"
+        "message": "Cette vidéo a des segments dans la base de données !"
     },
     "sponsor404": {
         "message": "Aucun segment trouvé"
@@ -96,13 +96,13 @@
         "message": "Fin du segment"
     },
     "sponsorCancel": {
-        "message": "Annuler la création de segment"
+        "message": "Annuler la création du segment"
     },
     "noVideoID": {
         "message": "Aucune vidéo YouTube trouvée.\nActualisez l'onglet s'il s'agit d'une erreur."
     },
     "refreshSegments": {
-        "message": "Rafraîchir les segments"
+        "message": "Actualiser les segments"
     },
     "success": {
         "message": "Succès !"
@@ -126,56 +126,53 @@
         "message": "Ouvrir l'encart SponsorBlock"
     },
     "closePopup": {
-        "message": "Fermer le Popup"
+        "message": "Fermer l'encart"
     },
     "closeIcon": {
         "message": "Icône \"Fermer\""
     },
-    "SubmitTimes": {
-        "message": "Soumettre des segments"
+    "OpenSubmissionMenu": {
+        "message": "Ouvrir le menu Contribution"
     },
     "sortSegments": {
         "message": "Trier les segments"
     },
     "submitCheck": {
-        "message": "Êtes-vous sûr de vouloir soumettre ces segments?"
+        "message": "Êtes-vous sûr de vouloir soumettre ces segments ?"
     },
     "whitelistChannel": {
         "message": "Ajouter la chaîne à la liste blanche"
     },
     "removeFromWhitelist": {
-        "message": "Enlever la chaîne de la liste blanche"
+        "message": "Retirer la chaîne de la liste blanche"
     },
     "voteOnTime": {
         "message": "Voter pour un segment"
     },
     "Submissions": {
-        "message": "Contributions"
+        "message": "Soumissions"
     },
     "savedPeopleFrom": {
-        "message": "Vous avez sauvé les utilisateurs de "
+        "message": "Vous avez sauvé les utilisateurices de "
     },
     "viewLeaderboard": {
         "message": "Classement"
     },
     "recordTimesDescription": {
-        "message": "Envoyer"
+        "message": "Soumettre"
     },
     "submissionEditHint": {
-        "message": "Le menu d'édition apparaîtra après que vous avez cliqué sur envoyer",
+        "message": "Le menu d'édition du segment apparaîtra après que vous ayez cliqué sur envoyer",
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
-        "message": "Astuce : vous pouvez configurer des raccourcis clavier dans les options"
+        "message": "Astuce : vous pouvez configurer les raccourcis clavier de l'extension dans les options"
     },
     "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"
+        "message": "Votre pseudo est inscrit dans le classement public permettant de présenter vos soumissions. Le consulter"
     },
     "Username": {
         "message": "Pseudo"
@@ -184,13 +181,13 @@
         "message": "Choisir un pseudonyme"
     },
     "copyPublicID": {
-        "message": "Copier l'ID utilisateur"
+        "message": "Copier le UserID"
     },
     "copySegmentID": {
         "message": "Copier l'identifiant du segment"
     },
     "discordAdvert": {
-        "message": "Rejoignez le serveur Discord officiel pour toutes suggestions ou remarques!"
+        "message": "Rejoignez le serveur Discord officiel pour partager vos suggestions et remarques !"
     },
     "hideThis": {
         "message": "Cacher"
@@ -199,7 +196,7 @@
         "message": "Options"
     },
     "showButtons": {
-        "message": "Montrer les boutons sur le lecteur YouTube"
+        "message": "Afficher les boutons sur le lecteur YouTube"
     },
     "hideButtons": {
         "message": "Cacher les boutons sur le lecteur YouTube"
@@ -229,13 +226,13 @@
         "message": "Activer le suivi du nombre de sauts de segments"
     },
     "whatViewTracking": {
-        "message": "Cette fonctionnalité permet de suivre les segments que vous avez sautés pour faire savoir aux utilisateurs à quel point leur soumission a aidé les autres et est utilisée comme donnée avec les votes positifs pour s'assurer que des spams n'entrent pas dans la base de données. L'extension envoie un message au serveur chaque fois que vous sautez un segment. Il est à espérer que la plupart des gens ne modifient pas ce paramètre pour que les données sur le nombre d'affichages soient exactes. :)"
+        "message": "Cette fonctionnalité enregistre les segments que vous sautez, de manière à informer leur auteurice que leur soumission a été utile, et est également utilisée en complément des votes afin d'éviter l'enregistrement de spams dans la base de données. SponsorBlock envoie un message au serveur à chaque fois que vous passez un segment. Pour garder des statistiques représentatives, nous espérons que la plupart des gens ne modifiront pas ce paramètre. :)"
     },
     "enableViewTrackingInPrivate": {
-        "message": "Activer le suivi du nombre de sauts dans les onglets privés/incognito"
+        "message": "Activer le décompte du nombre de segments sautés dans les onglets de navigation privée/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"
@@ -247,7 +244,7 @@
         "message": "Requête par préfixe du hash"
     },
     "whatQueryByHashPrefix": {
-        "message": "Au lieu de demander des segments au serveur à l'aide de l'identifiant de la vidéo, les 4 premiers caractères du hash de l'identifiant de la vidéo sont envoyés. Ce serveur renverra les données pour toutes les vidéos ayant des hash similaires."
+        "message": "Plutôt que de récupérer depuis le serveur les segments à sauter à l'aide de l'identifiant de la vidéo, les 4 premiers caractères du hash de l'identifiant de la vidéo sont envoyés. Le serveur renverra les données pour toutes les vidéos ayant des hash similaires."
     },
     "enableRefetchWhenNotFound": {
         "message": "Récupérer les segments sur les nouvelles vidéos"
@@ -262,31 +259,31 @@
         "message": "Certaines catégories nécessitent une autorisation en raison d'exigences minimales de réputation"
     },
     "showNotice": {
-        "message": "Afficher la notification"
+        "message": "Afficher à nouveau la notification"
     },
     "showSkipNotice": {
-        "message": "Notifier après qu'un segment ait été sauté"
+        "message": "Notifier après qu'un segment a été sauté"
     },
     "showCategoryGuidelines": {
         "message": "Affiche l'aide de la catégorie"
     },
     "noticeVisibilityMode0": {
-        "message": "Notifications de passage"
+        "message": "Cacher les notifications en mode plein écran"
     },
     "noticeVisibilityMode1": {
-        "message": "Petite notifications de passage pour l'auto skip"
+        "message": "Petite notification lors du passage automatique"
     },
     "noticeVisibilityMode2": {
         "message": "Toute les petites notifications de passage"
     },
     "noticeVisibilityMode3": {
-        "message": "Notifications de passage qui disparaissent pour l'auto skip"
+        "message": "Notifications estompées lors du passage automatique"
     },
     "noticeVisibilityMode4": {
-        "message": "Toute les notifications de passage qui disparaissent"
+        "message": "Toute les notifications de passage sont estompées"
     },
     "longDescription": {
-        "message": "SponsorBlock vous permet de passer les sponsors, les intros, les outros, les rappels d'abonnement et autres parties ennuyeuses des vidéos YouTube. SponsorBlock est une extension de navigateur qui permet à n'importe qui de soumettre les temps de début et de fin des segments sponsorisés et d'autres segments de vidéos YouTube. Une fois qu'une personne a soumis ces informations, toutes les autres personnes possédant cette extension passeront directement les segments sponsorisés. Vous pouvez également sauter les sections non musicales des vidéos musicales.",
+        "message": "SponsorBlock vous permet de passer les messages sponsorisés, les introductions, les postfaces, les rappels d'abonnement et autres passages ennuyeux des vidéos YouTube. SponsorBlock est une extension de navigateur web qui permet à tout le monde de soumettre les temps de début et de fin des passages sponsorisés et d'autres segments de vidéos YouTube. Dès que quelqu'un-e soumet ces informations, toutes les autres personnes possédant l'extension passeront directement les segments sponsorisés. Vous pouvez également sauter les sections non musicales des vidéos musicales.",
         "description": "Full description of the extension on the store pages."
     },
     "website": {
@@ -389,13 +386,13 @@
         "message": "Notification audio lors du passage"
     },
     "audioNotificationDescription": {
-        "message": "Une notification audio sera jouée chaque fois qu'un segment est passé. Si désactivé (ou si le passage automatique est désactivé), aucun son ne sera joué."
+        "message": "Une notification audio sera jouée chaque fois qu'un segment sera passé. Si désactivé (ou si le passage automatique est désactivé), aucun son ne sera joué."
     },
     "showTimeWithSkips": {
-        "message": "Afficher le temps avec les passages supprimés"
+        "message": "Afficher la durée en supprimant les segments"
     },
     "showTimeWithSkipsDescription": {
-        "message": "Ce temps apparaît entre crochets à côté du temps actuel sous la barre de défilement. Cela indique la durée totale de la vidéo après déduction de tous les segments. Ceci comprend les segments marqués comme étant uniquement à \"Afficher dans la barre de recherche\"."
+        "message": "Cette durée apparaît entre crochets à côté de la durée actuelle, sous la barre de défilement. Il s'agit de la durée totale de la vidéo après déduction de tous les segments. Les segments marqués comme étant uniquement à \"Afficher dans la barre de recherche\" sont inclus dans le calcul."
     },
     "youHaveSkipped": {
         "message": "Vous avez passé "
@@ -413,7 +410,7 @@
         "message": "heures"
     },
     "youHaveSavedTime": {
-        "message": "Vous avez fait économiser les utilisateurs",
+        "message": "Vous avez sauvé les autres de",
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "youHaveSavedTimeEnd": {
@@ -421,7 +418,7 @@
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "statusReminder": {
-        "message": "Vérifiez status.sponsor.ajay.app pour le status du serveur."
+        "message": "Consultez status.sponsor.ajay.app pour connaître le statut du serveur."
     },
     "changeUserID": {
         "message": "Importer/Exporter Votre ID privé d'utilisateur"
@@ -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": {
@@ -455,13 +452,13 @@
         "message": "Ajouter une instance de client tiers"
     },
     "addInvidiousInstanceDescription": {
-        "message": "Ajouter une instance personnalisée. Elle doit être formaté avec SEULEMENT le domaine. Exemple: invidious.ajay.app"
+        "message": "Ajouter une instance personnalisée. Contient UNIQUEMENT son nom de domaine. Par exemple : invidious.ajay.app"
     },
     "add": {
         "message": "Ajouter"
     },
     "addInvidiousInstanceError": {
-        "message": "Ce domaine n'est pas valide. Il devrait JUSTE inclure le domaine. Exemple: invidious.ajay.app"
+        "message": "Ce domaine n'est pas valide. Vérifiez que vous avez UNIQUEMENT noté le nom de domaine. Par exemple : invidious.ajay.app"
     },
     "resetInvidiousInstance": {
         "message": "Réinitialiser la liste d'instances Invidious"
@@ -470,13 +467,13 @@
         "message": "Vous êtes sur le point de réinitialiser la liste des instances Invidious"
     },
     "currentInstances": {
-        "message": "Instances actuelles:"
+        "message": "Instances actuelles :"
     },
     "minDuration": {
-        "message": "Durée minimale (en secondes):"
+        "message": "Durée minimale (en secondes) :"
     },
     "minDurationDescription": {
-        "message": "Les segments plus courts que la valeur fixée ne seront pas sautés ou affichés dans le lecteur."
+        "message": "Les segments plus courts que la valeur fixée ne seront pas sautés ni affichés dans le lecteur."
     },
     "enableManualSkipOnFullVideo": {
         "message": "Utiliser le saut manuel quand une étiquette vidéo complète existe"
@@ -485,10 +482,10 @@
         "message": "Pour les personnes qui veulent regarder la vidéo sans interruptions si elle est complétement sponsorisée ou auto-promu."
     },
     "skipNoticeDuration": {
-        "message": "Durée du saut de segment (secondes):"
+        "message": "Durée de l'affichage de la notification de saut de segment (en secondes) :"
     },
     "skipNoticeDurationDescription": {
-        "message": "L'avis du saut restera à l'écran pendant au moins aussi longtemps. Pour passer manuellement, il peut être visible plus longtemps."
+        "message": "La notification du passage restera à l'écran pendant au moins le temps défini. Pour passer manuellement un segment, il est possible qu'il reste visible plus longtemps."
     },
     "shortCheck": {
         "message": "Le segment suivant est plus court que votre option de durée minimale. Cela pourrait signifier qu'il a déjà été soumis et est simplement ignoré à cause de cette option. Êtes-vous sûr de vouloir soumettre ce segment ?"
@@ -497,13 +494,13 @@
         "message": "La soumission de segments sur un direct en cours ou une première n'est pas autorisée. Veuillez attendre qu'il soit terminé puis actualisez la page et vérifiez que les segments sont toujours valides."
     },
     "showUploadButton": {
-        "message": "Afficher le bouton de téléchargement"
+        "message": "Afficher le bouton de téléversement"
     },
     "customServerAddress": {
         "message": "Adresse du serveur SponsorBlock"
     },
     "customServerAddressDescription": {
-        "message": "L'adresse que SponsorBlock utilise pour faire des appels au serveur.\nSauf si vous avez votre propre instance de serveur, cela ne devrait pas être changé."
+        "message": "L'adresse que SponsorBlock utilise pour faire des appels au serveur.\nCe réglage ne doit pas être modifié à moins que vous hébergiez votre propre instance."
     },
     "save": {
         "message": "Sauvegarder"
@@ -515,7 +512,7 @@
         "message": "Le format de l'adresse est incorrect. Assurez-vous qu'elle commence bien par http:// ou https:// et ne termine pas par un slash."
     },
     "areYouSureReset": {
-        "message": "Voulez-vous vraiment remettre à zéro ?"
+        "message": "Voulez-vous vraiment réinitialiser ?"
     },
     "mobileUpdateInfo": {
         "message": "m.youtube.com est maintenant pris en charge"
@@ -542,7 +539,7 @@
         "message": "Attention : La modification des options est définitive et peut rendre instable voire planter votre installation. Êtes-vous sûr de vouloir faire ça ? Faites une sauvegarde de votre ancienne configuration au cas où."
     },
     "incorrectlyFormattedOptions": {
-        "message": "Ce JSON n'est pas formaté correctement. Vos options n'ont pas été modifiées."
+        "message": "Ce fichier JSON n'est pas formaté correctement. Vos options n'ont pas été modifiées."
     },
     "confirmNoticeTitle": {
         "message": "Soumettre le segment"
@@ -601,7 +598,7 @@
         "message": "Message sponsorisé"
     },
     "category_sponsor_description": {
-        "message": "Promotion rémunérée, parrainage rémunéré et publicité directe. Pas pour l'autopromotion ou les présentations gratuites de causes, de créateurs, de sites web ou de produits qu'ils aiment."
+        "message": "Promotion rémunérée, parrainage rémunéré et publicité directe. Ne concerne pas l'autopromotion ou le partage gratuit de causes, créateurices, sites web ou produits appréciés."
     },
     "category_sponsor_guideline1": {
         "message": "Promotions rémunérées"
@@ -656,7 +653,7 @@
         "message": "Rappel d'interaction"
     },
     "category_intro": {
-        "message": "Entracte/Animation d'intro"
+        "message": "Entracte/Animation d'introduction"
     },
     "category_intro_description": {
         "message": "Un intervalle sans réel contenu, par exemple une pause, une image statique ou une animation répétitive. N'utilisez pas cette catégorie pour les transitions contenant de l'information."
@@ -671,10 +668,10 @@
         "message": "Pas pour les transitions avec des informations"
     },
     "category_outro": {
-        "message": "Générique de fin"
+        "message": "Écrans de fin/Crédits"
     },
     "category_outro_description": {
-        "message": "Crédits ou écrans de fin YouTube. Pas pour les conclusions contenant des informations."
+        "message": "Crédits ou écran de fin YouTube. Pas pour les conclusions contenant des informations."
     },
     "category_outro_guideline1": {
         "message": "Ne dois pas inclure de contenu, même si les écrans de fin sont apparus"
@@ -716,10 +713,10 @@
         "message": "Musique : Segment non musical"
     },
     "category_music_offtopic_description": {
-        "message": "A utiliser seulement pour les vidéos de musiques. Ceci ne devrait qu'être utilisé que pour des morceaux de vidéos de musiques qui ne sont pas couvert par d'autres catégories."
+        "message": "A utiliser seulement dans les vidéos de musique. Doit être uniquement utilisé pour les sections qui ne sont pas couverte par une autre catégorie plus spécifique."
     },
     "category_music_offtopic_short": {
-        "message": "Hors musique"
+        "message": "Section non musicale"
     },
     "category_music_offtopic_guideline1": {
         "message": "Sections qui ne sont pas dans la musique officielle"
@@ -731,7 +728,7 @@
         "message": "Point essentiel"
     },
     "category_poi_highlight_description": {
-        "message": "La partie de la vidéo que la plupart des gens veulent voir. Similaire à \"la vidéo commence à x mins\"."
+        "message": "La partie de la vidéo que la plupart des gens veut voir. Similaire aux commentaires de type « La vidéo commence à x minutes »."
     },
     "category_poi_highlight_guideline1": {
         "message": "Section la plus regardée"
@@ -791,15 +788,19 @@
         "message": "Montre les chapitres"
     },
     "autoSkipOnMusicVideos": {
-        "message": "Ignorer automatiquement tous les segments lorsqu'il y a un segment non-musical"
+        "message": "Passer automatiquement tous les segments lorsqu'il y a un segment non musical"
     },
     "muteSegments": {
-        "message": "Autoriser les segments qui bloquent l'audio au lieu de le passer"
+        "message": "Autoriser les segments qui mettent l'audio en sourdine plutôt que de les passer"
     },
     "fullVideoSegments": {
         "message": "Afficher une icône lorsqu'une vidéo est entièrement promotionnelle",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Afficher également les étiquettes sur les vignettes de la vidéo",
+        "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": "Couleur non soumise",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -811,17 +812,17 @@
         "message": "Catégorie"
     },
     "skipOption": {
-        "message": "Option de saut",
+        "message": "Option de passage",
         "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
     },
     "enableTestingServer": {
         "message": "Activer le serveur de test bêta"
     },
     "whatEnableTestingServer": {
-        "message": "Vos soumissions et votes NE COMPTERONT PAS sur le serveur principal. Utilisez ceci uniquement pour faire des tests."
+        "message": "Vos soumissions et votes NE SERONT PAS COMPTÉES par serveur principal. À n'utiliser que lors de vos tests."
     },
     "testingServerWarning": {
-        "message": "AUCUNE SOUMISSION OU VOTE NE COMPTERA sur le serveur principal tant que vous serez connecté au serveur de test. Désactivez ceci quand vous voudrez réellement soumettre ou voter."
+        "message": "Aucune soumission ou vote NE SERA COMPTÉE par le serveur principal tant que vous serez connecté-e au serveur de test. À désactiver quand vous voudrez réellement soumettre des segments ou voter."
     },
     "bracketNow": {
         "message": "(Maintenant)"
@@ -866,19 +867,19 @@
         "message": "Le navigateur a refusé l'autorisation nécessaire pour pouvoir fonctionner sur Invidious et d'autres sites tiers. Veuillez cliquer sur le bouton ci-dessous pour réactiver cette autorisation."
     },
     "acceptPermission": {
-        "message": "Accepter l'autorisation"
+        "message": "Donner la permission"
     },
     "permissionRequestSuccess": {
         "message": "Demande de permission réussie !"
     },
     "permissionRequestFailed": {
-        "message": "La demande d'autorisation a échoué, avez-vous cliqué sur refuser ?"
+        "message": "La demande de permission a échoué, avez-vous cliqué sur refuser ?"
     },
     "adblockerIssueWhitelist": {
-        "message": "Si vous ne parvenez pas à résoudre ce problème, désactivez le paramètre 'Force Channel Check Before Skipping' car SponsorBlock est incapable de récupérer les informations de la chaine pour cette vidéo"
+        "message": "Si vous ne parvenez pas à résoudre ce problème, désactivez le paramètre \"Forcer la vérification de la chaîne avant de passer\" car SponsorBlock ne parvient pas à récupérer les informations de la chaine pour cette vidéo"
     },
     "forceChannelCheck": {
-        "message": "Forcer la vérification du canal avant de passer"
+        "message": "Forcer la vérification de la chaîne avant de passer"
     },
     "whatForceChannelCheck": {
         "message": "Par défaut, les segments sont passés avant même de savoir à quelle chaîne la vidéo appartient. Par défaut, certains segments en début de vidéo des chaînes sur liste blanche peuvent être involontairement passés. Activer cette option évitera ce problème mais le passage des segments aura un léger retard, du fait que l'obtention du ChannelID prend du temps. Ce retard devrait être imperceptible si vous avez un haut débit internet."
@@ -900,7 +901,7 @@
         "message": "Changer de catégorie"
     },
     "nonMusicCategoryOnMusic": {
-        "message": "Cette vidéo est catégorisée comme de la musique. Êtes-vous sûr qu'elle est sponsorisée? S'il s'agit en fait d'un \"Segment non musical\", allez dans les options de l'extension et activez cette catégorie. Ensuite, vous pourrez soumettre ce segment en tant que \"Segment non musical\" au lieu de sponsor. Lisez les instructions en cas de confusion."
+        "message": "Cette vidéo est catégorisée comme musicale. Êtes-vous sûr-e qu'elle est sponsorisée ? S'il s'agit d'un segment non musical, activez cette catégorie dans les options de SponsorBlock. Vous pourez ensuite soumettre ce segment en tant que \"segment non musical\" plutôt que \"message commercial\". Lisez les instructions pour plus de détails."
     },
     "multipleSegments": {
         "message": "Plusieurs segments"
@@ -916,13 +917,13 @@
         "message": "Les catégories sont là !"
     },
     "categoryUpdate2": {
-        "message": "Ouvrir les options pour sauter les intros, outros, marchandises, etc."
+        "message": "Ouvrir les options pour sauter les introductions, postfaces, produits dérivés, etc."
     },
     "help": {
         "message": "Aide"
     },
     "GotIt": {
-        "message": "Compris",
+        "message": "C'est compris",
         "description": "Used as the button to dismiss a tooltip"
     },
     "fullVideoTooltipWarning": {
@@ -942,7 +943,7 @@
         "message": "Cacher pour toujours"
     },
     "warningChatInfo": {
-        "message": "Nous avons remarqué que vous faisiez des erreurs courantes qui ne sont pas intentionnelles"
+        "message": "Nous avons remarqué que vous commettiez des erreurs courantes. Nous apprécions votre travail jusqu'à présent, mais nous recherchons la perfection, donc même de petites erreurs comptent :)"
     },
     "warningTitle": {
         "message": "Vous avez reçu un avertissement"
@@ -975,22 +976,22 @@
         "message": "Veuillez vérifier les options ci-dessous"
     },
     "helpPageFeatureDisclaimer": {
-        "message": "De nombreuses fonctionnalités sont désactivées par défaut. Si vous voulez ignorer les intros, outros, utiliser Invidious, etc., activez-les ci-dessous. Vous pouvez également masquer/afficher les éléments de l'interface."
+        "message": "De nombreuses fonctionnalités sont désactivées par défaut. Si vous voulez ignorer les introductions, postfaces, utiliser Invidious, etc., définissez-le ci-dessous. Vous pouvez également masquer ou afficher les éléments de l'interface."
     },
     "helpPageHowSkippingWorks": {
-        "message": "Comment fonctionne le saut d'un segment"
+        "message": "Comment fonctionne le passage d'un segment"
     },
     "helpPageHowSkippingWorks1": {
-        "message": "Les segments vidéo seront automatiquement ignorés s'ils sont trouvés dans la base de données. Vous pouvez ouvrir le popup en cliquant sur l'icône de l'extension pour obtenir un aperçu de ces segments."
+        "message": "Les segments vidéo seront automatiquement ignorés s'ils sont trouvés dans la base de données. Vous pouvez ouvrir un encart en cliquant sur l'icône de l'extension pour en avoir un aperçu."
     },
     "helpPageHowSkippingWorks2": {
-        "message": "À chaque fois que vous sautez un segment, vous en serez averti. Si le timing semble incorrect, vous pouvez disliker le segment, vous pouvez également voter dans le popup."
+        "message": "À chaque fois que vous passez un segment, vous en êtes averti-e. Si le timing semble incorrect, vous pouvez voter contre le segment ! Vous pouvez également voter dans l'encart d'aperçu."
     },
     "Submitting": {
         "message": "Soumission en cours"
     },
     "helpPageSubmitting1": {
-        "message": "La soumission peut être effectuée dans le popup en appuyant sur le bouton \"le segment commence maintenant\" ou dans le lecteur vidéo avec les boutons du lecteur."
+        "message": "La soumission peut être effectuée dans l'encart d'aperçu en appuyant sur le bouton \"Début du segment\" ou dans le lecteur vidéo avec les boutons."
     },
     "helpPageSubmitting2": {
         "message": "Cliquer sur le bouton de lecture indique le début d'un segment et cliquer sur l'icône d'arrêt indique sa fin. Vous pouvez préparer plusieurs messages commerciaux avant d'appuyer sur Soumettre. Cliquer sur le bouton Téléverser soumettra vos segments. Cliquer sur la poubelle supprimera vos segments."
@@ -999,13 +1000,13 @@
         "message": "Édition en cours"
     },
     "helpPageEditing1": {
-        "message": "Si vous avez fait une erreur, vous pouvez modifier ou supprimer vos segments après avoir cliqué sur le bouton avec la flèche vers le haut."
+        "message": "Si vous avez fait une erreur, vous pouvez modifier ou supprimer vos segments en cliquant sur le bouton avec la flèche vers le haut."
     },
     "helpPageTooSlow": {
         "message": "Ceci est trop lent"
     },
     "helpPageTooSlow1": {
-        "message": "Il y a des raccourcis clavier si vous voulez les utiliser. Appuyez sur la touche point-virgule pour indiquer le début / la fin d'un segment sponsorisé et cliquez sur l'apostrophe pour soumettre. Cela peut être modifié dans les options. Si vous n'utilisez pas un clavier QWERTY, vous devriez probablement changer la touche assignée de base."
+        "message": "Il y a des raccourcis clavier si vous voulez les utiliser. Appuyez sur la touche point-virgule pour indiquer le début et la fin d'un segment sponsorisé, et cliquez sur l'apostrophe pour soumettre. Vous pouvez les modifier dans les options. Si vous n'utilisez pas un clavier QWERTY, vous devriez probablement changer les racourcis par défaut."
     },
     "helpPageCopyOfDatabase": {
         "message": "Puis-je obtenir une copie de la base de données ? Que se passe-t-il si vous disparaissez ?"
@@ -1014,10 +1015,10 @@
         "message": "La base de données est publique et disponible à"
     },
     "helpPageCopyOfDatabase2": {
-        "message": "Le code source est librement disponible. Donc, même si il m'arrive quelque chose, vos soumissions ne seront pas perdues."
+        "message": "Le code source est en accès libre. Donc, même si il m'arrive quelque chose, vos soumissions ne seront pas perdues."
     },
     "helpPageNews": {
-        "message": "Nouvelles et comment elles sont faites"
+        "message": "Nouveautés et comment l'extension est fabriquée"
     },
     "helpPageSourceCode": {
         "message": "Où puis-je obtenir le code source ?"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Sélectionne ton pays"
     },
-    "alreadyDonated": {
-        "message": "Si tu as fait un don de n'importe quel montant avant, tu peux avoir un accès gratuit en envoyant un e-mail :",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Si vous ne pouvez pas vous permettre d'acheter une licence, cliquez sur {here} pour voir si vous êtes admissible à une réduction",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Entrer la clé de licence"
     },
-    "chaptersPage1": {
-        "message": "La fonctionnalité participative des chapitres de SponsorBlock n'est disponible que pour les personnes qui achètent une licence, ou pour les personnes qui en ont l'accès gratuitement grâce à leurs contributions passées"
-    },
-    "chaptersPage2": {
-        "message": "Remarque : l'autorisation d'envoyer des chapitres est toujours basée sur la réputation calculée. L'achat d'une licence vous permet uniquement de voir les chapitres envoyés par d'autres",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Nouvelle fonctionnalité : Chapitres personnalisés crowd-sourcés. Ce sont des sections dans les vidéos avec un nom personnalisé qui s'améliore au fur et à mesure. Achetez une licence pour voir les chapitres soumis sur cette vidéo tels que: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Nouvelle fonctionnalité : Chapitres personnalisés crowd-sourcés. Ce sont des sections dans les vidéos avec un nom personnalisé qui peuvent s'additionner pour être de plus en plus précis. Vous y avez accès gratuitement, activez la dans les options."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Vous avez actuellement {0} sur {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Attention : Le serveur n'a pas encore répondu avec les segments. Il se peut qu'il y ait des segments sur cette vidéo déjà soumise, mais vous ne les avez tout simplement pas reçus en raison de problèmes avec le serveur."
+    },
+    "allowScrollingToEdit": {
+        "message": "Autoriser l'utilisation de la molette pour modifier les temps"
     }
 }

public/_locales/he/messages.json

@@ -26,11 +26,18 @@
         "message": "מקטעים"
     },
     "SegmentsCap": {
-        "message": "מקטעים"
+        "message": "קטעים"
     },
     "Chapters": {
         "message": "פרקים"
     },
+    "renderAsChapters": {
+        "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": "הצבע לדיווח הזה"
     },
@@ -89,13 +96,13 @@
         "message": "מקטע נגמר עכשיו"
     },
     "sponsorCancel": {
-        "message": "ביטול יצירת מקטע"
+        "message": "ביטול יצירת קטע"
     },
     "noVideoID": {
         "message": "לא נמצא סרטון יוטיוב.\nאם זה לא נכון, רענן את הכרטיסייה."
     },
     "refreshSegments": {
-        "message": "רענן מקטעים"
+        "message": "ריענון קטעים"
     },
     "success": {
         "message": "הצלחה!"
@@ -109,6 +116,9 @@
     "connectionError": {
         "message": "התקבלה שגיאת חיבור. קוד השגיאה: "
     },
+    "segmentsStillLoading": {
+        "message": "קטעים עדיין נטענים..."
+    },
     "clearTimes": {
         "message": "נקה מקטעים"
     },
@@ -118,8 +128,14 @@
     "closePopup": {
         "message": "סגור חלון"
     },
-    "SubmitTimes": {
-        "message": "הגש מקטעים"
+    "closeIcon": {
+        "message": "סגירת סמליל"
+    },
+    "OpenSubmissionMenu": {
+        "message": "פתיחת תפריט הגשה"
+    },
+    "sortSegments": {
+        "message": "מיון מקטעים"
     },
     "submitCheck": {
         "message": "אתה בטוח שאתה רוצה להזין את זה?"
@@ -153,43 +169,43 @@
         "message": "רמז: אתה יכול להגדיר קיצורים מהמקלדת דרך תפריט אפשרויות כדי להזין זמנים"
     },
     "clearTimesButton": {
-        "message": "נקה זמנים"
-    },
-    "submitTimesButton": {
-        "message": "הגש זמנים"
+        "message": "ניקוי זמנים"
     },
     "publicStats": {
-        "message": "זה משומש בעמוד הסטטים הפומביים כדי להראות כמה תרמת. צפה בזה"
+        "message": "זה משמש בדף הסטטיסטיקה הציבורי כדי להראות כמה תרמת. ניתן לצפות בזה"
     },
     "Username": {
         "message": "שם משתמש"
     },
     "setUsername": {
-        "message": "הגדר שם משתמש"
+        "message": "הגדרת שם משתמש"
     },
     "copyPublicID": {
-        "message": "העתק קוד משתמש פומבי"
+        "message": "העתקת מזהה משתמש פומבי"
+    },
+    "copySegmentID": {
+        "message": "העתקת מזהה מקטע"
     },
     "discordAdvert": {
-        "message": "הצטרף לשרת הדיסקורד הרשמי כדי לביא הצעות וחוות דעת!"
+        "message": "הצטרפות לשרת הדיסקורד הרשמי כדי לביא הצעות וחוות דעת!"
     },
     "hideThis": {
-        "message": "הסתר"
+        "message": "להסתיר את זה"
     },
     "Options": {
         "message": "אפשרויות"
     },
     "showButtons": {
-        "message": "הראה כפתורים על הנגן של יוטיוב"
+        "message": "הצגת כפתורים על הנגן של יוטיוב"
     },
     "hideButtons": {
-        "message": "הסתר כפתורים על הנגן של יוטיוב"
+        "message": "הסתרת כפתורים על הנגן של יוטיוב"
     },
     "hideButtonsDescription": {
         "message": "זה מחביא את הכפתורים שמופיעים בנגן YouTube להגיש מקטעי דילוג."
     },
     "showSkipButton": {
-        "message": "השאר את כפתור הדילוג לשיא הסרטון על הנגן באופן קבוע"
+        "message": "השארת כפתור הדילוג להדגשה על הנגן"
     },
     "showInfoButton": {
         "message": "הראה כפתור מידע בנגן YouTube"
@@ -198,16 +214,55 @@
         "message": "החבא כפתור מידע בנגן YouTube"
     },
     "autoHideInfoButton": {
-        "message": "הסתר אוטומטית כפתורי אינפורמציה"
+        "message": "הסתרה אוטומטית של כפתורי אינפורמציה"
     },
     "hideDeleteButton": {
-        "message": "הסתר כפתור מחיקה על הנגן של יוטיוב"
+        "message": "הסתרת כפתור מחיקה על הנגן של יוטיוב"
     },
     "showDeleteButton": {
-        "message": "הצג כפתור מחיקה על הנגן של יוטיוב"
+        "message": "הצגת כפתור מחיקה על הנגן של יוטיוב"
+    },
+    "enableViewTracking": {
+        "message": "אפשר מעקב ספירת דילוגים"
     },
     "whatViewTracking": {
-        "message": "הפיצ'ר הזה עוקב אחרי מקטעים שדילגת עליהם בכדי ליידע משתמשים אחרים כמה ההגשות שלך עזרו לאחרים ושומשו כמטריקה יחד עם ההצבעות בעד בכדי להבטיח שלא ייכנס ספאם אל תוך המערכת. ההרחבה שולחת הודעה לשרת בכל פעם שאתה מדלג על מקטע. התקווה היא שרוב האנשים לא ישנו את ההגדרה הזו כדי שהמספרי צפייה יהיו מדוייקים :)"
+        "message": "תכונה זו עוקבת אחר אילו מקטעים דילגת כדי לאפשר למשתמשים לדעת עד כמה ההגשה שלהם עזרה לאחרים והשתמשה כמדד יחד עם הצבעות בעד כדי להבטיח שספאם לא ייכנס למסד הנתונים. התוסף שולח הודעה לשרת בכל פעם שאתה מדלג על קטע. אני מקווה שרוב האנשים לא ישנו את ההגדרה הזו כדי שמספרי התצוגה יהיו מדויקים. :)"
+    },
+    "enableViewTrackingInPrivate": {
+        "message": "אפשר מעקב ספירת דילוגים בכרטיסיות גלישה פרטית/גלישה בסתר"
+    },
+    "enableTrackDownvotes": {
+        "message": "שמור דירוג קטעים"
+    },
+    "whatTrackDownvotes": {
+        "message": "כל קטע שידורג על ידך יישאר חבוי, גם לאחר רענון"
+    },
+    "trackDownvotesWarning": {
+        "message": "אזהרה: ביטול השמירה ימחק את הדירוגים שנשמרו"
+    },
+    "whatQueryByHashPrefix": {
+        "message": "במקום לבקש מקטעים מהשרת לפי מזהה סרטון, נשלחים ארבעת התווים הראשונים של ה-hash של מזהה הסרטון. שרת זה ישלח בחזרה נתונים לכל הסרטונים עם hash מתאים."
+    },
+    "enableRefetchWhenNotFound": {
+        "message": "השג מקטעים של סרטונים חדשים"
+    },
+    "whatRefetchWhenNotFound": {
+        "message": "אם הסרטון חדש, ואין בו אף מקטע, הוא יחפש מחדש מקטעים כל כמה דקות בהן תצפה/י בסרטון."
+    },
+    "enableShowCategoryWithoutPermission": {
+        "message": "הצג קטגוריה בתפריט ההגשה גם ללא הרשאת הגשה"
+    },
+    "whatShowCategoryWithoutPermission": {
+        "message": "ישנן קטגוריות שדורשות הרשאת הגשה בגלל דרישות מינימום נקודות רפוטציה"
+    },
+    "showNotice": {
+        "message": "הראה הודעה שוב"
+    },
+    "showSkipNotice": {
+        "message": "הצג הודעה לאחר דילוג על מקטע"
+    },
+    "showCategoryGuidelines": {
+        "message": "הצג עזרה לקטגוריה"
     },
     "website": {
         "message": "אתר",
@@ -221,22 +276,66 @@
         "message": "הפרק הבא",
         "description": "Keybind label"
     },
+    "disableSkipping": {
+        "message": "דילוג מופעל"
+    },
+    "enableSkipping": {
+        "message": "דילוג מושבת"
+    },
     "yourWork": {
         "message": "העבודה שלך",
         "description": "Used to describe the section that will show you the statistics from your submissions."
     },
+    "502": {
+        "message": "נראה שהשרת עמוס יתר על המידה. יש לנסות שוב בעוד מספר שניות."
+    },
     "errorCode": {
         "message": "קוד שגיאה: "
     },
     "skip": {
-        "message": "דלג"
+        "message": "דילוג"
     },
     "mute": {
-        "message": "השתק"
+        "message": "השתקה"
+    },
+    "full": {
+        "message": "וידיאו מלא",
+        "description": "Used for the name of the option to label an entire video as sponsor or self promotion."
+    },
+    "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": "השבתת דילוג אוטומטי"
+    },
+    "enableAutoSkip": {
+        "message": "הפעלת דילוג אוטומטי"
+    },
+    "audioNotification": {
+        "message": "הודעת שמע בעת דילוג"
+    },
+    "youHaveSkipped": {
+        "message": "דילגת "
+    },
     "minLower": {
         "message": "דקה"
     },
@@ -266,35 +365,38 @@
     "add": {
         "message": "הוסף"
     },
+    "showUploadButton": {
+        "message": "הצגת כפתור העלאה"
+    },
     "save": {
-        "message": "שמור"
+        "message": "שמירה"
     },
     "reset": {
-        "message": "אתחל"
+        "message": "איתחול"
     },
     "exportOptionsCopy": {
-        "message": "ערוך/העתק"
+        "message": "עריכה/העתקה"
     },
     "exportOptionsDownload": {
-        "message": "שמור לקובץ"
+        "message": "שמירה לקובץ"
     },
     "exportOptionsUpload": {
-        "message": "טען מקובץ"
+        "message": "טעינה מקובץ"
     },
     "setOptions": {
-        "message": "הגדר אפשרויות"
+        "message": "הגדרת אפשרויות"
     },
     "confirmNoticeTitle": {
-        "message": "הגש מקטע"
+        "message": "הגשת מקטע"
     },
     "submit": {
-        "message": "הגש"
+        "message": "הגשה"
     },
     "cancel": {
         "message": "ביטול"
     },
     "delete": {
-        "message": "מחק"
+        "message": "מחיקה"
     },
     "preview": {
         "message": "תצוגה מקדימה"
@@ -303,7 +405,7 @@
         "message": "לא מוגש"
     },
     "inspect": {
-        "message": "סקור"
+        "message": "סקירה"
     },
     "edit": {
         "message": "עריכה"
@@ -312,12 +414,19 @@
         "message": "עד ל",
         "description": "Used between segments. Example: 1:20 to 1:30"
     },
+    "CopiedExclamation": {
+        "message": "הועתק!",
+        "description": "Used after something has been copied to the clipboard. Example: 'Copied!'"
+    },
     "category_sponsor": {
         "message": "נותן חסות"
     },
     "category_exclusive_access": {
         "message": "גישה אקסקלוסיבית"
     },
+    "category_filler_short": {
+        "message": "מסנן"
+    },
     "category_music_offtopic": {
         "message": "מוזיקה: קטעים ללא מוזיקה"
     },
@@ -327,17 +436,29 @@
     "category_poi_highlight": {
         "message": "קטע חשוב"
     },
+    "category_chapter": {
+        "message": "פרק"
+    },
     "autoSkip": {
         "message": "דילוג אוטומטי"
     },
     "manualSkip": {
-        "message": "דלג ידנית"
+        "message": "דילוג ידני"
     },
     "showOverlay": {
-        "message": "הראה בטיימליין"
+        "message": "הראה בשורת חיפוש"
+    },
+    "disable": {
+        "message": "מושבת"
     },
     "showOverlay_POI": {
-        "message": "הראה בטיימליין"
+        "message": "הראה בשורת חיפוש"
+    },
+    "showOverlay_full": {
+        "message": "הצגת תוית"
+    },
+    "showOverlay_chapter": {
+        "message": "הצגת פרקים"
     },
     "category": {
         "message": "קטגוריה"
@@ -353,16 +474,23 @@
         "message": "עוד קטגוריות"
     },
     "chooseACategory": {
-        "message": "בחר קטגוריה"
+        "message": "בחירת קטגוריה"
     },
     "bracketEnd": {
         "message": "(סוף)"
     },
+    "End": {
+        "message": "סוף",
+        "description": "Button that skips to the end of a segment"
+    },
     "downvoteDescription": {
         "message": "זמן שגוי/לא נכון"
     },
+    "incorrectVote": {
+        "message": "שגוי"
+    },
     "incorrectCategory": {
-        "message": "שנה קטגוריה"
+        "message": "שינוי קטגוריה"
     },
     "multipleSegments": {
         "message": "מספר מקטעים"
@@ -389,22 +517,34 @@
         "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": "הסתר לעד"
+        "message": "הסתרה לעד"
+    },
+    "questionButton": {
+        "message": "יש לי שאלה נוספת"
+    },
+    "warningConfirmButton": {
+        "message": "הבנתי את הסיכונים"
+    },
+    "warningError": {
+        "message": "שגיאה בעת ניסיון לאשר אזהרה:"
     },
     "Donate": {
-        "message": "תרום"
+        "message": "תרומה"
     },
     "considerDonating": {
         "message": "עזרו לממן את הפיתוח"
     },
     "hideDonationLink": {
-        "message": "הסתר כפתור תרומה"
+        "message": "הסתרת כפתור תרומה"
+    },
+    "darkModeOptionsPage": {
+        "message": "מצב כהה בדף האפשרויות"
     },
     "helpPageThanksForInstalling": {
         "message": "תודה שהתקנת את ספונסרבלוק."
     },
     "helpPageReviewOptions": {
-        "message": "אנא סקור את האפשרויות הבאות"
+        "message": "נא לסקור את האפשרויות הבאות"
     },
     "helpPageHowSkippingWorks": {
         "message": "כיצד דילוג עובד"
@@ -433,15 +573,39 @@
     "LearnMore": {
         "message": "למידע נוסף"
     },
+    "FullDetails": {
+        "message": "פרטים מלאים"
+    },
+    "CopyDownvoteButtonInfo": {
+        "message": "הצבעה שלילית ויצירת עותק מקומי שניתן לשלוח מחדש"
+    },
+    "OpenCategoryWikiPage": {
+        "message": "פתיחת דף הוויקי של קטגוריה זו."
+    },
     "CopyAndDownvote": {
-        "message": "העתק ועשה דיסלייק"
+        "message": "העתקה ודירוג שלילי"
     },
     "ContinueVoting": {
-        "message": "המשך להצביע"
+        "message": "המשך הצבעה"
     },
     "ChangeCategoryTooltip": {
         "message": "זה מיידית ישפיע על כל המקטעים שלך"
     },
+    "downvote": {
+        "message": "דירוג שלילי"
+    },
+    "upvote": {
+        "message": "דירוג חיובי"
+    },
+    "hideSegment": {
+        "message": "הסתרת מקטע"
+    },
+    "skipSegment": {
+        "message": "דילוכ מקטע"
+    },
+    "playChapter": {
+        "message": "הפעלת פרק"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "השתמש בגלגלת בזמן שהעכבר מעל הזמן בשלב העריכה על מנת לשנות את הזמן יותר מהר. שילוב של הלחצן Ctrl/Shift יכולים לשנות את מהירות השינוי."
     },
@@ -449,11 +613,11 @@
         "message": "חדש! ראה מתי וידאו בשלמותו הוא פרסומת או פרסום עצמי"
     },
     "dayAbbreviation": {
-        "message": "ימים",
+        "message": "י",
         "description": "100d"
     },
     "hourAbbreviation": {
-        "message": "שעות",
+        "message": "ש'",
         "description": "100h"
     },
     "optionsTabBehavior": {
@@ -472,6 +636,18 @@
         "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": "לא הוגדר"
     },
@@ -480,5 +656,125 @@
     },
     "youtubeKeybindWarning": {
         "message": "זה הוא קיצור דרך מובנה ביוטיוב. האם אתה בטוח שאתה רוצה להשתמש בו?"
+    },
+    "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": "בחירת מדינתך"
+    },
+    "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": "הזנת מפתח רישיון"
+    },
+    "unsubmittedSegmentCounts": {
+        "message": "כרגע יש לך {0} ב-{1}",
+        "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": "מזהה סרטון",
+        "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": "אזהרה: השרת עדיין לא הגיב עם מקטעים. ייתכן שלמעשה יש מקטעים בסרטון הזה שכבר נשלחו אבל פשוט לא קיבלת אותם בגלל בעיות בשרת."
     }
 }

public/_locales/hi/messages.json

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

public/_locales/hr/messages.json

@@ -113,6 +113,9 @@
     "connectionError": {
         "message": "Dogodija se greška u povezivanju. Kod pogreške: "
     },
+    "segmentsStillLoading": {
+        "message": "Segmenti se učitavaju..."
+    },
     "clearTimes": {
         "message": "Očisti isječke"
     },
@@ -122,8 +125,8 @@
     "closePopup": {
         "message": "Zatvori izbornik"
     },
-    "SubmitTimes": {
-        "message": "Podnesi isječke"
+    "closeIcon": {
+        "message": "Ikona za zatvaranje"
     },
     "sortSegments": {
         "message": "Razvrstaj isječke"
@@ -162,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"
     },
@@ -383,6 +383,12 @@
     "statusReminder": {
         "message": "Provjerite status.sponsor.ajay.app za status poslužitelja."
     },
+    "changeUserID": {
+        "message": "Uvezi/Izvezi svoj privatni UserID"
+    },
+    "setUserID": {
+        "message": "Postavi Privatni UserID"
+    },
     "createdBy": {
         "message": "Izradio"
     },
@@ -482,6 +488,12 @@
     "edit": {
         "message": "Uredi"
     },
+    "copyDebugInformation": {
+        "message": "Kopiraj Informaciju Za Otklanjanje Pogrešaka U Međuspremnik"
+    },
+    "copyDebugInformationFailed": {
+        "message": "Pisanje u međuspremnik nije uspjelo"
+    },
     "copyDebugInformationOptions": {
         "message": "Kopira informacije u međuspremnik koje treba dati razvojnom programeru kada otkrije grešku / kada to programer zatraži. Osjetljive informacije kao što su vaš korisnički ID, kanali s popisa dopuštenih i prilagođena adresa poslužitelja uklonjeni su. Međutim, sadrži informacije kao što su vaš korisnički agent, preglednik, operativni sustav i broj verzije proširenja. "
     },
@@ -517,6 +529,9 @@
     "category_selfpromo_description": {
         "message": "Slično kao „sponzor”, osim za neplaćenu promociju i samopromociju. To uključuje odlomke marketinga, donacija ili informacija o tome, s kim su surađivali."
     },
+    "category_selfpromo_guideline1": {
+        "message": "Donacije, članarine i roba"
+    },
     "category_exclusive_access": {
         "message": "Eksluzivni pristup"
     },
@@ -538,6 +553,9 @@
     "category_intro_short": {
         "message": "Stanka"
     },
+    "category_intro_guideline1": {
+        "message": "Interval bez stvarnog sadržaja"
+    },
     "category_outro": {
         "message": "Završni kadrovi/Zasluge"
     },
@@ -547,6 +565,9 @@
     "category_preview_description": {
         "message": "Zbirka isječaka koji pokazuju što dolazi u ovom videu ili drugim videima u nizu gdje se sve informacije kasnije ponavljaju u videu."
     },
+    "category_filler": {
+        "message": "Nepotrebna Popuna/Šale"
+    },
     "category_filler_short": {
         "message": "Popuna"
     },
@@ -647,6 +668,9 @@
         "message": "Kraj",
         "description": "Button that skips to the end of a segment"
     },
+    "hiddenDueToDuration": {
+        "message": "sakriveno: redak je prekratak"
+    },
     "manuallyHidden": {
         "message": "ručno skriveno"
     },
@@ -701,15 +725,33 @@
     "hideForever": {
         "message": "Sakrij zauvijek"
     },
+    "warningChatInfo": {
+        "message": "Primjetili smo da ste radili neke uobičajene pogreške. Mi cijenimo vaš trud, ali ovdje težimo perfekciji, pa i jako male pogreške su važne :)"
+    },
+    "warningTitle": {
+        "message": "Dobili ste upozorenje"
+    },
+    "questionButton": {
+        "message": "Imam pitanje"
+    },
+    "warningConfirmButton": {
+        "message": "Razumijem razlog"
+    },
     "Donate": {
         "message": "Doniraj"
     },
+    "darkModeOptionsPage": {
+        "message": "Tamni Način Na Stranici Opcija"
+    },
     "helpPageThanksForInstalling": {
         "message": "Hvala na instaliranju SponsorBlocka."
     },
     "helpPageFeatureDisclaimer": {
         "message": "Mnoge funkcije su standardno deaktivirane. Ako želiš preskočiti uvode, završne dijelove, koristiti Invidious, itd., aktiviraj ih niže dolje. Također možeš sakriti/prikazati elemente korisničkog sučelja."
     },
+    "helpPageHowSkippingWorks": {
+        "message": "Kako preskakanje radi"
+    },
     "Submitting": {
         "message": "Slanje"
     },
@@ -743,9 +785,18 @@
     "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"
     },
+    "skipSegment": {
+        "message": "Preskoči odsječak"
+    },
     "dayAbbreviation": {
         "message": "d",
         "description": "100d"
@@ -830,10 +881,6 @@
     "selectYourCountry": {
         "message": "Odaberi svoju zemlju"
     },
-    "alreadyDonated": {
-        "message": "Ako si već donirao/la, možeš iskoristiti kupon za besplatan pristup putem e-pošte:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Ako si ne možeš priuštiti kupnju licence, pritisni {here} da vidiš imaš li pravo na popust",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -852,5 +899,28 @@
     },
     "enterLicenseKey": {
         "message": "Upiši licencni ključ"
+    },
+    "videosSingular": {
+        "message": "video",
+        "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"
+    },
+    "videosPlural": {
+        "message": "videa",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
+    },
+    "videoID": {
+        "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"
+    },
+    "exportSegmentsAsURL": {
+        "message": "Dijeli kao URL"
     }
 }

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": {
@@ -800,6 +797,10 @@
         "message": "Mutasson egy ikont, amikor egy videó egésze reklám",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Címkék megjelenítése a videók indexképein is",
+        "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": "Beküldetlen színe",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Eltüntetés örökre"
     },
     "warningChatInfo": {
-        "message": "Észrevettük, hogy néhány nem rossz szándékú, gyakran előforduló hibát ejtettél"
+        "message": "Észrevettük, hogy néhány gyakran előforduló hibát vétettél. Nagyra értékeljük az eddigi munkádat, de a tökéletességre törekszünk, úgyhogy a legkisebb hibák is számítanak :)"
     },
     "warningTitle": {
         "message": "Figyelmeztetést kaptál"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Válaszd ki az országodat"
     },
-    "alreadyDonated": {
-        "message": "Ha korábban már támogattad a bővítményt, kérhetsz ingyenes hozzáférést emailben:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Ha nem engedheted meg magadnak a licenc megvásárlását, kattints {ide}, hogy megtudd, jogosult vagy-e kedvezményre",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Add meg a licenc kulcsot"
     },
-    "chaptersPage1": {
-        "message": "A SponsorBlock közösség által karbantartott fejezetek funkció csak azok számára érhető el, akik licencet vásárolnak, vagy ingyenes hozzáférést kaptak múltbeli hozzájárulásaikért"
-    },
-    "chaptersPage2": {
-        "message": "Fontos: A fejezetek beküldésére való engedély még mindig a számolt hírnévtől függ. A megvásárolt licenc csak a mások által beküldött fejezetek megtekintésére vonatkozik.",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Új funkció: Közösség által karbantartott fejezetek. Ezek egyedileg elnevezett részei a videóknak, amiket egymásba is lehet ágyazni, hogy egyre pontosabbak lehessenek. Vásárolj licencet, hogy láthasd az ezen a videón beküldött fejezeteket, mint: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Új funkció: Közösség által karbantartott fejezetek. Ezek egyedileg elnevezett részei a videóknak, amiket egymásba is lehet ágyazni, hogy egyre pontosabbak lehessenek. Neked van igyenes hozzáférésed, engedélyezd a beállításokban."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Jelenleg {0} van {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Figyelem: A szerver még nem válaszolt szegmensekkel. Elképzelhető, hogy már vannak beküldött szegmensek ezen a videón, csak még nem töltődtek be szerver-problémák miatt."
+    },
+    "allowScrollingToEdit": {
+        "message": "Görgő használatának engedélyezése az idők szerkesztéséhez"
     }
 }

public/_locales/id/messages.json

@@ -25,6 +25,19 @@
     "Segments": {
         "message": "segmen"
     },
+    "SegmentsCap": {
+        "message": "Segmen"
+    },
+    "Chapters": {
+        "message": "Bab"
+    },
+    "renderAsChapters": {
+        "message": "Jadikan segmen sebagai bab",
+        "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
+    },
+    "showSegmentNameInChapterBar": {
+        "message": "Tampilkan Segmen Saat Ini di Samping Waktu Video"
+    },
     "upvoteButtonInfo": {
         "message": "Upvote submisi ini"
     },
@@ -103,6 +116,9 @@
     "connectionError": {
         "message": "Kesalahan koneksi terjadi. Kode kesalahan: "
     },
+    "segmentsStillLoading": {
+        "message": "Segmen masih dimuat..."
+    },
     "clearTimes": {
         "message": "Hapus Segmen"
     },
@@ -112,8 +128,11 @@
     "closePopup": {
         "message": "Tutup Popup"
     },
-    "SubmitTimes": {
-        "message": "Kirim Segmen"
+    "closeIcon": {
+        "message": "Tutup Ikon"
+    },
+    "sortSegments": {
+        "message": "Urutkan Segmen"
     },
     "submitCheck": {
         "message": "Apakah anda yakin ingin mengirim ini?"
@@ -149,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"
     },
@@ -186,7 +202,7 @@
         "message": "Ini akan menyembunyikan tombol yang muncul di pemutar YouTube untuk mengirimkan segmen yang dilewati."
     },
     "showSkipButton": {
-        "message": "Tetap lewati ke tombol Highlight di Pemutar"
+        "message": "Biarkan Tombol Lewati ke Sorotan Tetap Tampil di Pemutar"
     },
     "showInfoButton": {
         "message": "Tampilkan Tombol Info Di Pemutar Video YouTube"
@@ -233,6 +249,12 @@
     "whatRefetchWhenNotFound": {
         "message": "Jika ini merupakan video baru, dan tidak ada segmen yang ditemukan, SponsorBlock akan terus merefetch setiap beberapa menit saat anda menonton."
     },
+    "enableShowCategoryWithoutPermission": {
+        "message": "Tampilkan kategori di dalam menu submisi bahkan tanpa izin submisi"
+    },
+    "whatShowCategoryWithoutPermission": {
+        "message": "Beberapa kategori memerlukan izin untuk mengirim karena persyaratan reputasi minimum"
+    },
     "showNotice": {
         "message": "Tampilkan Pemberitahuan Lagi"
     },
@@ -243,19 +265,19 @@
         "message": "Tampilkan Bantuan Kategori"
     },
     "noticeVisibilityMode0": {
-        "message": "Lewati maklumat ukuran penuh"
+        "message": "Pemberitahuan Lewati Ukuran Penuh"
     },
     "noticeVisibilityMode1": {
-        "message": "Maklumat lewati kecil untuk lewati otomatis"
+        "message": "Pemberitahuan Lewati Kecil untuk Lewati Otomatis"
     },
     "noticeVisibilityMode2": {
-        "message": "Lewati semua maklumat kecil"
+        "message": "Semua Pemberitahuan Lewati Kecil"
     },
     "noticeVisibilityMode3": {
-        "message": "Pudar maklumat lewati untuk semua lewati otomatis"
+        "message": "Pemberitahuan Lewati Pudar untuk Lewati Otomatis"
     },
     "noticeVisibilityMode4": {
-        "message": "Lewati semua maklumat pudar"
+        "message": "Semua Pemberitahuan Lewati Pudar"
     },
     "longDescription": {
         "message": "SponsorBlock membuat anda melewati sponsor, intro, outro, pengingat berlangganan dan segmen mengganggu lainnya di video YouTube. SponsorBlock adalah ekstensi browser crowdsourced yang membolehkan siapa saja mengirim waktu awal dan akhir dari segmen sponsor dan segmen video YouTube lainnya. Setelah seseorang mengirim informasi ini, orang lain yang memakai ekstensi ini akan melewati segmen sponsor di video yang sama. Anda juga dapat melewati bagian non-musik di musik video.",
@@ -289,6 +311,14 @@
         "message": "Kirim segmen",
         "description": "Keybind label"
     },
+    "nextChapterKeybind": {
+        "message": "Bab selanjutnya",
+        "description": "Keybind label"
+    },
+    "previousChapterKeybind": {
+        "message": "Bab sebelumnya",
+        "description": "Keybind label"
+    },
     "keybindDescription": {
         "message": "Pilih sebuah tombol dengan mengetikkannya dan pilih tombol modifier apa saja yang Anda ingin gunakan."
     },
@@ -387,8 +417,17 @@
     "statusReminder": {
         "message": "Cek status.sponsor.ajay.app untuk status server."
     },
+    "changeUserID": {
+        "message": "Impor/Ekspor UserID Pribadi Anda"
+    },
     "whatChangeUserID": {
-        "message": "Ini harus dirahasiakan. Ini seperti kata sandi dan tidak boleh dibagikan kepada siapa pun. Jika seseorang mempunyai ini, mereka bisa menyamar jadi anda. Jika anda mencari UserID publik anda, klik ikon papan tulis di popup."
+        "message": "Ini harus dirahasiakan. Ini seperti kata sandi dan tidak boleh dibagikan kepada siapa pun. Jika seseorang mempunyai ini, mereka bisa menyamar jadi Anda. Jika Anda mencari userID publik Anda, klik ikon papan tulis di popup."
+    },
+    "setUserID": {
+        "message": "Atur UserID pribadi"
+    },
+    "userIDChangeWarning": {
+        "message": "Peringatan: Mengubah UserID Pribadi bersifat permanen. Apakah Anda yakin ingin melakukan ini? Pastikan Anda telah mencadangkan yang lama untuk berjaga-jaga."
     },
     "createdBy": {
         "message": "Dibuat Oleh"
@@ -396,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: "
     },
@@ -433,6 +468,9 @@
     "minDurationDescription": {
         "message": "Segmen yang lebih kecil dari nilai yang diatur tidak akan dilewati atau tampil di pemutar."
     },
+    "enableManualSkipOnFullVideo": {
+        "message": "Gunakan lewati manual jika ada label seluruh video"
+    },
     "whatManualSkipOnFullVideo": {
         "message": "Untuk yang ingin menonton video tanpa gangguan jika sepenuhnya disponsori atau promosi sendiri."
     },
@@ -484,6 +522,9 @@
     "exportOptionsUpload": {
         "message": "Muat dari file"
     },
+    "whatExportOptions": {
+        "message": "Ini adalah seluruh konfigurasi Anda di JSON. Ini mencakup UserID Pribadi Anda, maka pastikan Anda membagikan ini dengan bijak."
+    },
     "setOptions": {
         "message": "Atur Opsi"
     },
@@ -536,6 +577,10 @@
         "message": "sampai",
         "description": "Used between segments. Example: 1:20 to 1:30"
     },
+    "CopiedExclamation": {
+        "message": "Tersalin!",
+        "description": "Used after something has been copied to the clipboard. Example: 'Copied!'"
+    },
     "generic_guideline1": {
         "message": "Tampilkan transisi segue"
     },
@@ -627,6 +672,9 @@
     "category_preview": {
         "message": "Pratinjau/Rekap"
     },
+    "category_preview_description": {
+        "message": "Koleksi klip yang menampilkan hal yang akan hadir di video ini atau video lain dalam suatu seri, di mana segala informasinya diulang dalam video tersebut."
+    },
     "category_preview_guideline1": {
         "message": "Klip yang ditampilkan nanti, atau di video di masa mendatang"
     },
@@ -639,6 +687,9 @@
     "category_filler": {
         "message": "Pengisi Tak berkaitan/Lawakan"
     },
+    "category_filler_description": {
+        "message": "Adegan tangensial ditambahkan hanya untuk pengisi atau humor yang tidak diperlukan untuk memahami isi utama video. Ini tidak boleh mencakup segmen yang memberikan detail konteks atau latar belakang. Ini adalah kategori sangat agresif yang ditujukan saat Anda tidak sedang ingin \"bersenang-senang\"."
+    },
     "category_filler_short": {
         "message": "Isian"
     },
@@ -681,6 +732,21 @@
     "category_poi_highlight_guideline3": {
         "message": "Dapat melewati ke judul atau thumbnail"
     },
+    "category_chapter": {
+        "message": "Bab"
+    },
+    "category_chapter_description": {
+        "message": "Bab bernama khusus yang menjelaskan bagian utama video."
+    },
+    "category_chapter_guideline1": {
+        "message": "Jangan menyebutkan nama merek sponsor"
+    },
+    "category_chapter_guideline2": {
+        "message": "Gunakan bab yang lebih besar untuk bagian umum"
+    },
+    "category_chapter_guideline3": {
+        "message": "Bab yang lebih kecil dapat ditempatkan di dalam yang lebih besar"
+    },
     "category_livestream_messages": {
         "message": "Livestream: Baca Pesan/Donasi"
     },
@@ -711,6 +777,9 @@
     "showOverlay_full": {
         "message": "Tampilkan Label"
     },
+    "showOverlay_chapter": {
+        "message": "Tampilkan Bab"
+    },
     "autoSkipOnMusicVideos": {
         "message": "Lewati semua segmen secara otomatis ketika ada segmen non-music"
     },
@@ -766,6 +835,10 @@
     "bracketEnd": {
         "message": "(Selesai)"
     },
+    "End": {
+        "message": "Akhir",
+        "description": "Button that skips to the end of a segment"
+    },
     "hiddenDueToDownvote": {
         "message": "disembunyikan: voting rendah"
     },
@@ -779,6 +852,9 @@
         "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 Channel belum dimuat. Apabila anda menggunakan video yang tersematkan, coba menggunakan halaman utama YouTube. Hal ini juga dapat disebabkan oleh perubahan yang ada pada tampilan YouTUbe, apabila anda mengira seperti itu, buat komentar disini:"
     },
+    "invidiousPermissionRefresh": {
+        "message": "Peramban telah mencabut izin yang diperlukan untuk berfungsi di Invidious dan situs pihak ketiga lainnya. Klik tombol di bawah untuk mengaktifkan kembali izin ini."
+    },
     "acceptPermission": {
         "message": "Terima permintaan izin"
     },
@@ -803,6 +879,13 @@
     "downvoteDescription": {
         "message": "Salah, Waktu Tidak Tepat"
     },
+    "incorrectVote": {
+        "message": "Salah"
+    },
+    "harmfulVote": {
+        "message": "Berbahaya",
+        "description": "Used for chapter segments when the text is harmful/offensive to remove it faster"
+    },
     "incorrectCategory": {
         "message": "Ubah Kategori"
     },
@@ -838,6 +921,9 @@
     "categoryPillTitleText": {
         "message": "Seluruh video ini ditandai sebagai kategori ini dan terlalu terintegrasi untuk dapat dipisahkan"
     },
+    "chapterNameTooltipWarning": {
+        "message": "Salah satu nama bab Anda mirip dengan sebuah kategori. Anda harus menggunakan kategori jika memungkinkan sebagai gantinya."
+    },
     "experiementOptOut": {
         "message": "Tidak ikut eksperimen masa depan",
         "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."
@@ -845,6 +931,21 @@
     "hideForever": {
         "message": "Sembunyikan selamanya"
     },
+    "warningChatInfo": {
+        "message": "Kami perhatikan Anda membuat beberapa kesalahan umum. Kami hargai sekali yang Anda kerjakan sejauh ini, tapi di sini kami berjuang mencapai sempurna, sehingga kesalahan sangat kecil pun berarti :)"
+    },
+    "warningTitle": {
+        "message": "Anda mendapatkan peringatan"
+    },
+    "questionButton": {
+        "message": "Saya memiliki pertanyaan"
+    },
+    "warningConfirmButton": {
+        "message": "Saya mengerti alasannya"
+    },
+    "warningError": {
+        "message": "Terjadi kesalahan ketika mengakui peringatan:"
+    },
     "Donate": {
         "message": "Donasi"
     },
@@ -864,16 +965,16 @@
         "message": "Haram ditinjau opsi di bawah ini"
     },
     "helpPageFeatureDisclaimer": {
-        "message": "Banyak fitur yang dinonaktifkan secara bawaan. Jika kamu ingin lewati mula, akhir, gunakan Invidious, dll, aktifkan mereka dibawah ini.\nKamu bisa menyembunyikan/menghadirkan elemen UI."
+        "message": "Banyak fitur yang dinonaktifkan secara bawaan. Jika Anda ingin melewati intro, outro, mengunakan Invidious, dll, aktifkan mereka dibawah ini. Anda juga bisa menyembunyikan/menampilkan elemen UI."
     },
     "helpPageHowSkippingWorks": {
         "message": "Cara kerja melewati segmen"
     },
     "helpPageHowSkippingWorks1": {
-        "message": "Segmen video akan otomatis dilewati jika ditemukan di databasis. Kamu bisa buka munculan dengan klik ikon ekstensi untuk mendapatkan pratinjau apa adanya."
+        "message": "Segmen video akan otomatis dilewati jika ditemukan di basis data. Anda bisa mumbuka popup dengan mengklik ikon ekstensi untuk mendapatkan pratinjau tersebut."
     },
     "helpPageHowSkippingWorks2": {
-        "message": "Kapanpun kamu melewati segmen, kamu akan mendapatkan maklumat. Jika waktu terlihat salah dapat menyuarakan turun dengan klik turun-suara! Kamu juga bisa menyuarakan di maklumat."
+        "message": "Kapanpun Anda melewati segmen, Anda akan mendapatkan pemberitahuan. Jika pengaturan waktu terlihat salah tolak dengan mengklik jempol bawah! Anda juga dapat memilih dalam popup."
     },
     "Submitting": {
         "message": "Mengirim"
@@ -944,6 +1045,12 @@
     "hideSegment": {
         "message": "Sembunyikan segmen"
     },
+    "skipSegment": {
+        "message": "Lewati segmen"
+    },
+    "playChapter": {
+        "message": "Mulai bab"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "Gunakan roda mouse ketika berada di kotak edit untuk mengatur waktu dengan cepat. Kombinasi dengan tombol [Ctrl + Shift] bisa digunakan untuk perubahan yang halus."
     },
@@ -1006,5 +1113,116 @@
     },
     "confirmResetToDefault": {
         "message": "Apakah Anda yakin ingin mengatur ulang semua pengaturan ke nilai bawaan?\nTindakan ini tidak dapat diurungkan."
+    },
+    "exportSegments": {
+        "message": "Ekspor segmen"
+    },
+    "importSegments": {
+        "message": "Impor segmen"
+    },
+    "Import": {
+        "message": "Impor",
+        "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
+    },
+    "redeemSuccess": {
+        "message": "Penukaran Berhasil!"
+    },
+    "redeemFailed": {
+        "message": "Kunci lisensi tidak valid"
+    },
+    "hideUpsells": {
+        "message": "Sembunyikan opsi yang tidak tersedia tanpa pembayaran tambahan"
+    },
+    "chooseACountry": {
+        "message": "Pilih negara"
+    },
+    "noDiscount": {
+        "message": "Anda tidak memenuhi syarat untuk mendapatkan diskon"
+    },
+    "discountLink": {
+        "message": "Tautan Diskon (Lihat harga pink)"
+    },
+    "selectYourCountry": {
+        "message": "Pilih negaramu"
+    },
+    "cantAfford": {
+        "message": "Jika Anda tidak mampu membeli lisensi, klik {here} untuk melihat jika Anda memenuhi syarat untuk mendapatkan diskon",
+        "description": "Keep the curly braces. The word 'here' should be translated as well."
+    },
+    "patreonSignIn": {
+        "message": "Masuk dengan Patreon"
+    },
+    "redeem": {
+        "message": "Tukar"
+    },
+    "joinOnPatreon": {
+        "message": "Gabung di Patreon"
+    },
+    "oneTimePurchase": {
+        "message": "Pembelian satu kali"
+    },
+    "enterLicenseKey": {
+        "message": "Masukkan Kode Lisensi"
+    },
+    "unsubmittedSegmentCounts": {
+        "message": "Kamu mempunyai {0} dalam {1}",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
+    },
+    "unsubmittedSegmentCountsZero": {
+        "message": "Anda tidak mempunyai segmen yang belum dikirim",
+        "description": "Replaces 'unsubmittedSegmentCounts' string when there are no unsubmitted segments"
+    },
+    "unsubmittedSegmentsSingular": {
+        "message": "segmen yang belum dikirim",
+        "description": "Example: You currently have 1 *unsubmitted segment* on 1 video"
+    },
+    "unsubmittedSegmentsPlural": {
+        "message": "segmen yang belum dikirim",
+        "description": "Example: You currently have 12 *unsubmitted segments* on 5 videos"
+    },
+    "videosSingular": {
+        "message": "video",
+        "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"
+    },
+    "videosPlural": {
+        "message": "video",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
+    },
+    "clearUnsubmittedSegments": {
+        "message": "Hapus semua segmen",
+        "description": "Label for a button in settings"
+    },
+    "clearUnsubmittedSegmentsConfirm": {
+        "message": "Yakin ingin menghapus semua segmen yang belum disubmit?",
+        "description": "Confirmation message for the Clear unsubmitted segments button"
+    },
+    "showUnsubmittedSegments": {
+        "message": "Tampilkan Segmen",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "hideUnsubmittedSegments": {
+        "message": "Sembunyikan segmen",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "videoID": {
+        "message": "ID Video",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "segmentCount": {
+        "message": "Jumlah Segmen",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "actions": {
+        "message": "Tindakan",
+        "description": "Header of the unsubmitted segments list"
+    },
+    "exportSegmentsAsURL": {
+        "message": "Bagikan sebagai Tautan"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "Peringatan: Server belum merespon dengan segmen. Mungkin sebenarnya sudah ada segmen di video ini namun Anda belum menerimanya karena ada masalah dengan server."
+    },
+    "allowScrollingToEdit": {
+        "message": "Izinkan Menggulir Untuk Menyunting Waktu"
     }
 }

public/_locales/it/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Icona Chiudi"
     },
-    "SubmitTimes": {
-        "message": "Invia i segmenti"
+    "OpenSubmissionMenu": {
+        "message": "Apri Menu Invio"
     },
     "sortSegments": {
         "message": "Ordina Segmenti"
@@ -171,9 +171,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 +439,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": {
@@ -800,6 +797,10 @@
         "message": "Mostra un'icona quando un video è interamente promozionale",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Mostra le etichette anche sulle copertine dei video",
+        "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": "Segmento non inviato",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Nascondi per sempre"
     },
     "warningChatInfo": {
-        "message": "Abbiamo notato che stavi facendo alcuni errori comuni che non sono intenzionali"
+        "message": "Abbiamo notato che hai fatto qualche errore comune. Noi apprezziamo molto il tuo lavoro fin'ora, ma qui puntiamo alla perfezione, quindi ogni errore, anche molto piccolo, conta :)"
     },
     "warningTitle": {
         "message": "Hai ricevuto un avvertimento"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Seleziona il tuo paese"
     },
-    "alreadyDonated": {
-        "message": "Se hai donato qualsiasi importo in passato, puoi riscattare l'accesso gratuito mandando una mail a:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Se non puoi permetterti di acquistare una licenza, premi {here} per verificare se hai diritto a uno sconto",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Inserisci chiave di licenza"
     },
-    "chaptersPage1": {
-        "message": "La funzionalità dei capitoli in crowd-sourcing di SponsorBlock è disponibile soltanto a chi acquista una licenza o a chi viene premiato con l'accesso gratuito grazie ai contributi passati"
-    },
-    "chaptersPage2": {
-        "message": "Nota: L'autorizzazione a inviare i capitoli si basa ancora sulla reputazione calcolata. Acquistare una licenza ti consente di visualizzare soltanto i capitoli inviati dagli altri",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Nuova Funzionalità: Capitoli personalizzati in crowdsourcing. Sono sezioni dal nome personalizzato che possono esser sovrapposte per essere sempre più precise. Acquista una licenza per visualizzare i capitoli inviati in questo video come ad esempio: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Nuova Funzionalità: Capitoli personalizzati in crowdsourcing. Sono sezioni dal nome personalizzato, che possono esser sovrapposte per essere sempre più precise. Hai accesso gratuitamente, abilitalo nelle opzioni."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Al momento hai {0} su {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Attenzione: il server non ha ancora fornito i segmenti. Questo video potrebbe avere dei segmenti inviati, ma forse non sono stati ricevuti a causa di problemi del server."
+    },
+    "allowScrollingToEdit": {
+        "message": "Usa la Rotella per Modificare i Tempi"
     }
 }

public/_locales/ja/messages.json

@@ -1,10 +1,10 @@
 {
     "fullName": {
-        "message": "SponserBlock for YouTube - 動画のスポンサーセクションを自動でスキップする",
+        "message": "SponserBlock for YouTube - 動画の広告セクションを自動でスキップする",
         "description": "Name of the extension."
     },
     "Description": {
-        "message": "YouTube動画の提供表示や登録要求をスキップします。視聴している動画の当該部分を報告して，みんなが時間を節約できるようにしましょう。",
+        "message": "YouTube動画の提供表示や登録のお願いをスキップします。動画の広告部分を報告して、みんなが時間を節約できるようにしましょう。",
         "description": "Description of the extension."
     },
     "400": {
@@ -17,7 +17,7 @@
         "message": "これは既に提出されています。"
     },
     "channelWhitelisted": {
-        "message": "チャンネルをホワイトリストに登録しました!"
+        "message": "チャンネルをホワイトリストに登録しました！"
     },
     "Segment": {
         "message": "セグメント"
@@ -32,20 +32,20 @@
         "message": "チャプター"
     },
     "renderAsChapters": {
-        "message": "セグメントをチャプターとしてレンダリングする",
+        "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": "この提案を支持"
+        "message": "この提出を高評価"
     },
     "reportButtonTitle": {
         "message": "報告"
     },
     "reportButtonInfo": {
-        "message": "この提案が正しくないと報告"
+        "message": "不正確な提出として報告"
     },
     "Dismiss": {
         "message": "無視"
@@ -60,7 +60,7 @@
         "message": "スキップ解除を押すと元の場所へ戻ります"
     },
     "unskip": {
-        "message": "スキップ解除"
+        "message": "スキップしない"
     },
     "reskip": {
         "message": "再スキップ"
@@ -105,10 +105,10 @@
         "message": "セグメントを更新"
     },
     "success": {
-        "message": "成功しました!"
+        "message": "成功しました！"
     },
     "voted": {
-        "message": "投票しました!"
+        "message": "投票しました！\n"
     },
     "serverDown": {
         "message": "サーバーがダウンしているようです。今すぐ開発者にお知らせください。"
@@ -131,14 +131,14 @@
     "closeIcon": {
         "message": "閉じるアイコン"
     },
-    "SubmitTimes": {
-        "message": "セグメントを送信"
+    "OpenSubmissionMenu": {
+        "message": "提出メニューを開く"
     },
     "sortSegments": {
         "message": "セグメントを並び替え"
     },
     "submitCheck": {
-        "message": "本当に提出してよろしいですか？"
+        "message": "提出しますか？"
     },
     "whitelistChannel": {
         "message": "チャンネルをホワイトリストに追加"
@@ -150,7 +150,7 @@
         "message": "セグメントに投票"
     },
     "Submissions": {
-        "message": "提案数"
+        "message": "合計提出数"
     },
     "savedPeopleFrom": {
         "message": "あなたが節約したみんなの時間: "
@@ -166,14 +166,11 @@
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
-        "message": "心得: 利用者設定で提出時のキーバインドを設定できます"
+        "message": "ヒント: オプションから提出時のキー割り当てを設定できます"
     },
     "clearTimesButton": {
         "message": "時間を消去"
     },
-    "submitTimesButton": {
-        "message": "時間を提出"
-    },
     "publicStats": {
         "message": "これは公開の統計ページであなたがどれだけ貢献したかを示すために使用され、ここで確認することができます: "
     },
@@ -199,13 +196,13 @@
         "message": "オプション"
     },
     "showButtons": {
-        "message": "YouTube プレイヤーにボタンを表示"
+        "message": "YouTubeプレイヤーにボタンを表示"
     },
     "hideButtons": {
-        "message": "YouTube プレイヤーにボタンを表示しない"
+        "message": "YouTubeプレイヤーにボタンを表示しない"
     },
     "hideButtonsDescription": {
-        "message": "YouTube再生画面のセグメント提出ボタンを非表示にします。"
+        "message": "YouTubeプレイヤーのセグメント提出ボタンを非表示にします。"
     },
     "showSkipButton": {
         "message": "「ハイライトまでスキップ」ボタンをプレイヤーに常に表示する"
@@ -220,10 +217,10 @@
         "message": "情報ボタンを自動的に隠す"
     },
     "hideDeleteButton": {
-        "message": "YouTube プレイヤーから削除ボタンを隠す"
+        "message": "YouTubeプレイヤーに削除ボタンを表示しない"
     },
     "showDeleteButton": {
-        "message": "YouTubeプレーヤーに削除ボタンを表示"
+        "message": "YouTubeプレイヤーに削除ボタンを表示"
     },
     "enableViewTracking": {
         "message": "スキップの集計を有効にする"
@@ -247,7 +244,7 @@
         "message": "ハッシュプレフィックスを使って要求"
     },
     "whatQueryByHashPrefix": {
-        "message": "サーバーに区域を要求する際に，動画IDの代わりに動画IDのハッシュから最初の4文字を送信します。それに対して，サーバーは類似したハッシュを持つすべての動画の情報を応答します。"
+        "message": "動画IDを使用してサーバーからセグメントを要求する代わりに、動画IDのハッシュから最初の4文字が送信されます。それに対して、サーバーは類似したハッシュを持つすべての動画のデータを返却します。"
     },
     "enableRefetchWhenNotFound": {
         "message": "新しい動画ではセグメントを再取得する"
@@ -302,7 +299,7 @@
         "description": "The first line of the message displayed after the notice was upgraded."
     },
     "noticeUpdate2": {
-        "message": "もしそれでも気に入らない場合は、再度表示しないボタンをクリックしてください。",
+        "message": "それでも気に入らない場合、「再び表示しない」ボタンを押してください。",
         "description": "The second line of the message displayed after the notice was upgraded."
     },
     "setSkipShortcut": {
@@ -332,17 +329,17 @@
         "message": "接続がタイムアウトになりました。インターネット接続をご確認ください。接続に問題がない場合、サーバーが混雑またはダウンしている可能性があります。"
     },
     "disableSkipping": {
-        "message": "スキップ有効"
+        "message": "スキップは有効です"
     },
     "enableSkipping": {
-        "message": "スキップ無効"
+        "message": "スキップは無効です"
     },
     "yourWork": {
         "message": "あなたの貢献",
         "description": "Used to describe the section that will show you the statistics from your submissions."
     },
     "502": {
-        "message": "サーバー側で問題が起きているようです。時間をおいて再び試してください。"
+        "message": "サーバーが混雑中です。数秒後にもう一度お試しください。"
     },
     "errorCode": {
         "message": "エラーコード: "
@@ -358,7 +355,7 @@
         "description": "Used for the name of the option to label an entire video as sponsor or self promotion."
     },
     "skip_category": {
-        "message": "{0} をスキップしますか?"
+        "message": "{0} をスキップしますか？"
     },
     "mute_category": {
         "message": "{0} をミュートしますか？"
@@ -380,10 +377,10 @@
         "description": "Used for skipping to things (Skipped to Highlight)"
     },
     "disableAutoSkip": {
-        "message": "自動スキップを無効にする"
+        "message": "自動スキップを無効化"
     },
     "enableAutoSkip": {
-        "message": "自動スキップを有効にする"
+        "message": "自動スキップを有効化"
     },
     "audioNotification": {
         "message": "スキップ時に通知音を鳴らす"
@@ -417,7 +414,7 @@
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "youHaveSavedTimeEnd": {
-        "message": "（彼らの人生のうち）",
+        "message": "（皆の人生のうち）",
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "statusReminder": {
@@ -439,10 +436,10 @@
         "message": "作成者:"
     },
     "supportOtherSites": {
-        "message": "第三者製のYouTube関連サイトに対応"
+        "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": {
@@ -476,22 +473,22 @@
         "message": "最小持続時間（秒）:"
     },
     "minDurationDescription": {
-        "message": "設定値より短いセグメントはスキップされず、プレーヤーにも表示されません。"
+        "message": "設定値より短いセグメントはスキップされず、プレイヤーにも表示されません。"
     },
     "enableManualSkipOnFullVideo": {
         "message": "動画全体のラベルが存在する場合は手動スキップを使用する"
     },
     "whatManualSkipOnFullVideo": {
-        "message": "動画全体がスポンサー付きまたはセルフプロモーションである場合に、動画を邪魔されずに観たい方向け。"
+        "message": "動画全体が広告または自己宣伝の時に、動画を途切れなく観たい方向け。"
     },
     "skipNoticeDuration": {
         "message": "スキップ通知の表示時間（秒）:"
     },
     "skipNoticeDurationDescription": {
-        "message": "飛び越し通知が画面上に表示され続ける時間です。手動で飛び越した場合は，より長く表示される可能性があります。"
+        "message": "スキップ通知が画面上に表示される時間です。手動でスキップした場合は、より長く表示される可能性があります。"
     },
     "shortCheck": {
-        "message": "提出しようとしている区間の長さが個人設定における最短時間よりも短かいです。これは，既に当区間は提出されており，個人設定によって無視されていることを意味します。本当に提出しますか？"
+        "message": "提出しようとしている区間が個人設定における最短時間よりも短くなっています。これは既に当該区間が提出されていながらも、単に個人設定によって無効化されているだけという可能性があります。本当に提出しますか？"
     },
     "liveOrPremiere": {
         "message": "ライブ配信中の動画やプレミア公開中の動画ではセグメントの提出はできません。配信が終了するまで待つか、ページを再読み込みしてセグメントがまだ有効かご確認ください。"
@@ -503,7 +500,7 @@
         "message": "SponsorBlock サーバーアドレス"
     },
     "customServerAddressDescription": {
-        "message": "SponsorBlockがサーバーへの呼び出しに用いるアドレスです。\n自分のサーバー実体を持っていない限り，この設定を変更してはいけません。"
+        "message": "SponsorBlockがサーバーへの呼び出しに用いるアドレスです。\n自分のサーバーインスタンスを持っていない限り、この設定を変更すべきではありません。"
     },
     "save": {
         "message": "保存"
@@ -512,13 +509,13 @@
         "message": "リセット"
     },
     "customAddressError": {
-        "message": "このアドレスの形式は正しくありません。最初にhttp://あるいはhttps://があり，最後が斜線で終わっていないことを確かめてください。"
+        "message": "このアドレスの形式は正しくありません。最初にhttp://あるいはhttps://があり、最後が斜線で終わっていないことを確かめてください。"
     },
     "areYouSureReset": {
         "message": "初期設定に戻します。よろしいですか？"
     },
     "mobileUpdateInfo": {
-        "message": "m.youtube.com は現在サポートされています"
+        "message": "m.youtube.com に対応しています"
     },
     "exportOptions": {
         "message": "全ての設定をインポート/エクスポート"
@@ -536,10 +533,10 @@
         "message": "これがJSON形式の設定項目全体になります。これにはあなたのプライベートユーザーIDが含まれているので、共有するときは注意してください。"
     },
     "setOptions": {
-        "message": "オプション設定"
+        "message": "オプションを設定"
     },
     "exportOptionsWarning": {
-        "message": "警告: 設定の変更は恒久的で，本拡張機能を破壊する可能性があります。本当に実行しますか？ 念のため，旧設定を控えておいてください。"
+        "message": "警告: 設定の変更は恒久的で、本拡張機能を破壊する可能性があります。本当に実行しますか？ 念のため、これまでの設定を控えておいてください。"
     },
     "incorrectlyFormattedOptions": {
         "message": "JSONの書式が正しくありません。設定は変更されませんでした。"
@@ -575,10 +572,10 @@
         "message": "クリップボードに書き込めませんでした"
     },
     "copyDebugInformationOptions": {
-        "message": "不具合があった，あるいは開発者から要求があった際に提供する為の情報をクリップボードに写します。利用者ID，許可表にある番組，および個人サーバーのアドレスなどの機密情報は含まれていません。ただし，利用者エージェント，Web閲覧機，OS，および拡張機能の版番などの情報は含まれています。"
+        "message": "不具合があった、あるいは開発者から要求があった際に提供する為の情報をクリップボードにコピーします。ユーザーID、ホワイトリストにあるチャンネル、およびカスタムサーバーのアドレスなどの機密情報は含まれていません。ただし、ユーザーエージェント、ブラウザ、OS、および拡張機能のバージョンなどの情報は含まれています。 "
     },
     "copyDebugInformationComplete": {
-        "message": "診断用情報がクリップボードに複製されました。共有したくない情報があればそこから削除できます。これをファイルに保存したり，不具合報告に貼り付けてください。"
+        "message": "診断用情報がクリップボードにコピーされました。共有したくない情報があればそこから削除できます。これをファイルに保存したり、不具合報告に貼り付けてください。"
     },
     "keyAlreadyUsed": {
         "message": "このショートカットは他のアクションに割り当てられています。別のショートカットを選択してください。"
@@ -601,7 +598,7 @@
         "message": "スポンサー"
     },
     "category_sponsor_description": {
-        "message": "報酬のある販売促進・製品紹介，および直接広告です。自己販促や好きな運動・製作者・Webサイト・製品に対する無報酬での宣伝とは違います。"
+        "message": "報酬のある販売促進、製品紹介、および直接広告です。自己販促や好きな運動・製作者・Webサイト・製品に対する無報酬での宣伝とは異なります。"
     },
     "category_sponsor_guideline1": {
         "message": "有料のプロモーション"
@@ -610,10 +607,10 @@
         "message": "寄付やオリジナルグッズには使わない"
     },
     "category_selfpromo": {
-        "message": "無報酬 / セルフプロモーション"
+        "message": "無報酬 / 自己の宣伝"
     },
     "category_selfpromo_description": {
-        "message": "無報酬での宣伝あるいは自己販促であるという点を除いては「スポンサー」と同様です。商品、寄付、コラボ情報に関する内容を含みます。"
+        "message": "無報酬での宣伝あるいは自己販促であるという点を除いては「広告」と同様です。商品、寄付、コラボ情報に関する内容を含みます。"
     },
     "category_selfpromo_guideline1": {
         "message": "寄付、メンバーシップ、オリジナルグッズ"
@@ -635,13 +632,13 @@
         "description": "Short description for this category"
     },
     "category_exclusive_access_guideline1": {
-        "message": "動画全体が無料または補助金を受けてアクセスしたものを紹介するものである"
+        "message": "動画全体が無料または補助金を受けてアクセスしたものを紹介している"
     },
     "category_interaction": {
-        "message": "行動を促すメッセージ(チャンネル登録)"
+        "message": "行動を促すメッセージ（チャンネル登録等）"
     },
     "category_interaction_description": {
-        "message": "動画の途中に挟まれる，高評価，チャンネル登録・通知の有効化を促す短かい場面。長かったり具体的な商品についての場面は，中断ではなく自己販売促進に分類するべきです。"
+        "message": "動画の途中に挿入される、高評価・チャンネル登録・通知オンなどを促す短いシーン。長かったり、具体的な商品についてのシーンは、セルフプロモーションに分類すべきです。"
     },
     "category_interaction_guideline1": {
         "message": "高評価、登録、フォローの短いお願い"
@@ -653,25 +650,25 @@
         "message": "一般的なプロモーションではなく、直接的な呼びかけのみに使用すること"
     },
     "category_interaction_short": {
-        "message": "動画の間に挟まる告知"
+        "message": "動画の間に挿入される告知"
     },
     "category_intro": {
-        "message": "インターミッション / イントロアニメーション"
+        "message": "合間 / 導入アニメーション"
     },
     "category_intro_description": {
-        "message": "意味のある内容を含まない場面です。一時停止，静止画面，繰り返される動作などが相等します。意味のある情報を含む転換場面に対しては使わないでください。"
+        "message": "本編ではない動画の合間部分。一時停止、静止画面、繰り返しのアニメーションなどが相当します。本編の情報を含んだ場面転換に対しては使用しないでください。"
     },
     "category_intro_short": {
-        "message": "インターミッション"
+        "message": "合間"
     },
     "category_intro_guideline1": {
-        "message": "実際のコンテンツを含まないインターバル"
+        "message": "実際のコンテンツではない間の部分"
     },
     "category_intro_guideline2": {
-        "message": "情報を含むトランジションには使用しない"
+        "message": "情報を含む場面転換には使用しない"
     },
     "category_outro": {
-        "message": "エンドカード/クレジット"
+        "message": "エンドカード / クレジット"
     },
     "category_outro_description": {
         "message": "提供表示やYouTubeの終了画面が表示されている場面。動画の内容を結論している場面には使用しないで下さい。"
@@ -710,7 +707,7 @@
         "message": "逸脱シーン、NGシーン、リプレイ"
     },
     "category_filler_guideline3": {
-        "message": "トピックの理解に必要な場面には使用しない"
+        "message": "主題の理解に必要な場面には使用しない"
     },
     "category_music_offtopic": {
         "message": "音楽: 音楽以外のセクション"
@@ -749,7 +746,7 @@
         "message": "動画の主要なセクションを説明するカスタムのチャプター名"
     },
     "category_chapter_guideline1": {
-        "message": "スポンサーのブランド名には言及しない"
+        "message": "広告主のブランド名には言及しない"
     },
     "category_chapter_guideline2": {
         "message": "全般的なセクションには大きなチャプターを使用する"
@@ -761,7 +758,7 @@
         "message": "ライブ配信: 寄付/メッセージの読み上げ"
     },
     "category_livestream_messages_short": {
-        "message": "寄付などの読み上げ"
+        "message": "メッセージの読み上げ"
     },
     "autoSkip": {
         "message": "自動スキップ"
@@ -791,7 +788,7 @@
         "message": "チャプターを表示"
     },
     "autoSkipOnMusicVideos": {
-        "message": "非音楽区域がある場合，全区域を自動的に飛び越す"
+        "message": "音楽以外のセグメントがある場合に全セグメントを自動的にスキップする"
     },
     "muteSegments": {
         "message": "スキップする代わりに音声をミュートしてセグメントを許可"
@@ -800,12 +797,16 @@
         "message": "動画全体が広告の場合にアイコンを表示",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "動画のサムネイル上にもラベルを表示",
+        "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": "未確定の色",
         "description": "Referring to submissions that have not been sent to the server yet."
     },
     "seekBarColor": {
-        "message": "シークバーのカラー"
+        "message": "シークバーの色"
     },
     "category": {
         "message": "カテゴリ"
@@ -837,7 +838,7 @@
         "description": "Used when submitting segments to only let them select a certain category if they have it enabled in the options."
     },
     "poiOnlyOneSegment": {
-        "message": "警告: このタイプのセグメントは一度に最大一つだけ有効にすることができます。複数送信するとランダムなものが表示されます。"
+        "message": "警告: この種類のセグメントは一度に最大一つだけ有効にすることができます。複数送信するとランダムなものが表示されます。"
     },
     "youMustSelectACategory": {
         "message": "送信するすべてのセグメントにカテゴリを選択する必要があります！"
@@ -850,7 +851,7 @@
         "description": "Button that skips to the end of a segment"
     },
     "hiddenDueToDownvote": {
-        "message": "低い評価の区間を無視する"
+        "message": "低評価のセグメントを無視する"
     },
     "hiddenDueToDuration": {
         "message": "あまりに短かい区間を無視する"
@@ -860,19 +861,19 @@
     },
     "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の画面構成を変えた際にも発生する可能性があります。その場合は，こちらに意見をお書きください:"
+        "message": "チャンネルIDがまだ読み込まれていません。埋め込み動画でご覧になっている場合は、代わりにYouTubeの公式サイトで再生してみてください。この問題はYouTubeがレイアウトを変更した際にも発生する可能性があります。その場合は、こちらからお知らせください:"
     },
     "invidiousPermissionRefresh": {
         "message": "Invidiousなどのサードパーティーサイトで機能するために必要な権限をブラウザーが拒否しています。この権限を許可するには下のボタンをクリックしてください。"
     },
     "acceptPermission": {
-        "message": "許可を承認する"
+        "message": "権限を承認する"
     },
     "permissionRequestSuccess": {
-        "message": "許可リクエストが成功しました！"
+        "message": "権限リクエストが成功しました！"
     },
     "permissionRequestFailed": {
-        "message": "権限要求に失敗しました。拒否をクリックしましたか？"
+        "message": "権限要求に失敗しました。承認を拒否しましたか？"
     },
     "adblockerIssueWhitelist": {
         "message": "これを解決できない場合は、設定「スキップする前にチャンネルチェックを強制」を無効にしてください。 SponsorBlockはこのビデオのチャンネル情報を取得できません。"
@@ -881,13 +882,13 @@
         "message": "スキップする前にチャンネルチェックを強制する"
     },
     "whatForceChannelCheck": {
-        "message": "デフォルト設定では、チャンネル情報を取得する前にセグメントをスキップします。デフォルト設定では、ホワイトリストに追加されているチャンネルでも動画の先頭部分にあるセグメントがスキップされる場合があります。この設定を有効にするとこの挙動が回避されますが、channelIDの取得に時間がかかるため、すべてのスキップに遅延が発生します。高速なインターネット回線を使用している場合は気にならないかもしれません。"
+        "message": "デフォルト設定では、チャンネル情報を取得する前にセグメントをスキップします。デフォルト設定では、ホワイトリストに追加されているチャンネルでも動画の先頭部分にあるセグメントがスキップされる場合があります。この設定を有効にするとこの挙動が回避されますが、チャンネルIDの取得に時間がかかるため、すべてのスキップに遅延が発生します。高速なインターネット回線を使用している場合は気にならないかもしれません。"
     },
     "forceChannelCheckPopup": {
-        "message": "「飛び越し前に強制的に番組を検査する」を有効にすることを検討してください"
+        "message": "「スキップする前にチャンネルチェックを強制する」を有効にしてみてください"
     },
     "downvoteDescription": {
-        "message": "不正確あるいは間違った時刻です"
+        "message": "不正確/誤った再生時間"
     },
     "incorrectVote": {
         "message": "間違っている"
@@ -900,7 +901,7 @@
         "message": "カテゴリーを変更"
     },
     "nonMusicCategoryOnMusic": {
-        "message": "この動画は音楽として分類されています。本当にこの動画にスポンサー部分がありますか？ このセグメントが実際には「音楽以外のセグメント」である場合、設定画面からこのカテゴリーを有効にしてください。「スポンサー」の代わりに「音楽以外」としてセグメントを提出できます。お困りの場合は、ガイドラインを参照してください。"
+        "message": "この動画は音楽として分類されています。本当にこの動画にスポンサー部分がありますか？ このセグメントが実際には「音楽以外のセグメント」である場合、設定画面からこのカテゴリーを有効にしてください。「広告」の代わりに「音楽以外」としてセグメントを提出できます。お困りの場合は、ガイドラインを参照してください。"
     },
     "multipleSegments": {
         "message": "複数のセグメント"
@@ -909,14 +910,14 @@
         "message": "ガイドライン"
     },
     "readTheGuidelines": {
-        "message": "ガイドラインを読んでください!!",
+        "message": "ガイドラインを読んでください！！",
         "description": "Show the first time they submit or if they are \"high risk\""
     },
     "categoryUpdate1": {
-        "message": "カテゴリはこちらです!"
+        "message": "カテゴリーはこちらです！"
     },
     "categoryUpdate2": {
-        "message": "導入画面・終了画面・商品紹介などを飛び越す個人設定を開きます。"
+        "message": "導入/終了シーン・グッズ紹介などをスキップする設定を開く"
     },
     "help": {
         "message": "ヘルプ"
@@ -926,7 +927,7 @@
         "description": "Used as the button to dismiss a tooltip"
     },
     "fullVideoTooltipWarning": {
-        "message": "このセグメントは大きすぎます。動画全体が一つのトピックに当てはまる場合は「スキップ」を「動画全体」に変更してください。詳細はガイドラインを参照してください。"
+        "message": "このセグメントは大きすぎます。動画全体が一つの話題に言及しているなら「スキップ」を「動画全体」に変更してください。詳細はガイドラインを参照してください。"
     },
     "categoryPillTitleText": {
         "message": "この動画は全体がこのカテゴリーとして指定されており、密に結合されているため分割することができません"
@@ -939,13 +940,13 @@
         "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": "二度と表示しない"
+        "message": "再び表示しない"
     },
     "warningChatInfo": {
-        "message": "悪意によるものではないよくある間違いを犯していたようです"
+        "message": "どうやらあなたはよくある間違いを犯してしまったようです。これまでのあなたの協力には大きく感謝しています。ですが、私たちは完璧さを追求しており、小さなミスでも重要であることをご理解ください :)"
     },
     "warningTitle": {
-        "message": "警告を付与されました"
+        "message": "警告を受け取りました"
     },
     "questionButton": {
         "message": "質問があります"
@@ -969,22 +970,22 @@
         "message": "オプション画面でダークモードを使用"
     },
     "helpPageThanksForInstalling": {
-        "message": "SponsorBlockを導入いただきありがとうございます。"
+        "message": "SponsorBlockをインストールいただきありがとうございます。"
     },
     "helpPageReviewOptions": {
         "message": "以下の設定を確認してください"
     },
     "helpPageFeatureDisclaimer": {
-        "message": "多くの機能がデフォルトでは無効となっています。イントロ・アウトロをスキップしたり、Invidiousで使用したりするにはこの下で有効にしてください。また画面の表示設定を切り替えることもできます。"
+        "message": "多くの機能がデフォルトでは無効となっています。導入/終了シーンをスキップしたり、Invidiousで使用したりするにはこの下で有効にしてください。また画面の表示設定を切り替えることもできます。"
     },
     "helpPageHowSkippingWorks": {
         "message": "スキップの仕組み"
     },
     "helpPageHowSkippingWorks1": {
-        "message": "データベースにある動画区域が自動的に飛び越されます。この拡張機能のアイコンをクリックすると，区域の位置や範囲を確かめることができます。"
+        "message": "データベースにある動画セグメントが自動的にスキップされます。この拡張機能のアイコンをクリックすると、セグメントの位置や範囲を確かめることができます。"
     },
     "helpPageHowSkippingWorks2": {
-        "message": "区域を飛び越すたびに通知されます。区域の範囲がおかしいと思ったら，その区域を低評価してください。ポップアップ画面でも同様に投票ができます。"
+        "message": "セグメントをスキップする度に通知が表示されます。セグメントの範囲がおかしいと思ったら、そのセグメントを低評価してください。ポップアップ画面でも同様に投票ができます。"
     },
     "Submitting": {
         "message": "提出する"
@@ -1005,7 +1006,7 @@
         "message": "こんな操作は面倒？"
     },
     "helpPageTooSlow1": {
-        "message": "ショートカットキーが利用可能です。セミコロンキーでスポンサーセグメントを開始/終了し、アポストロフィキーで送信できます。またこれらはオプションで変更できます。QWERTYキーを使わない場合は、キー割り当てを変更したほうがいいでしょう。"
+        "message": "ショートカットキーが利用可能です。セミコロンキーで広告セグメントを開始/終了し、アポストロフィキーで送信できます。またこれらはオプションで変更できます。QWERTYキーを使わない場合は、キー割り当てを変更したほうがいいでしょう。"
     },
     "helpPageCopyOfDatabase": {
         "message": "データベースのコピーを利用できますか？ 作者が失踪した場合はどうなりますか？"
@@ -1014,10 +1015,10 @@
         "message": "データベースは公開されており、こちらから利用できます:"
     },
     "helpPageCopyOfDatabase2": {
-        "message": "ソースコードは自由に利用できます。運営になにがあろうとも，あなたの貢献（提出された区域）が失われることはありません。"
+        "message": "ソースコードは自由に利用できます。運営になにがあろうとも、あなたの貢献（提出したセグメント）が失われることはありません。"
     },
     "helpPageNews": {
-        "message": "お知らせと作成方法"
+        "message": "最新情報と制作秘話"
     },
     "helpPageSourceCode": {
         "message": "ソースコードの入手先"
@@ -1065,7 +1066,7 @@
         "message": "編集ボックスにカーソルを合わせながらマウスホイールを使用すると、時間をすばやく調整できます。 CtrlキーまたはShiftキーの組み合わせを使用して変更を微調整できます。"
     },
     "categoryPillNewFeature": {
-        "message": "新機能！動画全体がスポンサー付きもしくはセルフプロモーションかがわかります"
+        "message": "新機能！動画全体が広告もしくは自己宣伝かがわかります"
     },
     "dayAbbreviation": {
         "message": "日",
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "国を選択してください"
     },
-    "alreadyDonated": {
-        "message": "今までにいくらかの寄付をしていただいた方は、メールにて無料アクセスの引き換えが可能です:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "ライセンスを購入する余裕がない方は、{こちら} をクリックして割引が適用されるかどうか確認できます",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "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"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "警告: サーバーがまだセグメントで応答していません。この動画に対するセグメントはすでに提出されているものの、サーバーの問題によりそれが受信できていないだけという可能性があります。"
+    },
+    "allowScrollingToEdit": {
+        "message": "スクロールで時間を編集できるようにする"
     }
 }

public/_locales/ko/messages.json

@@ -111,11 +111,14 @@
         "message": "투표 완료!"
     },
     "serverDown": {
-        "message": "서버가 다운된 것 같아요. 개발자분께 연락해주세요."
+        "message": "서버가 다운된 것 같아요. 개발자에게 연락해주세요."
     },
     "connectionError": {
         "message": "연결 오류가 발생했어요. 오류 코드: "
     },
+    "segmentsStillLoading": {
+        "message": "구간을 여전히 불러오는 중이에요..."
+    },
     "clearTimes": {
         "message": "구간 초기화"
     },
@@ -128,8 +131,8 @@
     "closeIcon": {
         "message": "닫기 아이콘"
     },
-    "SubmitTimes": {
-        "message": "구간 제출"
+    "OpenSubmissionMenu": {
+        "message": "제출 메뉴 열기"
     },
     "sortSegments": {
         "message": "구간 정렬"
@@ -168,9 +171,6 @@
     "clearTimesButton": {
         "message": "구간 초기화"
     },
-    "submitTimesButton": {
-        "message": "구간 제출"
-    },
     "publicStats": {
         "message": "얼마나 기여했는지 확인할 수 있는 공개 통계 페이지로 다음에서 확인하실 수 있어요."
     },
@@ -439,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": {
@@ -797,6 +797,10 @@
         "message": "동영상 전체가 광고인 경우 아이콘 표시",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "동영상 미리 보기 사진에도 라벨 표시",
+        "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": "미제출 색상",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -939,7 +943,7 @@
         "message": "다시 보지 않음"
     },
     "warningChatInfo": {
-        "message": "악의적인 의도는 없었던 듯 보이지만 제출하신 구간 중에 일부 문제가 있는 것 같아요."
+        "message": "현재 일반적인 실수들을 저지르고 계셔서 알려드려요. 지금까지 작업해주신 것은 감사드리지만, 저희는 완벽을 추구하고 있기 때문에 아주 작은 실수라도 문제가 될 수 있어요 :)"
     },
     "warningTitle": {
         "message": "경고를 받으셨어요"
@@ -1152,10 +1156,6 @@
     "selectYourCountry": {
         "message": "국가를 선택하세요"
     },
-    "alreadyDonated": {
-        "message": "이전에 후원한 이력이 있다면, 메일을 보내 라이선스를 등록하실 수 있어요. 문의 주소:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "요금을 결제할 여력이 아니시라면, {여기}서 할인 혜택을 받을 수 있는지 확인해 보세요",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1175,20 +1175,6 @@
     "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": "You currently have {0} on {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1243,5 +1229,11 @@
     },
     "exportSegmentsAsURL": {
         "message": "URL로 공유"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "경고: 서버에서 구간 정보를 불러오지 못했어요. 동영상에 이미 제출된 구간이 있을 수 있지만 서버의 문제로 인해 수신되지 않았을 수도 있어요."
+    },
+    "allowScrollingToEdit": {
+        "message": "스크롤하여 구간 편집 허용"
     }
 }

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: "
     },
@@ -941,9 +931,6 @@
     "hideForever": {
         "message": "Sembunyikan selamanya"
     },
-    "warningChatInfo": {
-        "message": "Kami perasaan yang anda telah membuat beberapa kesilapan biasa yang tidak berniat jahat"
-    },
     "warningTitle": {
         "message": "Anda mendapat amaran"
     },
@@ -1155,10 +1142,6 @@
     "selectYourCountry": {
         "message": "Pilih negara anda"
     },
-    "alreadyDonated": {
-        "message": "Jika anda telah menderma apa-apa jumlah sebelum ini, anda boleh tebus akses percuma dengan menghantar emel:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Jika anda tidak mampu untuk membeli lesen, tekan {sini} untuk melihat sama ada anda layak untuk diskaun",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1161,6 @@
     "enterLicenseKey": {
         "message": "Masukkan Kunci Lesen"
     },
-    "chaptersPage1": {
-        "message": "Fitur kandungan sumber awam SponsorBlock hanya tersedia untuk orang yang membeli lesen atau untuk orang yang diberikan akses secara percuma kerana sumbangan lepas"
-    },
-    "chaptersPage2": {
-        "message": "Nota: Kebenaran untuk hantar kandungan masih berdasarkan oleh reputasi yang dikira. Membeli lesen hanya membenarkan anda untuk melihat kandungan yang dihantar oleh orang lain",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Fitur Baharu: Kandungan sumber awam tersuai. Ini adalah bahagian dinamakan tersuai dalam video yang boleh bertindan untuk mendapatkan lebih dan lebih tepat. Beli lesen untuk melihat kandungan dihantar pada video seperti ini: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Fitur Baharu: Kandungan sumber awam tersuai. Ini adalah bahagian dinamakan tersuai dalam video yang boleh bertindan untuk mendapatkan lebih dan lebih tepat. Anda mempunyai akses secara percuma, membolehkannya di pilihan."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Anda pada masa ini mempunyai {0} di {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"

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": {
@@ -942,7 +939,7 @@
         "message": "Voor altijd verbergen"
     },
     "warningChatInfo": {
-        "message": "We hebben gemerkt dat u een aantal veelvoorkomende fouten maakte zonder slechte bedoelingen"
+        "message": "Het viel ons op dat u enkele veel voorkomende fouten maakte. We waarderen uw werk tot nu toe zeer, maar we streven hier naar perfectie, dus zelfs heel kleine foutjes zijn belangrijk :)"
     },
     "warningTitle": {
         "message": "U heeft een waarschuwing gekregen"
@@ -1155,10 +1152,6 @@
     "selectYourCountry": {
         "message": "Selecteer uw land"
     },
-    "alreadyDonated": {
-        "message": "Als u al eerder een bedrag hebt gedoneerd, kunt u gratis toegang krijgen door een e-mail te sturen:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Als u het zich niet kunt veroorloven om een licentie aan te schaffen, klik dan {hier} om te zien of u in aanmerking komt voor een korting",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1171,6 @@
     "enterLicenseKey": {
         "message": "Licentiesleutel invoeren"
     },
-    "chaptersPage1": {
-        "message": "De SponsorBlock-functie voor crowd-sourced hoofdstukken is alleen beschikbaar voor mensen die een licentie kopen of voor mensen die gratis toegang krijgen vanwege hun bijdragen in het verleden"
-    },
-    "chaptersPage2": {
-        "message": "Opmerking: toestemming om hoofdstukken in te dienen is nog steeds gebaseerd op berekende reputatie. Door een licentie te kopen kunt u enkel hoofdstukken bekijken die door anderen zijn ingediend",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Nieuwe functie: gecrowdsourcete aangepaste hoofdstukken. Dit zijn hoofdstukken met een eigen naam in video's die gestapeld kunnen worden om steeds preciezer te worden. Koop een licentie om de ingezonden hoofdstukken op deze video te bekijken, zoals: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Nieuwe functie: gecrowdsourcete aangepaste hoofdstukken. Dit zijn hoofdstukken met een eigen naam in video's die gestapeld kunnen worden om steeds preciezer te worden. U heeft gratis toegang. In te schakelen via de opties."
-    },
     "unsubmittedSegmentCounts": {
         "message": "U hebt momenteel {0} in {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1228,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Waarschuwing: de server heeft nog niet gereageerd met segmenten. Misschien zijn er al segmenten van deze video ingediend, maar heeft u ze nog niet ontvangen door problemen met de server."
+    },
+    "allowScrollingToEdit": {
+        "message": "Scrollen toestaan om tijdstippen te bewerken"
     }
 }

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

@@ -116,6 +116,9 @@
     "connectionError": {
         "message": "Wystąpił błąd połączenia. Kod błędu: "
     },
+    "segmentsStillLoading": {
+        "message": "Segmenty nadal się ładują..."
+    },
     "clearTimes": {
         "message": "Wyczyść segmenty"
     },
@@ -128,8 +131,8 @@
     "closeIcon": {
         "message": "Wyłącz ikonę"
     },
-    "SubmitTimes": {
-        "message": "Prześlij segmenty"
+    "OpenSubmissionMenu": {
+        "message": "Otwórz menu zgłoszenia"
     },
     "sortSegments": {
         "message": "Sortuj segmenty"
@@ -168,9 +171,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"
     },
@@ -439,7 +439,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": {
@@ -797,6 +797,10 @@
         "message": "Pokaż ikonę, gdy film jest w całości reklamą",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Pokaż etykiety również na miniaturach filmów",
+        "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": "Kolor nieprzesłanego segmentu",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -939,7 +943,7 @@
         "message": "Schowaj na zawsze"
     },
     "warningChatInfo": {
-        "message": "Zauważyliśmy, że popełniałeś pewne powszechne błędy, które nie są złośliwe"
+        "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"
@@ -1152,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Wybierz swój kraj"
     },
-    "alreadyDonated": {
-        "message": "Jeśli do tej pory przekazałeś jakąkolwiek darowiznę, możesz odebrać darmowy dostęp poprzez wysyłanie maila do:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Jeśli nie możesz sobie pozwolić na zakup licencji, kliknij {tutaj} aby sprawdzić, czy kwalifikujesz się do zniżki",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1175,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Wprowadź klucz licencyjny"
     },
-    "chaptersPage1": {
-        "message": "Funkcja społecznościowych rozdziałów SponsorBlock jest dostępna tylko dla osób, które wykupią licencję, albo którym przyznano dostęp za darmo ze względu na swoje wcześniejszy wkład"
-    },
-    "chaptersPage2": {
-        "message": "Uwaga: Przesyłanie rozdziałów jest nadal oparte na skalkulowanej reputacji. Kupowanie licencji pozwala tylko przeglądać rozdziały przesłane przez innych",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Nowa funkcja: niestandardowe rozdziały ze źródeł społecznościowych. Są to sekcje niestandardowo nazwane w filmach, które mogą być ustawione w sposób bardziej precyzyjny. Kup licencję, aby wyświetlić rozdziały przedstawione na tym filmie, takie jak: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Nowa funkcja: niestandardowe rozdziały ze źródeł społecznościowych. Są to sekcje niestandardowo nazwane w filmach, które mogą być ustawione w sposób bardziej precyzyjny."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Aktualnie masz {0} na {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1243,5 +1229,11 @@
     },
     "exportSegmentsAsURL": {
         "message": "Udostępnij jako adres URL"
+    },
+    "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

@@ -1,17 +1,17 @@
 {
     "fullName": {
-        "message": "SponsorBlock para YouTube - Pule patrocínios",
+        "message": "SponsorBlock para YouTube - Pule Patrocínios",
         "description": "Name of the extension."
     },
     "Description": {
-        "message": "Pule patrocinadores, pedidos para se inscrever, e outros nos vídeos do YouTube. Reporte patrocinadores nos vídeos que você assistir para economizar o tempo dos outros.",
+        "message": "Pule patrocinadores, pedidos para se inscrever e mais em vídeos do YouTube. Denuncie patrocinadores em vídeos que você assistir para economizar o tempo dos outros.",
         "description": "Description of the extension."
     },
     "400": {
         "message": "O servidor disse que esse pedido foi inválido"
     },
     "429": {
-        "message": "Você enviou muitos segmentos para esse vídeo, tem certeza que tem tantos assim?"
+        "message": "Você enviou muitos segmentos para esse vídeo, tem certeza de que são tantos assim?"
     },
     "409": {
         "message": "Isso já foi enviado antes"
@@ -36,16 +36,16 @@
         "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
     },
     "showSegmentNameInChapterBar": {
-        "message": "Mostrar Segmento Atual ao Lado do Tempo do Vídeo"
+        "message": "Mostrar segmento atual ao lado do tempo do vídeo"
     },
     "upvoteButtonInfo": {
-        "message": "Votar nesse segmento positivamente"
+        "message": "Aprovar este segmento"
     },
     "reportButtonTitle": {
-        "message": "Reportar"
+        "message": "Denunciar"
     },
     "reportButtonInfo": {
-        "message": "Reportar esse segmento como inválido."
+        "message": "Denunciar este segmento como inválido."
     },
     "Dismiss": {
         "message": "Ignorar"
@@ -57,7 +57,7 @@
         "message": "Nunca mostrar"
     },
     "hitGoBack": {
-        "message": "Aperta \"reverter pulo\" para voltar onde estava."
+        "message": "Aperte \"reverter pulo\" para voltar onde você estava."
     },
     "unskip": {
         "message": "Reverter pulo"
@@ -66,7 +66,7 @@
         "message": "Pular novamente"
     },
     "unmute": {
-        "message": "Ativar som"
+        "message": "Reativar o som"
     },
     "paused": {
         "message": "Pausado"
@@ -75,13 +75,13 @@
         "message": "Temporizador parado"
     },
     "confirmMSG": {
-        "message": "\n\nPara editar ou remover linhas individuais, clique com o botão direito ou abra o popup da extensão pelo icone no canto superior direito."
+        "message": "Para editar ou remover valores individuais, clique no botão de informações ou abra o pop-up da extensão clicando no ícone no canto superior direito."
     },
     "clearThis": {
-        "message": "Tem certeza que quer limpar isso?\n\n"
+        "message": "Tem certeza de que deseja limpar isso?\n\n"
     },
     "Unknown": {
-        "message": "Houve um erro ao enviar seus segmentos, tente novamente mais tarde."
+        "message": "Ocorreu um erro ao enviar seus segmentos, tente novamente mais tarde."
     },
     "sponsorFound": {
         "message": "Este vídeo tem segmentos no banco de dados!"
@@ -90,16 +90,16 @@
         "message": "Nenhum segmento encontrado"
     },
     "sponsorStart": {
-        "message": "O Segmento Começa Agora"
+        "message": "O segmento começa agora"
     },
     "sponsorEnd": {
-        "message": "O Segmento Termina Agora"
+        "message": "O segmento termina agora"
     },
     "sponsorCancel": {
-        "message": "Cancelar Criação de Segmento"
+        "message": "Cancelar criação de segmento"
     },
     "noVideoID": {
-        "message": "Nenhum vídeo do YouTube encontrado.\nSe isto estiver incorreto, atualize a aba."
+        "message": "Nenhum vídeo do YouTube encontrado.\nSe isto estiver errado, atualize a guia."
     },
     "refreshSegments": {
         "message": "Atualizar segmentos"
@@ -111,28 +111,31 @@
         "message": "Votado!"
     },
     "serverDown": {
-        "message": "Parece que o servidor caiu. Contate o desenvolvedor o quanto antes."
+        "message": "Parece que o servidor está fora do ar. Entre em contato com o desenvolvedor imediatamente."
     },
     "connectionError": {
         "message": "Ocorreu um erro de conexão. Código de erro: "
     },
+    "segmentsStillLoading": {
+        "message": "Segmentos ainda carregando..."
+    },
     "clearTimes": {
-        "message": "Limpar Segmentos"
+        "message": "Limpar segmentos"
     },
     "openPopup": {
-        "message": "Abrir o Popup SponsorBlock"
+        "message": "Abrir pop-up do SponsorBlock"
     },
     "closePopup": {
-        "message": "Fechar Popup"
+        "message": "Fechar pop-up"
     },
     "closeIcon": {
-        "message": "Ícone de Fechar"
+        "message": "Ícone de fechar"
     },
-    "SubmitTimes": {
-        "message": "Enviar Segmentos"
+    "OpenSubmissionMenu": {
+        "message": "Abrir menu de envio"
     },
     "sortSegments": {
-        "message": "Organizar Segmentos"
+        "message": "Organizar segmentos"
     },
     "submitCheck": {
         "message": "Você tem certeza que deseja enviar isto?"
@@ -144,7 +147,7 @@
         "message": "Remover canal da lista branca"
     },
     "voteOnTime": {
-        "message": "Votar Em Um Segmento"
+        "message": "Votar em um segmento"
     },
     "Submissions": {
         "message": "Envios"
@@ -166,13 +169,10 @@
         "message": "Dica: Você pode configurar os atalhos de tecla para enviar nas opções"
     },
     "clearTimesButton": {
-        "message": "Limpar Intervalos"
-    },
-    "submitTimesButton": {
-        "message": "Enviar Intervalos"
+        "message": "Limpar intervalos"
     },
     "publicStats": {
-        "message": "Isso é usado na página pública de estatísticas que mostra o quanto você já contribuiu. Veja-a"
+        "message": "Isto é usado na página pública de estatísticas que mostra o quanto você já contribuiu. Veja-a"
     },
     "Username": {
         "message": "Nome de usuário"
@@ -181,7 +181,7 @@
         "message": "Definir nome de usuário"
     },
     "copyPublicID": {
-        "message": "Copiar ID Pública de Usuário"
+        "message": "Copiar ID pública de usuário"
     },
     "copySegmentID": {
         "message": "Copiar ID do segmento"
@@ -196,58 +196,58 @@
         "message": "Opções"
     },
     "showButtons": {
-        "message": "Mostrar botões no player do Youtube"
+        "message": "Mostrar botões no reprodutor do YouTube"
     },
     "hideButtons": {
-        "message": "Esconder botões no player do Youtube"
+        "message": "Esconder botões no reprodutor do YouTube"
     },
     "hideButtonsDescription": {
-        "message": "Esta opção esconde os botões que aparecem para enviar segmentos no player do YouTube."
+        "message": "Esta opção esconde os botões que aparecem para enviar segmentos no reprodutor do YouTube."
     },
     "showSkipButton": {
-        "message": "Manter botão Pular para os Destaques no player"
+        "message": "Mostrar botão pular para os destaques no reprodutor"
     },
     "showInfoButton": {
-        "message": "Mostrar botão de Informações no player do Youtube"
+        "message": "Mostrar botão de informações no reprodutor do YouTube"
     },
     "hideInfoButton": {
-        "message": "Esconder botão de Informações no player do Youtube"
+        "message": "Ocultar botão de informações no reprodutor do YouTube"
     },
     "autoHideInfoButton": {
-        "message": "Esconder Automaticamente o Botão de Informação"
+        "message": "Ocultar automaticamente o botão de informação"
     },
     "hideDeleteButton": {
-        "message": "Esconder botão de Apagar no player do Youtube"
+        "message": "Ocultar botão de apagar no reprodutor do YouTube"
     },
     "showDeleteButton": {
-        "message": "Mostrar botão de Apagar no player do Youtube"
+        "message": "Mostrar botão de apagar no reprodutor do YouTube"
     },
     "enableViewTracking": {
-        "message": "Ativar Contador de Segmentos Pulados"
+        "message": "Ativar contador de segmentos pulados"
     },
     "whatViewTracking": {
-        "message": "Este recurso controla quais segmentos você pulou para permitir que os usuários saibam o quanto a submissão deles ajudou outros e foi usada como métrica, juntamente com votos positivos para garantir que nenhum spam entre no banco de dados. A extensão envia uma mensagem ao servidor cada vez que você pular um segmento. Espera-se que a maioria das pessoas não mude essa configuração, para que os números de exibição estejam corretos. :)"
+        "message": "Este recurso rastreia quais segmentos você pulou para permitir que os usuários saibam o quanto o envio deles ajudou outras pessoas e é usado como uma métrica junto com votos positivos para garantir que spam não entre no banco de dados. A extensão envia uma mensagem ao servidor toda vez que você pula um segmento. Espera-se que a maioria das pessoas não altere essa configuração para que os números de exibição sejam precisos. :)"
     },
     "enableViewTrackingInPrivate": {
-        "message": "Ativar Pular Contagem de Rastreamento em Abas Privadas/Incógnito"
+        "message": "Ativar rastreamento de contagem de pulos nas guias privadas/anônimas"
     },
     "enableTrackDownvotes": {
         "message": "Armazenar votos negativos de segmentos"
     },
     "whatTrackDownvotes": {
-        "message": "Qualquer segmento que você der voto negative permanecerá oculto mesmo após recarregar"
+        "message": "Quaisquer segmentos em que você votou negativamente permanecerão ocultos mesmo após a atualização"
     },
     "trackDownvotesWarning": {
         "message": "Aviso: Desativar isto excluirá todos os votos negativos armazenados anteriormente"
     },
     "enableQueryByHashPrefix": {
-        "message": "Consulta Por Prefixo Hash"
+        "message": "Consulta por prefixo de hash"
     },
     "whatQueryByHashPrefix": {
-        "message": "Em vez de solicitar segmentos do servidor usando o videoID, os 4 primeiros caracteres do hash do videoID foram enviados. Este servidor enviará dados de volta para todos os vídeos com hashes similares."
+        "message": "Em vez de solicitar segmentos do servidor usando o videoID, são enviados os 4 primeiros caracteres da hash do videoID. Este servidor enviará dados de volta para todos os vídeos com hashes similares."
     },
     "enableRefetchWhenNotFound": {
-        "message": "Recuperar Segmentos Em Novos Vídeos"
+        "message": "Recuperar segmentos em novos vídeos"
     },
     "whatRefetchWhenNotFound": {
         "message": "Se o vídeo for novo e nenhum segmento for encontrado, continuaremos buscando enquanto você assiste."
@@ -262,28 +262,28 @@
         "message": "Mostrar notificação outra vez"
     },
     "showSkipNotice": {
-        "message": "Mostrar Aviso Após Um Segmento Ser Ignorado"
+        "message": "Mostrar aviso após um segmento ser ignorado"
     },
     "showCategoryGuidelines": {
-        "message": "Mostrar Categoria de Ajuda"
+        "message": "Mostrar categoria de ajuda"
     },
     "noticeVisibilityMode0": {
-        "message": "Avisos de Ignorar em Tamanho Inteiro"
+        "message": "Avisos de pulo em tamanho completo"
     },
     "noticeVisibilityMode1": {
-        "message": "Avisos de Ignorar pequenos quando Pulado Automaticamente"
+        "message": "Avisos de pulo pequeno no pulo automático"
     },
     "noticeVisibilityMode2": {
-        "message": "Todos os Avisos de Ignorar em Tamanho Pequeno"
+        "message": "Todos os avisos de pulo pequeno"
     },
     "noticeVisibilityMode3": {
-        "message": "Avisos de Ignorar semi-transparentes quando Pulado Automaticamente"
+        "message": "Avisos de pulo semitransparente no pulo automático"
     },
     "noticeVisibilityMode4": {
-        "message": "Todos os Avisos de Ignorar semi-transparentes"
+        "message": "Todos os avisos de pulo semitransparente"
     },
     "longDescription": {
-        "message": "O SponsorBlock permite que você pule patrocinadores, introduções, créditos finais, lembretes de inscrição, e outras partes irritantes dos vídeos do YouTube. O SponsorBlock é uma extensão de navegador de crowdsourcing que permite enviar a qualquer um o tempo inicial e final de segmentos patrocinados de vídeos do YouTube. Assim que uma pessoa enviar essa informação, todas as outras pessoas com essa extensão irão pular o segmento patrocinado. Você também pode pular seções que não são de música dos vídeos de música.",
+        "message": "O SponsorBlock permite que você pule patrocinadores, introduções, créditos finais, lembretes de inscrição, e outras partes irritantes dos vídeos do YouTube. O SponsorBlock é uma extensão de navegador de colaboração coletiva que permite enviar a qualquer um o tempo inicial e final de segmentos patrocinados de vídeos do YouTube. Assim que uma pessoa enviar essa informação, todas as outras pessoas com essa extensão irão pular o segmento patrocinado. Você também pode pular seções sem música em vídeos de música.",
         "description": "Full description of the extension on the store pages."
     },
     "website": {
@@ -311,7 +311,7 @@
         "description": "Keybind label"
     },
     "setSubmitKeybind": {
-        "message": "Enviar Segmentos",
+        "message": "Enviar segmentos",
         "description": "Keybind label"
     },
     "nextChapterKeybind": {
@@ -323,10 +323,10 @@
         "description": "Keybind label"
     },
     "keybindDescription": {
-        "message": "Pressione a tecla desejada e escolha quaisquer teclas modificadoras deseja utilizar."
+        "message": "Selecione uma tecla, digitando-a e escolha as teclas modificadoras que deseja usar."
     },
     "0": {
-        "message": "Tempo limite de conexão excedida. Cheque a sua conexão de internet. Se a sua internet estiver funcionando, o servidor está sobrecarregado ou fora do ar."
+        "message": "Tempo limite de conexão excedida. Verifique a sua conexão de internet. Se a sua internet estiver funcionando, o servidor está provavelmente sobrecarregado ou fora do ar."
     },
     "disableSkipping": {
         "message": "Pular está habilitado"
@@ -335,7 +335,7 @@
         "message": "Pular está desabilitado"
     },
     "yourWork": {
-        "message": "Suas submissões",
+        "message": "Seus envios",
         "description": "Used to describe the section that will show you the statistics from your submissions."
     },
     "502": {
@@ -351,7 +351,7 @@
         "message": "Silenciar"
     },
     "full": {
-        "message": "Vídeo completo",
+        "message": "Vídeo Completo",
         "description": "Used for the name of the option to label an entire video as sponsor or self promotion."
     },
     "skip_category": {
@@ -365,7 +365,7 @@
         "description": "Used for skipping to things (Skip to Highlight)"
     },
     "skipped": {
-        "message": "{0} Ignorado",
+        "message": "{0} Pulado (a)",
         "description": "Example: Sponsor Skipped"
     },
     "muted": {
@@ -377,10 +377,10 @@
         "description": "Used for skipping to things (Skipped to Highlight)"
     },
     "disableAutoSkip": {
-        "message": "Desativar Salto Automático"
+        "message": "Desativar pulo automático"
     },
     "enableAutoSkip": {
-        "message": "Ativar Salto Automático"
+        "message": "Ativar pulo automático"
     },
     "audioNotification": {
         "message": "Notificação de áudio ao pular"
@@ -392,7 +392,7 @@
         "message": "Mostrar tempo com pulos removidos"
     },
     "showTimeWithSkipsDescription": {
-        "message": "Este tempo aparece em parênteses ao lado do tempo atual, abaixo da barra de procura. Isto mostra a duração total do vídeo menos qualquer segmento. Isto inclui segmentos marcados apenas como \"Mostrar na Barra de Procura\"."
+        "message": "Este tempo aparece em parênteses ao lado do tempo atual, abaixo da barra de progresso. Isto mostra a duração total do vídeo sem qualquer segmento. Isto inclui segmentos marcados apenas como \"Mostrar na barra de progresso\"."
     },
     "youHaveSkipped": {
         "message": "Você pulou "
@@ -410,7 +410,7 @@
         "message": "horas"
     },
     "youHaveSavedTime": {
-        "message": "Você poupou das pessoas",
+        "message": "Você poupou as pessoas",
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "youHaveSavedTimeEnd": {
@@ -418,38 +418,38 @@
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
     "statusReminder": {
-        "message": "Verifique status.sponsor.ajay.app para o status do servidor."
+        "message": "Verifique status.sponsor.ajay.app para ver o estado do servidor."
     },
     "changeUserID": {
-        "message": "Importar/Exportar Seu UserID Privado"
+        "message": "Importar/exportar seu ID de usuário privado"
     },
     "whatChangeUserID": {
-        "message": "Esta informação deve se mantida privada. Ela é como uma senha e não deve ser compartilhada. Outras pessoas poderão se passar por você caso obtenham acesso. Se estiver procurando por sua ID Pública de Usuário, clique no ícone de prancheta no popup."
+        "message": "Esta informação deve se mantida privada. Ela é como uma senha e não deve ser compartilhada. Outras pessoas poderão se passar por você caso obtenham acesso. Se estiver procurando por sua ID pública de usuário, clique no ícone de prancheta no pop-up."
     },
     "setUserID": {
-        "message": "Definir UserID Privado"
+        "message": "Definir ID de usuário privado"
     },
     "userIDChangeWarning": {
-        "message": "Aviso: A modificação do ID de usuário privado é permanente. Você tem certeza de que quer fazer isso? Certifique-se de fazer backup do anterior."
+        "message": "Aviso: A alteração do ID de usuário privado é permanente. Tem certeza de que gostaria de fazer isso? Certifique-se de fazer backup do seu antigo por precaução."
     },
     "createdBy": {
         "message": "Criado por"
     },
     "supportOtherSites": {
-        "message": "Suporte a Sites do YouTube de Terceiros"
+        "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.",
+        "message": "Suporte a clientes do YouTube de terceiros. Para habilitar o suporte, você deve aceitar as permissões extras.",
         "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
     },
     "supportedSites": {
-        "message": "Sites Suportados: "
+        "message": "Sites suportados: "
     },
     "optionsInfo": {
-        "message": "Ativar apoio ao Invidious, desabilitar pular automaticamente, ocultar botões e mais."
+        "message": "Ativar apoio ao Invidious, desativar pulo automático, ocultar botões e mais."
     },
     "addInvidiousInstance": {
-        "message": "Adicionar Instância de Cliente de Terceiros"
+        "message": "Adicionar instância de cliente de terceiros"
     },
     "addInvidiousInstanceDescription": {
         "message": "Adicionar uma instância personalizada. Isso deve ser formatado APENAS com o domínio. Exemplo: invidious.ajay.app"
@@ -461,13 +461,13 @@
         "message": "Este é um domínio inválido. Ele deve incluir APENAS a parte do domínio. Exemplo: invidious.ajay.app"
     },
     "resetInvidiousInstance": {
-        "message": "Redefinir Lista de Instâncias do Invidious"
+        "message": "Redefinir lista de instâncias do Invidious"
     },
     "resetInvidiousInstanceAlert": {
         "message": "Você está prestes a redefinir a lista de instâncias do Invidious"
     },
     "currentInstances": {
-        "message": "Instâncias Atuais:"
+        "message": "Instâncias atuais:"
     },
     "minDuration": {
         "message": "Duração mínima (segundos):"
@@ -479,19 +479,19 @@
         "message": "Usar o pulo manual quando houver um rótulo de vídeo completo"
     },
     "whatManualSkipOnFullVideo": {
-        "message": "Para pessoas que desejam assistir ao vídeo sem interrupção se ele for totalmente patrocinado ou autopromoção."
+        "message": "Para pessoas que desejam assistir ao vídeo sem interrupção se ele for totalmente patrocinado ou de auto-promoção."
     },
     "skipNoticeDuration": {
-        "message": "Duração do aviso prévio de pular (segundos):"
+        "message": "Duração do aviso prévio de pulo (segundos):"
     },
     "skipNoticeDurationDescription": {
-        "message": "O aviso de pular ficará na tela por pelo menos este tempo. Para o pulo manual, pode ser visível por mais tempo."
+        "message": "O aviso de pulo ficará na tela por pelo menos este tempo. Para o pulo manual, pode ser visível por mais tempo."
     },
     "shortCheck": {
-        "message": "A seguinte submissão é mais curta do que sua opção de duração mínima. Isto significa que já foi enviada e que está sendo ignorada devido a esta opção. Tem certeza que deseja enviar mesmo assim?"
+        "message": "O seguinte envio é mais curto do que sua opção de duração mínima. Isto significa que já foi enviada e está sendo ignorada devido a esta opção. Tem certeza que deseja enviar mesmo assim?"
     },
     "liveOrPremiere": {
-        "message": "Não é permitido o envio de segmentos em livestreams ou premieres ainda em andamento. Por favor, aguarde até que terminem, e em seguida, atualize a página e verifique se os segmentos ainda são válidos."
+        "message": "Não é permitido o envio de segmentos em transmissões ao vivo ou estreias ainda em andamento. Por favor, aguarde até que terminem, e em seguida, atualize a página e verifique se os segmentos ainda são válidos."
     },
     "showUploadButton": {
         "message": "Mostrar botão de envio"
@@ -518,7 +518,7 @@
         "message": "m.youtube.com agora é suportado"
     },
     "exportOptions": {
-        "message": "Importar/Exportar Todas as Opções"
+        "message": "Importar/Exportar todas as opções"
     },
     "exportOptionsCopy": {
         "message": "Editar/copiar"
@@ -529,8 +529,11 @@
     "exportOptionsUpload": {
         "message": "Importar de um arquivo"
     },
+    "whatExportOptions": {
+        "message": "Essa é a sua configuração completa em JSON. Isso inclui seu ID de usuário privado, então tenha certeza de compartilhá-lo com sabedoria."
+    },
     "setOptions": {
-        "message": "Definir Opções"
+        "message": "Definir opções"
     },
     "exportOptionsWarning": {
         "message": "Aviso: Alterar as opções é permanente e pode fazer a extensão parar de funcionar. Tem certeza que deseja fazer isso? Certifique-se de fazer um backup por precaução."
@@ -539,7 +542,7 @@
         "message": "Este JSON não está formatado corretamente. Suas opções não foram alteradas."
     },
     "confirmNoticeTitle": {
-        "message": "Enviar Segmento"
+        "message": "Enviar segmento"
     },
     "submit": {
         "message": "Enviar"
@@ -563,16 +566,16 @@
         "message": "Editar"
     },
     "copyDebugInformation": {
-        "message": "Copiar Informações de Depuração Para Área de Transferência"
+        "message": "Copiar informações de depuração para a área de transferência"
     },
     "copyDebugInformationFailed": {
         "message": "Erro ao copiar para a área de transferência"
     },
     "copyDebugInformationOptions": {
-        "message": "Copia informações para a área de transferência para serem fornecidas a um desenvolvedor quando houver um bug / quando um solicitado pelo desenvolvedor. Informações sensíveis como seu ID de usuário, canais na lista de permissões e endereço personalizado do servidor foram removidos. No entanto, ele contém informações como seu useragent, navegador, sistema operacional e número de versão de extensão. "
+        "message": "Copia informações para a área de transferência para serem fornecidas a um desenvolvedor quando houver um bug / quando solicitado pelo desenvolvedor. Informações sensíveis como seu ID de usuário, canais na lista de permissões e endereço personalizado do servidor foram removidos. No entanto, ele contém informações como seu useragent, navegador, sistema operacional e número de versão da extensão. "
     },
     "copyDebugInformationComplete": {
-        "message": "A informação de depuração foi copiada para a área de transferência. Sinta-se à vontade para remover qualquer informação que prefira não compartilhar. Salve em um arquivo de texto ou cole-a no relatório de bug."
+        "message": "A informação de depuração foi copiada para a área de transferência. Sinta-se à vontade para remover qualquer informação que prefira não compartilhar. Salve em um arquivo de texto ou cole-a no relatório de erro."
     },
     "keyAlreadyUsed": {
         "message": "Este atalho está vinculado a outra ação. Por favor, selecione um atalho diferente."
@@ -595,7 +598,7 @@
         "message": "Patrocinador"
     },
     "category_sponsor_description": {
-        "message": "Promoção paga, referências pagas e anúncios diretos. Não deve ser usado para Auto promoção ou mensagens grátis para causas/criadores/sites/produtos que eles gostam."
+        "message": "Promoção paga, referências pagas e anúncios diretos. Não deve ser usado para auto-promoção ou mensagens grátis para causas/criadores/sites/produtos que eles gostam."
     },
     "category_sponsor_guideline1": {
         "message": "Promoções pagas"
@@ -604,10 +607,10 @@
         "message": "Não é para doações ou mercadoria personalizada"
     },
     "category_selfpromo": {
-        "message": "Não-pago/Auto promoção"
+        "message": "Não-pago/Auto-promoção"
     },
     "category_selfpromo_description": {
-        "message": "Similar a \"patrocinador\", mas para auto promoções e segmentos não-pagos. Isso inclui seções sobre vendas, doações ou informações sobre com quem colaboraram."
+        "message": "Similar a \"patrocinador\", exceto para não-pago ou auto-promoção. Isso inclui seções sobre mercadorias, doações ou informações sobre com quem eles colaboraram."
     },
     "category_selfpromo_guideline1": {
         "message": "Doações, programa de membros e mercadoria personalizada"
@@ -632,10 +635,10 @@
         "message": "Todo o vídeo promove algo de acesso gratuito ou subsidiado"
     },
     "category_interaction": {
-        "message": "Lembrete de interação (inscrever-se)"
+        "message": "Lembrete de Interação (Inscrever-se)"
     },
     "category_interaction_description": {
-        "message": "Quando houver um pequeno lembrete para curtir, inscrever-se ou segui-los no meio do conteúdo. Se é longo ou sobre algo em específico, deveria ser sob Não-pago/Auto promoção."
+        "message": "Quando houver um pequeno lembrete para curtir, inscrever-se ou seguir no meio do conteúdo. Se é longo ou sobre algo em específico, deveria estar sob auto-promoção."
     },
     "category_interaction_guideline1": {
         "message": "Lembretes rápidos para curtir, inscrever ou seguir"
@@ -644,10 +647,10 @@
         "message": "Inclui lembretes indiretos para comentar"
     },
     "category_interaction_guideline3": {
-        "message": "Não é para promoção geral, apenas chamado à ação"
+        "message": "Não é para promoção geral, apenas um chamado para à ação"
     },
     "category_interaction_short": {
-        "message": "Lembrete de interação"
+        "message": "Lembrete de Interação"
     },
     "category_intro": {
         "message": "Intervalo/Animação de Introdução"
@@ -671,7 +674,7 @@
         "message": "Créditos ou quando os cards finais do YouTube aparecem. Não deve ser usado para conclusões informativas."
     },
     "category_outro_guideline1": {
-        "message": "Não inclue conteúdo, mesmo que cartões de finalização estejam na tela"
+        "message": "Não inclui conteúdo, mesmo que cartões de finalização estejam na tela"
     },
     "category_preview": {
         "message": "Pré-visualização/Recapitulação"
@@ -691,6 +694,9 @@
     "category_filler": {
         "message": "Enrolação/Piadas"
     },
+    "category_filler_description": {
+        "message": "Cenas tangenciais inseridas apenas por enrolação ou humor que não são necessárias para compreender o tópico principal do vídeo. Isto não deve incluir segmentos que fornecem contexto ou detalhes de segundo plano. Esta é uma categoria muito agressiva para quando você não está com disposição para \"diversão\"."
+    },
     "category_filler_short": {
         "message": "Enrolação"
     },
@@ -698,19 +704,19 @@
         "message": "Cenas tangenciais apenas para enrolação ou humor"
     },
     "category_filler_guideline2": {
-        "message": "Distrações, erros de gravação, replays"
+        "message": "Distrações, erros de gravação, repetições"
     },
     "category_filler_guideline3": {
         "message": "Não é para cenas necessárias para o entendimento do tópico"
     },
     "category_music_offtopic": {
-        "message": "Música: Seção sem música"
+        "message": "Música: Seção Não Musical"
     },
     "category_music_offtopic_description": {
         "message": "Apenas para uso em vídeos musicais. Deve ser usado exclusivamente para seções de vídeos musicais que já não pertençam à outra categoria."
     },
     "category_music_offtopic_short": {
-        "message": "Não musical"
+        "message": "Não Musical"
     },
     "category_music_offtopic_guideline1": {
         "message": "Seções que não estão nos lançamentos oficiais"
@@ -722,7 +728,7 @@
         "message": "Destaques"
     },
     "category_poi_highlight_description": {
-        "message": "A parte do vídeo que a maioria das pessoas procura. Similar aos comentários \"Vídeo começa aos x\"."
+        "message": "A parte do vídeo que a maioria das pessoas procura. Similar aos comentários \"Vídeo começa em x\"."
     },
     "category_poi_highlight_guideline1": {
         "message": "A seção que maioria das pessoas está procurando"
@@ -742,11 +748,17 @@
     "category_chapter_guideline1": {
         "message": "Não mencione os nomes dos patrocinadores"
     },
+    "category_chapter_guideline2": {
+        "message": "Use capítulos maiores para seções gerais"
+    },
+    "category_chapter_guideline3": {
+        "message": "Capítulos menores podem ser colocados em capítulos maiores"
+    },
     "category_livestream_messages": {
-        "message": "Livestream: Leituras de Doação/Mensagem"
+        "message": "Transmissão ao vivo: Leituras de Doação/Mensagem"
     },
     "category_livestream_messages_short": {
-        "message": "Leitura de mensagens"
+        "message": "Leitura de Mensagens"
     },
     "autoSkip": {
         "message": "Pular automaticamente"
@@ -770,13 +782,13 @@
         "message": "Mostrar na barra de progresso"
     },
     "showOverlay_full": {
-        "message": "Mostrar Rótulo"
+        "message": "Mostrar rótulo"
     },
     "showOverlay_chapter": {
-        "message": "Mostrar Capítulos"
+        "message": "Mostrar capítulos"
     },
     "autoSkipOnMusicVideos": {
-        "message": "Pular automaticamente todos os segmentos quando há um segmento que não é música"
+        "message": "Pular automaticamente todos os segmentos quando há um segmento não musical"
     },
     "muteSegments": {
         "message": "Permitir segmentos que silenciem o áudio ao invés de pular"
@@ -785,12 +797,16 @@
         "message": "Mostrar um ícone quando um vídeo é inteiramente um anúncio",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Mostrar rótulos nas miniaturas de vídeo também",
+        "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": "Cor Não Enviada",
+        "message": "Cor não enviada",
         "description": "Referring to submissions that have not been sent to the server yet."
     },
     "seekBarColor": {
-        "message": "Cor da barra"
+        "message": "Cor da barra de progresso"
     },
     "category": {
         "message": "Categoria"
@@ -800,7 +816,7 @@
         "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
     },
     "enableTestingServer": {
-        "message": "Habilitar Servidor em teste Beta"
+        "message": "Habilitar servidor de testes beta"
     },
     "whatEnableTestingServer": {
         "message": "Seus envios e votos NÃO SERÃO ENVIADOS para o servidor principal. Use isso apenas para testes."
@@ -809,20 +825,20 @@
         "message": "Todas os envios e votos NÃO SERÃO ENVIADOS para o servidor principal enquanto se conecta ao servidor de teste. Certifique-se de desativar isso quando você quiser fazer envios reais."
     },
     "bracketNow": {
-        "message": "(agora)"
+        "message": "(Agora)"
     },
     "moreCategories": {
         "message": "Mais categorias"
     },
     "chooseACategory": {
-        "message": "Selecione uma Categoria"
+        "message": "Selecione uma categoria"
     },
     "enableThisCategoryFirst": {
         "message": "Para enviar os segmentos com a categoria de \"{0}\", você deve ativá-la nas opções. Você será redirecionado para as opções agora.",
         "description": "Used when submitting segments to only let them select a certain category if they have it enabled in the options."
     },
     "poiOnlyOneSegment": {
-        "message": "Aviso: Este tipo de segmento pode ter no máximo um ativo por vez. Enviar múltiplos fará com que um aleatório seja mostrado."
+        "message": "Aviso: este tipo de segmento pode ter no máximo um ativo por vez. Enviar múltiplos fará com que um aleatório seja mostrado."
     },
     "youMustSelectACategory": {
         "message": "Você deve selecionar uma categoria para todos os segmentos que você está enviando!"
@@ -830,8 +846,12 @@
     "bracketEnd": {
         "message": "(Fim)"
     },
+    "End": {
+        "message": "Fim",
+        "description": "Button that skips to the end of a segment"
+    },
     "hiddenDueToDownvote": {
-        "message": "oculto: Downvote"
+        "message": "oculto: voto negativo"
     },
     "hiddenDueToDuration": {
         "message": "oculto: muito curto"
@@ -841,7 +861,10 @@
     },
     "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": "O ID do canal ainda não foi carregado. Se você estiver usando um vídeo embutido, tente usar a página inicial do YouTube. Isso também pode ser causado por mudanças no layout do YouTube, se você achar que este é o caso, faça um comentário aqui:"
+        "message": "O ID do canal ainda não foi carregado. Se você estiver usando um vídeo embutido, tente usar a página inicial do YouTube. Isso também pode ser causado por mudanças no layout do YouTube, se você acreditar que este é o caso, faça um comentário aqui:"
+    },
+    "invidiousPermissionRefresh": {
+        "message": "O navegador revogou a permissão necessária para funcionar em Invidious e em outros sites de terceiros. Por favor, clique no botão abaixo para reativar essa permissão."
     },
     "acceptPermission": {
         "message": "Aceitar permissão"
@@ -853,25 +876,32 @@
         "message": "Falha na solicitação de permissão, você clicou em negar?"
     },
     "adblockerIssueWhitelist": {
-        "message": "Se você não consegue resolver isso, desative a configuração 'Forçar Verificação do Canal Antes de Pular', pois o SponsorBlock não pode recuperar as informações deste vídeo"
+        "message": "Se você não consegue resolver isso, desative a configuração 'Forçar verificação do canal antes de pular', pois o SponsorBlock não pode recuperar as informações deste vídeo"
     },
     "forceChannelCheck": {
-        "message": "Forçar Verificação do Canal Antes de Pular"
+        "message": "Forçar verificação do canal antes de pular"
     },
     "whatForceChannelCheck": {
-        "message": "Por padrão, isso pulará os seguimentos imediatamente, mesmo antes de saber qual é o canal. Por padrão, alguns seguimentos no inicio do vídeo podem ser ignorados nos canais da lista branca. Habilitar esta opção evitará isso, mas fará com que todos os pulos tenham um ligeiro atraso, já que obter o channelID pode levar algum tempo. Este atraso pode não ser perceptível se você tiver internet rápida."
+        "message": "Por padrão, isso pulará os segmentos imediatamente, mesmo antes de saber qual é o canal. Por padrão, alguns seguimentos no inicio do vídeo podem ser ignorados nos canais da lista branca. Habilitar esta opção evitará isso, mas fará com que todos os pulos tenham um ligeiro atraso, já que obter o ID do canal pode levar algum tempo. Este atraso pode não ser perceptível se você tiver internet rápida."
     },
     "forceChannelCheckPopup": {
-        "message": "Considere Ativar a \"Forçar Verificação de Canal Antes de Pular\""
+        "message": "Considere ativar \"Forçar verificação do canal antes de pular\""
     },
     "downvoteDescription": {
-        "message": "Tempo errado ou incorreto"
+        "message": "Tempo errado/incorreto"
+    },
+    "incorrectVote": {
+        "message": "Incorreto"
+    },
+    "harmfulVote": {
+        "message": "Nocivo",
+        "description": "Used for chapter segments when the text is harmful/offensive to remove it faster"
     },
     "incorrectCategory": {
-        "message": "Mudar Categoria"
+        "message": "Mudar categoria"
     },
     "nonMusicCategoryOnMusic": {
-        "message": "Este vídeo é categorizado como música. Tem certeza de que isto tem um patrocinador? Se este é realmente um \"Segmento Não Musical\", abra as opções da extensão e habilite esta categoria. Assim você pode enviar este segmento como \"Não-Musical\" ao invés de patrocinador. Por favor leia as diretrizes se estiver confuso."
+        "message": "Este vídeo é categorizado como musical. Tem certeza de que tem um patrocinador? Se este é realmente um \"Segmento Não Musical\", abra as opções da extensão e habilite esta categoria. Assim você pode enviar este segmento como \"Não Musical\" ao invés de patrocinador. Por favor leia as diretrizes se estiver confuso."
     },
     "multipleSegments": {
         "message": "Múltiplos segmentos"
@@ -913,7 +943,19 @@
         "message": "Ocultar para sempre"
     },
     "warningChatInfo": {
-        "message": "Percebemos que você estava cometendo alguns erros comuns que não são prejudiciais"
+        "message": "Percebemos que você estava cometendo alguns erros comuns. Apreciamos muito o seu trabalho até agora, mas nos esforçamos para alcançar a perfeição aqui, então mesmo os pequenos erros são importantes :)"
+    },
+    "warningTitle": {
+        "message": "Você recebeu um aviso"
+    },
+    "questionButton": {
+        "message": "Eu tenho uma dúvida"
+    },
+    "warningConfirmButton": {
+        "message": "Eu entendo o motivo"
+    },
+    "warningError": {
+        "message": "Erro ao tentar reconhecer o aviso:"
     },
     "Donate": {
         "message": "Doar"
@@ -922,37 +964,37 @@
         "message": "Ajude a financiar o desenvolvimento"
     },
     "hideDonationLink": {
-        "message": "Ocultar o Link de Doação"
+        "message": "Ocultar o link de doação"
     },
     "darkModeOptionsPage": {
-        "message": "Modo Escuro na página de Opções"
+        "message": "Modo escuro na página de opções"
     },
     "helpPageThanksForInstalling": {
         "message": "Obrigado por instalar o SponsorBlock."
     },
     "helpPageReviewOptions": {
-        "message": "Por favor revise as opções abaixo"
+        "message": "Por favor, revise as opções abaixo"
     },
     "helpPageFeatureDisclaimer": {
-        "message": "Muitoa recursos são desativados por padrão. Se você deseja pular introduções, encerramentos, usar o Invidious, etc, ative as opções abaixo. Você também pode ocultar/mostrar elementos da interface."
+        "message": "Muitos recursos são desativados por padrão. Se você deseja pular introduções, encerramentos, usar o Invidious, etc., ative as opções abaixo. Você também pode ocultar/mostrar elementos da interface."
     },
     "helpPageHowSkippingWorks": {
         "message": "Como a função pular funciona"
     },
     "helpPageHowSkippingWorks1": {
-        "message": "Segmentos do vídeo serão pulados automaticamente se forem encontrados na base de dados. Você pode abrir a pop-up clicando no ícone da extensão para ter uma prévia de quais são."
+        "message": "Segmentos do vídeo serão pulados automaticamente se forem encontrados na base de dados. Você pode abrir o pop-up clicando no ícone da extensão para ter uma prévia de quais são."
     },
     "helpPageHowSkippingWorks2": {
-        "message": "Sempre que você pular um segmento, você receberá um aviso. Se o tempo estiver errado vote contra clicando no voto negativo! Você também pode votar na pop-up."
+        "message": "Sempre que você pular um segmento, você receberá um aviso. Se o tempo estiver errado vote contra clicando no voto negativo! Você também pode votar no pop-up."
     },
     "Submitting": {
         "message": "Enviando"
     },
     "helpPageSubmitting1": {
-        "message": "O envio pode ser feito no pop-up apertando o botão \"Segmento começa Agora\" ou no reprodutor de vídeo com os botões no reprodutor."
+        "message": "O envio pode ser feito no pop-up apertando o botão \"O segmento começa agora\" ou no reprodutor de vídeo com os botões no reprodutor."
     },
     "helpPageSubmitting2": {
-        "message": "Clicar no botão inicio indica o começo de um segmento e clicar no ícone parar indica o fim. Você pode preparar vários patrocinadores antes de clicar em enviar. Clicar no botão upload irá enviar. Clicar no lixo irá excluir."
+        "message": "Clicar no botão de começar indica o início de um segmento e clicar no ícone de parada indica o fim. Você pode preparar vários patrocinadores antes de enviar. Clicar no botão de enviar enviará. Clicar na lata de lixo excluirá."
     },
     "Editing": {
         "message": "Editando"
@@ -988,22 +1030,22 @@
         "message": "Saiba mais"
     },
     "FullDetails": {
-        "message": "Ver Detalhes Completos"
+        "message": "Detalhes completos"
     },
     "CopyDownvoteButtonInfo": {
-        "message": "Dá voto negativo e cria uma cópia local para você reenviar"
+        "message": "Vota negativamente e cria uma cópia local para você reenviar"
     },
     "OpenCategoryWikiPage": {
-        "message": "Abrir a wiki dessa categoria."
+        "message": "Abrir a página wiki desta categoria."
     },
     "CopyAndDownvote": {
-        "message": "Copiar e dar voto negativo"
+        "message": "Copiar e votar negativamente"
     },
     "ContinueVoting": {
-        "message": "Continuar Votando"
+        "message": "Continuar votando"
     },
     "ChangeCategoryTooltip": {
-        "message": "Isto irá aplicar instantaneamente seus segmentos"
+        "message": "Isto irá aplicar instantaneamente aos seus segmentos"
     },
     "downvote": {
         "message": "Voto negativo"
@@ -1024,7 +1066,7 @@
         "message": "Use a roda do mouse enquanto mantêm o cursor sobre a caixa de edição para ajustar o tempo rapidamente. Combinações das teclas ctrl e shift podem ser usadas para refinar as mudanças."
     },
     "categoryPillNewFeature": {
-        "message": "Novo! Veja quando um vídeo é inteiramente patrocinado ou de autopromoção"
+        "message": "Novo! Veja quando um vídeo é inteiramente patrocinado ou de auto-promoção"
     },
     "dayAbbreviation": {
         "message": "d",
@@ -1043,7 +1085,7 @@
         "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": "Atalhos de teclado",
+        "message": "Teclas de atalho",
         "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": {
@@ -1051,7 +1093,7 @@
         "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": "Miscelânea",
+        "message": "Diversos",
         "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": {
@@ -1072,7 +1114,7 @@
         "message": "Este já é um atalho padrão do YouTube. Tem certeza que deseja utilizá-lo?"
     },
     "betaServerWarning": {
-        "message": "Os Servidores BETA estão ativos!"
+        "message": "O servidor BETA está habilitado!"
     },
     "openOptionsPage": {
         "message": "Abrir página de opções"
@@ -1093,9 +1135,50 @@
         "message": "Importar",
         "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
     },
+    "redeemSuccess": {
+        "message": "Resgatado com sucesso!"
+    },
+    "redeemFailed": {
+        "message": "A chave de licença é inválida"
+    },
+    "hideUpsells": {
+        "message": "Ocultar opções não disponíveis sem pagamento extra"
+    },
+    "chooseACountry": {
+        "message": "Escolha um país"
+    },
+    "noDiscount": {
+        "message": "Você não se qualifica para um desconto"
+    },
+    "discountLink": {
+        "message": "Link para desconto (veja o preço rosa)"
+    },
     "selectYourCountry": {
         "message": "Selecione o seu país"
     },
+    "cantAfford": {
+        "message": "Se você não puder comprar uma licença, clique {aqui} para ver se você tem direito a um desconto",
+        "description": "Keep the curly braces. The word 'here' should be translated as well."
+    },
+    "patreonSignIn": {
+        "message": "Entrar com Patreon"
+    },
+    "redeem": {
+        "message": "Resgatar"
+    },
+    "joinOnPatreon": {
+        "message": "Inscreva-se no Patreon"
+    },
+    "oneTimePurchase": {
+        "message": "Compra única"
+    },
+    "enterLicenseKey": {
+        "message": "Inserir chave de licença"
+    },
+    "unsubmittedSegmentCounts": {
+        "message": "Você tem atualmente {0} em {1}",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
+    },
     "unsubmittedSegmentCountsZero": {
         "message": "No momento, você não tem segmentos não enviados",
         "description": "Replaces 'unsubmittedSegmentCounts' string when there are no unsubmitted segments"
@@ -1117,11 +1200,11 @@
         "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
     },
     "clearUnsubmittedSegments": {
-        "message": "Excluir todos os segmentos",
+        "message": "Limpar todos os segmentos",
         "description": "Label for a button in settings"
     },
     "clearUnsubmittedSegmentsConfirm": {
-        "message": "Tem certeza de que deseja excluir todos os segmentos não enviados?",
+        "message": "Tem certeza de que deseja limpar todos os segmentos não enviados?",
         "description": "Confirmation message for the Clear unsubmitted segments button"
     },
     "showUnsubmittedSegments": {
@@ -1133,11 +1216,11 @@
         "description": "Show/hide button for the unsubmitted segments list"
     },
     "videoID": {
-        "message": "ID do Vídeo",
+        "message": "ID do vídeo",
         "description": "Header of the unsubmitted segments list"
     },
     "segmentCount": {
-        "message": "Número de segmentos",
+        "message": "Contagem de segmentos",
         "description": "Header of the unsubmitted segments list"
     },
     "actions": {
@@ -1146,5 +1229,11 @@
     },
     "exportSegmentsAsURL": {
         "message": "Compartilhar como URL"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "Aviso: O servidor ainda não respondeu com segmentos. Na verdade, pode haver segmentos neste vídeo já enviados, mas você não os recebeu devido a problemas com o servidor."
+    },
+    "allowScrollingToEdit": {
+        "message": "Permitir rolagem para editar tempos"
     }
 }

public/_locales/pt_PT/messages.json

@@ -25,6 +25,19 @@
     "Segments": {
         "message": "segmentos"
     },
+    "SegmentsCap": {
+        "message": "Segmentos"
+    },
+    "Chapters": {
+        "message": "Capítulos"
+    },
+    "renderAsChapters": {
+        "message": "Renderizar segmentos como capítulos",
+        "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
+    },
+    "showSegmentNameInChapterBar": {
+        "message": "Mostrar segmento atual ao lado do tempo do vídeo"
+    },
     "upvoteButtonInfo": {
         "message": "Votar positivamente esta submissão"
     },
@@ -103,6 +116,9 @@
     "connectionError": {
         "message": "Deu-se um erro de conecção: Código: "
     },
+    "segmentsStillLoading": {
+        "message": "Segmentos ainda a carregar..."
+    },
     "clearTimes": {
         "message": "Limpar Segmentos"
     },
@@ -112,8 +128,14 @@
     "closePopup": {
         "message": "Fechar Popup"
     },
-    "SubmitTimes": {
-        "message": "Submeter Segmentos"
+    "closeIcon": {
+        "message": "Ícone de Fechar"
+    },
+    "OpenSubmissionMenu": {
+        "message": "Abrir Menu de Envio"
+    },
+    "sortSegments": {
+        "message": "Ordenar Segmentos"
     },
     "submitCheck": {
         "message": "Tem a certeza que pretende submeter?"
@@ -149,9 +171,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"
     },
@@ -233,12 +252,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"
     },
@@ -256,6 +281,25 @@
         "message": "Código-fonte",
         "description": "Used on Firefox Store Page"
     },
+    "setStartSponsorShortcut": {
+        "message": "Iniciar/parar segmento",
+        "description": "Keybind label"
+    },
+    "setSubmitKeybind": {
+        "message": "Enviar segmentos",
+        "description": "Keybind label"
+    },
+    "nextChapterKeybind": {
+        "message": "Próximo capítulo",
+        "description": "Keybind label"
+    },
+    "previousChapterKeybind": {
+        "message": "Capítulo anterior",
+        "description": "Keybind label"
+    },
+    "502": {
+        "message": "O servidor parece estar sobrecarregado. Tente novamente em alguns segundos."
+    },
     "errorCode": {
         "message": "Código de erro: "
     },
@@ -307,6 +351,25 @@
         "message": " das suas vidas",
         "description": "You've saved people from 887,362 segments (236d 15h 5.3 minutes of their lives)."
     },
+    "setUserID": {
+        "message": "Definir UserID Privado"
+    },
+    "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: "
+    },
+    "addInvidiousInstanceDescription": {
+        "message": "Adicione uma instância personalizada. Isso deve ser formatado APENAS com o domínio. Exemplo: invidious.ajay.app"
+    },
+    "addInvidiousInstanceError": {
+        "message": "Este é um domínio inválido. Isto deve APENAS incluir a parte do domínio. Exemplo: invidious.ajay.app"
+    },
     "areYouSureReset": {
         "message": "Tem certeza que deseja redefinir?"
     },
@@ -380,6 +443,10 @@
     "disable": {
         "message": "Desativar"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Mostrar etiquetas nas miniaturas de vídeo também",
+        "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."
+    },
     "category": {
         "message": "Categoria"
     },

public/_locales/ro/messages.json

@@ -116,6 +116,9 @@
     "connectionError": {
         "message": "A apărut o eroare de conexiune. Cod de eroare: "
     },
+    "segmentsStillLoading": {
+        "message": "Încă se încarcă segmentele..."
+    },
     "clearTimes": {
         "message": "Curăță segmentele"
     },
@@ -128,9 +131,6 @@
     "closeIcon": {
         "message": "Închide pictograma"
     },
-    "SubmitTimes": {
-        "message": "Trimite segmente"
-    },
     "sortSegments": {
         "message": "Sortare Segmente"
     },
@@ -168,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"
     },
@@ -438,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: "
     },
@@ -939,7 +932,7 @@
         "message": "Ascunde pentru totdeauna"
     },
     "warningChatInfo": {
-        "message": "Am observat că făceați niște greșeli comune care nu sunt răuvoitoare"
+        "message": "Am observat că faci niște greșeli comune. Apreciem foarte mult munca ta de până acum, însă noi tindem spre perfecțiune aici, așa că fiecare mică greșeală contează :)"
     },
     "warningTitle": {
         "message": "Ai primit o avertizare"
@@ -1152,10 +1145,6 @@
     "selectYourCountry": {
         "message": "Selectaţi ţara"
     },
-    "alreadyDonated": {
-        "message": "Dacă ai donat orice sumă înainte, poți revendica acces gratuit prin e-mail:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Dacă nu vă puteți permite să achiziționați o licență, faceți clic pe {aici} pentru a vedea dacă sunteți eligibil pentru o reducere",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1175,20 +1164,6 @@
     "enterLicenseKey": {
         "message": "Introdu cheia de licență"
     },
-    "chaptersPage1": {
-        "message": "Funcția SponsorBlock crowd-sourted capitol este disponibilă doar pentru persoanele care achiziționează o licență, fie persoanelor cărora li se acordă acces gratuit la contribuţiile lor anterioare"
-    },
-    "chaptersPage2": {
-        "message": "Notă: Permisiunea de a trimite capitole este încă bazată pe reputația calculată. Achiziționarea unei licențe vă permite doar să vizualizați capitolele prezentate de alții",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Funcție nouă: Capitole personalizate din surse colective. Acestea sunt secțiuni personalizate în videoclipuri care pot fi stivuite pentru a deveni din ce în ce mai precise. Cumpără o licență pentru a vizualiza capitolele trimise pe acest videoclip, cum ar fi: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Funcție nouă: Capitole personalizate din surse colective. Acestea sunt secțiuni personalizate în videoclipuri care pot fi stivuite pentru a deveni din ce în ce mai precise. Ai acces gratuit, activeaz-o in opțiuni."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Ai în prezent {0} pe {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1243,5 +1218,11 @@
     },
     "exportSegmentsAsURL": {
         "message": "Distribuie ca URL"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "Atenție: Serverul nu a răspuns încă cu segmente. Ar putea fi segmente în acest videoclip deja trimise, dar pur și simplu nu le-ai primit din cauza problemelor cu serverul."
+    },
+    "allowScrollingToEdit": {
+        "message": "Permite derularea la Editarea Timpilor"
     }
 }

public/_locales/ru/messages.json

@@ -117,7 +117,7 @@
         "message": "Ошибка соединения. Код ошибки: "
     },
     "segmentsStillLoading": {
-        "message": "Сегменты все еще загружаются..."
+        "message": "Сегменты всё ещё загружаются..."
     },
     "clearTimes": {
         "message": "Очистить сегменты"
@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Кнопка закрытия"
     },
-    "SubmitTimes": {
-        "message": "Отправить сегменты"
+    "OpenSubmissionMenu": {
+        "message": "Открыть меню отправки"
     },
     "sortSegments": {
         "message": "Сортировать сегменты"
@@ -162,7 +162,7 @@
         "message": "Отправить"
     },
     "submissionEditHint": {
-        "message": "Редактирование сегментов появится после нажатия на кнопку \"Отправить\"",
+        "message": "Редактирование сегментов появится после нажатия на кнопку «Отправить»",
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
@@ -171,9 +171,6 @@
     "clearTimesButton": {
         "message": "Очистить время"
     },
-    "submitTimesButton": {
-        "message": "Отправить сегменты"
-    },
     "publicStats": {
         "message": "Оно используется на публичной странице статистики, чтобы показать Ваш вклад. Её можно посмотреть "
     },
@@ -208,7 +205,7 @@
         "message": "Эта настройка скрывает кнопки для отправки сегментов, расположенные в плеере YouTube."
     },
     "showSkipButton": {
-        "message": "Не скрывать кнопку \"Пропустить до важного\" в плеере YouTube"
+        "message": "Не скрывать кнопку «Пропустить до важного» в плеере YouTube"
     },
     "showInfoButton": {
         "message": "Показывать кнопку информации в плеере YouTube"
@@ -217,7 +214,7 @@
         "message": "Скрыть кнопку информации в плеере YouTube"
     },
     "autoHideInfoButton": {
-        "message": "Автоматически скрывать кнопку Информация"
+        "message": "Автоматически скрывать кнопку информации"
     },
     "hideDeleteButton": {
         "message": "Скрыть кнопку удаления в плеере YouTube"
@@ -389,7 +386,7 @@
         "message": "Аудио уведомление при пропуске"
     },
     "audioNotificationDescription": {
-        "message": "Аудио уведомление о пропуске будет воспроизводиться каждый раз, когда сегмент пропущен. Если отключено (или автоматический пропуск отключён), звук не будет воспроизводиться."
+        "message": "Звуковое уведомление при пропуске будет воспроизводиться каждый раз, когда сегмент пропущен. Если отключено (или автоматический пропуск отключён), звук не будет воспроизводиться."
     },
     "showTimeWithSkips": {
         "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": {
@@ -800,6 +797,10 @@
         "message": "Показывать иконку, когда всё видео является рекламой",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Также показывать категории на превью",
+        "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": "Цвет неотправленного сегмента",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Скрыть навсегда"
     },
     "warningChatInfo": {
-        "message": "Мы заметили, что вы совершаете распространённые и не злонамеренные ошибки"
+        "message": "Мы заметили, что вы совершаете распространенные ошибки. Мы очень ценим вашу работу, но мы стремимся делать всё идеально, так что даже очень маленькие ошибки имеют большое значение :)"
     },
     "warningTitle": {
         "message": "Вы получили предупреждение"
@@ -1088,7 +1089,7 @@
         "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": "Бэкап/Восстановление",
+        "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": {
@@ -1141,7 +1142,7 @@
         "message": "Ключ лицензии недействителен"
     },
     "hideUpsells": {
-        "message": "Скрыть опции, не доступные без дополнительной платы"
+        "message": "Скрыть опции, недоступные без дополнительной платы"
     },
     "chooseACountry": {
         "message": "Выберите страну"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Выберите вашу страну"
     },
-    "alreadyDonated": {
-        "message": "Если вы когда-то жертвовали любую сумму, вы можете получить доступ, отправив электронное письмо сюда:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Если вы не можете позволить себе приобрести лицензию, нажмите {сюда}, чтобы узнать, имеете ли вы право на скидку",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "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": "Сейчас у вас есть {0} в {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Внимание: Сервер еще не прислал существующие сегменты. В этом видео уже могут быть отправленные сегменты, но вы их ещё не получили из-за проблем с сервером."
+    },
+    "allowScrollingToEdit": {
+        "message": "Разрешить прокрутку для редактирования времени"
     }
 }

public/_locales/sk/messages.json

@@ -131,8 +131,8 @@
     "closeIcon": {
         "message": "Ikona pre zatvorenie"
     },
-    "SubmitTimes": {
-        "message": "Odoslať segmenty"
+    "sortSegments": {
+        "message": "Triedenie segmentov"
     },
     "submitCheck": {
         "message": "Naozaj to chcete odoslať?"
@@ -168,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"
     },
@@ -231,6 +228,15 @@
     "enableViewTrackingInPrivate": {
         "message": "Zapnúť počítanie preskočení v inkognito oknách"
     },
+    "enableTrackDownvotes": {
+        "message": "Uložiť segmenty, ktoré boli downvotované"
+    },
+    "whatTrackDownvotes": {
+        "message": "Všetky segmenty, ktoré znížite, zostanú skryté aj po obnovení"
+    },
+    "trackDownvotesWarning": {
+        "message": "Varovanie: Vypnutím tejto funkcie sa vymažú všetky predtým uložené downvoty"
+    },
     "enableQueryByHashPrefix": {
         "message": "Dopyt podľa hash prefixu"
     },
@@ -293,6 +299,18 @@
         "message": "Ak sa vám to stále nepáčí, stlačte tlačidlo Nikdy nezobrazovať.",
         "description": "The second line of the message displayed after the notice was upgraded."
     },
+    "setSkipShortcut": {
+        "message": "Preskočiť segment",
+        "description": "Keybind label"
+    },
+    "setStartSponsorShortcut": {
+        "message": "Segment štart/stop",
+        "description": "Keybind label"
+    },
+    "setSubmitKeybind": {
+        "message": "Odoslať segmenty",
+        "description": "Keybind label"
+    },
     "nextChapterKeybind": {
         "message": "Ďalšia kapitola",
         "description": "Keybind label"
@@ -301,6 +319,9 @@
         "message": "Predošlá kapitola",
         "description": "Keybind label"
     },
+    "keybindDescription": {
+        "message": "Vyberte kláves jeho zadaním a vyberte všetky modifikačné klávesy, ktoré chcete použiť."
+    },
     "0": {
         "message": "Spojenie vypršalo. Skontrolujte svoje internetové pripojenie. Ak vám internet funguje, server je pravdepodobne preťažený alebo nefunkčný."
     },
@@ -396,9 +417,18 @@
     "statusReminder": {
         "message": "Stav servera skontrolujete na status.sponsor.ajay.app."
     },
+    "changeUserID": {
+        "message": "Import/export vášho súkromného ID používateľa"
+    },
     "whatChangeUserID": {
         "message": "Toto si starostlivo uchovajte. Podobne ako heslo by ste to nemali s nikým zdieľať. Ak by to získal niekto ďalší, mohol by vám uškodiť. Ak hľadáte vaše verejné ID používateľa, stlačte ikonu schránky v podokne."
     },
+    "setUserID": {
+        "message": "Nastavenie súkromného identifikátora používateľa"
+    },
+    "userIDChangeWarning": {
+        "message": "Varovanie: Zmena súkromného ID používateľa je trvalá. Ste si istí, že to chcete urobiť? Pre istotu si zálohujte svoje staré."
+    },
     "createdBy": {
         "message": "Vytvoril"
     },
@@ -406,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": {
@@ -442,6 +472,12 @@
     "minDurationDescription": {
         "message": "Segmenty kratšie ako nastavená hodnota nebudú preskočené ani zobrazené v prehrávači."
     },
+    "enableManualSkipOnFullVideo": {
+        "message": "Používanie manuálneho preskočenia, ak existuje úplný štítok videa"
+    },
+    "whatManualSkipOnFullVideo": {
+        "message": "Pre ľudí, ktorí chcú sledovať video bez prerušenia, ak je plne sponzorované alebo ide o vlastnú propagáciu."
+    },
     "skipNoticeDuration": {
         "message": "Trvanie oznámenia o preskočení (v sekundách):"
     },
@@ -481,6 +517,18 @@
     "exportOptions": {
         "message": "Import/export všetkých nastavení"
     },
+    "exportOptionsCopy": {
+        "message": "Upraviť/kopírovať"
+    },
+    "exportOptionsDownload": {
+        "message": "Uložiť do súboru"
+    },
+    "exportOptionsUpload": {
+        "message": "Načítanie do súboru"
+    },
+    "whatExportOptions": {
+        "message": "Toto je celá vaša konfigurácia vo formáte JSON. Zahŕňa vaše súkromné ID používateľa, preto ho nezabudnite rozumne zdieľať."
+    },
     "setOptions": {
         "message": "Nastaviť Nastavenia"
     },
@@ -526,6 +574,9 @@
     "copyDebugInformationComplete": {
         "message": "Debug informácie boli skopírované do schránky. Ak chcete, môžete odstrániť akékoľvek informácie, ktoré nechcete zdieľať. Uložte si ich do textového súboru alebo ich vložte do nahlásenia chyby."
     },
+    "keyAlreadyUsed": {
+        "message": "Táto skratka je viazaná na inú akciu. Vyberte inú."
+    },
     "to": {
         "message": "do",
         "description": "Used between segments. Example: 1:20 to 1:30"
@@ -637,6 +688,12 @@
     "category_preview_guideline3": {
         "message": "Nie pre sekcie, ktoré majú dodatočný obsah"
     },
+    "category_filler": {
+        "message": "Výplň Tangent / Vtipy"
+    },
+    "category_filler_description": {
+        "message": "Vedľajšie scény pridané len ako výplň alebo humor, ktoré nie sú potrebné na pochopenie hlavného obsahu videa. Nemali by sem patriť segmenty poskytujúce kontext alebo detaily pozadia. Toto je veľmi agresívna kategória určená na to, keď nemáte náladu na \"zábavu\"."
+    },
     "category_filler_short": {
         "message": "Odbočka"
     },
@@ -792,6 +849,9 @@
     "hiddenDueToDuration": {
         "message": "skryté: príliš krátke"
     },
+    "manuallyHidden": {
+        "message": "ručne skryté"
+    },
     "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 kanála sa ešte nenačítalo. Ak pozeráte video vložené na stránke, skúste ísť radšej priamo na YouTube. Problém mohli spôsobiť zmeny na YouTube. Ak je tomu tak, zanechajte komentár:"
@@ -876,7 +936,7 @@
         "message": "Navždy skryť"
     },
     "warningChatInfo": {
-        "message": "Zaznamenali sme, že robíte omylom chyby"
+        "message": "Zaznamenali sme, že ste urobili obvyklú chybu. Vážime si vašej práce, ale ide nám o presnosť, takže aj na malých chybách záleží."
     },
     "warningTitle": {
         "message": "Dostali ste varovanie"
@@ -888,14 +948,20 @@
         "message": "Rozumiem dôvodu"
     },
     "warningError": {
-        "message": "Chyb a pri pokuse o súhlas s upozornením:"
+        "message": "Chyba pri pokuse o súhlas s upozornením:"
     },
     "Donate": {
         "message": "Prispieť"
     },
+    "considerDonating": {
+        "message": "Zvážte darovanie"
+    },
     "hideDonationLink": {
         "message": "Skryť možnosti prispenia"
     },
+    "darkModeOptionsPage": {
+        "message": "Tmavý režim na stránke s možnosťami"
+    },
     "helpPageThanksForInstalling": {
         "message": "Ďakujeme za inštaláciu SponsorBlock-u."
     },
@@ -1003,19 +1069,68 @@
         "message": "h",
         "description": "100h"
     },
+    "optionsTabBehavior": {
+        "message": "Správanie",
+        "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": "Rozhranie",
+        "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": "Klávesové skratky",
+        "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": "Zálohovanie/obnova",
+        "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": "Rôzne",
+        "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": "Preskočiť vzhľad oznámenia",
+        "description": "Option label"
+    },
+    "unbind": {
+        "message": "Zrušenie väzby",
+        "description": "Unbind keyboard shortcut"
+    },
+    "notSet": {
+        "message": "Nie je nastavené"
+    },
+    "change": {
+        "message": "Zmena"
+    },
+    "youtubeKeybindWarning": {
+        "message": "Toto je zabudovaná skratka YouTube. Ste si istí, že ju chcete použiť?"
+    },
     "betaServerWarning": {
         "message": "Je zapnutý BETA server!"
     },
     "openOptionsPage": {
         "message": "Otvoriť stránku s nastaveniami"
     },
+    "resetToDefault": {
+        "message": "Obnovenie predvolených nastavení"
+    },
+    "confirmResetToDefault": {
+        "message": "Ste si istí, že chcete obnoviť všetky nastavenia na predvolené hodnoty? To sa nedá vrátiť späť."
+    },
     "exportSegments": {
         "message": "Exportovať segmenty"
     },
+    "importSegments": {
+        "message": "Import segmentov"
+    },
     "Import": {
         "message": "Import",
         "description": "Button to initiate importing segments. Appears under the textbox where they paste in the data"
     },
+    "redeemSuccess": {
+        "message": "Úspešne vykúpiť!"
+    },
     "redeemFailed": {
         "message": "Licenčný kľúč nie je platný"
     },
@@ -1034,10 +1149,6 @@
     "selectYourCountry": {
         "message": "Vyberte krajinu"
     },
-    "alreadyDonated": {
-        "message": "Ak ste už v minulosti prispeli, získajte voľný prístup napísaním emailu:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Ak si nemôžete dovoliť kúpiť licenciu, kliknite {sem} a zistite, či máte nárok na zľavu",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1057,12 +1168,49 @@
     "enterLicenseKey": {
         "message": "Zadajte licenčný kľúč"
     },
-    "chaptersPage1": {
-        "message": "Crowd-sourcované kapitovly v SponsorBlock-u sú dostupné len po zakúpení licencie alebo zadarmo pre ľudí, ktorí už v minulosti prispeli"
+    "unsubmittedSegmentCounts": {
+        "message": "V súčasnosti máte {0} na {1}",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
     },
-    "chapterNewFeature": {
-        "message": "Nová funkcia: Crowd-sourcované vlastné kapitoly. Toto sú sekcie videa s vlastnými názvami, ktoré môžu byť pre väčšiu presnosť vyskladané. Ak si kúpite licenciu, uvidíte kapitoly v tomto videu, ako napr.: ",
-        "description": "After the comma, a list of chapters for this video will appear"
+    "unsubmittedSegmentCountsZero": {
+        "message": "V súčasnosti nemáte žiadne neodoslané segmenty",
+        "description": "Replaces 'unsubmittedSegmentCounts' string when there are no unsubmitted segments"
+    },
+    "unsubmittedSegmentsSingular": {
+        "message": "neodoslaný segment",
+        "description": "Example: You currently have 1 *unsubmitted segment* on 1 video"
+    },
+    "unsubmittedSegmentsPlural": {
+        "message": "nezaslané segmenty",
+        "description": "Example: You currently have 12 *unsubmitted segments* on 5 videos"
+    },
+    "videosSingular": {
+        "message": "video",
+        "description": "Example: You currently have 3 unsubmitted segments on 1 *video*"
+    },
+    "videosPlural": {
+        "message": "v",
+        "description": "Example: You currently have 12 unsubmitted segments on 5 *videos*"
+    },
+    "clearUnsubmittedSegments": {
+        "message": "Vymazať všetky segmenty",
+        "description": "Label for a button in settings"
+    },
+    "clearUnsubmittedSegmentsConfirm": {
+        "message": "Ste si istí, že chcete vymazať všetky neodoslané segmenty?",
+        "description": "Confirmation message for the Clear unsubmitted segments button"
+    },
+    "showUnsubmittedSegments": {
+        "message": "Zobraziť segmenty",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "hideUnsubmittedSegments": {
+        "message": "Skryť segmenty",
+        "description": "Show/hide button for the unsubmitted segments list"
+    },
+    "videoID": {
+        "message": "ID videa",
+        "description": "Header of the unsubmitted segments list"
     },
     "segmentFetchFailureWarning": {
         "message": "Varovanie: Zo servera sa ešte nenahrali segmenty. V tomto videu už môžu byť vytvorené segmenty, ale vzhľadom na problémy so serverom ešte nemuseli byť nahraté."

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 stöd 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": {
@@ -800,6 +797,10 @@
         "message": "Visa en ikon när hela videon är en annons",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Visa även etiketter på videominiatyrbilder",
+        "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": "Färg på oinskickade",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Dölj för alltid"
     },
     "warningChatInfo": {
-        "message": "Vi märkte att du gjorde några vanliga misstag som inte var uppsåtligt"
+        "message": "Vi märkte att du gjorde några vanliga misstag. Vi uppskattar verkligen ditt arbete hittills, men vi strävar mot perfektion här, så även mycket små misstag spelar roll :)"
     },
     "warningTitle": {
         "message": "Du har fått en varning"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Välj ditt land"
     },
-    "alreadyDonated": {
-        "message": "Om du har donerat tidigare kan du lösa in fri åtkomst genom att skicka e-post till:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Om du inte har råd att köpa en licens kan du klicka {här} för att se om du är berättigad till rabatt",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "enterLicenseKey": {
         "message": "Ange licensnyckel"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlock crowd-sourced kapitelfunktionen är endast tillgänglig för personer som köper en licens eller för de personer som beviljats gratis tillgång på grund av att de bidragit tidigare"
-    },
-    "chaptersPage2": {
-        "message": "Obs: Tillstånd att skicka in kapitel är fortfarande baserat på beräknat rykte. Köpa en licens låter dig bara visa kapitel som lämnats in av andra",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Ny funktion: Crowd-sourced anpassade kapitel. Dessa är anpassade namngivna avsnitt i videor som kan staplas för att få mer och mer exakt. Köp en licens för att se de kapitel som lämnats på denna video såsom: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Ny funktion: Crowd-sourced anpassade kapitel. Dessa är anpassade namngivna avsnitt i videor som kan staplas för att få mer och mer exakt. För dig är det gratis, aktivera det i alternativen."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Du har för närvarande {0} på {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Varning: Servern har inte skickat ut några segment. Det kan faktiskt finnas segment på den här videon som redan skickats in, men du har inte mottagit dem ännu på grund av problem med servern."
+    },
+    "allowScrollingToEdit": {
+        "message": "Tillåt rullning för att redigera tiden"
     }
 }

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

@@ -25,6 +25,9 @@
     "Segments": {
         "message": "ส่วน"
     },
+    "SegmentsCap": {
+        "message": "ส่วน"
+    },
     "upvoteButtonInfo": {
         "message": "เห็นด้วยกับรายงานนี้"
     },
@@ -69,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

@@ -116,6 +116,9 @@
     "connectionError": {
         "message": "Bağlantı hatası oluştu. Hata kodu: "
     },
+    "segmentsStillLoading": {
+        "message": "Bölümler hala yükleniyor..."
+    },
     "clearTimes": {
         "message": "Kısımları temizle"
     },
@@ -128,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"
@@ -168,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"
     },
@@ -439,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": {
@@ -476,7 +476,7 @@
         "message": "Ayarlanan değerden daha kısa kısımlar atlanmayacak veya oynatıcıda gösterilmeyecektir."
     },
     "enableManualSkipOnFullVideo": {
-        "message": "Tam bir video etiketi mevcut olduğunda manuel atlama özelliğini kullanın"
+        "message": "Bütün video etiketi mevcut olduğunda manuel atlama özelliğini kullanın"
     },
     "whatManualSkipOnFullVideo": {
         "message": "Video boyunca sponsorlu veya kendi reklamını yapıyorsa videoyu kesintisiz izlemek isteyenler için."
@@ -939,7 +939,7 @@
         "message": "Asla gösterme"
     },
     "warningChatInfo": {
-        "message": "Kötü amaçlı olmayan bazı yaygın hatalar yaptığınızı fark ettik"
+        "message": "Yaygın hataları sıkça yaptığınız anlaşılıyor. Çabalarınız için sağolun fakat burada mükemmel bir sonuç istiyoruz, küçük hatalar bile fark ediyor :)"
     },
     "warningTitle": {
         "message": "Bir uyarı aldın"
@@ -1152,10 +1152,6 @@
     "selectYourCountry": {
         "message": "Ülkenizi seçin"
     },
-    "alreadyDonated": {
-        "message": "Şimdiye kadar herhangi bir miktarda bağış yaptıysanız, bu adrese e-posta göndererek ücretsiz erişim hakkına sahip olabilirsin:",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Lisans satın almaya gücünüz yetmiyorsa, indirim almaya uygun olup olmadığınızı görmek için {here} tıklayın",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1175,20 +1171,6 @@
     "enterLicenseKey": {
         "message": "Lisans Anahtarını Girin"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlock'un topluluk kaynaklı bölümler özelliği yalnızca lisans satın alan veya geçmiş katkılarından dolayı ücretsiz erişim hakkı verilen kişiler tarafından kullanılabilir"
-    },
-    "chaptersPage2": {
-        "message": "Not: Bölüm gönderme izni hala hesaplanan itibara dayanmaktadır. Bir lisans satın almak, yalnızca başkaları tarafından gönderilen bölümleri görüntülemenize izin verir",
-        "description": "On the chapters page for getting access to the paid chapters feature"
-    },
-    "chapterNewFeature": {
-        "message": "Yeni Özellik: Topluluk kaynaklı özel bölümler. Bunlar, giderek daha doğru hale gelmek için istiflenebilen videolardaki özel adlandırılmış bölümlerdir. Bu videodaki gibi gönderilen bölümleri görüntülemek için bir lisans satın alın: ",
-        "description": "After the comma, a list of chapters for this video will appear"
-    },
-    "chapterNewFeature2": {
-        "message": "Yeni Özellik: Topluluk kaynaklı özel bölümler. Bunlar, giderek daha doğru hale gelmek için istiflenebilen videolardaki özel adlandırılmış bölümlerdir. Ücretsiz erişiminiz var, seçeneklerden etkinleştirin."
-    },
     "unsubmittedSegmentCounts": {
         "message": "Şu anda {1} da {0} var",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1243,5 +1225,11 @@
     },
     "exportSegmentsAsURL": {
         "message": "URL olarak paylaş"
+    },
+    "segmentFetchFailureWarning": {
+        "message": "Uyarı: Sunucu henüz bölümlerle yanıt vermedi. Aslında bu videoda zaten gönderilmiş bölümler olabilir, ancak sunucudaki sorunlar nedeniyle bunları almadınız."
+    },
+    "allowScrollingToEdit": {
+        "message": "Zamanları Düzenlemek İçin Kaydırmaya İzin Ver"
     }
 }

public/_locales/uk/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": {
@@ -800,6 +797,10 @@
         "message": "Показувати значок, коли все відео є рекламою",
         "description": "Referring to the category pill that is now shown on videos that are entirely sponsor or entirely selfpromo"
     },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "Показувати мітки на мініатюрах відео",
+        "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": "Колір не надісланого сегмента",
         "description": "Referring to submissions that have not been sent to the server yet."
@@ -942,7 +943,7 @@
         "message": "Сховати назавжди"
     },
     "warningChatInfo": {
-        "message": "Ми помітили, що ви не зловмисно робили деякі поширені помилки"
+        "message": "Ми помітили, що ви робите деякі типові помилки. Ми дуже цінуємо вашу роботу, але ми прагнемо до досконалості, тому навіть дуже маленькі помилки мають значення :)"
     },
     "warningTitle": {
         "message": "Ви отримали попередження"
@@ -1155,10 +1156,6 @@
     "selectYourCountry": {
         "message": "Виберіть вашу країну"
     },
-    "alreadyDonated": {
-        "message": "Якщо ви вже пожертвували будь-яку суму, ви можете отримати безкоштовний доступ, надіславши електронний лист:\nВажливо:Після двокрапки вказується адреса електронної пошти",
-        "description": "After the colon is an email address"
-    },
     "cantAfford": {
         "message": "Якщо ви не можете дозволити собі придбати ліцензію, натисніть {тут}, щоб дізнатися, чи маєте ви право на знижку",
         "description": "Keep the curly braces. The word 'here' should be translated as well."
@@ -1178,20 +1175,6 @@
     "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": "Наразі у вас є {0} на {1}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1249,5 +1232,8 @@
     },
     "segmentFetchFailureWarning": {
         "message": "Попередження: сервер ще не завантажив сегменти. Можливо, у цьому відео вже є сегменти, але ви просто не отримали їх через проблеми з сервером."
+    },
+    "allowScrollingToEdit": {
+        "message": "Дозволити прокручування для редагування часу"
     }
 }

public/_locales/vi/messages.json

@@ -25,6 +25,16 @@
     "Segments": {
         "message": "phân đoạn"
     },
+    "SegmentsCap": {
+        "message": "Phân đoạn"
+    },
+    "Chapters": {
+        "message": "Chương"
+    },
+    "renderAsChapters": {
+        "message": "Coi phân đoạn như chương",
+        "description": "Refers to drawing segments on the YouTube seek bar as split up chapters, similar to the existing chapter system"
+    },
     "upvoteButtonInfo": {
         "message": "Tán thành phân đoạn này"
     },
@@ -103,6 +113,9 @@
     "connectionError": {
         "message": "Đã xảy ra lỗi kết nối. Mã lỗi: "
     },
+    "segmentsStillLoading": {
+        "message": "Phân đoạn vẫn đang tải..."
+    },
     "clearTimes": {
         "message": "Xóa các phân đoạn"
     },
@@ -112,8 +125,8 @@
     "closePopup": {
         "message": "Đóng bảng popup"
     },
-    "SubmitTimes": {
-        "message": "Gửi phân đoạn"
+    "sortSegments": {
+        "message": "Sắp xếp phân đoạn"
     },
     "submitCheck": {
         "message": "Bạn có chắc chắn muốn gửi không?"
@@ -149,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"
     },
@@ -289,6 +299,14 @@
         "message": "Gửi phân đoạn",
         "description": "Keybind label"
     },
+    "nextChapterKeybind": {
+        "message": "Chương tiếp",
+        "description": "Keybind label"
+    },
+    "previousChapterKeybind": {
+        "message": "Chương trước",
+        "description": "Keybind label"
+    },
     "keybindDescription": {
         "message": "Chọn một phím bằng cách nhập nó và chọn bất kỳ phím bổ trợ nào bạn muốn sử dụng."
     },
@@ -396,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ợ: "
     },
@@ -533,6 +547,10 @@
         "message": "đến",
         "description": "Used between segments. Example: 1:20 to 1:30"
     },
+    "CopiedExclamation": {
+        "message": "Đã sao chép!",
+        "description": "Used after something has been copied to the clipboard. Example: 'Copied!'"
+    },
     "generic_guideline2": {
         "message": "Chơi như thể không có gì bị bỏ qua"
     },
@@ -669,6 +687,9 @@
     "category_poi_highlight_guideline3": {
         "message": "Có thể bỏ qua để đến tiêu đề hoặc hình thu nhỏ"
     },
+    "category_chapter": {
+        "message": "Chương"
+    },
     "category_livestream_messages": {
         "message": "Luồng phát trực tiếp: Đọc Quyên góp/Tin nhắn"
     },
@@ -754,6 +775,10 @@
     "bracketEnd": {
         "message": "(Kết thúc)"
     },
+    "End": {
+        "message": "Kết thúc",
+        "description": "Button that skips to the end of a segment"
+    },
     "hiddenDueToDownvote": {
         "message": "đã ẩn: hạ bình chọn"
     },
@@ -791,6 +816,9 @@
     "downvoteDescription": {
         "message": "Chỉnh thời gian sai/không đúng"
     },
+    "incorrectVote": {
+        "message": "Sai"
+    },
     "incorrectCategory": {
         "message": "Đổi danh mục"
     },
@@ -941,6 +969,9 @@
     "hideSegment": {
         "message": "Ẩn phân đoạn"
     },
+    "skipSegment": {
+        "message": "Bỏ qua phân đoạn"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "Sử dụng con lăn chuột của bạn khi di chuột qua hộp chỉnh sửa để nhanh chóng điều chỉnh thời gian. Kết hợp phím ctrl hoặc shift có thể được sử dụng để tinh chỉnh các thay đổi."
     },
@@ -1003,5 +1034,24 @@
     },
     "confirmResetToDefault": {
         "message": "Bạn chắc chắn muốn đặt lại cài đặt về mặc định? Điều này sẽ không thể hoàn tác được."
+    },
+    "chooseACountry": {
+        "message": "Chọn một quốc gia"
+    },
+    "selectYourCountry": {
+        "message": "Chọn quốc gia"
+    },
+    "patreonSignIn": {
+        "message": "Đăng nhập bằng Patreon"
+    },
+    "joinOnPatreon": {
+        "message": "Đăng ký trên Patreon"
+    },
+    "enterLicenseKey": {
+        "message": "Nhập mã bản quyền"
+    },
+    "hideUnsubmittedSegments": {
+        "message": "Ẩn các phân đoạn",
+        "description": "Show/hide button for the unsubmitted segments list"
     }
 }

public/_locales/zh_CN/messages.json

@@ -116,6 +116,9 @@
     "connectionError": {
         "message": "连接错误。错误代码： "
     },
+    "segmentsStillLoading": {
+        "message": "片段仍在加载中..."
+    },
     "clearTimes": {
         "message": "清除片段"
     },
@@ -128,8 +131,11 @@
     "closeIcon": {
         "message": "关闭图标"
     },
-    "SubmitTimes": {
-        "message": "提交片段"
+    "OpenSubmissionMenu": {
+        "message": "打开提交菜单"
+    },
+    "sortSegments": {
+        "message": "排序片段"
     },
     "submitCheck": {
         "message": "您确定要提交它吗？"
@@ -165,9 +171,6 @@
     "clearTimesButton": {
         "message": "清除时间"
     },
-    "submitTimesButton": {
-        "message": "提交时间"
-    },
     "publicStats": {
         "message": "这被用于在公开统计页面上展示您的贡献。查看它"
     },
@@ -177,6 +180,9 @@
     "setUsername": {
         "message": "设定用户名"
     },
+    "copyPublicID": {
+        "message": "复制公开的用户ID"
+    },
     "copySegmentID": {
         "message": "复制片段 ID"
     },
@@ -198,6 +204,9 @@
     "hideButtonsDescription": {
         "message": "这将隐藏在 YouTube 播放器上提交赞助商广告的按钮。我了解这个东西打扰到了某些人。除了使用那个按钮，这个弹窗也可以用来提交赞助商广告。 要隐藏出现的通知，请使用通知中显示的写着 ”不再显示“ 的按钮。您可以在以后再次启用这些设置。"
     },
+    "showSkipButton": {
+        "message": "播放器显示跳至精华片段按钮"
+    },
     "showInfoButton": {
         "message": "在 Youtube 播放器上显示信息按钮"
     },
@@ -219,6 +228,18 @@
     "whatViewTracking": {
         "message": "此功能追踪您跳过了哪些片段，以让用户知道他们提交的信息帮助了多少人，并与点赞一同作为依据，来确保垃圾信息不会进入数据库。在您每次跳过片段时，此扩展都会向服务器发送一条消息。希望大部分人不要改变此设置，以使观看数字准确。:)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "在私人/隐身标签中启用跳过计数跟踪"
+    },
+    "enableTrackDownvotes": {
+        "message": "保存差评片段"
+    },
+    "whatTrackDownvotes": {
+        "message": "任何被你差评的片段，即使在刷新后也会保持隐藏"
+    },
+    "trackDownvotesWarning": {
+        "message": "警告：禁用此功能将删除所有先前保存的差评"
+    },
     "enableQueryByHashPrefix": {
         "message": "按哈希前缀查询"
     },
@@ -231,12 +252,36 @@
     "whatRefetchWhenNotFound": {
         "message": "如果视频是新的且没有发现可跳片段，将在您观看时每隔几分钟再次获取信息。"
     },
+    "enableShowCategoryWithoutPermission": {
+        "message": "在提交菜单中显示类别，即使没有提交权限"
+    },
+    "whatShowCategoryWithoutPermission": {
+        "message": "一些类别由于有最低信誉要求，需要得到许可才能提交"
+    },
     "showNotice": {
         "message": "重新显示通知"
     },
     "showSkipNotice": {
         "message": "在跳过片段后显示通知"
     },
+    "showCategoryGuidelines": {
+        "message": "显示类别帮助"
+    },
+    "noticeVisibilityMode0": {
+        "message": "全尺寸的跳过通知"
+    },
+    "noticeVisibilityMode1": {
+        "message": "缩小自动跳过的提醒"
+    },
+    "noticeVisibilityMode2": {
+        "message": "缩小所有的跳过提醒"
+    },
+    "noticeVisibilityMode3": {
+        "message": "减弱自动跳过的提醒"
+    },
+    "noticeVisibilityMode4": {
+        "message": "减弱所有的跳过提醒"
+    },
     "longDescription": {
         "message": "SponsorBlock 可帮您跳过 YouTube 视频中的赞助商广告、开场、结尾、订阅提醒和其他烦人片段。SponsorBlock 是一个众包的浏览器扩展，可以让任何人提交 YouTube 视频的赞助商广告和其他片段的开始和结束时间。若有一人提交了信息，其他所有使用此扩展的人都能直接跳过赞助商广告片段。您也可以跳过音乐视频中的非音乐部分。",
         "description": "Full description of the extension on the store pages."
@@ -257,6 +302,29 @@
         "message": "如果您依然不喜欢它，请按下不再显示按钮。",
         "description": "The second line of the message displayed after the notice was upgraded."
     },
+    "setSkipShortcut": {
+        "message": "跳过片段",
+        "description": "Keybind label"
+    },
+    "setStartSponsorShortcut": {
+        "message": "片段开始/停止",
+        "description": "Keybind label"
+    },
+    "setSubmitKeybind": {
+        "message": "提交片段",
+        "description": "Keybind label"
+    },
+    "nextChapterKeybind": {
+        "message": "下一章节",
+        "description": "Keybind label"
+    },
+    "previousChapterKeybind": {
+        "message": "上一章节",
+        "description": "Keybind label"
+    },
+    "keybindDescription": {
+        "message": "请按下想绑定的按键。如果您想使用组合快捷键，请勾选左侧的选项。"
+    },
     "0": {
         "message": "连接超时。请检查您的网络连接。如果您的网络运行正常，则可能是服务器过载或宕机。"
     },
@@ -289,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": "禁用自动跳过"
     },
@@ -333,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": "添加"
     },
@@ -366,9 +475,24 @@
     "minDurationDescription": {
         "message": "短于设定值的片段将不会被跳过或显示在播放器中。"
     },
+    "enableManualSkipOnFullVideo": {
+        "message": "当整个视频都是相同内容时使用手动跳过"
+    },
+    "whatManualSkipOnFullVideo": {
+        "message": "用于在观看整个视频都是赞助商广告或自我推广时不受打扰"
+    },
+    "skipNoticeDuration": {
+        "message": "跳过提醒持续时间（秒）："
+    },
+    "skipNoticeDurationDescription": {
+        "message": "跳过提醒将显示至少这么多秒。手动跳过的提醒可能会显示更久。"
+    },
     "shortCheck": {
         "message": "以下的提交短于您的最小持续时间选项。这代表它们可能已经被提交，只是由于该选项被忽略了。您确定要提交吗？"
     },
+    "liveOrPremiere": {
+        "message": "无法在进行中的直播或首播提交片段。请等待直播结束后刷新页面并确认片段仍然有效，再次提交。"
+    },
     "showUploadButton": {
         "message": "显示上传按钮"
     },
@@ -405,6 +529,9 @@
     "exportOptionsUpload": {
         "message": "从文件加载"
     },
+    "whatExportOptions": {
+        "message": "这是您所有设置的 JSON 格式。它包含了您的私人用户 ID ，所以您一定要谨慎的保管它。"
+    },
     "setOptions": {
         "message": "设定选项"
     },
@@ -445,7 +572,7 @@
         "message": "复制到剪贴板失败"
     },
     "copyDebugInformationOptions": {
-        "message": "复制信息到剪贴板，在提交错误或开发者需要时提供给他。 敏感信息如：您的用户ID，白名单频道和自定义服务器地址等已被删除。然而，它仍然包含诸如您的 useragent ，浏览器，操作系统和扩展版本号等信息。 "
+        "message": "复制信息到剪贴板，在提交错误或开发者需要时提供给他。 敏感信息如：您的用户ID，白名单频道和自定义服务器地址等已被删除。然而，它仍然包含诸如您的 useragent ，浏览器，操作系统和插件版本号等信息。 "
     },
     "copyDebugInformationComplete": {
         "message": "调试信息已复制到剪切板中。 您可以随意移除任何您不想分享的信息。请将其另存为 .txt 文件或粘贴到错误报告中。"
@@ -461,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": "赞助商广告"
     },
@@ -474,7 +607,7 @@
         "message": "捐赠或自制周边不属于此项"
     },
     "category_selfpromo": {
-        "message": "未收钱的/自我推销"
+        "message": "无偿的/自我推广"
     },
     "category_selfpromo_description": {
         "message": "类似于 “赞助商广告” ，但为无报酬或自我推广。包括有关商品、捐赠的部分或合作者的信息。"
@@ -482,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": "互动提醒"
     },
@@ -500,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": "音乐：非音乐部分"
     },
@@ -513,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": "直播：捐赠/消息阅读"
@@ -528,13 +767,46 @@
         "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"
+    },
+    "fullVideoLabelsOnThumbnails": {
+        "message": "在视频缩略图上也显示标签",
+        "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": "未提交颜色",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
     "seekBarColor": {
-        "message": "拖动条颜色"
+        "message": "进度条颜色"
     },
     "category": {
         "message": "类别"
@@ -565,24 +837,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": "跳过前强制进行频道检查"
     },
@@ -595,6 +890,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": "此视频的分类为音乐。 您确定其中包含赞助商广告吗？如果这是“非音乐片段”，请打开扩展选项并启用此类别。 之后，您可以以“非音乐”而不是赞助商广告类别提交此片段。如果您不太明白，请阅读指南。"
     },
@@ -612,9 +917,323 @@
         "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": "选择所在国家/地区"
+    },
+    "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": "输入注册码"
+    },
+    "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": "允許權限"
@@ -911,9 +926,6 @@
     "hideForever": {
         "message": "永久隱藏"
     },
-    "warningChatInfo": {
-        "message": "我們注意到你犯下了一些不帶有惡意的常見錯誤"
-    },
     "warningTitle": {
         "message": "你收到了一支警告"
     },
@@ -1025,6 +1037,12 @@
     "hideSegment": {
         "message": "隱藏片段"
     },
+    "skipSegment": {
+        "message": "略過片段"
+    },
+    "playChapter": {
+        "message": "播放章節"
+    },
     "SponsorTimeEditScrollNewFeature": {
         "message": "在滑鼠鼠標放在編輯框上時使用滾輪以快速調製時間。Ctrl和Shift可以用於精密調整"
     },
@@ -1091,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"
@@ -1111,15 +1132,11 @@
         "message": "你不能使用優惠"
     },
     "discountLink": {
-        "message": "優惠連結 (看粉色的價格)"
+        "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."
@@ -1139,9 +1156,6 @@
     "enterLicenseKey": {
         "message": "請輸入授權金鑰"
     },
-    "chaptersPage1": {
-        "message": "SponsorBlock 僅供有購買授權或在過去有貢獻者使用"
-    },
     "unsubmittedSegmentCounts": {
         "message": "你現在在 {1} 上有 {0}",
         "description": "Example: You currently have 12 unsubmitted segments on 5 videos"
@@ -1183,7 +1197,7 @@
         "description": "Show/hide button for the unsubmitted segments list"
     },
     "videoID": {
-        "message": "影片ID",
+        "message": "影片 ID",
         "description": "Header of the unsubmitted segments list"
     },
     "segmentCount": {
@@ -1196,5 +1210,8 @@
     },
     "exportSegmentsAsURL": {
         "message": "分享連結"
+    },
+    "allowScrollingToEdit": {
+        "message": "允許在編輯時滾動"
     }
 }

public/content.css

@@ -585,6 +585,7 @@ input::-webkit-inner-spin-button {
 	font-size: 14px;
 
 	-moz-appearance: textfield;
+	appearance: textfield;
 }
 
 .sponsorTimeEditInput {
@@ -802,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/libs/Source+Sans+Pro.css

@@ -3,7 +3,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -11,7 +11,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -19,7 +19,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -27,7 +27,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2) format('woff2');
   unicode-range: U+0370-03FF;
 }
 /* vietnamese */
@@ -35,7 +35,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -43,7 +43,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -51,7 +51,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -59,7 +59,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmhduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmhduz8A.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -67,7 +67,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwkxduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwkxduz8A.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -75,7 +75,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmxduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmxduz8A.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -83,7 +83,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2) format('woff2');
   unicode-range: U+0370-03FF;
 }
 /* vietnamese */
@@ -91,7 +91,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -99,7 +99,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -107,6 +107,6 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
+}

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>
@@ -277,6 +289,18 @@
 						</label>
 					</div>
 				</div>
+
+				<div data-type="toggle" data-sync="allowScrollingToEdit">
+					<div class="switch-container">
+						<label class="switch">
+							<input id="allowScrollingToEdit" type="checkbox" checked>
+							<span class="slider round"></span>
+						</label>
+						<label class="switch-label" for="allowScrollingToEdit">
+							__MSG_allowScrollingToEdit__
+						</label>
+					</div>
+				</div>
 	
 				<div data-type="toggle" data-sync="audioNotificationOnSkip">
 					<div class="switch-container">
@@ -430,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">
@@ -441,11 +465,11 @@
 						</label>
 					</div>
 	
-					<div class="small-description">(__MSG_supportedSites__ Invidious, CloudTube)</div>
+					<div class="small-description">(__MSG_supportedSites__ Invidious, CloudTube, Piped)</div>
 					<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,3 +1,204 @@
+@ajayyy/maze-utils
+1.1.7 <https://github.com/ajayyy/SponsorBlock>
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+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
 4.0.0 <https://github.com/lydell/js-tokens>
 The MIT License (MIT)
@@ -129,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

@@ -1,101 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-	<title>Upsell - SponsorBlock</title>
-	<meta charset="utf-8">
-
-	<link href="styles.css" rel="stylesheet" />
-
-	<script src="../js/vendor.js"></script>
-	<script src="../js/upsell.js"></script>
-</head>
-
-<body class="sponsorBlockPageBody">
-
-	<div id="title" class="titleBar">
-		<img src="../icons/LogoSponsorBlocker256px.png" height="80" class="profilepic" />
-		SponsorBlock
-	</div>
-
-	<br />
-
-	<div class="center">
-		<p>
-			__MSG_chaptersPage1__
-		</p>
-
-		<p class="smaller">
-			__MSG_chaptersPage2__
-		</p>
-	</div>
-
-	<div class="center">
-		<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/H_mP7bpbA_c?modestbranding=1&rel=0" title="Demo Video"
-			frameborder="0" allow="autoplay; clipboard-write; encrypted-media; picture-in-picture"
-			allowfullscreen>
-		</iframe>
-	</div>
-
-	
-
-	<br />
-
-	<div class="center row-item">
-		<a href="https://buy.ajay.app/l/sponsorblock" class="option-link side-by-side" target="_blank" rel="noreferrer">
-			<div id="oneTimePurchase" class="option-button inline">
-				__MSG_oneTimePurchase__
-			</div>
-		</a>
-
-		<a href="https://www.patreon.com/ajayyy" class="option-link side-by-side" target="_blank" rel="noreferrer">
-			<div class="option-button side-by-side inline">
-				__MSG_joinOnPatreon__
-			</div>
-		</a>
-	</div>
-
-	<div class="center row-item">
-		<input id="redeemCodeInput" class="option-text-box" type="text" placeholder="__MSG_enterLicenseKey__">
-		<div id="redeemButton" class="option-button inline">
-			__MSG_redeem__
-		</div>
-	</div>
-
-	<div class="center row-item">
-		<a href="https://www.patreon.com/oauth2/authorize?response_type=code&client_id=-W7ib8J-LB3jowb1fqE07A7RDUovy45_pOoWcjby6yr5upo6At8Jlg2BPhWDXO2k&redirect_uri=https%3A%2F%2Fsponsor.ajay.app%2Fapi%2FgenerateToken%2Fpatreon"
-			class="option-link" target="_blank" rel="noreferrer">
-			<div class="option-button inline">
-				__MSG_patreonSignIn__
-			</div>
-		</a>
-	</div>
-
-	<div class="center">
-		<p id="cantAfford" class="smaller no-margin">
-		</p>
-	</div>
-
-	<div class="center">
-		<p class="smaller no-margin">
-			__MSG_alreadyDonated__ sponsorblock-free@ajay.app
-		</p>
-	</div>
-
-	<div id="subsidizedPrice" class="center hidden">
-		__MSG_selectYourCountry__
-	</div>
-
-	<div id="subsidizedLink" class="center hidden">
-		<a href="https://buy.ajay.app/l/sponsorblock/purchasing-power" class="option-link" target="_blank"
-			rel="noreferrer">
-			<div class="option-button inline">
-				__MSG_discountLink__
-			</div>
-		</a>
-	</div>
-
-	<div id="noSubsidizedLink" class="center hidden">
-		__MSG_noDiscount__
-	</div>
-
-</body>

public/upsell/styles.css

@@ -1,397 +0,0 @@
-/* Based on options page CSS */
-html {
-    color-scheme: dark;
-}
-
-body {
-    font-family: sans-serif;
-}
-
-.center {
-    text-align: center;
-}
-
-.center p {
-    margin: auto;
-}
-
-.inline {
-    display: inline-block;
-}
-
-.bold {
-    font-weight: bold;
-}
-
-.hidden {
-    display: none !important;
-}
-
-.row-item {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.keybind-status {
-    display: inline;
-}
-
-.small-description {
-    color: white;
-    font-size: 13px;
-}
-
-.medium-description {
-    color: white;
-    font-size: 15px;
-}
-
-.option-text-box {
-    width: 300px;
-}
-
-.option-button {
-    cursor: pointer;
-
-    background-color: #c00000;
-    padding: 10px;
-    color: white;
-    border-radius: 5px;
-    font-size: 14px;
-
-    width: max-content;
-}
-
-.option-link {
-    text-decoration: none;
-}
-
-.option-link.side-by-side {
-    padding: 50px;
-}
-
-.option-button:hover {
-    background-color: #fc0303;
-}
-
-.option-button.disabled {
-    cursor: default;
-
-    background-color: #520000;
-    color: grey;
-}
-
-#options {
-    max-width: 60%;
-    text-align: left;
-    display: inline-block;
-}
-
-.switch-container:after {
-	content: attr(label-name);
-    position: absolute;
-    padding: 4px;
-    width: max-content;
-
-    font-size: 14px;
-    color: white;
-}
-
-.text-label-container {
-    font-size: 14px;
-    color: white;
-}
-
-.switch {
-    position: relative;
-    display: inline-block;
-    width: 40px;
-    height: 24px;
-}
-
-.switch input { 
-    opacity: 0;
-    width: 0;
-    height: 0;
-}
-
-.slider {
-    position: absolute;
-    cursor: pointer;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: #707070;
-}
-
-.animated * {
-    -webkit-transition: .4s;
-    transition: .4s;
-}
-
-.slider:before {
-    position: absolute;
-    content: "";
-    height: 16px;
-    width: 16px;
-    left: 4px;
-    bottom: 4px;
-    background-color: white;
-}
-
-.animated .slider:before {
-    -webkit-transition: .4s;
-    transition: .4s;
-}
-
-input:checked + .slider {
-    background-color: #fc0303;
-}
-
-input:checked + .slider:before {
-    -webkit-transform: translateX(16px);
-    -ms-transform: translateX(16px);
-    transform: translateX(16px);
-}
-
-/* Rounded sliders */
-.slider.round {
-    border-radius: 34px;
-}
-
-.slider.round:before {
-    border-radius: 50%;
-}
-
-
-/* Boilerplate CSS from https://ajay.app */
-
-body {
-    background-color: #333333;
-}
-
-.projectPreview {
-    position: relative;
-}
-
-.projectPreviewImage {
-    position: absolute;
-    left: -90px;
-    width: 80px;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-.projectPreviewImageLarge {
-    position: absolute;
-    left: -210px;
-    width: 200px;
-    top: 50%;
-    transform: translateY(-20%);
-}
-
-.projectPreviewImageLargeRight {
-    position: absolute;
-    right: -210px;
-    width: 200px;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-.createdBy {
-    font-size: 14px;
-    text-align: center;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
-    display: inline-block;
-}
-
-#title {
-    background-color: #636363;
-  
-    text-align: center;
-    vertical-align: middle;
-  
-    font-size: 50px;
-    color: #212121;
-  
-    padding: 20px;
-  
-    text-decoration: none;
-  
-    transition: font-size 1s;
-}
-
-.subtitle {
-    font-size: 40px;
-    color: #dad8d8;
-  
-    padding-top: 10px;
-  
-    transition: font-size 0.4s;
-}
-
-.subtitle:hover {
-    font-size: 45px;
-  
-    transition: font-size 0.4s;
-}
-
-.profilepic {
-    background-color: #636363 !important;
-    vertical-align: middle;
-}
-
-.profilepiccircle {
-    vertical-align: middle;
-    overflow: hidden;
-    border-radius: 50%;
-}
-
-a {
-    text-decoration: underline;
-    color: inherit;
-}
-
-.link {
-    padding: 20px;
-  
-    height: 80px;
-  
-    transition: height 0.2s;
-}
-
-.link:hover {
-    height: 95px;
-  
-    transition: height 0.2s;
-}
-
-#contact,.smalllink {
-    font-size: 25px;
-    color: #e8e8e8;
-  
-    text-align: center;
-  
-    padding: 10px;
-}
-
-#contact {
-    text-decoration: none;
-}
-
-p,li {
-    font-size: 20px;
-    color: #c4c4c4;
-  
-    padding: 10px;
-}
-
-.smaller {
-    font-size: 12px;
-    text-align: center;
-}
-
-.no-margin {
-    padding: 0;
-    margin: 0;
-}
-
-p,li,code,a {
-    max-width: 60%;
-    text-align: left;
-    overflow-wrap: break-word;
-}
-
-@media screen and (orientation:portrait) {
-    p,li,code,a {
-        max-width: 100%;
-    }
-  
-    .projectPreviewImage {
-        position: unset;
-        width: 130px;
-        display: block;
-        margin: auto;
-        transform: none;
-    }
-}
-
-.previewImage {
-    max-height: 200px;
-}
-
-img {
-    max-width: 100%;
-  
-    text-align: center;
-}
-
-#recentPostTitle {
-    font-size: 30px;
-    color: #dad8d8;
-}
-
-#recentPostDate {
-    font-size: 15px;
-    color: #dad8d8;
-}
-
-h1,h2,h3,h4,h5,h6 {
-    color: #dad8d8;
-}
-
-svg {
-    text-decoration: none; 
-}
-
-.number-container:before {
-    content: attr(label-name);
-    padding-right: 4px;
-    width: max-content;
-
-    font-size: 14px;
-    color: white;
-}
-
-/* React styles */
-
-.categoryTableElement {
-    font-size: 16px;
-
-    color: white;
-}
-
-.categoryTableElement > * {
-    padding-right: 15px;
-    padding-bottom: 15px;
-}
-
-.optionsSelector {
-    background-color: #c00000;
-    color: white;
-    
-    border: none;
-    font-size: 14px;
-    padding: 5px;
-    border-radius: 5px;
-}
-
-.categoryColorTextBox {
-    width: 60px;
-
-    background: none;
-    border: none;
-}
-
-#subsidizedPrice {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-#discountButton {
-    text-decoration: underline;
-    cursor: pointer;
-}

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) {
@@ -63,22 +38,9 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
         case "openHelp":
             chrome.tabs.create({url: chrome.runtime.getURL('help/index.html')});
             return false;
-        case "openUpsell":
-            chrome.tabs.create({url: chrome.runtime.getURL('upsell/index.html')});
-            return false;
         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 +103,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 +129,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 +143,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 +154,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 +185,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

@@ -43,7 +43,7 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
 
         return (
             <span style={style}
-                className={"sponsorBlockCategoryPill"} 
+                className={"sponsorBlockCategoryPill"}
                 aria-label={this.getTitleText()}
                 onClick={(e) => this.toggleOpen(e)}
                 onMouseEnter={() => this.openTooltip()}
@@ -104,8 +104,8 @@ class CategoryPillComponent extends React.Component<CategoryPillProps, CategoryP
             await stopAnimation();
 
             if (response.successType == 1 || (response.successType == -1 && response.statusCode == 429)) {
-                this.setState({ 
-                    open: false, 
+                this.setState({
+                    open: false,
                     show: type === 1
                 });
             } else if (response.statusCode !== 403) {
@@ -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 category == null ? null : `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 category == null ? null : `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/components/SponsorTimeEditComponent.tsx

@@ -6,10 +6,8 @@ import Utils from "../utils";
 import SubmissionNoticeComponent from "./SubmissionNoticeComponent";
 import { RectangleTooltip } from "../render/RectangleTooltip";
 import SelectorComponent, { SelectorOption } from "./SelectorComponent";
-import { GenericUtils } from "../utils/genericUtils";
-import { noRefreshFetchingChaptersAllowed } from "../utils/licenseKey";
 import { DEFAULT_CATEGORY } from "../utils/categoryUtils";
-
+import { getFormattedTime, getFormattedTimeToSeconds } from "@ajayyy/maze-utils/lib/formating";
 
 const utils = new Utils();
 
@@ -181,9 +179,9 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                     style={timeDisplayStyle}
                     className="sponsorTimeDisplay"
                     onClick={this.toggleEditTime.bind(this)}>
-                        {GenericUtils.getFormattedTime(segment[0], true) +
+                        {getFormattedTime(segment[0], true) +
                             ((!isNaN(segment[1]) && sponsorTime.actionType !== ActionType.Poi)
-                                ? " " + chrome.i18n.getMessage("to") + " " + GenericUtils.getFormattedTime(segment[1], true) : "")}
+                                ? " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(segment[1], true) : "")}
                 </div>
             );
         }
@@ -308,8 +306,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         const sponsorTimeEdits = this.state.sponsorTimeEdits;
         
         // check if change is small engough to show tooltip
-        const before = GenericUtils.getFormattedTimeToSeconds(sponsorTimeEdits[index]);
-        const after = GenericUtils.getFormattedTimeToSeconds(targetValue);
+        const before = getFormattedTimeToSeconds(sponsorTimeEdits[index]);
+        const after = getFormattedTimeToSeconds(targetValue);
         const difference = Math.abs(before - after);
         if (0 < difference && difference < 0.5) this.showScrollToEditToolTip();
 
@@ -320,6 +318,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
     }
 
     changeTimesWhenScrolling(index: number, e: React.WheelEvent, sponsorTime: SponsorTime): void {
+        if (!Config.config.allowScrollingToEdit) return;
         let step = 0;
         // shift + ctrl = 1
         // ctrl = 0.1
@@ -332,7 +331,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         }
         
         const sponsorTimeEdits = this.state.sponsorTimeEdits;
-        let timeAsNumber = GenericUtils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[index]);
+        let timeAsNumber = getFormattedTimeToSeconds(this.state.sponsorTimeEdits[index]);
         if (timeAsNumber !== null && e.deltaY != 0) {
             if (e.deltaY < 0) {
                 timeAsNumber += step;
@@ -342,7 +341,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
                 timeAsNumber = 0;
             }
             
-            sponsorTimeEdits[index] = GenericUtils.getFormattedTime(timeAsNumber, true);
+            sponsorTimeEdits[index] = getFormattedTime(timeAsNumber, true);
             if (sponsorTime.actionType === ActionType.Poi) sponsorTimeEdits[1] = sponsorTimeEdits[0];
 
             this.setState({sponsorTimeEdits});
@@ -420,7 +419,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
             // If permission not loaded, treat it like we have permission except chapter
             const defaultBlockCategories = ["chapter"];
             const permission = (Config.config.showCategoryWithoutPermission
-                || Config.config.permissions[category as Category]) && (category !== "chapter" || noRefreshFetchingChaptersAllowed());
+                || Config.config.permissions[category as Category]);
             if ((defaultBlockCategories.includes(category) 
                 || (permission !== undefined && !Config.config.showCategoryWithoutPermission)) && !permission) continue;
 
@@ -574,8 +573,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
     /** Returns an array in the sponsorTimeEdits form (formatted time string) from a normal seconds sponsor time */
     getFormattedSponsorTimesEdits(sponsorTime: SponsorTime): [string, string] {
-        return [GenericUtils.getFormattedTime(sponsorTime.segment[0], true),
-            GenericUtils.getFormattedTime(sponsorTime.segment[1], true)];
+        return [getFormattedTime(sponsorTime.segment[0], true),
+            getFormattedTime(sponsorTime.segment[1], true)];
     }
 
     saveEditTimes(): void {
@@ -583,8 +582,8 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         const category = this.categoryOptionRef.current.value as Category
 
         if (this.state.editing) {
-            const startTime = GenericUtils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[0]);
-            const endTime = GenericUtils.getFormattedTimeToSeconds(this.state.sponsorTimeEdits[1]);
+            const startTime = getFormattedTimeToSeconds(this.state.sponsorTimeEdits[0]);
+            const endTime = getFormattedTimeToSeconds(this.state.sponsorTimeEdits[1]);
 
             // Change segment time only if the format was correct
             if (startTime !== null && endTime !== null) {

src/components/options/CategorySkipOptionsComponent.tsx

@@ -6,8 +6,6 @@ import { Category, CategorySkipOption } from "../../types";
 
 import { getCategorySuffix } from "../../utils/categoryUtils";
 import ToggleOptionComponent from "./ToggleOptionComponent";
-import { fetchingChaptersAllowed } from "../../utils/licenseKey";
-import LockSvg from "../../svg-icons/lock_svg";
 
 export interface CategorySkipOptionsProps { 
     category: Category;
@@ -19,7 +17,6 @@ export interface CategorySkipOptionsProps {
 export interface CategorySkipOptionsState {
     color: string;
     previewColor: string;
-    hideChapter: boolean;
 }
 
 export interface ToggleOption {
@@ -37,29 +34,11 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
         // Setup state
         this.state = {
             color: props.defaultColor || Config.config.barTypes[this.props.category]?.color,
-            previewColor: props.defaultPreviewColor || Config.config.barTypes["preview-" + this.props.category]?.color,
-            hideChapter: true
+            previewColor: props.defaultPreviewColor || Config.config.barTypes["preview-" + this.props.category]?.color
         };
-
-        fetchingChaptersAllowed().then((allowed) => {
-            this.setState({
-                hideChapter: !allowed
-            });
-        });
     }
 
     render(): React.ReactElement {
-        if (this.state.hideChapter) {
-            // Ensure force update refreshes this
-            fetchingChaptersAllowed().then((allowed) => {
-                if (allowed) {
-                    this.setState({
-                        hideChapter: !allowed
-                    });
-                }
-            });
-        }
-
         let defaultOption = "disable";
         // Set the default opton properly
         for (const categorySelection of Config.config.categorySelections) {
@@ -80,20 +59,10 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
             }
         }
 
-        let extraClasses = "";
-        const disabled = this.props.category === "chapter" && this.state.hideChapter;
-        if (disabled) {
-            extraClasses += " disabled";
-
-            if (!Config.config.showUpsells) {
-                return <></>;
-            }
-        }
-
         return (
             <>
                 <tr id={this.props.category + "OptionsRow"}
-                    className={`categoryTableElement${extraClasses}`} >
+                    className={`categoryTableElement`} >
                     <td id={this.props.category + "OptionName"}
                         className="categoryTableLabel">
                             {chrome.i18n.getMessage("category_" + this.props.category)}
@@ -104,14 +73,9 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                         <select
                             className="optionsSelector"
                             defaultValue={defaultOption}
-                            disabled={disabled}
                             onChange={this.skipOptionSelected.bind(this)}>
                                 {this.getCategorySkipOptions()}
                         </select>
-
-                        {disabled &&
-                            <LockSvg className="upsellButton" onClick={() => chrome.tabs.create({url: chrome.runtime.getURL('upsell/index.html')})}/>
-                        }
                     </td>
 
                     {this.props.category !== "chapter" &&
@@ -120,7 +84,6 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                             <input
                                 className="categoryColorTextBox option-text-box"
                                 type="color"
-                                disabled={disabled}
                                 onChange={(event) => this.setColorState(event, false)}
                                 value={this.state.color} />
                         </td>
@@ -140,7 +103,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                 </tr>
 
                 <tr id={this.props.category + "DescriptionRow"}
-                    className={`small-description categoryTableDescription${extraClasses}`}>
+                    className={`small-description categoryTableDescription`}>
                         <td
                             colSpan={2}>
                             {chrome.i18n.getMessage("category_" + this.props.category + "_description")}
@@ -151,7 +114,7 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                         </td>
                 </tr>
                 
-                {this.getExtraOptionComponents(this.props.category, extraClasses, disabled)}
+                {this.getExtraOptionComponents(this.props.category)}
 
             </>
         );
@@ -235,16 +198,15 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
         }, 50);
     }
 
-    getExtraOptionComponents(category: string, extraClasses: string, disabled: boolean): JSX.Element[] {
+    getExtraOptionComponents(category: string): JSX.Element[] {
         const result = [];
         for (const option of this.getExtraOptions(category)) {
             result.push(
-                <tr key={option.configKey} className={extraClasses}>
+                <tr key={option.configKey}>
                     <td id={`${category}_${option.configKey}`} className="categoryExtraOptions">
                         <ToggleOptionComponent 
                             configKey={option.configKey} 
                             label={option.label}
-                            disabled={!option.dontDisable && disabled}
                             style={{width: "inherit"}}
                         />
                     </td>

src/components/options/KeybindDialogComponent.tsx

@@ -124,7 +124,7 @@ class KeybindDialogComponent extends React.Component<KeybindDialogProps, Keybind
         let youtubeShortcuts: Keybind[];
         if (/[a-zA-Z0-9,.+\-\][:]/.test(this.state.key.key)) {
             youtubeShortcuts = [{key: "k"}, {key: "j"}, {key: "l"}, {key: "p", shift: true}, {key: "n", shift: true}, {key: ","}, {key: "."}, {key: ",", shift: true}, {key: ".", shift: true},
-                {key: "ArrowRight"}, {key: "ArrowLeft"}, {key: "ArrowUp"}, {key: "ArrowDown"}, {key: "ArrowRight", ctrl: true}, {key: "ArrowLeft", ctrl: true}, {key: "c"}, {key: "o"},
+                {key: "ArrowRight"}, {key: "ArrowLeft"}, {key: "ArrowUp"}, {key: "ArrowDown"}, {key: "c"}, {key: "o"},
                 {key: "w"}, {key: "+"}, {key: "-"}, {key: "f"}, {key: "t"}, {key: "i"}, {key: "m"}, {key: "a"}, {key: "s"}, {key: "d"}, {key: "Home"}, {key: "End"},
                 {key: "0"}, {key: "1"}, {key: "2"}, {key: "3"}, {key: "4"}, {key: "5"}, {key: "6"}, {key: "7"}, {key: "8"}, {key: "9"}, {key: "]"}, {key: "["}];
         } else {

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;
@@ -69,6 +72,7 @@ interface SBConfig {
     showSegmentNameInChapterBar: boolean;
     useVirtualTime: boolean;
     showSegmentFailedToFetchWarning: boolean;
+    allowScrollingToEdit: boolean;
 
     // Used to cache calculated text color info
     categoryPillColors: {
@@ -120,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 */
@@ -128,338 +132,32 @@ 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,
-
-        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: "]", ctrl: true},
-        previousChapterKeybind: {key: "[", 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) {
+    if (!config["chapterCategoryAdded"]) {
+        config["chapterCategoryAdded"] = true;
+
+        if (!config.categorySelections.some((s) => s.name === "chapter")) {
+            config.categorySelections.push({
+                name: "chapter" as Category,
+                option: CategorySkipOption.ShowOverlay
+            });
+    
+            config.categorySelections = config.categorySelections;
+        }
+    }
+
     if (config["segmentTimes"]) {
         const unsubmittedSegments = {};
         for (const item of config["segmentTimes"]) {
@@ -469,15 +167,8 @@ function migrateOldSyncFormats(config: SBConfig) {
         chrome.storage.sync.remove("segmentTimes", () => config.unsubmittedSegments = unsubmittedSegments);
     }
 
-    if (!config["exclusive_accessCategoryAdded"] && !config.categorySelections.some((s) => s.name === "exclusive_access")) {
-        config["exclusive_accessCategoryAdded"] = true;
-
-        config.categorySelections.push({
-            name: "exclusive_access" as Category,
-            option: CategorySkipOption.ShowOverlay
-        });
-
-        config.categorySelections = config.categorySelections;
+    if (config["exclusive_accessCategoryAdded"] !== undefined) {
+        chrome.storage.sync.remove("exclusive_accessCategoryAdded");
     }
 
     if (config["fillerUpdate"] !== undefined) {
@@ -498,7 +189,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;
@@ -517,20 +208,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;
@@ -548,59 +239,206 @@ 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
+    }, {
+        name: "chapter" 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/help.ts

@@ -2,14 +2,14 @@ import Config from "./config";
 import { showDonationLink } from "./utils/configUtils";
 
 import { localizeHtmlPage } from "./utils/pageUtils";
-import { GenericUtils } from "./utils/genericUtils";
+import { waitFor } from "@ajayyy/maze-utils";
 
 window.addEventListener('DOMContentLoaded', init);
 
 async function init() {
     localizeHtmlPage();
 
-    await GenericUtils.wait(() => Config.config !== null);
+    await waitFor(() => Config.config !== null);
 
     if (!Config.config.darkMode) {
         document.documentElement.setAttribute("data-theme", "light");

src/js-components/previewBar.ts

@@ -10,8 +10,9 @@ import { ChapterVote } from "../render/ChapterVote";
 import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceType, SponsorTime } from "../types";
 import { partition } from "../utils/arrayUtils";
 import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
-import { GenericUtils } from "../utils/genericUtils";
-import { findValidElement } from "../utils/pageUtils";
+import { normalizeChapterName } from "../utils/exporter";
+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;
@@ -37,6 +38,10 @@ class PreviewBar {
     categoryTooltip?: HTMLDivElement;
     categoryTooltipContainer?: HTMLElement;
     chapterTooltip?: HTMLDivElement;
+    lastSmallestSegment: Record<string, {
+        index: number;
+        segment: PreviewBarSegment;
+    }> = {};
 
     parent: HTMLElement;
     onMobileYouTube: boolean;
@@ -57,6 +62,7 @@ class PreviewBar {
     originalChapterBar: HTMLElement;
     originalChapterBarBlocks: NodeListOf<HTMLElement>;
     chapterMargin: number;
+    lastRenderedSegments: PreviewBarSegment[];
     unfilteredChapterGroups: ChapterGroup[];
     chapterGroups: ChapterGroup[];
 
@@ -92,6 +98,7 @@ class PreviewBar {
         this.chapterTooltip.className = "ytp-tooltip-title sponsorCategoryTooltip";
 
         const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper");
+        const originalTooltip = tooltipTextWrapper.querySelector(".ytp-tooltip-title:not(.sponsorCategoryTooltip)") as HTMLElement;
         if (!tooltipTextWrapper || !tooltipTextWrapper.parentElement) return;
 
         // Grab the tooltip from the text wrapper as the tooltip doesn't have its classes on init
@@ -118,8 +125,8 @@ class PreviewBar {
         const observer = new MutationObserver((mutations) => {
             if (!mouseOnSeekBar || !this.categoryTooltip || !this.categoryTooltipContainer) return;
 
-            // If the mutation observed is only for our tooltip text, ignore
-            if (mutations.some((mutation) => (mutation.target as HTMLElement).classList.contains("sponsorCategoryTooltip"))) {
+            // Only care about mutations to time tooltip
+            if (!mutations.some((mutation) => (mutation.target as HTMLElement).classList.contains("ytp-tooltip-text"))) {
                 return;
             }
 
@@ -133,19 +140,23 @@ class PreviewBar {
                 const tooltipText = tooltipTextElement.textContent;
                 if (tooltipText === null || tooltipText.length === 0) continue;
 
-                timeInSeconds = GenericUtils.getFormattedTimeToSeconds(tooltipText);
+                timeInSeconds = getFormattedTimeToSeconds(tooltipText);
 
                 if (timeInSeconds !== null) break;
             }
 
-            if (timeInSeconds === null) return;
+            if (timeInSeconds === null) {
+                originalTooltip.style.removeProperty("display");
+
+                return;
+            }
 
             // Find the segment at that location, using the shortest if multiple found
-            const [normalSegments, chapterSegments] = 
-                partition(this.segments.filter((s) => s.source !== SponsorSourceType.YouTube), 
+            const [normalSegments, chapterSegments] =
+                partition(this.segments.filter((s) => s.source !== SponsorSourceType.YouTube),
                     (segment) => segment.actionType !== ActionType.Chapter);
-            let mainSegment = this.getSmallestSegment(timeInSeconds, normalSegments);
-            let secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments);
+            let mainSegment = this.getSmallestSegment(timeInSeconds, normalSegments, "normal");
+            let secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments, "chapter");
             if (mainSegment === null && secondarySegment !== null) {
                 mainSegment = secondarySegment;
                 secondarySegment = this.getSmallestSegment(timeInSeconds, chapterSegments.filter((s) => s !== secondarySegment));
@@ -153,6 +164,7 @@ class PreviewBar {
 
             if (mainSegment === null && secondarySegment === null) {
                 this.categoryTooltipContainer.classList.remove(TOOLTIP_VISIBLE_CLASS);
+                originalTooltip.style.removeProperty("display");
             } else {
                 this.categoryTooltipContainer.classList.add(TOOLTIP_VISIBLE_CLASS);
                 if (mainSegment !== null && secondarySegment !== null) {
@@ -164,6 +176,14 @@ class PreviewBar {
                 this.setTooltipTitle(mainSegment, this.categoryTooltip);
                 this.setTooltipTitle(secondarySegment, this.chapterTooltip);
 
+                if (normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.categoryTooltip.textContent)
+                        || normalizeChapterName(originalTooltip.textContent) === normalizeChapterName(this.chapterTooltip.textContent)) {
+                    if (originalTooltip.style.display !== "none") originalTooltip.style.display = "none";
+                    noYoutubeChapters = true;
+                } else if (originalTooltip.style.display === "none") {
+                    originalTooltip.style.removeProperty("display");
+                }
+
                 // Used to prevent overlapping
                 this.categoryTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
                 this.chapterTooltip.classList.toggle("ytp-tooltip-text-no-title", noYoutubeChapters);
@@ -171,6 +191,8 @@ class PreviewBar {
                 // To prevent offset issue
                 this.categoryTooltip.style.right = titleTooltip.style.right;
                 this.chapterTooltip.style.right = titleTooltip.style.right;
+                this.categoryTooltip.style.textAlign = titleTooltip.style.textAlign;
+                this.chapterTooltip.style.textAlign = titleTooltip.style.textAlign;
             }
         });
 
@@ -270,7 +292,7 @@ class PreviewBar {
         if (this.originalChapterBar) {
             this.originalChapterBarBlocks = this.originalChapterBar.querySelectorAll(":scope > div") as NodeListOf<HTMLElement>
             this.existingChapters = this.segments.filter((s) => s.source === SponsorSourceType.YouTube).sort((a, b) => a.segment[0] - b.segment[0]);
-        
+
             if (this.existingChapters?.length > 0) {
                 const margin = parseFloat(this.originalChapterBarBlocks?.[0]?.style?.marginRight?.replace("px", ""));
                 if (margin) this.chapterMargin = margin;
@@ -292,7 +314,7 @@ class PreviewBar {
         if (chapterChevron) {
             if (this.segments.some((segment) => segment.source === SponsorSourceType.YouTube)) {
                 chapterChevron.style.removeProperty("display");
-            } else {
+            } else if (this.segments) {
                 chapterChevron.style.display = "none";
             }
         }
@@ -309,18 +331,22 @@ 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";
         const duration = Math.min(segment[1], this.videoDuration) - segment[0];
+        const startTime = segment[1] ? Math.min(this.videoDuration, segment[0]) : segment[0];
+        const endTime = Math.min(this.videoDuration, segment[1]);
+        bar.style.left = this.timeToPercentage(startTime);
+
         if (duration > 0) {
-            bar.style.width = `calc(${this.intervalToPercentage(segment[0], segment[1])}${
-                this.chapterFilter(barSegment) && segment[1] < this.videoDuration ? ` - ${this.chapterMargin}px` : ''})`;
+            bar.style.right = this.timeToPercentage(this.videoDuration - endTime);
+        }
+        if (this.chapterFilter(barSegment) && segment[1] < this.videoDuration) {
+            bar.style.marginRight = `${this.chapterMargin}px`;
         }
-        
-        const time = segment[1] ? Math.min(this.videoDuration, segment[0]) : segment[0];
-        bar.style.left = this.timeToPercentage(time);
 
         return bar;
     }
@@ -335,12 +361,17 @@ class PreviewBar {
             return;
         }
 
-        // Merge overlapping chapters
-        this.unfilteredChapterGroups = this.createChapterRenderGroups(segments);
+        const remakingBar = segments !== this.lastRenderedSegments;
+        if (remakingBar) {
+            this.lastRenderedSegments = segments;
 
-        if (segments.every((segments) => segments.source === SponsorSourceType.YouTube) 
-            || (!Config.config.renderSegmentsAsChapters 
-                && segments.every((segment) => segment.actionType !== ActionType.Chapter 
+            // Merge overlapping chapters
+            this.unfilteredChapterGroups = this.createChapterRenderGroups(segments);
+        }
+
+        if (segments.every((segments) => segments.source === SponsorSourceType.YouTube)
+            || (!Config.config.renderSegmentsAsChapters
+                && segments.every((segment) => segment.actionType !== ActionType.Chapter
                     || segment.source === SponsorSourceType.YouTube))) {
             if (this.customChaptersBar) this.customChaptersBar.style.display = "none";
             this.originalChapterBar.style.removeProperty("display");
@@ -423,7 +454,9 @@ class PreviewBar {
             }
         }
 
-        this.updateChapterAllMutation(this.originalChapterBar, this.progressBar, true);
+        if (remakingBar) {
+            this.updateChapterAllMutation(this.originalChapterBar, this.progressBar, true);
+        }
     }
 
     createChapterRenderGroups(segments: PreviewBarSegment[]): ChapterGroup[] {
@@ -433,7 +466,7 @@ class PreviewBar {
             const latestChapter = result[result.length - 1];
             if (latestChapter && latestChapter.segment[1] > segment.segment[0]) {
                 const segmentDuration = segment.segment[1] - segment.segment[0];
-                if (segment.segment[0] < latestChapter.segment[0] 
+                if (segment.segment[0] < latestChapter.segment[0]
                         || segmentDuration < latestChapter.originalDuration) {
                     // Remove latest if it starts too late
                     let latestValidChapter = latestChapter;
@@ -581,6 +614,7 @@ class PreviewBar {
             for (const mutation of mutations) {
                 if (mutation.type === "childList") {
                     this.update();
+                    break;
                 }
             }
 
@@ -634,7 +668,7 @@ class PreviewBar {
                         if (changedData.scale !== null) {
                             const transformScale = (changedData.scale) / progressBar.clientWidth;
 
-                            customChangedElement.style.transform = 
+                            customChangedElement.style.transform =
                                 `scaleX(${Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft))}`;
                             if (firstUpdate) {
                                 customChangedElement.style.transition = "none";
@@ -651,7 +685,7 @@ class PreviewBar {
                 cursor += sectionWidthDecimal;
             }
 
-            if (sections.length !== 0 && sections.length !== this.existingChapters?.length 
+            if (sections.length !== 0 && sections.length !== this.existingChapters?.length
                     && Date.now() - this.lastChapterUpdate > 3000) {
                 this.lastChapterUpdate = Date.now();
                 this.updateExistingChapters();
@@ -659,7 +693,7 @@ class PreviewBar {
         }
     }
 
-    private findLeftAndScale(selector: string, currentElement: HTMLElement, progressBar: HTMLElement): 
+    private findLeftAndScale(selector: string, currentElement: HTMLElement, progressBar: HTMLElement):
             { left: number; scale: number } {
         const sections = currentElement.parentElement.parentElement.parentElement.children;
         let currentWidth = 0;
@@ -677,7 +711,7 @@ class PreviewBar {
             const section = sections[i] as HTMLElement;
             const checkElement = section.querySelector(selector) as HTMLElement;
             const currentSectionWidthNoMargin = this.getPartialChapterSectionStyle(section, "width") ?? progressBar.clientWidth;
-            const currentSectionWidth = currentSectionWidthNoMargin 
+            const currentSectionWidth = currentSectionWidthNoMargin
                 + this.getPartialChapterSectionStyle(section, "marginRight");
 
             // First check for left
@@ -720,8 +754,8 @@ class PreviewBar {
             currentWidth += lastWidth;
         }
 
-        return { 
-            left: left + leftPosition, 
+        return {
+            left: left + leftPosition,
             scale: scale !== null ? scale * scaleWidth + scalePosition : null
         };
     }
@@ -736,7 +770,7 @@ class PreviewBar {
     }
 
     updateChapterText(segments: SponsorTime[], submittingSegments: SponsorTime[], currentTime: number): SponsorTime[] {
-        if (!Config.config.showSegmentNameInChapterBar 
+        if (!Config.config.showSegmentNameInChapterBar
                 || ((!segments || segments.length <= 0) && submittingSegments?.length <= 0)) {
             const chaptersContainer = this.getChaptersContainer();
             const chapterButton = this.getChapterButton(chaptersContainer);
@@ -750,7 +784,7 @@ class PreviewBar {
         segments ??= [];
         if (submittingSegments?.length > 0) segments = segments.concat(submittingSegments);
         const activeSegments = segments.filter((segment) => {
-            return segment.hidden === SponsorHideType.Visible 
+            return segment.hidden === SponsorHideType.Visible
                 && segment.segment[0] <= currentTime && segment.segment[1] > currentTime
                 && segment.category !== DEFAULT_CATEGORY;
         });
@@ -784,7 +818,16 @@ class PreviewBar {
                 chapterButton.disabled = false;
 
                 const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;
-                chapterTitle.innerText = chosenSegment.description || shortCategoryName(chosenSegment.category);
+                chapterTitle.innerText = "";
+
+                const chapterCustomText = (chapterTitle.querySelector(".sponsorChapterText") || (() => {
+                    const elem = document.createElement("div");
+                    chapterTitle.appendChild(elem);
+                    elem.classList.add("sponsorChapterText");
+                    return elem;
+                })()) as HTMLDivElement;
+                chapterCustomText.innerText = chosenSegment.description || shortCategoryName(chosenSegment.category);
+
                 if (chosenSegment.actionType !== ActionType.Chapter) {
                     chapterTitle.classList.add("sponsorBlock-segment-title");
                 } else {
@@ -798,7 +841,7 @@ class PreviewBar {
                         if (oldVoteContainers.length > 0) {
                             oldVoteContainers.forEach((oldVoteContainer) => oldVoteContainer.remove());
                         }
-                        
+
                         chapterButton.insertBefore(chapterVoteContainer, this.getChapterChevron());
                     }
 
@@ -808,7 +851,13 @@ class PreviewBar {
                     this.chapterVote.setVisibility(false);
                 }
             } else {
-                chaptersContainer.style.display = "none";
+                chaptersContainer.querySelector(".sponsorChapterText")?.remove();
+                const chapterTitle = chaptersContainer.querySelector(".ytp-chapter-title-content") as HTMLDivElement;
+                if (chapterTitle.innerText === "") {
+                    chaptersContainer.style.display = "none";
+                } else {
+                    chaptersContainer.style.removeProperty("display");
+                }
                 this.chapterVote.setVisibility(false);
             }
         }
@@ -868,7 +917,7 @@ class PreviewBar {
             for (let i = 0; i < this.originalChapterBarBlocks.length; i++) {
                 const chapterElement = this.originalChapterBarBlocks[i];
                 const widthPixels = parseFloat(chapterElement.style.width.replace("px", ""));
-                
+
                 if (time >= this.existingChapters[i].segment[1]) {
                     const marginPixels = chapterElement.style.marginRight ? parseFloat(chapterElement.style.marginRight.replace("px", "")) : 0;
                     pixelOffset += widthPixels + marginPixels;
@@ -883,8 +932,8 @@ class PreviewBar {
             if (latestChapter) {
                 const latestWidth = parseFloat(this.originalChapterBarBlocks[lastCheckedChapter + 1].style.width.replace("px", ""));
                 const latestChapterDuration = latestChapter.segment[1] - latestChapter.segment[0];
-    
-                const percentageInCurrentChapter = (time - latestChapter.segment[0]) / latestChapterDuration; 
+
+                const percentageInCurrentChapter = (time - latestChapter.segment[0]) / latestChapterDuration;
                 const sizeOfCurrentChapter = latestWidth / totalPixels;
                 return Math.min(1, ((pixelOffset / totalPixels) + (percentageInCurrentChapter * sizeOfCurrentChapter)));
             }
@@ -900,11 +949,18 @@ class PreviewBar {
         return this.videoDuration * (showLarger ? 0.006 : 0.003);
     }
 
-    private getSmallestSegment(timeInSeconds: number, segments: PreviewBarSegment[]): PreviewBarSegment | null {
+    // Name parameter used for cache
+    private getSmallestSegment(timeInSeconds: number, segments: PreviewBarSegment[], name?: string): PreviewBarSegment | null {
+        const proposedIndex = name ? this.lastSmallestSegment[name]?.index : null;
+        const startSearchIndex = proposedIndex && segments[proposedIndex] === this.lastSmallestSegment[name].segment ? proposedIndex : 0;
+        const direction = startSearchIndex > 0 && timeInSeconds < this.lastSmallestSegment[name].segment.segment[0] ? -1 : 1;
+
         let segment: PreviewBarSegment | null = null;
+        let index = -1;
         let currentSegmentLength = Infinity;
 
-        for (const seg of segments) { //
+        for (let i = startSearchIndex; i < segments.length && i >= 0; i += direction) {
+            const seg = segments[i];
             const segmentLength = seg.segment[1] - seg.segment[0];
             const minSize = this.getMinimumSize(seg.showLarger);
 
@@ -914,8 +970,20 @@ class PreviewBar {
                 if (segmentLength < currentSegmentLength) {
                     currentSegmentLength = segmentLength;
                     segment = seg;
+                    index = i;
                 }
             }
+
+            if (direction === 1 && seg.segment[0] > timeInSeconds) {
+                break;
+            }
+        }
+
+        if (segment) {
+            this.lastSmallestSegment[name] = {
+                index: index,
+                segment: segment
+            };
         }
 
         return segment;

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,
@@ -26,7 +25,9 @@ import { shortCategoryName } from "./utils/categoryUtils";
 import { localizeHtmlPage } from "./utils/pageUtils";
 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();
 
@@ -230,7 +231,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) {
@@ -280,10 +281,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     }
 
     const values = ["userName", "viewCount", "minutesSaved", "vip", "permissions"];
-    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) {
@@ -315,13 +315,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
 
             Config.config.isVip = userInfo.vip;
             Config.config.permissions = userInfo.permissions;
-
-            if (userInfo.freeChaptersAccess) {
-                Config.config.payments.chaptersAllowed = userInfo.freeChaptersAccess;
-                Config.config.payments.freeAccess = userInfo.freeChaptersAccess;
-                Config.config.payments.lastCheck = Date.now();
-                Config.forceSyncUpdate("payments");
-            }
         }
     });
 
@@ -593,9 +586,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
             if (downloadedTimes[i].actionType === ActionType.Full) {
                 segmentTimeFromToNode.innerText = chrome.i18n.getMessage("full");
             } else {
-                segmentTimeFromToNode.innerText = GenericUtils.getFormattedTime(downloadedTimes[i].segment[0], true) +
+                segmentTimeFromToNode.innerText = getFormattedTime(downloadedTimes[i].segment[0], true) +
                         (actionType !== ActionType.Poi
-                            ? " " + chrome.i18n.getMessage("to") + " " + GenericUtils.getFormattedTime(downloadedTimes[i].segment[1], true)
+                            ? " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(downloadedTimes[i].segment[1], true)
                             : "");
             }
 

src/render/CategoryPill.tsx

@@ -4,17 +4,23 @@ import CategoryPillComponent, { CategoryPillState } from "../components/Category
 import Config from "../config";
 import { VoteResponse } from "../messageTypes";
 import { Category, SegmentUUID, SponsorTime } from "../types";
-import { GenericUtils } from "../utils/genericUtils";
 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();
@@ -22,45 +28,58 @@ 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 GenericUtils.wait(() => 
-                // New YouTube Title, YouTube, Mobile YouTube, Invidious
-                document.querySelector("#title h1, .ytd-video-primary-info-renderer.title, .slim-video-information-title, #player-container + .h-box > h1") as HTMLElement);
+            await waitFor(() => getYouTubeTitleNode());
 
         if (referenceNode && !referenceNode.contains(this.container)) {
-            this.container = document.createElement('span');
-            this.container.id = "categoryPill";
-            this.container.style.display = "relative";
+            if (!this.container) {
+                this.container = document.createElement('span');
+                this.container.id = id;
+                this.container.style.display = "relative";
 
-            referenceNode.prepend(this.container);
-            referenceNode.style.display = "flex";
+                this.root = createRoot(this.container);
+                this.ref = React.createRef();
+                this.root.render(<CategoryPillComponent ref={this.ref} vote={this.vote} />);
 
-            if (this.ref.current) {
-                this.unsavedState = this.ref.current.state;
-            }
-
-            this.root = createRoot(this.container);
-            this.root.render(<CategoryPillComponent ref={this.ref} vote={vote} />);
-
-            if (this.unsavedState) {
-                GenericUtils.wait(() => this.ref.current).then(() => {
-                    this.ref.current?.setState(this.unsavedState);
-                    this.unsavedState = null;
-                });
-            }
-
-            if (onMobileYouTube) {
-                if (this.mutationObserver) {
-                    this.mutationObserver.disconnect();
+                if (this.onMobileYouTube) {
+                    if (this.mutationObserver) {
+                        this.mutationObserver.disconnect();
+                    }
+                    
+                    this.mutationObserver = new MutationObserver((changes) => {
+                        if (changes.some((change) => change.removedNodes.length > 0)) {
+                            this.attachToPageInternal();
+                        }
+                    });
+    
+                    this.mutationObserver.observe(referenceNode, { 
+                        childList: true,
+                        subtree: true
+                    });
                 }
-                
-                this.mutationObserver = new MutationObserver(() => this.attachToPage(onMobileYouTube, onInvidious, vote));
+            }
 
-                this.mutationObserver.observe(referenceNode, { 
-                    childList: true,
-                    subtree: true
+            if (this.lastState) {
+                waitFor(() => this.ref.current).then(() => {
+                    this.ref.current?.setState(this.lastState);
                 });
             }
+
+            // 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,16 +106,13 @@ 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;
 
-                const watchDiv = await GenericUtils.wait(() => document.querySelector("#info.ytd-watch-flexy") as HTMLElement);
+                const watchDiv = await waitFor(() => document.querySelector("#info.ytd-watch-flexy") as HTMLElement);
                 if (watchDiv) {
                     new Tooltip({
                         text: chrome.i18n.getMessage("categoryPillNewFeature"),
@@ -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/upsell.ts

@@ -1,83 +0,0 @@
-import Config from "./config";
-import { checkLicenseKey } from "./utils/licenseKey";
-import { localizeHtmlPage } from "./utils/pageUtils";
-
-import * as countries from "../public/res/countries.json";
-import Utils from "./utils";
-import { Category, CategorySkipOption } from "./types";
-
-// This is needed, if Config is not imported before Utils, things break.
-// Probably due to cyclic dependencies
-Config.config;
-
-const utils = new Utils();
-
-window.addEventListener('DOMContentLoaded', init);
-
-async function init() {
-    localizeHtmlPage();
-
-    const cantAfford = document.getElementById("cantAfford");
-    const cantAffordTexts = chrome.i18n.getMessage("cantAfford").split(/{|}/);
-    cantAfford.appendChild(document.createTextNode(cantAffordTexts[0]));
-    const discountButton = document.createElement("span");
-    discountButton.id = "discountButton";
-    discountButton.innerText = cantAffordTexts[1];
-    cantAfford.appendChild(discountButton);
-    cantAfford.appendChild(document.createTextNode(cantAffordTexts[2]));
-
-    const redeemButton = document.getElementById("redeemButton") as HTMLInputElement;
-    const redeemInput = document.getElementById("redeemCodeInput") as HTMLInputElement;
-    redeemButton.addEventListener("click", async () => {
-        const licenseKey = redeemInput.value;
-
-        if (await checkLicenseKey(licenseKey)) {
-            Config.config.payments.licenseKey = licenseKey;
-            Config.forceSyncUpdate("payments");
-
-            if (!utils.getCategorySelection("chapter")) {
-                Config.config.categorySelections.push({
-                    name: "chapter" as Category,
-                    option: CategorySkipOption.ShowOverlay
-                });
-            }
-
-            alert(chrome.i18n.getMessage("redeemSuccess"));
-        } else {
-            alert(chrome.i18n.getMessage("redeemFailed"));
-        }
-    });
-
-    discountButton.addEventListener("click", async () => {
-        const subsidizedSection = document.getElementById("subsidizedPrice");
-        subsidizedSection.classList.remove("hidden");
-
-        const oldSelector = document.getElementById("countrySelector");
-        if (oldSelector) oldSelector.remove();
-        const countrySelector = document.createElement("select");
-        countrySelector.id = "countrySelector";
-        countrySelector.className = "optionsSelector";
-        const defaultOption = document.createElement("option");
-        defaultOption.innerText = chrome.i18n.getMessage("chooseACountry");
-        countrySelector.appendChild(defaultOption);
-
-        for (const country of Object.keys(countries)) {
-            const option = document.createElement("option");
-            option.value = country;
-            option.innerText = country;
-            countrySelector.appendChild(option);
-        }
-
-        countrySelector.addEventListener("change", () => {
-            if (countries[countrySelector.value]?.allowed) {
-                document.getElementById("subsidizedLink").classList.remove("hidden");
-                document.getElementById("noSubsidizedLink").classList.add("hidden");
-            } else {
-                document.getElementById("subsidizedLink").classList.add("hidden");
-                document.getElementById("noSubsidizedLink").classList.remove("hidden");
-            }
-        });
-
-        subsidizedSection.appendChild(countrySelector);
-    });
-}

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 { GenericUtils } from "./utils/genericUtils";
+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,94 +15,21 @@ export default class Utils {
 
     // Used to add content scripts and CSS required
     js = [
-        "./js/vendor.js",
         "./js/content.js"
     ];
     css = [
         "content.css",
         "./libs/Source+Sans+Pro.css",
-        "popup.css"
+        "popup.css",
+        "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;
     }
 
     async wait<T>(condition: () => T, timeout = 5000, check = 100): Promise<T> {
-        return GenericUtils.wait(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);
+        return waitFor(condition, timeout, check);
     }
 
     containsPermission(permissions: chrome.permissions.Permissions): Promise<boolean> {
@@ -117,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(),
@@ -143,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);
         }
     }
 
@@ -196,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"]);
         }
@@ -346,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);
     }
 
     /**
@@ -401,14 +297,15 @@ export default class Utils {
             "#player-container", // Preview on hover
             "#main-panel.ytmusic-player-page", // YouTube music
             "#player-container .video-js", // Invidious
-            ".main-video-section > .video-container" // Cloudtube  
+            ".main-video-section > .video-container", // Cloudtube
+            ".shaka-video-container" // Piped
         ];
 
         let referenceNode = findValidElementFromSelector(selectors)
         if (referenceNode == null) {
             //for embeds
             const player = document.getElementById("player");
-            referenceNode = player.firstChild as HTMLElement;
+            referenceNode = player?.firstChild as HTMLElement;
             if (referenceNode) {
                 let index = 1;
 
@@ -439,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 };
@@ -465,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,7 +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";
 
@@ -26,9 +27,9 @@ export function exportTimes(segments: SponsorTime[]): string {
 function exportTime(segment: SponsorTime): string {
     const name = segment.description || shortCategoryName(segment.category);
 
-    return `${GenericUtils.getFormattedTime(segment.segment[0], true)}${
+    return `${getFormattedTime(segment.segment[0], true)}${
         segment.segment[1] && segment.segment[0] !== segment.segment[1] 
-            ? ` - ${GenericUtils.getFormattedTime(segment.segment[1], true)}` : ""} ${name}`;
+            ? ` - ${getFormattedTime(segment.segment[1], true)}` : ""} ${name}`;
 }
 
 export function importTimes(data: string, videoDuration: number): SponsorTime[] {
@@ -37,25 +38,31 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
     for (const line of lines) {
         const match = line.match(/(?:((?:\d+:)?\d+:\d+)+(?:\.\d+)?)|(?:\d+(?=s| second))/g);
         if (match) {
-            const startTime = GenericUtils.getFormattedTimeToSeconds(match[0]);
+            const startTime = getFormattedTimeToSeconds(match[0]);
             if (startTime !== null) {
-                const specialCharsMatcher = /^(?:\s+seconds?)?[-:()\s]*|(?:\s+at)?[-:()\s]+$/g
-                const titleLeft = line.split(match[0])[0].replace(specialCharsMatcher, "");
+                // Remove "seconds", "at", special characters, and ")" if there was a "("
+                const specialCharMatchers = [{
+                    matcher: /^(?:\s+seconds?)?[-:()\s]*|(?:\s+at)?[-:(\s]+$/g
+                }, {
+                    matcher: /[-:()\s]*$/g,
+                    condition: (value) => !!value.match(/^\s*\(/)
+                }];
+                const titleLeft = removeIf(line.split(match[0])[0], specialCharMatchers);
                 let titleRight = null;
                 const split2 = line.split(match[1] || match[0]);
-                titleRight = split2[split2.length - 1].replace(specialCharsMatcher, "");
+                titleRight = removeIf(split2[split2.length - 1], specialCharMatchers)
 
                 const title = titleLeft?.length > titleRight?.length ? titleLeft : titleRight;
                 if (title) {
                     const determinedCategory = chapterNames.find(c => c.names.includes(title))?.code as Category;
 
                     const segment: SponsorTime = {
-                        segment: [startTime, GenericUtils.getFormattedTimeToSeconds(match[1])],
+                        segment: [startTime, getFormattedTimeToSeconds(match[1])],
                         category: determinedCategory ?? ("chapter" as Category),
                         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) {
@@ -75,6 +82,17 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
     return result;
 }
 
+function removeIf(value: string, matchers: Array<{ matcher: RegExp; condition?: (value: string) => boolean }>): string {
+    let result = value;
+    for (const matcher of matchers) {
+        if (!matcher.condition || matcher.condition(value)) {
+            result = result.replace(matcher.matcher, "");
+        }
+    }
+
+    return result;
+}
+
 export function exportTimesAsHashParam(segments: SponsorTime[]): string {
     const hashparamSegments = segments.map(segment => ({
         actionType: segment.actionType,
@@ -85,3 +103,8 @@ export function exportTimesAsHashParam(segments: SponsorTime[]): string {
 
     return `#segments=${JSON.stringify(hashparamSegments)}`;
 }
+
+
+export function normalizeChapterName(description: string): string {
+    return description.toLowerCase().replace(/\.|:|-/g, "").replace(/\s+/g, " ");
+}

src/utils/genericUtils.ts

@@ -1,70 +1,3 @@
-/** Function that can be used to wait for a condition before returning. */
-async function wait<T>(condition: () => T, timeout = 5000, check = 100, predicate?: (obj: T) => boolean): Promise<T> {
-    return await new Promise((resolve, reject) => {
-        setTimeout(() => {
-            clearInterval(interval);
-            reject("TIMEOUT");
-        }, timeout);
-
-        const intervalCheck = () => {
-            const result = condition();
-            if (predicate ? predicate(result) : result) {
-                resolve(result);
-                clearInterval(interval);
-            }
-        };
-
-        const interval = setInterval(intervalCheck, check);
-        
-        //run the check once first, this speeds it up a lot
-        intervalCheck();
-    });
-}
-
-function getFormattedTimeToSeconds(formatted: string): number | null {
-    const fragments = /^(?:(?:(\d+):)?(\d+):)?(\d*(?:[.,]\d+)?)$/.exec(formatted);
-
-    if (fragments === null) {
-        return null;
-    }
-
-    const hours = fragments[1] ? parseInt(fragments[1]) : 0;
-    const minutes = fragments[2] ? parseInt(fragments[2] || '0') : 0;
-    const seconds = fragments[3] ? parseFloat(fragments[3].replace(',', '.')) : 0;
-
-    return hours * 3600 + minutes * 60 + seconds;
-}
-
-function getFormattedTime(seconds: number, precise?: boolean): string {
-    seconds = Math.max(seconds, 0);
-    
-    const hours = Math.floor(seconds / 60 / 60);
-    const minutes = Math.floor(seconds / 60) % 60;
-    let minutesDisplay = String(minutes);
-    let secondsNum = seconds % 60;
-    if (!precise) {
-        secondsNum = Math.floor(secondsNum);
-    }
-
-    let secondsDisplay = String(precise ? secondsNum.toFixed(3) : secondsNum);
-    
-    if (secondsNum < 10) {
-        //add a zero
-        secondsDisplay = "0" + secondsDisplay;
-    }
-    if (hours && minutes < 10) {
-        //add a zero
-        minutesDisplay = "0" + minutesDisplay;
-    }
-    if (isNaN(hours) || isNaN(minutes)) {
-        return null;
-    }
-
-    const formatted = (hours ? hours + ":" : "") + minutesDisplay + ":" + secondsDisplay;
-
-    return formatted;
-}
-
 /**
  * Gets the error message in a nice string
  * 
@@ -116,44 +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 = {
-    wait,
-    getFormattedTime,
-    getFormattedTimeToSeconds,
     getErrorMessage,
     getLuminance,
-    generateUserID,
-    indexesOf,
-    objectToURI
+    indexesOf
 }

src/utils/licenseKey.ts

@@ -1,77 +0,0 @@
-import Config from "../config";
-import Utils from "../utils";
-import * as CompileConfig from "../../config.json";
-
-const utils = new Utils();
-
-export async function checkLicenseKey(licenseKey: string): Promise<boolean> {
-    const result = await utils.asyncRequestToServer("GET", "/api/verifyToken", {
-        licenseKey
-    });
-
-    try {
-        if (result.ok && JSON.parse(result.responseText).allowed) {
-            Config.config.payments.chaptersAllowed = true;
-            Config.config.showChapterInfoMessage = false;
-            Config.config.payments.lastCheck = Date.now();
-            Config.forceSyncUpdate("payments");
-
-            return true;
-        }
-    } catch (e) { } //eslint-disable-line no-empty
-
-    return false
-}
-
-/**
- * The other one also tried refreshing, so returns a promise
- */
-export function noRefreshFetchingChaptersAllowed(): boolean {
-    return Config.config.payments.chaptersAllowed || CompileConfig["freeChapterAccess"];
-}
-
-export async function fetchingChaptersAllowed(): Promise<boolean> {
-    if (Config.config.payments.freeAccess || CompileConfig["freeChapterAccess"]) {
-        return true;
-    }
-
-    //more than 14 days
-    if (Config.config.payments.licenseKey && Date.now() - Config.config.payments.lastCheck > 14 * 24 * 60 * 60 * 1000) {
-        const licensePromise = checkLicenseKey(Config.config.payments.licenseKey);
-
-        if (!Config.config.payments.chaptersAllowed) {
-            return licensePromise;
-        }
-    }
-
-    if (Config.config.payments.chaptersAllowed) return true;
-
-    if (Config.config.payments.lastCheck === 0 && Date.now() - Config.config.payments.lastFreeCheck > 2 * 24 * 60 * 60 * 1000) {
-        Config.config.payments.lastFreeCheck = Date.now();
-        Config.forceSyncUpdate("payments");
-
-        // 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)
-        });
-
-        try {
-            if (result.ok) {
-                const userInfo = JSON.parse(result.responseText);
-
-                Config.config.payments.lastCheck = Date.now();
-                if (userInfo.freeChaptersAccess) {
-                    Config.config.payments.freeAccess = true;
-                    Config.config.payments.chaptersAllowed = true;
-                    Config.config.showChapterInfoMessage = false;
-                    Config.forceSyncUpdate("payments");
-
-                    return true;
-                }
-            }
-        } catch (e) { } //eslint-disable-line no-empty
-    }
-
-    return false;
-}

src/utils/pageUtils.ts

@@ -1,5 +1,5 @@
 import { ActionType, Category, SponsorSourceType, SponsorTime, VideoID } from "../types";
-import { GenericUtils } from "./genericUtils";
+import { getFormattedTimeToSeconds } from "@ajayyy/maze-utils/lib/formating";
 
 export function getControls(): HTMLElement {
     const controlsSelectors = [
@@ -9,12 +9,14 @@ export function getControls(): HTMLElement {
         ".player-controls-top",
         // Invidious/videojs video element's controls element
         ".vjs-control-bar",
+        // Piped shaka player
+        ".shaka-bottom-controls"
     ];
 
     for (const controlsSelector of controlsSelectors) {
-        const controls = document.querySelectorAll(controlsSelector);
+        const controls = Array.from(document.querySelectorAll(controlsSelector)).filter(el => !isInPreviewPlayer(el));
 
-        if (controls && controls.length > 0) {
+        if (controls.length > 0) {
             return <HTMLElement> controls[controls.length - 1];
         }
     }
@@ -22,29 +24,14 @@ export function getControls(): HTMLElement {
     return null;
 }
 
+export function isInPreviewPlayer(element: Element): boolean {
+    return !!element.closest("#inline-preview-player");
+}
+
 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) {
@@ -68,6 +55,8 @@ export function getHashParams(): Record<string, unknown> {
 
 export function getExistingChapters(currentVideoID: VideoID, duration: number): SponsorTime[] {
     const chaptersBox = document.querySelector("ytd-macro-markers-list-renderer");
+    const title = document.querySelector("[target-id=engagement-panel-macro-markers-auto-chapters] #title-text");
+    if (title?.textContent?.includes("Key moment")) return [];
 
     const chapters: SponsorTime[] = [];
     // .ytp-timed-markers-container indicates that key-moments are present, which should not be divided
@@ -78,14 +67,14 @@ 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 = GenericUtils.getFormattedTimeToSeconds(timeElement.innerText);
+                const time = getFormattedTimeToSeconds(timeElement.innerText.replace(".", ":"));
                 if (time === null) return [];
-                
+
                 if (lastSegment) {
                     lastSegment.segment[1] = time;
                     chapters.push(lastSegment);
                 }
-                
+
                 lastSegment = {
                     segment: [time, null],
                     category: "chapter" as Category,
@@ -103,11 +92,6 @@ export function getExistingChapters(currentVideoID: VideoID, duration: number):
         }
     }
 
-    if (chapters[0] && chapters[0].segment[0] !== 0) {
-        // This is key moments instead of chapters, don't import as they are not full sections
-        return [];
-    }
-
     return chapters;
 }
 
@@ -132,4 +116,4 @@ export function getLocalizedMessage(text: string): string | false {
     } else {
         return false;
     }
-}
+}

src/utils/thumbnails.ts

@@ -0,0 +1,115 @@
+import { isOnInvidious, parseYouTubeVideoIDFromURL } from "@ajayyy/maze-utils/lib/video";
+import Config from "../config";
+import { getVideoLabel } from "./videoLabels";
+import { setThumbnailListener } from "@ajayyy/maze-utils/lib/thumbnailManagement";
+
+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 setupThumbnailListener(): void {
+    setThumbnailListener(labelThumbnails, () => {
+        insertSBIconDefinition();
+    }, () => Config.isReady());
+}

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/exporter.test.ts

@@ -275,4 +275,36 @@ describe("Import segments", () => {
             category: "chapter" as Category
         }]);
     });
+
+    it ("0:00 G¹ (Tangent Continuity)", () => {
+        const input = ` 0:00  G¹ (Tangent Continuity)
+                        0:01 G² (Tangent Continuity)`;
+
+        const result = importTimes(input, 8000);
+        expect(result).toMatchObject([{
+            segment: [0, 1],
+            description: "G¹ (Tangent Continuity)",
+            category: "chapter" as Category
+        }, {
+            segment: [1, 8000],
+            description: "G² (Tangent Continuity)",
+            category: "chapter" as Category
+        }]);
+    });
+
+    it ("((Some name) 1:20)", () => {
+        const input = ` ((Some name) 1:20)
+                        ((Some other name) 1:25)`;
+
+        const result = importTimes(input, 8000);
+        expect(result).toMatchObject([{
+            segment: [80, 85],
+            description: "Some name",
+            category: "chapter" as Category
+        }, {
+            segment: [85, 8000],
+            description: "Some other name",
+            category: "chapter" as Category
+        }]);
+    });
 });

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/configDiffPlugin.js

@@ -0,0 +1,66 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { readFile } = require("fs/promises")
+let logger;
+
+const readFileContents = (name) => readFile(name)
+  .then(data => JSON.parse(data))
+
+// partialDeepEquals from ajayyy/SponsorBlockServer
+function partialDeepEquals (actual, expected, logger) {
+  // loop over key, value of expected
+  let failed = false;
+  for (const [ key, value ] of Object.entries(expected)) {
+    if (key === "serverAddress" || key === "testingServerAddress" || key === "serverAddressComment" || key === "freeChapterAccess") continue
+    // if value is object, recurse
+    const actualValue = actual?.[key]
+    if (typeof value !== "string" && Array.isArray(value)) {
+      if (!arrayPartialDeepEquals(actualValue, value)) {
+        printActualExpected(key, actualValue, value, logger)
+        failed = true
+      }
+    } else if (typeof value === "object") {
+      if (partialDeepEquals(actualValue, value, logger)) {
+        console.log("obj failed")
+        printActualExpected(key, actualValue, value, logger)
+        failed = true
+      }
+    } else if (actualValue !== value) {
+      printActualExpected(key, actualValue, value, logger)
+      failed = true
+    }
+  }
+  return failed
+}
+
+const arrayPartialDeepEquals = (actual, expected) =>
+  expected.every(a => actual?.includes(a))
+
+function printActualExpected(key, actual, expected, logger) {
+  logger.error(`Differing value for: ${key}`)
+  logger.error(`Actual: ${JSON.stringify(actual)}`)
+  logger.error(`Expected: ${JSON.stringify(expected)}`)
+}
+
+class configDiffPlugin {
+  apply(compiler) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    compiler.hooks.done.tapAsync("configDiffPlugin", async (stats, callback) => {
+      logger = compiler.getInfrastructureLogger('configDiffPlugin')
+      logger.log('Checking for config.json diff...')
+      
+      // check example
+      const exampleConfig = await readFileContents("./config.json.example")
+      const currentConfig = await readFileContents("./config.json")
+
+      const difference = partialDeepEquals(currentConfig, exampleConfig, logger)
+      if (difference) {
+        logger.warn("config.json is missing values from config.json.example")
+      } else {
+        logger.info("config.json is not missing any values from config.json.example")
+      }
+      callback()
+    })
+  }
+}
+
+module.exports = configDiffPlugin;

webpack/webpack.common.js

@@ -7,6 +7,7 @@ const BuildManifest = require('./webpack.manifest');
 const srcDir = '../src/';
 const fs = require("fs");
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const configDiffPlugin = require('./configDiffPlugin');
 
 const edgeLanguages = [
     "de",
@@ -24,98 +25,165 @@ 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: 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'),
+        },
+        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
-        })
-    ]
-});
+        },
+        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");