From efc402898c629f23f62da1db731494542f3917ad Mon Sep 17 00:00:00 2001
From: Tammie Lister <tammie@automattic.com>
Date: Fri, 28 Feb 2025 17:07:23 +0000
Subject: [PATCH] Twenty Twenty-Five: Improves text strings.

This ticket replaces the issue not resolved in time before the release of the theme. This now takes the feedback of translators and iterates on that.

Props poena, desrosj, hameem1102, burakkaptan, jorbin, prathamesh24, audrasjb.
Fixes #62482.

Built from https://develop.svn.wordpress.org/trunk@59891


git-svn-id: http://core.svn.wordpress.org/trunk@59233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../themes/twentytwentyfive/patterns/banner-intro-image.php   | 2 +-
 .../themes/twentytwentyfive/patterns/header-centered.php      | 4 ++--
 .../themes/twentytwentyfive/patterns/header-columns.php       | 2 +-
 .../themes/twentytwentyfive/patterns/header-large-title.php   | 2 +-
 wp-content/themes/twentytwentyfive/patterns/header.php        | 2 +-
 .../twentytwentyfive/patterns/hero-full-width-image.php       | 2 +-
 .../patterns/template-404-vertical-header-blog.php            | 2 +-
 .../twentytwentyfive/patterns/template-archive-text-blog.php  | 2 +-
 .../patterns/template-archive-vertical-header-blog.php        | 2 +-
 .../twentytwentyfive/patterns/template-home-text-blog.php     | 2 +-
 .../patterns/template-home-vertical-header-blog.php           | 2 +-
 .../patterns/template-page-vertical-header-blog.php           | 2 +-
 .../patterns/template-query-loop-text-blog.php                | 2 +-
 .../patterns/template-query-loop-vertical-header-blog.php     | 2 +-
 .../twentytwentyfive/patterns/template-search-text-blog.php   | 2 +-
 .../twentytwentyfive/patterns/template-single-text-blog.php   | 2 +-
 .../themes/twentytwentyfive/patterns/vertical-header.php      | 4 ++--
 wp-content/themes/twentytwentyfive/theme.json                 | 2 +-
 wp-includes/version.php                                       | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php b/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
index 428deb07af..ea70d00b73 100644
--- a/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/banner-intro-image.php
@@ -39,7 +39,7 @@
 			<div class="wp-block-buttons">
 				<!-- wp:button -->
 				<div class="wp-block-button">
-					<a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Learn More', 'Button text of intro section.', 'twentytwentyfive' ); ?></a>
+					<a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Learn more', 'twentytwentyfive' ); ?></a>
 				</div>
 				<!-- /wp:button -->
 			</div>
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-centered.php b/wp-content/themes/twentytwentyfive/patterns/header-centered.php
index f65124256d..4468001a6c 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-centered.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-centered.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Title: Centered header
+ * Title: Centered site header
  * Slug: twentytwentyfive/header-centered
  * Categories: header
  * Block Types: core/template-part/header
- * Description: Header with centered site title and navigation.
+ * Description: Site header with centered site title and navigation.
  *
  * @package WordPress
  * @subpackage Twenty_Twenty_Five
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-columns.php b/wp-content/themes/twentytwentyfive/patterns/header-columns.php
index fc0a6e4603..7cb8eabaa0 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-columns.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-columns.php
@@ -4,7 +4,7 @@
  * Slug: twentytwentyfive/header-columns
  * Categories: header
  * Block Types: core/template-part/header
- * Description: Header with site title and navigation in columns.
+ * Description: Site header with site title and navigation in columns.
  *
  * @package WordPress
  * @subpackage Twenty_Twenty_Five
diff --git a/wp-content/themes/twentytwentyfive/patterns/header-large-title.php b/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
index 087be5d5f6..8a4cd38830 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header-large-title.php
@@ -4,7 +4,7 @@
  * Slug: twentytwentyfive/header-large-title
  * Categories: header
  * Block Types: core/template-part/header
- * Description: Header with large site title and right-aligned navigation.
+ * Description: Site header with large site title and right-aligned navigation.
  *
  * @package WordPress
  * @subpackage Twenty_Twenty_Five
diff --git a/wp-content/themes/twentytwentyfive/patterns/header.php b/wp-content/themes/twentytwentyfive/patterns/header.php
index 1cbe86e1d3..8cccb6cd25 100644
--- a/wp-content/themes/twentytwentyfive/patterns/header.php
+++ b/wp-content/themes/twentytwentyfive/patterns/header.php
@@ -4,7 +4,7 @@
  * Slug: twentytwentyfive/header
  * Categories: header
  * Block Types: core/template-part/header
- * Description: Header with site title and navigation.
+ * Description: Site header with site title and navigation.
  *
  * @package WordPress
  * @subpackage Twenty_Twenty_Five
diff --git a/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php b/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
index 1a50f1dfcc..95079712d4 100644
--- a/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
+++ b/wp-content/themes/twentytwentyfive/patterns/hero-full-width-image.php
@@ -30,7 +30,7 @@
 			<!-- wp:buttons -->
 			<div class="wp-block-buttons">
 				<!-- wp:button -->
-				<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php echo esc_html_x( 'Learn More', 'Sample hero button', 'twentytwentyfive' ); ?></a></div>
+				<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Learn more', 'twentytwentyfive' ); ?></a></div>
 				<!-- /wp:button -->
 			</div>
 			<!-- /wp:buttons -->
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-404-vertical-header-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-404-vertical-header-blog.php
index b93343da67..5506cb4e5b 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-404-vertical-header-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-404-vertical-header-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Right-aligned blog, 404
+ * Title: Right-aligned 404
  * Slug: twentytwentyfive/template-404-vertical-header-blog
  * Template Types: 404
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-archive-text-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-archive-text-blog.php
index 26cc2437bb..7efe1b4df9 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-archive-text-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-archive-text-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Text-only blog, archive
+ * Title: Text blog archive
  * Slug: twentytwentyfive/template-archive-text-blog
  * Template Types: archive
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-archive-vertical-header-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-archive-vertical-header-blog.php
index a9a47302cf..9a25fe3ff2 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-archive-vertical-header-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-archive-vertical-header-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Archive for the right-aligned blog
+ * Title: Right-aligned archive
  * Slug: twentytwentyfive/template-archive-vertical-header-blog
  * Template Types: archive
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-home-text-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-home-text-blog.php
index eb6bb36741..81e482e216 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-home-text-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-home-text-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Text-only blog, home
+ * Title: Text blog home
  * Slug: twentytwentyfive/template-home-text-blog
  * Template Types: front-page, home
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-home-vertical-header-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-home-vertical-header-blog.php
index 528d313b14..b44b5dd7e1 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-home-vertical-header-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-home-vertical-header-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Homepage for right-aligned blog
+ * Title: Right-aligned home
  * Slug: twentytwentyfive/template-home-vertical-header-blog
  * Template Types: front-page, index, home
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-page-vertical-header-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-page-vertical-header-blog.php
index 8be9a7e3a3..1c2377048d 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-page-vertical-header-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-page-vertical-header-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Page template for the right-aligned blog
+ * Title: Right-aligned page
  * Slug: twentytwentyfive/template-page-vertical-header-blog
  * Template Types: page
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-text-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-text-blog.php
index 416c3b33aa..e90e480518 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-text-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-text-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Text-only blog, posts
+ * Title: Text blog query loop
  * Slug: twentytwentyfive/template-query-loop-text-blog
  * Inserter: no
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-vertical-header-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-vertical-header-blog.php
index c4b912b194..b572e9306a 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-query-loop-vertical-header-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-query-loop-vertical-header-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Right-aligned posts
+ * Title: Right-aligned query loop
  * Slug: twentytwentyfive/template-query-loop-vertical-header-blog
  * Inserter: no
  *
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-search-text-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-search-text-blog.php
index c51a053fb0..124af4a57f 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-search-text-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-search-text-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Text-only blog, search
+ * Title: Text blog search results
  * Slug: twentytwentyfive/template-search-text-blog
  * Template Types: search
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/template-single-text-blog.php b/wp-content/themes/twentytwentyfive/patterns/template-single-text-blog.php
index a99ee6adf7..2b60f96670 100644
--- a/wp-content/themes/twentytwentyfive/patterns/template-single-text-blog.php
+++ b/wp-content/themes/twentytwentyfive/patterns/template-single-text-blog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Title: Text-only blog, single post
+ * Title: Text blog single post
  * Slug: twentytwentyfive/template-single-text-blog
  * Template Types: posts, single
  * Viewport width: 1400
diff --git a/wp-content/themes/twentytwentyfive/patterns/vertical-header.php b/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
index a90923924e..52cbf9a542 100644
--- a/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
+++ b/wp-content/themes/twentytwentyfive/patterns/vertical-header.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Title: Vertical header
+ * Title: Vertical site header
  * Slug: twentytwentyfive/vertical-header
  * Categories: header
  * Block Types: core/template-part/vertical-header
- * Description: Vertical Header with site title and navigation
+ * Description: Vertical site header with site title and navigation.
  * Viewport width: 300
  *
  * @package WordPress
diff --git a/wp-content/themes/twentytwentyfive/theme.json b/wp-content/themes/twentytwentyfive/theme.json
index a830707865..7daeb0dbd7 100644
--- a/wp-content/themes/twentytwentyfive/theme.json
+++ b/wp-content/themes/twentytwentyfive/theme.json
@@ -694,7 +694,7 @@
 		{
 			"area": "header",
 			"name": "vertical-header",
-			"title": "Vertical Header"
+			"title": "Vertical site header"
 		},
 		{
 			"area": "header",
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6c1ebb7214..0898e8c051 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.8-alpha-59890';
+$wp_version = '6.8-alpha-59891';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.