harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
redmatrix
2015-05-17 19:48:57 -07:00
parent dd72f580dd ac3b886cc4
commit 76558df966
29 changed files with 602 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mod/setup.php
View File

@@ -163,9 +163,7 @@ function setup_content(&$a) {
global $install_wizard_pass, $db;
$o = '';
$wizard_status = "";
$install_title = t('Hubzilla Server - Setup');
$install_title = t('$Projectname Server - Setup');
if(x($a->data,'db_conn_failed')) {
$install_wizard_pass = 2;
@@ -287,7 +285,7 @@ function setup_content(&$a) {
$o .= replace_macros($tpl, array(
'$title' => $install_title,
'$pass' => t('Database connection'),
'$info_01' => t('In order to install Hubzilla we need to know how to connect to your database.'),
'$info_01' => t('In order to install $Projectname we need to know how to connect to your database.'),
'$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
'$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),