[pLog-svn] r5212 - plog/branches/lifetype-1.2/templates/wizard

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-03-28 15:28:06 -0400 (Wed, 28 Mar 2007)
New Revision: 5212

Modified:
   plog/branches/lifetype-1.2/templates/wizard/update2.template
Log:
Slightly longer but hopefully more clear description of what these two options mean. Native English speakers, please be so kind to review this text and make any changes you see fit t make it even more clear :-)

Modified: plog/branches/lifetype-1.2/templates/wizard/update2.template
===================================================================
--- plog/branches/lifetype-1.2/templates/wizard/update2.template	2007-03-28 18:18:43 UTC (rev 5211)
+++ plog/branches/lifetype-1.2/templates/wizard/update2.template	2007-03-28 19:28:06 UTC (rev 5212)
@@ -11,14 +11,16 @@
  <div class="wizardInfo">
   <img src="imgs/admin/icon_info-16.png" alt="Info" class="wizardInfoIcon" />
    <p class="wizardInfoText">
-  The following options will control the behavior of database changing process. Please make sure
+  The following options will control the behaviour of the database changing process. Please make sure
   the options are correct and press "Next" to move to the next step. The database changing process
-  is inreversible, please backup your database if you have any concerns of the changing process.</p>
+  is irreversible, please backup your database and files if you have any concerns about this process.</p>
   </div>
 {/if}
    <div class="field">
     <label for="resourcesNamingRule">Resource Naming Rules</label>
-    <div class="formHelp">The file naming rules for uploaded resources. 'Original File Name' use original file for uploaded resources. 'Encoded File Name' use the encoded file name for uploaded resources, the naming rule is [BlogId]-[ResourceId].[Ext] as we implemented in LifeType 1.1. <strong>Please use 'Encoded File Name' if you install LifeType under Multi-Byte Microsoft Windows environment.</strong></div>	
+    <div class="formHelp">
+	<p>Due to performance reasons, LifeType 1.2 uses the web server to serve resources (images, videos, etc) rather than using resserver.php. Because of this new implementation, all resource files need to be renamed to their original name but this will cause some problems when using Windows and multi-byte endcodings.</p>
+	<p>Please select one of these two options: <i>'Original File Name'</i> will rename files to their original name, <strong>please use this option if your server is not running Windows or if you are not using a double-byte character encoding</strong>. <i>'Encoded File Name'</i> will use the encoded file name for uploaded resources, the naming rule is [BlogId]-[ResourceId].[Ext] as implemented in LifeType 1.1. <strong>Please use 'Encoded File Name' if you are installing LifeType under a Multi-Byte Microsoft Windows environment.</strong></p></div>
      <select name="resourcesNamingRule">
       <option value="original_file_name" {if $resourcesNamingRule == "original_file_name"} selected="selected" {/if} />Original File Name</option>
       <option value="encoded_file_name" {if $resourcesNamingRule == "encoded_file_name"} selected="selected" {/if} />Encoded File Name</option>