diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
| commit | 2aad4c2cf9c17a7532089aadfcc5feff6505ec74 (patch) | |
| tree | 2082c8dc7ba090f610874b6e33b0f1092a2ff00c /view/en | |
| parent | 474a1267d73c1dcf00678dd15ed4e0e37496473d (diff) | |
| parent | e2692a4baaf031bd0d9c0893c3762637b1f6b201 (diff) | |
| download | volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.gz volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.bz2 volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.zip | |
Merge pull request #4 from redmatrix/master
Merge master into dev branch
Diffstat (limited to 'view/en')
| -rw-r--r-- | view/en/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/en/update_fail_eml.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index c6357b3a7..17ee7bfeb 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -81,7 +81,7 @@ $a->config['system']['php_path'] = '{{$phpath}}'; // Configure how we communicate with directory servers. // DIRECTORY_MODE_NORMAL = directory client, we will find a directory // DIRECTORY_MODE_SECONDARY = caching directory or mirror -// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_PRIMARY = master directory server - one per realm // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services $a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl index 61f44b1e6..86bb61aaa 100644 --- a/view/en/update_fail_eml.tpl +++ b/view/en/update_fail_eml.tpl @@ -4,7 +4,7 @@ I'm the web server at {{$sitename}}; 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
+Please contact a project developer if you can not figure out how to
fix it on your own. My database might be invalid.
The error message is '{{$error}}'.
|