diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
| commit | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (patch) | |
| tree | d88838524fa5f6cbf1d072da73eddafd4b752ffb /include/diaspora.php | |
| parent | f0cb3cba124e637fa46143b692dbb561d4ee3ae0 (diff) | |
| parent | 76558df9667b4900b4036faca0075985596b93cd (diff) | |
| download | volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.gz volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.bz2 volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.zip | |
Merge branch 'master' into tres
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 43eed003e..618c27e1c 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -706,8 +706,9 @@ function diaspora_request($importer,$xml) { $cnv = random_string(); $mid = random_string(); - $msg = t('You have started sharing with a Hubzilla premium channel.'); - $msg .= t('Hubzilla premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r"; + $msg = t('You have started sharing with a $Projectname premium channel.'); + $msg .= t('$Projectname premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r"; + $msg .= t('Please do not reply to this message, as this channel is not sharing with you and any reply will not be seen by the recipient.') . "\r"; $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C'); @@ -2449,7 +2450,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') + '$provider' => (($item['app']) ? $item['app'] : t('$projectname')) )); } else { $tpl = get_markup_template('diaspora_post.tpl'); @@ -2460,7 +2461,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') + '$provider' => (($item['app']) ? $item['app'] : t('$projectname')) )); } |