Merge remote branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 7991c9002c0fa287f8d2a0d25b34f69c9dd008f0..2c519e4abd3c48aaf4d3284d9385f1618c1f3953 100644 (file)
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -134,12 +134,12 @@ class AccountSettingsNav extends Widget
                 $this->showMenuItem('userdesignsettings',_('Design'),$title);
                 Event::handle('EndAccountSettingsDesignMenuItem', array($this, &$menu));
             }
-            if(Event::handle('StartAccountSettingsOtherMenuItem', array($this, &$menu))){
+            if(Event::handle('StartAccountSettingsUrlMenuItem', array($this, &$menu))){
                 // TRANS: Link title attribute in user account settings menu.
-                $title = _('Other options');
+                $title = _('URL shortener settings');
                 // TRANS: Link description in user account settings menu.
-                $this->showMenuItem('othersettings',_('Other'),$title);
-                Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
+                $this->showMenuItem('urlsettings',_('URL'),$title);
+                Event::handle('EndAccountSettingsUrlMenuItem', array($this, &$menu));
             }
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));