diff options
| author | friendica <info@friendica.com> | 2011-11-18 22:04:41 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-11-18 22:04:41 -0800 |
| commit | fd4fe24406edb277814c7a45a6094a8eec0850d7 (patch) | |
| tree | 7db5bceb30a569b035c600313a9dbbf66b14abac /mod | |
| parent | 485f97b3d8937f219e2b9f3c662ee0e1966130eb (diff) | |
| parent | 6893df991edfe971871a5db45055b40b871a7a4f (diff) | |
| download | volse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.tar.gz volse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.tar.bz2 volse-hubzilla-fd4fe24406edb277814c7a45a6094a8eec0850d7.zip | |
Merge branch 'master' into groups
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/item.php | 4 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php index ee3bdca99..145c42cec 100644 --- a/mod/item.php +++ b/mod/item.php @@ -865,12 +865,12 @@ function item_post(&$a) { $addr = trim($recip); if(! strlen($addr)) continue; - $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendika social network.'),$a->user['username']) + $disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username']) . '<br />'; $disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; - $subject = '[Friendika]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); + $subject = '[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']); $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; $headers .= 'MIME-Version: 1.0' . "\n"; $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; diff --git a/mod/settings.php b/mod/settings.php index 6cc80e3a6..a073a5e98 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -644,7 +644,7 @@ function settings_content(&$a) { )); $hide_wall = replace_macros($opt_tpl,array( - '$field' => array('hidewall', t('Hide profile details and all your messages from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))), + '$field' => array('hidewall', t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], '', array(t('No'),t('Yes'))), )); |