Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2017-05-22 03:51:58 -07:00
parent 36a960adec 50e9d02458
commit 1c8c7479b8
11 changed files with 276 additions and 73 deletions
--- a/Zotlabs/Module/Notifications.php
+++ b/Zotlabs/Module/Notifications.php
@@ -40,7 +40,7 @@ class Notifications extends \Zotlabs\Web\Controller {
 			
 		$o .= replace_macros(get_markup_template('notifications.tpl'),array(
 			'$notif_header' => t('System Notifications'),
-			'$notif_link_mark_seen' => t('Mark all system notifications seen'),
+			'$notif_link_mark_seen' => t('Mark all seen'),
 			'$notif_content' => $notif_content,
 			'$notifications_available' => $notifications_available,
 		));