refactor(YouTube): Match YouTube naming and sort strings (#5309)

patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt

@@ -43,17 +43,17 @@ private val hideAdsResourcePatch = resourcePatch {
         addResources("youtube", "ad.general.hideAdsResourcePatch")
 
         PreferenceScreen.ADS.addPreferences(
-            SwitchPreference("revanced_hide_general_ads"),
+            SwitchPreference("revanced_hide_creator_store_shelves"),
             SwitchPreference("revanced_hide_end_screen_store_banner"),
             SwitchPreference("revanced_hide_fullscreen_ads"),
+            SwitchPreference("revanced_hide_general_ads"),
+            SwitchPreference("revanced_hide_merchandise_banners"),
             SwitchPreference("revanced_hide_paid_promotion_label"),
-            SwitchPreference("revanced_hide_player_store_shelf"),
             SwitchPreference("revanced_hide_self_sponsor_ads"),
-            SwitchPreference("revanced_hide_products_banner"),
-            SwitchPreference("revanced_hide_shopping_links"),
+            SwitchPreference("revanced_hide_tagged_products"),
+            SwitchPreference("revanced_hide_view_products_banner"),
             SwitchPreference("revanced_hide_visit_store_button"),
             SwitchPreference("revanced_hide_web_search_results"),
-            SwitchPreference("revanced_hide_merchandise_banners"),
         )
 
         addLithoFilter("Lapp/revanced/extension/youtube/patches/components/AdsFilter;")

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -160,9 +160,9 @@ val hideLayoutComponentsPatch = bytecodePatch(
                     SwitchPreference("revanced_hide_comments_by_members_header"),
                     SwitchPreference("revanced_hide_comments_section"),
                     SwitchPreference("revanced_hide_comments_create_a_short_button"),
-                    SwitchPreference("revanced_hide_comments_timestamp_button"),
                     SwitchPreference("revanced_hide_comments_preview_comment"),
                     SwitchPreference("revanced_hide_comments_thanks_button"),
+                    SwitchPreference("revanced_hide_comments_timestamp_button"),
                 ),
                 sorting = PreferenceScreenPreference.Sorting.UNSORTED,
             ),