Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 35 insertions, 16 deletions

diff --git a/languages/en.php b/languages/en.php
index aab05c8f4..83a7c5159 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -382,7 +382,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
 	'registerbad' => "Your registration was unsuccessful. The username may already exist, your passwords might not match, or your username or password may be too short.",
 	'registerdisabled' => "Registration has been disabled by the system administrator",
 
-	'firstadminlogininstructions' => 'Your new Elgg site has been successfully installed and your administrator account created. You can now configure your site further by enabling various installed plugin tools.',
+	'firstadminlogininstructions' => "Enable and disable plugins to customize your new Elgg site! (Remember to hit 'Save' when you're done.)",
 
 	'registration:notemail' => 'The email address you provided does not appear to be a valid email address.',
 	'registration:userexists' => 'That username already exists',
@@ -436,19 +436,29 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
 	'admin:configuration:success' => "Your settings have been saved.",
 	'admin:configuration:fail' => "Your settings could not be saved.",
 
+	'admin:unknown_section' => 'Invalid Admin Section.',
+
 	'admin' => "Administration",
 	'admin:description' => "The admin panel allows you to control all aspects of the system, from user management to how plugins behave. Choose an option below to get started.",
 
-	'admin:user' => "User Administration",
-	'admin:user:description' => "This admin panel allows you to control user settings for your site. Choose an option below to get started.",
-	'admin:user:adduser:label' => "Click here to add a new user...",
-	'admin:user:opt:linktext' => "Configure users...",
-	'admin:user:opt:description' => "Configure users and account information. ",
+	'admin:overview' => 'Overview',
+
+	'admin:appearance' => 'Appearance',
+
+	'admin:users' => "Users",
+	'admin:users:online' => 'Currently Online',
+	'admin:users:add' => 'Add',
+	'admin:users:description' => "This admin panel allows you to control user settings for your site. Choose an option below to get started.",
+	'admin:users:adduser:label' => "Click here to add a new user...",
+	'admin:users:opt:linktext' => "Configure users...",
+	'admin:users:opt:description' => "Configure users and account information. ",
+	'admin:users:find' => 'Find',
 
-	'admin:site' => "Site Administration",
+	'admin:site' => "Site Settings",
+	'admin:site:basic' => 'Basic',
+	'admin:site:advanced' => 'Advanced',
 	'admin:site:description' => "This admin panel allows you to control global settings for your site. Choose an option below to get started.",
 	'admin:site:opt:linktext' => "Configure site...",
-	'admin:site:opt:description' => "Configure the site technical and non-technical settings. ",
 	'admin:site:access:warning' => "Changing the access setting only affects the permissions on content created in the future.",
 
 /**
@@ -460,7 +470,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
 	'plugins:usersettings:save:fail' => "There was a problem saving  user settings for the %s plugin.",
 	'item:object:plugin' => 'Plugin configuration settings',
 
-	'admin:plugins' => "Tool Administration",
+	'admin:plugins' => "Plugins",
 	'admin:plugins:description' => "This admin panel allows you to control and configure tools installed on your site.",
 	'admin:plugins:opt:linktext' => "Configure tools...",
 	'admin:plugins:opt:description' => "Configure the tools installed on the site. ",
@@ -481,6 +491,14 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
 	'admin:plugins:enable:yes' => "Plugin %s was enabled successfully.",
 	'admin:plugins:enable:no' => "Plugin %s could not be enabled.",
 	'admin:plugins:categories:all' => 'All categories',
+	'admin:plugins:plugin_website' => 'Plugin website',
+	'admin:plugins:author' => '%s',
+	'admin:plugins:version' => 'Version %s',
+	'admin:plugins:simple' => 'Simple',
+	'admin:plugins:advanced' => 'Advanced',
+	'admin:plugin_settings' => 'Plugin Settings',
+	'admin:plugins:simple_simple_fail' => 'Could not save settings.',
+	'admin:plugins:simple_simple_success' => 'Settings saved.',
 
 	'admin:statistics' => "Statistics",
 	'admin:statistics:description' => "This is an overview of statistics on your site. If you need more detailed statistics, a professional administration feature is available.",
@@ -555,6 +573,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
  */
 
 	'save' => "Save",
+	'reset' => 'Reset',
 	'publish' => "Publish",
 	'cancel' => "Cancel",
 	'saving' => "Saving ...",
@@ -742,12 +761,12 @@ Alternatively, you can enter your database settings below and we will try and do
 
 	'installation:settings:dbwizard:savefail' => "We were unable to save the new settings.php. Please save the following file as engine/settings.php using a text editor.",
 
-	'installation:sitename' => "The name of your site (eg \"My social networking site\"):",
-	'installation:sitedescription' => "Short description of your site (optional)",
-	'installation:wwwroot' => "The site URL, followed by a trailing slash:",
-	'installation:path' => "The full path to your site root on your disk, followed by a trailing slash:",
-	'installation:dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",
-	'installation:dataroot:warning' => "You must create this directory manually. It should sit in a different directory to your Elgg installation.",
+	'installation:sitename' => "The name of your site:",
+	'installation:sitedescription' => "Short description of your site (optional):",
+	'installation:wwwroot' => "The site URL:",
+	'installation:path' => "The full path of the Elgg installation:",
+	'installation:dataroot' => "The full path the data directory:",
+	'installation:dataroot:warning' => "You must create this directory manually. It should be in a different directory to your Elgg installation.",
 	'installation:sitepermissions' => "The default access permissions:",
 	'installation:language' => "The default language for your site:",
 	'installation:debug' => "Debug mode provides extra information which can be used to diagnose faults. However, it can slow your system down so should only be used if you are having problems:",
@@ -759,7 +778,7 @@ Alternatively, you can enter your database settings below and we will try and do
 	'installation:httpslogin:label' => "Enable HTTPS logins",
 	'installation:view' => "Enter the view which will be used as the default for your site or leave this blank for the default view (if in doubt, leave as default):",
 
-	'installation:siteemail' => "Site email address (used when sending system emails)",
+	'installation:siteemail' => "Site email address (used when sending system emails):",
 
 	'installation:disableapi' => "The RESTful API is a flexible and extensible interface that enables applications to use certain Elgg features remotely.",
 	'installation:disableapi:label' => "Enable the RESTful API",