Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index b9c14799e03bb386eaeae1d95d2fe7e8afba2330..20f18ef0d97485ddf91dd9611d00aa5d55267c4a 100644 (file)
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  *
  * @see      Widget
  */
-
 class ConnectSettingsAction extends SettingsAction
 {
     /**
@@ -54,7 +53,6 @@ class ConnectSettingsAction extends SettingsAction
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $menu = new ConnectSettingsNav($this);
@@ -73,7 +71,6 @@ class ConnectSettingsAction extends SettingsAction
  *
  * @see      HTMLOutputter
  */
-
 class ConnectSettingsNav extends Widget
 {
     var $action = null;
@@ -83,7 +80,6 @@ class ConnectSettingsNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-
     function __construct($action=null)
     {
         parent::__construct($action);
@@ -95,29 +91,34 @@ class ConnectSettingsNav extends Widget
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartConnectSettingsNav', array(&$this->action))) {
+        if (Event::handle('StartConnectSettingsNav', array($this->action))) {
 
             # action => array('prompt', 'title')
             $menu = array();
             if (common_config('xmpp', 'enabled')) {
                 $menu['imsettings'] =
-                  array(_('IM'),
+                  // TRANS: Menu item for Instant Messaging settings.
+                  array(_m('MENU','IM'),
+                        // TRANS: Tooltip for Instant Messaging menu item.
                         _('Updates by instant messenger (IM)'));
             }
             if (common_config('sms', 'enabled')) {
                 $menu['smssettings'] =
-                  array(_('SMS'),
+                  // TRANS: Menu item for Short Message Service settings.
+                  array(_m('MENU','SMS'),
+                        // TRANS: Tooltip for Short Message Service menu item.
                         _('Updates by SMS'));
             }
-            
+
             $menu['oauthconnectionssettings'] = array(
-                _('Connections'),
+                // TRANS: Menu item for OuAth connection settings.
+                _m('MENU','Connections'),
+                // TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
                 _('Authorized connected applications')
             );
 
@@ -128,11 +129,9 @@ class ConnectSettingsNav extends Widget
                         $action_name === $menuaction);
             }
 
-            Event::handle('EndConnectSettingsNav', array(&$this->action));
+            Event::handle('EndConnectSettingsNav', array($this->action));
         }
 
         $this->action->elementEnd('ul');
     }
-
 }
-