resolved merge conflict

2 files changed, 17 insertions, 17 deletions

diff --git a/lib/app.php b/lib/app.php
index e7cf74af85c..e9f97a4354e 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -52,7 +52,7 @@ class OC_App{
 		}
 
 		// Our very own core apps are hardcoded
-		foreach( array( 'admin', 'files', 'help', 'settings' ) as $app ){
+		foreach( array('files', 'settings') as $app ){
 			require( $app.'/appinfo/app.php' );
 		}
 
@@ -200,13 +200,13 @@ class OC_App{
 	public static function getSettingsNavigation(){
 		$l=new OC_L10N('core');
 		$admin=array(
-			array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.svg" )),
-			array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.svg" )),
+			array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )),
+			array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )),
 //			array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "settings", "options.svg" )),
 		);
 		$settings=array(
-			array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.svg" )),
-			array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ))
+			array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )),
+			array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ))
 		);
 		if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
 			$settings=array_merge($admin,$settings);
diff --git a/lib/setup.php b/lib/setup.php
index c7259d6b8ce..8386846358b 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -37,13 +37,13 @@ class OC_Setup {
 		$dbtype = $options['dbtype'];
 		
 		if(empty($options['adminlogin'])) {
-			$error[] = 'STEP 1 : admin login is not set.';
+			$error[] = 'Set an admin username.';
 		}
 		if(empty($options['adminpass'])) {
-			$error[] = 'STEP 1 : admin password is not set.';
+			$error[] = 'Set an admin password.';
 		}
 		if(empty($options['directory'])) {
-			$error[] = 'STEP 2 : data directory path is not set.';
+			$error[] = 'Specify a data folder.';
 		}
 
 		if($dbtype=='mysql' or $dbtype=='pgsql') { //mysql and postgresql needs more config options
@@ -53,19 +53,19 @@ class OC_Setup {
 				$dbprettyname = 'PostgreSQL';
 
 			if(empty($options['dbuser'])) {
-				$error[] = "STEP 3 : $dbprettyname database user is not set.";
+				$error[] = "$dbprettyname enter the database username.";
 			}
 			if(empty($options['dbpass'])) {
-				$error[] = "STEP 3 : $dbprettyname database password is not set.";
+				$error[] = "$dbprettyname enter the database password.";
 			}
 			if(empty($options['dbname'])) {
-				$error[] = "STEP 3 : $dbprettyname database name is not set.";
+				$error[] = "$dbprettyname enter the database name.";
 			}
 			if(empty($options['dbhost'])) {
-				$error[] = "STEP 3 : $dbprettyname database host is not set.";
+				$error[] = "$dbprettyname set the database host.";
 			}
 			if(!isset($options['dbtableprefix'])) {
-				$error[] = "STEP 3 : $dbprettyname database table prefix is not set.";
+				$error[] = "$dbprettyname set a table prefix.";
 			}
 		}
 
@@ -97,8 +97,8 @@ class OC_Setup {
 				$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
 				if(!$connection) {
 					$error[] = array(
-						'error' => 'mysql username and/or password not valid',
-						'hint' => 'you need to enter either an existing account, or the administrative account if you wish to create a new user for ownCloud'
+						'error' => 'MySQL username and/or password not valid',
+						'hint' => 'You need to enter either an existing account or the administrator.'
 					);
 				}
 				else {
@@ -151,8 +151,8 @@ class OC_Setup {
 				$connection = @pg_connect($connection_string);
 				if(!$connection) {
 					$error[] = array(
-						'error' => 'postgresql username and/or password not valid',
-						'hint' => 'you need to enter either an existing account, or the administrative account if you wish to create a new user for ownCloud'
+						'error' => 'PostgreSQL username and/or password not valid',
+						'hint' => 'You need to enter either an existing account or the administrator.'
 					);
 				}
 				else {