Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1214)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1215)
@@ -103,7 +103,7 @@
 <h2>Step 1: Backup your files</h2>
 <p>It is highly recommended to <strong>create a manual backup</strong> of the entire <strong>/pages folder</strong> and the <strong>MySQL database</strong> before proceeding.<br /><strong class="error">Note: </strong>The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.</p>
 
-<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
+<form name="send" action="<?php echo $_SERVER['PHP_SELF'];?>" method="POST">
 <textarea cols="80" rows="5">DISCLAIMER: The Website Baker upgrade script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. One needs to confirm that a manual backup of the /pages folder (including all files and subfolders contained in it) and backup of the entire Website Baker MySQL database was created before you can proceed.</textarea>
 <br /><br /><input name="backup_confirmed" type="checkbox" value="confirmed" />&nbsp;I confirm that a manual backup of the /pages folder and the MySQL database was created.
 <br /><br /><input name="send" type="submit" value="Start upgrade script" />
Index: branches/2.8.x/wb/admin/preferences/index.php
===================================================================
--- branches/2.8.x/wb/admin/preferences/index.php	(revision 1214)
+++ branches/2.8.x/wb/admin/preferences/index.php	(revision 1215)
@@ -123,7 +123,7 @@
 	if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
 		$template->set_var('SELECTED', ' selected="selected"');
 	} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
-		$template->set_var('SELECTED', ' selected="selected"');
+		$template->set_var('SELECTED', 'selected');
 	} else {
 		$template->set_var('SELECTED', '');
 	}
@@ -157,8 +157,7 @@
 								'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'],
 								'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'],
 								'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'],
-								'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'],
-								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT']
+								'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD']
 								)
 						);
 
Index: branches/2.8.x/wb/templates/classic_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/classic_theme/templates/preferences.htt	(revision 1214)
+++ branches/2.8.x/wb/templates/classic_theme/templates/preferences.htt	(revision 1215)
@@ -28,7 +28,7 @@
 	<td>{TEXT_TIMEZONE}:</td>
 	<td>
 		<select name="timezone" style="width: 98%;">
-			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
+			<option value="-20">Please select...</option>
 			<!-- BEGIN timezone_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END timezone_list_block -->
@@ -39,7 +39,7 @@
 	<td>{TEXT_DATE_FORMAT}:</td>
 	<td>
 		<select name="date_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN date_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END date_format_list_block -->
@@ -50,7 +50,7 @@
 	<td>{TEXT_TIME_FORMAT}:</td>
 	<td>
 		<select name="time_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN time_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END time_format_list_block -->
Index: branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(revision 1214)
+++ branches/2.8.x/wb/templates/wb_theme/templates/preferences.htt	(revision 1215)
@@ -28,7 +28,7 @@
 	<td>{TEXT_TIMEZONE}:</td>
 	<td>
 		<select name="timezone" style="width: 98%;">
-			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
+			<option value="-20">Please select...</option>
 			<!-- BEGIN timezone_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END timezone_list_block -->
@@ -39,7 +39,7 @@
 	<td>{TEXT_DATE_FORMAT}:</td>
 	<td>
 		<select name="date_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN date_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END date_format_list_block -->
@@ -50,7 +50,7 @@
 	<td>{TEXT_TIME_FORMAT}:</td>
 	<td>
 		<select name="time_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN time_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END time_format_list_block -->
Index: branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(revision 1214)
+++ branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt	(revision 1215)
@@ -29,7 +29,7 @@
 	<td>{TEXT_TIMEZONE}:</td>
 	<td>
 		<select name="timezone" style="width: 98%;">
-			<option value="-20">{TEXT_PLEASE_SELECT}...</option>
+			<option value="-20">Please select...</option>
 			<!-- BEGIN timezone_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END timezone_list_block -->
@@ -40,7 +40,7 @@
 	<td>{TEXT_DATE_FORMAT}:</td>
 	<td>
 		<select name="date_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN date_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END date_format_list_block -->
@@ -51,7 +51,7 @@
 	<td>{TEXT_TIME_FORMAT}:</td>
 	<td>
 		<select name="time_format" style="width: 98%;">
-			<option value="">{TEXT_PLEASE_SELECT}...</option>
+			<option value="">Please select...</option>
 			<!-- BEGIN time_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
 			<!-- END time_format_list_block -->
Index: branches/2.8.x/wb/modules/show_menu2/languages/NL.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/languages/NL.php	(revision 1214)
+++ branches/2.8.x/wb/modules/show_menu2/languages/NL.php	(revision 1215)
@@ -27,6 +27,6 @@
 */
 
 //Module Description
-$module_description = 'Deze module integreert een de geavanceerde menu functie <code> show_menu2 () </ code> in Website Baker. Gedetailleerde informatie is beschikbaar op <a href="http://code.jellycan.com/show_menu2/" target="_blank"> http://code.jellycan.com/show_menu2/ </a> of in de <a href = "{WB_URL}/modules/show_menu2/README_EN" target = "_blank"> README </a>.';
+$module_description = 'Deze module integreert een de geavanceerde menu functie <code> show_menu2 () </ code> in Website Baker. Gedetailleerde informatie is beschikbaar op <a href="http://code.jellycan.com/show_menu2/" target="_blank"> http://code.jellycan.com/show_menu2/ </a> of in de <a href = "{WB_URL}/modules/show_menu2/README_EN" target = "_blank"> README </a>.
 
 ?>
\ No newline at end of file