Merge branch 'helptext' of https://github.com/silke/friendica into silke-helptext

This commit is contained in:
fabrixxm 2015-04-04 17:42:23 +02:00
commit bb7406643b

View file

@ -185,7 +185,7 @@ function notifications_content(&$a) {
'$intro_id' => $rr['intro_id'], '$intro_id' => $rr['intro_id'],
'$friend_selected' => $friend_selected, '$friend_selected' => $friend_selected,
'$fan_selected' => $fan_selected, '$fan_selected' => $fan_selected,
'$approve_as' => t('Choose "Friend" to allow to read and to subscribe to their posts. Choose "Fan" to allow to read if you do not want to read their posts. Approve as: '), '$approve_as' => t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan" means that you allow to read but you do not want to read theirs. To start sharing with a Diaspora contact, choose "Fan". Approve as: '),
'$as_friend' => t('Friend'), '$as_friend' => t('Friend'),
'$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
)); ));