Merge branch 'master' of https://github.com/bish0polis/phpipam into bish0polis-master

app/install/install_manual.php

@@ -17,14 +17,14 @@ $filename	  = @$_GET['subnetId']=="migrate" ? "MIGRATE" : "SCHEMA";
 		<a href="<?php print create_link("install"); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> <?php print _("Back"); ?></a>
 		<!-- Instructions -->
 		<div style="margin-top:10px;padding:30px 20px;">
-			<?php print _("For importing database file with mysqlimport tool please follow below instructions:"); ?><hr>
+			<?php print _("For importing database file with mysqlimport tool please follow the instructions below:"); ?><hr>
 			<ol>
 				<li><?php print _("Set variables for database connection in config.php"); ?></li>
 				<li><?php print _("Open mysql connection, create database"); ?>
 					<pre>mysql -u root -p</pre>
 				</li>
 				<li>
-					<?php print _("Copy below SQL queries and paste them to mysql"); ?>
+					<?php print _("Copy the SQL queries below and paste them into mysql"); ?>
 				</li>
 				<li><?php print _("Finished ! Now log in with <strong>Admin/ipamadmin</strong> to web page."); ?><br>
 				<a href="<?php print create_link(null,null,null,null,null,true); ?>" class="btn btn-sm btn-info"><?php print _("Login"); ?></a>

app/install/install_mysqlimport.php

@@ -18,7 +18,7 @@ $filename	  = @$_GET['subnetId']=="migrate" ? "MIGRATE" : "SCHEMA";
 		<a href="<?php print create_link("install"); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> <?php print _("Back"); ?></a>
 		<!-- Instructions -->
 		<div style="margin-top:10px;padding:30px 20px;">
-			<?php print _("Please follow below steps for")." ".$title_prefix." "._("with mysqlimport:"); ?><hr>
+			<?php print _("Please follow the steps below for")." ".$title_prefix." "._("with mysqlimport:"); ?><hr>
 			<ol>
 				<li><?php print _("Set variables for database connection in config.php"); ?></li>
 				<li><?php print _("Open mysql connection"); ?>

app/install/invalid_install_type.php

@@ -4,7 +4,7 @@
 
 	<div class="hContent">
 	<div style="padding:10px;">
-		<?php $Result->show("danger", _("This installation type does not exist. Please select valid installation method!"), false); ?>
+		<?php $Result->show("danger", _("This installation type does not exist. Please select a valid installation method!"), false); ?>
 
 		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> <?php print _("Back"); ?></a>
 

app/install/postinstall_configure.php

@@ -5,12 +5,12 @@
 	<div class="hContent">
 
 		<div class="text-muted" style="margin:10px;">
-		<?php print _("Hi, almost set, lets just set some basic settings. You can change all settings under administration once logged in!"); ?>
+		<?php print _("Hi. Almost set. Let's just set some basic settings. You can change all settings under administration once logged in!"); ?>
 		</div>
 		<hr>
 
 		<?php
-		# lets verify database
+		# let's verify database
 		$errors = $Tools->verify_database ();
 
 		/* print result */
@@ -41,7 +41,7 @@
 			}
 			print "</div>";
 		}
-		# no db errors, lets configure !
+		# no db errors, so lets configure !
 		else {
 		?>