diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-03 08:03:46 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-03 08:03:46 +0100 |
| commit | 5c885e91a36bdbdd0829c2950b54bb84288e05a9 (patch) | |
| tree | c17bcc246b68dd4a53b7883f81f596f82cc1e3fc /mod/settings.php | |
| parent | 11efafb5d2b9a6b860772e4c4cec0cde5c1bf248 (diff) | |
| parent | ee42079685dd4df721b1090bdaa0d86316e3358a (diff) | |
| download | volse-hubzilla-5c885e91a36bdbdd0829c2950b54bb84288e05a9.tar.gz volse-hubzilla-5c885e91a36bdbdd0829c2950b54bb84288e05a9.tar.bz2 volse-hubzilla-5c885e91a36bdbdd0829c2950b54bb84288e05a9.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/settings.php')
| -rw-r--r-- | mod/settings.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mod/settings.php b/mod/settings.php index 7ff76cd3e..38b1d6fdf 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -919,19 +919,21 @@ function settings_content(&$a) { '$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''), '$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_user(),'system','use_browser_location')) ? 1 : ''), ''), - '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel publishes adult content.')), + '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')), '$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'), - '$pmacro1' => t('Private - default private, rarely open or public'), - '$pmacro0' => t('Blocked - default blocked to/from everybody'), + '$lbl_pmacro' => t('Simple Privacy Settings:'), + '$pmacro3' => t('Very Public - <em>extremely permissive (should be used with caution)</em>'), + '$pmacro2' => t('Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>'), + '$pmacro1' => t('Private - <em>default private, never open or public</em>'), + '$pmacro0' => t('Blocked - <em>default blocked to/from everybody</em>'), '$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"), |