diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /view/en-au | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
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
Diffstat (limited to 'view/en-au')
| -rw-r--r-- | view/en-au/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/en-au/update_fail_eml.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl index 9377472bd..c3bef0de3 100644 --- a/view/en-au/htconfig.tpl +++ b/view/en-au/htconfig.tpl @@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}'; // What is your site name? $a->config['system']['baseurl'] = '{{$siteurl}}'; -$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['sitename'] = "Hubzilla"; $a->config['system']['location_hash'] = '{{$site_id}}'; diff --git a/view/en-au/update_fail_eml.tpl b/view/en-au/update_fail_eml.tpl index a7df8fc2f..61f44b1e6 100644 --- a/view/en-au/update_fail_eml.tpl +++ b/view/en-au/update_fail_eml.tpl @@ -1,7 +1,7 @@ Hey,
I'm the web server at {{$sitename}};
-The Red Matrix developers released update {{$update}} recently,
+The Hubzilla developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and it requires human intervention.
Please contact a Red developer if you can not figure out how to
|