Fixes to i18n file and formatting.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1003 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/messenger_i18n_en.properties

@@ -705,13 +705,12 @@ session.summary.last_update=List last updated
 setup.admin.settings.account=Administrator Account
 setup.admin.settings.info=Enter settings for the system administrator account (username of "admin") below. It is important to choose a password for the account that cannot be easily guessed -- for example, at least six characters long and containing a mix of letters and numbers. You can skip this step if you have already setup your admin account (not for first time users).
 setup.admin.settings.error=There were errors when updating the admin account. Please see below.
-setup.admin.settings.install=If this is a new
-setup.admin.settings.install1=installation, the current password will be
-setup.admin.settings.install2=admin
-setup.admin.settings.password=Please enter the correct current password.
+setup.admin.settings.current_password=Current Password:
+setup.admin.settings.current_password_description=If this is a new installation, the current password will be 'admin'.
+setup.admin.settings.current_password_error=Please enter the correct current password.
 setup.admin.settings.email=Admin Email Address:
-setup.admin.settings.valid_email=A valid email address for the admin account.
-setup.admin.settings.enter_email=Please enter a valid email address.
+setup.admin.settings.email_description=A valid email address for the admin account.
+setup.admin.settings.email_error=Please enter a valid email address.
 setup.admin.settings.new_password=New Password:
 setup.admin.settings.valid_new_password=Please enter a valid new password.
 setup.admin.settings.not_new_password=The new passwords do not match.

src/web/setup-admin-settings.jsp

@@ -146,20 +146,21 @@ function checkClick() {
 <table cellpadding="3" cellspacing="2" border="0">
 <tr valign="top">
     <td class="jive-label">
-        Current Password:
+        <fmt:message key="setup.admin.settings.current_password" />
     </td>
     <td>
         <input type="password" name="password" size="20" maxlength="50"
-         value="<%= ((password!=null) ? password : "") %>">
-        <span class="jive-description">
-        <br>
-        <fmt:message key="setup.admin.settings.install" /><fmt:message key="short.title" /> <fmt:message key="setup.admin.settings.install1" /> <b><fmt:message key="setup.admin.settings.install2" /></b>.
-        </span>
+         value="<%= ((password!=null) ? password : "") %>"><br>
+
         <%  if (errors.get("password") != null) { %>
             <span class="jive-error-text">
-            <br><fmt:message key="setup.admin.settings.password" />
+            <fmt:message key="setup.admin.settings.current_password_error" />
             </span>
-        <%  } %>
+        <%  } else { %>
+            <span class="jive-description">
+            <fmt:message key="setup.admin.settings.current_password_description" />
+            </span>
+        <% } %>
     </td>
 </tr>
 <tr valign="top">
@@ -168,16 +169,17 @@ function checkClick() {
     </td>
     <td>
         <input type="text" name="email" size="40" maxlength="150"
-         value="<%= ((email!=null) ? email : "") %>">
-        <span class="jive-description">
-        <br>
-        <fmt:message key="setup.admin.settings.valid_email" />
-        </span>
+         value="<%= ((email!=null) ? email : "") %>"><br>
+
         <%  if (errors.get("email") != null) { %>
             <span class="jive-error-text">
-            <br><fmt:message key="setup.admin.settings.enter_email" />
+            <fmt:message key="setup.admin.settings.email_error" />
             </span>
-        <%  } %>
+        <%  } else { %>
+            <span class="jive-description">
+            <fmt:message key="setup.admin.settings.email_description" />
+            </span>
+        <% } %>
     </td>
 </tr>
 <tr valign="top">
@@ -186,17 +188,15 @@ function checkClick() {
     </td>
     <td>
         <input type="password" name="newPassword" size="20" maxlength="50"
-         value="<%= ((newPassword!=null) ? newPassword : "") %>">
-        <span class="jive-description">
+         value="<%= ((newPassword!=null) ? newPassword : "") %>"><br>
 
-        </span>
         <%  if (errors.get("newPassword") != null) { %>
             <span class="jive-error-text">
-            <br><fmt:message key="setup.admin.settings.valid_new_password" />
+            <fmt:message key="setup.admin.settings.valid_new_password" />
             </span>
         <%  } else if (errors.get("match") != null) { %>
             <span class="jive-error-text">
-            <br><fmt:message key="setup.admin.settings.not_new_password" />
+            <fmt:message key="setup.admin.settings.not_new_password" />
             </span>
         <%  } %>
     </td>
@@ -207,13 +207,10 @@ function checkClick() {
     </td>
     <td>
         <input type="password" name="newPasswordConfirm" size="20" maxlength="50"
-         value="<%= ((newPasswordConfirm!=null) ? newPasswordConfirm : "") %>">
-        <span class="jive-description">
-
-        </span>
+         value="<%= ((newPasswordConfirm!=null) ? newPasswordConfirm : "") %>"><br>
         <%  if (errors.get("newPasswordConfirm") != null) { %>
             <span class="jive-error-text">
-            <br><fmt:message key="setup.admin.settings.valid_confirm" />
+            <fmt:message key="setup.admin.settings.valid_confirm" />
             </span>
         <%  } %>
     </td>