From dd34c3f93f4ab08c2659b22d792e180e3b95e802 Mon Sep 17 00:00:00 2001 From: KobeW50 <84587632+KobeW50@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:08:02 -0400 Subject: [PATCH] Proper nouns and clarity of in-app strings (#54) * (YT Music): Fix proper nouns and clarity * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml * Recently added YouTube strings * refactor: Patch option descriptions * Update src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt Co-authored-by: KobeW50 <84587632+KobeW50@users.noreply.github.com> * Revert Android 8.0 change * Update strings.xml * refactor(YouTube - Hide feed components): Description * Fix capitalization of `Comments` --------- Co-authored-by: inotia00 <108592928+inotia00@users.noreply.github.com> --- .../components/LayoutComponentsPatch.kt | 2 +- .../branding/icon/CustomBrandingIconPatch.kt | 6 +- .../shared/packagename/PackageNamePatch.kt | 4 +- .../feed/components/FeedComponentsPatch.kt | 2 +- .../general/toolbar/ToolBarComponentsPatch.kt | 2 +- .../branding/icon/CustomBrandingIconPatch.kt | 6 +- .../doubletaplength/DoubleTapLengthPatch.kt | 2 +- .../overlaybuttons/OverlayButtonsPatch.kt | 4 +- .../utils/sponsorblock/SponsorBlockPatch.kt | 2 +- .../music/settings/host/values/strings.xml | 211 +++++++++--------- .../youtube/settings/host/values/strings.xml | 16 +- 11 files changed, 131 insertions(+), 126 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/music/general/components/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/music/general/components/LayoutComponentsPatch.kt index 9a174088e..09f100afb 100644 --- a/src/main/kotlin/app/revanced/patches/music/general/components/LayoutComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/general/components/LayoutComponentsPatch.kt @@ -78,7 +78,7 @@ object LayoutComponentsPatch : BaseBytecodePatch( key = "ForceHideVoiceSearchButton", default = false, title = "Force hide voice search button", - description = "Hide voice search button with legacy method, button will always be hidden." + description = "Permanently hide the voice search button with the legacy method." ) override fun execute(context: BytecodeContext) { diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt index 7e782db36..21b887c6f 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/CustomBrandingIconPatch.kt @@ -98,11 +98,13 @@ object CustomBrandingIconPatch : BaseResourcePatch( values = availableIcon, title = "App icon", description = """ - The path to a folder containing the following folders: + The icon to apply to the app. + + If a path to a folder is provided, the folder must contain the following folders: ${mipmapDirectories.joinToString("\n") { "- $it" }} - Each of these folders has to have the following files: + Each of these folders must contain the following files: ${launcherIconResourceFileNames.joinToString("\n") { "- $it" }} """ diff --git a/src/main/kotlin/app/revanced/patches/shared/packagename/PackageNamePatch.kt b/src/main/kotlin/app/revanced/patches/shared/packagename/PackageNamePatch.kt index 75c347cff..c81bd5f7c 100644 --- a/src/main/kotlin/app/revanced/patches/shared/packagename/PackageNamePatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/packagename/PackageNamePatch.kt @@ -36,7 +36,7 @@ object PackageNamePatch : ResourcePatch() { "Default" to DEFAULT_PACKAGE_NAME_YOUTUBE ), title = "Package name of YouTube", - description = "The name of the package to use in MicroG support", + description = "The name of the package to use in GmsCore support.", required = true ) @@ -48,7 +48,7 @@ object PackageNamePatch : ResourcePatch() { "Default" to DEFAULT_PACKAGE_NAME_YOUTUBE_MUSIC ), title = "Package name of YouTube Music", - description = "The name of the package to use in MicroG support", + description = "The name of the package to use in GmsCore support.", required = true ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/feed/components/FeedComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/feed/components/FeedComponentsPatch.kt index 4a5b97e42..c0ebc8958 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/feed/components/FeedComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/feed/components/FeedComponentsPatch.kt @@ -50,7 +50,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference @Suppress("unused") object FeedComponentsPatch : BaseBytecodePatch( name = "Hide feed components", - description = "Adds options to hide components related to the feed.", + description = "Adds options to hide components related to feeds.", dependencies = setOf( LithoFilterPatch::class, NavigationBarHookPatch::class, diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt index 48599754e..1aa9ab362 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarComponentsPatch.kt @@ -86,7 +86,7 @@ object ToolBarComponentsPatch : BaseBytecodePatch( key = "ForceHideVoiceSearchButton", default = false, title = "Force hide voice search button", - description = "Hide voice search button with legacy method, button will always be hidden." + description = "Permanently hide the voice search button with the legacy method." ) override fun execute(context: BytecodeContext) { diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt index 4db560fb6..8c9f43a9b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconPatch.kt @@ -102,11 +102,13 @@ object CustomBrandingIconPatch : BaseResourcePatch( values = availableIcon, title = "App icon", description = """ - The path to a folder containing the following folders: + The icon to apply to the app. + + If a path to a folder is provided, the folder must contain the following folders: ${mipmapDirectories.joinToString("\n") { "- $it" }} - Each of these folders has to have the following files: + Each of these folders must contain the following files: ${launcherIconResourceFileNames.joinToString("\n") { "- $it" }} """ diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt index 5620bd3fb..e3e2ced6a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt @@ -22,7 +22,7 @@ object DoubleTapLengthPatch : BaseResourcePatch( key = "DoubleTapLengthArrays", default = "3, 5, 10, 15, 20, 30, 60, 120, 180", title = "Double-tap to seek Values", - description = "A list of custom double-tap to seek lengths. Be sure to separate them with commas (,).", + description = "A list of custom double-tap to seek lengths to be added, separated by commas.", required = true ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt index aef4412eb..f47f0cd7b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt @@ -52,7 +52,7 @@ object OverlayButtonsPatch : BaseResourcePatch( default = DEFAULT_ICON_KEY, values = iconTypes, title = "Icon type", - description = "Apply icon type" + description = "The icon type." ) // Option to set bottom margin @@ -64,7 +64,7 @@ object OverlayButtonsPatch : BaseResourcePatch( "Default" to DEFAULT_MARGIN ), title = "Bottom margin", - description = "Apply bottom margin to Overlay buttons and Timestamp" + description = "The bottom margin for the overlay buttons and timestamp." ) /** diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt index 6ab312e82..dae22a371 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt @@ -25,7 +25,7 @@ object SponsorBlockPatch : BaseResourcePatch( key = "OutlineIcon", default = false, title = "Outline icons", - description = "Apply the outline icon", + description = "Apply the outline icon.", required = true ) diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml index 2f8e60541..5b7003ee8 100644 --- a/src/main/resources/music/settings/host/values/strings.xml +++ b/src/main/resources/music/settings/host/values/strings.xml @@ -11,7 +11,7 @@ Account Hide account menu - Hides account menu elements in the custom filter. + Hides account menu elements using the custom filter. Account menu filter List of account menu names to filter, separated by new lines. Hide empty components @@ -19,31 +19,31 @@ Hide handle Hides the handle in the account menu. Hide terms container - Hides terms of service container. + Hides the Terms of Service container. Action Bar - Hide like and dislike buttons - Hides the like and dislike buttons. It does not work in the old player layout. - Hide comment button - Hides comment button. - Hide add to playlist button - Hides add to playlist button. - Hide download button - Hides download button. - Hide share button - Hides share button. - Hide radio button - Hides start radio button. - Hides labels in action buttons. + Hide Like and Dislike buttons + Hides the Like and Dislike buttons. It does not work in the old player layout. + Hide Comments button + Hides the Comments button. + Hide Save button + Hides the Save button. + Hide Download button + Hides the Download button. + Hide Share button + Hides the Share button. + Hide Radio button + Hides the Radio button. Hide action button labels - Override download action button + Hides the labels of the action buttons. + Override Download action button "Download button opens your external downloader. -• Only overrides the download action button in the player. -• Does not override the download button in the flyout menu or library." +• Only overrides the Download action button in the player. +• Does not override the Download button in the flyout menu or Library tab." External downloader package name Package name of your installed external downloader app, such as NewPipe or YTDLnis. External downloader @@ -60,10 +60,10 @@ Please download %2$s from the website." Hides fullscreen ads. Hide general ads Hides general ads. - Hide music ads - Hides ads before playing a music. + Hide media ads + Hides ads before playing media. Hide paid promotion label - Hides paid promotion label. + Hides the paid promotion label. Hide premium promotion popups Hides premium promotion popups. Hide premium renewal banner @@ -77,52 +77,53 @@ Please download %2$s from the website." "Enables the compact flyout menu on phones. Limitations: -• Album art in the library tab becomes smaller when organized in a grid. +• Album art in the Library tab becomes smaller when organized in a grid. • Sleep timer layout may appear unusual." - Add trim silence switch - "Adds 'Trim silence' switch to the playback speed flyout menu. + Add Trim silence switch + "Adds a Trim silence switch to the playback speed flyout menu. Info: • This feature is for podcasts. • This feature is still in development, so it may be unstable." - Hide like and dislike button + Hide Like and Dislike buttons Hide 3-column component - Hide add to queue menu - Hide captions menu - Hide delete playlist menu - Hide dismiss queue menu - Hide download menu - Hide edit playlist menu - Hide go to album menu - Hide go to artist menu - Hide go to episode menu - Hide go to podcast menu - Hide help & feedback menu - Hide play next menu - Hide quality menu - Hide remove from library menu - Hide remove from playlist menu - Hide report menu - Hide save episode for later menu - Hide save to library menu - Hide save to playlist menu - Hide share menu - Hide shuffle play menu - Hide sleep timer menu - Hide start radio menu - Hide stats for nerds menu - Hide subscribe / unsubscribe menu - Hide view song credit menu + Hide Add to queue menu + Hide Captions menu + Hide Delete playlist menu + Hide Dismiss queue menu + Hide Download menu + Hide Edit playlist menu + Hide Go to album menu + Hide Go to artist menu + Hide Go to episode menu + Hide Go to podcast menu + Hide Help & feedback menu + Hide Play next menu + Hide Quality menu + Hide Remove from library menu + Hide Remove from playlist menu + Hide Report menu + Hide Save episode for later menu + Hide Save to library menu + Hide Save to playlist menu + Hide Share menu + Hide Shuffle play menu + Hide Sleep timer menu + Hide Start radio menu + Hide Stats for nerds menu + Hide Subscribe / Unsubscribe menu + Hide View song credits menu Continue watching Continues the video from the current time when switching to YouTube. Watch on YouTube Invalid video url. - Replace dismiss queue - Replaces \'Dismiss queue\' with \'Watch on YouTube\'. - Keep report in comments - Keeps the report menu in the comments section intact. - Replace report - Replaces \'Report\' with \'Playback speed\'. + Replace Dismiss queue menu + Replaces the Dismiss queue menu with the Watch on YouTube menu. + Replace Report menu + Replaces the Report menu with the Playback speed menu. + Keep Report in comments + Keeps the Report menu in the comments section intact. + @@ -138,7 +139,7 @@ Info: Disable forced auto captions Disables captions from being automatically enabled. Disable dislike redirection - Disables redirection to the next track when clicking the dislike button. + Disables redirection to the next track when clicking the Dislike button. Enable landscape mode Enables landscape mode when rotating the screen on phones. Enable custom filter @@ -148,31 +149,31 @@ Info: List of component path builder strings to filter, separated by new lines. Invalid custom filter: %s. Hide button shelf - Hides button shelf in feed. + Hides the button shelf in the feed. Hide carousel shelf - Hides carousel shelf in feed. + Hides the carousel shelf in the feed. Hide playlist card shelf - Hides playlist card shelf in feed. - Hide samples shelf - Hides samples shelf in feed. - Hide cast button - Hides cast button. + Hides the playlist card shelf in the feed. + Hide Samples shelf + Hides the Samples shelf in the feed. + Hide Cast button + Hides the Cast button. Hide category bar - Hides category bar. + Hides the category bar. Hide floating button - Hides floating button in library. + Hides the floating button in the Library tab. Hide \'Tap to update\' button - Hides \'Tap to update\' button. - Hide history button - Hides history button in toolbar. - Hide notification button - Hides notification button in toolbar. + Hides the \'Tap to update\' button. + Hide History button + Hides the History button in the toolbar. + Hide Notifications button + Hides the Notifications button in the toolbar. Hide sound search button - Hides sound search button in search bar. + Hides the sound search button in the search bar. Hide voice search button - Hides voice search button in search bar. + Hides the voice search button in the search bar. Restore old style library shelf - Returns the library tab to the old style. (Experimental) + Returns the Library tab to the old style. (Experimental) Remove viewer discretion dialog "Removes the viewer discretion dialog. This does not bypass the age restriction. It just accepts it automatically." @@ -183,7 +184,7 @@ This does not bypass the age restriction. It just accepts it automatically." Spoof app version target Select the spoof app version target. - 4.27.53 - Disable radio mode in Canadian regions + 4.27.53 - Disable Radio mode in Canadian regions 6.11.52 - Disable real-time lyrics @@ -192,19 +193,19 @@ This does not bypass the age restriction. It just accepts it automatically."Enable black navigation bar Sets the navigation bar color to black. - Hide home button - Hides the home button. - Hide samples button - Hides the samples button. - Hide explore button - Hides the explore button. - Hide library button - Hides the library button. - Hide upgrade button - Hides the upgrade button. + Hide Home button + Hides the Home button. + Hide Samples button + Hides the Samples button. + Hide Explore button + Hides the Explore button. + Hide Library button + Hides the Library button. + Hide Upgrade button + Hides the Upgrade button. Hide navigation bar Hides the navigation bar. - Hide navigation label + Hide navigation labels Hides labels below the navigation buttons. @@ -217,24 +218,24 @@ This does not bypass the age restriction. It just accepts it automatically."Matches the color of the miniplayer to the fullscreen player. Enable force minimized player Keeps the player minimized even when another track is played. - Enable miniplayer next button - Enables next button in the miniplayer. - Enable miniplayer previous button - Enables previous button in the miniplayer. + Add miniplayer next button + Adds a next track button to the miniplayer. + Add miniplayer previous button + Adds a previous track button to the miniplayer. Enable swipe to dismiss miniplayer Enables swipe down to dismiss miniplayer. - Enable zen mode - Changes the player background to light grey to reduce eye strain. - Enable zen mode in podcasts - Zen mode is also applied to podcasts. - Hide audio video switch toggle - Hides the audio video switch toggle in player. + Enable Zen mode + Changes the player background color to light grey to reduce eye strain. + Enable Zen mode in podcasts + Also enables Zen mode for podcasts. + Hide Audio / Video toggle + Hides the Audio / Video toggle in the player. Hide channel guidelines - Hides channel guidelines at the top of the comments section. + Hides the channel guidelines at the top of the comments section. Hide timestamp and emoji buttons - Hides timestamp and emoji buttons when typing comments. - Hide fullscreen share button - Hides the share button in the fullscreen player. + Hides the timestamp and emoji buttons when typing comments. + Hide fullscreen Share button + Hides the Share button in the fullscreen player. Remember repeat state Remembers the state of the repeat toggle. Remember shuffle state @@ -356,11 +357,11 @@ Some features may not work properly in the old player layout." Prints the debug log. Enable debug buffer logging Includes the buffer in the debug log. - Enable opus codec - "Enables the opus audio codec instead of the mp4a audio codec. + Enable OPUS codec + "Enables the OPUS audio codec instead of the MP4A audio codec. Info: -• Latest Android clients use the opus audio codec by default. +• Latest Android clients use the OPUS audio codec by default. • This is only valid for users spoofing with very old clients." Open GmsCore @@ -369,7 +370,7 @@ Info: Action needed "GmsCore does not have permission to run in the background. -Follow the 'Don't kill my app' guide for your phone, and apply the instructions to your MicroG installation. +Follow the 'Don't kill my app!' guide for your device, and apply the instructions to your GmsCore installation. This is required for the app to work." Open website diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml index c56b4ed96..5652763f2 100644 --- a/src/main/resources/youtube/settings/host/values/strings.xml +++ b/src/main/resources/youtube/settings/host/values/strings.xml @@ -433,7 +433,7 @@ Captions" "Enabling this setting will disable the Settings button in the You tab. In this case, please use the following path to access the settings: -You tab → View channel → Menu → Settings." +'You tab → View channel → Menu → Settings'" Hide Cast button Cast button is hidden. Cast button is shown. @@ -590,10 +590,10 @@ Autoplay can be changed in YouTube settings: "Hide 'Comments by members' banner" "'Comments by members' banner is hidden." "'Comments by members' banner is shown." - Hide comments section + Hide Comments section Comments section is hidden. Comments section is shown. - Hide comments section in home feed + Hide Comments section in home feed Comments section is hidden in home feed. Comments section is shown in home feed. Hide preview comment @@ -1017,7 +1017,7 @@ Limitation: Official headers in search results will be hidden." Hide Dislike button Dislike button is hidden. Dislike button is shown. - Hide comments button + Hide Comments button Comments button is hidden. Comments button is shown. Hide disabled comments button @@ -1496,7 +1496,7 @@ Side effects include: • Playback speed menu is missing. • Higher video qualities may be missing. • Watch history does not work with a brand account. -• Live streams cannot play as audio only. +• Live streams cannot play as audio-only. • Live streams not available on Android 8.0." Android Testsuite "Spoof client to Android Testsuite. @@ -1504,14 +1504,14 @@ Side effects include: Side effects include: • No HDR video. • Audio track menu and playback speed menu are missing. -• Subtitles may not be available." +• Captions may not be available." Android TV "Spoof client to Android TV (YouTube TV). Side effects include: • No HDR video. • Audio track menu and playback speed menu are missing. -• Subtitles may not be available. +• Captions may not be available. • Some live streams are not supported for playback." Android VR "Spoof client to Android VR. @@ -1520,7 +1520,7 @@ Side effects include: • No HDR video. • Paused videos can randomly resume. • Low quality Shorts seekbar thumbnails. -• Kids videos do not playback." +• Kids videos do not play." Patch information