diff options
| author | friendica <info@friendica.com> | 2014-02-02 17:54:36 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-02 17:54:36 -0800 |
| commit | ee1580427e9a1bc4e2b86906f7b42d3071ed516d (patch) | |
| tree | 979443bd249ed89fddcf93fcab6a6f67866be6d9 /mod | |
| parent | 732a4b898afc7bc4d5b96f1b0f50f866c2068e06 (diff) | |
| download | volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.tar.gz volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.tar.bz2 volse-hubzilla-ee1580427e9a1bc4e2b86906f7b42d3071ed516d.zip | |
don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use.
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connedit.php | 8 | ||||
| -rw-r--r-- | mod/settings.php | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index e2d4b861c..b7101fcab 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -442,13 +442,13 @@ function connedit_content(&$a) { '$perms' => $perms, '$forum' => t('Forum Members'), '$soapbox' => t('Soapbox'), - '$full' => t('Full Sharing'), - '$cautious' => t('Cautious Sharing'), + '$full' => t('Full Sharing (typical social network permissions)'), + '$cautious' => t('Cautious Sharing '), '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel <a href="settings">privacy settings</a>, which have higher priority. Changing those inherited settings on this page will have no effect.'), + '$permnote' => t('Some permissions may be inherited from your channel <a href="settings">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'), '$advanced' => t('Advanced Permissions'), - '$quick' => t('Quick Links'), + '$quick' => t('Simple Permissions (select one and submit)'), '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], '$all_friends' => $all_friends, '$relation_text' => $relation_text, diff --git a/mod/settings.php b/mod/settings.php index 7ff76cd3e..c0e8122cb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -923,15 +923,17 @@ function settings_content(&$a) { '$h_prv' => t('Security and Privacy Settings'), - '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents showing if you are available for chat')), + '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')), - '$lbl_pmacro' => t('Quick Privacy Settings:'), - '$pmacro3' => t('Very Public - extremely permissive'), - '$pmacro2' => t('Typical - default public, privacy when desired'), + '$lbl_pmacro' => t('Simple Privacy Settings:'), + '$pmacro3' => t('Very Public - extremely permissive (use with caution)'), + '$pmacro2' => t('Typical - default public, privacy when desired (similar to social network permissions)'), '$pmacro1' => t('Private - default private, rarely open or public'), '$pmacro0' => t('Blocked - default blocked to/from everybody'), '$permiss_arr' => $permiss, + '$lbl_p2macro' => t('Advanced Privacy Settings'), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), |