aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-04 01:26:29 -0800
committerfriendica <info@friendica.com>2015-03-04 01:26:29 -0800
commitb471d2a3d19d21543ab84a64db2439dc1b36c77f (patch)
tree20942cb0b032dbdb270e88db3ccde18bb33b2ac6 /mod
parent64e7c8b20f241f7f63ad78c23fdf872f3422d561 (diff)
parent4b08ccd873a02dcbcd8603f4b8681de47776e31f (diff)
downloadvolse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.tar.gz
volse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.tar.bz2
volse-hubzilla-b471d2a3d19d21543ab84a64db2439dc1b36c77f.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/settings.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 71ca38d91..a40a1deca 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -708,9 +708,8 @@ function settings_content(&$a) {
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("settings_account"),
'$title' => t('Account Settings'),
- '$h_pass' => t('Password Settings'),
- '$password1'=> array('npassword', t('New Password:'), '', ''),
- '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+ '$password1'=> array('npassword', t('Enter New Password:'), '', ''),
+ '$password2'=> array('confirm', t('Confirm New Password:'), '', t('Leave password fields blank unless changing')),
'$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'),