aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2015-09-17 09:27:13 +0200
committermrjive <mrjive@mrjive.it>2015-09-17 09:27:13 +0200
commit024af91df82b4bb14983c53ae319ba9d348773d6 (patch)
treee2c0fa8ae7827ebea20db24264dbacbcd1495edd /include/conversation.php
parent4c5a74284bb1c2e23ef1e40c09d10f3449f8c853 (diff)
parent5d33b34be7fe1a4c89d43a4bdab5c4e6b35a61bc (diff)
downloadvolse-hubzilla-024af91df82b4bb14983c53ae319ba9d348773d6.tar.gz
volse-hubzilla-024af91df82b4bb14983c53ae319ba9d348773d6.tar.bz2
volse-hubzilla-024af91df82b4bb14983c53ae319ba9d348773d6.zip
Merge pull request #1 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php4
1 files changed, 2 insertions, 2 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
);