From 5d3e652c23763e519bf2c32785143bba5918f5e8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 24 Feb 2014 23:31:15 +0000
Subject: [PATCH] Add Oxford comma to password hint.

props trepmal.
fixes #26457.
Built from https://develop.svn.wordpress.org/trunk@27246


git-svn-id: http://core.svn.wordpress.org/trunk@27103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/install.php   | 2 +-
 wp-admin/user-edit.php | 2 +-
 wp-admin/user-new.php  | 2 +-
 wp-login.php           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-admin/install.php b/wp-admin/install.php
index 587d79ade9..921e62167c 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -123,7 +123,7 @@ function display_setup_form( $error = null ) {
 				<input name="admin_password" type="password" id="pass1" size="25" value="" />
 				<p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
 				<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
-				<p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+				<p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
 			</td>
 		</tr>
 		<?php endif; ?>
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index bf83ec9dc7..e35c879568 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -470,7 +470,7 @@ if ( $show_password_fields ) :
 	<span class="description" for="pass2"><?php _e( 'Type your new password again.' ); ?></span>
 	<br />
 	<div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div>
-	<p class="description indicator-hint"><?php _e( 'Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).' ); ?></p>
+	<p class="description indicator-hint"><?php _e( 'Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' ); ?></p>
 	</td>
 </tr>
 <?php endif; ?>
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 6b18ad53c7..400e789222 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -395,7 +395,7 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?>
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		<br />
 		<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
-		<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+		<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
 		</td>
 	</tr>
 	<tr>
diff --git a/wp-login.php b/wp-login.php
index 068ab26e18..47dc3c53c7 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -612,7 +612,7 @@ case 'rp' :
 	</p>
 
 	<div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div>
-	<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+	<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
 
 	<br class="clear" />