aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-06 16:40:30 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-06 16:40:30 +0200
commit96277372d55a58349e318e694f4dab3a00fb2f13 (patch)
treea6379c1d1a992f31c4fc021ea6cf732a3c97e1cd /Zotlabs/Module
parentb8991750c5d36714100d20595da6a33149bd7d5d (diff)
downloadvolse-hubzilla-96277372d55a58349e318e694f4dab3a00fb2f13.tar.gz
volse-hubzilla-96277372d55a58349e318e694f4dab3a00fb2f13.tar.bz2
volse-hubzilla-96277372d55a58349e318e694f4dab3a00fb2f13.zip
rename grid to network (for consistency) and activity to stream (as seen in osada) because it makes much more sense.
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Network.php2
-rw-r--r--Zotlabs/Module/Settings/Channel.php2
-rw-r--r--Zotlabs/Module/Settings/Network.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 015351cbf..792f92418 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -164,7 +164,7 @@ class Network extends \Zotlabs\Web\Controller {
));
}
- nav_set_selected('Grid');
+ nav_set_selected('Network');
$channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'],
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index ebc444178..fc7c547ca 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -582,7 +582,7 @@ class Channel {
'$lbl_vnot' => t('Show visual notifications including:'),
- '$vnotify1' => array('vnotify1', t('Unseen grid activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
+ '$vnotify1' => array('vnotify1', t('Unseen stream activity'), ($vnotify & VNOTIFY_NETWORK), VNOTIFY_NETWORK, '', $yes_no),
'$vnotify2' => array('vnotify2', t('Unseen channel activity'), ($vnotify & VNOTIFY_CHANNEL), VNOTIFY_CHANNEL, '', $yes_no),
'$vnotify3' => array('vnotify3', t('Unseen private messages'), ($vnotify & VNOTIFY_MAIL), VNOTIFY_MAIL, t('Recommended'), $yes_no),
'$vnotify4' => array('vnotify4', t('Upcoming events'), ($vnotify & VNOTIFY_EVENT), VNOTIFY_EVENT, '', $yes_no),
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index aaafe9255..ae02b06e9 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -55,7 +55,7 @@ class Network {
'$rpath' => $rpath,
'$action_url' => 'settings/' . $module,
'$form_security_token' => get_form_security_token('settings_' . $module),
- '$title' => t('Activity Settings'),
+ '$title' => t('Stream Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$extra_settings_html' => $extra_settings_html,
'$submit' => t('Submit')