From 0c20fb1ad86817ad64bb9ffe5073e479b557f718 Mon Sep 17 00:00:00 2001
From: davidbaumwald <davidbaumwald@git.wordpress.org>
Date: Mon, 19 Sep 2022 21:43:10 +0000
Subject: [PATCH] Help/About: Make translator comments version agnostic and
 make version translatable on the About page.

In past versions of the About page, translator comments referencing the Field Guide and Release Notes links included the current version number.  This change updates these translator comments to remove a specific version number, which was not necessary.

This change also abstracts the version number out of the "Read the WordPress X.X Release Notes" string, making it translatable.

Props Presskopp, audrasjb, SergeyBiryukov, marybaum.
Fixes #54741.
Built from https://develop.svn.wordpress.org/trunk@54219


git-svn-id: http://core.svn.wordpress.org/trunk@53778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 11 ++++++-----
 wp-includes/version.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index cf17d163df..1ce28fef89 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -298,7 +298,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 				<p>
 					<?php
 					printf(
-						/* translators: %s: WordPress 6.0 Field Guide link. */
+						/* translators: %s: WordPress Field Guide link. */
 						__( 'Check out the latest version of the <a href="%s">WordPress Field Guide</a>. It is overflowing with detailed developer notes to help you build with WordPress.' ),
 						__( 'https://make.wordpress.org/core/2022/05/03/wordpress-6-0-field-guide/' )
 					);
@@ -309,13 +309,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 				<p>
 					<?php
 					printf(
-						/* translators: %s: WordPress 6.0 Release Notes link. */
-						__( '<a href="%s">Read the WordPress 6.0 Release Notes</a> for more information on the included enhancements and issues fixed, installation information, developer notes and resources, release contributors, and the list of file changes in this release.' ),
+						/* translators: 1: WordPress Release Notes link, 2: WordPress version number. */
+						__( '<a href="%1$s">Read the WordPress %2$s Release Notes</a> for more information on the included enhancements and issues fixed, installation information, developer notes and resources, release contributors, and the list of file changes in this release.' ),
 						sprintf(
-							/* translators: %s: WordPress version. */
+							/* translators: %s: WordPress version number. */
 							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
 							'6-0'
-						)
+						),
+						'6.0'
 					);
 					?>
 				</p>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6bcb2a6a0a..19cf415027 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-54218';
+$wp_version = '6.1-alpha-54219';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.