Update language keys and tweak text

qa-include/lang/qa-lang-users.php

@@ -40,8 +40,8 @@
 		'change_email_link' => ' - ^1change email^2',
 		'change_password' => 'Change Password',
 		'confirm_button' => 'Confirm email address',
-		'confirm_complete' => 'Thank you - your email address has been confirmed',
-		'confirm_emailed' => 'Please click the link or input the code sent to your email address in order to confirm it.',
+		'confirm_complete' => 'Thank you - your email address has been confirmed.',
+		'confirm_emailed' => 'A confirmation link has been emailed to you. Please click the link to confirm your email address or input the confirmation code below.',
 		'confirm_required' => 'To complete your registration, please click the confirmation link that has been emailed to you, or ^1request another^2.',
 		'confirm_title' => 'Email Address Confirmation',
 		'confirm_wrong_log_in' => 'Code not correct - please ^1log in^2 to send a new link',
@@ -49,6 +49,10 @@
 		'delete_user_button' => 'Delete User',
 		'edit_profile' => 'Edit my Profile',
 		'edit_user_button' => 'Edit User',
+		'email_code_another' => 'send another',
+		'email_code_emailed' => 'You have been emailed your code',
+		'email_code_label' => 'Code:',
+		'email_code_wrong' => 'Code not correct',
 		'email_confirmed' => 'Confirmed',
 		'email_exists' => 'Email already belongs to an account',
 		'email_handle_label' => 'Email or Username:',
@@ -111,10 +115,6 @@
 		'remember' => 'Remember',
 		'remember_label' => 'Remember me on this computer',
 		'remove_avatar' => 'Remove avatar:',
-		'reset_code_another' => 'send another',
-		'reset_code_emailed' => 'You have been emailed your code',
-		'reset_code_label' => 'Code:',
-		'reset_code_wrong' => 'Code not correct',
 		'reset_title' => 'Reset Forgotten Password',
 		'save_profile' => 'Save Profile',
 		'save_user' => 'Save User',

qa-include/pages/confirm.php

@@ -120,11 +120,11 @@ if ($emailConfirmationSent) {
 				'type' => 'static',
 			),
 			'code' => array(
-				'label' => qa_lang_html('users/reset_code_label'),
+				'label' => qa_lang_html('users/email_code_label'),
 				'tags' => 'name="code" id="code"',
 				'value' => isset($code) ? qa_html($code) : null,
-				'note' => qa_lang_html('users/reset_code_emailed') . ' - ' .
-					'<a href="' . qa_path_html('confirm') . '">' . qa_lang_html('users/reset_code_another') . '</a>',
+				'note' => qa_lang_html('users/email_code_emailed') . ' - ' .
+					'<a href="' . qa_path_html('confirm') . '">' . qa_lang_html('users/email_code_another') . '</a>',
 			),
 		),
 

qa-include/pages/reset.php

@@ -61,12 +61,12 @@ $fields = array(
 		'value' => qa_html($emailHandle),
 	),
 	'code' => array(
-		'label' => qa_lang_html('users/reset_code_label'),
+		'label' => qa_lang_html('users/email_code_label'),
 		'tags' => 'name="code" id="code"',
 		'value' => isset($code) ? qa_html($code) : null,
 		'note_force' => true,
-		'note' => qa_lang_html('users/reset_code_emailed') . ' - ' .
-			'<a href="' . qa_html($forgotPath) . '">' . qa_lang_html('users/reset_code_another') . '</a>',
+		'note' => qa_lang_html('users/email_code_emailed') . ' - ' .
+			'<a href="' . qa_html($forgotPath) . '">' . qa_lang_html('users/email_code_another') . '</a>',
 	),
 );
 $buttons = array(
@@ -151,11 +151,11 @@ if (strlen($emailHandle) > 0) {
 				);
 			} else {
 				// User input wrong code so show field with error
-				$fields['code']['error'] = qa_lang('users/reset_code_wrong');
+				$fields['code']['error'] = qa_lang('users/email_code_wrong');
 			}
 		} else if (qa_clicked('donext')) {
 			// If user submitted the form with an empty code
-			$fields['code']['error'] = qa_lang('users/reset_code_wrong');
+			$fields['code']['error'] = qa_lang('users/email_code_wrong');
 		}
 	} else {
 		// If match more than one (should be impossible), consider it a non-match
@@ -181,7 +181,7 @@ if (!isset($errors['page'])) {
 
 		'style' => 'tall',
 
-		'ok' => qa_get('s') ? qa_lang_html('users/reset_code_emailed') : null,
+		'ok' => qa_get('s') ? qa_lang_html('users/email_code_emailed') : null,
 
 		'fields' => $fields,