From 969ccec7d261664fc097ee9e8bf45fc6dd1aab88 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 24 Feb 2016 01:22:26 +0000
Subject: [PATCH] I18N: Remove `<code>` tags from translatable strings in
 `wp-admin/install.php`.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/install.php    | 25 ++++++++++++++++++++++---
 wp-includes/version.php |  2 +-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/wp-admin/install.php b/wp-admin/install.php
index d1e1762518..2403982046 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -211,7 +211,12 @@ function display_setup_form( $error = null ) {
 // Let's check to make sure WP isn't already installed.
 if ( is_blog_installed() ) {
 	display_header();
-	die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
+	die(
+		'<h1>' . __( 'Already Installed' ) . '</h1>' .
+		'<p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p>' .
+		'<p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p>' .
+		'</body></html>'
+	);
 }
 
 /**
@@ -241,13 +246,27 @@ if ( !$mysql_compat || !$php_compat ) {
 
 if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
 	display_header();
-	die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
+	die(
+		'<h1>' . __( 'Configuration Error' ) . '</h1>' .
+		'<p>' . sprintf(
+			/* translators: %s: wp-config.php */
+			__( 'Your %s file has an empty database table prefix, which is not supported.' ),
+			'<code>wp-config.php</code>'
+		) . '</p></body></html>'
+	);
 }
 
 // Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install.
 if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
 	display_header();
-	die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '</p></body></html>' );
+	die(
+		'<h1>' . __( 'Configuration Error' ) . '</h1>' .
+		'<p>' . sprintf(
+			/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
+			__( 'The constant %s cannot be defined when installing WordPress.' ),
+			'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
+		) . '</p></body></html>'
+	);
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4e296521db..dd994b61ae 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36664';
+$wp_version = '4.5-alpha-36665';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.