From f8677253e47485da7baa06183ccfaec75b28f89e Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Mon, 10 Jun 2019 13:34:45 +0000
Subject: [PATCH] I18N: Combine similar strings with minor differences.

Merges [45298] to the 5.2 branch.

Props dimadin.
Fixes #47158.
Built from https://develop.svn.wordpress.org/branches/5.2@45510


git-svn-id: http://core.svn.wordpress.org/branches/5.2@45321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/dashboard.php | 2 +-
 wp-admin/includes/file.php      | 4 ++--
 wp-admin/includes/theme.php     | 9 +++++++--
 wp-includes/version.php         | 2 +-
 wp-login.php                    | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index e3160bb390..ad02909c74 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -1628,7 +1628,7 @@ function wp_dashboard_php_nag() {
 	<p><?php echo $msg; ?></p>
 
 	<h3><?php _e( 'What is PHP and how does it affect my site?' ); ?></h3>
-	<p><?php _e( 'PHP is the programming language we use to build and maintain WordPress. Newer versions of PHP are both faster and more secure, so updating will have a positive effect on your site’s performance.' ); ?></p>
+	<p><?php _e( 'PHP is the programming language we use to build and maintain WordPress. Newer versions of PHP are both faster and more secure, so updating will have a positive effect on your site&#8217;s performance.' ); ?></p>
 
 	<p class="button-container">
 		<?php
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 3605cd6602..538ec2e1ca 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -1187,8 +1187,8 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
 		return new WP_Error(
 			'signature_verification_unsupported',
 			sprintf(
-				/* translators: 1: The filename of the package. */
-				__( 'The authenticity of %1$s could not be verified as signature verification is unavailable on this system.' ),
+				/* translators: %s: The filename of the package. */
+				__( 'The authenticity of %s could not be verified as signature verification is unavailable on this system.' ),
 				'<span class="code">' . esc_html( $filename_for_errors ) . '</span>'
 			),
 			array(
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 5283cea8bc..f1d0d374bd 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -723,8 +723,13 @@ function customize_themes_print_templates() {
 							{{{ data.stars }}}
 							<a class="num-ratings" target="_blank" href="{{ data.reviews_url }}">
 								<?php
-								/* translators: %s: number of ratings */
-								echo sprintf( __( '(%s ratings) <span class="screen-reader-text">link to view ratings opens in a new tab</span>' ), '{{ data.num_ratings }}' );
+								printf(
+									'%1$s <span class="screen-reader-text">%2$s</span>',
+									/* translators: %s: number of ratings */
+									sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' ),
+									/* translators: accessibility text */
+									__( '(opens in a new tab)' )
+								);
 								?>
 							</a>
 						</div>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0368129882..dfd9638957 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2.2-alpha-45509';
+$wp_version = '5.2.2-alpha-45510';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-login.php b/wp-login.php
index d9b2554783..5ecf5f0dbf 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -426,7 +426,7 @@ function retrieve_password() {
 	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
 	if ( $message && ! wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
-		wp_die( __( 'The email could not be sent.' ) . "<br />\n" . __( 'Possible reason: your host may have disabled the mail() function.' ) );
+		wp_die( __( 'The email could not be sent. Possible reason: your host may have disabled the mail() function.' ) );
 	}
 
 	return true;