tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2013-09-15 19:39:22 +02:00
commit 34d0eb709b
24 changed files with 700 additions and 823 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/friendica.php
View file

@ -57,7 +57,7 @@ function friendica_content(&$a) {
$o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';
$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="http://bugs.friendica.com">Bugs.Friendica.com</a></p><p>';
$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">the bucktracker at github</a></p><p>';
$o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
$o .= '<p></p>';

4
mod/register.php
View file

@ -278,7 +278,9 @@ function register_content(&$a) {
'$nickname' => $nickname,
'$license' => $license,
'$sitename' => $a->get_hostname(),
'$importh' => t('Import'),
'$importt' => t('Import your profile to this friendica instance'),
));
return $o;