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/connedit.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/connedit.php')
| -rw-r--r-- | mod/connedit.php | 8 |
1 files changed, 4 insertions, 4 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, |