Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

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

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 16916ca6bb0e6702bc92ce3f8ac1b5e25eb4a703..6f7b7febc35a1b5d858b8b089989eb6701d12263 100644 (file)
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      Widget
  */
-
 class PublicGroupNav extends Menu
 {
     /**
@@ -53,7 +52,6 @@ class PublicGroupNav extends Menu
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
@@ -61,13 +59,19 @@ class PublicGroupNav extends Menu
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartPublicGroupNav', array($this))) {
-            $this->out->menuItem(common_local_url('public'), _('Public'),
+            // TRANS: Menu item in search group navigation panel.
+            $this->out->menuItem(common_local_url('public'), _m('MENU','Public'),
+                // TRANS: Menu item title in search group navigation panel.
                 _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
 
-            $this->out->menuItem(common_local_url('groups'), _('Groups'),
+            // TRANS: Menu item in search group navigation panel.
+            $this->out->menuItem(common_local_url('groups'), _m('MENU','Groups'),
+                // TRANS: Menu item title in search group navigation panel.
                 _('User groups'), $action_name == 'groups', 'nav_groups');
 
-            $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+            // TRANS: Menu item in search group navigation panel.
+            $this->out->menuItem(common_local_url('publictagcloud'), _m('MENU','Recent tags'),
+                // TRANS: Menu item title in search group navigation panel.
                 _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
 
             $this->out->menuItem(common_local_url('publicpeopletagcloud'), _('People tags'),
@@ -75,12 +79,16 @@ class PublicGroupNav extends Menu
                                     'peopletag', 'selftag')), 'nav_people-tags');
 
             if (count(common_config('nickname', 'featured')) > 0) {
-                $this->out->menuItem(common_local_url('featured'), _('Featured'),
+                // TRANS: Menu item in search group navigation panel.
+                $this->out->menuItem(common_local_url('featured'), _m('MENU','Featured'),
+                    // TRANS: Menu item title in search group navigation panel.
                     _('Featured users'), $action_name == 'featured', 'nav_featured');
             }
 
-            $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-                _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
+            // TRANS: Menu item in search group navigation panel.
+            $this->out->menuItem(common_local_url('favorited'), _m('MENU','Popular'),
+                // TRANS: Menu item title in search group navigation panel.
+                _('Popular notices'), $action_name == 'favorited', 'nav_timeline_favorited');
 
             Event::handle('EndPublicGroupNav', array($this));
         }