aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorJeroen <jeroenpraat@xs4all.nl>2014-07-31 12:51:09 +0000
committerJeroen <jeroenpraat@xs4all.nl>2014-07-31 12:51:09 +0000
commitd126d02c659327188e5bd50447506ad16a4875bb (patch)
tree1e7ad2ca42f48936ab0c2bd4eb36a0695b22033d /mod
parentc4e82772c04926696d0ca8d5a7e75476f77cb904 (diff)
parent56bbf583389eae33b138e81f1e5b3cc71ae41218 (diff)
downloadvolse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.tar.gz
volse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.tar.bz2
volse-hubzilla-d126d02c659327188e5bd50447506ad16a4875bb.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod')
-rw-r--r--mod/invite.php2
-rwxr-xr-xmod/setup.php2
-rw-r--r--mod/siteinfo.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/mod/invite.php b/mod/invite.php
index 9e37d1e6d..84c17948a 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -141,7 +141,7 @@ 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('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool.') . "\r\n" . "\r\n"
+ '$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool.') . "\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('Please visit my channel at')
diff --git a/mod/setup.php b/mod/setup.php
index ad5394335..a8f3a1f47 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -569,7 +569,7 @@ function check_htaccess(&$checks) {
$help = t('SSL certificate cannot be validated. Fix certificate or disable https access to this site.') . EOL;
$help .= t('If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!') . EOL;
$help .= t('This restriction is incorporated because public posts from you may for example contain references to images on your own hub.') . EOL;
- $help .= t('If your certificate is not recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL;
+ $help .= t('If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.') . EOL;
$help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') .EOL;
$help .= t('Providers are available that issue free certificates which are browser-valid.'). EOL;
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index bdf9b1af6..9674965e1 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -95,7 +95,7 @@ function siteinfo_content(&$a) {
$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
'$title' => t('Red'),
- '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'),
+ '$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites.'),
'$version' => $version,
'$commit' => $commit,
'$web_location' => t('Running at web location') . ' ' . z_root(),