Merge commit 'origin/testing' into 0.9.x

Conflicts:
	lib/action.php
	lib/adminpanelaction.php

diff --cc classes/File.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/User_group.php
Simple merge

diff --cc index.php
Simple merge

diff --cc lib/action.php
index a804b8e82536ac0d3cbdddeb3d6bce0880919e73,816086d202f00889f686d31a228ac1e5049b5d49..10394c78956775490e1365cc31b19f4958b0693d
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -433,37 -426,20 +426,35 @@@ class Action extends HTMLOutputter // l
          $this->elementStart('ul', array('class' => 'nav'));
          if (Event::handle('StartPrimaryNav', array($this))) {
              if ($user) {
 +                // TRANS: Tooltip for main menu option "Personal"
 +                $tooltip = _m('TOOLTIP', 'Personal profile and friends timeline');
 +                // TRANS: Main menu option when logged in for access to personal profile and friends timeline
                  $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
 -                                _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
 +                                _m('MENU', 'Personal'), $tooltip, false, 'nav_home');
 +                // TRANS: Tooltip for main menu option "Account"
 +                $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
 +                // TRANS: Main menu option when logged in for access to user settings
                  $this->menuItem(common_local_url('profilesettings'),
-                                 _m('MENU', 'Account'), $tooltip, false, 'nav_account');
-                 if ($connect) {
-                     // TRANS: Tooltip for main menu option "Services"
-                     $tooltip = _m('TOOLTIP', 'Connect to services');
-                     // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-                     $this->menuItem(common_local_url($connect),
-                                     _m('MENU', 'Connect'), $tooltip, false, 'nav_connect');
-                 }
 -                                _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
++                                _('Account'), $tooltip, false, 'nav_account');
++                // TRANS: Tooltip for main menu option "Services"
++                $tooltip = _m('TOOLTIP', 'Connect to services');
++                // TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+                 $this->menuItem(common_local_url('oauthconnectionssettings'),
 -                                _('Connect'), _('Connect to services'), false, 'nav_connect');
++                                _('Connect'), $tooltip, false, 'nav_connect');
                  if ($user->hasRight(Right::CONFIGURESITE)) {
 +                    // TRANS: Tooltip for menu option "Admin"
 +                    $tooltip = _m('TOOLTIP', 'Change site configuration');
 +                    // TRANS: Main menu option when logged in and site admin for access to site configuration
                      $this->menuItem(common_local_url('siteadminpanel'),
 -                                    _('Admin'), _('Change site configuration'), false, 'nav_admin');
 +                                    _m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
                  }
                  if (common_config('invite', 'enabled')) {
 +                    // TRANS: Tooltip for main menu option "Invite"
 +                    $tooltip = _m('TOOLTIP', 'Invite friends and colleagues to join you on %s');
 +                    // TRANS: Main menu option when logged in and invitations are allowed for inviting new users
                      $this->menuItem(common_local_url('invite'),
 -                                    _('Invite'),
 -                                    sprintf(_('Invite friends and colleagues to join you on %s'),
 +                                    _m('MENU', 'Invite'),
 +                                    sprintf($tooltip,
                                              common_config('site', 'name')),
                                      false, 'nav_invitecontact');
                  }

diff --cc lib/adminpanelaction.php
index a0cdab8a45dc9bb29e000369b1acc002d1e4310f,d1aab3dfcbadc8e4dad3d5c24d78a174b178c96a..f3f86449f3096681423da372576743a95fd2c8a1
--- 1/lib/adminpanelaction.php
--- 2/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@@ -342,35 -357,33 +370,51 @@@ class AdminPanelNav extends Widge
              }
  
              if (AdminPanelAction::canAdmin('user')) {
-                 $this->out->menuItem(common_local_url('useradminpanel'), _m('MENU', 'User'),
-                                      $menu_title, $action_name == 'useradminpanel', 'nav_design_admin_panel');
 +                // TRANS: Menu item title/tooltip
 +                $menu_title = _('User configuration');
 +                // TRANS: Menu item for site administration
 -                                     _('User configuration'), $action_name == 'useradminpanel', 'nav_user_admin_panel');
+                 $this->out->menuItem(common_local_url('useradminpanel'), _('User'),
++                                     $menu_title, $action_name == 'useradminpanel', 'nav_user_admin_panel');
              }
  
              if (AdminPanelAction::canAdmin('access')) {
-                 $this->out->menuItem(common_local_url('accessadminpanel'), _m('MENU', 'Access'),
-                                      $menu_title, $action_name == 'accessadminpanel', 'nav_design_admin_panel');
 +                // TRANS: Menu item title/tooltip
 +                $menu_title = _('Access configuration');
 +                // TRANS: Menu item for site administration
 -                                     _('Access configuration'), $action_name == 'accessadminpanel', 'nav_access_admin_panel');
+                 $this->out->menuItem(common_local_url('accessadminpanel'), _('Access'),
++                                     $menu_title, $action_name == 'accessadminpanel', 'nav_access_admin_panel');
              }
  
              if (AdminPanelAction::canAdmin('paths')) {
-                 $this->out->menuItem(common_local_url('pathsadminpanel'), _m('MENU', 'Paths'),
-                                     $menu_title, $action_name == 'pathsadminpanel', 'nav_design_admin_panel');
 +                // TRANS: Menu item title/tooltip
 +                $menu_title = _('Paths configuration');
 +                // TRANS: Menu item for site administration
 -                                    _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_paths_admin_panel');
+                 $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'),
++                                    $menu_title, $action_name == 'pathsadminpanel', 'nav_paths_admin_panel');
              }
  
              if (AdminPanelAction::canAdmin('sessions')) {
-                 $this->out->menuItem(common_local_url('sessionsadminpanel'), _m('MENU', 'Sessions'),
-                                      $menu_title, $action_name == 'sessionsadminpanel', 'nav_design_admin_panel');
 +                // TRANS: Menu item title/tooltip
 +                $menu_title = _('Sessions configuration');
 +                // TRANS: Menu item for site administration
 -                                     _('Sessions configuration'), $action_name == 'sessionsadminpanel', 'nav_sessions_admin_panel');
+                 $this->out->menuItem(common_local_url('sessionsadminpanel'), _('Sessions'),
 -                                     _('Edit site notice'), $action_name == 'sitenoticeadminpanel', 'nav_sitenotice_admin_panel');
++                                     $menu_title, $action_name == 'sessionsadminpanel', 'nav_sessions_admin_panel');
+             }
+ 
+             if (AdminPanelAction::canAdmin('sitenotice')) {
++                // TRANS: Menu item title/tooltip
++                $menu_title = _('Edit site notice');
++                // TRANS: Menu item for site administration
+                 $this->out->menuItem(common_local_url('sitenoticeadminpanel'), _('Site notice'),
 -                                     _('Snapshots configuration'), $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
++                                     $menu_title, $action_name == 'sitenoticeadminpanel', 'nav_sitenotice_admin_panel');
+             }
+ 
+             if (AdminPanelAction::canAdmin('snapshot')) {
++                // TRANS: Menu item title/tooltip
++                $menu_title = _('Snapshots configuration');
++                // TRANS: Menu item for site administration
+                 $this->out->menuItem(common_local_url('snapshotadminpanel'), _('Snapshots'),
++                                     $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
              }
  
              Event::handle('EndAdminPanelNav', array($this));

diff --cc lib/default.php
Simple merge

diff --cc plugins/Facebook/FacebookPlugin.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge