diff options
author | zottel <github@zottel.net> | 2012-05-31 08:43:14 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-05-31 08:43:14 +0200 |
commit | 20fdbda25e7fa1c1f6e234867df495be1085f3f8 (patch) | |
tree | 6eb8a4448647f17357d5c5219ddc577f4948230d /mod/settings.php | |
parent | 24b58af68938558baa2ddc6809401ec528ff1176 (diff) | |
parent | f0cf0ebb485432b444b1d85843385ebfda0260fd (diff) | |
download | volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.tar.gz volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.tar.bz2 volse-hubzilla-20fdbda25e7fa1c1f6e234867df495be1085f3f8.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/settings.php')
-rw-r--r-- | mod/settings.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mod/settings.php b/mod/settings.php index bbdfe1ac9..92593d7a8 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -837,27 +837,26 @@ function settings_content(&$a) { $pageset_tpl = get_markup_template('pagetypes.tpl'); $pagetype = replace_macros($pageset_tpl,array( - '$page_normal' => array('page-flags', t('Normal Account'), PAGE_NORMAL, + '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, t('This account is a normal personal profile'), ($a->user['page-flags'] == PAGE_NORMAL)), - '$page_soapbox' => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX, + '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX, t('Automatically approve all connection/friend requests as read-only fans'), ($a->user['page-flags'] == PAGE_SOAPBOX)), - '$page_community' => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY, + '$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY, t('Automatically approve all connection/friend requests as read-write fans'), ($a->user['page-flags'] == PAGE_COMMUNITY)), - '$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE, + '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE, t('Automatically approve all connection/friend requests as friends'), ($a->user['page-flags'] == PAGE_FREELOVE)), - '$page_prvgroup' => array('page-flags', t('Private Forum'), PAGE_PRVGROUP, - t('Private forum - approved members only [Experimental]'), + '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP, + t('Private forum - approved members only'), ($a->user['page-flags'] == PAGE_PRVGROUP)), - '$experimental' => ( (intval(get_config('system','prvgroup_testing'))) ? 'true' : ''), )); @@ -1026,7 +1025,8 @@ function settings_content(&$a) { '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''), - '$h_advn' => t('Advanced Page Settings'), + '$h_advn' => t('Advanced Account/Page Type Settings'), + '$h_descadvn' => t('Change the behaviour of this account for special situations'), '$pagetype' => $pagetype, |