chore(release): 4.7.0-dev.3 [skip ci]

# [4.7.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.7.0-dev.2...v4.7.0-dev.3) (2024-04-09) ### Bug Fixes * **Tumblr - Fix old versions:** Improve reliability by removing remnances of Tumblr Live ([#2988](https://github.com/ReVanced/revanced-patches/issues/2988)) ([1ac6127](1ac612798b))
fix(Tumblr - Fix old versions): Improve reliability by removing remnances of Tumblr Live (#2988 )
2025-12-26 02:44:08 +01:00 · 2024-04-09 17:40:30 +00:00 · 2024-04-09 19:38:11 +02:00 · 2024-04-07 23:56:09 +04:00 · 2024-04-07 17:36:01 +02:00 · 2024-04-06 18:53:36 +00:00
13 changed files with 107 additions and 166 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [4.7.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.7.0-dev.2...v4.7.0-dev.3) (2024-04-09)
+
+
+### Bug Fixes
+
+* **Tumblr - Fix old versions:** Improve reliability by removing remnances of Tumblr Live  ([#2988](https://github.com/ReVanced/revanced-patches/issues/2988)) ([897b4db](https://github.com/ReVanced/revanced-patches/commit/897b4dbce984270ae1fd7de5bd30bd05153e45f2))
+
+# [4.7.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.7.0-dev.1...v4.7.0-dev.2) (2024-04-06)
+
+
+### Features
+
+* **Strava - Unlock subscription:** Remove compatible version constraint ([80a5599](https://github.com/ReVanced/revanced-patches/commit/80a55991683d7b22626224fa2935a5bf9bfcbfee))
+
+# [4.7.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.6.1-dev.3...v4.7.0-dev.1) (2024-04-06)
+
+
+### Features
+
+* **YouTube - Hide layout components:** Add option to hide horizontal shelves ([#2951](https://github.com/ReVanced/revanced-patches/issues/2951)) ([9ae0650](https://github.com/ReVanced/revanced-patches/commit/9ae0650c0005d882299996aa442410bab4261395))
+
 ## [4.6.1-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.6.1-dev.2...v4.6.1-dev.3) (2024-04-06)


--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -1062,10 +1062,6 @@ public final class app/revanced/patches/tumblr/fixes/FixOldVersionsPatch : app/r
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

-public final class app/revanced/patches/tumblr/fixes/fingerprints/HttpPathParserFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
-	public static final field INSTANCE Lapp/revanced/patches/tumblr/fixes/fingerprints/HttpPathParserFingerprint;
-}
-
 public final class app/revanced/patches/tumblr/live/DisableTumblrLivePatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/tumblr/live/DisableTumblrLivePatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
    mavenLocal()
    google()
    maven {
-        // A repository must be speficied for some reason. "registry" is a dummy.
+        // A repository must be specified for some reason. "registry" is a dummy.
        url = uri("https://maven.pkg.github.com/revanced/registry")
        credentials {
            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.6.1-dev.3
+version = 4.7.0-dev.3
--- a/src/main/kotlin/app/revanced/patches/strava/subscription/UnlockSubscriptionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/strava/subscription/UnlockSubscriptionPatch.kt
@@ -1,17 +1,16 @@
 package app.revanced.patches.strava.subscription
-
-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.strava.subscription.fingerprints.GetSubscribedFingerprint
+import app.revanced.util.exception

@Patch(
    name = "Unlock subscription features",
    description = "Unlocks \"Routes\", \"Matched Runs\" and \"Segment Efforts\".",
-    compatiblePackages = [CompatiblePackage("com.strava", ["320.12"])]
+    compatiblePackages = [CompatiblePackage("com.strava")],
 )
@Suppress("unused")
 object UnlockSubscriptionPatch : BytecodePatch(setOf(GetSubscribedFingerprint)) {
--- a/src/main/kotlin/app/revanced/patches/tumblr/fixes/FixOldVersionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tumblr/fixes/FixOldVersionsPatch.kt
@@ -5,34 +5,63 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.tumblr.fixes.fingerprints.AddQueryParamFingerprint
 import app.revanced.patches.tumblr.fixes.fingerprints.HttpPathParserFingerprint
 import app.revanced.util.exception

@Patch(
    name = "Fix old versions",
    description = "Fixes old versions of the app (v33.2 and earlier) breaking due to Tumblr removing remnants of Tumblr" +
-            " Live from the API, which causes many requests to fail. This patch has no effect on newer versions of the app.",
+        " Live from the API, which causes many requests to fail. This patch has no effect on newer versions of the app.",
    compatiblePackages = [CompatiblePackage("com.tumblr")],
    use = false,
 )
@Suppress("unused")
 object FixOldVersionsPatch : BytecodePatch(
-    setOf(HttpPathParserFingerprint),
+    setOf(HttpPathParserFingerprint, AddQueryParamFingerprint),
 ) {
-    override fun execute(context: BytecodeContext) =
+    override fun execute(context: BytecodeContext) {
+        val liveQueryParameters = listOf(
+            ",?live_now",
+            ",?live_streaming_user_id",
+        )
+
        HttpPathParserFingerprint.result?.let {
            val endIndex = it.scanResult.patternScanResult!!.endIndex
-
-            it.mutableMethod.addInstructions(
-                endIndex + 1,
-                """
-                # Remove "?live_now" from the request path p2.
-                # p2 = p2.replace(p1, p3)
-                const-string p1, ",?live_now"
-                const-string p3, ""
-                invoke-virtual {p2, p1, p3}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
-                move-result-object p2
-            """,
-            )
+            // Remove the live query parameters from the path when it's specified via a @METHOD annotation.
+            for (liveQueryParameter in liveQueryParameters) {
+                it.mutableMethod.addInstructions(
+                    endIndex + 1,
+                    """
+                    # urlPath = urlPath.replace(liveQueryParameter, "")
+                    const-string p1, "$liveQueryParameter"
+                    const-string p3, ""
+                    invoke-virtual {p2, p1, p3}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
+                    move-result-object p2
+                """,
+                )
+            }
        } ?: throw HttpPathParserFingerprint.exception
+
+        AddQueryParamFingerprint.result?.let {
+            // Remove the live query parameters when passed via a parameter which has the @Query annotation.
+            // e.g. an API call could be defined like this:
+            //  @GET("api/me/info")
+            //  ApiResponse getCurrentUserInfo(@Query("fields[blog]") String value)
+            // which would result in the path "api/me/inf0?fields[blog]=${value}"
+            // Here we make sure that this value doesn't contain the broken query parameters.
+            for (liveQueryParameter in liveQueryParameters) {
+                it.mutableMethod.addInstructions(
+                    0,
+                    """
+                    # queryParameterValue = queryParameterValue.replace(liveQueryParameter, "")
+                    const-string v0, "$liveQueryParameter"
+                    const-string v1, ""
+                    invoke-virtual {p2, v0, v1}, Ljava/lang/String;->replace(Ljava/lang/CharSequence;Ljava/lang/CharSequence;)Ljava/lang/String;
+                    move-result-object p2
+                """,
+                )
+            }
+        } ?: throw AddQueryParamFingerprint.exception
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/tumblr/fixes/fingerprints/AddQueryParamFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tumblr/fixes/fingerprints/AddQueryParamFingerprint.kt
@@ -0,0 +1,11 @@
+package app.revanced.patches.tumblr.fixes.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+
+// Fingerprint for the addQueryParam method from retrofit2
+// https://github.com/square/retrofit/blob/trunk/retrofit/src/main/java/retrofit2/RequestBuilder.java#L186
+// Injecting here allows modifying dynamically set query parameters
+internal object AddQueryParamFingerprint : MethodFingerprint(
+    strings = listOf("Malformed URL. Base: ", ", Relative: "),
+    parameters = listOf("Ljava/lang/String;", "Ljava/lang/String;", "Z"),
+)
--- a/src/main/kotlin/app/revanced/patches/tumblr/fixes/fingerprints/HttpPathParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tumblr/fixes/fingerprints/HttpPathParserFingerprint.kt
@@ -3,13 +3,13 @@ package app.revanced.patches.tumblr.fixes.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode

-// Fingerprint for the parseHttpMethodAndPath from retrofit2
+// Fingerprint for the parseHttpMethodAndPath method from retrofit2
 // https://github.com/square/retrofit/blob/ebf87b10997e2136af4d335276fa950221852c64/retrofit/src/main/java/retrofit2/RequestFactory.java#L270-L302
 // Injecting here allows modifying the path/query params of API endpoints defined via annotations
-object HttpPathParserFingerprint : MethodFingerprint(
+internal object HttpPathParserFingerprint : MethodFingerprint(
    strings = listOf("Only one HTTP method is allowed. Found: %s and %s."),
    opcodes = listOf(
        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_BOOLEAN
-    )
-)
+        Opcode.IPUT_BOOLEAN,
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
@@ -1,73 +1,13 @@
 package app.revanced.patches.youtube.layout.hide.breakingnews

-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.youtube.layout.hide.breakingnews.fingerprints.BreakingNewsFingerprint
-import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import app.revanced.patches.youtube.layout.hide.general.HideLayoutComponentsPatch

-@Patch(
-    name = "Hide breaking news shelf",
-    description = "Adds an option to hide the breaking news shelf on the homepage tab.",
-    dependencies = [
-        IntegrationsPatch::class,
-        BreakingNewsResourcePatch::class
-    ],
-    compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.youtube",
-            [
-                "18.32.39",
-                "18.37.36",
-                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
-                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                "19.09.37"
-            ]
-        )
-    ]
-)
-@Suppress("unused")
+@Deprecated("This patch has been merged to HideLayoutComponentsPatch.")
 object BreakingNewsPatch : BytecodePatch(
-    setOf(BreakingNewsFingerprint)
+    dependencies = setOf(HideLayoutComponentsPatch::class),
 ) {
    override fun execute(context: BytecodeContext) {
-        BreakingNewsFingerprint.result?.let {
-            val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
-            val moveResultIndex = insertIndex - 1
-
-            it.mutableMethod.apply {
-                val breakingNewsViewRegister =
-                    getInstruction<OneRegisterInstruction>(moveResultIndex).registerA
-
-                addInstruction(
-                    insertIndex,
-                    """
-                        invoke-static {v$breakingNewsViewRegister}, 
-                        Lapp/revanced/integrations/youtube/patches/HideBreakingNewsPatch;
-                        ->
-                        hideBreakingNews(Landroid/view/View;)V
-                    """
-                )
-            }
-
-        } ?: throw BreakingNewsFingerprint.exception
-
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsResourcePatch.kt
@@ -1,32 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-
-@Patch(
-    dependencies = [
-        SettingsPatch::class,
-        ResourceMappingPatch::class,
-        AddResourcesPatch::class
-    ],
-)
-internal object BreakingNewsResourcePatch : ResourcePatch() {
-    internal var horizontalCardListId: Long = -1
-
-    override fun execute(context: ResourceContext) {
-        AddResourcesPatch(this::class)
-
-        SettingsPatch.PreferenceScreen.FEED.addPreferences(
-            SwitchPreference("revanced_hide_breaking_news")
-        )
-
-        horizontalCardListId = ResourceMappingPatch.resourceMappings.single {
-            it.type == "layout" && it.name == "horizontal_card_list"
-        }.id
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/fingerprints/BreakingNewsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/fingerprints/BreakingNewsFingerprint.kt
@@ -1,20 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.hide.breakingnews.BreakingNewsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object BreakingNewsFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    opcodes = listOf(
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT,
-    ),
-    literalSupplier = { BreakingNewsResourcePatch.horizontalCardListId }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -39,7 +39,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
        SettingsPatch::class,
        AddResourcesPatch::class,
        HideLayoutComponentsResourcePatch::class,
-        NavigationBarHookPatch::class // Used by Keyword Content filter.
+        NavigationBarHookPatch::class,
    ],
    compatiblePackages = [
        CompatiblePackage(
@@ -117,6 +117,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
            SwitchPreference("revanced_hide_compact_banner"),
            SwitchPreference("revanced_hide_feed_survey"),
            SwitchPreference("revanced_hide_for_you_shelf"),
+            SwitchPreference("revanced_hide_horizontal_shelves"),
            SwitchPreference("revanced_hide_image_shelf"),
            SwitchPreference("revanced_hide_latest_posts_ads"),
            SwitchPreference("revanced_hide_mix_playlists"),
@@ -133,9 +134,9 @@ object HideLayoutComponentsPatch : BytecodePatch(
                    SwitchPreference("revanced_hide_keyword_content_subscriptions"),
                    SwitchPreference("revanced_hide_keyword_content_search"),
                    TextPreference("revanced_hide_keyword_content_phrases", inputType = InputType.TEXT_MULTI_LINE),
-                    NonInteractivePreference("revanced_hide_keyword_content_about")
-                )
-            )
+                    NonInteractivePreference("revanced_hide_keyword_content_about"),
+                ),
+            ),
        )

        SettingsPatch.PreferenceScreen.GENERAL_LAYOUT.addPreferences(
@@ -216,7 +217,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
                addInstruction(
                    insertIndex,
                    "invoke-static { v$viewRegister }, " +
-                            "$LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideShowMoreButton(Landroid/view/View;)V"
+                        "$LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideShowMoreButton(Landroid/view/View;)V",
                )
            }
        }
--- a/src/main/resources/addresources/values/strings.xml
+++ b/src/main/resources/addresources/values/strings.xml
@@ -22,7 +22,7 @@
    Forgetting to do this will cause that string to appear in app with no quotation characters.

    Correct:
-        <string name="revanced_string">You\'re correct. This is the \"correct\" way and this text will as expected in the app</string>
+        <string name="revanced_string">You\'re correct. This is the \"correct\" way and this text will appear as expected in the app</string>
    Not correct:
        <string name="revanced_string">You're not correct. This is not the "correct" way and this text will not appear as expected the in app</string>
 -->
@@ -92,6 +92,9 @@
            <string name="revanced_hide_channel_watermark_title">Hide channel watermark</string>
            <string name="revanced_hide_channel_watermark_summary_on">Watermark is hidden</string>
            <string name="revanced_hide_channel_watermark_summary_off">Watermark is shown</string>
+            <string name="revanced_hide_horizontal_shelves_title">Hide horizontal shelves</string>
+            <string name="revanced_hide_horizontal_shelves_summary_on">Shelves are hidden such as:\n• Breaking news\n• Continue watching\n• Explore more channels\n• Shopping\n• Watch it Again</string>
+            <string name="revanced_hide_horizontal_shelves_summary_off">Shelves are shown</string>
            <!-- 'Join' should be translated using the same localized wording YouTube displays.
                 This appears in the video player for certain videos. -->
            <string name="revanced_hide_join_membership_button_title">Hide \'Join\' button</string>
@@ -210,6 +213,7 @@
            <string name="revanced_custom_filter_summary_on">Custom filter is enabled</string>
            <string name="revanced_custom_filter_summary_off">Custom filter is disabled</string>
            <string name="revanced_custom_filter_strings_title">Custom filter</string>
+            <!-- 'Component path builder strings' is the technical name for identifying the Litho UI layout items to hide. This is an advanced feature and most users will never use this. -->
            <string name="revanced_custom_filter_strings_summary">List of component path builder strings to filter separated by new line</string>
            <string name="revanced_custom_filter_toast_invalid_syntax">Invalid custom filter: %s</string>
            <string name="revanced_hide_keyword_content_screen_title">Hide keyword content</string>
@@ -483,11 +487,6 @@
            <string name="revanced_hide_album_cards_summary_on">Album cards are hidden</string>
            <string name="revanced_hide_album_cards_summary_off">Album cards are shown</string>
        </patch>
-        <patch id="layout.hide.breakingnews.BreakingNewsResourcePatch">
-            <string name="revanced_hide_breaking_news_title">Hide breaking news</string>
-            <string name="revanced_hide_breaking_news_summary_on">Breaking news are hidden</string>
-            <string name="revanced_hide_breaking_news_summary_off">Breaking news are shown</string>
-        </patch>
        <patch id="layout.hide.comments.CommentsPatch">
            <string name="revanced_comments_screen_title">Comments</string>
            <string name="revanced_comments_screen_summary">Hide or show comments section components</string>
@@ -550,6 +549,7 @@
            <string name="revanced_hide_seekbar_thumbnail_summary_off">Thumbnail seekbar is shown</string>
        </patch>
        <patch id="layout.hide.shorts.HideShortsComponentsResourcePatch">
+            <!-- 'home' should be translated using the same localized wording YouTube displays for the home tab. -->
            <string name="revanced_hide_shorts_home_title">Hide Shorts in home feed</string>
            <string name="revanced_hide_shorts_home_summary_on">Shorts in home feed are hidden</string>
            <string name="revanced_hide_shorts_home_summary_off">Shorts in home feed are shown</string>
@@ -649,11 +649,9 @@
            <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
            <string name="revanced_ryd_enable_summary_off">Dislikes are not shown</string>
            <string name="revanced_ryd_shorts_title">Show dislikes on Shorts</string>
-            <!-- %s is either an empty blank string, or it is 'revanced_ryd_shorts_summary_disclaimer'. This text should read normally in both situations. -->
-            <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts %s</string>
+            <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts</string>
+            <string name="revanced_ryd_shorts_summary_on_disclaimer">Dislikes shown on Shorts\n\nLimitation: Dislikes may not appear in incognito mode</string>
            <string name="revanced_ryd_shorts_summary_off">Dislikes hidden on Shorts</string>
-            <!-- Shown only when used with 'revanced_ryd_shorts_summary_on' and it is never displayed alone. -->
-            <string name="revanced_ryd_shorts_summary_disclaimer">Limitation: Dislikes may not appear in incognito mode</string>
            <string name="revanced_ryd_dislike_percentage_title">Dislikes as percentage</string>
            <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage</string>
            <string name="revanced_ryd_dislike_percentage_summary_off">Dislikes shown as number</string>
@@ -737,21 +735,19 @@
            <string name="revanced_sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
            <string name="revanced_sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
            <string name="revanced_sb_general_min_duration">Minimum segment duration</string>
-            <string name="revanced_sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped </string>
+            <string name="revanced_sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
            <string name="revanced_sb_general_uuid">Your private user id</string>
            <string name="revanced_sb_general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
            <string name="revanced_sb_general_uuid_invalid">Private user id must be at least 30 characters long</string>
            <string name="revanced_sb_general_api_url">Change API URL</string>
-            <string name="revanced_sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. Do not change this unless you know what you\'re doing</string>
+            <string name="revanced_sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server</string>
            <string name="revanced_sb_api_url_reset">API URL reset</string>
            <string name="revanced_sb_api_url_invalid">API URL is invalid</string>
            <string name="revanced_sb_api_url_changed">API URL changed</string>
            <string name="revanced_sb_settings_ie">Import/Export settings</string>
            <string name="revanced_sb_settings_copy">Copy</string>
-            <!-- %s is either an empty blank string, or it is 'revanced_sb_settings_ie_sum_warning'. This text should read normally in both situations. -->
-            <string name="revanced_sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms %s</string>
-            <!-- Shown only when used with 'revanced_sb_settings_ie_sum' and it is never displayed alone. -->
-            <string name="revanced_sb_settings_ie_sum_warning">This includes your private user id. Be sure to share this wisely</string>
+            <string name="revanced_sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms</string>
+            <string name="revanced_sb_settings_ie_sum_warning">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms. This includes your private user id. Be sure to share this wisely</string>
            <string name="revanced_sb_settings_import_successful">Settings imported successfully</string>
            <string name="revanced_sb_settings_import_failed">Failed to import: %s</string>
            <string name="revanced_sb_settings_export_failed">Failed to export: %s</string>
@@ -1044,7 +1040,7 @@
        <patch id="video.speed.custom.CustomPlaybackSpeedPatch">
            <string name="revanced_custom_playback_speeds_title">Custom playback speeds</string>
            <string name="revanced_custom_playback_speeds_summary">Add or change the available playback speeds</string>
-            <string name="revanced_custom_playback_speeds_invalid">Custom speeds must be less than %s Using default values.</string>
+            <string name="revanced_custom_playback_speeds_invalid">Custom speeds must be less than %s. Using default values.</string>
            <string name="revanced_custom_playback_speeds_parse_exception">Invalid custom playback speeds. Using default values.</string>
        </patch>
        <patch id="video.speed.remember.RememberPlaybackSpeedPatch">
Author	SHA1	Message	Date
semantic-release-bot	3d3197701c	chore(release): 4.7.0-dev.3 [skip ci] # [4.7.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.7.0-dev.2...v4.7.0-dev.3) (2024-04-09) ### Bug Fixes * Tumblr - Fix old versions: Improve reliability by removing remnances of Tumblr Live ([#2988](https://github.com/ReVanced/revanced-patches/issues/2988)) ([`1ac6127`](`1ac612798b`))	2024-04-09 17:40:30 +00:00
Temm	1ac612798b	fix(Tumblr - Fix old versions): Improve reliability by removing remnances of Tumblr Live (#2988 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-04-09 19:38:11 +02:00
LisoUseInAIKyrios	e1ed1aee69	chore(YouTube): Fix typos, simplify some strings for translating	2024-04-07 23:56:09 +04:00
oSumAtrIX	795ccac990	chore: Fix spelling mistake	2024-04-07 17:36:01 +02:00
semantic-release-bot	da55410a2b	chore(release): 4.7.0-dev.2 [skip ci] # [4.7.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.7.0-dev.1...v4.7.0-dev.2) (2024-04-06) ### Features * Strava - Unlock subscription: Remove compatible version constraint ([`e798341`](`e7983411a7`))	2024-04-06 18:53:36 +00:00
oSumAtrIX	e7983411a7	feat(Strava - Unlock subscription): Remove compatible version constraint	2024-04-06 20:51:37 +02:00
semantic-release-bot	182748cb16	chore(release): 4.7.0-dev.1 [skip ci] # [4.7.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.6.1-dev.3...v4.7.0-dev.1) (2024-04-06) ### Features * YouTube - Hide layout components: Add option to hide horizontal shelves ([#2951](https://github.com/ReVanced/revanced-patches/issues/2951)) ([`122f042`](`122f04219f`))	2024-04-06 18:51:17 +00:00
nullptr	122f04219f	feat(YouTube - Hide layout components): Add option to hide horizontal shelves (#2951 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de> Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>	2024-04-06 20:49:03 +02:00