diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-24 17:44:27 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-24 17:44:27 +0100 |
commit | ddeab48f9b314eed067c31086945acee33964d37 (patch) | |
tree | a814d6244991017af57ea03670d45d9ca1286cc0 /include/permissions.php | |
parent | cc264b2d60049a844fe17322fbcb367712a7071f (diff) | |
parent | 039eb585240a5fa106ede00a055036458a4f5393 (diff) | |
download | volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.gz volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.bz2 volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/permissions.php')
-rw-r--r-- | include/permissions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/permissions.php b/include/permissions.php index 8c36f9744..e4cd9ddda 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -864,10 +864,10 @@ function get_role_perms($role) { */ function get_roles() { $roles = array( - t('Social Networking') => array('social' => t('Mostly Public'), 'social_restricted' => t('Restricted'), 'social_private' => t('Private')), - t('Community Forum') => array('forum' => t('Mostly Public'), 'forum_restricted' => t('Restricted'), 'forum_private' => t('Private')), - t('Feed Republish') => array('feed' => t('Mostly Public'), 'feed_restricted' => t('Restricted')), - t('Special Purpose') => array('soapbox' => t('Celebrity/Soapbox'), 'repository' => t('Group Repository')), + t('Social Networking') => array('social' => t('Social - Mostly Public'), 'social_restricted' => t('Social - Restricted'), 'social_private' => t('Social - Private')), + t('Community Forum') => array('forum' => t('Forum - Mostly Public'), 'forum_restricted' => t('Forum - Restricted'), 'forum_private' => t('Forum - Private')), + t('Feed Republish') => array('feed' => t('Feed - Mostly Public'), 'feed_restricted' => t('Feed - Restricted')), + t('Special Purpose') => array('soapbox' => t('Special - Celebrity/Soapbox'), 'repository' => t('Special - Group Repository')), t('Other') => array('custom' => t('Custom/Expert Mode')) ); |