Merge pull request #805 from ajayyy/unlisted-hotfix

Unlisted hotfix

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: ajayyy
+custom: [sponsor.ajay.app/donate]

.github/pull_request_template.md

@@ -1 +1,5 @@
 - [ ] I agree to license my contribution under LGPL-3.0 **or** my contribution is from another project with a license compatible with LGPL-3.0
+
+To test this pull request, follow the [instructions in the wiki](https://github.com/ajayyy/SponsorBlock/wiki/Testing-a-Pull-Request).
+
+***

LICENSE

@@ -1,679 +1,165 @@
-SponsorBlock Copyright (C) 2019  Ajay Ramachandran and other SponsorBlock contributors.
-
-Please refer to the license below.
-                   
-                     GNU GENERAL PUBLIC LICENSE
+                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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.
 
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
- 
-    <program>  Copyright (C) <year>  <name of author>
-    
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+  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.

README.md

@@ -52,7 +52,7 @@ The backend server code is available here: https://github.com/ajayyy/SponsorBloc
 
 To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database ([License](https://github.com/ajayyy/SponsorBlock/wiki/Database-and-API-License)). If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information.
 
-The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock).
+The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/3rd-Party-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock).
 
 # API
 
@@ -75,6 +75,8 @@ The result is in `dist`. This can be loaded as an unpacked extension
 Run `npm run dev` to run the extension using a clean browser profile with hot reloading. Use `npm run dev:firefox` for Firefox. This uses [`web-ext run`](https://extensionworkshop.com/documentation/develop/web-ext-command-reference/#commands).  
 Known chromium bug: Extension is not loaded properly on first start. Visit `chrome://extensions/` and reload the extension.
 
+For Firefox for Android, use `npm run dev:firefox-android -- --adb-device <ip-address of the device>`. See the [Firefox documentation](https://extensionworkshop.com/documentation/develop/developing-extensions-for-firefox-for-android/#debug-your-extension) for more information.
+
 ### Attribution Generation
 
 If you contribute and add a dependency, update the attribution file using the following steps:
@@ -88,7 +90,7 @@ mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt
 
 # Credit
 
-The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used.
+The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used, and the server is now using [NewLeaf](https://git.sr.ht/~cadence/NewLeaf) as a to get video info from YouTube.
 
 Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but very little code remains.
 
@@ -100,4 +102,4 @@ Icons made by:
 
 ### License
 
-This project is licensed under GNU GPL v3 or any later version
+This project is licensed under GNU LGPL v3 or any later version

config.json.example

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

manifest/manifest.json

@@ -1,7 +1,8 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "2.0.16",
+    "version": "2.1.0.2",
+    "version": "2.1.1",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "content_scripts": [{
@@ -29,6 +30,7 @@
         "icons/PlayerUploadIconSponsorBlocker.svg",
         "icons/PlayerUploadFailedIconSponsorBlocker.svg",
         "icons/PlayerCancelSegmentIconSponsorBlocker.svg",
+        "icons/clipboard.svg",
         "icons/settings.svg",
         "icons/pencil.svg",
         "icons/check.svg",
@@ -67,7 +69,9 @@
         "32": "icons/IconSponsorBlocker32px.png",
         "64": "icons/LogoSponsorBlocker64px.png",
         "128": "icons/LogoSponsorBlocker128px.png",
-        "256": "icons/LogoSponsorBlocker256px.png"
+        "256": "icons/LogoSponsorBlocker256px.png",
+        "512": "icons/LogoSponsorBlocker512px.png",
+        "1024": "icons/LogoSponsorBlocker1024px.png"
     },
     "options_ui": {
         "page": "options/options.html",

package-lock.json

@@ -12463,9 +12463,9 @@
       }
     },
     "normalize-url": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-      "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
       "dev": true
     },
     "npm-run-path": {

package.json

@@ -38,6 +38,7 @@
     "web-run": "npm run web-run:chrome",
     "web-sign": "web-ext sign -s dist",
     "web-run:firefox": "cd dist && web-ext run --start-url https://addons.mozilla.org/firefox/addon/ublock-origin/",
+    "web-run:firefox-android": "cd dist && web-ext run -t firefox-android --firefox-apk org.mozilla.fenix",
     "web-run:chrome": "cd dist && web-ext run --start-url https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm -t chromium",
     "build": "npm run build:chrome",
     "build:chrome": "webpack --env.browser=chrome --config webpack/webpack.prod.js",
@@ -50,6 +51,7 @@
     "build:watch:firefox": "webpack --env.browser=firefox --config webpack/webpack.dev.js --watch",
     "dev": "npm run build:dev && concurrently \"npm run web-run\" \"npm run build:watch\"",
     "dev:firefox": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"",
+    "dev:firefox-android": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox-android\" \"npm run build:watch:firefox\"",
     "clean": "rimraf dist",
     "test": "npx jest",
     "lint": "eslint src",

public/_locales/cs/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Tato vlastnost sleduje, jaké segmenty jste přeskočili, abychom dali uživatelům vědět, jak moc jejich příspěvek pomohl ostatním a může být použita jako sledování společně s hlasy pro zajištění, že se spam nedostane do databáze. Toto rozšíření posílá zprávu serveru pokaždé když přeskočíte segment. Doufejme, že si moc lidí nezmění toto nastavení, aby byla zobrazená čísla přesná. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Povolit sledování počtu přeskočení v soukromých/anonymních oknech"
+    },
     "enableQueryByHashPrefix": {
         "message": "Dotaz podle hash předpony"
     },
@@ -239,7 +242,7 @@
         "message": "Nastavit klíč pro přeskočení segmentu"
     },
     "setStartSponsorShortcut": {
-        "message": "Nastavte klávesu pro spuštění segmentu"
+        "message": "Nastavte klávesu pro spuštění/zastavení segmentu"
     },
     "setSubmitKeybind": {
         "message": "Nastavte klávesu pro odeslání"
@@ -583,7 +586,8 @@
         "message": "skryté: moc krátké"
     },
     "channelDataNotFound": {
-        "message": "ID kanálu ještě nebylo načteno."
+        "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álu ještě není načteno. Pokud používáte vložené video, zkuste místo toho použít domovskou stránku YouTube. Toto může být také způsobeno změnami v rozložení YouTube, pokud si myslíte, že tomu tak bude, zanechte zde komentář:"
     },
     "videoInfoFetchFailed": {
         "message": "Vypadá to, že něco blokuje schopnost SponsorBlocku získat údaje o videu. Pro více informací prosím navštivte https://github.com/ajayyy/SponsorBlock/issues/741."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Pokud vám tento problém nepůjde vyřešit, vypněte nastavení 'Vynutit kontrolu kanálu před přeskočením', protože SponsorBlock nemůže zjistit informace o kanálu"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Pokud k tomu stále dochází, může to být způsobeno vaším adblockerem. Podívejte se prosím https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Vynutit kontrolu kanálu před přeskočením"
     },

public/_locales/de/messages.json

@@ -32,7 +32,7 @@
         "message": "Melden"
     },
     "reportButtonInfo": {
-        "message": "Diese Einreichung als falsch melden"
+        "message": "Diesen Beitrag als falsch melden."
     },
     "Dismiss": {
         "message": "Abbrechen"
@@ -59,16 +59,16 @@
         "message": "Timer angehalten"
     },
     "confirmMSG": {
-        "message": "Um einzelne Werte zu löschen oder zu ändern, klicke auf den Info-Knopf, oder öffne die Erweiterungs-Übersicht, indem du das Erweiterungssymbol in der Ecke oben rechts anklickst."
+        "message": "Um einzelne Werte zu löschen oder zu ändern, klicke auf den Info-Knopf oder öffne die Erweiterungsübersicht, indem du das Erweiterungssymbol in der Ecke oben rechts anklickst."
     },
     "clearThis": {
         "message": "Bist du sicher, dass du Folgendes löschen möchtest?\n\n"
     },
     "Unknown": {
-        "message": "Deine Einreichung konnte nicht übertragen werden, bitte versuche es später erneut."
+        "message": "Dein Beitrag konnte nicht übertragen werden, bitte versuche es später erneut."
     },
     "sponsorFound": {
-        "message": "In der Datenbank wurden überspringbare Segmente für dieses Video gefunden!"
+        "message": "Die Datenbank enthält überspringbare Segmente für dieses Video!"
     },
     "sponsor404": {
         "message": "Keine Segmente gefunden"
@@ -79,6 +79,9 @@
     "sponsorEnd": {
         "message": "Segment endet jetzt"
     },
+    "sponsorCancel": {
+        "message": "Segmenterstellung abbrechen"
+    },
     "noVideoID": {
         "message": "Kein YouTube-Video gefunden.\nWenn dies falsch ist, aktualisiere den Tab."
     },
@@ -107,7 +110,7 @@
         "message": "Pop-up schließen"
     },
     "SubmitTimes": {
-        "message": "Segmente übermitteln"
+        "message": "Senden"
     },
     "submitCheck": {
         "message": "Bist du sicher, dass du dies übermitteln willst?"
@@ -138,7 +141,7 @@
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
-        "message": "Tipp: Du kannst Tastenkombinationen für das Senden in den Optionen festlegen"
+        "message": "Tipp: Du kannst Tastenkombinationen in den Optionen festlegen"
     },
     "clearTimesButton": {
         "message": "Zeiten löschen"
@@ -192,7 +195,7 @@
         "message": "Dieser Knopf im YouTube-Videoplayer löscht alle nicht übermittelten Segmente für das aktuelle Video."
     },
     "enableViewTracking": {
-        "message": "Aktiviere das Mitzählen übersprungener Segmente"
+        "message": "Aktiviere das Zählen übersprungener Segmente"
     },
     "whatViewTracking": {
         "message": "Diese Funktion verfolgt welche Segmente du übersprungen hast, um andere Benutzer wissen zu lassen, wie sehr ihre Einreichung anderen geholfen hat, sowie um als Metrik zusammen mit positiven Bewertungen sicherzustellen, dass kein Spam in die Datenbank gelangt. Die Erweiterung sendet jedes Mal, wenn du ein Segment überspringst, eine Nachricht an den Server. Hoffentlich ändern die meisten Leute diese Einstellung nicht, so dass die Zahlen korrekt sind. :)"
@@ -210,7 +213,7 @@
         "message": "Wenn das Video neu ist und keine Segmente gefunden wurden, wird während des Betrachtens alle paar Minuten erneut eine Anfrage gesendet."
     },
     "showNotice": {
-        "message": "Benachrichtigung wieder zeigen"
+        "message": "Hinweis erneut anzeigen"
     },
     "longDescription": {
         "message": "SponsorBlock lässt dich gesponserte Videosegmente, Intros, Outros, Interaktions-Erinnerungen, Musikvideoteile ohne Musik und andere nervige Teile von YouTube-Videos überspringen. SponsorBlock ist eine crowdsourced Browser-Erweiterung, in der jeder die Start- und Endzeit gesponserter Videosegmente und anderer Segmente von YouTube-Videos einreicht. Sobald eine Person diese Informationen einreicht, überspringen alle anderen mit dieser Erweiterung das gesponserte Segment.",
@@ -229,14 +232,14 @@
         "description": "The first line of the message displayed after the notice was upgraded."
     },
     "noticeUpdate2": {
-        "message": "Gefällt dir immer noch nicht? Dann klicke auf den Verstecken-Knopf.",
+        "message": "Falls es dir trotzdem nicht gefällt, drücke auf \"Verstecken\".",
         "description": "The second line of the message displayed after the notice was upgraded."
     },
     "setSkipShortcut": {
         "message": "Taste zum Überspringen eines Segments festlegen"
     },
     "setStartSponsorShortcut": {
-        "message": "Taste für das Starten eines Segments festlegen"
+        "message": "Taste für das Starten/Stoppen eines Segments festlegen"
     },
     "setSubmitKeybind": {
         "message": "Taste für das Einsenden festlegen"
@@ -321,7 +324,7 @@
         "message": "Du kannst den Serverstatus auf https://status.sponsor.ajay.app überprüfen."
     },
     "changeUserID": {
-        "message": "Interne Benutzer-ID importieren/exportieren"
+        "message": "Benutzer-ID importieren/exportieren"
     },
     "whatChangeUserID": {
         "message": "Halte diese ID geheim. Sie ist dazu in der Lage dich eindeutig zu identifizieren und sollte mit niemanden geteilt werden."
@@ -472,7 +475,7 @@
         "message": "Gesponserte Videosegmente"
     },
     "category_sponsor_description": {
-        "message": "Bezahlte Promotion, bezahlte Empfehlungen und direkte Werbung. Nicht für Selbstpromotion oder kostenlose Shoutouts an Anlässe/Personen/Webseiten/Produkte."
+        "message": "Bezahlte Werbung, bezahlte Empfehlungen und direkte Werbung, nicht für Eigenwerbung, kostenlose Fremdwerbung oder Empfehlungen für Anlässe/Personen/Webseiten/Produkte."
     },
     "category_intro": {
         "message": "Unterbrechung/Intro-Animation"
@@ -580,25 +583,26 @@
         "message": "Ausgeblendet: zu kurz"
     },
     "channelDataNotFound": {
-        "message": "Kanal-ID wurde noch nicht geladen."
+        "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": "Kanal-ID ist noch nicht geladen. Falls es sich um ein eingebettetes Video handelt, probiere stattdessen die YouTube-Homepage. Dies könnte auch durch Änderungen im YouTube-Layout verursacht werden. Sollte das der Fall sein, kannst du es hier vermerken:"
+    },
+    "videoInfoFetchFailed": {
+        "message": "Etwas hält SponsorBlock davon ab, die Videodaten abzurufen. Eine mögliche Ursache sind Adblocker. Für weitere Informationen besuche: https://github.com/ajayyy/SponsorBlock/issues/741."
     },
     "youtubePermissionRequest": {
-        "message": "Es scheint, dass SponsorBlock nicht in der Lage ist, die YouTube-API zu erreichen. Um dies zu beheben, akzeptieren Sie die Berechtigungsanfrage, die gleich erscheint; Warten Sie ein paar Sekunden, und laden Sie die Seite neu."
+        "message": "Anscheinend kann SponsorBlock die YouTube-API nicht erreichen. Um dies zu beheben, akzeptiere die nun folgende Berechtigungsanfrage, warte kurz, und lade dann die Seite neu."
     },
     "acceptPermission": {
-        "message": "Berechtigung akzeptieren"
+        "message": "Berechtigung erteilen"
     },
     "permissionRequestSuccess": {
         "message": "Die Berechtigungsanfrage war erfolgreich!"
     },
     "permissionRequestFailed": {
-        "message": "Berechtigungsanfrage fehlgeschlagen, haben Sie \"Ablehnen\" angeklickt?"
+        "message": "Berechtigungsanfrage fehlgeschlagen, hast du sie abgelehnt?"
     },
     "adblockerIssueWhitelist": {
-        "message": "Wenn Sie dies nicht lösen können, deaktivieren Sie die Einstellung 'Kanalprüfung vor dem Überspringen von Segmenten erzwingen', da SponsorBlock nicht in der Lage ist, die Sichtbarkeit für dieses Video abzurufen."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Falls dies weiterhin geschieht, könnte dies durch einen Werbeblocker verursacht werden. Mehr Infos: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+        "message": "Falls du dies nicht beheben kannst, deaktiviere die Einstellung 'Kanalprüfung vor dem Überspringen von Segmenten erzwingen', da SponsorBlock nicht in der Lage ist die Kanal-Informationen für dieses Video abzurufen"
     },
     "forceChannelCheck": {
         "message": "Kanalprüfung vor dem Überspringen von Segmenten erzwingen"

public/_locales/en/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "This feature tracks which segments you have skipped to let users know how much their submission has helped others and used as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message to the server each time you skip a segment. Hopefully most people don't change this setting so that the view numbers are accurate. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Enable Skip Count Tracking In Private/Incognito tabs"
+    },
     "enableQueryByHashPrefix": {
         "message": "Query By Hash Prefix"
     },
@@ -239,7 +242,7 @@
         "message": "Set key for skipping a segment"
     },
     "setStartSponsorShortcut": {
-        "message": "Set key for start segment keybind"
+        "message": "Set key for start/stop segment keybind"
     },
     "setSubmitKeybind": {
         "message": "Set key for submission keybind"
@@ -347,20 +350,24 @@
     "keybindCurrentlySet": {
         "message": ". It is currently set to:"
     },
-    "supportInvidious": {
-        "message": "Support Invidious"
+    "supportOtherSites": {
+        "message": "Support 3rd Party YouTube-Sites"
     },
-    "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) is a third party YouTube client. To enable support, you must accept the extra permissions. This does NOT work in incognito on Chrome and other Chromium variants."
+    "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.",
+        "description": "This replaces the 'supports Invidious' option because it now works on other YouTube sites such as Cloudtube"
+    },
+    "supportedSites": {
+        "message": "Supported Sites: "
     },
     "optionsInfo": {
         "message": "Enable Invidious support, disable autoskip, hide buttons and more."
     },
     "addInvidiousInstance": {
-        "message": "Add Invidious Instance"
+        "message": "Add 3rd-Party Client Instance"
     },
     "addInvidiousInstanceDescription": {
-        "message": "Add a custom instance of Invidious. This must be formatted with JUST the domain. Example: invidious.ajay.app"
+        "message": "Add a custom instance. This must be formatted with JUST the domain. Example: invidious.ajay.app"
     },
     "add": {
         "message": "Add"
@@ -443,6 +450,9 @@
     "preview": {
         "message": "Preview"
     },
+    "unsubmitted": {
+        "message": "Unsubmitted"
+    },
     "inspect": {
         "message": "Inspect"
     },
@@ -477,6 +487,21 @@
     "category_sponsor_description": {
         "message": "Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shoutouts to causes/creators/websites/products they like."
     },
+    "category_selfpromo": {
+        "message": "Unpaid/Self Promotion"
+    },
+    "category_selfpromo_description": {
+        "message": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated with."
+    },
+    "category_interaction": {
+        "message": "Interaction Reminder (Subscribe)"
+    },
+    "category_interaction_description": {
+        "message": "When there is a short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should be under self promotion instead."
+    },
+    "category_interaction_short": {
+        "message": "Interaction Reminder"
+    },
     "category_intro": {
         "message": "Intermission/Intro Animation"
     },
@@ -492,20 +517,11 @@
     "category_outro_description": {
         "message": "Credits or when the YouTube endcards appear. Not for conclusions with information."
     },
-    "category_interaction": {
-        "message": "Interaction Reminder (Subscribe)"
+    "category_preview": {
+        "message": "Preview/Recap"
     },
-    "category_interaction_description": {
-        "message": "When there is a short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should be under self promotion instead."
-    },
-    "category_interaction_short": {
-        "message": "Interaction Reminder"
-    },
-    "category_selfpromo": {
-        "message": "Unpaid/Self Promotion"
-    },
-    "category_selfpromo_description": {
-        "message": "Similar to \"sponsor\" except for unpaid or self promotion. This includes sections about merchandise, donations, or information about who they collaborated with."
+    "category_preview_description": {
+        "message": "Quick recap of previous episodes, or a preview of what's coming up later in the current video. Meant for edited together clips, not for spoken summaries."
     },
     "category_music_offtopic": {
         "message": "Music: Non-Music Section"
@@ -535,7 +551,7 @@
         "message": "Your color is formatted incorrectly. It should be a 3 or 6 digit hex code with a number sign at the beginning."
     },
     "previewColor": {
-        "message": "Preview Color",
+        "message": "Unsubmitted Color",
         "description": "Referring to submissions that have not been sent to the server yet."
     },
     "seekBarColor": {
@@ -583,7 +599,8 @@
         "message": "hidden: too short"
     },
     "channelDataNotFound": {
-        "message": "Channel ID not loaded yet."
+        "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": "Channel ID is not loaded yet. If you are using an embedded video, try using the YouTube homepage instead. This could also be caused by changes in the YouTube layout, if you think so, make a comment here:"
     },
     "videoInfoFetchFailed": {
         "message": "It seems that something is blocking SponsorBlock's ability to get video data. Please see https://github.com/ajayyy/SponsorBlock/issues/741 for more info."
@@ -603,9 +620,6 @@
     "adblockerIssueWhitelist": {
         "message": "If you are unable to resolve this, then disable the setting 'Force Channel Check Before Skipping', as SponsorBlock is unable to retrieve the channel information for this video"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "If this keeps occuring, it could be caused by your ad blocker. Please check https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Force Channel Check Before Skipping"
     },
@@ -640,7 +654,17 @@
     "categoryUpdate2": {
         "message": "Open the options to skip intros, outros, merch, etc."
     },
-    "help": {
-        "message": "Help"
+    "experimentUnlistedTitle": {
+        "message": "Help prevent this from disappearing"
+    },
+    "experimentUnlistedText": {
+        "message": "This video is detected as unlisted and uploaded before 2017\nOld unlisted videos are being set to private next month\nWe are collecting *public* videos to back up\nWould you like anonymously to send this video to us?\nhttps://support.google.com/youtube/answer/9230970"
+    },
+    "experiementOptOut": {
+        "message": "Opt-out of all future experiments",
+        "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": "Hide forever"
     }
 }

public/_locales/es/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Esta función rastrea los segmentos que se han saltado para que los usuarios sepan en qué medida sus aportes ayudaron a los demás y se utilizan como una métrica junto con los votos favorables para garantizar que no aparezca spam en la base de datos. La extensión envía un mensaje al servidor cada vez que se salta un segmento. Esperemos que la mayoría de la gente no cambie esta configuración para que los números de vista sean exactos. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Activar el seguimiento del número de saltos en las pestañas privadas/de incógnito"
+    },
     "enableQueryByHashPrefix": {
         "message": "Consulta Por Prefijo Hash"
     },
@@ -239,7 +242,7 @@
         "message": "Establecer tecla para omitir un segmento"
     },
     "setStartSponsorShortcut": {
-        "message": "Establecer tecla para iniciar segmento"
+        "message": "Establecer tecla para iniciar/detener un segmento"
     },
     "setSubmitKeybind": {
         "message": "Establecer botón de envio"
@@ -583,7 +586,8 @@
         "message": "oculto: demasiado corto"
     },
     "channelDataNotFound": {
-        "message": "ID de canal no cargado todavía."
+        "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": "El ID del canal no está cargado todavía. Si está usando un vídeo incrustado, intente usar la página de inicio de YouTube en su lugar. Esto también podría ser causado por cambios en el diseño de YouTube, si lo cree, haga un comentario aquí:"
     },
     "videoInfoFetchFailed": {
         "message": "Parece que algo está bloqueando la capacidad de SponsorBlock para obtener datos de video, Por favor, vea https://github.com/ajayyy/SponsorBlock/issues/741 para más información."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Si no puede resolverlo, desactive la opción \"Forzar Comprobación de Canal antes de Saltar\", ya que SponsorBlock no puede recuperar la información del canal de este video"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Si esto sigue ocurriendo, podría ser causado por tu bloqueador de anuncios. Por favor, compruebe https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Solicitudes"
-    },
     "forceChannelCheck": {
         "message": "Comprobación forzada del canal antes de saltarse"
     },

public/_locales/et/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "See funktsioon jälgib, milliseid segmente sa oled vahele jätnud, et kasutajad teaksid, kui palju nende sisestus on teisi aidanud ning et koos poolthäältega veenduda rämpsu mittesattumises andmebaasi. Laiendus saadab iga segmendi vahelejätmisel serverisse sõnumi. Loodetavasti enamus inimesi ei muuda seda seadistust, et vaatamisarvud oleksid täpsed. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Luba vahelejätmiste arvu jälgimine privaatsetel/inkognito kaartidel"
+    },
     "enableQueryByHashPrefix": {
         "message": "Küsi räsi eesliite järgi"
     },
@@ -239,7 +242,7 @@
         "message": "Seadista segmendi vahelejätmise klahv"
     },
     "setStartSponsorShortcut": {
-        "message": "Seadista segmendi alustamise klahv"
+        "message": "Seadista segmendi alustamise/lõpetamise klahv"
     },
     "setSubmitKeybind": {
         "message": "Seadista segmendi saatmise klahv"
@@ -583,7 +586,8 @@
         "message": "peidetud: liiga lühike"
     },
     "channelDataNotFound": {
-        "message": "Kanali ID pole veel laaditud."
+        "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:"
     },
     "videoInfoFetchFailed": {
         "message": "Tundub, et miski segab SponsorBlocki video andmete hankimise võimalust. Rohkema abi saamiseks palun vaata: https://github.com/ajayyy/SponsorBlock/issues/741"
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Kui sa ei suuda seda lahendada, keela valik \"sunnitud kanalikontroll enne vahelejätmist\", kuna SponsorBlock ei leia selle video kanaliteavet"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Kui see jätkub, võib see olla põhjustatud sinu reklaamiblokeerijast. Palun vaata https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Sunnitud kanalikontroll enne vahelejätmist"
     },

public/_locales/fi/messages.json

@@ -128,7 +128,7 @@
         "message": "Lähetykset"
     },
     "savedPeopleFrom": {
-        "message": "Olet säästänyt ihmisiä "
+        "message": "Olet säästänyt ihmisiltä "
     },
     "viewLeaderboard": {
         "message": "Tulostaulu"
@@ -137,11 +137,11 @@
         "message": "Lähetä"
     },
     "submissionEditHint": {
-        "message": "Osien muokkaus ilmestyy kun klikkaat lähetä",
+        "message": "Osien muokkaus ilmestyy sen jälkeen, kun klikkaat lähetä-nappia",
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
-        "message": "Vihje: Voit asettaa pikanäppäimet lähettämistä varten asetuksissa"
+        "message": "Vihje: Voit asettaa lähettämisen pikanäppäimet asetuksissa"
     },
     "clearTimesButton": {
         "message": "Tyhjennä ajat"
@@ -198,16 +198,19 @@
         "message": "Ota Ohitusten Lukumäärän Seuranta Käyttöön"
     },
     "whatViewTracking": {
-        "message": "Tämä toiminto seuraa, mitkä segmentit olet ohittanut, jonka avulla käyttäjät saavat tietää kuinka paljon heidän lähetyksensä ovat auttaneet muita ja sitä myös käytetään mittarina äänestysten kanssa sen varmistamiseksi, että spämmi ei pääse tietokantaan. Laajennus lähettää viestin palvelimelle aina, kun ohitat segmentin. Toivottavasti useimmat ihmiset eivät muuta tätä asetusta, jotta katselunumerot pysyisivät tarkkoina. :)"
+        "message": "Tämä toiminto seuraa, mitä segmenttejä olet ohittanut. Sen avulla käyttäjät saavat tietää, kuinka paljon heidän lähetyksensä ovat auttaneet muita, ja sitä käytetään myös mittarina äänestysten kanssa estääksemme spämmin pääsyn tietokantaan. Laajennus lähettää viestin palvelimelle aina, kun ohitat segmentin. Toivottavasti useimmat eivät muuta tätä asetusta, jotta katselunumerot pysyisivät tarkkoina. :)"
+    },
+    "enableViewTrackingInPrivate": {
+        "message": "Ota Ohitusten Lukumäärän Seuranta Käyttöön Yksityis-/Incognito-välilehdissä"
     },
     "enableQueryByHashPrefix": {
         "message": "Kysely Tiiviste-etuliittellä"
     },
     "whatQueryByHashPrefix": {
-        "message": "Sen sijaan, että videoID:tä käyttäen pyydettäisiin segmenttejä palvelimelta, videoID:n tiivisteen 4 ensimmäistä merkkiä lähetetään. Tämä palvelin lähettää takaisin dataa kaikista videoista, joilla on samankaltaiset tiivisteet."
+        "message": "Kokonaisen videon ID:n lähettämisen sijaan ID:n hashin 4 ensimmäistä merkkiä lähetetään. Palvelin lähettää takaisin dataa kaikista videoista, joilla on vastaavat hashit."
     },
     "enableRefetchWhenNotFound": {
-        "message": "Hae Segmentit Uudelleen Uusissa Videoissa"
+        "message": "Hae segmentit uudelleen uusissa videoissa"
     },
     "whatRefetchWhenNotFound": {
         "message": "Jos video on uusi, eikä segmenttejä löydy, niitä haetaan uudelleen muutaman minuutin välein katsoessasi."
@@ -239,7 +242,7 @@
         "message": "Aseta näppäin segmentin ohittamista varten"
     },
     "setStartSponsorShortcut": {
-        "message": "Aseta näppäin segmentin aloittamiseen näppäimistössä"
+        "message": "Aseta pikanäppäin segmentin aloittamiseen ja lopettamiseen"
     },
     "setSubmitKeybind": {
         "message": "Aseta näppäin tietojen lähetykseen"
@@ -291,10 +294,10 @@
         "message": "Ääni-ilmoitus ohittaessa toistaa äänen kun segmentti ohitetaan. Jos asetus on pois päältä (tai automaattinen ohitus on pois käytöstä), ääntä ei soiteta."
     },
     "showTimeWithSkips": {
-        "message": "Näytä Aika Ohitetut Osiot Poistettuna"
+        "message": "Näytä kesto ilman ohitettuja osioita"
     },
     "showTimeWithSkipsDescription": {
-        "message": "Tämä aika näkyy sulkeissa nykyisen ajan vieressä liukusäätimen alapuolella. Tämä näyttää videon koko pituuden miinus segmentit. Tämä sisältää segmentit, jotka on merkitty vain \"Näytä Liukusäätimessä\"."
+        "message": "Tämä aika näkyy sulkeissa nykyisen ajan vieressä liukusäätimen alapuolella. Se näyttää videon koko pituuden ilman segmenttejä. Se sisältää vain segmentit, jotka on merkitty \"Näytä liukusäätimessä\"."
     },
     "youHaveSkipped": {
         "message": "Olet ohittanut "
@@ -315,7 +318,7 @@
         "message": "tuntia"
     },
     "youHaveSavedTime": {
-        "message": "Olet säästänyt ihmisiä"
+        "message": "Olet säästänyt ihmisiltä"
     },
     "youHaveSavedTimeEnd": {
         "message": " heidän elämistään"
@@ -342,7 +345,7 @@
         "message": "Ohita Automaattisesti"
     },
     "showSkipNotice": {
-        "message": "Näytä Ilmoitus Ohitetun Segmentin Jälkeen"
+        "message": "Näytä ilmoitus ohitetun segmentin jälkeen"
     },
     "keybindCurrentlySet": {
         "message": ". Tällä hetkellä se on asetettu:"
@@ -396,7 +399,7 @@
         "message": "SponsorBlock Palvelimen Osoite"
     },
     "customServerAddressDescription": {
-        "message": "Osoite jota SponsorBlock käyttää lähettääkseen kutsuja palvelimelle.\nEllei sinulla ole omaa palvelininstanssia, tätä ei pitäisi muuttaa."
+        "message": "Osoite, jota SponsorBlock käyttää lähettääkseen kutsuja palvelimelle.\nEllei sinulla ole omaa palvelininstanssia, tätä ei pitäisi muuttaa."
     },
     "save": {
         "message": "Tallenna"
@@ -417,7 +420,7 @@
         "message": "Vie/tuo kaikki asetukset"
     },
     "whatExportOptions": {
-        "message": "Tämä on koko konfiguraatiosi JSON:ina. Tämä sisältää userID:si, joten jaa tämä viisaasti."
+        "message": "Tämä on koko konfiguraatiosi JSON-tiedostona. Tämä sisältää userID:si, joten jaa sitä viisaasti."
     },
     "setOptions": {
         "message": "Käytä asetuksia"
@@ -456,10 +459,10 @@
         "message": "Kirjoittaminen leikepöydälle epäonnistui"
     },
     "copyDebugInformationOptions": {
-        "message": "Kopioi tiedot leikepöydälle, joka annetaan kehittäjälle kun ilmoitetaan viasta / kun kehittäjä pyytää sitä. Arkaluonteiset tiedot, kuten käyttäjätunnus, sallitut kanavat ja mukautettu palvelimen osoite on poistettu. Se sisältää kuitenkin tietoja, kuten käyttäjäagentin, selaimen, käyttöjärjestelmän ja laajennuksen versionumeron. "
+        "message": "Kopioi tiedot leikepöydälle, joka annetaan kehittäjälle kun ilmoitetaan viasta / kun kehittäjä pyytää sitä. Arkaluonteiset tiedot, kuten käyttäjätunnus, sallitut kanavat ja mukautettu palvelimen osoite on poistettu. Se sisältää kuitenkin tietoja, kuten user agentin, selaimen, käyttöjärjestelmän ja laajennuksen versionumeron. "
     },
     "copyDebugInformationComplete": {
-        "message": "Virheenkorjaustiedot on kopioitu leikepöydälle. Voit poistaa mitä tahansa tietoa mitä et mielummin jakaisi. Tallenna tämä tekstitiedostoon tai liitä se virheraporttiin."
+        "message": "Virheenkorjaustiedot on kopioitu leikepöydälle. Voit poistaa mitä tahansa tietoa mitä et mielummin jakaisi. Tallenna se tekstitiedostoon tai liitä se virheraporttiin."
     },
     "theKey": {
         "message": "Näppäin"
@@ -478,7 +481,7 @@
         "message": "Maksettu mainostus, maksetut viittaukset ja suorat mainokset. Ei itsensä mainostukselle tai huikkauksille kampanjoista/luojista/nettisivuista/tuotteista, joista he pitävät."
     },
     "category_intro": {
-        "message": "Tauko/Introanimaatio"
+        "message": "Tauko tai introanimaatio"
     },
     "category_intro_description": {
         "message": "Aikaväli ilman varsinaista sisältöä. Voi olla tauko, staattinen kehys, toistuva animaatio. Tätä ei pitäisi käyttää siirtymisiin, jotka sisältävät tietoa."
@@ -490,16 +493,16 @@
         "message": "Loppukortit/-tekstit"
     },
     "category_outro_description": {
-        "message": "Lopputekstit tai kun YouTuben loppukortit tulevat näkyviin. Ei lopetuksille joissa on tietoa."
+        "message": "Lopputekstit tai YouTuben loppukortit. Ei lopetuksille, joissa on tärkeää tietoa."
     },
     "category_interaction": {
         "message": "Vuorovaikutusmuistutus (tilaaminen)"
     },
     "category_interaction_description": {
-        "message": "Kun sisällön keskellä on lyhyt muistutus tykätä, tilata tai seurata. Jos se on pitkä tai koskee jotain tiettyä asiaa, tulisi se merkitä mielummin itsensä mainostamiseksi."
+        "message": "Lyhyt muistutus tykätä, tilata tai seurata sisällön keskellä. Jos se on pitkä tai koskee jotain tiettyä asiaa, tulisi se merkitä mielummin itsensä mainostamiseksi."
     },
     "category_interaction_short": {
-        "message": "Vuorovaikutus Muistutus"
+        "message": "Vuorovaikutusmuistutus"
     },
     "category_selfpromo": {
         "message": "Maksamaton/Itsensä Mainostus"
@@ -511,7 +514,7 @@
         "message": "Musiikki: Ei-Musiikki-Osio"
     },
     "category_music_offtopic_description": {
-        "message": "Vain käytettävissä musiikkivideoissa. Tätä tulee käyttää vain musiikkivideoiden osissa, jotka eivät jo kuulu toiseen kategoriaan."
+        "message": "Vain musiikkivideoille. Tätä tulee käyttää vain musiikkivideoiden osissa, jotka eivät jo kuulu toiseen kategoriaan."
     },
     "category_music_offtopic_short": {
         "message": "Ei-Musiikki"
@@ -567,7 +570,7 @@
         "message": "Valitse kategoria"
     },
     "enableThisCategoryFirst": {
-        "message": "Lähettääksesi segmenttejä \"{0}\" kategorialla, sinun täytyy aktivoida se asetuksista. Sinut uudelleenohjataan asetuksiin nyt.",
+        "message": "Lähettääksesi segmenttejä kategorialla \"{0}\", sinun täytyy aktivoida se asetuksista. Sinut uudelleenohjataan asetuksiin nyt.",
         "description": "Used when submitting segments to only let them select a certain category if they have it enabled in the options."
     },
     "youMustSelectACategory": {
@@ -583,7 +586,8 @@
         "message": "piilotettu: liian lyhyt"
     },
     "channelDataNotFound": {
-        "message": "Kanavatunnusta ei ole vielä ladattu."
+        "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": "Kanavan ID ei ole vielä latautunut. Jos käytät upotettua videota, kokeile sen sijaan YouTuben kotisivua. Tämä voi myös johtua muutoksista YouTuben ulkoasussa. Jos luulet luulet niin, tee kommenti tänne:"
     },
     "videoInfoFetchFailed": {
         "message": "Näyttää siltä, että jokin estää SponsorBlockin kykyä saada videotietoja. Katso https://github.com/ajayyy/SponsorBlock/issues/741 lisätietoja varten."
@@ -601,10 +605,7 @@
         "message": "Käyttöoikeuspyyntö epäonnistui, klikkasitko kiellä?"
     },
     "adblockerIssueWhitelist": {
-        "message": "Jos et pysty ratkaisemaan tätä, poista käytöstä asetus 'Pakota Kanavan Tarkistus Ennen Ohittamista', koska SponsorBlock ei pysty noutamaan tämän videon kanavatietoja"
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Jos tämä toistuu, mainosten esto-ohjelmasi voi olla syynä. Katso https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+        "message": "Jos et pysty ratkaisemaan tätä, poista käytöstä asetus 'Pakota kanavan tarkistus ennen ohittamista', koska SponsorBlock ei pysty noutamaan tämän videon kanavatietoja"
     },
     "forceChannelCheck": {
         "message": "Pakota Kanavan Tarkistus Ennen Ohittamista"

public/_locales/fr/messages.json

@@ -79,6 +79,9 @@
     "sponsorEnd": {
         "message": "Fin du segment"
     },
+    "sponsorCancel": {
+        "message": "Annuler la création de segment"
+    },
     "noVideoID": {
         "message": "Aucune vidéo YouTube trouvée.\nActualisez l'onglet si il est censé y en avoir une."
     },
@@ -197,6 +200,9 @@
     "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. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Activer le suivi du nombre de sauts dans les onglets privés/incognito"
+    },
     "enableQueryByHashPrefix": {
         "message": "Requête avec seulement le début du hash"
     },
@@ -236,7 +242,7 @@
         "message": "Définir une touche pour passer un segment"
     },
     "setStartSponsorShortcut": {
-        "message": "Définir le raccourci pour commencer un segment"
+        "message": "Définir le raccourci pour démarrer/terminer un segment"
     },
     "setSubmitKeybind": {
         "message": "Changer le raccourci pour soumettre les segments"
@@ -580,10 +586,26 @@
         "message": "masqué : trop court"
     },
     "channelDataNotFound": {
-        "message": "L'ID de la chaîne n'a pas encore été chargé."
+        "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": "Le Channel ID n'est pas encore chargé. Si vous utilisez une vidéo intégrée, essayez d'utiliser la page d'accueil de YouTube. Cela pourrait également être causé par des changements dans l'interface de YouTube. Si vous pensez que c'est le cas, écrivez un commentaire ici :"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Si ça se reproduit, c'est peut-être causé par votre bloqueur de publicités. Veuillez consulter https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    "videoInfoFetchFailed": {
+        "message": "Il semblerait que quelque chose empêche SponsorBlock de récupérer les données de la vidéo. Veuillez consulter https://github.com/ajayyy/SponsorBlock/issues/741 pour plus d'informations."
+    },
+    "youtubePermissionRequest": {
+        "message": "Il semblerait que SponsorBlock ne puisse pas accéder à l'API YouTube. Pour corriger cela, acceptez la demande de permission qui apparaîtra, attendez quelques secondes, puis rechargez la page."
+    },
+    "acceptPermission": {
+        "message": "Accepter l'autorisation"
+    },
+    "permissionRequestSuccess": {
+        "message": "Demande de permission réussie !"
+    },
+    "permissionRequestFailed": {
+        "message": "La demande d'autorisation 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"
     },
     "forceChannelCheck": {
         "message": "Forcer la vérification du canal avant de passer"

public/_locales/hr/messages.json

@@ -122,10 +122,63 @@
     "submitTimesButton": {
         "message": "Unesi vremena"
     },
+    "Username": {
+        "message": "Korisničko ime"
+    },
+    "setUsername": {
+        "message": "Postavi korisničko ime"
+    },
+    "Options": {
+        "message": "Opcije"
+    },
+    "website": {
+        "message": "Web-stranica",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Izvorni kod",
+        "description": "Used on Firefox Store Page"
+    },
+    "disableSkipping": {
+        "message": "Preskakanje je aktivirano"
+    },
+    "enableSkipping": {
+        "message": "Preskakanje je deaktivirano"
+    },
     "yourWork": {
         "message": "Tvoja slanja",
         "description": "Used to describe the section that will show you the statistics from your submissions."
     },
+    "errorCode": {
+        "message": "Kȏd greške: "
+    },
+    "skip": {
+        "message": "Preskoči"
+    },
+    "skip_category": {
+        "message": "Preskočiti {0}?"
+    },
+    "skipped": {
+        "message": "Preskočeno"
+    },
+    "disableAutoSkip": {
+        "message": "Deaktiviraj automatsko preskakanje"
+    },
+    "enableAutoSkip": {
+        "message": "Aktiviraj automatsko preskakanje"
+    },
+    "minLower": {
+        "message": "min"
+    },
+    "minsLower": {
+        "message": "min"
+    },
+    "hourLower": {
+        "message": "h"
+    },
+    "hoursLower": {
+        "message": "h"
+    },
     "whatChangeUserID": {
         "message": "Ovo bi trebalo ostati privatno. slično je lozinki i ne bi se smjelo dijeliti ni s kime. Ako netko ovo ima, mogu se lažno predstavljati kao ti."
     },
@@ -183,12 +236,36 @@
     "minDurationDescription": {
         "message": "Isječci kraći od postavljene vrijednosti neće biti preskočeni ili prikazani u playeru."
     },
+    "save": {
+        "message": "Spremi"
+    },
+    "reset": {
+        "message": "Resetiraj"
+    },
+    "setOptions": {
+        "message": "Postavi opcije"
+    },
     "confirmNoticeTitle": {
         "message": "Pošalji segment"
     },
     "submit": {
         "message": "Pošalji"
     },
+    "cancel": {
+        "message": "Odustani"
+    },
+    "delete": {
+        "message": "Izbriši"
+    },
+    "preview": {
+        "message": "Pregledaj"
+    },
+    "inspect": {
+        "message": "Provjeri"
+    },
+    "edit": {
+        "message": "Uredi"
+    },
     "category_sponsor": {
         "message": "Sponzor"
     },
@@ -228,9 +305,38 @@
     "manualSkip": {
         "message": "Ručno preskakanje"
     },
+    "previewColor": {
+        "message": "Boja pregleda",
+        "description": "Referring to submissions that have not been sent to the server yet."
+    },
+    "category": {
+        "message": "Kategorija"
+    },
+    "skipOption": {
+        "message": "Preskoči opciju",
+        "description": "Used on the options page to describe the ways to skip the segment (auto skip, manual, etc.)"
+    },
+    "bracketNow": {
+        "message": "(sada)"
+    },
+    "moreCategories": {
+        "message": "Više kategorija"
+    },
+    "chooseACategory": {
+        "message": "Odaberi kategoriju"
+    },
     "youMustSelectACategory": {
         "message": "Moraš odabrati kategoriju za sve segmente koje šalješ!"
     },
+    "bracketEnd": {
+        "message": "(kraj)"
+    },
+    "downvoteDescription": {
+        "message": "Neispravno/krivo vrijeme"
+    },
+    "incorrectCategory": {
+        "message": "Kriva kategorija"
+    },
     "nonMusicCategoryOnMusic": {
         "message": "Ovaj je video kategoriziran kao glazba. Je li stvarno ima sponzora? Ako je ovo zapravo „Ne-glazbeni segment”, otvori opcije proširenja i aktiviraj ovu kategoriju. Zatim ovaj segment možeš posalti kao „Ne-glazbeni” umjesto sponzora. Pročitaj smjernice ako nešto nije jasno."
     },

public/_locales/hu/messages.json

@@ -222,9 +222,6 @@
         "message": "Ha még mindig nem tetszik, kattintson a ne mutassa többé gombra.",
         "description": "The second line of the message displayed after the notice was upgraded."
     },
-    "setStartSponsorShortcut": {
-        "message": "Billentyű beállítása a szegmenskezdés gombhoz"
-    },
     "setSubmitKeybind": {
         "message": "Billentyű beállítása a beküldés gombhoz"
     },
@@ -549,12 +546,6 @@
     "hiddenDueToDuration": {
         "message": "elrejtve: túl rövid"
     },
-    "channelDataNotFound": {
-        "message": "A csatorna azonosító még nem töltődött be."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Ha ez folyamatosan előfordul, lehet hogy az ad-blockere okozza. Kérem nézzen utána: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Csatorna ellenőrzése átugrás előtt"
     },

public/_locales/id/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Fitur ini melacak segmen mana yang sudah anda lewati untuk memberitahu pengguna berapa banyak submisi mereka telah membantu orang lain dan digunakan sebagai metrik bersamaan dengan upvote untuk memastikan tidak ada spam dalam basis data. Ekstensi mengirim pesan ke server tiap kali anda melewati segmen. Harapannya kebanyakan orang tidak akan mengubah opsi ini agar jumlah tayangan akurat. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Aktifkan Pelacakan Jumlah Lewati Pada Tab Privat/Penyamaran"
+    },
     "enableQueryByHashPrefix": {
         "message": "Query By Hash Prefix"
     },
@@ -239,7 +242,7 @@
         "message": "Atur tombol untuk melewati sebuah segmen"
     },
     "setStartSponsorShortcut": {
-        "message": "Atur tombol untuk mulai segmen"
+        "message": "Atur tombol untuk mulai/hentikan segmen"
     },
     "setSubmitKeybind": {
         "message": "Atur tombol untuk kirim submisi"
@@ -583,7 +586,8 @@
         "message": "disembunyikan: terlalu pendek"
     },
     "channelDataNotFound": {
-        "message": "ID Channel belum dimuat."
+        "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:"
     },
     "videoInfoFetchFailed": {
         "message": "Sepertinya sesuatu memnghalangi abilitas SponsorBlock untuk mendapatkan data video. Silahkan lihat https://github.com/ajayyy/SponsorBlock/issues/741 untuk info lebih lanjut."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Apabila anda tidak dapat menyelesaikan masalah ini, maka nonaktifkan pengaturan 'Paksa Cek Channel Sebelum Melewati', dikarenakan SponsorBlock tidak dapat menerima informasi channel untuk video ini"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Jika ini terus terjadi, kemungkinan terjadi karena ad blocker anda. Mohon cek https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Paksa Cek Channel Sebelum Melewati"
     },

public/_locales/it/messages.json

@@ -204,13 +204,13 @@
         "message": "Ricerca tramite prefisso hash"
     },
     "whatQueryByHashPrefix": {
-        "message": "Invece di richiedere segmenti dal server utilizzando l'Id video, vengono inviati i primi 4 caratteri dell'hash dell'ID video. Questo server invierà i dati per tutti i video con hash simili."
+        "message": "Invece di richiedere i segmenti dal server utilizzando l'ID del video, viene inviato un hash dei primi 4 caratteri dell'ID. Questo server invierà i dati per tutti i video con hash simili."
     },
     "enableRefetchWhenNotFound": {
         "message": "Ricarica I Segmenti Su Nuovi Video"
     },
     "whatRefetchWhenNotFound": {
-        "message": "Se il video è nuovo, e non risultano esserci segmenti, questi continueranno ad essere ricaricati dopo pochi minuti mentre guardi il video."
+        "message": "Se il video è nuovo, e non risultano esserci segmenti, continueremo a cercarne di nuovi ogni pochi minuti."
     },
     "showNotice": {
         "message": "Mostra di Nuovo l'Avviso"
@@ -238,9 +238,6 @@
     "setSkipShortcut": {
         "message": "Imposta un tasto per saltare un segmento"
     },
-    "setStartSponsorShortcut": {
-        "message": "Imposta chiave di associazione per l'inizio del segmento"
-    },
     "setSubmitKeybind": {
         "message": "Imposta chiave di associazione tasti per i tuoi contributi"
     },
@@ -315,7 +312,7 @@
         "message": "ore"
     },
     "youHaveSavedTime": {
-        "message": "Hai salvato alle persone"
+        "message": "Hai fatto risparmiare"
     },
     "youHaveSavedTimeEnd": {
         "message": " delle loro vite"
@@ -583,7 +580,8 @@
         "message": "nascosto: troppo corto"
     },
     "channelDataNotFound": {
-        "message": "ID canale non ancora caricato."
+        "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": "L'ID del canale non è ancora caricato. Se stai usando un video incorporato, prova piuttosto a usare la pagina principale di YouTube. Questo potrebbe esser causato dalle modifiche al layout di YouTube, se pensi che sia così, scrivi qui un commento:"
     },
     "videoInfoFetchFailed": {
         "message": "Sembra che qualcosa stia bloccando l'abilità di SponsorBlock di ottenere i dati del video. Sei pregato di vedere https://github.com/ajayyy/SponsorBlock/issues/741 per ulteriori informazioni."
@@ -603,9 +601,6 @@
     "adblockerIssueWhitelist": {
         "message": "Se non riesci a risolverlo, disabilita allora l'impostazione 'Forza Controllo Canale Prima di Saltare', poiché SponsorBlock non è in grado di recuperare le informazioni del canale per questo video"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Se questo continua a verificarsi, potrebbe essere causato dal tuo ad-blocker. Controlla https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Forza controllo canale prima di andare avanti"
     },

public/_locales/ja/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "セグメントをスキップするキーを設定"
     },
-    "setStartSponsorShortcut": {
-        "message": "セグメントを開始するキーを設定"
-    },
     "setSubmitKeybind": {
         "message": "投稿するキーを設定"
     },
@@ -467,9 +464,6 @@
     "youMustSelectACategory": {
         "message": "提出する全ての区域について，その範疇を選択する必要があります！"
     },
-    "channelDataNotFound": {
-        "message": "まだチャンネル ID が読み込まれてません。"
-    },
     "youtubePermissionRequest": {
         "message": "SponsorBlockがYouTube APIを参照できないようです。修正するには，次に表示される画面で許可を承認してから，数秒後に再読み込みしてください。"
     },

public/_locales/ko/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "이 기능은 건너 뛴 부분을 추적하여 사용자가 제출한 내용이 다른 사람에게 얼마나 도움이 되는지 알려주고 스팸이 데이터베이스에 들어가지 않도록 추천과 함께 분석에 사용합니다. 확장 프로그램은 부분을 건너뛸 때마다 서버에 메시지를 보냅니다. 조회수가 정확하도록 대부분의 사람들이 이 설정을 변경하지 않기를 바랍니다. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "시크릿/사생활 보호 탭에서 스킵 개수 추적 활성화"
+    },
     "enableQueryByHashPrefix": {
         "message": "Hash Prefix가 쿼리를 제공함"
     },
@@ -239,7 +242,7 @@
         "message": "구간 건너뛰기 키 설정"
     },
     "setStartSponsorShortcut": {
-        "message": "시작 부분 키 할당 설정"
+        "message": "시작/끝 부분 키 할당 설정"
     },
     "setSubmitKeybind": {
         "message": "제출 키 할당 설정"
@@ -583,7 +586,8 @@
         "message": "숨겨짐: 너무 짧음"
     },
     "channelDataNotFound": {
-        "message": "채널 ID가 로드되지 않았습니다."
+        "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의 레이아웃 변경으로 인해서도 발생할 수 있습니다. 레이아웃 변경에 의해 오류가 발생했다고 생각하면 여기에 의견을 남겨주십시오."
     },
     "videoInfoFetchFailed": {
         "message": "무언가가 SponsorBlock의 동영상 데이터 수집을 막고 있는 것 같습니다. https://github.com/ajayyy/SponsorBlock/issues/741 사이트를 참조하세요."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "이 문제를 해결할 수 없는 경우, SponsorBlock이 이 동영상에 대한 채널 정보를 찾을 수 없으므로 '건너뛰기 전 채널 강제 체크' 설정을 꺼주십시오."
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "오류가 지속된다면, 광고 차단기로 인해 발생할 수 있습니다. https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests 사이트를 참조하세요"
-    },
     "forceChannelCheck": {
         "message": "건너뛰기 전 채널 강제 체크"
     },

public/_locales/ml/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "ഒരു സെഗ്മെന്റ് ഒഴിവാക്കുന്നതിനായി കീ സജ്ജമാക്കുക"
     },
-    "setStartSponsorShortcut": {
-        "message": "ആരംഭ സെഗ്‌മെന്റ് കീബൈൻഡിനായി കീ സജ്ജമാക്കുക"
-    },
     "setSubmitKeybind": {
         "message": "സമർപ്പിക്കൽ കീബൈൻഡിനായി കീ സജ്ജമാക്കുക"
     },
@@ -579,12 +576,6 @@
     "hiddenDueToDuration": {
         "message": "മറഞ്ഞിരിക്കുന്നു: വളരെ ചെറുതാണ്"
     },
-    "channelDataNotFound": {
-        "message": "ചാനൽ ഐഡി ഇതുവരെ ലോഡുചെയ്തിട്ടില്ല."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "ഇത് സംഭവിച്ചുകൊണ്ടിരിക്കുകയാണെങ്കിൽ, ഇത് നിങ്ങളുടെ പരസ്യ ബ്ലോക്കർ കാരണമാകാം. Https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests പരിശോധിക്കുക"
-    },
     "forceChannelCheck": {
         "message": "ഒഴിവാക്കുന്നതിനുമുമ്പ് ചാനൽ പരിശോധന നിർബന്ധിക്കുക"
     },

public/_locales/ms/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "Tetapkan kunci untuk melangkau segmen"
     },
-    "setStartSponsorShortcut": {
-        "message": "Tetapkan kunci untuk keybind segmen permulaan"
-    },
     "setSubmitKeybind": {
         "message": "Tetapkan kunci untuk pengikat kunci penyerahan"
     },
@@ -579,12 +576,6 @@
     "hiddenDueToDuration": {
         "message": "tersembunyi: terlalu pendek"
     },
-    "channelDataNotFound": {
-        "message": "ID Saluran belum dimuat."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Sekiranya ini terus berlaku, ini mungkin disebabkan oleh penyekat iklan anda. Sila periksa https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Pakai Pemeriksaan Saluran Sebelum Melangkau"
     },

public/_locales/nl/messages.json

@@ -44,10 +44,10 @@
         "message": "Nooit weergeven"
     },
     "hitGoBack": {
-        "message": "Druk op \"niet overslaan\" om terug te gaan naar waar u vandaan komt."
+        "message": "Druk op \"overslaan ongedaan maken\" om terug te gaan naar waar u vandaan komt."
     },
     "unskip": {
-        "message": "Niet overslaan"
+        "message": "Overslaan ongedaan maken"
     },
     "reskip": {
         "message": "Opnieuw overslaan"
@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Deze functie houdt bij welke segmenten u heeft overgeslagen om gebruikers te laten weten hoezeer hun indiening anderen heeft geholpen en wordt samen met upvotes als meetwaarde gebruikt om ervoor te zorgen dat spam niet in de database terechtkomt. De extensie stuurt telkens wanneer u een segment overslaat een bericht naar de server. Hopelijk veranderen de meeste mensen deze instelling niet zodat de weergavenummers accuraat zijn. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Bijhouden van het aantal keren overslaan inschakelen in privé-/incognito-tabbladen"
+    },
     "enableQueryByHashPrefix": {
         "message": "Opvragen via hash-voorvoegsel"
     },
@@ -239,7 +242,7 @@
         "message": "Sleutel instellen voor het overslaan van een segment"
     },
     "setStartSponsorShortcut": {
-        "message": "Sneltoets instellen voor begin van segment"
+        "message": "Sneltoets instellen voor begin/einde van segment"
     },
     "setSubmitKeybind": {
         "message": "Sneltoets instellen voor indienen"
@@ -583,7 +586,8 @@
         "message": "verborgen: te kort"
     },
     "channelDataNotFound": {
-        "message": "Kanaal-ID is nog niet geladen."
+        "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": "Kanaal-ID is nog niet geladen. Als u een ingesloten video gebruikt, probeer dan in plaats daarvan de YouTube-homepagina. Dit kan ook worden veroorzaakt door wijzigingen in de YouTube-lay-out. Als u denkt dat dit het geval is, maak dan hier een opmerking:"
     },
     "videoInfoFetchFailed": {
         "message": "Het lijkt erop dat iets de mogelijkheid van SponsorBlock om videogegevens op te halen, blokkeert. Zie https://github.com/ajayyy/SponsorBlock/issues/741 voor meer informatie."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Als u dit niet kunt oplossen, schakel dan de instelling 'kanaalcontrole forceren vóór overslaan' uit omdat SponsorBlock niet in staat is de kanaalinformatie voor deze video op te halen"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Als dit blijft optreden, kan dit worden veroorzaakt door uw reclamefilter. Zie https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Kanaalcontrole forceren vóór overslaan"
     },

public/_locales/no/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "Angi tast for å hoppe over et segment"
     },
-    "setStartSponsorShortcut": {
-        "message": "Angi tast for å starte segmenter"
-    },
     "setSubmitKeybind": {
         "message": "Angi tast for innsending"
     },
@@ -579,9 +576,6 @@
     "hiddenDueToDuration": {
         "message": "skjult: for kort"
     },
-    "channelDataNotFound": {
-        "message": "Kanal-ID-en er ikke lastet inn enda."
-    },
     "youtubePermissionRequest": {
         "message": "Det ser ut til at SponsorBlock ikke klarer å nå YouTube-API-en. For å fikse dette, godta tillatelsesspørringen som dukker opp etter dette, vent noen sekunder, og så last inn siden på nytt."
     },
@@ -594,9 +588,6 @@
     "permissionRequestFailed": {
         "message": "Tillatelsesforespørselen mislyktes, klikket du på Avvis?"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Hvis dette skjer til stadighet, kan det være forårsaket av reklameblokkereren din. Vennligst sjekk https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Fremtving kanalsjekk før hopp"
     },

public/_locales/pl/messages.json

@@ -79,6 +79,9 @@
     "sponsorEnd": {
         "message": "Koniec segmentu"
     },
+    "sponsorCancel": {
+        "message": "Anuluj tworzenie segmentu"
+    },
     "noVideoID": {
         "message": "Nie znaleziono filmu YouTube.\nJeżeli to błąd, odśwież stronę."
     },
@@ -197,6 +200,9 @@
     "whatViewTracking": {
         "message": "Ta opcja monitoruje pomijane przez Ciebie segmenty, by dać znać użytkownikom, jak bardzo ich wkład pomógł innym, oraz w połączeniu z systemem głosowania zapobiegać dostawaniu się spamu do bazy danych. Rozszerzenie wysyła wiadomość do serwera za każdym razem, kiedy pomijasz segment. Miejmy nadzieję, że większość ludzi tego nie wyłączy i liczniki wyświetleń będą wiarygodne. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Włącz licznik śledzenia pominięć w zakładkach Prywatnych/Incognito"
+    },
     "enableQueryByHashPrefix": {
         "message": "Zapytanie według prefiksu Hash"
     },
@@ -236,7 +242,7 @@
         "message": "Ustaw klawisz do pomijania segmentów"
     },
     "setStartSponsorShortcut": {
-        "message": "Ustaw klawisz do oznaczania początku segmentu"
+        "message": "Ustaw klawisz do oznaczania początku/końca segmentu"
     },
     "setSubmitKeybind": {
         "message": "Ustaw klawisz do wysyłania czasów"
@@ -580,7 +586,11 @@
         "message": "ukryty: zbyt krótki"
     },
     "channelDataNotFound": {
-        "message": "ID kanału nie zostało póki co załadowane."
+        "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 kanału nie zostało jeszcze załadowane. Jeśli używasz embeddowanego filmu, spróbuj użyć strony głównej YouTube'a. Może to być również spowodowane zmianami w layout'cie YouTube'a, jeśli myślisz, że to przez to, dodaj swój komentarz tutaj:"
+    },
+    "videoInfoFetchFailed": {
+        "message": "Wygląda na to, że coś blokuje możliwość pobierania danych o filmach przez SponsorBlock. Sprawdź proszę https://github.com/ajayyy/SponsorBlock/issues/741 po więcej informacji."
     },
     "youtubePermissionRequest": {
         "message": "Wygląda na to, że SponsorBlock nie jest w stanie połączyć się z API YouTube. Aby to naprawić, zaakceptuj monit o pozwolenie, który pojawi się za chwilę, odczekaj kilka sekund, a następnie odśwież stronę."
@@ -594,8 +604,8 @@
     "permissionRequestFailed": {
         "message": "Prośba odrzucona. Może kliknięto „Odmów”?"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Jeśli ten problem się powtarza, możliwą przyczyną jest Twój ad blocker. Sprawdź proszę https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    "adblockerIssueWhitelist": {
+        "message": "Jeśli nie możesz rozwiązać tego problemu, wyłącz opcję „Wymuś sprawdzanie kanału przed pomijaniem”, ponieważ SponsorBlock nie jest w stanie pobrać informacji o kanale dla tego wideo"
     },
     "forceChannelCheck": {
         "message": "Wymuś sprawdzanie kanału przed pomijaniem"

public/_locales/pt_BR/messages.json

@@ -239,7 +239,7 @@
         "message": "Defina a tecla para ignorar um segmento"
     },
     "setStartSponsorShortcut": {
-        "message": "Defina a tecla para que marca o início do segmento"
+        "message": "Defina a tecla para iniciar/interromper o segmento"
     },
     "setSubmitKeybind": {
         "message": "Defina a tecla para enviar o segmento de patrocínio"
@@ -583,7 +583,8 @@
         "message": "oculto: muito curto"
     },
     "channelDataNotFound": {
-        "message": "ID do canal ainda não carregado."
+        "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 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:"
     },
     "videoInfoFetchFailed": {
         "message": "Parece que algo está bloqueando a habilidade do SponsorBlock de obter dados de vídeo. Por favor, veja https://github.com/ajayyy/SponsorBlock/issues/741 para mais informações."
@@ -603,9 +604,6 @@
     "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"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Se isso continuar acontecendo, pode ser causado pelo seu bloqueador de anúncios. Por favor, verifique https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock-Requests"
-    },
     "forceChannelCheck": {
         "message": "Forçar verificação do canal antes de pular"
     },

public/_locales/ro/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "Setați cheia pentru omiterea unui segment"
     },
-    "setStartSponsorShortcut": {
-        "message": "Setează tasta pentru pornirea segmentului"
-    },
     "setSubmitKeybind": {
         "message": "Setează tasta pentru trimiterea sponsorizării"
     },
@@ -576,12 +573,6 @@
     "hiddenDueToDuration": {
         "message": "ascuns: prea scurt"
     },
-    "channelDataNotFound": {
-        "message": "ID-ul Canalului nu a fost încărcat încă."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Dacă acest lucru continuă să se întample, ar putea fi cauzat de adblocker-ul dumneavoastră. Vă rugăm să verificați \nhttps://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Forțează verificarea canalului înainte de a sări"
     },

public/_locales/ru/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Эта возможность отслеживает, какие сегменты Вы пропустили, чтобы помочь пользователям узнать, насколько их вклад помог другим, и, наряду с голосами, используется как метрика, чтобы убедиться, что спам не попадает в базу данных. Расширение отправляет сообщение на сервер каждый раз, когда Вы пропускаете сегмент. Надеемся, большая часть пользователей не поменяет эту настройку, так что у нас будет точная статистика просмотров. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Включить отслеживание пропусков во вкладках инкогнито"
+    },
     "enableQueryByHashPrefix": {
         "message": "Запрос по префиксу хэша"
     },
@@ -239,7 +242,7 @@
         "message": "Назначить горячую клавишу для пропуска сегмента"
     },
     "setStartSponsorShortcut": {
-        "message": "Назначить горячую клавишу для начала сегмента"
+        "message": "Назначить горячую клавишу для начала/остановки сегмента"
     },
     "setSubmitKeybind": {
         "message": "Назначить горячую клавишу для отправки"
@@ -583,7 +586,8 @@
         "message": "скрыто: слишком коротко"
     },
     "channelDataNotFound": {
-        "message": "ID канала еще не загружен."
+        "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, если вы считаете, что это так, оставьте комментарий здесь:"
     },
     "videoInfoFetchFailed": {
         "message": "Похоже, что-то блокирует возможность SponsorBlock'а получать данные о видео. Подробнее: https://github.com/ajayyy/SponsorBlock/issues/741."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Если вы не можете решить эту проблему, попробуйте отключить \"Принудительная проверка каналов перед пропуском\" в настройках, т. к. SponsorBlock не может определить название канала для этого видео"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Если это сообщения появляется слишком часто, это может быть вызвано вашим блокировщиком рекламы. Пожалуйста, перейдите на https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Принудительная проверка каналов перед пропуском"
     },

public/_locales/sk/messages.json

@@ -238,9 +238,6 @@
     "setSkipShortcut": {
         "message": "Nastaviť kláves pre preskočenie segmentu"
     },
-    "setStartSponsorShortcut": {
-        "message": "Nastaviť kláves pre začiatok segmentu"
-    },
     "setSubmitKeybind": {
         "message": "Nastaviť kláves pre odoslanie segmentu"
     },
@@ -583,7 +580,8 @@
         "message": "skryté: príliš krátke"
     },
     "channelDataNotFound": {
-        "message": "ID kanála nie je zatiaľ načítané."
+        "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:"
     },
     "videoInfoFetchFailed": {
         "message": "Zdá sa, že niečo blokuje SponsorBlocku možnosť získať dáta o videu. Prosím navštívte https://github.com/ajayyy/SponsorBlock/issues/741 pre viac informácií."
@@ -603,9 +601,6 @@
     "adblockerIssueWhitelist": {
         "message": "Ak to neviete vyriešiť, vypnite nastavenie \"Vynútiť kontrolu kanála pred preskočením\", lebo SponsorBlock nevie zistiť informácie o kanále tohto videa"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Ak sa to bude diať aj naďalej, môže to byť spôsobené Vašim adblockerom. Prosím navštívte https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Vynútiť kontrolu kanála pred preskočením"
     },

public/_locales/sv/messages.json

@@ -98,13 +98,13 @@
         "message": "Anslutningsfel. Felkod: "
     },
     "wantToSubmit": {
-        "message": "Vill skicka in med video-id"
+        "message": "Vill du skicka in för video-ID"
     },
     "clearTimes": {
         "message": "Rensa segmenten"
     },
     "openPopup": {
-        "message": "Öppna SponsorBlock Popup"
+        "message": "Öppna SponsorBlock-popup"
     },
     "closePopup": {
         "message": "Stäng popup"
@@ -141,7 +141,7 @@
         "description": "Appears in the popup to inform them that editing has been moved to the video player."
     },
     "popupHint": {
-        "message": "Tips: Du kan ställa in snabbtangenter för de olika inskickningsalternativen"
+        "message": "Tips: Du kan ställa in snabbtangenter för att skicka in i alternativen"
     },
     "clearTimesButton": {
         "message": "Rensa tider"
@@ -156,7 +156,7 @@
         "message": "Användarnamn"
     },
     "setUsername": {
-        "message": "Ange Användarnamn"
+        "message": "Ange användarnamn"
     },
     "discordAdvert": {
         "message": "Gå med i den officiella discordservern för att ge förslag och feedback!"
@@ -165,7 +165,7 @@
         "message": "Dölj detta"
     },
     "Options": {
-        "message": "Inställningar"
+        "message": "Alternativ"
     },
     "showButtons": {
         "message": "Visa Knappar På YouTube-spelaren"
@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "Den här funktionen spårar vilka segment du har hoppat över för att låta användarna veta hur mycket tid en användare har sparat andra och tillsammans med användarnas röster säkerställa att spam inte kommer in i databasen. Detta tillägg skickar ett meddelande till servern varje gång du hoppar över ett segment. Förhoppningsvis ändrar inte folk den här inställningen så statistiken hålls tillförlitlig. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Aktivera spåra antalet hoppa över i privata/inkognitoflikar"
+    },
     "enableQueryByHashPrefix": {
         "message": "Fråga efter hash-prefix"
     },
@@ -239,7 +242,7 @@
         "message": "Ställ in knapp för att hoppa över ett segment"
     },
     "setStartSponsorShortcut": {
-        "message": "Ange den tangent som ska fungera som snabbstartstangent för ett segment"
+        "message": "Ange den genväg som ska fungera som start-/stopptangent för ett segment"
     },
     "setSubmitKeybind": {
         "message": "Välj knapp att koppla till rapportering av sponsormeddelande"
@@ -351,7 +354,7 @@
         "message": "Stöd Invidious"
     },
     "supportInvidiousDescription": {
-        "message": "Invidious (invidio.us) är en tredjeparts YouTube-klient. För att aktivera stöd måste du acceptera de extra behörigheterna. Detta kommer INTE att fungera i incognito i Chrome och andra Cromium-varianter."
+        "message": "Invidious (invidio.us) är en tredjeparts YouTube-klient. För att aktivera stöd måste du acceptera de extra behörigheterna. Detta kommer INTE att fungera i inkognito i Chrome och andra Chromium-varianter."
     },
     "optionsInfo": {
         "message": "Aktivera Invidious stöd, inaktivera hoppa över automatiskt, dölj knappar och mer."
@@ -414,19 +417,19 @@
         "message": "m.youtube.com stöds nu"
     },
     "exportOptions": {
-        "message": "Importera/Exportera Alla Inställningar"
+        "message": "Importera/Exportera alla alternativen"
     },
     "whatExportOptions": {
-        "message": "Detta är alla dina inställningar i JSON-format. Det inkluderar ditt AnvändarID, så var nog med hur du hanterar datan."
+        "message": "Detta är alla dina alternativ i JSON-format. Det inkluderar ditt användar-ID, så var noga med hur du hanterar datan."
     },
     "setOptions": {
-        "message": "Ange Inställningar"
+        "message": "Ange alternativ"
     },
     "exportOptionsWarning": {
-        "message": "Varning: Att ändra inställningarna är permanent och kan förstöra din installation. Är du säker på att du vill göra detta? Se till att göra en backup för säkerhets skull."
+        "message": "Varning: Att ändra alternativen är permanent och kan förstöra din installation. Är du säker på att du vill göra detta? Se till och gör en säkerhetskopia för säkerhets skull."
     },
     "incorrectlyFormattedOptions": {
-        "message": "Denna JSON är inte korrekt formaterad. Dina inställningar har inte ändrats."
+        "message": "Denna JSON är inte korrekt formaterad. Dina alternativ har inte ändrats."
     },
     "confirmNoticeTitle": {
         "message": "Rapportera Segment"
@@ -456,7 +459,7 @@
         "message": "Misslyckades med att kopiera debuginformation till urklipp"
     },
     "copyDebugInformationOptions": {
-        "message": "Kopierar information till urklipp för att dela med en utvecklare vid rapportering av en bugg / när en utvecklare ber om det. Känslig data som AnvändarID, vitlistade kanaler, och anpassad serveradress följer inte med. Däremot innehåller det information om useragent, webbläsare, operativsystem, och tilläggsversion."
+        "message": "Kopierar information till urklipp för att dela med en utvecklare vid rapportering av en bugg / när en utvecklare ber om det. Känslig data som användar-ID, vitlistade kanaler, och anpassad serveradress följer inte med. Däremot innehåller det information om useragent, webbläsare, operativsystem, och tilläggsversion. "
     },
     "copyDebugInformationComplete": {
         "message": "Debuginformationen har kopierats till urklipp. Ta bort eventuell information du inte vill dela med dig av. Spara informationen i en textfil eller klistra in den i en buggrapport."
@@ -520,7 +523,7 @@
         "message": "Liveström: Donations-/meddelandeavläsningar"
     },
     "category_livestream_messages_short": {
-        "message": "Läser meddelande"
+        "message": "Meddelandeläsning"
     },
     "disable": {
         "message": "Inaktivera"
@@ -583,7 +586,8 @@
         "message": "dold: för kort"
     },
     "channelDataNotFound": {
-        "message": "Kanal-ID är inte inladdat än."
+        "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": "Kanal-ID:t är inte laddat ännu. Om du använder en inbäddad video, prova att använda YouTube-hemsidan istället. Detta kan också bero på förändringar i layouten hos YouTube och om du tror så är fallet kommentera det här:"
     },
     "videoInfoFetchFailed": {
         "message": "Det verkar som om något blockerar SponsorBlock från att hämta videodata. Gå till https://github.com/ajayyy/SponsorBlock/issues/741 för mer info."
@@ -603,9 +607,6 @@
     "adblockerIssueWhitelist": {
         "message": "Om du inte kan lösa detta kan du inaktivera 'Tvinga kontroll av kanalen innan hoppa över' i inställningarna, eftersom SponsorBlock inte kan hämta kanalinformationen för den här videon"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Om detta fortsätter att inträffa, kan orsaken vara din annonsblockerare. Vänligen kontrollera https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Tvinga kontroll av kanalen innan hoppa över"
     },
@@ -638,7 +639,7 @@
         "message": "Kategorier finns här!"
     },
     "categoryUpdate2": {
-        "message": "Öppna inställningarna för att hoppa över intros, outros, merch, osv."
+        "message": "Öppna alternativen för att hoppa över intros, outros, merch, osv."
     },
     "help": {
         "message": "Hjälp"

public/_locales/ta/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "ஒரு பகுதியைத் தவிர்ப்பதற்கான விசையை அமைக்கவும்"
     },
-    "setStartSponsorShortcut": {
-        "message": "தொடக்க பிரிவு விசைப்பலகைக்கு விசையை அமைக்கவும்"
-    },
     "setSubmitKeybind": {
         "message": "சமர்ப்பிக்கும் விசைப்பலகைக்கு விசையை அமைக்கவும்"
     },
@@ -579,12 +576,6 @@
     "hiddenDueToDuration": {
         "message": "மறைக்கப்பட்ட: மிகக் குறுகிய"
     },
-    "channelDataNotFound": {
-        "message": "சேனல் ஐடி இன்னும் ஏற்றப்படவில்லை."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "இது தொடர்ந்து நடந்தால், அது உங்கள் விளம்பர தடுப்பாளரால் ஏற்படலாம். Https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests ஐ சரிபார்க்கவும்"
-    },
     "forceChannelCheck": {
         "message": "தவிர்ப்பதற்கு முன் சேனல் சோதனை கட்டாயப்படுத்தவும்"
     },

public/_locales/te/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "విభాగాన్ని దాటవేయడానికి కీని సెట్ చేయండి"
     },
-    "setStartSponsorShortcut": {
-        "message": "ప్రారంభ విభాగం కీబైండ్ కోసం కీని సెట్ చేయండి"
-    },
     "setSubmitKeybind": {
         "message": "సమర్పణ కీబైండ్ కోసం కీని సెట్ చేయండి"
     },
@@ -579,12 +576,6 @@
     "hiddenDueToDuration": {
         "message": "దాచబడింది: చాలా చిన్నది"
     },
-    "channelDataNotFound": {
-        "message": "ఛానెల్ ID ఇంకా లోడ్ కాలేదు."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "ఇది జరుగుతూ ఉంటే, అది మీ ప్రకటన బ్లాకర్ వల్ల సంభవించవచ్చు. దయచేసి https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests తనిఖీ చేయండి"
-    },
     "forceChannelCheck": {
         "message": "దాటవేయడానికి ముందు ఛానెల్ తనిఖీ చేయమని బలవంతం చేయండి"
     },

public/_locales/tr/messages.json

@@ -79,6 +79,9 @@
     "sponsorEnd": {
         "message": "Kısım Şimdi Bitiyor"
     },
+    "sponsorCancel": {
+        "message": "Kısım Oluşturmayı İptal Et"
+    },
     "noVideoID": {
         "message": "YouTube videosu bulunamadı.\nHatalı olduğunu düşünüyorsanız sayfayı yenileyin."
     },
@@ -197,6 +200,9 @@
     "whatViewTracking": {
         "message": "Bu özellik, hangi kısımları atladığınızı takip ederek kullanıcıların gönderilerinin diğerlerine ne kadar yardımcı olduğunu bilmelerini sağlar ve olumlu oyları bir ölçüm aracı olarak kullanarak gereksiz yollanan kısımların veri tabanına girmemesini sağlar. Eklenti, bir kısmı her atladığınızda sunucuya bir mesaj gönderir. Umarım çoğu insan bu ayarı değiştirmez böylece görüntüleme sayıları doğru olur. :)"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "Özel/Gizli sekmelerde atlama sayısı takibini etkinleştir"
+    },
     "enableQueryByHashPrefix": {
         "message": "Karma Ön eki ile Sorgula"
     },
@@ -236,7 +242,7 @@
         "message": "Kısım atlamak için bir tuş ata"
     },
     "setStartSponsorShortcut": {
-        "message": "Kısım kaydına başlamak için bir tuş belirleyin"
+        "message": "Kısım başlatmak/durdurmak için kısayol ayarla"
     },
     "setSubmitKeybind": {
         "message": "Gönderim için bir tuş belirleyin"
@@ -580,10 +586,26 @@
         "message": "gizlendi: çok kısa"
     },
     "channelDataNotFound": {
-        "message": "Kanal kimliği henüz yüklenmedi."
+        "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": "Kanal kimliği henüz yüklenmedi. Gömülü bir video kullanıyorsanız, bunun yerine YouTube ana sayfasından izlemeyi deneyin. Bu, YouTube düzenindeki değişikliklerden de kaynaklanabilir, eğer öyleyse, buraya bir yorum yazın:"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Bunu sürekli yaşıyorsanız, reklam engelleyiciniz tarafından gerçekleşiyor olabilir. https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests adresini kontrol edin."
+    "videoInfoFetchFailed": {
+        "message": "SponsorBlock'un video verilerini almasını engelleyen bir şey var gibi görünüyor. Lütfen daha fazla bilgi için şuraya göz atın: https://github.com/ajayyy/SponsorBlock/issues/741"
+    },
+    "youtubePermissionRequest": {
+        "message": "SponsorBlock YouTube API'sine ulaşamıyor gibi gözüküyor. Bunu düzeltmek için, bundan sonra görünecek izin isteğini kabul edin, birkaç saniye bekleyin ve ardından sayfayı yeniden yükleyin."
+    },
+    "acceptPermission": {
+        "message": "İzni kabul et"
+    },
+    "permissionRequestSuccess": {
+        "message": "İzin isteği başarılı!"
+    },
+    "permissionRequestFailed": {
+        "message": "İzin isteği başarısız. Reddet butonuna mı tıkladınız?"
+    },
+    "adblockerIssueWhitelist": {
+        "message": "Bunu çözemiyorsanız, SponsorBlock, bu video için kanal bilgilerini alamadığı için 'Atlamadan Önce Kanal Kontrolünü Zorla' ayarını devre dışı bırakın"
     },
     "forceChannelCheck": {
         "message": "Atlamadan Önce Kanal Kontrolüne Zorla"

public/_locales/uk/messages.json

@@ -79,6 +79,9 @@
     "sponsorEnd": {
         "message": "Сегмент закінчується тут"
     },
+    "sponsorCancel": {
+        "message": "Скасувати створення сегмента"
+    },
     "noVideoID": {
         "message": "Відео YouTube, не знайдено.\nЯкщо це не так, поновіть вкладку."
     },
@@ -236,7 +239,7 @@
         "message": "Призначити гарячу клавішу для пропуску сегмента"
     },
     "setStartSponsorShortcut": {
-        "message": "Призначити гарячу клавішу для початку сегмента"
+        "message": "Призначити гарячу клавішу для початку/зупинки сегмента"
     },
     "setSubmitKeybind": {
         "message": "Призначити гарячу клавішу для надсилання"
@@ -580,10 +583,26 @@
         "message": "приховано: занадто коротко"
     },
     "channelDataNotFound": {
-        "message": "ID каналу ще не завантажений."
+        "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, якщо ви вважаєте, що це так, залиште коментар тут:"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "Якщо це повідомлення з'являється занадто часто, це може бути викликано вашим блокувальником реклами. Будь ласка, перейдіть на https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
+    "videoInfoFetchFailed": {
+        "message": "Схоже, щось блокує можливість SponsorBlock'а отримувати дані про відео. Докладніше: https://github.com/ajayyy/SponsorBlock/issues/741."
+    },
+    "youtubePermissionRequest": {
+        "message": "Здається, SponsorBlock не може отримати доступ до API YouTube. Щоб виправити цю помилку, дайте дозвіл у вікні, яке зараз з'явиться, зачекайте кілька секунд і потім перезавантажте сторінку."
+    },
+    "acceptPermission": {
+        "message": "Надати дозвіл"
+    },
+    "permissionRequestSuccess": {
+        "message": "Дозвіл отримано!"
+    },
+    "permissionRequestFailed": {
+        "message": "Не вдалося отримати дозвіл, ви натиснули на \"Блокувати\"?"
+    },
+    "adblockerIssueWhitelist": {
+        "message": "Якщо ви не можете вирішити цю проблему, спробуйте відключити \"Примусова перевірка каналів перед пропуском\" в налаштуваннях, так як SponsorBlock не може визначити назву каналу для цього відео"
     },
     "forceChannelCheck": {
         "message": "Примусова перевірка каналів перед пропуском"

public/_locales/vi/messages.json

@@ -232,9 +232,6 @@
     "setSkipShortcut": {
         "message": "Chọn phím tắt để bỏ qua phân đoạn"
     },
-    "setStartSponsorShortcut": {
-        "message": "Đặt phím tắt đánh dấu đoạn quảng cáo bắt đầu"
-    },
     "setSubmitKeybind": {
         "message": "Đặt phím tắt đăng đoạn quảng cáo"
     },
@@ -573,12 +570,6 @@
     "hiddenDueToDuration": {
         "message": "đã bị ẩn: quá ngắn"
     },
-    "channelDataNotFound": {
-        "message": "Chưa đọc được ID của kênh."
-    },
-    "itCouldBeAdblockerIssue": {
-        "message": "Nếu lỗi này tiếp tục xuất hiện, nó có thể là do trình chặn quảng cáo của bạn. Hãy kiểm tra ở đây: https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "Bắt buộc kiểm tra kênh trước khi bỏ qua"
     },

public/_locales/zh_CN/messages.json

@@ -235,9 +235,6 @@
     "setSkipShortcut": {
         "message": "设置用于跳过片段的按键"
     },
-    "setStartSponsorShortcut": {
-        "message": "设定片段开始的绑定按键"
-    },
     "setSubmitKeybind": {
         "message": "设定提交的绑定按键"
     },
@@ -579,18 +576,12 @@
     "hiddenDueToDuration": {
         "message": "隐藏：过短"
     },
-    "channelDataNotFound": {
-        "message": "频道 ID 尚未加载。"
-    },
     "acceptPermission": {
         "message": "接受权限"
     },
     "permissionRequestSuccess": {
         "message": "权限请求成功！"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "如果这种情况不断发生，它可能是由您的广告拦截器引起的。请查看 https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "跳过前强制进行频道检查"
     },

public/_locales/zh_TW/messages.json

@@ -200,6 +200,9 @@
     "whatViewTracking": {
         "message": "這個功能會追蹤您跳過的片段來讓其他使用者知道您的提交幫助了其他人多少，並同時用作計算錯誤提交的方式。這個擴充功能會在您每一次跳過片段時向伺服器回報。希望大家盡量不要改變這個設定來確保資料的正確性。 ：）"
     },
+    "enableViewTrackingInPrivate": {
+        "message": "在私人/無痕分頁啟用跳過次數追蹤"
+    },
     "enableQueryByHashPrefix": {
         "message": "使用雜湊前綴查詢"
     },
@@ -239,7 +242,7 @@
         "message": "設定跳過段落的快捷鍵"
     },
     "setStartSponsorShortcut": {
-        "message": "設定開始片段快捷鍵"
+        "message": "設定開始/結束片段快捷鍵"
     },
     "setSubmitKeybind": {
         "message": "設定提交快捷鍵"
@@ -579,9 +582,6 @@
     "hiddenDueToDuration": {
         "message": "隱藏：太短"
     },
-    "channelDataNotFound": {
-        "message": "頻道 ID 尚未載入"
-    },
     "videoInfoFetchFailed": {
         "message": "似乎有東西在阻止 SponsorBlock 獲取影片資料。請查看 https://github.com/ajayyy/SponsorBlock/issues/741 以了解更多資訊。"
     },
@@ -597,9 +597,6 @@
     "adblockerIssueWhitelist": {
         "message": "如果您沒辦法解決這個問題，請停用\"強制在跳過前檢查頻道\"，因為 SponsorBlock 無法獲取這部影片的頻道資料。"
     },
-    "itCouldBeAdblockerIssue": {
-        "message": "如果這種情況不斷發生，它可能是由您的廣告攔截器引起的。請查看 https://github.com/ajayyy/SponsorBlock/wiki/Fix-Ad-Blocker-Blocking-SponsorBlock's-Requests"
-    },
     "forceChannelCheck": {
         "message": "在跳過之前強制頻道檢查"
     },

public/content.css

@@ -9,6 +9,12 @@
 	height: 100%;
 	transform: scaleY(0.6) translateY(-30%) translateY(1.5px);
 	z-index: 40;
+
+	transition: transform .1s cubic-bezier(0,0,0.2,1);
+}
+
+#previewbar.hovered {
+	transform: scaleY(1)
 }
 
 .previewbar {
@@ -69,6 +75,22 @@
 	vertical-align: top;
 }
 
+#infoButton.playerButton:not(.hidden) {
+	transform: translateX(0%) scale(1);
+	/* opacity is from YouTube page */
+	transition: transform 0.2s, opacity .1s cubic-bezier(0.4,0.0,1,1) !important;
+}
+
+#infoButton.playerButton.hidden {
+	transform: translateX(100%) scale(0);
+	/* opacity is from YouTube page */
+	transition: transform 0.2s, opacity .1s cubic-bezier(0.4,0.0,1,1) !important;
+}
+
+.playerButton.hidden {
+	display: none;
+}
+
 .sponsorSkipObject {
 	font-family: Roboto, Arial, Helvetica, sans-serif;
 		
@@ -116,6 +138,11 @@
 	border-collapse: unset;
 }
 
+/* For Cloudtube */
+.sponsorSkipNotice td, .sponsorSkipNotice table, .sponsorSkipNotice th {
+	border: none;
+}
+
 .sponsorSkipNoticeFadeIn {
 	animation: fadeIn 0.5s;
 }
@@ -124,7 +151,7 @@
 	animation: fadeOut 3s cubic-bezier(0.55, 0.055, 0.675, 0.19);
 }
 
-.sponsorSkipNoticeTimeLeft {
+.sponsorSkipNotice .sponsorSkipNoticeTimeLeft {
 	color: #eeeeee;
 
 	border-radius: 4px;
@@ -141,7 +168,7 @@
   	transition: bottom 0.2s;
 }
 
-.sponsorSkipNoticeUnskipSection {
+.sponsorSkipNotice .sponsorSkipNoticeUnskipSection {
 	float: left;
 
 	border-left: 1px solid rgb(150, 150, 150);
@@ -406,10 +433,6 @@ input::-webkit-inner-spin-button {
     padding: 3px;
 }
 
-.helpButton {
-
-}
-
 .helpButton {
 	height: 25px;
 	cursor: pointer;

public/icons/PlayerInfoIconSponsorBlocker.svg

@@ -1,120 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 565.15 568"
-   version="1.1"
-   id="svg16"
-   sodipodi:docname="PlayerInfoIconSponsorBlocker.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="D:\Dell Data\_Projects\_____SponsorSkip\ignored\svg\SponsorBlocker4.png"
-   inkscape:export-xdpi="43.436523"
-   inkscape:export-ydpi="43.436523">
-  <metadata
-     id="metadata20">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>LogoSponsorBlocker2</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     id="namedview18"
-     showgrid="false"
-     inkscape:zoom="0.83098592"
-     inkscape:cx="203.60203"
-     inkscape:cy="226.95062"
-     inkscape:window-x="477"
-     inkscape:window-y="961"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg16" />
-  <defs
-     id="defs4">
-    <style
-       id="style2">.cls-1{fill:red;}.cls-2{fill:#fff;}</style>
-  </defs>
-  <title
-     id="title6">LogoSponsorBlocker2</title>
-  <path
-     class="cls-1"
-     d="m 282.58,568 a 65,65 0 0 1 -34.14,-9.66 C 95.41,463.94 2.54,300.46 0,121 a 64.91,64.91 0 0 1 34,-58.09 522.56,522.56 0 0 1 497.16,0 64.91,64.91 0 0 1 34,58.12 c -2.53,179.43 -95.4,342.91 -248.42,437.3 A 65,65 0 0 1 282.58,568 Z m 0,-548.31 A 502.24,502.24 0 0 0 43.4,80.22 45.27,45.27 0 0 0 19.7,120.75 c 2.44,172.67 91.81,330 239.07,420.83 a 46.19,46.19 0 0 0 47.61,0 C 453.64,450.73 543,293.42 545.45,120.75 A 45.26,45.26 0 0 0 521.75,80.21 502.26,502.26 0 0 0 282.58,19.69 Z"
-     id="path8"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff" />
-  <path
-     style="fill:#ffffff"
-     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 282.57422 102.03711 C 371.92182 102.03711 444.65625 174.74933 444.65625 264.11719 C 444.65625 353.48504 371.92182 426.19922 282.57422 426.19922 C 193.20636 426.19922 120.49414 353.48504 120.49414 264.11719 C 120.49414 174.74933 193.20636 102.03711 282.57422 102.03711 z M 282.57422 132.42578 C 209.96157 132.42578 150.88281 191.50454 150.88281 264.11719 C 150.88281 336.72984 209.96157 395.80859 282.57422 395.80859 C 355.18687 395.80859 414.26562 336.72984 414.26562 264.11719 C 414.26562 191.50454 355.18687 132.42578 282.57422 132.42578 z M 280.01172 149.12109 C 294.1331 149.12109 304.375 159.72726 304.375 173.16992 C 304.375 186.6531 294.10302 196.60156 279.67773 196.60156 C 264.94855 196.60156 255.32422 186.6531 255.32422 173.16992 C 255.32422 159.72726 264.94824 149.12109 280.01172 149.12109 z M 245.07422 217.8125 L 302.4707 217.8125 L 302.45117 352.50391 L 320.74609 353.47656 L 320.74609 379.11523 L 244.42578 379.11523 L 244.42578 354.74219 L 255.01172 353.78906 C 260.76562 353.15087 264.29102 351.21646 264.29102 343.51758 L 264.29102 254.36328 C 264.29102 247.28233 262.3858 245.04297 256.27734 245.04297 L 245.07422 244.41406 L 245.07422 217.8125 z "
-     id="path10" />
-  <g
-     id="g883"
-     transform="matrix(10.130113,0,0,10.130113,45.728213,14.587871)"
-     style="fill:#ffffff">
-    <g
-       id="g827"
-       style="fill:#ffffff" />
-    <g
-       id="g829"
-       style="fill:#ffffff" />
-    <g
-       id="g831"
-       style="fill:#ffffff" />
-    <g
-       id="g833"
-       style="fill:#ffffff" />
-    <g
-       id="g835"
-       style="fill:#ffffff" />
-    <g
-       id="g837"
-       style="fill:#ffffff" />
-    <g
-       id="g839"
-       style="fill:#ffffff" />
-    <g
-       id="g841"
-       style="fill:#ffffff" />
-    <g
-       id="g843"
-       style="fill:#ffffff" />
-    <g
-       id="g845"
-       style="fill:#ffffff" />
-    <g
-       id="g847"
-       style="fill:#ffffff" />
-    <g
-       id="g849"
-       style="fill:#ffffff" />
-    <g
-       id="g851"
-       style="fill:#ffffff" />
-    <g
-       id="g853"
-       style="fill:#ffffff" />
-    <g
-       id="g855"
-       style="fill:#ffffff" />
-    <g
-       id="g857"
-       style="fill:#ffffff" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" id="svg16" version="1.1" viewBox="0 0 565.15 568">
+  <defs/>
+  <defs id="defs4"/>
+  <path id="path8" fill="#fff" d="M282.58 568a65 65 0 01-34.14-9.66C95.41 463.94 2.54 300.46 0 121a64.91 64.91 0 0134-58.09 522.56 522.56 0 01497.16 0 64.91 64.91 0 0134 58.12c-2.53 179.43-95.4 342.91-248.42 437.3a65 65 0 01-34.16 9.67zm0-548.31A502.24 502.24 0 0043.4 80.22a45.27 45.27 0 00-23.7 40.53c2.44 172.67 91.81 330 239.07 420.83a46.19 46.19 0 0047.61 0C453.64 450.73 543 293.42 545.45 120.75a45.26 45.26 0 00-23.7-40.54 502.26 502.26 0 00-239.17-60.52z"/>
+  <path id="path10" fill="#fff" d="M284.705 42.693A479.9 479.9 0 0054.37 100.42a22.53 22.53 0 00-11.7 20c2.4 169.84 93.001 318.22 228.161 401.59a22.48 22.48 0 0023.49 0c135.16-83.37 225.76-231.75 228.16-401.59a22.53 22.53 0 00-11.7-20 479.9 479.9 0 00-226.075-57.727zm-2.13 59.344c89.347 0 162.081 72.712 162.081 162.08 0 89.368-72.734 162.082-162.082 162.082-89.368 0-162.08-72.714-162.08-162.082s72.712-162.08 162.08-162.08zm0 30.389c-72.613 0-131.692 59.079-131.692 131.691 0 72.613 59.079 131.692 131.691 131.692 72.613 0 131.692-59.08 131.692-131.692 0-72.612-59.08-131.691-131.692-131.691zm-2.563 16.695c14.121 0 24.363 10.606 24.363 24.049 0 13.483-10.272 23.432-24.697 23.432-14.73 0-24.354-9.949-24.354-23.432 0-13.443 9.624-24.049 24.688-24.049zm-34.938 68.691h57.397l-.02 134.692 18.295.973v25.638h-76.32v-24.373l10.586-.953c5.754-.638 9.279-2.573 9.279-10.271v-89.155c0-7.08-1.905-9.32-8.014-9.32l-11.203-.629v-26.601z"/>
 </svg>

public/options/options.css

@@ -66,14 +66,22 @@ body {
     display: inline-block;
 }
 
-.switch-container:after {
+.switch-container {
 	content: attr(label-name);
     position: absolute;
-    padding: 4px;
     width: max-content;
 
     font-size: 14px;
     color: white;
+
+    display: table;
+}
+
+.switch-container .switch-label {
+    display: table-cell;
+    vertical-align: middle;
+
+    padding: 4px;
 }
 
 .text-label-container {
@@ -268,23 +276,13 @@ p,li {
     padding: 10px;
 }
 
-p,li,code,a {
-    max-width: 60%;
-    text-align: left;
-    overflow-wrap: break-word;
-}
-
 @media screen and (orientation:portrait) {
-    p,li,code,a {
+    #options {
         max-width: 100%;
     }
-  
-    .projectPreviewImage {
-        position: unset;
-        width: 130px;
-        display: block;
-        margin: auto;
-        transform: none;
+
+    .previewColorOption {
+        display: none;
     }
 }
 

public/options/options.html

@@ -3,7 +3,8 @@
 <head>
   <title>Options - SponsorBlock</title>
   <meta charset="utf-8">
-
+  <meta name="viewport" content="width=device-width, initial-scale=1" /> 
+  
   <link href="options.css" rel="stylesheet"/>
 
   <script src="../js/vendor.js"></script>
@@ -31,24 +32,31 @@
 			<br/>
 			<br/>
 
-			<div id="support-invidious" option-type="toggle" sync-option="supportInvidious">
-				<label class="switch-container" label-name="__MSG_supportInvidious__">
+			<div id="support-invidious" option-type="toggle" sync-option="supportInvidious" no-safari="true">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox">
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_supportOtherSites__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
-				<div class="small-description">__MSG_supportInvidiousDescription__</div>
-			</div>
+				<div class="small-description">(__MSG_supportedSites__ Invidious, CloudTube)</div>
+				<br/>
+				<span class="small-description">__MSG_supportOtherSitesDescription__ </span>
 
-			<br/>
-			<br/>
+				<br/>
+				<br/>
+				<br/>
+			</div>
 	
-			<div option-type="private-text-change" sync-option="invidiousInstances">
+			<div option-type="private-text-change" sync-option="invidiousInstances" no-safari="true">
 				<div class="option-button trigger-button">
 					__MSG_addInvidiousInstance__
 				</div>
@@ -79,10 +87,10 @@
 					<span class="small-description">__MSG_currentInstances__</span>
 					<span class="small-description" option-type="display" sync-option="invidiousInstances"></span>
 				</div>
-			</div>
 
-			<br/>
-			<br/>
+				<br/>
+				<br/>
+			</div>
 
 			<div option-type="keybind-change" sync-option="skipKeybind">
 				<div class="option-button trigger-button">
@@ -148,7 +156,7 @@
 			<br/>
 	
 			<div option-type="number-change" sync-option="minDuration">
-				<label class="number-container" label-name="__MSG_minDuration__">
+				<label class="number-container">
 					<input type="number" step="0.1" min="0">
 				</label>
 
@@ -162,25 +170,33 @@
 			<br/>
 	
 			<div option-type="toggle" toggle-type="reverse" sync-option="dontShowNotice">
-				<label class="switch-container" label-name="__MSG_showSkipNotice__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showSkipNotice__
+					</div>
 				</label>
 			</div>
 	
+			<br/>
 			<br/>
 			<br/>
 
 			<div option-type="toggle" sync-option="forceChannelCheck">
-				<label class="switch-container" label-name="__MSG_forceChannelCheck__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_forceChannelCheck__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -191,13 +207,17 @@
 			<br/>
 	
 			<div option-type="toggle" toggle-type="reverse" sync-option="hideVideoPlayerControls">
-				<label class="switch-container" label-name="__MSG_showButtons__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showButtons__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -208,13 +228,17 @@
 			<br/>
 	
 			<div option-type="toggle" toggle-type="reverse" sync-option="hideInfoButtonPlayerControls">
-				<label class="switch-container" label-name="__MSG_showInfoButton__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showInfoButton__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -225,16 +249,20 @@
 			<br/>
 	
 			<div option-type="toggle" toggle-type="reverse" sync-option="hideDeleteButtonPlayerControls">
-				<label class="switch-container" label-name="__MSG_showDeleteButton__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showDeleteButton__
+					</div>
 				</label>
 	
 				<br/>
 				<br/>
-	
+				<br/>
+
 				<div class="small-description">__MSG_whatDeleteButton__</div>
 			</div>
 
@@ -242,13 +270,17 @@
 			<br/>
 	
 			<div option-type="toggle" toggle-type="reverse" sync-option="hideUploadButtonPlayerControls">
-				<label class="switch-container" label-name="__MSG_showUploadButton__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showUploadButton__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -259,13 +291,17 @@
 			<br/>
 
 			<div option-type="toggle" sync-option="audioNotificationOnSkip">
-				<label class="switch-container" label-name="__MSG_audioNotification__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_audioNotification__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -276,13 +312,17 @@
 			<br/>
 
 			<div option-type="toggle" sync-option="showTimeWithSkips">
-				<label class="switch-container" label-name="__MSG_showTimeWithSkips__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_showTimeWithSkips__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -293,13 +333,17 @@
 			<br/>
 	
 			<div option-type="toggle" sync-option="trackViewCount">
-				<label class="switch-container" label-name="__MSG_enableViewTracking__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_enableViewTracking__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -309,14 +353,35 @@
 			<br/>
 			<br/>
 
-			<div option-type="toggle" sync-option="refetchWhenNotFound">
-				<label class="switch-container" label-name="__MSG_enableRefetchWhenNotFound__">
+			<div option-type="toggle" sync-option="trackViewCountInPrivate" private-mode-only="true">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox" checked>
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_enableViewTrackingInPrivate__
+					</div>
+				</label>
+
+				<br/>
+				<br/>
+				<br/>
+				<br/>
+			</div>
+
+			<div option-type="toggle" sync-option="refetchWhenNotFound">
+				<label class="switch-container">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+					<div class="switch-label">
+						__MSG_enableRefetchWhenNotFound__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	
@@ -392,13 +457,17 @@
 			<br/>
 	
 			<div option-type="toggle" sync-option="testingServer" confirm-message="testingServerWarning">
-				<label class="switch-container" label-name="__MSG_enableTestingServer__">
+				<label class="switch-container">
 					<label class="switch">
 						<input type="checkbox">
 						<span class="slider round"></span>
 					</label>
+					<div class="switch-label">
+						__MSG_enableTestingServer__
+					</div>
 				</label>
 	
+				<br/>
 				<br/>
 				<br/>
 	

public/popup.css

@@ -6,10 +6,18 @@
   --sb-green-bg: #077B27;
 }
 
-.hidden {
+#sponsorBlockPopupBody .hidden {
   display: none !important;
 }
 
+.sponsorTimesCategoryColorCircle {
+  margin: 0 8px;
+}
+
+.voteButtonsContainer--hide {
+  display: none;
+}
+
 @media only screen and (max-width: 600px) {
   #sponsorBlockPopupBody {
     width: 100%; 
@@ -43,6 +51,7 @@
   outline: none;
 
   cursor: pointer;
+  white-space: nowrap;
 }
 
 .dot {
@@ -277,8 +286,6 @@ background-color:#ec1c1c;
   min-height: 16px;
   margin-top: auto;
   margin-bottom: auto;
-
-  height: 100%;
 }
 
 .SBWhitelistIcon>path {

public/popup.html

@@ -136,9 +136,9 @@
       <a href="https://github.com/ajayyy/SponsorBlock" target="_blank" rel="noopener">GitHub</a>
       <br/>
       <a href="https://discord.gg/QnmVMpU" target="_blank" rel="noopener">Discord</a> |
-      <a href="https://matrix.to/#/+sponsorblock:ajay.app" target="_blank" rel="noopener">Matrix</a> |
+      <a href="https://matrix.to/#/#sponsor:ajay.app?via=ajay.app&via=matrix.org&via=mozilla.org" target="_blank" rel="noopener">Matrix</a> |
       <a id="helpButton" style="cursor: pointer;">__MSG_help__</a> |
-      <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener">$</a>
+      <a href="https://sponsor.ajay.app/donate" target="_blank" rel="noopener" id="sbDonate">$</a>
     </footer>
 
     <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
@@ -146,4 +146,4 @@
   <!-- Scripts that need to load after the html -->
   <script src="./js/vendor.js" async></script>
   <script src="./js/popup.js" async></script>
-</body>
+</body>

src/components/CategoryChooserComponent.tsx

@@ -34,15 +34,18 @@ class CategoryChooserComponent extends React.Component<CategoryChooserProps, Cat
                             {chrome.i18n.getMessage("category")}
                         </td>
 
-                        <td id={"CategorySkipOption"}>
+                        <td id={"CategorySkipOption"}
+                            className="skipOption">
                             {chrome.i18n.getMessage("skipOption")}
                         </td>
 
-                        <td id={"CategoryColorOption"}>
+                        <td id={"CategoryColorOption"}
+                            className="colorOption">
                             {chrome.i18n.getMessage("seekBarColor")}
                         </td>
 
-                        <td id={"CategoryPreviewColorOption"}>
+                        <td id={"CategoryPreviewColorOption"}
+                            className="previewColorOption">
                             {chrome.i18n.getMessage("previewColor")}
                         </td>
                     </tr>

src/components/CategorySkipOptionsComponent.tsx

@@ -21,8 +21,8 @@ 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,
+            color: props.defaultColor || Config.config.barTypes[this.props.category]?.color,
+            previewColor: props.defaultPreviewColor || Config.config.barTypes["preview-" + this.props.category]?.color,
         }
     }
 
@@ -56,7 +56,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                             {chrome.i18n.getMessage("category_" + this.props.category)}
                     </td>
 
-                    <td id={this.props.category + "SkipOption"}>
+                    <td id={this.props.category + "SkipOption"}
+                        className="skipOption">
                         <select
                             className="categoryOptionsSelector"
                             defaultValue={defaultOption}
@@ -65,7 +66,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                         </select>
                     </td>
                     
-                    <td id={this.props.category + "ColorOption"}>
+                    <td id={this.props.category + "ColorOption"}
+                        className="colorOption">
                         <input
                             className="categoryColorTextBox option-text-box"
                             type="color"
@@ -73,7 +75,8 @@ class CategorySkipOptionsComponent extends React.Component<CategorySkipOptionsPr
                             value={this.state.color} />
                     </td>
 
-                    <td id={this.props.category + "PreviewColorOption"}>
+                    <td id={this.props.category + "PreviewColorOption"}
+                        className="previewColorOption">
                         <input
                             className="categoryColorTextBox option-text-box"
                             type="color"

src/components/NoticeComponent.tsx

@@ -15,7 +15,8 @@ export interface NoticeProps {
     // Callback for when this is closed
     closeListener: () => void,
 
-    zIndex?: number
+    zIndex?: number,
+    style?: React.CSSProperties
 }
 
 export interface NoticeState {
@@ -70,7 +71,8 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
 
     render(): React.ReactElement {
         const noticeStyle: React.CSSProperties = {
-            zIndex: this.props.zIndex || (50 + this.amountOfPreviousNotices)
+            zIndex: this.props.zIndex || (1000 + this.amountOfPreviousNotices),
+            ...(this.props.style ?? {})
         }
 
         return (
@@ -94,6 +96,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                             </img>
 
                             <span id={"sponsorSkipMessage" + this.idSuffix}
+                                style={{float: "left"}}
                                 className="sponsorSkipMessage sponsorSkipObject">
                                 
                                 {this.state.noticeTitle}

src/components/SkipNoticeComponent.tsx

@@ -126,9 +126,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
     }
 
     render(): React.ReactElement {
-        const noticeStyle: React.CSSProperties = {
-            zIndex: 1000 + this.amountOfPreviousNotices
-        }
+        const noticeStyle: React.CSSProperties = { }
         if (this.contentContainer().onMobileYouTube) {
             noticeStyle.bottom = "4em";
             noticeStyle.transform = "scale(0.8) translate(10%, 10%)";
@@ -142,6 +140,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 timed={true}
                 maxCountdownTime={this.state.maxCountdownTime}
                 videoSpeed={() => this.contentContainer().v?.playbackRate}
+                style={noticeStyle}
                 ref={this.noticeRef}
                 closeListener={() => this.closeListener()}>
                     

src/config.ts

@@ -21,6 +21,7 @@ interface SBConfig {
     showTimeWithSkips: boolean,
     disableSkipping: boolean,
     trackViewCount: boolean,
+    trackViewCountInPrivate: boolean,
     dontShowNotice: boolean,
     hideVideoPlayerControls: boolean,
     hideInfoButtonPlayerControls: boolean,
@@ -37,6 +38,8 @@ interface SBConfig {
     testingServer: boolean,
     refetchWhenNotFound: boolean,
     ytInfoPermissionGranted: boolean,
+    askAboutUnlistedVideos: boolean,
+    allowExpirements: boolean,
 
     // What categories should be skipped
     categorySelections: CategorySelection[],
@@ -46,14 +49,16 @@ interface SBConfig {
         "preview-chooseACategory": PreviewBarOption,
         "sponsor": PreviewBarOption,
         "preview-sponsor": PreviewBarOption,
+        "selfpromo": PreviewBarOption,
+        "preview-selfpromo": PreviewBarOption,
+        "interaction": PreviewBarOption,
+        "preview-interaction": PreviewBarOption,
         "intro": PreviewBarOption,
         "preview-intro": PreviewBarOption,
         "outro": PreviewBarOption,
         "preview-outro": PreviewBarOption,
-        "interaction": PreviewBarOption,
-        "preview-interaction": PreviewBarOption,
-        "selfpromo": PreviewBarOption,
-        "preview-selfpromo": PreviewBarOption,
+        "preview": PreviewBarOption,
+        "preview-preview": PreviewBarOption,
         "music_offtopic": PreviewBarOption,
         "preview-music_offtopic": PreviewBarOption,
     }
@@ -154,6 +159,7 @@ const Config: SBObject = {
         showTimeWithSkips: true,
         disableSkipping: false,
         trackViewCount: true,
+        trackViewCountInPrivate: true,
         dontShowNotice: false,
         hideVideoPlayerControls: false,
         hideInfoButtonPlayerControls: false,
@@ -170,6 +176,8 @@ const Config: SBObject = {
         testingServer: false,
         refetchWhenNotFound: true,
         ytInfoPermissionGranted: false,
+        askAboutUnlistedVideos: true,
+        allowExpirements: true,
 
         categorySelections: [{
             name: "sponsor",
@@ -190,6 +198,22 @@ const Config: SBObject = {
                 color: "#007800",
                 opacity: "0.7"
             },
+            "selfpromo": {
+                color: "#ffff00",
+                opacity: "0.7"
+            },
+            "preview-selfpromo": {
+                color: "#bfbf35",
+                opacity: "0.7"
+            },
+            "interaction": {
+                color: "#cc00ff",
+                opacity: "0.7"
+            },
+            "preview-interaction": {
+                color: "#6c0087",
+                opacity: "0.7"
+            },
             "intro": {
                 color: "#00ffff",
                 opacity: "0.7"
@@ -206,20 +230,12 @@ const Config: SBObject = {
                 color: "#000070",
                 opacity: "0.7"
             },
-            "interaction": {
-                color: "#cc00ff",
+            "preview": {
+                color: "#008fd6",
                 opacity: "0.7"
             },
-            "preview-interaction": {
-                color: "#6c0087",
-                opacity: "0.7"
-            },
-            "selfpromo": {
-                color: "#ffff00",
-                opacity: "0.7"
-            },
-            "preview-selfpromo": {
-                color: "#bfbf35",
+            "preview-preview": {
+                color: "#005799",
                 opacity: "0.7"
             },
             "music_offtopic": {
@@ -325,6 +341,25 @@ function fetchConfig(): Promise<void> {
 }
 
 function migrateOldFormats(config: SBConfig) {
+    // Adding preview category
+    if (!config["previewCategoryUpdate"]) {
+        config["previewCategoryUpdate"] = true;
+        for (const selection of config.categorySelections) {
+            if (selection.name === "intro" 
+                    && selection.option === CategorySkipOption.AutoSkip ||  selection.option === CategorySkipOption.ManualSkip) {
+                
+                // Add a default skip option for preview category
+                config.categorySelections.push({
+                    name: "preview",
+                    option: CategorySkipOption.ManualSkip
+                });
+                // Ensure it gets updated
+                config.categorySelections = config.categorySelections;
+                break;
+            }
+        }
+    }
+
     if (config["disableAutoSkip"]) {
         for (const selection of config.categorySelections) {
             if (selection.name === "sponsor") {
@@ -428,6 +463,14 @@ function migrateOldFormats(config: SBConfig) {
 
         chrome.storage.sync.remove("sponsorTimes");
     }
+
+    // Remove some old unused options
+    if (config["sponsorVideoID"] !== undefined) {
+        chrome.storage.sync.remove("sponsorVideoID");
+    }
+    if (config["previousVideoID"] !== undefined) {
+        chrome.storage.sync.remove("previousVideoID");
+    }
 }
 
 async function setupConfig() {

src/content.ts

@@ -1,6 +1,6 @@
 import Config from "./config";
 
-import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, FetchResponse, VideoInfo, StorageChangesObject } from "./types";
+import { SponsorTime, CategorySkipOption, VideoID, SponsorHideType, FetchResponse, VideoInfo, StorageChangesObject, ChannelIDInfo, ChannelIDStatus } from "./types";
 
 import { ContentContainer } from "./types";
 import Utils from "./utils";
@@ -13,6 +13,7 @@ import SkipNotice from "./render/SkipNotice";
 import SkipNoticeComponent from "./components/SkipNoticeComponent";
 import SubmissionNotice from "./render/SubmissionNotice";
 import { Message, MessageResponse } from "./messageTypes";
+import GenericNotice from "./render/GenericNotice";
 
 // Hack to get the CSS loaded on permission-based sites (Invidious)
 utils.wait(() => Config.config !== null, 5000, 10).then(addCSS);
@@ -29,21 +30,22 @@ const skipNotices: SkipNotice[] = [];
 // JSON video info 
 let videoInfo: VideoInfo = null;
 //the channel this video is about
-let channelID: string;
+let channelIDInfo: ChannelIDInfo;
 
 // Skips are scheduled to ensure precision.
 // Skips are rescheduled every seeking event.
 // Skips are canceled every seeking event
 let currentSkipSchedule: NodeJS.Timeout = null;
-let seekListenerSetUp = false
 
 /** Has the sponsor been skipped */
 let sponsorSkipped: boolean[] = [];
 
 //the video
 let video: HTMLVideoElement;
+let videoMutationObserver: MutationObserver = null;
 // List of videos that have had event listeners added to them
-const videoRootsWithEventListeners: HTMLDivElement[] = [];
+const videosWithEventListeners: HTMLVideoElement[] = [];
+const controlsWithEventListeners: HTMLElement[] = []
 
 let onInvidious;
 let onMobileYouTube;
@@ -51,9 +53,6 @@ let onMobileYouTube;
 //the video id of the last preview bar update
 let lastPreviewBarUpdate;
 
-//whether the duration listener listening for the duration changes of the video has been setup yet
-let durationListenerSetUp = false;
-
 // Is the video currently being switched
 let switchingVideos = null;
 
@@ -75,10 +74,11 @@ let previewBar: PreviewBar = null;
 let controls: HTMLElement | null = null;
 
 /** Contains buttons created by `createButton()`. */
-const playerButtons: Record<string, {button: HTMLButtonElement, image: HTMLImageElement}> = {};
+const playerButtons: Record<string, {button: HTMLButtonElement, image: HTMLImageElement, setupListener: boolean}> = {};
 
 // Direct Links after the config is loaded
 utils.wait(() => Config.config !== null, 1000, 1).then(() => videoIDChange(getYouTubeVideoID(document.URL)));
+addHotkeyListener();
 
 //the amount of times the sponsor lookup has retried
 //this only happens if there is an error
@@ -160,7 +160,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             break;
         case "getChannelID":
             sendResponse({
-                channelID: channelID
+                channelID: channelIDInfo.id
             });
 
             break;
@@ -212,7 +212,10 @@ function resetValues() {
 
     videoInfo = null;
     channelWhitelisted = false;
-    channelID = null;
+    channelIDInfo = {
+        status: ChannelIDStatus.Fetching,
+        id: null
+    };
 
     //empty the preview bar
     if (previewBar !== null) {
@@ -270,6 +273,9 @@ async function videoIDChange(id) {
     // Update whitelist data when the video data is loaded
     whitelistCheck();
 
+    // Temporary expirement
+    unlistedCheck();
+
     //setup the preview bar
     if (previewBar === null) {
         if (onMobileYouTube) {
@@ -390,9 +396,9 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
         return;
     }
 
-    if (video.paused) return;
+    if (!video || video.paused) return;
 
-    if (Config.config.disableSkipping || channelWhitelisted || (channelID === null && Config.config.forceChannelCheck)){
+    if (Config.config.disableSkipping || channelWhitelisted || (channelIDInfo.status === ChannelIDStatus.Fetching && Config.config.forceChannelCheck)){
         return;
     }
 
@@ -474,48 +480,60 @@ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boole
     }
 }
 
-async function sponsorsLookup(id: string) {
-    video = document.querySelector('video') // Youtube video player
-    //there is no video here
-    if (video == null) {
-        setTimeout(() => sponsorsLookup(id), 100);
-        return;
+function setupVideoMutationListener() {
+    const videoContainer = document.querySelector(".html5-video-container");
+    if (!videoContainer || videoMutationObserver !== null || onInvidious) return;
+    
+    videoMutationObserver = new MutationObserver(refreshVideoAttachments);
+
+    videoMutationObserver.observe(videoContainer, { 
+        attributes: true, 
+        childList: true, 
+        subtree: true 
+    });
+}
+
+function refreshVideoAttachments() {
+    const newVideo = document.querySelector('video');
+    if (newVideo && newVideo !== video) {
+        video = newVideo;
+
+        if (!videosWithEventListeners.includes(video)) {
+            videosWithEventListeners.push(video);
+
+            setupVideoListeners();
+        }
     }
+}
 
-    addHotkeyListener();
+function setupVideoListeners() {
+    //wait until it is loaded
+    video.addEventListener('durationchange', durationChangeListener);
 
-    if (!durationListenerSetUp) {
-        durationListenerSetUp = true;
-
-        //wait until it is loaded
-        video.addEventListener('durationchange', durationChangeListener);
-    }
-
-    if (!seekListenerSetUp && !Config.config.disableSkipping) {
-        seekListenerSetUp = true;
+    if (!Config.config.disableSkipping) {
         switchingVideos = false;
 
         video.addEventListener('play', () => {
             switchingVideos = false;
-
+    
             // If it is not the first event, then the only way to get to 0 is if there is a seek event
             // This check makes sure that changing the video resolution doesn't cause the extension to think it
             // gone back to the begining
             if (!firstEvent && video.currentTime === 0) return;
             firstEvent = false;
-
+    
             // Check if an ad is playing
             updateAdFlag();
-
+    
             // Make sure it doesn't get double called with the playing event
             if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3
                     || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
                 lastCheckTime = Date.now();
                 lastCheckVideoTime = video.currentTime;
-
+    
                 startSponsorSchedule();
             }
-
+    
         });
         video.addEventListener('playing', () => {
             // Make sure it doesn't get double called with the play event
@@ -523,7 +541,7 @@ async function sponsorsLookup(id: string) {
                     || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) {
                 lastCheckTime = Date.now();
                 lastCheckVideoTime = video.currentTime;
-
+    
                 startSponsorSchedule();
             }
         });
@@ -532,7 +550,7 @@ async function sponsorsLookup(id: string) {
                 // Reset lastCheckVideoTime
                 lastCheckTime = Date.now();
                 lastCheckVideoTime = video.currentTime;
-
+    
                 startSponsorSchedule();
             }
         });
@@ -543,12 +561,23 @@ async function sponsorsLookup(id: string) {
             // Reset lastCheckVideoTime
             lastCheckVideoTime = -1;
             lastCheckTime = 0;
-
+    
             cancelSponsorSchedule();
         });
-
+    
         startSponsorSchedule();
     }
+}
+
+async function sponsorsLookup(id: string) {
+    if (!video) refreshVideoAttachments();
+    //there is still no video here
+    if (!video) {
+        setTimeout(() => sponsorsLookup(id), 100);
+        return;
+    }
+
+    setupVideoMutationListener();
 
     //check database for sponsor times
     //made true once a setTimeout has been created to try again after a server error
@@ -565,22 +594,12 @@ async function sponsorsLookup(id: string) {
         categories
     }).then(async (response: FetchResponse) => {
         if (response?.ok) {
-            let result = JSON.parse(response.responseText);
-            result = result.filter((video) => video.videoID === id);
-            if (result.length > 0) {
-                result = result[0].segments;
-                if (result.length === 0) { // return if no segments found
-                    retryFetch(id);
-                    return;
-                }
-            } else { // return if no video found
-                retryFetch(id);
-                return;
-            }
-
-            const recievedSegments: SponsorTime[] = result;
-            if (!recievedSegments.length) {
-                console.error("[SponsorBlock] Server returned malformed response: " + JSON.stringify(recievedSegments));
+            const recievedSegments: SponsorTime[] = JSON.parse(response.responseText)
+                        ?.filter((video) => video.videoID === id)
+                        ?.map((video) => video.segments)[0];
+            if (!recievedSegments || !recievedSegments.length) { 
+                // return if no video found
+                retryFetch();
                 return;
             }
 
@@ -596,6 +615,7 @@ async function sponsorsLookup(id: string) {
                 }
             }
 
+            const oldSegments = sponsorTimes || [];
             sponsorTimes = recievedSegments;
 
             // Hide all submissions smaller than the minimum duration
@@ -607,6 +627,15 @@ async function sponsorsLookup(id: string) {
                 }
             }
 
+            for (const segment of oldSegments) {
+                const otherSegment = sponsorTimes.find((other) => segment.UUID === other.UUID);
+                if (otherSegment) {
+                    // If they downvoted it, or changed the category, keep it
+                    otherSegment.hidden = segment.hidden;
+                    otherSegment.category = segment.category;
+                }
+            }
+
             startSkipScheduleCheckingForStartSponsors();
 
             // Reset skip save
@@ -622,20 +651,24 @@ async function sponsorsLookup(id: string) {
 
             sponsorLookupRetries = 0;
         } else if (response?.status === 404) {
-            retryFetch(id);
+            retryFetch();
         } else if (sponsorLookupRetries < 15 && !recheckStarted) {
             recheckStarted = true;
 
             //TODO lower when server becomes better (back to 1 second)
             //some error occurred, try again in a second
-            setTimeout(() => sponsorsLookup(id), 5000 + Math.random() * 15000 + 5000 * sponsorLookupRetries);
+            setTimeout(() => {
+                if (sponsorVideoID && sponsorTimes?.length === 0) {
+                    sponsorsLookup(sponsorVideoID);
+                }
+            }, 5000 + Math.random() * 15000 + 5000 * sponsorLookupRetries);
 
             sponsorLookupRetries++;
         }
     });
 }
 
-function retryFetch(id: string): void {
+function retryFetch(): void {
     if (!Config.config.refetchWhenNotFound) return;
 
     sponsorDataFound = false;
@@ -646,7 +679,11 @@ function retryFetch(id: string): void {
 
         //if less than 3 days old
         if (Date.now() - new Date(dateUploaded).getTime() < 259200000) {
-            setTimeout(() => sponsorsLookup(id), 30000 + Math.random() * 90000);
+            setTimeout(() => {
+                if (sponsorVideoID && sponsorTimes?.length === 0) {
+                    sponsorsLookup(sponsorVideoID);
+                }
+            }, 10000 + Math.random() * 30000);
         }
     });
 
@@ -689,7 +726,7 @@ function startSkipScheduleCheckingForStartSponsors() {
  * Get the video info for the current tab from YouTube
  */
 async function getVideoInfo(): Promise<void> {
-    const result = await utils.asyncRequestToCustomServer("GET", "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID);
+    const result = await utils.asyncRequestToCustomServer("GET", "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID + "&html5=1&c=TVHTML5&cver=7.20190319");
 
     if (result.ok) {
         const decodedData = decodeURIComponent(result.responseText).match(/player_response=([^&]*)/)[1];
@@ -703,22 +740,7 @@ async function getVideoInfo(): Promise<void> {
     }
 }
 
-async function videoInfoFetchFailed(errorMessage: string): Promise<void> {
-    console.log("failed\t" + errorMessage)
-    if (utils.isFirefox() && !Config.config.ytInfoPermissionGranted) {
-        // Attempt to ask permission for youtube.com domain
-        alert(chrome.i18n.getMessage("youtubePermissionRequest"));
-        
-        chrome.runtime.sendMessage({
-            message: "openPage",
-            url: "permissions/index.html#youtube.com"
-        });
-    } else {
-        alert(chrome.i18n.getMessage("videoInfoFetchFailed") + "\n\n" + chrome.i18n.getMessage(errorMessage));
-    }
-}
-
-function getYouTubeVideoID(url: string) {
+function getYouTubeVideoID(url: string): string | boolean {
     // For YouTube TV support
     if(url.startsWith("https://www.youtube.com/tv#/")) url = url.replace("#", "");
 
@@ -765,7 +787,7 @@ function getYouTubeVideoID(url: string) {
  */
 function updatePreviewBarPositionMobile(parent: HTMLElement) {
     if (document.getElementById("previewbar") === null) {
-        previewBar.updatePosition(parent);
+        previewBar.createElement(parent);
     }
 }
 
@@ -788,7 +810,7 @@ function updatePreviewBar(): void {
             previewBarSegments.push({
                 segment: segment.segment as [number, number],
                 category: segment.category,
-                preview: false,
+                unsubmitted: false,
             });
         });
     }
@@ -797,7 +819,7 @@ function updatePreviewBar(): void {
         previewBarSegments.push({
             segment: segment.segment as [number, number],
             category: segment.category,
-            preview: true,
+            unsubmitted: true,
         });
     });
 
@@ -817,41 +839,94 @@ function updatePreviewBar(): void {
 async function whitelistCheck() {
     const whitelistedChannels = Config.config.whitelistedChannels;
 
-    const getChannelID = () => videoInfo?.videoDetails?.channelId 
+    const getChannelID = () => videoInfo?.videoDetails?.channelId
         ?? document.querySelector(".ytd-channel-name a")?.getAttribute("href")?.replace(/\/.+\//, "") // YouTube
         ?? document.querySelector(".ytp-title-channel-logo")?.getAttribute("href")?.replace(/https:\/.+\//, "") // YouTube Embed
         ?? document.querySelector("a > .channel-profile")?.parentElement?.getAttribute("href")?.replace(/\/.+\//, ""); // Invidious
 
     try {
         await utils.wait(() => !!getChannelID(), 6000, 20);
-    } catch {
-        if (Config.config.forceChannelCheck) {
-            // treat as not whitelisted
-            channelID = "";
 
-            // Don't warn for Invidious embeds
-            if (!(onInvidious && document.URL.includes("/embed/"))) {
-                videoInfoFetchFailed("adblockerIssueWhitelist");
-            }
+        channelIDInfo = {
+            status: ChannelIDStatus.Found,
+            id: getChannelID()
+        }
+    } catch (e) {
+        channelIDInfo = {
+            status: ChannelIDStatus.Failed,
+            id: null
         }
 
         return;
     }
 
-    channelID = getChannelID();
-    if (!channelID) {
-        channelID = null;
-
-        return;
-    }
-
     //see if this is a whitelisted channel
-    if (whitelistedChannels != undefined && whitelistedChannels.includes(channelID)) {
+    if (whitelistedChannels != undefined && whitelistedChannels.includes(getChannelID())) {
         channelWhitelisted = true;
     }
 
     // check if the start of segments were missed
-    if (Config.config.forceChannelCheck && sponsorTimes && sponsorTimes.length > 0) startSkipScheduleCheckingForStartSponsors();
+    if (Config.config.forceChannelCheck && sponsorTimes?.length > 0) startSkipScheduleCheckingForStartSponsors();
+}
+
+async function unlistedCheck() {
+    if (!Config.config.allowExpirements || !Config.config.askAboutUnlistedVideos) return;
+
+    try {
+        await utils.wait(() => !!videoInfo && !!document.getElementById("info-text") 
+                && !!document.querySelector(".ytd-video-primary-info-renderer > .badge > yt-icon > svg"), 6000, 1000);
+
+        const isUnlisted = document.querySelector(".ytd-video-primary-info-renderer > .badge > yt-icon > svg > g > path")
+                            ?.getAttribute("d")?.includes("M3.9 12c0-1.71 1.39-3.1 3.1-3.1h"); // Icon of unlisted badge
+        const yearMatches = document.querySelector("#info-text > #info-strings > yt-formatted-string")
+                            ?.innerHTML?.match(/20[0-9]{2}/);
+        const year = yearMatches ? parseInt(yearMatches[0]) : -1;
+        const isOld = !isNaN(year) && year < 2017 && year > 2004;
+        const views = parseInt(videoInfo?.videoDetails?.viewCount);
+        const isHighViews = views > 15000;
+
+        if (isUnlisted && isOld && isHighViews) {
+            // Ask if they want to submit this videoID
+            const notice = new GenericNotice(skipNoticeContentContainer, "unlistedWarning", {
+                title: chrome.i18n.getMessage("experimentUnlistedTitle"),
+                textBoxes: chrome.i18n.getMessage("experimentUnlistedText").split("\n"),
+                buttons: [
+                    {
+                        name: chrome.i18n.getMessage("experiementOptOut"),
+                        listener: () => {
+                            Config.config.allowExpirements = false;
+
+                            notice.close();
+                        }
+                    },
+                    {
+                        name: chrome.i18n.getMessage("hideForever"),
+                        listener: () => {
+                            Config.config.askAboutUnlistedVideos = false;
+
+                            notice.close();
+                        }
+                    },
+                    {
+                        name: "Submit",
+                        listener: () => {
+                            utils.asyncRequestToServer("POST", "/api/unlistedVideo", {
+                                videoID: sponsorVideoID,
+                                year,
+                                views,
+                                channelID: channelIDInfo.status === ChannelIDStatus.Found ? channelIDInfo.id : undefined
+                            });
+
+                            notice.close();
+                        }
+                    }
+                ]
+            });
+        }
+
+    } catch (e) {
+        return;
+    }
 }
 
 /**
@@ -866,14 +941,14 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool
     const minSponsorTimeIndex = sponsorStartTimes.indexOf(Math.min(...sponsorStartTimesAfterCurrentTime));
     const endTimeIndex = getLatestEndTimeIndex(sponsorTimes, minSponsorTimeIndex);
 
-    const previewSponsorStartTimes = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments);
-    const previewSponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, false, false);
+    const unsubmittedSponsorStartTimes = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments);
+    const unsubmittedSponsorStartTimesAfterCurrentTime = getStartTimes(sponsorTimesSubmitting, includeIntersectingSegments, includeNonIntersectingSegments, currentTime, false, false);
 
-    const minPreviewSponsorTimeIndex = previewSponsorStartTimes.indexOf(Math.min(...previewSponsorStartTimesAfterCurrentTime));
-    const previewEndTimeIndex = getLatestEndTimeIndex(sponsorTimesSubmitting, minPreviewSponsorTimeIndex);
+    const minUnsubmittedSponsorTimeIndex = unsubmittedSponsorStartTimes.indexOf(Math.min(...unsubmittedSponsorStartTimesAfterCurrentTime));
+    const previewEndTimeIndex = getLatestEndTimeIndex(sponsorTimesSubmitting, minUnsubmittedSponsorTimeIndex);
 
-    if ((minPreviewSponsorTimeIndex === -1 && minSponsorTimeIndex !== -1) || 
-            sponsorStartTimes[minSponsorTimeIndex] < previewSponsorStartTimes[minPreviewSponsorTimeIndex]) {
+    if ((minUnsubmittedSponsorTimeIndex === -1 && minSponsorTimeIndex !== -1) || 
+            sponsorStartTimes[minSponsorTimeIndex] < unsubmittedSponsorStartTimes[minUnsubmittedSponsorTimeIndex]) {
         return {
             array: sponsorTimes,
             index: minSponsorTimeIndex,
@@ -883,7 +958,7 @@ function getNextSkipIndex(currentTime: number, includeIntersectingSegments: bool
     } else {
         return {
             array: sponsorTimesSubmitting,
-            index: minPreviewSponsorTimeIndex,
+            index: minUnsubmittedSponsorTimeIndex,
             endIndex: previewEndTimeIndex,
             openNotice: false
         };
@@ -977,8 +1052,8 @@ function previewTime(time: number, unpause = true) {
 
 //send telemetry and count skip
 function sendTelemetryAndCount(skippingSegments: SponsorTime[], secondsSkipped: number, fullSkip: boolean) {
-    if (!Config.config.trackViewCount) return;
-    
+    if (!Config.config.trackViewCount || (!Config.config.trackViewCountInPrivate && chrome.extension.inIncognitoContext)) return;
+
     let counted = false;
     for (const segment of skippingSegments) {
         const index = sponsorTimes.indexOf(segment);
@@ -1070,6 +1145,7 @@ function createButton(baseID: string, title: string, callback: () => void, image
     playerButtons[baseID] = {
         button: newButton,
         image: newButtonImage,
+        setupListener: false
     };
 
     return newButton;
@@ -1103,17 +1179,31 @@ async function createButtons(): Promise<void> {
     controls = await utils.wait(getControls).catch();
 
     // Add button if does not already exist in html
-    createButton("startSponsor", "sponsorStart", () => closeInfoMenuAnd(() => startOrEndTimingNewSegment()), "PlayerStartIconSponsorBlocker.svg");
-    createButton("cancelSponsor", "sponsorCancel", () => closeInfoMenuAnd(() => cancelCreatingSegment()), "PlayerCancelSegmentIconSponsorBlocker.svg");
-    createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker.svg");
+    createButton("startSegment", "sponsorStart", () => closeInfoMenuAnd(() => startOrEndTimingNewSegment()), "PlayerStartIconSponsorBlocker.svg");
+    createButton("cancelSegment", "sponsorCancel", () => closeInfoMenuAnd(() => cancelCreatingSegment()), "PlayerCancelSegmentIconSponsorBlocker.svg");
     createButton("delete", "clearTimes", () => closeInfoMenuAnd(() => clearSponsorTimes()), "PlayerDeleteIconSponsorBlocker.svg");
     createButton("submit", "SubmitTimes", submitSponsorTimes, "PlayerUploadIconSponsorBlocker.svg");
+    createButton("info", "openPopup", openInfoMenu, "PlayerInfoIconSponsorBlocker.svg");
+
+    const controlsContainer = getControls();
+    if (!onInvidious && controlsContainer && playerButtons["info"]?.button && !controlsWithEventListeners.includes(controlsContainer)) {
+        controlsWithEventListeners.push(controlsContainer);
+        playerButtons["info"].button.classList.add("hidden");
+
+        controlsContainer.addEventListener("mouseenter", () => {
+            playerButtons["info"].button.classList.remove("hidden");
+        });
+
+        controlsContainer.addEventListener("mouseleave", () => {
+            playerButtons["info"].button.classList.add("hidden");
+        });
+    }
 }
 
 /** Creates any missing buttons on the player and updates their visiblity. */
 async function updateVisibilityOfPlayerControlsButton(): Promise<void> {
     // Not on a proper video yet
-    if (!sponsorVideoID) return;
+    if (!sponsorVideoID || onMobileYouTube) return;
 
     await createButtons();
 
@@ -1130,7 +1220,7 @@ async function updateVisibilityOfPlayerControlsButton(): Promise<void> {
 /** Updates the visibility of buttons on the player related to creating segments. */
 function updateEditButtonsOnPlayer(): void {
     // Don't try to update the buttons if we aren't on a YouTube video page
-    if (!sponsorVideoID) return;
+    if (!sponsorVideoID || onMobileYouTube) return;
 
     const buttonsEnabled = !Config.config.hideVideoPlayerControls && !onInvidious;
 
@@ -1150,16 +1240,16 @@ function updateEditButtonsOnPlayer(): void {
     }
 
     // Update the elements
-    playerButtons.startSponsor.button.style.display = buttonsEnabled ? "unset" : "none";
-    playerButtons.cancelSponsor.button.style.display = buttonsEnabled && creatingSegment ? "unset" : "none";
+    playerButtons.startSegment.button.style.display = buttonsEnabled ? "unset" : "none";
+    playerButtons.cancelSegment.button.style.display = buttonsEnabled && creatingSegment ? "unset" : "none";
 
     if (buttonsEnabled) {
         if (creatingSegment) {
-            playerButtons.startSponsor.image.src = chrome.extension.getURL("icons/PlayerStopIconSponsorBlocker.svg");
-            playerButtons.startSponsor.button.setAttribute("title", chrome.i18n.getMessage("sponsorEnd"));
+            playerButtons.startSegment.image.src = chrome.extension.getURL("icons/PlayerStopIconSponsorBlocker.svg");
+            playerButtons.startSegment.button.setAttribute("title", chrome.i18n.getMessage("sponsorEnd"));
         } else {
-            playerButtons.startSponsor.image.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker.svg");
-            playerButtons.startSponsor.button.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
+            playerButtons.startSegment.image.src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker.svg");
+            playerButtons.startSegment.button.setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
         }
     }
 
@@ -1205,6 +1295,9 @@ function startOrEndTimingNewSegment() {
     // Save the newly created segment
     Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);
 
+    // Make sure they know if someone has already submitted something it while they were watching
+    sponsorsLookup(sponsorVideoID);
+
     updateEditButtonsOnPlayer();
     updateSponsorTimesSubmitting(false);
 }
@@ -1223,6 +1316,8 @@ function cancelCreatingSegment() {
     if (isSegmentCreationInProgress()) {
         sponsorTimesSubmitting.splice(sponsorTimesSubmitting.length - 1, 1);
         Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting);
+
+        if (sponsorTimesSubmitting.length <= 0) resetSponsorSubmissionNotice();
     }
 
     updateEditButtonsOnPlayer();
@@ -1357,6 +1452,8 @@ function clearSponsorTimes() {
                                 + "\n" + chrome.i18n.getMessage("confirmMSG")
         if(!confirm(confirmMessage)) return;
 
+        resetSponsorSubmissionNotice();
+
         //clear the sponsor times
         Config.config.segmentTimes.delete(currentVideoID);
 
@@ -1364,7 +1461,6 @@ function clearSponsorTimes() {
         sponsorTimesSubmitting = [];
 
         updatePreviewBar();
-
         updateEditButtonsOnPlayer();
     }
 }
@@ -1435,6 +1531,7 @@ function dontShowNoticeAgain() {
  * Helper method for the submission notice to clear itself when it closes
  */
 function resetSponsorSubmissionNotice() {
+    submissionNotice?.close();
     submissionNotice = null;
 }
 
@@ -1548,21 +1645,14 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
     return sponsorTimesMessage;
 }
 
-function addHotkeyListener(): boolean {
-    let videoRoot = document.getElementById("movie_player") as HTMLDivElement;
-    if (onInvidious) videoRoot = (document.getElementById("player-container") ?? document.getElementById("player")) as HTMLDivElement;
-    if (video.baseURI.startsWith("https://www.youtube.com/tv#/")) videoRoot = document.querySelector("ytlr-watch-page") as HTMLDivElement;
-
-    if (videoRoot && !videoRootsWithEventListeners.includes(videoRoot)) {
-        videoRoot.addEventListener("keydown", hotkeyListener);
-        videoRootsWithEventListeners.push(videoRoot);
-        return true;
-    }
-
-    return false;
+function addHotkeyListener(): void {
+    document.addEventListener("keydown", hotkeyListener);
 }
 
 function hotkeyListener(e: KeyboardEvent): void {
+    if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
+        || document.activeElement?.id?.toLowerCase()?.includes("editable")) return;
+
     const key = e.key;
 
     const skipKey = Config.config.skipKeybind;

src/js-components/previewBar.ts

@@ -1,5 +1,5 @@
 /*
-This is based on code from VideoSegments.
+Parts of this are inspired from code from VideoSegments, but rewritten and under the LGPLv3 license
 https://github.com/videosegments/videosegments/commits/f1e111bdfe231947800c6efdd51f62a4e7fef4d4/segmentsbar/segmentsbar.js
 */
 
@@ -14,7 +14,7 @@ const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
 export interface PreviewBarSegment {
     segment: [number, number];
     category: string;
-    preview: boolean;
+    unsubmitted: boolean;
 }
 
 class PreviewBar {
@@ -37,7 +37,7 @@ class PreviewBar {
         this.onMobileYouTube = onMobileYouTube;
         this.onInvidious = onInvidious;
 
-        this.updatePosition(parent);
+        this.createElement(parent);
 
         this.setupHoverText();
     }
@@ -117,8 +117,8 @@ class PreviewBar {
             } else if (segment !== null) {
                 this.tooltipContainer.classList.add(TOOLTIP_VISIBLE_CLASS);
 
-                if (segment.preview) {
-                    this.categoryTooltip.textContent = chrome.i18n.getMessage("preview") + " " + utils.shortCategoryName(segment.category);
+                if (segment.unsubmitted) {
+                    this.categoryTooltip.textContent = chrome.i18n.getMessage("unsubmitted") + " " + utils.shortCategoryName(segment.category);
                 } else {
                     this.categoryTooltip.textContent = utils.shortCategoryName(segment.category);
                 }
@@ -134,7 +134,7 @@ class PreviewBar {
         });
     }
 
-    updatePosition(parent: HTMLElement): void {
+    createElement(parent: HTMLElement): void {
         this.parent = parent;
 
         if (this.onMobileYouTube) {
@@ -142,22 +142,19 @@ class PreviewBar {
             parent.style.opacity = "1";
             
             this.container.style.transform = "none";
+        } else if (!this.onInvidious) {
+            // Hover listener
+            this.parent.addEventListener("mouseenter", () => this.container.classList.add("hovered"));
+
+            this.parent.addEventListener("mouseleave", () => this.container.classList.remove("hovered"));
         }
 
+        
+
         // On the seek bar
         this.parent.prepend(this.container);
     }
 
-    // TODO: call on config changes
-    updateColor(segmentType: string, color: string, opacity: number): void {
-        const bars = <NodeListOf<HTMLElement>> document.querySelectorAll('[data-vs-segment-type=' + segmentType + ']');
-
-        for (const bar of bars) {
-            bar.style.backgroundColor = color;
-            bar.style.opacity = String(opacity);
-        }
-    }
-
     clear(): void {
         this.videoDuration = 0;
         this.segments = [];
@@ -169,7 +166,6 @@ class PreviewBar {
 
     set(segments: PreviewBarSegment[], videoDuration: number): void {
         this.clear();
-
         if (!segments) return;
 
         this.segments = segments;
@@ -185,17 +181,16 @@ class PreviewBar {
         });
     }
 
-    createBar({category, preview, segment}: PreviewBarSegment): HTMLLIElement {
+    createBar({category, unsubmitted, segment}: PreviewBarSegment): HTMLLIElement {
         const bar = document.createElement('li');
         bar.classList.add('previewbar');
         bar.innerHTML = '&nbsp;';
 
-        const barSegmentType = (preview ? 'preview-' : '') + category;
+        const fullCategoryName = (unsubmitted ? 'preview-' : '') + category;
+        bar.setAttribute('sponsorblock-category', fullCategoryName);
 
-        bar.setAttribute('data-vs-segment-type', barSegmentType);
-
-        bar.style.backgroundColor = Config.config.barTypes[barSegmentType].color;
-        if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[barSegmentType].opacity;
+        bar.style.backgroundColor = Config.config.barTypes[fullCategoryName]?.color;
+        if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[fullCategoryName]?.opacity;
 
         bar.style.position = "absolute";
         bar.style.width = this.timeToPercentage(segment[1] - segment[0]);

src/options.ts

@@ -31,6 +31,12 @@ async function init() {
     const optionsElements = optionsContainer.querySelectorAll("*");
 
     for (let i = 0; i < optionsElements.length; i++) {
+        if ((optionsElements[i].getAttribute("private-mode-only") === "true" && !(await isIncognitoAllowed()))
+            || (optionsElements[i].getAttribute("no-safari") === "true" && navigator.vendor === "Apple Computer, Inc.")) {
+            optionsElements[i].classList.add("hidden");
+            continue;
+        }
+
         switch (optionsElements[i].getAttribute("option-type")) {
             case "toggle": {
                 const option = optionsElements[i].getAttribute("sync-option");
@@ -540,3 +546,7 @@ function copyDebugOutputToClipboard() {
         alert(chrome.i18n.getMessage("copyDebugInformationFailed"));
       });
 }
+
+function isIncognitoAllowed(): Promise<boolean> {
+    return new Promise((resolve) => chrome.extension.isAllowedIncognitoAccess(resolve));
+}

src/popup.ts

@@ -103,8 +103,14 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         "sponsorMessageTimes",
         //"downloadedSponsorMessageTimes",
         "whitelistButton",
+        "sbDonate"
     ].forEach(id => PageElements[id] = document.getElementById(id));
 
+    // Hide donate button on safari
+    if (navigator.vendor === "Apple Computer, Inc.") {
+        PageElements.sbDonate.style.display = "none";
+    }
+
     //setup click listeners
     PageElements.sponsorStart.addEventListener("click", sendSponsorStartMessage);
     PageElements.whitelistToggle.addEventListener("change", function() {
@@ -372,8 +378,12 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 const sponsorTimeButton = document.createElement("button");
                 sponsorTimeButton.className = "segmentTimeButton popupElement";
 
-                const prefix = utils.shortCategoryName(segmentTimes[i].category) + ": ";
-
+                const categoryColorCircle = document.createElement("span");
+                categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID;
+                categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category]?.color;
+                categoryColorCircle.classList.add("dot");
+                categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle");
+                
                 let extraInfo = "";
                 if (segmentTimes[i].hidden === SponsorHideType.Downvoted) {
                     //this one is downvoted
@@ -382,14 +392,15 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                     //this one is too short
                     extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
                 }
+                
+                const textNode = document.createTextNode(utils.shortCategoryName(segmentTimes[i].category) + extraInfo);
+                const segmentTimeFromToNode = document.createElement("div");
+                segmentTimeFromToNode.innerText = utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true);
+                segmentTimeFromToNode.style.margin = "5px";
 
-                sponsorTimeButton.innerText = prefix + utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true) + extraInfo;
-
-                const categoryColorCircle = document.createElement("span");
-                categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID;
-                categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category].color;
-                categoryColorCircle.classList.add("dot");
-                categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle");
+                sponsorTimeButton.appendChild(categoryColorCircle);
+                sponsorTimeButton.appendChild(textNode);
+                sponsorTimeButton.appendChild(segmentTimeFromToNode);
 
                 const votingButtons = document.createElement("div");
                 votingButtons.classList.add("votingButtons");
@@ -398,7 +409,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 const voteButtonsContainer = document.createElement("div");
                 voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + UUID;
                 voteButtonsContainer.setAttribute("align", "center");
-                voteButtonsContainer.style.display = "none"
+                voteButtonsContainer.classList.add('voteButtonsContainer--hide');
 
                 const upvoteButton = document.createElement("img");
                 upvoteButton.id = "sponsorTimesUpvoteButtonsContainer" + UUID;
@@ -427,7 +438,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
 
                 //add click listener to open up vote panel
                 sponsorTimeButton.addEventListener("click", function() {
-                    voteButtonsContainer.style.removeProperty("display");
+                    voteButtonsContainer.classList.toggle("voteButtonsContainer--hide");
                 });
 
                 // Will contain request status
@@ -441,7 +452,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 thanksForVotingText.classList.add("sponsorTimesThanksForVotingText");
                 voteStatusContainer.appendChild(thanksForVotingText);
 
-                votingButtons.append(categoryColorCircle);
                 votingButtons.append(sponsorTimeButton);
                 votingButtons.append(voteButtonsContainer);
                 votingButtons.append(voteStatusContainer);
@@ -581,8 +591,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
                 {message: 'getChannelID'},
                 function(response) {
                     if (!response.channelID) {
-                        alert(chrome.i18n.getMessage("channelDataNotFound") + "\n\n" + 
-                            chrome.i18n.getMessage("itCouldBeAdblockerIssue"));
+                        alert(chrome.i18n.getMessage("channelDataNotFound") + " https://github.com/ajayyy/SponsorBlock/issues/753");
                         return;
                     }
 

src/render/GenericNotice.tsx

@@ -0,0 +1,111 @@
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import NoticeComponent from "../components/NoticeComponent";
+
+import Utils from "../utils";
+const utils = new Utils();
+
+import { ContentContainer } from "../types";
+import NoticeTextSelectionComponent from "../components/NoticeTextSectionComponent";
+
+export interface ButtonListener {
+    name: string,
+    listener: (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void
+}
+
+export interface NoticeOptions {
+    title: string,
+    textBoxes?: string[],
+    buttons?: ButtonListener[],
+    fadeIn?: boolean,
+    timed?: boolean
+}
+
+export default class GenericNotice {
+    // Contains functions and variables from the content script needed by the skip notice
+    contentContainer: ContentContainer;
+
+    noticeElement: HTMLDivElement;
+    noticeRef: React.MutableRefObject<NoticeComponent>;
+
+    constructor(contentContainer: ContentContainer, idSuffix: string, options: NoticeOptions) {
+        this.noticeRef = React.createRef();
+
+        this.contentContainer = contentContainer;
+
+        const referenceNode = utils.findReferenceNode();
+    
+        this.noticeElement = document.createElement("div");
+        this.noticeElement.id = "sponsorSkipNoticeContainer" + idSuffix;
+
+        referenceNode.prepend(this.noticeElement);
+
+        ReactDOM.render(
+            <NoticeComponent
+                noticeTitle={options.title}
+                idSuffix={idSuffix}
+                fadeIn={options.fadeIn ?? true}
+                timed={options.timed ?? true}
+                ref={this.noticeRef}
+                closeListener={() => this.close()} >
+                    
+                    {this.getMessageBox(idSuffix, options.textBoxes)}
+
+                    <tr id={"sponsorSkipNoticeSpacer" + idSuffix}
+                        className="sponsorBlockSpacer">
+                    </tr>
+
+                    <div className="sponsorSkipNoticeRightSection"
+                        style={{position: "relative"}}>
+
+                        {this.getButtons(options.buttons)}
+                    </div>
+            </NoticeComponent>,
+            this.noticeElement
+        );
+    }
+
+    getMessageBox(idSuffix: string, textBoxes: string[]): JSX.Element[] { 
+        if (textBoxes) {
+            const result = [];
+            for (let i = 0; i < textBoxes.length; i++) {
+                result.push(
+                    <NoticeTextSelectionComponent idSuffix={idSuffix}
+                        key={i}
+                        text={textBoxes[i]} />
+                )
+            }
+
+            return result;
+        } else {
+            return null;
+        }
+    }
+
+    getButtons(buttons?: ButtonListener[]): JSX.Element[] {
+        if (buttons) {
+            const result: JSX.Element[] = [];
+
+            for (const button of buttons) {
+                result.push(
+                    <button className="sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton"
+                            key={button.name}
+                            onClick={(e) => button.listener(e)}>
+
+                            {button.name}
+                    </button>
+                )
+            }
+
+            return result;
+        } else {
+            return null;
+        }
+    }
+
+    close(): void {
+        ReactDOM.unmountComponentAtNode(this.noticeElement);
+
+        this.noticeElement.remove();
+    }
+}

src/render/SkipNotice.tsx

@@ -1,6 +1,9 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
+import Utils from "../utils";
+const utils = new Utils();
+
 import SkipNoticeComponent, { SkipNoticeAction } from "../components/SkipNoticeComponent";
 import { SponsorTime, ContentContainer } from "../types";
 
@@ -21,26 +24,7 @@ class SkipNotice {
         this.autoSkip = autoSkip;
         this.contentContainer = contentContainer;
 
-        //get reference node
-        let referenceNode = document.getElementById("player-container-id") 
-                                || document.getElementById("movie_player") || document.querySelector("#player-container .video-js");
-        if (referenceNode == null) {
-            //for embeds
-            const player = document.getElementById("player");
-            referenceNode = player.firstChild as HTMLElement;
-            let index = 1;
-
-            //find the child that is the video player (sometimes it is not the first)
-            while (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed")) {
-                referenceNode = player.children[index] as HTMLElement;
-
-                index++;
-            }
-        }
-        // YouTube Music
-        if (new URL(document.URL).host === "music.youtube.com") {
-            referenceNode = document.querySelector("#main-panel.ytmusic-player-page");
-        }
+        const referenceNode = utils.findReferenceNode();
     
         const amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
         //this is the suffix added at the end of every id

src/render/SubmissionNotice.tsx

@@ -1,6 +1,9 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
+import Utils from "../utils";
+const utils = new Utils();
+
 import SubmissionNoticeComponent from "../components/SubmissionNoticeComponent";
 import { ContentContainer } from "../types";
 
@@ -20,22 +23,7 @@ class SubmissionNotice {
         this.contentContainer = contentContainer;
         this.callback = callback;
 
-        //get reference node
-        let referenceNode = document.getElementById("player-container-id") 
-                                || document.getElementById("movie_player") || document.querySelector("#player-container .video-js");
-        if (referenceNode == null) {
-            //for embeds
-            const player = document.getElementById("player");
-            referenceNode = player.firstChild as HTMLElement;
-            let index = 1;
-
-            //find the child that is the video player (sometimes it is not the first)
-            while (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed")) {
-                referenceNode = player.children[index] as HTMLElement;
-
-                index++;
-            }
-        }
+        const referenceNode = utils.findReferenceNode();
     
         this.noticeElement = document.createElement("div");
         this.noticeElement.id = "submissionNoticeContainer";

src/types.ts

@@ -161,3 +161,14 @@ export type VideoID = string;
 export type StorageChangesObject = { [key: string]: chrome.storage.StorageChange };
 
 export type UnEncodedSegmentTimes = [string, SponsorTime[]][];
+
+export enum ChannelIDStatus {
+    Fetching,
+    Found,
+    Failed
+}
+
+export interface ChannelIDInfo {
+    id: string,
+    status: ChannelIDStatus
+}

src/utils.ts

@@ -366,6 +366,29 @@ export default class Utils {
         });
     }
 
+    findReferenceNode(): HTMLElement {
+        let referenceNode = document.getElementById("player-container-id")
+                                ?? document.getElementById("movie_player") 
+                                ?? document.querySelector("#main-panel.ytmusic-player-page") // YouTube music
+                                ?? document.querySelector("#player-container .video-js") // Invidious
+                                ?? document.querySelector(".main-video-section > .video-container");  // Cloudtube  
+        if (referenceNode == null) {
+            //for embeds
+            const player = document.getElementById("player");
+            referenceNode = player.firstChild as HTMLElement;
+            let index = 1;
+
+            //find the child that is the video player (sometimes it is not the first)
+            while (index < player.children.length && (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed"))) {
+                referenceNode = player.children[index] as HTMLElement;
+
+                index++;
+            }
+        }
+
+        return referenceNode;
+    }
+
     getFormattedTime(seconds: number, precise?: boolean): string {
         const hours = Math.floor(seconds / 60 / 60);
         const minutes = Math.floor(seconds / 60) % 60;