Merge branch 'release/23.6' of https://github.com/Yoast/wordpress-seo …

…into trunk

package.json

@@ -75,7 +75,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "23.6-RC5"
+    "pluginVersion": "23.6-RC6"
   },
   "version": "0.0.0"
 }

packages/js/src/shared-admin/components/premium-upsell-card.js

@@ -36,9 +36,11 @@ export const PremiumUpsellCard = ( { link, linkProps, promotions } ) => {
 		getPremium = createInterpolateElement(
 			sprintf(
 				/* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */
-				__( "%1$sAll annual plans incl. %2$s", "wordpress-seo" ),
+				__( "%1$sBuy%2$s %3$s", "wordpress-seo" ),
 				"<nowrap>",
-				"</nowrap>"
+				"</nowrap>",
+				"Yoast SEO Premium"
+
 			),
 			{
 				nowrap: <span className="yst-whitespace-nowrap" />,

src/presenters/admin/sidebar-presenter.php

@@ -55,8 +55,8 @@ class="attachment-full size-full content-visible"
 						<h2 class="yoast-get-premium-title">
 							<?php
 							if ( \YoastSEO()->classes->get( Promotion_Manager::class )->is( 'black-friday-2024-promotion' ) ) {
-								/* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. */
-								\printf( \esc_html__( '%1$sAll annual plans incl.%2$s', 'wordpress-seo' ), '<span>', '</span>' );
+								/* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */
+								\printf( \esc_html__( '%1$sBuy%2$s %3$s', 'wordpress-seo' ), '<span>', '</span>', 'Yoast SEO Premium' );
 							}
 							else {
 								/* translators: %1$s and %2$s expand to a span wrap to avoid linebreaks. %3$s expands to "Yoast SEO Premium". */

wp-seo-main.php

@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '23.6-RC5' );
+define( 'WPSEO_VERSION', '23.6-RC6' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     23.6-RC5
+ * Version:     23.6-RC6
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast