From 33af05c1c30710f998540db109729ea10d114784 Mon Sep 17 00:00:00 2001
From: marj <marj@e107.org>
Date: Sat, 18 Jul 2009 18:37:45 +0000
Subject: [PATCH] language cleanup on install

---
 e107_languages/English/lan_installer.php | 34 +++++++++++++++---------
 install_.php                             | 10 +++----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/e107_languages/English/lan_installer.php b/e107_languages/English/lan_installer.php
index d1f4dc1a5..21822bfd1 100644
--- a/e107_languages/English/lan_installer.php
+++ b/e107_languages/English/lan_installer.php
@@ -1,4 +1,18 @@
 <?php
+/*
+ * e107 website system
+ *
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ *
+ *
+ * $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_installer.php,v $
+ * $Revision: 1.13 $
+ * $Date: 2009-07-18 18:37:00 $
+ * $Author: marj_nl_fr $
+ */
 
 define("LANINS_001", "e107 Installation");
 
@@ -37,7 +51,7 @@ define("LANINS_026", "MySQL Password:");
 define("LANINS_027", "MySQL Database:");
 define("LANINS_028", "Create Database?");
 define("LANINS_029", "Table prefix:");
-define("LANINS_030", "The MySQL server you would like e107 to use. It can also include a port number. e.g. \"hostname:port\" or a path to a local socket e.g. \":/path/to/socket\" for the localhost.");
+define("LANINS_030", "The MySQL server you would like e107 to use. It can also include a port number. e.g. “hostname:port” or a path to a local socket e.g. \":/path/to/socket\" for the localhost.");
 define("LANINS_031", "The username you wish e107 to use for connecting to your MySQL server");
 define("LANINS_032", "The Password for the user you just entered");
 define("LANINS_033", "The MySQL database you wish e107 to reside in, sometimes referred to as a schema. If the user has database create permissions you can opt to create the database automatically if it doesn't already exist.");
@@ -60,8 +74,8 @@ define("LANINS_049", "The two passwords you entered are not the same. Please go
 define("LANINS_050", "XML Extension");
 define("LANINS_051", "Installed");
 define("LANINS_052", "Not Installed");
-define("LANINS_053", "e107 0.8.x requires the PHP XML Extension to be installed. Please contact your host or read the information at ");
-define("LANINS_054", " before continuing");
+define("LANINS_053", "e107 0.8.x requires the PHP XML Extension to be installed. Please contact your host or read the information at <a href='http://php.net/manual/en/ref.xml.php' target='_blank'>php.net</a> before continuing");
+//not used: define("LANINS_054", " before continuing");
 define("LANINS_055", "Install Confirmation");
 define("LANINS_056", "6");
 define("LANINS_057", " e107 now has all the information it needs to complete the installation.
@@ -136,18 +150,14 @@ define("LANINS_095", "Integrity Check");
 
 define("LANINS_096", 'Latest Comments');
 define("LANINS_097", '[more ...]');
-define("LANINS_098", 'Articles');
-define("LANINS_099", 'Articles Front Page ...');
+//define("LANINS_098", 'Articles');
+//define("LANINS_099", 'Articles Front Page ...');
 define("LANINS_100", 'Latest Forum Posts');
 define("LANINS_101", 'Update menu Settings');
 define("LANINS_102", 'Date / Time');
-define("LANINS_103", 'Reviews');
-define("LANINS_104", 'Review Front Page ...');
+//define("LANINS_103", 'Reviews');
+//define("LANINS_104", 'Review Front Page ...');
 
-define("LANINS_105", 'A database name or prefix beginning with some digits followed by \'e\' or \'E\' is not acceptable');
+define("LANINS_105", 'A database name or prefix beginning with some digits followed by “e” or “E” is not acceptable');
 define("LANINS_106", 'WARNING - E107 cannot write to the directories and/or files listed. While this will not stop E107 installing, it will mean that certain features are not available. 
 				You will need to change the file permissions to use these features');
-define("LANINS_107", '');
-define("LANINS_108", '');
-
-?>
\ No newline at end of file
diff --git a/install_.php b/install_.php
index c4b10c998..ac0be5efc 100644
--- a/install_.php
+++ b/install_.php
@@ -9,8 +9,8 @@
 * Installation file
 *
 * $Source: /cvs_backup/e107_0.8/install_.php,v $
-* $Revision: 1.24 $
-* $Date: 2009-07-18 11:41:44 $
+* $Revision: 1.25 $
+* $Date: 2009-07-18 18:37:00 $
 * $Author: marj_nl_fr $
 *
 */
@@ -443,7 +443,7 @@ class e_install
 			$perms_pass = false;
 			foreach ($not_writable as $file)
 			{
-				$perms_errors .= (substr($file, -1) == "/" ? LANINS_010a : LANINS_010)."...<br /><b>{$file}</b><br />\n";
+				$perms_errors .= (substr($file, -1) == "/" ? LANINS_010a : LANINS_010)."<br /><b>{$file}</b><br />\n";
 			}
 			$perms_notes = LANINS_018;
 		}
@@ -452,7 +452,7 @@ class e_install
 			$perms_pass = true;
 			foreach ($opt_writable as $file)
 			{
-				$perms_errors .= (substr($file, -1) == "/" ? LANINS_010a : LANINS_010)."...<br /><b>{$file}</b><br />\n";
+				$perms_errors .= (substr($file, -1) == "/" ? LANINS_010a : LANINS_010)."<br /><b>{$file}</b><br />\n";
 			}
 			$perms_notes = LANINS_106;
 		}
@@ -534,7 +534,7 @@ class e_install
 			<tr>
 				<td>".LANINS_050."</td>
 				<td>".($xml_installed ? LANINS_051 : LANINS_052)."</td>
-				<td>".($xml_installed ? LANINS_017 : LANINS_053."<a href='http://php.net/manual/en/ref.xml.php' target='_blank'>php.net</a>".LANINS_054)."</td>
+				<td>".($xml_installed ? LANINS_017 : LANINS_053)."</td>
 			</tr>
 			</table>\n<br /><br />\n\n";
 		$this->finish_form();