From 7482a4d4ac0b38e9bb330b0d5b13e04d55eadf81 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 17 Feb 2016 15:00:28 +0000
Subject: [PATCH] Setup: Use "Username" instead of "User Name".

Props thisisit.
Fixes #35850.
Built from https://develop.svn.wordpress.org/trunk@36544


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

diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index ac8e4fdf9f..45d4d62e8f 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -191,7 +191,7 @@ switch($step) {
 			<td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
+			<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
 			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
 			<td><?php _e( 'Your MySQL username' ); ?></td>
 		</tr>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3330840ea1..a874d83603 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36543';
+$wp_version = '4.5-alpha-36544';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.