diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-04 22:33:53 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-04 22:33:53 -0700 |
| commit | ca58ef80ae665ab2b9da125e17fdb33a1ea90a40 (patch) | |
| tree | f5c53fc0a1ed04f986d4fb06ff45545081780335 /Zotlabs/Module/Settings/Channel.php | |
| parent | 05654e498034329759351c4a64349734ce6b7204 (diff) | |
| parent | c8000fca1f2ee379b62b473a00838af9a48bc4b6 (diff) | |
| download | volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.tar.gz volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.tar.bz2 volse-hubzilla-ca58ef80ae665ab2b9da125e17fdb33a1ea90a40.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Settings/Channel.php')
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index eb31841ed..e49c34666 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -509,7 +509,7 @@ class Channel { '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), - '$permissions' => t('Default Access Control List (ACL)'), + '$permissions' => t('Default Privacy Group'), '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$allow_cid' => acl2json($perm_defaults['allow_cid']), |