aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-17 19:48:57 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-17 19:48:57 -0700
commit76558df9667b4900b4036faca0075985596b93cd (patch)
tree08b57c1159399db70af105ac93726000bf5fe36b /mod
parentdd72f580dd14e8745dd81bc056e1a73df1e8e563 (diff)
parentac3b886cc46bd9c634cce7b409f5bea7211382da (diff)
downloadvolse-hubzilla-76558df9667b4900b4036faca0075985596b93cd.tar.gz
volse-hubzilla-76558df9667b4900b4036faca0075985596b93cd.tar.bz2
volse-hubzilla-76558df9667b4900b4036faca0075985596b93cd.zip
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
Diffstat (limited to 'mod')
-rw-r--r--mod/admin.php2
-rw-r--r--mod/cloud.php2
-rw-r--r--mod/dav.php2
-rw-r--r--mod/home.php2
-rw-r--r--mod/invite.php6
-rwxr-xr-xmod/like.php2
-rw-r--r--mod/mitem.php6
-rw-r--r--mod/p.php2
-rw-r--r--mod/pubsites.php2
-rwxr-xr-xmod/setup.php6
-rw-r--r--mod/siteinfo.php10
11 files changed, 20 insertions, 22 deletions
diff --git a/mod/admin.php b/mod/admin.php
index c74e5ad2c..e84f155ed 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -230,7 +230,7 @@ function admin_page_summary(&$a) {
$alertmsg = '';
// annoy admin about upcoming unsupported PHP version
if (version_compare(PHP_VERSION, '5.4', '<')) {
- $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of Hubzilla. You are strongly urged to upgrade to a current version.'
+ $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of $Projectname. You are strongly urged to upgrade to a current version.'
. '<br>PHP 5.3 has reached its <a href="http://php.net/eol.php" class="alert-link">End of Life (EOL)</a> in August 2014.'
. ' A list about current PHP versions can be found <a href="http://php.net/supported-versions.php" class="alert-link">here</a>.';
}
diff --git a/mod/cloud.php b/mod/cloud.php
index a87d36ea1..defdc3451 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -117,7 +117,7 @@ function cloud_init(&$a) {
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
try {
- $auth->Authenticate($server, t('Hubzilla - Guests: Username: {your email address}, Password: +++'));
+ $auth->Authenticate($server, t('$Projectname - Guests: Username: {your email address}, Password: +++'));
}
catch (Exception $e) {
logger('mod_cloud: auth exception' . $e->getMessage());
diff --git a/mod/dav.php b/mod/dav.php
index d49dd7359..2321aec75 100644
--- a/mod/dav.php
+++ b/mod/dav.php
@@ -118,7 +118,7 @@ function dav_init(&$a) {
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
try {
- $auth->Authenticate($server, t('Hubzilla channel'));
+ $auth->Authenticate($server, t('$Projectname channel'));
}
catch (Exception $e) {
logger('mod_cloud: auth exception' . $e->getMessage());
diff --git a/mod/home.php b/mod/home.php
index 85c89a623..1b941a639 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) {
if(get_config('system','projecthome')) {
$o .= file_get_contents('assets/home.html');
$a->page['template'] = 'full';
- $a->page['title'] = t('Hubzilla - &quot;The Network&quot;');
+ $a->page['title'] = t('$Projectname');
return $o;
}
diff --git a/mod/invite.php b/mod/invite.php
index 81e10bcd8..1fdfbacc6 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 Hubzilla.') . "\r\n" . "\r\n"
+ '$default_message' => t('Please join my community on $Projectname.') . "\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 Hubzilla location (they are all inter-connected)')
+ . t('1. Register at any $Projectname location (they are all inter-connected)')
. "\r\n" . "\r\n" . z_root() . '/register'
- . "\r\n" . "\r\n" . t('2. Enter my Hubzilla network address into the site searchbar.')
+ . "\r\n" . "\r\n" . t('2. Enter my $Projectname 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]')
diff --git a/mod/like.php b/mod/like.php
index 54039f2cf..226f0f62b 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -18,7 +18,7 @@ function like_content(&$a) {
if(! $observer) {
$_SESSION['return_url'] = $a->query_string;
$o .= t('This action is restricted to members.') . EOL;
- $o .= t('Please <a href="rmagic">login with your Hubzilla ID</a> or <a href="register">register as a new Redmatrix.member</a> to continue.') . EOL;
+ $o .= t('Please <a href="rmagic">login with your $Projectname ID</a> or <a href="register">register as a new $Projectname member</a> to continue.') . EOL;
return $o;
}
}
diff --git a/mod/mitem.php b/mod/mitem.php
index 9a80ba88b..0961e15ff 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -159,7 +159,7 @@ function mitem_content(&$a) {
'$permdesc' => t("\x28click to open/close\x29"),
'$aclselect' => populate_acl($perm_defaults,false),
'$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'),
- '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
+ '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'),
'$usezid' => array('usezid', t('Use magic-auth if available'), true, ''),
'$newwin' => array('newwin', t('Open link in new window'), false,''),
'$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')),
@@ -230,8 +230,8 @@ function mitem_content(&$a) {
'$aclselect' => populate_acl($mitem,false),
'$mitem_id' => intval(argv(2)),
'$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'),
- '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-name"'),
- '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
+ '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'),
+ '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''),
'$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''),
'$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')),
'$submit' => t('Submit'),
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');
diff --git a/mod/pubsites.php b/mod/pubsites.php
index ccddff2d8..62990c70c 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -16,7 +16,7 @@ function pubsites_content(&$a) {
$o .= '<h1>' . t('Public Sites') . '</h1>';
$o .= '<div class="descriptive-text">' .
- t('The listed sites allow public registration into the Hubzilla. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details.') . '</div>' . EOL;
+ t('The listed sites allow public registration for the $Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details.') . '</div>' . EOL;
$ret = z_fetch_url($url);
if($ret['success']) {
diff --git a/mod/setup.php b/mod/setup.php
index 0a560e6df..0dc032674 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -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.'),
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index d9464f4f6..1282e2f17 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -152,8 +152,8 @@ function siteinfo_content(&$a) {
$donate .= file_get_contents('doc/site_donate.html');
$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
- '$title' => t('Red'),
- '$description' => t('This is a hub of hubzilla - a global cooperative network of decentralized privacy enhanced websites.'),
+ '$title' => t('$Projectname'),
+ '$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'),
'$version' => $version,
'$tag_txt' => t('Tag: '),
'$tag' => $tag,
@@ -161,11 +161,11 @@ function siteinfo_content(&$a) {
'$lastpoll' => get_poller_runtime(),
'$commit' => $commit,
'$web_location' => t('Running at web location') . ' ' . z_root(),
- '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Hubzilla.'),
+ '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'),
'$bug_text' => t('Bug reports and issues: please visit'),
'$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues',
- '$bug_link_text' => 'hubzilla issues',
- '$contact' => t('Suggestions, praise, etc. - please email "hubzilla" at librelist - dot com'),
+ '$bug_link_text' => '$projectname issues',
+ '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
'$donate' => $donate,
'$adminlabel' => t('Site Administrators'),
'$admininfo' => $admininfo,