Merge commit 'refs/merge-requests/181' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / lib / subgroupnav.php

diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 6ff3b4609c6ce854fd5051635e03ddd56dc59fcb..9fc5cd9e0972630402e362ef07d4b24571d1b951 100644 (file)
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -128,16 +128,16 @@ class SubGroupNav extends Menu
                                          $this->user->nickname),
                                  $action == 'usergroups',
                                  'nav_usergroups');
-            $this->out->menuItem(common_local_url('peopletagsbyuser',
+            $this->out->menuItem(common_local_url('peopletagsubscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
                                  // TRANS: Menu item title in local navigation menu.
-                                 _m('MENU','People tags'),
+                                 _m('MENU','Lists'),
                                  // TRANS: Menu item title in local navigation menu.
                                  // TRANS: %s is a user nickname.
-                                 sprintf(_('People tags by %s.'),
+                                 sprintf(_('List subscriptions by %s.'),
                                          $this->user->nickname),
-                                 in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                                 in_array($action, array('peopletagsbyuser', 'peopletagsubscriptions', 'peopletagsforuser')),
                                  'nav_timeline_peopletags');
 
             if (common_config('invite', 'enabled') && !is_null($cur) && $this->user->id === $cur->id) {
@@ -145,7 +145,7 @@ class SubGroupNav extends Menu
                                      // TRANS: Menu item in local navigation menu.
                                      _m('MENU','Invite'),
                                      // TRANS: Menu item title in local navigation menu.
-                                     // TRANS: %s is a user nickname.
+                                     // TRANS: %s is the StatusNet sitename.
                                      sprintf(_('Invite friends and colleagues to join you on %s.'),
                                              common_config('site', 'name')),
                                      $action == 'invite',