Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po

1 files changed, 1 insertions, 1 deletions

diff --git a/mod/p.php b/mod/p.php
index f467ae5a5..4e411a17b 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -42,7 +42,7 @@ function p_init(&$a) {
 		'$handle' => xmlify($myaddr),
 		'$public' => 'true',
 		'$created' => $created,
-		'$provider' => (($item['app']) ? $item['app'] : 'hubzilla')
+		'$provider' => (($item['app']) ? $item['app'] : t('$projectname'))
 	));
 
 	header('Content-type: text/xml');