Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 3 insertions, 3 deletions

diff --git a/mod/invite.php b/mod/invite.php
index e197278d1..81e10bcd8 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -129,12 +129,12 @@ function invite_content(&$a) {
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
-		'$default_message' => t('Please join my community on RedMatrix.') . "\r\n" . "\r\n"
+		'$default_message' => t('Please join my community on Hubzilla.') . "\r\n" . "\r\n"
 			. $linktxt
 			. (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: ') . $invite_code . "\r\n" . "\r\n" : '') 
-			. t('1. Register at any RedMatrix location (they are all inter-connected)')
+			. t('1. Register at any Hubzilla location (they are all inter-connected)')
 			. "\r\n" . "\r\n" . z_root() . '/register'
-			. "\r\n" . "\r\n" . t('2. Enter my RedMatrix network address into the site searchbar.')
+			. "\r\n" . "\r\n" . t('2. Enter my Hubzilla network address into the site searchbar.')
 			. "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit ') . z_root() . '/channel/' . $channel['channel_address'] . ')'
 			. "\r\n" . "\r\n"
 			. t('3. Click [Connect]')