Changeset 1620:542c321dc040 for inc/admin

Timestamp:

08/30/13 10:37:08 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1619:5d925866b5b3 (diff), 1593:0c884219a872 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 into default

Files:

• inc/admin/prepend.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (1 diff)

inc/admin/prepend.php

@@ -261 +261 @@
           'images/menu/users.png','images/menu/users-b.png',
           null,null,null));
-     $_fav['plugins'] = new ArrayObject(array('plugins','Plugins','plugins.php',
+     $_fav['plugins'] = new ArrayObject(array('plugins','Plugins management','plugins.php',
           'images/menu/plugins.png','images/menu/plugins-b.png',
           null,null,null));
@@ -284 +284 @@
      # Set menu titles
      
-     $_menu['System']->title = __('System');
+     $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
      $_menu['Plugins']->title = __('Plugins');
@@ -328 +328 @@
           preg_match('/langs.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin());
-     $_menu['System']->prependItem(__('Plugins'),'plugins.php','images/menu/plugins.png',
+     $_menu['System']->prependItem(__('Plugins management'),'plugins.php','images/menu/plugins.png',
           preg_match('/plugins.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin());

inc/admin/prepend.php

@@ -322 +322 @@
           $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post');
      
-     $_menu['System']->prependItem(__('Updates'),'update.php','images/menu/update.png',
+     $_menu['System']->prependItem(__('Update'),'update.php','images/menu/update.png',
           preg_match('/update.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->isSuperAdmin() && is_readable(DC_DIGESTS));