From 5ca590058778d1fea7c7bbb1224e2d3ee4856bae Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Feb 2016 23:28:25 +0000
Subject: [PATCH] I18N: Remove `<a>` tag from translatable string in
 `wp-admin/options-general.php`.

Add translator comment.

Props ramiy.
Fixes #35673.
Built from https://develop.svn.wordpress.org/trunk@36656


git-svn-id: http://core.svn.wordpress.org/trunk@36623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 13 +++++++++----
 wp-includes/version.php      |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 89830222f5..9091d5e3eb 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -105,10 +105,15 @@ $new_admin_email = get_option( 'new_admin_email' );
 if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
 <p><?php
-	/* translators: 1: new admin email, 2: Cancel link URL */
-	printf( __( 'There is a pending change of the admin email to %1$s. <a href="%2$s">Cancel</a>' ),
-		'<code>' . esc_html( $new_admin_email ) . '</code>',
-		esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) )
+	printf(
+		/* translators: %s: new admin email */
+		__( 'There is a pending change of the admin email to %s.' ),
+		'<code>' . esc_html( $new_admin_email ) . '</code>'
+	);
+	printf(
+		' <a href="%1$s">%2$s</a>',
+		esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ),
+		__( 'Cancel' )
 	);
 ?></p>
 </div>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 80a70fcaef..b9887b2007 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36655';
+$wp_version = '4.5-alpha-36656';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.