aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-03-04 10:26:25 +0100
committerMario Vavti <mario@mariovavti.com>2015-03-04 10:26:25 +0100
commiteceafd5777c2b2c15d5db93e0a11bbeb328142e2 (patch)
tree75e04e167be0adc8b334f7a92a5278a7d057c27f
parent4b08ccd873a02dcbcd8603f4b8681de47776e31f (diff)
downloadvolse-hubzilla-eceafd5777c2b2c15d5db93e0a11bbeb328142e2.tar.gz
volse-hubzilla-eceafd5777c2b2c15d5db93e0a11bbeb328142e2.tar.bz2
volse-hubzilla-eceafd5777c2b2c15d5db93e0a11bbeb328142e2.zip
fix wording
-rw-r--r--mod/settings.php7
-rwxr-xr-xview/tpl/settings.tpl2
-rwxr-xr-xview/tpl/settings_account.tpl2
3 files changed, 5 insertions, 6 deletions
diff --git a/mod/settings.php b/mod/settings.php
index a40a1deca..6b1e5ab0a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -713,8 +713,7 @@ function settings_content(&$a) {
'$submit' => t('Submit'),
'$email' => array('email', t('Email Address:'), $email, ''),
'$removeme' => t('Remove Account'),
- '$removeaccount' => t('Remove this account from this server including all its channels'),
- '$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
+ '$removeaccount' => t('Remove this account including all its channels'),
'$account_settings' => $account_settings
));
return $o;
@@ -1129,8 +1128,8 @@ function settings_content(&$a) {
'$lbl_misc' => t('Miscellaneous Settings'),
'$menus' => $menu,
'$menu_desc' => t('Personal menu to display in your channel pages'),
- '$removeme' => t('Remove this channel'),
- '$permanent' => t('Warning: This action is permanent and cannot be reversed.'),
+ '$removeme' => t('Remove Channel'),
+ '$removechannel' => t('Remove this channel.'),
));
call_hooks('settings_form',$o);
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 6ad23b007..eb497bbb5 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+ <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$ptitle}}</h2>
<div class="clear"></div>
</div>
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index 5f1f9c9b1..9f550fe4a 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -1,6 +1,6 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
- <a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+ <a title="{{$removeaccount}}" class="btn btn-danger btn-xs pull-right" href="removeaccount"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$title}}</h2>
<div class="clear"></div>
</div>