diff options
| author | zottel <github@zottel.net> | 2015-09-17 08:50:28 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2015-09-17 08:50:28 +0200 |
| commit | 3017dbc8c1058c9a1258a19aff39d3833d5d038c (patch) | |
| tree | e2c0fa8ae7827ebea20db24264dbacbcd1495edd /include | |
| parent | c2dac55edb9d825990b43f8f3c857a99ad491387 (diff) | |
| parent | 5d33b34be7fe1a4c89d43a4bdab5c4e6b35a61bc (diff) | |
| download | volse-hubzilla-3017dbc8c1058c9a1258a19aff39d3833d5d038c.tar.gz volse-hubzilla-3017dbc8c1058c9a1258a19aff39d3833d5d038c.tar.bz2 volse-hubzilla-3017dbc8c1058c9a1258a19aff39d3833d5d038c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 4 | ||||
| -rw-r--r-- | include/nav.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php index fb8ef8585..0f6f8685b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -943,9 +943,9 @@ function item_photo_menu($item){ t("View Status") => $status_link, t("View Profile") => $profile_link, t("View Photos") => $photos_link, - t("Matrix Activity") => $posts_link, + t("Activity/Posts") => $posts_link, t("Connect") => $follow_url, - t("Edit Contact") => $contact_url, + t("Edit Connection") => $contact_url, t("Send PM") => $pm_url, t("Poke") => $poke_link ); diff --git a/include/nav.php b/include/nav.php index 898805bba..59a7c83a3 100644 --- a/include/nav.php +++ b/include/nav.php @@ -172,8 +172,8 @@ EOT; if(local_channel()) { - $nav['network'] = array('network', t('Matrix'), "", t('Your matrix'),'network_nav_btn'); - $nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '',''); + $nav['network'] = array('network', t('Grid'), "", t('Your grid'),'network_nav_btn'); + $nav['network']['mark'] = array('', t('Mark all grid notifications seen'), '',''); $nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home'),'home_nav_btn'); $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); |