Modified to use resource bundles for i18n. JM-156

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

src/web/audit-policy.jsp

@@ -23,7 +23,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Audit Policy";
+    String title = LocaleUtils.getLocalizedString("audit.policy.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "audit-policy.jsp"));
@@ -87,7 +87,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="audit.policy.settings.saved_successfully" />
         </td></tr>
     </tbody>
     </table>
@@ -112,18 +112,13 @@
 
 <p>
 <fmt:message key="title" />
-can audit XMPP traffic on the server and save
-the data to XML data files. The amount of data sent via an XMPP server can be substantial.
-Messenger provides several settings to control whether to audit packets, how
-audit files are created, and the types of packets to save. In most cases, logging
-Message packets will provide all of the data an enterprise requires. Presence
-and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments.
+<fmt:message key="audit.policy.title_info" />
 </p>
 
 <form action="audit-policy.jsp">
 
 <fieldset>
-    <legend>Set Message Audit Policy</legend>
+    <legend><fmt:message key="audit.policy.policytitle" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -134,7 +129,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
             </td>
             <td width="99%">
                 <label for="rb01">
-                <b>Disable Message Auditing</b> -- packets are not logged.
+                <b><fmt:message key="audit.policy.label_disable_auditing" /></b> <fmt:message key="audit.policy.label_disable_auditing_info" />
                 </label>
             </td>
         </tr>
@@ -145,7 +140,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
             </td>
             <td width="99%">
                 <label for="rb02">
-                <b>Enable Message Auditing</b> -- packets are logged with the following options:
+                <b><fmt:message key="audit.policy.label_enable_auditing" /></b> <fmt:message key="audit.policy.label_enable_auditing_info" />
                 </label>
             </td>
         </tr>
@@ -157,7 +152,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                 <table cellpadding="3" cellspacing="0" border="0" width="100%">
                 <tr valign="top">
                     <td width="1%" nowrap class="c1">
-                        Maximum file size (MB):
+                        <fmt:message key="audit.policy.maxfile_size" />
                     </td>
                     <td width="99%">
                         <input type="text" size="15" maxlength="50" name="maxSize"
@@ -166,7 +161,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                     <%  if (errors.get("maxSize") != null) { %>
 
                         <span class="jive-error-text">
-                        Please enter a valid number.
+                        <fmt:message key="audit.policy.validnumber" />
                         </span>
 
                     <%  } %>
@@ -175,7 +170,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                 </tr>
                 <tr valign="top">
                     <td width="1%" nowrap class="c1">
-                        Maximum number of files:
+                        <fmt:message key="audit.policy.maxfile_number" />
                     </td>
                     <td width="99%">
                         <input type="text" size="15" maxlength="50" name="maxCount"
@@ -184,7 +179,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                         <%  if (errors.get("maxCount") != null) { %>
 
                             <span class="jive-error-text">
-                            Please enter a valid number.
+                            <fmt:message key="audit.policy.validnumber" />
                             </span>
 
                         <%  } %>
@@ -193,7 +188,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                 </tr>
                 <tr valign="top">
                     <td width="1%" nowrap class="c1">
-                        Flush Interval (seconds):
+                        <fmt:message key="audit.policy.flush_interval" />
                     </td>
                     <td width="99%">
                         <input type="text" size="15" maxlength="50" name="logTimeout"
@@ -202,7 +197,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                     <%  if (errors.get("logTimeout") != null) { %>
 
                         <span class="jive-error-text">
-                        Please enter a valid number.
+                        <fmt:message key="audit.policy.validnumber" />
                         </span>
 
                     <%  } %>
@@ -211,7 +206,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                 </tr>
                 <tr valign="top">
                     <td width="1%" nowrap class="c1">
-                        Packets to audit:
+                        <fmt:message key="audit.policy.packet_audit" />
                     </td>
                     <td width="99%">
 
@@ -224,7 +219,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                             </td>
                             <td width="99%">
                                 <label for="cb01">
-                                <b>Audit Message Packets</b>
+                                <b><fmt:message key="audit.policy.label_audit_messenge_packets" /></b>
                                 </label>
                             </td>
                         </tr>
@@ -236,7 +231,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                             </td>
                             <td width="99%">
                                 <label for="cb02">
-                                <b>Audit Presence Packets</b>
+                                <b><fmt:message key="audit.policy.label_audit_presence_packets" /></b>
                                 </label>
                             </td>
                         </tr>
@@ -248,7 +243,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
                             </td>
                             <td width="99%">
                                 <label for="cb03">
-                                <b>Audit IQ Packets</b>
+                                <b><fmt:message key="audit.policy.label_audit_iq_packets" /></b>
                                 </label>
                             </td>
                         </tr>
@@ -263,7 +258,7 @@ and IQ packets are primarily useful for tracing and troubleshooting XMPP deploym
     <table border="0">
         <tr valign="top">
             <td width="1%" nowrap class="c1">
-                Queued packets:
+                <fmt:message key="audit.policy.queued_packets" />
             </td>
             <td width="99%">
                  <%= auditManager.getAuditor().getQueuedPacketsNumber() %>

src/web/chatroom-history-settings.jsp

@@ -26,7 +26,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Chat Room History Settings";
+    String title = LocaleUtils.getLocalizedString("chatroom.history.settings.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "chatroom-history-settings.jsp"));
@@ -78,7 +78,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="chatroom.history.settings.saved_successfully" />
         </td></tr>
     </tbody>
     </table>
@@ -103,15 +103,14 @@
 %>
 
 <p>
-Chatrooms can replay conversation histories to provide context to new members joining a room.
-<fmt:message key="short.title" /> provides several options for controlling how
-much history to store for each room.
+<fmt:message key="chatroom.history.settings.info_response1" />
+<fmt:message key="short.title" /> <fmt:message key="chatroom.history.settings.info_response2" />
 </p>
 
 <form action="chatroom-history-settings.jsp" method="post">
 
 <fieldset>
-    <legend>Set Chatroom History Policy</legend>
+    <legend><fmt:message key="chatroom.history.settings.policy" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -121,8 +120,8 @@ much history to store for each room.
                  <%= ((policy==NONE) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb01"><b>Don't Show History</b></label> - Do not show the entire chat
-                history.
+                <label for="rb01"><b><fmt:message key="chatroom.history.settings.label_show_title" /></b>
+                </label><fmt:message key="chatroom.history.settings.label_show_content" />
             </td>
         </tr>
         <tr valign="top">
@@ -131,8 +130,8 @@ much history to store for each room.
                  <%= ((policy==ALL) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb02"><b>Show Entire Chat History</b></label> - Show the entire chat history
-                to the user.
+                <label for="rb02"><b><fmt:message key="chatroom.history.settings.label_show_Entire_title" /></b></label>
+                <fmt:message key="chatroom.history.settings.label_show_Entire_content" />  
             </td>
         </tr>
         <tr valign="top" class="">
@@ -141,9 +140,8 @@ much history to store for each room.
                  <%= ((policy==NUMBER) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb03"><b>Show a Specific Number of Messages</b></label> - Show a specific
-                number of the most recent messages in the chat. Use the box below to specify
-                that number.
+                <label for="rb03"><b><fmt:message key="chatroom.history.settings.label_show_message_number_title" /></b></label> - 
+                <fmt:message key="chatroom.history.settings.label_show_message_number_content" />
         </tr>
         <tr valign="top" class="">
             <td width="1%" nowrap>

src/web/error-serverdown.jsp

@@ -3,7 +3,8 @@
   -	$Revision$
   -	$Date$
 --%>
-<%@ page import="org.jivesoftware.admin.AdminConsole"%>
+<%@ page import="org.jivesoftware.admin.AdminConsole,
+                 org.jivesoftware.util.LocaleUtils"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -17,14 +18,14 @@
 <%  String path = request.getContextPath();
 
     // Title of this page
-    String title = AdminConsole.getAppName() + " Server Down";
+    String title = AdminConsole.getAppName() + " " +LocaleUtils.getLocalizedString("error.serverdown.title");
     pageinfo.setTitle(title);
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
 <html>
 <head>
- <title><%= AdminConsole.getAppName() %> Admin Console<%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
+ <title><%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
  <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
 </head>
@@ -36,7 +37,7 @@
 <tbody>
     <tr>
      <td>
-         <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console">
+         <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.admin_console" />">
      </td>
      <td align="right">
          <table cellpadding="0" cellspacing="0" border="0">
@@ -67,16 +68,15 @@
         <jsp:include page="title.jsp" flush="true" />
 
         <p>
-        <%= AdminConsole.getAppName() %> is currently down.
-        To continue:
+        <%= AdminConsole.getAppName() %> <fmt:message key="error.serverdown.is_down" />
         </p>
 
         <ol>
             <li>
-                Start the server.
+                <fmt:message key="error.serverdown.start" />
             </li>
             <li>
-                <a href="index.jsp">Login to the admin console</a>.
+                <a href="index.jsp"><fmt:message key="error.serverdown.login" /></a>.
             </li>
         </ol>
 

src/web/error.jsp

@@ -12,7 +12,7 @@
                  org.jivesoftware.messenger.group.GroupNotFoundException"
     isErrorPage="true"
 %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  boolean debug = "true".equals(JiveGlobals.getProperty("skin.default.debug"));
     if (debug) {
         exception.printStackTrace();
@@ -22,24 +22,24 @@
 <%  if (exception instanceof UnauthorizedException) { %>
 
     <p>
-    You don't have admin privileges to perform this operation.
+    <fmt:message key="error.admin_privileges" />
     </p>
 
 <%  } else if (exception instanceof UserNotFoundException) {
         String username = ParamUtils.getParameter(request,"username");
 %>
         <p>
-        The requested user
+        <fmt:message key="error.requested_user" />
         <%  if (username != null) { %>
-            (username: <%= username %>)
+            (<fmt:message key="error.username" /><%= username %>)
         <%  } %>
-        was not found.
+        <fmt:message key="error.not_found" />
         </p>
 
 <%  } else if (exception instanceof GroupNotFoundException) { %>
 
     <p>
-    The requested group was not found.
+    <fmt:message key="error.not_found_group" />
     </p>
     
 <%  } %>
@@ -49,7 +49,7 @@
         PrintWriter pout = new PrintWriter(sout);
         exception.printStackTrace(pout);
 %>
-    Exception:
+    <fmt:message key="error.exception" />
     <pre>
 <%= sout.toString() %>
     </pre>

src/web/group-create.jsp

@@ -30,6 +30,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <jsp:useBean id="errors" class="java.util.HashMap" />
@@ -130,7 +131,7 @@
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
 
 <% // Title of this page and breadcrumbs
-    String title = "Create Group";
+    String title = LocaleUtils.getLocalizedString("group.create.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp"));
@@ -153,7 +154,7 @@
                 <img src="images/success-16x16.gif" width="16" height="16" border="0">
             </td>
             <td class="jive-icon-label">
-                Error creating the group. Please check your error logs.
+                <fmt:message key="group.create.error" />
             </td>
         </tr>
     </tbody>
@@ -163,19 +164,19 @@
 <%  } %>
 
 <p>
-Use the form below to create a group.
+<fmt:message key="group.create.form" />
 </p>
 
 <form name="f" action="group-create.jsp" method="post">
 
 <fieldset>
-    <legend>Create New Group</legend>
+    <legend><fmt:message key="group.create.new_group_title" /></legend>
     <div>
 
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tr valign="top">
         <td width="1%" nowrap>
-            <label for="gname">Group Name:</label> *
+            <label for="gname"><fmt:message key="group.create.group_name" /></label> *
         </td>
         <td width="99%">
             <input type="text" name="name" size="30" maxlength="75"
@@ -189,9 +190,9 @@ Use the form below to create a group.
             <td width="1%" nowrap>&nbsp;</td>
             <td width="99%">
                 <%  if (errors.get("name") != null) { %>
-                    <span class="jive-error-text">Invalid group name.</span>
+                    <span class="jive-error-text"><fmt:message key="group.create.invalid_group_name" /></span>
                 <%  } else if (errors.get("groupAlreadyExists") != null) { %>
-                    <span class="jive-error-text">Group already exists - please choose a different name.</span>
+                    <span class="jive-error-text"><fmt:message key="group.create.invalid_group_info" /></span>
                 <%  } %>
             </td>
         </tr>
@@ -200,7 +201,7 @@ Use the form below to create a group.
 
     <tr valign="top">
         <td width="1%" nowrap>
-            <label for="gdesc">Description:</label>
+            <label for="gdesc"><fmt:message key="group.create.label_description" /></label>
         </td>
         <td width="99%">
             <textarea name="description" cols="30" rows="3" id="gdesc"
@@ -215,7 +216,7 @@ Use the form below to create a group.
                 &nbsp;
             </td>
             <td width="99%">
-                <span class="jive-error-text">Invalid description.</span>
+                <span class="jive-error-text"><fmt:message key="group.create.invalid_description" /></span>
             </td>
         </tr>
 
@@ -223,7 +224,7 @@ Use the form below to create a group.
 
     <tr>
         <td nowrap width="1%" valign="top">
-            Initial Member(s):
+            <fmt:message key="group.create.label_initial_member" />
         </td>
         <td nowrap class="c1" align="left">
             <textarea name="users" cols="30" rows="3" id="gdesc"
@@ -233,11 +234,10 @@ Use the form below to create a group.
     </table>
 
     <br>
-    <p><b>Shared Roster Groups</b></p>
+    <p><b><fmt:message key="group.create.share_groups_title" /></b></p>
 
     <p>
-    You can use the form below to show this group in users' rosters. Select from one of three
-    options for who should see this group in their rosters.
+    <fmt:message key="group.create.share_groups_info" />
     </p>
 
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
@@ -247,7 +247,7 @@ Use the form below to create a group.
                 <input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>>
             </td>
             <td width="99%">
-                <label for="rb201">Disable sharing group in rosters</label>
+                <label for="rb201"><fmt:message key="group.create.disable_share_group" /></label>
             </td>
         </tr>
         <tr>
@@ -255,7 +255,7 @@ Use the form below to create a group.
                 <input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>>
             </td>
             <td width="99%">
-                <label for="rb202">Enable sharing group in rosters</label>
+                <label for="rb202"><fmt:message key="group.create.enable_share_group" /></label>
             </td>
         </tr>
         <tr>
@@ -268,7 +268,7 @@ Use the form below to create a group.
                 <tbody>
                     <tr>
                         <td width="1%" nowrap>
-                            Group Display Name
+                            <fmt:message key="group.create.group_display_name" />
                         </td>
                         <td width="99%">
                             <input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>"
@@ -276,7 +276,7 @@ Use the form below to create a group.
 
                             <%  if (errors.get("groupDisplayName") != null) { %>
 
-                                    <span class="jive-error-text">Enter a Group Display Name.</span>
+                                    <span class="jive-error-text"><fmt:message key="group.create.enter_a_group_name" /></span>
 
                             <%  } %>
                         </td>
@@ -293,8 +293,7 @@ Use the form below to create a group.
                              <%= ("everybody".equals(showGroup) ? "checked" : "") %>>
                         </td>
                         <td width="99%">
-                            <label for="rb002"
-                             >Show group in all users' rosters.</label>
+                            <label for="rb002"><fmt:message key="group.create.show_group_in_all_users" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -304,8 +303,7 @@ Use the form below to create a group.
                              <%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>>
                         </td>
                         <td width="99%">
-                            <label for="rb001"
-                             >Show group in group members' rosters</label>
+                            <label for="rb001"><fmt:message key="group.create.show_group_in_group_members" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -315,8 +313,7 @@ Use the form below to create a group.
                              <%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>>
                         </td>
                         <td width="99%">
-                            <label for="rb003"
-                             >Show group to members' rosters of these groups:</label>
+                            <label for="rb003"><fmt:message key="group.create.show_group_in_roster_group" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -347,7 +344,7 @@ Use the form below to create a group.
     </table>
 
     <br>
-    <span class="jive-description">* Required fields </span>
+    <span class="jive-description">* <fmt:message key="group.create.required_fields" /> </span>
     </div>
 
 </fieldset>

src/web/group-delete.jsp

@@ -17,6 +17,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>
@@ -47,7 +48,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Delete Group";
+    String title = LocaleUtils.getLocalizedString("group.delete.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-delete.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
@@ -58,9 +59,9 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Are you sure you want to delete the group
+<fmt:message key="group.delete.hint_info" />
 <b><a href="group-edit.jsp?group=<%= URLEncoder.encode(group.getName(), "UTF-8")%>"><%= group.getName() %></a></b>
-from the system?
+<fmt:message key="group.delete.hint_info1" />
 </p>
 
 <form action="group-delete.jsp">

src/web/group-edit.jsp

@@ -21,11 +21,12 @@
                  org.jivesoftware.messenger.user.UserManager,
                  org.jivesoftware.messenger.user.UserNotFoundException,
                  org.jivesoftware.stringprep.Stringprep,
-                 java.io.UnsupportedEncodingException"
+                 java.io.UnsupportedEncodingException,
+                 org.jivesoftware.util.LocaleUtils"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <!-- Define Administration Bean -->
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
 <jsp:useBean id="errors" class="java.util.HashMap"/>
@@ -207,7 +208,7 @@
 %>
     <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
 <% // Title of this page and breadcrumbs
-    String title = "Edit Group";
+    String title = LocaleUtils.getLocalizedString("group.edit.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-edit.jsp?group="+URLEncoder.encode(groupName, "UTF-8")));
@@ -217,8 +218,7 @@
     <jsp:include page="top.jsp" flush="true"/>
     <jsp:include page="title.jsp" flush="true"/>
     <p>
-        Edit group settings and add or remove group members and administrators
-        using the forms below.
+        <fmt:message key="group.edit.form_info" />
     </p>
 
 <%
@@ -230,15 +230,15 @@
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
         <% if (groupInfoChanged) { %>
-        Group information updated successfully.
+        <fmt:message key="group.edit.update" />
         <% } else if ("true".equals(request.getParameter("success"))) { %>
-            User(s) added successfully.
+            <fmt:message key="group.edit.update_add_user" />
         <% } else if ("true".equals(request.getParameter("deletesuccess"))) { %>
-            User(s) deleted successfully.
+            <fmt:message key="group.edit.update_del_user" />
         <% } else if ("true".equals(request.getParameter("updatesuccess"))) { %>
-            User(s) updated successfully.
+            <fmt:message key="group.edit.update_user" />
          <% } else if ("true".equals(request.getParameter("creategroupsuccess"))) { %>
-            Group created successfully.
+            <fmt:message key="group.edit.update_success" />
         <%
             }
         %>
@@ -256,7 +256,7 @@
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
         <% if(add) { %>
-        User(s) not added successfully.
+        <fmt:message key="group.edit.not_update" />
         <%= errorBuf %>
         <% } %>
         </td></tr>
@@ -269,13 +269,13 @@
 
     <fieldset>
         <legend>
-            Group Summary
+            <fmt:message key="group.edit.group_summary" />
         </legend>
 
         <table cellpadding="3" cellspacing="1" border="0">
             <tr>
                 <td  width="1%">
-                    Name:
+                    <fmt:message key="group.edit.group_name" />
                 </td>
                 <% if(!edit) { %>
                 <td align=left nowrap width="1%">
@@ -296,11 +296,11 @@
             </tr>
             <tr>
                 <td width="1%">
-                    Description:
+                    <fmt:message key="group.edit.group_description" />
                 </td>
                 <% if(!edit) { %>
                 <td colspan="2">
-                    <%= ((group.getDescription() != null) ? group.getDescription() : "<i>No Description</i>") %>
+                    <%= ((group.getDescription() != null) ? group.getDescription() : "<i>"+LocaleUtils.getLocalizedString("group.edit.group_not_description")+"</i>") %>
                 </td>
                 <% } else { %>
 
@@ -315,11 +315,10 @@
 
 
     <br>
-    <p>Shared Roster Groups</p>
+    <p><fmt:message key="group.edit.group_share_title" /></p>
 
     <p>
-    You can use the form below to show this group in users' rosters. Select from one of three
-    options for who should see this group in their rosters.
+    <fmt:message key="group.edit.group_share_content" />
     </p>
 
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
@@ -329,7 +328,7 @@
                 <input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>>
             </td>
             <td width="99%">
-                <label for="rb201">Disable sharing group in rosters</label>
+                <label for="rb201"><fmt:message key="group.edit.group_share_not_in_rosters" /></label>
             </td>
         </tr>
         <tr>
@@ -337,7 +336,7 @@
                 <input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>>
             </td>
             <td width="99%">
-                <label for="rb202">Enable sharing group in rosters</label>
+                <label for="rb202"><fmt:message key="group.edit.group_share_in_rosters" /></label>
             </td>
         </tr>
         <tr>
@@ -350,7 +349,7 @@
                 <tbody>
                     <tr>
                         <td width="1%" nowrap>
-                            Group Display Name
+                            <fmt:message key="group.edit.group_display_name" />
                         </td>
                         <td width="99%">
                             <input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>"
@@ -369,8 +368,7 @@
                              <%= ("everybody".equals(showGroup) ? "checked" : "") %>>
                         </td>
                         <td width="99%">
-                            <label for="rb002"
-                             >Show group in all users' rosters.</label>
+                            <label for="rb002"><fmt:message key="group.edit.show_groups_in_all_user" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -380,8 +378,7 @@
                              <%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>>
                         </td>
                         <td width="99%">
-                            <label for="rb001"
-                             >Show group in group members' rosters</label>
+                            <label for="rb001"><fmt:message key="group.edit.show_groups_in_groups_members" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -391,8 +388,7 @@
                              <%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>>
                         </td>
                         <td width="99%">
-                            <label for="rb003"
-                             >Show group to members' rosters of these groups:</label>
+                            <label for="rb003"><fmt:message key="group.edit.show_group_in_roster_group" /></label>
                         </td>
                     </tr>
                     <tr>
@@ -440,7 +436,7 @@
         <table cellpadding="3" cellspacing="1" border="0">
             <tr>
                 <td nowrap width="1%">
-                    Add User(s):
+                    <fmt:message key="group.edit.add_user" />
                 </td>
                 <td nowrap class="c1" align="left">
                     <input type="text" size="40" name="users"/>
@@ -454,7 +450,7 @@
         <input type="hidden" name="group" value="<%= groupName %>">
         <table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600">
             <tr>
-                <th>Username</th><th width="1%">Admin</th><th width="1%">Remove</th>
+                <th><fmt:message key="group.edit.username" /></th><th width="1%"><fmt:message key="group.edit.admin" /></th><th width="1%"><fmt:message key="group.edit.remove" /></th>
             </tr>
             <!-- Add admins first -->
 <%
@@ -468,7 +464,7 @@
                 <tr>
                     <td align="center" colspan="3">
                         <br>
-                        No members in this group. Use the form above to add some.
+                        <fmt:message key="group.edit.user_hint" />
                         <br>
                         <br>
                     </td>

src/web/group-summary.jsp

@@ -20,13 +20,14 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Group Summary";
+    String title = LocaleUtils.getLocalizedString("group.summary.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-summary.jsp"));
@@ -48,7 +49,7 @@
 %>             
 
 <p>
-Below is a list of the groups in the system.
+<fmt:message key="group.summary.list_group" />
 </p>
 
 <%  if (request.getParameter("deletesuccess") != null) { %>
@@ -58,7 +59,7 @@ Below is a list of the groups in the system.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Group deleted successfully.
+        <fmt:message key="group.summary.delete_group" />
         </td></tr>
     </tbody>
     </table>
@@ -67,10 +68,10 @@ Below is a list of the groups in the system.
 <%  } %>
 
 <p>
-Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
+<fmt:message key="group.summary.total_group" /> <%= webManager.getGroupManager().getGroupCount() %>,
 <%  if (numPages > 1) { %>
 
-    Showing <%= (start+1) %>-<%= (start+range) %>,
+    <fmt:message key="group.summary.showing" /> <%= (start+1) %>-<%= (start+range) %>,
 
 <%  } %>
 </p>
@@ -78,7 +79,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="group.summary.page" />
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -99,11 +100,11 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
 <thead>
     <tr>
         <th>&nbsp;</th>
-        <th>Name</th>
-        <th>Members</th>
-        <th>Admins</th>
-        <th>Edit</th>
-        <th>Delete</th>
+        <th><fmt:message key="group.summary.page_name" /></th>
+        <th><fmt:message key="group.summary.page_member" /></th>
+        <th><fmt:message key="group.summary.page_admin" /></th>
+        <th><fmt:message key="group.summary.page_edit" /></th>
+        <th><fmt:message key="group.summary.page_delete" /></th>
     </tr>
 </thead>
 <tbody>
@@ -114,7 +115,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
 %>
     <tr>
         <td align="center" colspan="6">
-            No groups in the system.
+            <fmt:message key="group.summary.no_groups" />
         </td>
     </tr>
 
@@ -146,12 +147,12 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
         </td>
         <td width="1%" align="center">
             <a href="group-edit.jsp?group=<%= groupName %>"
-             title="Click to edit..."
+             title=<fmt:message key="group.summary.click_edit" />
              ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
         </td>
         <td width="1%" align="center" style="border-right:1px #ccc solid;">
             <a href="group-delete.jsp?group=<%= groupName %>"
-             title="Click to delete..."
+             title=<fmt:message key="group.summary.click_delete" />
              ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
@@ -166,7 +167,7 @@ Total Groups: <%= webManager.getGroupManager().getGroupCount() %>,
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="group.summary.page" />
     [
     <%  for (i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";

src/web/header.jsp

@@ -10,7 +10,7 @@
 
 <html>
 <head>
-    <title><fmt:message key="title" /> Admin</title>
+    <title><fmt:message key="title" /> <fmt:message key="header.admin" /></title>
     <meta http-equiv="content-type" content="text/html; charset=">
     <script language="JavaScript" type="text/javascript">
     <!-- // code for window popups

src/web/index.jsp

@@ -55,7 +55,7 @@
 %>
 
 <%  // Title of this page and breadcrumbs
-    String title = "Server Settings";
+    String title = LocaleUtils.getLocalizedString("index.title");
     pageinfo.setTitle(title);
     pageinfo.setPageID("server-settings");
 %>
@@ -65,8 +65,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below are properties for this server. Click the "Edit Properties" button below to change
-some of the server settings. Some settings can not be changed.
+<fmt:message key="index.title.info" />
 </p>
 
 <script lang="JavaScript" type="text/javascript">
@@ -82,7 +81,7 @@ some of the server settings. Some settings can not be changed.
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
     <tr>
-        <th colspan="2">Server Properties</th>
+        <th colspan="2"><fmt:message key="index.properties" /></th>
     </tr>
 </thead>
 <tbody>
@@ -90,7 +89,7 @@ some of the server settings. Some settings can not be changed.
     <%  if (serverOn) { %>
 
          <tr>
-            <td class="c1">Server Uptime:</td>
+            <td class="c1"><fmt:message key="index.uptime" /></td>
             <td>
                 <%  DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
                     long now = System.currentTimeMillis();
@@ -131,21 +130,21 @@ some of the server settings. Some settings can not be changed.
     <%  } %>
 
     <tr>
-        <td class="c1">Version:</td>
+        <td class="c1"><fmt:message key="index.version" /></td>
         <td class="c2">
             <%= AdminConsole.getAppName() %>
             <%= AdminConsole.getVersionString() %>
         </td>
     </tr>
     <tr>
-        <td class="c1">Messenger Home:</td>
+        <td class="c1"><fmt:message key="index.home" /></td>
         <td class="c2">
             <%= JiveGlobals.getMessengerHome() %>
         </td>
     </tr>
     <tr>
         <td class="c1">
-            Server Name:
+            <fmt:message key="index.server_name" />
         </td>
         <td class="c2">
             ${webManager.serverInfo.name}
@@ -154,7 +153,7 @@ some of the server settings. Some settings can not be changed.
 </tbody>
 <thead>
     <tr>
-        <th colspan="2">Server Ports</th>
+        <th colspan="2"><fmt:message key="index.server_port" /></th>
     </tr>
 </thead>
 <tbody>
@@ -163,18 +162,18 @@ some of the server settings. Some settings can not be changed.
         <%  i++; %>
         <tr>
             <td class="c1">
-                <%= i %>: IP:Port, Security:
+                <%= i %>: <fmt:message key="index.server_ip" />
             </td>
             <td class="c2">
                 ${port.IPAddress}:${port.port},
                 <c:choose>
                     <c:when test="${empty port.securityType}">
-                        NORMAL
+                        <fmt:message key="index.port_type" />
                     </c:when>
                     <c:otherwise>
                         <c:choose>
                             <c:when test="${port.securityType == 'TLS'}">
-                                TLS (SSL)
+                                <fmt:message key="index.port_type1" />
                             </c:when>
                             <c:otherwise>
                                 <c:out value="${port.securityType}" />
@@ -186,7 +185,7 @@ some of the server settings. Some settings can not be changed.
         </tr>
         <tr valign="top">
             <td class="c1">
-                <nobr>&nbsp;&nbsp;&nbsp; Domain Name(s):</nobr>
+                <nobr>&nbsp;&nbsp;&nbsp; <fmt:message key="index.domain_name" /></nobr>
             </td>
             <td class="c2">
                 <c:set var="sep" value="" />
@@ -200,30 +199,30 @@ some of the server settings. Some settings can not be changed.
 </tbody>
 <thead>
     <tr>
-        <th colspan="2">Environment</th>
+        <th colspan="2"><fmt:message key="index.environment" /></th>
     </tr>
 </thead>
 <tbody>
     <tr>
-        <td class="c1">JVM Version and Vendor:</td>
+        <td class="c1"><fmt:message key="index.jvm" /></td>
         <td class="c2">
             <%= System.getProperty("java.version") %> <%= System.getProperty("java.vendor") %>
         </td>
     </tr>
     <tr>
-        <td class="c1">Appserver:</td>
+        <td class="c1"><fmt:message key="index.app" /></td>
         <td class="c2">
             <%= application.getServerInfo() %>
         </td>
     </tr>
     <tr>
-        <td class="c1">OS / Hardware:</td>
+        <td class="c1"><fmt:message key="index.os" /></td>
         <td class="c2">
             <%= System.getProperty("os.name") %> / <%= System.getProperty("os.arch") %>
         </td>
     </tr>
     <tr>
-        <td class="c1">Locale / Timezone:</td>
+        <td class="c1"><fmt:message key="index.local" /></td>
         <td class="c2">
             <%= JiveGlobals.getLocale() %> / <%= JiveGlobals.getTimeZone().getDisplayName(JiveGlobals.getLocale()) %>
             (<%= (JiveGlobals.getTimeZone().getRawOffset()/1000/60/60) %> GMT)

src/web/license-details.jsp

@@ -45,15 +45,15 @@
 %>
 
 <p>
-The following is a summary of your <fmt:message key="short.title" /> license.
+<fmt:message key="license.details.info" /> <fmt:message key="short.title" /> <fmt:message key="license.details.info1" />
 </p>
 
 
 <table class="box" cellpadding="3" cellspacing="1" border="0" width="600">
-<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" /> License Details</td></tr>
+<tr class="tableHeaderBlue"><td colspan="2" align="center"><fmt:message key="short.title" /> <fmt:message key="license.details.details" /></td></tr>
 <tr>
     <td class="jive-label">
-        License Type:
+        <fmt:message key="license.details.type" />
     </td>
     <td>
 
@@ -61,20 +61,20 @@ The following is a summary of your <fmt:message key="short.title" /> license.
 </tr>
 <tr>
     <td class="jive-label">
-        Maximum Allowable Sessions:
+        <fmt:message key="license.details.max_session" />
     </td>
     <td>
-       Unlimited
+       <fmt:message key="license.details.unlimited" />
     </td>
 </tr>
 <tr>
     <td class="jive-label">
-        Expiration Date:
+        <fmt:message key="license.details.expiration_date" />
     </td>
     <td>
 
 
-            Never
+            <fmt:message key="license.details.expiration_date_never" />
 
 
     </td>

src/web/log.jsp

@@ -21,6 +21,7 @@
     errorPage="error.jsp"
 %>
 
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <%!
@@ -183,7 +184,7 @@
 <div class="log">
 <table cellpadding="1" cellspacing="0" border="0" width="100%">
 <tr>
-    <th class="head-num">line</th>
+    <th class="head-num"><fmt:message key="log.line" /></th>
     <th>&nbsp;</th>
 </tr>
 <tr>

src/web/login.jsp

@@ -91,7 +91,7 @@
 
 <html>
 <head>
-	<title><%= AdminConsole.getAppName() %> Admin Console</title>
+	<title><%= AdminConsole.getAppName() %> <fmt:message key="login.title" /></title>
 	<script language="JavaScript" type="text/javascript">
 		<!--
 		// break out of frames
@@ -174,7 +174,7 @@
                     ></div></td>
                 <td colspan="3"
                     ><div id="jive-login-text-image"
-                    ><img src="images/login-text.gif" width="237" height="28" border="0" alt="Admin Console Login"
+                    ><img src="images/login-text.gif" width="237" height="28" border="0" alt="<fmt:message key="login.hint" />"
                     ></div></td>
             </tr>
 
@@ -186,9 +186,7 @@
                             <td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td>
                             <td>
                                 <div class="jive-error-text" style="padding-left:5px;">
-                                Error: You don't have JavaScript enabled. This tool uses JavaScript
-                                and much of it will not work correctly without it enabled. Please turn
-                                JavaScript back on and reload this page.
+                                <fmt:message key="login.error" />
                                 </div>
                             </td>
                         </tr>
@@ -206,8 +204,7 @@
                             <td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td>
                             <td>
                                 <div class="jive-error-text" style="padding-left:5px;">
-                                Login failed: make sure your username and password are correct
-                                and that you're an admin or moderator.
+																<fmt:message key="login.failed" />
                                 </div>
                             </td>
                         </tr>
@@ -231,12 +228,12 @@
             <tr valign="top">
                 <td class="jive-login-label">
                     <label for="u01">
-                    username
+                    <fmt:message key="login.username" />
                     </label>
                 </td>
                 <td class="jive-login-label">
                     <label for="p01">
-                    password
+                    <fmt:message key="login.password" />
                     </label>
                 </td>
                 <td>
@@ -249,7 +246,7 @@
             <tr class="jive-footer">
                 <td colspan="3" nowrap>
                     <span style="font-size:0.8em;">
-                    <%= AdminConsole.getAppName() %>, Version: <%= AdminConsole.getVersionString() %>
+                    <%= AdminConsole.getAppName() %>, <fmt:message key="login.version" />: <%= AdminConsole.getVersionString() %>
                     </span>
                 </td>
             </tr>

src/web/logviewer.jsp

@@ -21,7 +21,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
@@ -195,7 +195,7 @@
 %>
 
 <%  // Title of this page and breadcrumbs
-    String title = "Log Viewer";
+    String title = LocaleUtils.getLocalizedString("logviewer.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "logviewer.jsp?log=" + log));
@@ -249,7 +249,7 @@ IFRAME {
         <td class="jive-spacer" width="1%">&nbsp;</td>
         <td class="jive-tab<%= (("error".equals(log))?"-active":"") %>" width="1%">
             <a href="logviewer.jsp?log=error"
-            >Error</a>
+            ><fmt:message key="logviewer.error" /></a>
             <span class="new">
             <%= ((newlogs.containsKey("error"))?"*":"") %>
             </span>
@@ -257,7 +257,7 @@ IFRAME {
         <td class="jive-spacer" width="1%">&nbsp;</td>
         <td class="jive-tab<%= (("warn".equals(log))?"-active":"") %>" width="1%">
             <a href="logviewer.jsp?log=warn"
-            >Warn</a>
+            ><fmt:message key="logviewer.warn" /></a>
             <span class="new">
             <%= ((newlogs.containsKey("warn"))?"*":"") %>
             </span>
@@ -265,7 +265,7 @@ IFRAME {
         <td class="jive-spacer" width="1%">&nbsp;</td>
         <td class="jive-tab<%= (("info".equals(log))?"-active":"") %>" width="1%">
             <a href="logviewer.jsp?log=info"
-            >Info</a>
+            ><fmt:message key="logviewer.info" /></a>
             <span class="new">
             <%= ((newlogs.containsKey("info"))?"*":"") %>
             </span>
@@ -273,7 +273,7 @@ IFRAME {
         <td class="jive-spacer" width="1%">&nbsp;</td>
         <td class="jive-tab<%= (("debug".equals(log))?"-active":"") %>" width="1%">
             <a href="logviewer.jsp?log=debug"
-            >Debug</a>
+            ><fmt:message key="logviewer.debug" /></a>
             <span class="new">
             <%= ((newlogs.containsKey("debug"))?"*":"") %>
             </span>
@@ -297,25 +297,25 @@ IFRAME {
         <td>
             <table cellpadding="3" cellspacing="0" border="0" width="100%">
             <tr>
-                <td nowrap>Log File:</td>
+                <td nowrap><fmt:message key="logviewer.log" /></td>
                 <td nowrap><b><%= logFile.getName() %></b> (<%= byteFormatter.format(logFile.length()) %>)</td>
                 <td width="96%" rowspan="3">&nbsp;</td>
-                <td nowrap>Order:</td>
+                <td nowrap><fmt:message key="logviewer.order" /></td>
                 <td nowrap>
                     <input type="radio" name="mode" value="asc"<%= ("asc".equals(mode)?" checked":"") %>
                      onclick="this.form.submit();" id="rb01"
-                     ><label for="rb01">Normal</label>
+                     ><label for="rb01"><fmt:message key="logviewer.normal" /></label>
                     <input type="radio" name="mode" value="desc"<%= ("desc".equals(mode)?" checked":"") %>
                      onclick="this.form.submit();" id="rb02"
-                     ><label for="rb02">Reverse</label>
+                     ><label for="rb02"><fmt:message key="logviewer.reverse" /></label>
                 </td>
             </tr>
             <tr>
-                <td nowrap>Last Modified:</td>
+                <td nowrap><fmt:message key="logviewer.modified" /></td>
                 <td nowrap>
                     <span><%= dateFormatter.format(lastMod) %></span>
                 </td>
-                <td nowrap>Lines:</td>
+                <td nowrap><fmt:message key="logviewer.line" /></td>
                 <td nowrap>
                     <select name="lines" size="1"
                      onchange="this.form.submit();">
@@ -326,7 +326,7 @@ IFRAME {
 
                         <%  } %>
                             <option value="All"<%= (("All".equals(numLinesParam))?" selected":"") %>
-                             >All
+                             ><fmt:message key="logviewer.all" />
                     </select>
                 </td>
             </tr>
@@ -354,25 +354,25 @@ IFRAME {
                     <tbody>
                         <tr>
                             <td class="icon">
-                                <a href="#" onclick="if (confirm('Are you sure you want to clear this log file?')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"><img src="images/delete-16x16.gif" border="0" alt="Clear Log"></a>
+                                <a href="#" onclick="if (confirm('<fmt:message key="logviewer.confirm" />')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"><img src="images/delete-16x16.gif" border="0" alt="<fmt:message key="logviewer.alt_clear" />"></a>
                             </td>
                             <td class="icon-label">
-                                <a href="#" onclick="if (confirm('Are you sure you want to clear this log file?')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"
-                                 >Clear</a>
+                                <a href="#" onclick="if (confirm('<fmt:message key="logviewer.clear" />')) {setLog('clearLog'); document.logViewer.submit(); return true;} else { return false; }"
+                                 ><fmt:message key="logviewer.clear" /></a>
                             </td>
                             <td class="icon">
-                                <a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"><img src="images/mark-16x16.gif" border="0" alt="Mark Log"></a>
+                                <a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"><img src="images/mark-16x16.gif" border="0" alt="<fmt:message key="logviewer.alt_mark" />"></a>
                             </td>
                             <td class="icon-label">
                                 <a href="#" onclick="setLog('markLog'); document.logViewer.submit(); return true;"
-                                 >Mark</a>
+                                 ><fmt:message key="logviewer.mark" /></a>
                             </td>
                         </tr>
                     </tbody>
                     </table>
                     </div>
                 </td>
-                <td nowrap>Refresh:</td>
+                <td nowrap><fmt:message key="logviewer.refresh" /></td>
                 <td nowrap>
                     <select size="1" name="refresh" onchange="this.form.submit();">
                     <%  for (int j=0; j<REFRESHES.length; j++) {
@@ -382,7 +382,7 @@ IFRAME {
 
                     <%  } %>
                     </select>
-                    (seconds)
+                    (<fmt:message key="logviewer.seconds" />)
                 </td>
             </tr>
 
@@ -394,13 +394,13 @@ IFRAME {
                         <table cellpadding="0" cellspacing="0" border="0" width="100%">
                         <tr>
                             <td width="1%" nowrap>
-                                Debug Log: &nbsp;
+                                <fmt:message key="logviewer.debug_log" />: &nbsp;
                             </td>
                             <td width="1%">
                                 <input type="radio" name="debugEnabled" value="true"<%= ((debugEnabled) ? " checked" : "") %> id="de01">
                             </td>
                             <td width="1%" nowrap>
-                                <label for="de01">Enabled</label> &nbsp;
+                                <label for="de01"><fmt:message key="logviewer.enabled" /></label> &nbsp;
                             </td>
                             <td width="1%">
                                 <input type="radio" name="debugEnabled" value="false"<%= ((!debugEnabled) ? " checked" : "") %> id="de02">

src/web/muc-create-permission.jsp

@@ -19,7 +19,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -84,7 +84,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Room Creation Permissions";
+    String title = LocaleUtils.getLocalizedString("muc.create.permission.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-create-permission.jsp"));
@@ -94,7 +94,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Use the form below to configure the policy for who can create group chat rooms.
+<fmt:message key="muc.create.permission.info" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -104,7 +104,7 @@ Use the form below to configure the policy for who can create group chat rooms.
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error adding the user. Please verify the JID is correct.
+        <fmt:message key="muc.create.permission.error" />
         </td></tr>
     </tbody>
     </table>
@@ -119,15 +119,15 @@ Use the form below to configure the policy for who can create group chat rooms.
         <td class="jive-icon-label">
         <%  if (success) { %>
 
-            Settings updated successfully.
+            <fmt:message key="muc.create.permission.update" />
 
         <%  } else if (addsuccess) { %>
 
-            User added successfully.
+            <fmt:message key="muc.create.permission.add_user" />
 
         <%  } else if (deletesuccess) { %>
 
-            User removed successfully.
+            <fmt:message key="muc.create.permission.user_removed" />
 
         <%  } %>
         </td></tr>
@@ -140,7 +140,7 @@ Use the form below to configure the policy for who can create group chat rooms.
 <form action="muc-create-permission.jsp?save" method="post">
 
 <fieldset>
-    <legend>Permission Policy</legend>
+    <legend><fmt:message key="muc.create.permission.policy" /></legend>
     <div>
         <table cellpadding="3" cellspacing="0" border="0" width="100%">
         <tbody>
@@ -150,7 +150,7 @@ Use the form below to configure the policy for who can create group chat rooms.
                      <%= ((!mucServer.isRoomCreationRestricted()) ? "checked" : "") %>>
                 </td>
                 <td width="99%">
-                    <label for="rb01">Anyone can create a chat room.</label>
+                    <label for="rb01"><fmt:message key="muc.create.permission.anyone_created" /></label>
                 </td>
             </tr>
             <tr>
@@ -160,7 +160,7 @@ Use the form below to configure the policy for who can create group chat rooms.
                      <%= ((mucServer.isRoomCreationRestricted()) ? "checked" : "") %>>
                 </td>
                 <td width="99%">
-                    <label for="rb02">Only specific users can create a chat room.</label>
+                    <label for="rb02"><fmt:message key="muc.create.permission.specific_created" /></label>
                 </td>
             </tr>
         </tbody>
@@ -179,10 +179,10 @@ Use the form below to configure the policy for who can create group chat rooms.
     <form action="muc-create-permission.jsp?add" method="post">
 
     <fieldset>
-        <legend>Allowed Users</legend>
+        <legend><fmt:message key="muc.create.permission.allowed_users" /></legend>
         <div>
         <p>
-        <label for="userJIDtf">Add User (JID):</label>
+        <label for="userJIDtf"><fmt:message key="muc.create.permission.add_jid" /></label>
         <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
          onclick="this.form.openPerms[1].checked=true;" id="userJIDtf">
         <input type="submit" value="Add">
@@ -201,7 +201,7 @@ Use the form below to configure the policy for who can create group chat rooms.
 
                 <tr>
                     <td colspan="2">
-                        No allowed users, use the form above to add one.
+                        <fmt:message key="muc.create.permission.no_allowed_users" />
                     </td>
                 </tr>
 
@@ -216,8 +216,8 @@ Use the form below to configure the policy for who can create group chat rooms.
                     </td>
                     <td width="1%" align="center">
                         <a href="muc-create-permission.jsp?userJID=<%= user %>&delete=true"
-                         title="Click to delete..."
-                         onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                         title="<fmt:message key="muc.create.permission.click_title" />"
+                         onclick="return confirm('<fmt:message key="muc.create.permission.confirm_remove" />');"
                          ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                     </td>
                 </tr>

src/web/muc-room-affiliations.jsp

@@ -21,7 +21,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -106,7 +106,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "User Permissions";
+    String title = LocaleUtils.getLocalizedString("muc.room.affiliations.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Room Permissions", "muc-room-affiliations.jsp?roomName="+roomName));
@@ -117,12 +117,9 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below is the list of room owners, administrators, members and outcasts of the the room
+<fmt:message key="muc.room.affiliations.info" />
 <b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b>.
-Room owners can alter the room configuration, grant ownership and administrative privileges to users
-and destroy the room. Room administrators can ban, grant membership and moderator privileges to
-users. Room members are the only allowed users to join the room when it is configured as members-only.
-Whilst room outcasts are users who have been banned from the room.
+<fmt:message key="muc.room.affiliations.info_detail" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -134,15 +131,15 @@ Whilst room outcasts are users who have been banned from the room.
         <td class="jive-icon-label">
         <%  if (errors.containsKey("ConflictException")) { %>
 
-        Error removing the user. The room must have at least one owner.
+        <fmt:message key="muc.room.affiliations.error_removing_user" />
 
         <%  } else if (errors.containsKey("NotAllowedException")) { %>
 
-        Error banning the user. Owners or Administratos cannot be banned.
+        <fmt:message key="muc.room.affiliations.error_banning_user" />
 
         <%  } else { %>
 
-        Error adding the user. Please verify the JID is correct.
+        <fmt:message key="muc.room.affiliations.error_adding_user" />
 
         <%  } %>
         </td></tr>
@@ -159,11 +156,11 @@ Whilst room outcasts are users who have been banned from the room.
         <td class="jive-icon-label">
         <%  if (addsuccess) { %>
 
-            User added successfully.
+            <fmt:message key="muc.room.affiliations.user_added" />
 
         <%  } else if (deletesuccess) { %>
 
-            User removed successfully.
+            <fmt:message key="muc.room.affiliations.user_removed" />
 
         <%  } %>
         </td></tr>
@@ -177,16 +174,16 @@ Whilst room outcasts are users who have been banned from the room.
 <input type="hidden" name="roomName" value="<%= roomName %>">
 
 <fieldset>
-    <legend>User Permissions</legend>
+    <legend><fmt:message key="muc.room.affiliations.permission" /></legend>
     <div>
     <p>
-    <label for="memberJID">Add User (JID):</label>
+    <label for="memberJID"><fmt:message key="muc.room.affiliations.add_jid" /></label>
     <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>" id="memberJID">
     <select name="affiliation">
-        <option value="owner">Owner</option>
-        <option value="admin">Admin</option>
-        <option value="member">Member</option>
-        <option value="outcast">Outcast</option>
+        <option value="owner"><fmt:message key="muc.room.affiliations.owner" /></option>
+        <option value="admin"><fmt:message key="muc.room.affiliations.admin" /></option>
+        <option value="member"><fmt:message key="muc.room.affiliations.member" /></option>
+        <option value="outcast"><fmt:message key="muc.room.affiliations.outcast" /></option>
     </select>
     <input type="submit" value="Add">
     </p>
@@ -195,20 +192,20 @@ Whilst room outcasts are users who have been banned from the room.
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <thead>
         <tr>
-            <th colspan="2">User</th>
-            <th width="1%">Delete</th>
+            <th colspan="2"><fmt:message key="muc.room.affiliations.user" /></th>
+            <th width="1%"><fmt:message key="muc.room.affiliations.delete" /></th>
         </tr>
     </thead>
     <tbody>
     <%-- Add owners section --%>
             <tr>
-                <td colspan="2"><b>Room Owners</b></td>
+                <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_owner" /></b></td>
                 <td>&nbsp;</td>
             </tr>
 
         <%  if (room.getOwners().isEmpty()) { %>
             <tr>
-                <td colspan="2" align="center"><i>No Users</i></td>
+                <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
                 <td>&nbsp;</td>
             </tr>
         <%  }
@@ -222,21 +219,21 @@ Whilst room outcasts are users who have been banned from the room.
                 </td>
                 <td width="1%" align="center">
                     <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=owner"
-                     title="Click to delete..."
-                     onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                     title="<fmt:message key="muc.room.affiliations.click_delete" />"
+                     onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
                      ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                 </td>
             </tr>
         <%  } } %>
     <%-- Add admins section --%>
             <tr>
-                <td colspan="2"><b>Room Admins</b></td>
+                <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_admin" /></b></td>
                 <td>&nbsp;</td>
             </tr>
 
         <%  if (room.getAdmins().isEmpty()) { %>
             <tr>
-                <td colspan="2" align="center"><i>No Users</i></td>
+                <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
                 <td>&nbsp;</td>
             </tr>
         <%  }
@@ -250,21 +247,21 @@ Whilst room outcasts are users who have been banned from the room.
                 </td>
                 <td width="1%" align="center">
                     <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=admin"
-                     title="Click to delete..."
-                     onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                     title="<fmt:message key="muc.room.affiliations.click_delete" />"
+                     onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
                      ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                 </td>
             </tr>
         <%  } } %>
     <%-- Add members section --%>
             <tr>
-                <td colspan="2"><b>Room Members</b></td>
+                <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_member" /></b></td>
                 <td>&nbsp;</td>
             </tr>
 
         <%  if (room.getMembers().isEmpty()) { %>
             <tr>
-                <td colspan="2" align="center"><i>No Users</i></td>
+                <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
                 <td>&nbsp;</td>
             </tr>
         <%  }
@@ -280,21 +277,21 @@ Whilst room outcasts are users who have been banned from the room.
                 </td>
                 <td width="1%" align="center">
                     <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=member"
-                     title="Click to delete..."
-                     onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                     title="<fmt:message key="muc.room.affiliations.click_delete" />"
+                     onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
                      ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                 </td>
             </tr>
         <%  } } %>
     <%-- Add outcasts section --%>
             <tr>
-                <td colspan="2"><b>Room Outcasts</b></td>
+                <td colspan="2"><b><fmt:message key="muc.room.affiliations.room_outcast" /></b></td>
                 <td>&nbsp;</td>
             </tr>
 
         <%  if (room.getOutcasts().isEmpty()) { %>
             <tr>
-                <td colspan="2" align="center"><i>No Users</i></td>
+                <td colspan="2" align="center"><i><fmt:message key="muc.room.affiliations.no_users" /></i></td>
                 <td>&nbsp;</td>
             </tr>
         <%  }
@@ -308,8 +305,8 @@ Whilst room outcasts are users who have been banned from the room.
                 </td>
                 <td width="1%" align="center">
                     <a href="muc-room-affiliations.jsp?roomName=<%= roomName %>&userJID=<%= user %>&delete=true&affiliation=outcast"
-                     title="Click to delete..."
-                     onclick="return confirm('Are you sure you want to remove this user from the list?');"
+                     title="<fmt:message key="muc.room.affiliations.click_delete" />"
+                     onclick="return confirm('<fmt:message key="muc.room.affiliations.confirm_removed" />');"
                      ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
                 </td>
             </tr>

src/web/muc-room-delete.jsp

@@ -16,7 +16,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <% webManager.init(request, response, session, application, out ); %>
 
@@ -51,7 +51,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Destroy Room";
+    String title = LocaleUtils.getLocalizedString("muc.room.delete.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-delete.jsp?roomName="+roomName));
@@ -62,23 +62,22 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Are you sure you want to destroy the room
+<fmt:message key="muc.room.delete.info" />
 <b><a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"><%= room.getName() %></a></b>
-from the system? You may specify a reason for the room destruction and an alternative room
-address that will replace this room. This information will be sent to room occupants.
+<fmt:message key="muc.room.delete.detail" />
 </p>
 
 <form action="muc-room-delete.jsp">
 <input type="hidden" name="roomName" value="<%= roomName %>">
 
 <fieldset>
-    <legend>Destruction Details</legend>
+    <legend><fmt:message key="muc.room.delete.destructon_title" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
         <tr>
             <td class="c1">
-                Room ID:
+                <fmt:message key="muc.room.delete.room_id" />
             </td>
             <td>
                 <%= room.getName() %>
@@ -86,7 +85,7 @@ address that will replace this room. This information will be sent to room occup
         </tr>
         <tr>
             <td class="c1">
-                Reason:
+                <fmt:message key="muc.room.delete.reason" />
             </td>
             <td>
                 <input type="text" size="50" maxlength="150" name="reason">
@@ -94,7 +93,7 @@ address that will replace this room. This information will be sent to room occup
         </tr>
         <tr>
             <td class="c1">
-                Alternate Room Address:
+                <fmt:message key="muc.room.delete.alternate_address" />
             </td>
             <td>
                 <input type="text" size="30" maxlength="150" name="alternateJID">

src/web/muc-room-summary.jsp

@@ -19,13 +19,13 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <% webManager.init(request, response, session, application, out ); %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Group Chat Rooms";
+    String title = LocaleUtils.getLocalizedString("muc.room.summary.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "muc-room-summary.jsp"));
@@ -56,8 +56,7 @@
 %>
 
 <p>
-Below is an overview of the Group Chat Rooms in the system. From here you can view the rooms, edit their
-properties, and create new rooms.
+<fmt:message key="muc.room.summary.info" />
 </p>
 
 <%  if (request.getParameter("deletesuccess") != null) { %>
@@ -67,7 +66,7 @@ properties, and create new rooms.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Room destroyed successfully.
+        <fmt:message key="muc.room.summary.destroyed" />
         </td></tr>
     </tbody>
     </table>
@@ -76,19 +75,19 @@ properties, and create new rooms.
 <%  } %>
 
 <p>
-Total Rooms: <%= roomsCount %>,
+<fmt:message key="muc.room.summary.total_room" />: <%= roomsCount %>,
 <%  if (numPages > 1) { %>
 
-    Showing <%= (start+1) %>-<%= (maxRoomIndex) %>,
+    <fmt:message key="muc.room.summary.showing" /> <%= (start+1) %>-<%= (maxRoomIndex) %>,
 
 <%  } %>
-Sorted by Room ID
+<fmt:message key="muc.room.summary.sorted_id" />
 </p>
 
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="muc.room.summary.page" />:
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -109,12 +108,12 @@ Sorted by Room ID
 <thead>
     <tr>
         <th>&nbsp;</th>
-        <th>Room</th>
-        <th>Description</th>
-        <th>Persistent</th>
-        <th>Users</th>
-        <th>Edit</th>
-        <th>Destroy</th>
+        <th><fmt:message key="muc.room.summary.room" /></th>
+        <th><fmt:message key="muc.room.summary.description" /></th>
+        <th><fmt:message key="muc.room.summary.persistent" /></th>
+        <th><fmt:message key="muc.room.summary.users" /></th>
+        <th><fmt:message key="muc.room.summary.edit" /></th>
+        <th><fmt:message key="muc.room.summary.destroy" /></th>
     </tr>
 </thead>
 <tbody>
@@ -125,7 +124,7 @@ Sorted by Room ID
 %>
     <tr>
         <td align="center" colspan="7">
-            No rooms in the Group Chat service.
+            <fmt:message key="muc.room.summary.no_room_in_group" />
         </td>
     </tr>
 
@@ -153,9 +152,9 @@ Sorted by Room ID
         </td>
         <td width="1%" align="center">
                 <% if (room.isPersistent()) { %>
-                <img src="images/tape.gif" width="16" height="16" border="0" alt="Room is persistent">
+                <img src="images/tape.gif" width="16" height="16" border="0" alt="<fmt:message key="muc.room.summary.alt_persistent" />">
                 <% } else { %>
-                <img src="images/blank.gif" width="16" height="16" border="0" alt="Room is temporary">
+                <img src="images/blank.gif" width="16" height="16" border="0" alt="<fmt:message key="muc.room.summary.alt_temporary" />">
                 <% } %>
         </td>
         <td width="1%" align="center">
@@ -163,12 +162,12 @@ Sorted by Room ID
         </td>
         <td width="1%" align="center">
             <a href="muc-room-edit-form.jsp?roomName=<%= room.getName() %>"
-             title="Click to edit..."
+             title="<fmt:message key="muc.room.summary.click_edit" />"
              ><img src="images/edit-16x16.gif" width="17" height="17" border="0"></a>
         </td>
         <td width="1%" align="center" style="border-right:1px #ccc solid;">
             <a href="muc-room-delete.jsp?roomName=<%= room.getName() %>"
-             title="Click to delete..."
+             title="<fmt:message key="muc.room.summary.click_delete" />"
              ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
@@ -183,7 +182,7 @@ Sorted by Room ID
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="muc.room.summary.page" />:
     [
     <%  for (i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";

src/web/muc-server-props-edit-form.jsp

@@ -88,7 +88,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-            <fmt:message key="groupchat.service.properties.saved_successfully" />
+            <fmt:message key="groupchat.service.properties.saved_successfully" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="groupchat.service.properties.saved_successfully2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
         </td></tr>
     </tbody>
     </table>

src/web/muc-tasks.jsp

@@ -19,7 +19,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager" />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -108,7 +108,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Other Settings";
+    String title = LocaleUtils.getLocalizedString("muc.tasks.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Other Settings", "muc-tasks.jsp"));
@@ -118,8 +118,7 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Use the forms below to configure settings for kicking idle users from group chat rooms and to
-configure the task that logs room conversations to the database.
+<fmt:message key="muc.tasks.info" />
 </p>
 
 <%  if (kickSettingSuccess || logSettingSuccess) { %>
@@ -131,11 +130,11 @@ configure the task that logs room conversations to the database.
         <td class="jive-icon-label">
         <%  if (kickSettingSuccess) { %>
 
-            Idle user settings updated successfully.
+            <fmt:message key="muc.tasks.update" />
 
         <%  } else if (logSettingSuccess) { %>
 
-            Conversation logging settings updated successfully.
+            <fmt:message key="muc.tasks.log" />
 
         <%  } %>
         </td></tr>
@@ -152,13 +151,13 @@ configure the task that logs room conversations to the database.
     <td width="99%" class="jive-error-text">
 
 		<% if (errors.get("idletime") != null) { %>
-                Please enter a valid number for max idle minutes.
+                <fmt:message key="muc.tasks.valid_idel_minutes" />
         <% }
            else if (errors.get("logfreq") != null) { %>
-                Please enter a valid number for the frequency.
+                <fmt:message key="muc.tasks.valid_frequency" />
         <%  }
             else if (errors.get("logbatchsize") != null) { %>
-                Please enter a valid number for the batch size.
+                <fmt:message key="muc.tasks.valid_batch" />
             <%  } %>
     </td>
     </tr>
@@ -169,7 +168,7 @@ configure the task that logs room conversations to the database.
 <form action="muc-tasks.jsp?kickSettings" method="post">
 
 <fieldset>
-    <legend>Idle User Settings</legend>
+    <legend><fmt:message key="muc.tasks.user_setting" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -179,7 +178,7 @@ configure the task that logs room conversations to the database.
                  <%= ((mucServer.getUserIdleTime() < 0) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb01">Never kick idle users.</label>
+                <label for="rb01"><fmt:message key="muc.tasks.never_kick" /></label>
             </td>
         </tr>
         <tr valign="middle">
@@ -188,11 +187,11 @@ configure the task that logs room conversations to the database.
                  <%= ((mucServer.getUserIdleTime() > -1) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                    <label for="rb02">Kick users after they have been idle for</label>
+                    <label for="rb02"><fmt:message key="muc.tasks.kick_user" /></label>
                      <input type="text" name="idletime" size="5" maxlength="5"
                          onclick="this.form.kickEnabled[1].checked=true;"
                          value="<%= mucServer.getUserIdleTime() == -1 ? 30 : mucServer.getUserIdleTime() / 1000 / 60 %>">
-                     minutes.
+                     <fmt:message key="muc.tasks.minutes" />
             </td>
         </tr>
     </tbody>
@@ -211,12 +210,12 @@ configure the task that logs room conversations to the database.
 <form action="muc-tasks.jsp?logSettings" method="post">
 
 <fieldset>
-    <legend>Conversation Logging</legend>
+    <legend><fmt:message key="muc.tasks.conversation.logging" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tr valign="middle">
         <td width="1%" nowrap class="c1">
-            Flush interval (seconds):
+            <fmt:message key="muc.tasks.flush" />
         </td>
         <td width="99%">
             <input type="text" name="logfreq" size="15" maxlength="50"
@@ -225,7 +224,7 @@ configure the task that logs room conversations to the database.
     </tr>
     <tr valign="middle">
         <td width="1%" nowrap class="c1">
-            Batch size:
+            <fmt:message key="muc.tasks.batch" />
         </td>
         <td width="99%">
             <input type="text" name="logbatchsize" size="15" maxlength="50"

src/web/offline-messages.jsp

@@ -29,7 +29,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Offline Messages";
+    String title = LocaleUtils.getLocalizedString("offline.messages.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "offline-messages.jsp"));
@@ -158,7 +158,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="offline.messages.update" />
         </td></tr>
     </tbody>
     </table>
@@ -185,22 +185,18 @@
 <%  } %>
 
 <p>
-XMPP provides the option for servers to store-and-forward IM messages when they are sent to a
-user that is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient
-feature of an XMPP deployment. However, offline messages, like email, can take up a significant
-amount of space on a server. There are several options for handling offline messages; select
-the policy that best suites your needs.
+<fmt:message key="offline.messages.info" />
 </p>
 
 <p>
-Current size of all offline message:
+<fmt:message key="offline.messages.size" />
 <b><%= format.format(OfflineMessageStore.getInstance().getSize()/1024.0/1024.0) %> MB</b>
 </p>
 
 <form action="offline-messages.jsp">
 
 <fieldset>
-    <legend>Offline Message Policy</legend>
+    <legend><fmt:message key="offline.messages.policy" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -210,8 +206,7 @@ Current size of all offline message:
                  <%= ((strategy==BOUNCE) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb01"><b>Bounce</b></label> - Never store offline messages and bounce
-                messages back to the sender.
+                <label for="rb01"><b>Bounce</b></label> - <fmt:message key="offline.messages.never_back" />
             </td>
         </tr>
         <tr valign="top">
@@ -220,8 +215,7 @@ Current size of all offline message:
                  <%= ((strategy==DROP) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb02"><b>Drop</b></label> - Never store offline messages and drop
-                messages so the sender is not notified.
+                <label for="rb02"><b>Drop</b></label> - <fmt:message key="offline.messages.never_store" />
             </td>
         </tr>
         <tr valign="top" class="">
@@ -230,9 +224,7 @@ Current size of all offline message:
                  <%= ((strategy==STORE) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb03"><b>Store</b></label> - Store offline messages for later
-                retrieval. Messages will be delivered the next time the recipient logs in.
-                Choose a storage policy and storage store max size below.
+                <label for="rb03"><b>Store</b></label> - <fmt:message key="offline.messages.storage_messenger" />
             </td>
         </tr>
         <tr valign="top">
@@ -249,8 +241,7 @@ Current size of all offline message:
                          <%= ((storeStrategy==ALWAYS_STORE) ? "checked" : "") %>>
                     </td>
                     <td width="99%">
-                        <label for="rb05"><b>Always Store</b></label> - Always store messages,
-                        even if the max storage size has been exceeded.
+                        <label for="rb05"><b><fmt:message key="offline.messages.always_store" /></b></label> - <fmt:message key="offline.messages.always_store_info" />
                     </td>
                 </tr>
                 <tr valign="top">
@@ -260,9 +251,7 @@ Current size of all offline message:
                          <%= ((storeStrategy==STORE_AND_BOUNCE) ? "checked" : "") %>>
                     </td>
                     <td width="99%">
-                        <label for="rb06"><b>Store or Bounce</b></label> - Store messages
-                        up to the max storage size. After the max size has been exceeded, bounce
-                        the message back to the sender.
+                        <label for="rb06"><b><fmt:message key="offline.messages.bounce" /></b></label> - <fmt:message key="offline.messages.bounce_info" />
                     </td>
                 </tr>
                 <tr valign="top">
@@ -272,14 +261,12 @@ Current size of all offline message:
                          <%= ((storeStrategy==STORE_AND_DROP) ? "checked" : "") %>>
                     </td>
                     <td width="99%">
-                        <label for="rb07"><b>Store or Drop</b></label> - Store messages
-                        for a user up to the max storage size. After the max size has been exceeded,
-                        silently drop messages.
+                        <label for="rb07"><b><fmt:message key="offline.messages.drop" /></b></label> - <fmt:message key="offline.messages.drop_info" />
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2">
-                        Per-user offline message storage limit:
+                        <fmt:message key="offline.messages.storage_limit" />
                         <input type="text" size="5" maxlength="12" name="quota"
                          value="<%= (quota>0 ? ""+format.format(quota) : "") %>"
                          onclick="this.form.strategy[2].checked=true;">

src/web/private-data-settings.jsp

@@ -17,13 +17,13 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Private Data";
+    String title = LocaleUtils.getLocalizedString("private.data.settings.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "private-data-settings.jsp"));
@@ -48,7 +48,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="private.data.settings.update" />
         </td></tr>
     </tbody>
     </table>
@@ -64,16 +64,13 @@
 %>
 
 <p>
-Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users
-can log into their account and their settings will follow them around (as opposed to having the
-clients store the settings on the local computer where their settings will not follow them). You
-may enable or disable this feature.
+<fmt:message key="private.data.settings.info" />
 </p>
 
 <form action="private-data-settings.jsp">
 
 <fieldset>
-    <legend>Set Private Data Policy</legend>
+    <legend><fmt:message key="private.data.settings.policy" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -84,7 +81,8 @@ may enable or disable this feature.
             </td>
             <td width="99%">
                 <label for="rb01">
-                <b>Enable Private Data Storage</b> - allow clients to store information on the server.
+                <b><fmt:message key="private.data.settings.enable_storage" /></b> - 
+                <fmt:message key="private.data.settings.enable_storage_info" />
                 </label>
             </td>
         </tr>
@@ -95,7 +93,8 @@ may enable or disable this feature.
             </td>
             <td width="99%">
                 <label for="rb02">
-                <b>Disable Private Data Storage</b> - do not allow server-side storage.
+                <b><fmt:message key="private.data.settings.disable_storage" /></b> - 
+                <fmt:message key="private.data.settings.disable_storage_info" />
                 </label>
             </td>
         </tr>

src/web/reg-settings.jsp

@@ -12,18 +12,19 @@
 <%@ page import="org.jivesoftware.util.ParamUtils,
                  org.jivesoftware.messenger.handler.IQRegisterHandler,
                  org.jivesoftware.messenger.handler.IQAuthHandler,
-                 org.jivesoftware.admin.AdminPageBean"
+                 org.jivesoftware.admin.AdminPageBean,
+                 org.jivesoftware.util.LocaleUtils"
     errorPage="error.jsp"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Registration Settings";
+    String title = LocaleUtils.getLocalizedString("reg.settings.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "reg-settings.jsp"));
@@ -58,7 +59,7 @@
 %>
 
 <p>
-Use the forms below to change various aspects of user registration and login.
+<fmt:message key="reg.settings.info" />
 </p>
 
 <form action="reg-settings.jsp">
@@ -70,7 +71,7 @@ Use the forms below to change various aspects of user registration and login.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="reg.settings.update" />
         </td></tr>
     </tbody>
     </table>
@@ -79,14 +80,10 @@ Use the forms below to change various aspects of user registration and login.
 </c:if>
 
 <fieldset>
-    <legend>Inband Account Registration</legend>
+    <legend><fmt:message key="reg.settings.inband_account" /></legend>
     <div>
     <p>
-    Inband account registration allows users to create accounts on the server automatically using most
-    clients. It does not affect the ability to create new accounts through this web administration
-    interface. Administrators may want to disable this option so users are required to register by
-    other means (e.g. sending requests to the server administrator or through your own custom web
-    interface).
+    <fmt:message key="reg.settings.inband_account_info" />
     </p>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -96,7 +93,8 @@ Use the forms below to change various aspects of user registration and login.
                  <%= ((inbandEnabled) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb01"><b>Enabled</b></label> - Users can automatically create new accounts.
+                <label for="rb01"><b><fmt:message key="reg.settings.enable" /></b></label> - 
+                <fmt:message key="reg.settings.auto_create_user" />
             </td>
         </tr>
         <tr>

src/web/server-db.jsp

@@ -17,7 +17,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <%-- Define Administration Bean --%>
@@ -25,7 +25,7 @@
 <% admin.init(request, response, session, application, out ); %>
 
 <%  // Title of this page and breadcrumbs
-    String title = "Database Properties";
+    String title = LocaleUtils.getLocalizedString("server.db.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-db.jsp"));
@@ -42,20 +42,20 @@
 %>
 
 <p>
-Below is a list of properties for your database and the JDBC driver.
+<fmt:message key="server.db.info" />
 </p>
 
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
     <tr>
-        <th colspan="2">Database Connection Info</th>
+        <th colspan="2"><fmt:message key="server.db.connect_info" /></th>
     </tr>
 </thead>
 <tbody>
     <tr>
         <td class="c1">
-            Database and Version:
+            <fmt:message key="server.db.version" />
         </td>
         <td class="c2">
             <%= metaData.getDatabaseProductName() %>
@@ -64,7 +64,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-            JDBC Driver:
+            <fmt:message key="server.db.jdbc" />
         </td>
         <td class="c2">
             <%= metaData.getDriverName() %>
@@ -72,7 +72,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-             JDBC Driver Version:
+             <fmt:message key="server.db.jdbc_driver" />
         </td>
         <td class="c2">
             <%= metaData.getDriverVersion() %>
@@ -80,7 +80,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-            DB Connection URL:
+            <fmt:message key="server.db.connect_url" />
         </td>
         <td class="c2">
             <%= metaData.getURL() %>
@@ -88,7 +88,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-            DB User:
+            <fmt:message key="server.db.user" />
         </td>
         <td class="c2">
             <%= metaData.getUserName() %>
@@ -96,7 +96,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-            Transaction Support:
+            <fmt:message key="server.db.transaction" />
         </td>
         <td class="c2">
             <%= (metaData.supportsTransactions()) ? "Yes" : "No" %>
@@ -105,7 +105,7 @@ Below is a list of properties for your database and the JDBC driver.
     <%  if (metaData.supportsTransactions()) { %>
         <tr>
             <td class="c1">
-                Transaction Isolation Level:
+                <fmt:message key="server.db.transaction_level" />
             </td>
             <td class="c2">
                 <%  if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) { %>
@@ -134,7 +134,8 @@ Below is a list of properties for your database and the JDBC driver.
     <%  } %>
     <tr>
         <td class="c1">
-            Supports multiple connections<br>open at once:
+            <fmt:message key="server.db.multiple_connect" /><br>
+            <fmt:message key="server.db.multiple_connect2" />
         </td>
         <td class="c2">
             <%= (metaData.supportsMultipleTransactions()) ? "Yes" : "No" %>
@@ -142,7 +143,7 @@ Below is a list of properties for your database and the JDBC driver.
     </tr>
     <tr>
         <td class="c1">
-            In read-only mode:
+            <fmt:message key="server.db.read_only_mode" />
         </td>
         <td class="c2">
             <%= (metaData.isReadOnly()) ? "Yes" : "No" %>

src/web/server-properties.jsp

@@ -17,7 +17,7 @@
                  org.jivesoftware.admin.AdminPageBean"
     errorPage="error.jsp"
 %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 
 <%!
@@ -103,7 +103,7 @@
 %>
 
 <%  // Title of this page and breadcrumbs
-    String title = "System Properties";
+    String title = LocaleUtils.getLocalizedString("server.properties.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "server-properties.jsp"));
@@ -114,13 +114,10 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below is a list of the system properties. Values for password sensitive fields are hidden.
-Long property names and values are clipped. Hold your mouse over the property name to see
-the full value or to see both the full name and value, click the edit icon next to the
-property.
+<fmt:message key="server.properties.info" />
 </p>
 
-<p><b>System Properties</b></p>
+<p><b><fmt:message key="server.properties.system" /></b></p>
 
 <%  if (errors.size() > 0) { %>
 
@@ -129,7 +126,7 @@ property.
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error -- creating the property failed, see below.
+        <fmt:message key="server.properties.error" />
         </td></tr>
     </tbody>
     </table>
@@ -142,7 +139,7 @@ property.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Property saved successfully.
+        <fmt:message key="server.properties.saved" />
         </td></tr>
     </tbody>
     </table>
@@ -155,7 +152,7 @@ property.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Property deleted successfully.
+        <fmt:message key="server.properties.deleted" />
         </td></tr>
     </tbody>
     </table>
@@ -170,7 +167,7 @@ property.
     <tbody>
         <tr><td class="jive-icon"><img src="images/info-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Use the form below this table to edit the property value.
+        <fmt:message key="server.properties.edit_property" />
         </td></tr>
     </tbody>
     </table>
@@ -185,7 +182,7 @@ property.
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error deleting the property.
+        <fmt:message key="server.properties.error_deleting" />
         </td></tr>
     </tbody>
     </table>
@@ -231,10 +228,10 @@ function dodelete(propName) {
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
 <thead>
     <tr>
-        <th nowrap>Property Name</th>
-        <th nowrap>Property Value</th>
-        <th style="text-align:center;">Edit</th>
-        <th style="text-align:center;">Delete</th>
+        <th nowrap><fmt:message key="server.properties.name" /></th>
+        <th nowrap><fmt:message key="server.properties.value" /></th>
+        <th style="text-align:center;"><fmt:message key="server.properties.edit" /></th>
+        <th style="text-align:center;"><fmt:message key="server.properties.delete" /></th>
     </tr>
 </thead>
 <tbody>
@@ -243,7 +240,7 @@ function dodelete(propName) {
 
         <tr>
             <td colspan="4">
-                No properties set.
+                <fmt:message key="server.properties.no_property" />
             </td>
         </tr>
 
@@ -273,11 +270,11 @@ function dodelete(propName) {
                 </div>
             </td>
             <td align="center"><a href="#" onclick="doedit('<%= StringUtils.replace(n,"'","''") %>');"
-                ><img src="images/edit-16x16.gif" width="16" height="16" alt="Click to edit this property" border="0"></a
+                ><img src="images/edit-16x16.gif" width="16" height="16" alt="<fmt:message key="server.properties.alt_edit" />" border="0"></a
                 >
             </td>
             <td align="center"><a href="#" onclick="return dodelete('<%= StringUtils.replace(n,"'","''") %>');"
-                ><img src="images/delete-16x16.gif" width="16" height="16" alt="Click to delete this property" border="0"></a
+                ><img src="images/delete-16x16.gif" width="16" height="16" alt="<fmt:message key="server.properties.alt_delete" />" border="0"></a
                 >
             </td>
         </tr>
@@ -301,9 +298,9 @@ function dodelete(propName) {
     <tr>
         <th colspan="2">
             <%  if (edit) { %>
-                Edit property
+                <fmt:message key="server.properties.edit_property_title" />
             <%  } else { %>
-                Add new property
+                <fmt:message key="server.properties.new_property" />
             <%  } %>
         </th>
     </tr>
@@ -311,7 +308,7 @@ function dodelete(propName) {
 <tbody>
     <tr valign="top">
         <td>
-            Property Name:
+            <fmt:message key="server.properties.name" />:
         </td>
         <td>
             <%  if (edit) { %>
@@ -325,7 +322,7 @@ function dodelete(propName) {
 
                 <%  if (errors.containsKey("propName")) { %>
 
-                    <br><span class="jive-error-text">Please enter a property name.</span>
+                    <br><span class="jive-error-text"><fmt:message key="server.properties.enter_property_name" /></span>
 
                 <%  } %>
 
@@ -334,18 +331,18 @@ function dodelete(propName) {
     </tr>
     <tr valign="top">
         <td>
-            Property Value:
+            <fmt:message key="server.properties.value" />:
         </td>
         <td>
             <textarea cols="45" rows="5" name="propValue" wrap="virtual"><%= (propValue != null ? StringUtils.escapeHTMLTags(propValue) : "") %></textarea>
 
             <%  if (errors.containsKey("propValue")) { %>
 
-                <br><span class="jive-error-text">Please enter a property value.</span>
+                <br><span class="jive-error-text"><fmt:message key="server.properties.enter_property_value" /></span>
 
             <%  } else if (errors.containsKey("propValueLength")) { %>
 
-                <br><span class="jive-error-text">1000 character max.</span>
+                <br><span class="jive-error-text"><fmt:message key="server.properties.max_character" /></span>
 
             <%  } %>
         </td>

src/web/server-props.jsp

@@ -94,7 +94,7 @@
 %>
 
 <%  // Title of this page and breadcrumbs
-    String title = "Edit Server Properties";
+    String title = LocaleUtils.getLocalizedString("server.props.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Server Properties", "index.jsp"));
@@ -111,7 +111,7 @@
 </style>
 
 <p>
-Use the form below to edit server properties.
+<fmt:message key="server.props.info" />
 </p>
 
 <%  if ("true".equals(request.getParameter("success"))) { %>
@@ -121,8 +121,7 @@ Use the form below to edit server properties.
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Server properties updated successfully. You'll need to <b>restart</b> the server to have
-        the changes take effect (see <a href="index.jsp">Server Status</a>).
+        <fmt:message key="server.props.update" /> <b><fmt:message key="global.restart" /></b> <fmt:message key="server.props.update2" /> <a href="index.jsp"><fmt:message key="global.server_status" /></a>).
         </td></tr>
     </tbody>
     </table>
@@ -137,14 +136,14 @@ Use the form below to edit server properties.
 <thead>
     <tr>
         <th colspan="2">
-            Server Properties
+            <fmt:message key="server.props.property" />
         </th>
     </tr>
 </thead>
 <tbody>
     <tr>
         <td class="c1">
-            Server Name:
+            <fmt:message key="server.props.name" />
         </td>
         <td class="c2">
             <input type="text" name="serverName" value="<%= (serverName != null) ? serverName : "" %>"
@@ -152,16 +151,16 @@ Use the form below to edit server properties.
             <%  if (errors.containsKey("serverName")) { %>
                 <br>
                 <span class="jive-error-text">
-                Please enter a valid server host name or
+                <fmt:message key="server.props.valid_hostname" />
                 <a href="#" onclick="document.editform.serverName.value='<%= InetAddress.getLocalHost().getHostName() %>';"
-                 >restore the default</a>.
+                 ><fmt:message key="server.props.valid_hostname1" /></a>.
                 </span>
             <%  } %>
         </td>
     </tr>
     <tr>
         <td class="c1">
-             Port:
+             <fmt:message key="server.props.port" />
         </td>
         <td class="c2">
             <input type="text" name="port" value="<%= (port > 0 ? String.valueOf(port) : "") %>"
@@ -169,21 +168,21 @@ Use the form below to edit server properties.
             <%  if (errors.containsKey("port")) { %>
                 <br>
                 <span class="jive-error-text">
-                Please enter a valid port number or
+                <fmt:message key="server.props.valid_port" />
                 <a href="#" onclick="document.editform.port.value='5222';"
-                 >restore the default</a>.
+                 ><fmt:message key="server.props.valid_port1" /></a>.
                 </span>
             <%  } else if (errors.containsKey("portsEqual")) { %>
                 <br>
                 <span class="jive-error-text">
-                Error -- this port and the SSL port can not be equal.
+                <fmt:message key="server.props.error_port" />
                 </span>
             <%  } %>
         </td>
     </tr>
     <tr>
         <td class="c1">
-             SSL Enabled:
+              <fmt:message key="server.props.ssl" />
         </td>
         <td class="c2">
             <table cellpadding="0" cellspacing="0" border="0">
@@ -193,14 +192,14 @@ Use the form below to edit server properties.
                         <input type="radio" name="sslEnabled" value="true" <%= (sslEnabled ? "checked" : "") %>
                          id="SSL01">
                     </td>
-                    <td><label for="SSL01">Enabled</label></td>
+                    <td><label for="SSL01"><fmt:message key="server.props.enable" /></label></td>
                 </tr>
                 <tr>
                     <td>
                         <input type="radio" name="sslEnabled" value="false" <%= (!sslEnabled ? "checked" : "") %>
                          id="SSL02">
                     </td>
-                    <td><label for="SSL02">Disabled</label></td>
+                    <td><label for="SSL02"><fmt:message key="server.props.disable" /></label></td>
                 </tr>
             </tbody>
             </table>
@@ -216,16 +215,16 @@ Use the form below to edit server properties.
             <%  if (errors.containsKey("sslPort")) { %>
                 <br>
                 <span class="jive-error-text">
-                Please enter a valid SSL port number or
+                <fmt:message key="server.props.ssl_valid" />
                 <a href="#" onclick="document.editform.sslPort.value='5223';"
-                 >restore the default</a>.
+                 ><fmt:message key="server.props.ssl_valid1" /></a>.
                 </span>
             <%  } %>
         </td>
     </tr>
     <tr>
         <td class="c1">
-             Admin Console Port:
+            <fmt:message key="server.props.admin_port" />
         </td>
         <td class="c2">
             <input type="text" name="embeddedPort" value="<%= (embeddedPort > 0 ? String.valueOf(embeddedPort) : "") %>"
@@ -233,9 +232,9 @@ Use the form below to edit server properties.
             <%  if (errors.containsKey("embeddedPort")) { %>
                 <br>
                 <span class="jive-error-text">
-                Please enter a valid port number or
+                <fmt:message key="server.props.valid_port" />
                 <a href="#" onclick="document.editform.embeddedPort.value='9090';"
-                 >restore the default</a>.
+                 ><fmt:message key="server.props.valid_port1" /></a>.
                 </span>
             <%  } %>
         </td>

src/web/server-stopped.jsp

@@ -4,7 +4,8 @@
   -	$Date$
 --%>
 
-<%@ page import="org.jivesoftware.admin.AdminConsole"%>
+<%@ page import="org.jivesoftware.admin.AdminConsole,
+                 org.jivesoftware.util.LocaleUtils"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -20,14 +21,14 @@
     String path = request.getContextPath();
 
     // Title of this page
-    String title = restart ? "Restarting Server" : "Server stopped";
+    String title = restart ? LocaleUtils.getLocalizedString("server.stopped.title_restarting") : LocaleUtils.getLocalizedString("server.stopped.title_stopped");
     pageinfo.setTitle(title);
 %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 
 <html>
 <head>
- <title><%= AdminConsole.getAppName() %> Admin Console<%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
+ <title><%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" /><%= (pageinfo.getTitle() != null ? (": "+pageinfo.getTitle()) : "") %></title>
  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
  <link rel="stylesheet" type="text/css" href="<%= path %>/style/global.css">
 </head>
@@ -39,7 +40,7 @@
 <tbody>
     <tr>
      <td>
-         <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> Admin Console">
+         <img src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="server.stopped.admin_console" />">
      </td>
      <td align="right">
          <table cellpadding="0" cellspacing="0" border="0">
@@ -71,30 +72,28 @@
 
         <% if (restart) { %>
             <p>
-            The server is being restarted.
-            To continue:
+            <fmt:message key="server.stopped.restarted" />
             </p>
 
             <ol>
                 <li>
-                    Wait a few seconds until the server has been restarted.
+                    <fmt:message key="server.stopped.wait_time" />
                 </li>
                 <li>
-                    <a href="index.jsp">Login to the admin console</a>.
+                    <a href="index.jsp"><fmt:message key="server.stopped.login_console" /></a>.
                 </li>
             </ol>
         <% } else { %>
             <p>
-            The server is being stopped.
-            To continue:
+                   <fmt:message key="server.stopped.stop" />
             </p>
 
             <ol>
                 <li>
-                    Wait a few seconds and then <b style="font-size:1.2em;">restart</b> the server.
+                    <fmt:message key="server.stopped.wait_restarted" /> <b style="font-size:1.2em;"><fmt:message key="global.restart" /></b> <fmt:message key="server.stopped.wait_restarted2" />
                 </li>
                 <li>
-                    <a href="index.jsp">Login to the admin console</a>.
+                    <a href="index.jsp"><fmt:message key="server.stopped.login_console" /></a>.
                 </li>
             </ol>
         <% } %>

src/web/session-conflict.jsp

@@ -28,7 +28,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Conflict Policy";
+    String title = LocaleUtils.getLocalizedString("session.conflict.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Session Conflict", "session-conflict.jsp"));
@@ -71,7 +71,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="session.conflict.update" />
         </td></tr>
     </tbody>
     </table>
@@ -88,19 +88,13 @@
 %>
 
 <p>
-XMPP allows multiple logins to the same user account by assigning a unique "resource name"
-to each connection. If a connection requests a resource name that is already in use, the server must
-decide how to handle the conflict. The options on this page allow you to determine if the server
-always kicks off existing connections, never kicks off existing connections, or sets the number of
-login attempts that should be rejected before kicking off an
-existing connection. The last option allows users to receive an error when logging in that
-allows them to request a different resource name.
+<fmt:message key="session.conflict.info" />
 </p>
 
 <form action="session-conflict.jsp" method="post">
 
 <fieldset>
-    <legend>Set Conflict Policy</legend>
+    <legend><fmt:message key="session.conflict.policy" /></legend>
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -110,8 +104,8 @@ allows them to request a different resource name.
                  <%= ((kickPolicy==0) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb01"><b>Always kick</b></label> - If there is a resource conflict,
-                immediately kick the other resource.
+                <label for="rb01"><b><fmt:message key="session.conflict.always_kick" /></b></label> - 
+                <fmt:message key="session.conflict.always_kick_info" />
             </td>
         </tr>
         <tr valign="middle">
@@ -120,8 +114,8 @@ allows them to request a different resource name.
                  <%= ((kickPolicy==SessionManager.NEVER_KICK) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb02"><b>Never kick</b></label> - If there is a resource conflict, don't
-                allow the new resource to log in.
+                <label for="rb02"><b><fmt:message key="session.conflict.never_kick" /></b></label> - 
+                <fmt:message key="session.conflict.never_kick_info" />
             </td>
         </tr>
         <tr valign="middle">
@@ -130,8 +124,8 @@ allows them to request a different resource name.
                  <%= ((kickPolicy==1) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb04"><b>Allow one login attempt</b></label> - If there is a resource conflict,
-                report an error one time but don't kick the existing connection.
+                <label for="rb04"><b><fmt:message key="session.conflict.allow_one" /></b></label> - 
+                <fmt:message key="session.conflict.resource_conflict" />
             </td>
         </tr>
 <%  // Figure out if the kick policy is neither 0 nor SessionManager.NEVER_KICK:
@@ -147,9 +141,9 @@ allows them to request a different resource name.
                  <%= ((assignedKickPolicy) ? "checked" : "") %>>
             </td>
             <td width="99%">
-                <label for="rb03"><b>Assign kick value</b></label> - Specify the number of login
-                attempts allowed before conflicting resources are kicked. You must specify a
-                number greater than one.
+                <label for="rb03"><b><fmt:message key="session.conflict.kick_value" /></b></label> - 
+                <fmt:message key="session.conflict.kick_value_info" />
+                
             </td>
         </tr>
         <tr valign="middle">
@@ -159,7 +153,7 @@ allows them to request a different resource name.
             <td width="99%">
                 <%  if (errors.get("kickValue") != null) { %>
                     <span class="jive-error-text">
-                    Please enter a value greater than 1.
+                    <fmt:message key="session.conflict.enter_value" />
                     </span><br>
                 <%  } %>
                 <input type="text" name="kickValue" value="<%= ((assignedKickPolicy) ? ""+kickPolicy : "") %>"

src/web/session-details.jsp

@@ -23,7 +23,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 
 <%  // Get parameters
@@ -72,7 +72,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Session Details";
+    String title = LocaleUtils.getLocalizedString("session.details.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-details.jsp"));
@@ -82,8 +82,9 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-Below are session details for the session <b><%= address.toString() %></b>. If the
-user <b><%= address.getNode() %></b> has multiple sessions open, they will appear below.
+<fmt:message key="session.details.info" /> <b><%= address.toString() %></b>. 
+<fmt:message key="session.details.info1" /> <b><%= address.getNode() %></b> 
+<fmt:message key="session.details.info2" />
 </p>
 
 <div class="jive-table">
@@ -91,14 +92,14 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
 <thead>
     <tr>
         <th colspan="2">
-            Session Details
+            <fmt:message key="session.details.title" />
         </th>
     </tr>
 </thead>
 <tbody>
     <tr>
         <td class="c1">
-            Session ID:
+            <fmt:message key="session.details.session_id" />
         </td>
         <td>
             <%= address.toString() %>
@@ -106,13 +107,13 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            User Name &amp; Resource:
+            <fmt:message key="session.details.username" />
         </td>
         <td>
             <%  String n = address.getNode(); %>
             <%  if (n == null || "".equals(n)) { %>
 
-                <i>Anonymous</i> - <%= address.getResource()==null?"":address.getResource() %>
+                <i> <fmt:message key="session.details.anonymous" /> </i> - <%= address.getResource()==null?"":address.getResource() %>
 
             <%  } else { %>
 
@@ -124,38 +125,38 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            Status:
+            <fmt:message key="session.details.status" />:
         </td>
         <td>
             <%
                 int status = currentSess.getStatus();
                 if (status == Session.STATUS_CLOSED) {
             %>
-                Closed
+                <fmt:message key="session.details.close" />
 
             <%
                 } else if (status == Session.STATUS_CONNECTED) {
             %>
 
-                Connected
+                <fmt:message key="session.details.connect" />
 
             <%
                 } else if (status == Session.STATUS_STREAMING) {
             %>
 
-                Streaming
+                <fmt:message key="session.details.streaming" />
 
             <%
                 } else if (status == Session.STATUS_AUTHENTICATED) {
             %>
 
-                Authenticated
+                <fmt:message key="session.details.authenticated" />
 
             <%
                 } else {
             %>
 
-                Unknown
+                <fmt:message key="session.details.unknown" />
 
             <%
                 }
@@ -164,7 +165,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            Presence:
+            <fmt:message key="session.details.presence" />:
         </td>
         <td>
             <%
@@ -180,39 +181,39 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
             %>
 
                 <img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away">
-                Away <%= statusTxt %>
+                <fmt:message key="session.details.away" /> <%= statusTxt %>
 
             <%
                 } else if (show == Presence.Show.chat) {
             %>
                 <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat">
-                Available to Chat <%= statusTxt %>
+                <fmt:message key="session.details.chat_available" /> <%= statusTxt %>
             <%
                 } else if (show == Presence.Show.dnd) {
             %>
 
                 <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do not Disturb">
-                Do Not Disturb <%= statusTxt %>
+                <fmt:message key="session.details.not_disturb" /> <%= statusTxt %>
 
             <%
                 } else if (show == null) {
             %>
 
                 <img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online">
-                Online <%= statusTxt %>
+                <fmt:message key="session.details.online" /> <%= statusTxt %>
 
             <%
                 } else if (show == Presence.Show.xa) {
             %>
 
                 <img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Extended Away">
-                Extended Away <%= statusTxt %>
+                <fmt:message key="session.details.extended" /> <%= statusTxt %>
 
             <%
                 } else {
             %>
 
-                Unknown/Not Recognized
+                <fmt:message key="session.details.unknown" />
 
             <%
                 }
@@ -221,7 +222,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            Session Created:
+            <fmt:message key="session.details.session_created" />:
         </td>
         <td>
             <%= dateFormatter.format(currentSess.getCreationDate()) %>
@@ -229,7 +230,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            Session Last Active:
+            <fmt:message key="session.details.last_active" />:
         </td>
         <td>
             <%= dateFormatter.format(currentSess.getLastActiveDate()) %>
@@ -237,16 +238,16 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     </tr>
     <tr>
         <td class="c1">
-            Session Statistics:
+            <fmt:message key="session.details.statistics" />:
         </td>
         <td>
-            Packets Received/Sent:
+            <fmt:message key="session.details.received" />:
             <%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %>
         </td>
     </tr>
     <tr>
         <td class="c1">
-            Client IP / Hostname:
+            <fmt:message key="session.details.hostname" />:
         </td>
         <td>
             <%= currentSess.getConnection().getInetAddress().getHostAddress() %>
@@ -262,19 +263,19 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
     if (sessionCount > 1) {
 %>
     <p>
-    <b>Multiple User Sessions</b>
+    <b><fmt:message key="session.details.multiple_session" /></b>
     </p>
 
     <div class="jive-table">
     <table cellpadding="3" cellspacing="1" border="0" width="100%">
     <tr>
         <th>&nbsp;</th>
-        <th>Name</th>
-        <th>Resource</th>
-        <th>Status</th>
-        <th nowrap colspan="2">Presence (if authenticated)</th>
-        <th nowrap>Client IP</th>
-        <th nowrap>Close Connection</th>
+        <th><fmt:message key="session.details.name" /></th>
+        <th><fmt:message key="session.details.resource" /></th>
+        <th><fmt:message key="session.details.status" /></th>
+        <th nowrap colspan="2"><fmt:message key="session.details.if_presence" /></th>
+        <th nowrap><fmt:message key="session.details.clientip" /></th>
+        <th nowrap><fmt:message key="session.details.close_connect" /></th>
     </tr>
 
     <%  int count = 0;
@@ -305,7 +306,7 @@ user <b><%= address.getNode() %></b> has multiple sessions open, they will appea
         </td>
         <td width="99%">
 
-            &nbsp; = Current session details above.
+            &nbsp; = <fmt:message key="session.details.session_detail" />
 
         </td>
     </tr>

src/web/session-filter.jsp

@@ -10,7 +10,7 @@
                  org.jivesoftware.messenger.Session" %>
 
 <%@ include file="global.jsp" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  // Check to see if the server is down.
     if (xmppServer == null) {
         response.sendRedirect("error-serverdown.jsp");
@@ -58,7 +58,7 @@
 <jsp:include page="header.jsp" flush="true" />
 
 <%  // Title of this page and breadcrumbs
-    String title = "Filter Session Summary by User";
+    String title = LocaleUtils.getLocalizedString("session.filter.title");
     String[][] breadcrumbs = {
         {"Home", "index.jsp"},
         {"Session Summary", "session-summary.jsp"},
@@ -68,14 +68,13 @@
 <jsp:include page="title.jsp" flush="true" />
 
 <p>
-To filter the list of sessions by user, select the user from the list below or enter
-their username in the box below.
+<fmt:message key="session.filter.info" />
 </p>
 
 <%  if (errors) { %>
 
     <p class="jive-error-text">
-    Please enter a valid username or choose a username from the list.
+    <fmt:message key="session.filter.enter_username" />
     </p>
 
 <%  } %>
@@ -89,7 +88,7 @@ their username in the box below.
         <input type="radio" name="choose" value="false">
     </td>
     <td width="1%" nowrap>
-        Specify username:
+        <fmt:message key="session.filter.specify_username" />
     </td>
     <td width="98%">
         <input type="text" name="usernameTF" size="30" maxlength="100"
@@ -102,7 +101,7 @@ their username in the box below.
         <input type="radio" name="choose" value="true">
     </td>
     <td width="1%" nowrap>
-        Choose user:
+        <fmt:message key="session.filter.choose_user" />
     </td>
     <td width="98%">
         <select size="1" name="usernameSEL" onfocus="this.form.choose[1].checked=true;">

src/web/session-row.jspf

 <%@ page import="org.jivesoftware.messenger.Session,
                  org.xmpp.packet.Presence,
-                 java.net.URLEncoder"%>
+                 java.net.URLEncoder,
+                 org.jivesoftware.util.LocaleUtils"%>
  <%--
   -	$RCSfile$
   -	$Revision$
@@ -29,8 +30,8 @@
     <td width="1%" nowrap><%= count %></td>
     <td width="10%" nowrap>
         <%  String name = sess.getAddress().getNode(); %>
-            <a href="session-details.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>" title="Click for more info..."
-             ><%= ((name != null && !"".equals(name)) ? name : "<i>Anonymous</i>") %></a>
+            <a href="session-details.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>" title="<fmt:message key="session.row.cliked" />"
+             ><%= ((name != null && !"".equals(name)) ? name : "<i>"+LocaleUtils.getLocalizedString("session.details.anonymous")+"</i>") %></a>
     </td>
     <td width="15%" nowrap>
         <%= sess.getAddress().getResource() %>
@@ -39,30 +40,30 @@
         <%  int _status = sess.getStatus();
             if (_status == Session.STATUS_CLOSED) {
         %>
-            Closed
+            <fmt:message key="session.details.close" />
 
         <%  } else if (_status == Session.STATUS_CONNECTED) { %>
 
-            Connected
+            <fmt:message key="session.details.connect" />
 
         <%  } else if (_status == Session.STATUS_STREAMING) { %>
 
-            Streaming
+            <fmt:message key="session.details.streaming" />
 
         <%  } else if (_status == Session.STATUS_AUTHENTICATED) { %>
 
-            Authenticated
+            <fmt:message key="session.details.authenticated" />
 
         <%  } else { %>
 
-            Unknown
+            <fmt:message key="session.details.unknown" />
 
         <%  } %>
     </td>
     <%  if (sess.getConnection().isSecure()) { %>
         <td width="1%">
             <img src="images/lock.gif" width="16" height="16" border="0"
-            title="User is connected via SSL">
+            title="<fmt:message key="session.row.cliked_ssl" />">
         </td>
      <% } else { %>
         <td width="1%"><img src="images/blank.gif" width="1" height="1"></td>
@@ -73,7 +74,7 @@
         if (_show == Presence.Show.away) {
     %>
         <td width="1%"
-            ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Away"
+            ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.away" />"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -82,7 +83,7 @@
 
             <%  } else { %>
 
-                Away
+                <fmt:message key="session.details.away" />
 
             <%  } %>
         </td>
@@ -90,16 +91,16 @@
     <%  } else if (_show == Presence.Show.chat) { %>
 
         <td width="1%"
-            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Available to Chat"
+            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.chat_available" />"
             ></td>
         <td width="46%">
-            Available to Chat
+            <fmt:message key="session.details.chat_available" />
         </td>
 
     <%  } else if (_show == Presence.Show.dnd) { %>
 
         <td width="1%"
-            ><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="Do Not Disturb"
+            ><img src="images/bullet-red-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.not_disturb" />"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -108,7 +109,7 @@
 
             <%  } else { %>
 
-                Do Not Disturb
+                <fmt:message key="session.details.not_disturb" />
 
             <%  } %>
         </td>
@@ -116,16 +117,16 @@
     <%  } else if (_show == null) { %>
 
         <td width="1%"
-            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="Online"
+            ><img src="images/bullet-green-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.online" />"
             ></td>
         <td width="46%">
-            Online
+            <fmt:message key="session.details.online" />
         </td>
 
     <%  } else if (_show == Presence.Show.xa) { %>
 
         <td width="1%"
-            ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="Extended Away"
+            ><img src="images/bullet-yellow-14x14.gif" width="14" height="14" border="0" title="<fmt:message key="session.details.extended" />"
             ></td>
         <td width="46%">
             <%  if (_stat != null) { %>
@@ -134,7 +135,7 @@
 
             <%  } else { %>
 
-                Extended Away
+                <fmt:message key="session.details.extended" />
 
             <%  } %>
         </td>
@@ -142,7 +143,7 @@
     <%  } else { %>
 
         <td colspan="2" width="46%">
-            Unknown/Not Recognized
+            <fmt:message key="session.details.unknown" />
         </td>
 
     <%  } %>
@@ -153,8 +154,8 @@
 
     <td width="1%" nowrap align="center" style="border-right:1px #ccc solid;">
         <a href="session-summary.jsp?jid=<%= URLEncoder.encode(sess.getAddress().toString(), "UTF-8") %>&close=true"
-         title="Click to kill session..."
-         onclick="return confirm('Are you sure you want to close this connection?');"
+         title="<fmt:message key="session.row.cliked_kill_session" />"
+         onclick="return confirm('<fmt:message key="session.row.confirm_close" />');"
          ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
     </td>
 </tr>
\ No newline at end of file

src/web/session-summary.jsp

@@ -20,7 +20,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <jsp:useBean id="admin" class="org.jivesoftware.util.WebManager"  />
 <% admin.init(request, response, session, application, out ); %>
 
@@ -63,7 +63,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "Session Summary";
+    String title = LocaleUtils.getLocalizedString("session.summary.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "session-summary.jsp"));
@@ -75,16 +75,16 @@
 <%  if ("success".equals(request.getParameter("close"))) { %>
 
     <p class="jive-success-text">
-    Session closed successfully.
+    <fmt:message key="session.summary.close" />
     </p>
 
 <%  } %>
 
-Active Sessions: <b><%= sessionCount %></b>
+<fmt:message key="session.summary.active" />: <b><%= sessionCount %></b>
 
 <%  if (numPages > 1) { %>
 
-    - Showing <%= (start+1) %>-<%= (start+range) %>
+    - <fmt:message key="session.summary.showing" /> <%= (start+1) %>-<%= (start+range) %>
 
 <%  } %>
 </p>
@@ -92,7 +92,7 @@ Active Sessions: <b><%= sessionCount %></b>
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="session.summary.page" />:
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -109,7 +109,7 @@ Active Sessions: <b><%= sessionCount %></b>
 <%  } %>
 
 <p>
-Below is a list of sessions on this server.
+<fmt:message key="session.summary.info" />
 </p>
 
 <div class="jive-table">
@@ -117,12 +117,12 @@ Below is a list of sessions on this server.
 <thead>
     <tr>
         <th>&nbsp;</th>
-        <th>Name</th>
-        <th>Resource</th>
-        <th nowrap colspan="2">Status</th>
-        <th nowrap colspan="2">Presence</th>
-        <th nowrap>Client IP</th>
-        <th nowrap>Close Connection</th>
+        <th><fmt:message key="session.details.name" /></th>
+        <th><fmt:message key="session.details.resource" /></th>
+        <th nowrap colspan="2"><fmt:message key="session.details.status" /></th>
+        <th nowrap colspan="2"><fmt:message key="session.details.presence" /></th>
+        <th nowrap><fmt:message key="session.details.clientip" /></th>
+        <th nowrap><fmt:message key="session.details.close_connect" /></th>
     </tr>
 </thead>
 <tbody>
@@ -136,7 +136,7 @@ Below is a list of sessions on this server.
         <tr>
             <td colspan="9">
 
-                No Sessions
+                <fmt:message key="session.summary.not_session" />
 
             </td>
         </tr>
@@ -160,7 +160,7 @@ Below is a list of sessions on this server.
 <%  if (numPages > 1) { %>
 
     <p>
-    Pages:
+    <fmt:message key="session.summary.page" />:
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -178,7 +178,7 @@ Below is a list of sessions on this server.
 
 <br>
 <p>
-List last updated: <%= dateFormatter.format(new Date()) %>
+<fmt:message key="session.summary.last_update" />: <%= dateFormatter.format(new Date()) %>
 </p>
 
 <jsp:include page="bottom.jsp" flush="true" />

src/web/setup-admin-settings.jsp

@@ -107,14 +107,11 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Administrator Account
+<fmt:message key="setup.admin.settings.account" />
 </p>
 
 <p>
-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).
+<fmt:message key="setup.admin.settings.info" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -126,7 +123,7 @@ already setup your admin account (not for first time users).
 
     <%  } else { %>
 
-        There were errors when updating the admin account. Please see below.
+        <fmt:message key="setup.admin.settings.error" />
 
     <%  } %>
     </span>
@@ -156,36 +153,36 @@ function checkClick() {
          value="<%= ((password!=null) ? password : "") %>">
         <span class="jive-description">
         <br>
-        If this is a new <fmt:message key="short.title" /> installation, the current password will be <b>admin</b>.
+        <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>
         <%  if (errors.get("password") != null) { %>
             <span class="jive-error-text">
-            <br>Please enter the correct current password.
+            <br><fmt:message key="setup.admin.settings.password" />
             </span>
         <%  } %>
     </td>
 </tr>
 <tr valign="top">
     <td class="jive-label">
-        Admin Email Address:
+        <fmt:message key="setup.admin.settings.email" />
     </td>
     <td>
         <input type="text" name="email" size="40" maxlength="150"
          value="<%= ((email!=null) ? email : "") %>">
         <span class="jive-description">
         <br>
-        A valid email address for the admin account.
+        <fmt:message key="setup.admin.settings.valid_email" />
         </span>
         <%  if (errors.get("email") != null) { %>
             <span class="jive-error-text">
-            <br>Please enter a valid email address.
+            <br><fmt:message key="setup.admin.settings.enter_email" />
             </span>
         <%  } %>
     </td>
 </tr>
 <tr valign="top">
     <td class="jive-label">
-        New Password:
+        <fmt:message key="setup.admin.settings.new_password" />
     </td>
     <td>
         <input type="password" name="newPassword" size="20" maxlength="50"
@@ -195,18 +192,18 @@ function checkClick() {
         </span>
         <%  if (errors.get("newPassword") != null) { %>
             <span class="jive-error-text">
-            <br>Please enter a valid new password.
+            <br><fmt:message key="setup.admin.settings.valid_new_password" />
             </span>
         <%  } else if (errors.get("match") != null) { %>
             <span class="jive-error-text">
-            <br>The new passwords do not match.
+            <br><fmt:message key="setup.admin.settings.not_new_password" />
             </span>
         <%  } %>
     </td>
 </tr>
 <tr valign="top">
     <td class="jive-label">
-        Confirm Password:
+        <fmt:message key="setup.admin.settings.confirm_password" />
     </td>
     <td>
         <input type="password" name="newPasswordConfirm" size="20" maxlength="50"
@@ -216,7 +213,7 @@ function checkClick() {
         </span>
         <%  if (errors.get("newPasswordConfirm") != null) { %>
             <span class="jive-error-text">
-            <br>Please enter a valid new confirmation password.
+            <br><fmt:message key="setup.admin.settings.valid_confirm" />
             </span>
         <%  } %>
     </td>

src/web/setup-completed.jsp

@@ -10,7 +10,7 @@
 
 <html>
 <head>
-	<title><fmt:message key="short.title" /> Setup</title>
+	<title><fmt:message key="short.title" /> <fmt:message key="setup.completed.setup" /></title>
 
 	<link rel="stylesheet" type="text/css" href="setup-style.css">
 </head>
@@ -21,12 +21,12 @@
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
     <td width="99%">
-        <fmt:message key="short.title" /> Setup
+        <fmt:message key="short.title" /> <fmt:message key="setup.completed.setup" />
     </td>
     <td width="1%" nowrap>
         <font size="-2" face="arial,helvetica,sans-serif" color="#ffffff">
         <b>
-        Jive Software
+        <fmt:message key="setup.completed.jive" />
         </b>
         </font>
     </td>
@@ -52,14 +52,13 @@
     <td width="98%">
 
         <p class="jive-setup-page-header">
-        Setup Already Run
+        <fmt:message key="setup.completed.run" />
         </p>
 
         <p>
-        It appears setup has already been run. To administer your community, please use the
-        <a href="index.jsp"><fmt:message key="short.title" /> Admin Tool</a>. To re-run
-        setup, you need to stop your appserver, delete the "setup" property from the
-        jive-messenger.xml file, restart Messenger then reload the setup tool.
+        <fmt:message key="setup.completed.run_info" />
+        <a href="index.jsp"><fmt:message key="short.title" /> <fmt:message key="setup.completed.run_info1" /></a>.
+        <fmt:message key="setup.completed.run_info2" />
         </p>
 
         <form action="index.jsp">

src/web/setup-datasource-jndi.jsp

@@ -74,14 +74,12 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Datasource Settings - JNDI Connection
+<fmt:message key="setup.datasource.jndi.setting" />
 </p>
 
 <p>
-Choose a JNDI datasource below to connect to the <fmt:message key="short.title" /> database.
-The name varies between application servers, but it is generally of the form:
-<tt>java:comp/env/jdbc/[DataSourceName]</tt>. Please consult your application server's
-documentation for more information.
+<fmt:message key="setup.datasource.jndi.setting_info" /><fmt:message key="short.title" /> 
+<fmt:message key="setup.datasource.jndi.setting_info1" /> <tt>java:comp/env/jdbc/[DataSourceName]</tt>. <fmt:message key="setup.datasource.jndi.setting_info2" />
 </p>
 
 <%  if (errors.size() > 0 && errors.get("jndiName") == null) { %>
@@ -107,7 +105,7 @@ documentation for more information.
 
 <%  if (!isLookupNames) { %>
 
-    JNDI Datasource Name:
+    <fmt:message key="setup.datasource.jndi.name" />
     <input type="text" name="jndiName" size="30" maxlength="100"
      value="<%= ((jndiName!=null) ? jndiName : "") %>">
 
@@ -118,7 +116,7 @@ documentation for more information.
         <td><input type="radio" name="jndiNameMode" value="custom"></td>
         <td>
             <span onclick="document.jndiform.jndiName.focus();"
-            >Custom:</span>
+            ><fmt:message key="setup.datasource.jndi.custom" /></span>
             &nbsp;
             <input type="text" name="jndiName" size="30" maxlength="100"
              value="<%= ((jndiName!=null) ? jndiName : "") %>"
@@ -126,7 +124,7 @@ documentation for more information.
             <%  if (errors.get("jndiName") != null) { %>
 
                 <span class="jive-error-text"><br>
-                Please enter a valid JNDI name.
+                <fmt:message key="setup.datasource.jndi.valid_name" />
                 </span>
 
             <%  } %>
@@ -159,7 +157,7 @@ documentation for more information.
 <div align="right">
     <input type="submit" name="continue" value=" Continue ">
     <br>
-    Note, it might take between 30-60 seconds to connect to your database.
+    <fmt:message key="setup.datasource.jndi.note" />
 </div>
 
 </form>

src/web/setup-datasource-settings.jsp

@@ -74,11 +74,12 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Datasource Settings
+<fmt:message key="setup.datasource.settings.title" />
 </p>
 
 <p>
-Choose how you would like to connect to the <fmt:message key="short.title" /> database.
+<fmt:message key="setup.datasource.settings.info" /> <fmt:message key="short.title" /> 
+<fmt:message key="setup.datasource.settings.info1" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -99,8 +100,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
          <%= ((STANDARD.equals(mode)) ? "checked" : "") %>>
     </td>
     <td>
-        <label for="rb02"><b>Standard Database Connection</b></label> -
-        Use an external database with the built-in connection pool.
+        <label for="rb02"><b><fmt:message key="setup.datasource.settings.connect" /></b></label> -
+        <fmt:message key="setup.datasource.settings.connect_info" />
     </td>
 </tr>
 
@@ -112,8 +113,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
              <%= ((JNDI.equals(mode)) ? "checked" : "") %>>
         </td>
         <td>
-            <label for="rb03"><b>JNDI Datasource</b></label> -
-            Use a datasource defined by your application server via JNDI.
+            <label for="rb03"><b><fmt:message key="setup.datasource.settings.jndi" /></b></label> -
+            <fmt:message key="setup.datasource.settings.jndi_info" />
         </td>
     </tr>
 
@@ -125,10 +126,8 @@ Choose how you would like to connect to the <fmt:message key="short.title" /> da
          <%= ((EMBEDDED.equals(mode)) ? "checked" : "") %>>
     </td>
     <td>
-        <label for="rb01"><b>Embedded Database</b></label> -
-        Use an embedded database, powered by HSQLDB. This option requires no external database
-        configuration and is an easy way to get running quickly. However, this is not recommended
-        for large installations.
+        <label for="rb01"><b><fmt:message key="setup.datasource.settings.embedded" /></b></label> -
+        <fmt:message key="setup.datasource.settings.embedded_info" />
     </td>
 </tr>
 </table>

src/web/setup-datasource-standard.jsp

@@ -24,7 +24,7 @@
 %>
 
 <%@ include file="setup-global.jspf" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  // Get parameters
     String driver = ParamUtils.getParameter(request,"driver");
     String serverURL = ParamUtils.getParameter(request,"serverURL");
@@ -149,17 +149,15 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Datasource Settings - Standard Connection
+<fmt:message key="setup.datasource.standard.title" />
 </p>
 
 <p>
-Specify a JDBC driver and connection properties to connect to your database. If you need more
-information about this process please see the database documentation distributed with <fmt:message key="title" />.
+<fmt:message key="setup.datasource.standard.info" /><b><fmt:message key="setup.datasource.standard.info2" /> </b><fmt:message key="setup.datasource.standard.info3" /><tt>[MESSENGER_HOME]/resources/database</tt>.<fmt:message key="title" />.
 </p>
 
 <p>
-<b>Note: </b> Database scripts for most popular databases are included in the Jive Messenger
-distribution at <tt>[MESSENGER_HOME]/resources/database</tt>.
+<fmt:message key="setup.datasource.standard.note" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -171,7 +169,7 @@ distribution at <tt>[MESSENGER_HOME]/resources/database</tt>.
 
     <%  } else { %>
 
-        Failed to establish a database connection - please see specific errors listed below.
+        <fmt:message key="setup.datasource.standard.failed_connect" />
 
     <%  } %>
     </span>
@@ -215,7 +213,7 @@ function checkSubmit() {
     <td colspan="2">
         Database Driver Presets:
         <select size="1" name="presets" onchange="populate(this.options[this.selectedIndex].value)">
-            <option value="">Pick Database...
+            <option value=""><fmt:message key="setup.datasource.standard.pick_database" />
             <%  for (int i=0; i<presets.size(); i++) {
                     String[] data = (String[])presets.get(i);
             %>
@@ -227,14 +225,14 @@ function checkSubmit() {
 </tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        JDBC Driver Class:
+        <fmt:message key="setup.datasource.standard.jdbc" />
     </td>
     <td>
         <input type="text" name="driver" size="50" maxlength="150"
          value="<%= ((driver != null) ? driver : "") %>">
         <span class="jive-description">
         <br>
-        The valid classname of your JDBC driver, ie: com.mydatabase.driver.MyDriver.
+        <fmt:message key="setup.datasource.standard.jdbc_info" />
         </span>
         <%  if (errors.get("driver") != null) { %>
 
@@ -249,14 +247,14 @@ function checkSubmit() {
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        Database URL:
+        <fmt:message key="setup.datasource.standard.url" />
     </td>
     <td>
         <input type="text" name="serverURL" size="50" maxlength="250"
          value="<%= ((serverURL != null) ? serverURL : "") %>">
         <span class="jive-description">
         <br>
-        The valid URL used to connect to your database, ie: jdbc:mysql://host:port/database
+        <fmt:message key="setup.datasource.standard.valid_url" />
         </span>
         <%  if (errors.get("serverURL") != null) { %>
 
@@ -271,15 +269,14 @@ function checkSubmit() {
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        Username:
+        <fmt:message key="setup.datasource.standard.username" />
     </td>
     <td>
         <input type="text" name="username" size="20" maxlength="50"
          value="<%= ((username != null) ? username : "") %>">
         <span class="jive-description">
         <br>
-        The user used to connect to your database - note, this may not be required and can be left
-        blank.
+        <fmt:message key="setup.datasource.standard.username_info" />
         </span>
         <%  if (errors.get("username") != null) { %>
 
@@ -294,15 +291,14 @@ function checkSubmit() {
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        Password:
+        <fmt:message key="setup.datasource.standard.password" />
     </td>
     <td>
         <input type="password" name="password" size="20" maxlength="50"
          value="<%= ((password != null) ? password : "") %>">
         <span class="jive-description">
         <br>
-        The password for the user account used for this database - note, this may not be required
-        and can be left blank.
+        <fmt:message key="setup.datasource.standard.password_info" />
         </span>
         <%  if (errors.get("password") != null) { %>
 
@@ -317,17 +313,17 @@ function checkSubmit() {
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        Connections:
+        <fmt:message key="setup.datasource.standard.connect" />
     </td>
     <td>
-        Minimum: <input type="text" name="minConnections" size="5" maxlength="5"
+        <fmt:message key="setup.datasource.standard.min" /> <input type="text" name="minConnections" size="5" maxlength="5"
          value="<%= ((minConnections != -1) ? ""+minConnections : "") %>">
         &nbsp;
-        Maximum: <input type="text" name="maxConnections" size="5" maxlength="5"
+        <fmt:message key="setup.datasource.standard.max" /> <input type="text" name="maxConnections" size="5" maxlength="5"
          value="<%= ((maxConnections != -1) ? ""+maxConnections : "") %>">
         <span class="jive-description">
         <br>
-        The minimum and maximum number of database connections the connection pool should maintain.
+        <fmt:message key="setup.datasource.standard.pool" />
         </span>
         <%  if (errors.get("minConnections") != null) { %>
 
@@ -350,14 +346,14 @@ function checkSubmit() {
 <tr><td colspan="2">&nbsp;</td></tr>
 <tr valign="top">
     <td class="jive-label" nowrap>
-        Connection Timeout:
+        <fmt:message key="setup.datasource.standard.timeout" />
     </td>
     <td>
         <input type="text" name="connectionTimeout" size="5" maxlength="5"
          value="<%= connectionTimeout %>">
         <span class="jive-description">
         <br>
-        The time (in days) before connections in the connection pool are recycled.
+        <fmt:message key="setup.datasource.standard.timeout_info" />
         </span>
         <%  if (errors.get("connectionTimeout") != null) { %>
 
@@ -378,7 +374,7 @@ function checkSubmit() {
 <div align="right">
     <input type="submit" name="continue" value=" Continue ">
     <br>
-    Note, it might take between 30-60 seconds to connect to your database.
+    <fmt:message key="setup.datasource.standard.note" />
 </div>
 
 </form>

src/web/setup-env-check.jspf

@@ -67,22 +67,22 @@
 %>
         <html>
         <head>
-            <title><fmt:message key="title" /> Setup</title>
+            <title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
             <link rel="stylesheet" type="text/css" href="style.css">
         </head>
         <body>
 
         <p class="jive-setup-page-header">
-        <fmt:message key="title" /> Setup
+        <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
         </p>
 
         <p class="jive-setup-error-text">
-        Error: Can not proceed with <fmt:message key="title" /> setup.
+        <fmt:message key="setup.env.check.error" /> <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />.
         </p>
 
         <p>
-        Your current installation fails to meet minimum <fmt:message key="title" /> requirements - please see
-        the checklist below:
+        <fmt:message key="setup.env.check.error_info" /> <fmt:message key="title" /> 
+        <fmt:message key="setup.env.check.error_info1" />
         </p>
 
         <ul>
@@ -92,7 +92,7 @@
             <tr>
                 <td><img src="images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-                    At least JDK 1.5
+                    <fmt:message key="setup.env.check.jdk" />
                 </td>
             </tr>
 
@@ -102,7 +102,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    At least JDK 1.5
+                    <fmt:message key="setup.env.check.jdk" />
                     </span>
                 </td>
             </tr>
@@ -113,7 +113,7 @@
             <tr>
                 <td><img src="images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-                    Servlet 2.2 Support
+                    <fmt:message key="setup.env.check.servlet" />
                 </td>
             </tr>
 
@@ -123,7 +123,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    Servlet 2.2 Support
+                    <fmt:message key="setup.env.check.servlet" />
                     </span>
                 </td>
             </tr>
@@ -134,7 +134,7 @@
             <tr>
                 <td><img src="images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-                    JSP 1.1 Support
+                    <fmt:message key="setup.env.check.jsp" />
                 </td>
             </tr>
 
@@ -144,7 +144,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    JSP 1.1 Support
+                    <fmt:message key="setup.env.check.jsp" />
                     </span>
                 </td>
             </tr>
@@ -155,7 +155,7 @@
             <tr>
                 <td><img src="images/check.gif" width="13" height="13" border="0"></td>
                 <td>
-                    <fmt:message key="title" /> Classes
+                    <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
                 </td>
             </tr>
 
@@ -165,7 +165,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    <fmt:message key="title" /> Classes
+                    <fmt:message key="title" /> <fmt:message key="setup.env.check.class" />
                     </span>
                 </td>
             </tr>
@@ -177,7 +177,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    Jive Home Directory (<%= messengerHome.toString() %>)
+                    <fmt:message key="setup.env.check.jive" /> (<%= messengerHome.toString() %>)
                     </span>
                 </td>
             </tr>
@@ -188,7 +188,7 @@
                 <td><img src="images/x.gif" width="13" height="13" border="0"></td>
                 <td>
                     <span class="jive-setup-error-text">
-                    Messenger Home Directory - Not Set
+                    <fmt:message key="setup.env.check.not_home" />
                     </span>
                 </td>
             </tr>
@@ -198,8 +198,7 @@
         </ul>
 
         <p>
-        Please read the installation documentation and try setting up your environment again. After making
-        changes, restart your appserver and load this page again.
+        <fmt:message key="setup.env.check.doc" />
         </p>
 
         </body>

src/web/setup-finished.jsp

@@ -33,24 +33,23 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-<fmt:message key="title" /> Setup Complete!
+<fmt:message key="title" /> <fmt:message key="setup.finished.title" />
 </p>
 
 <p>
-This installation of <fmt:message key="title" /> is now complete.
-To continue:
+<fmt:message key="setup.finished.info" /> <fmt:message key="title" /> <fmt:message key="setup.finished.info1" />
 </p>
 
 <ol>
     <li>
-        Please <b style="font-size:1.2em;">restart</b> the server.
+        <fmt:message key="setup.finished.restart" /> <b style="font-size:1.2em;"><fmt:message key="global.restart" /></b> <fmt:message key="setup.finished.restart2" />
     </li>
     <li>
         <%
             String server = request.getServerName();
             String port = JiveGlobals.getProperty("adminConsole.port");
         %>
-        <a href="http://<%= server %>:<%= port %>/login.jsp?username=admin">Login to the admin console</a>.
+        <a href="http://<%= server %>:<%= port %>/login.jsp?username=admin"><fmt:message key="setup.finished.login" /></a>.
     </li>
 </ol>
 

src/web/setup-header.jspf

@@ -8,7 +8,7 @@
 
 <html>
 <head>
-	<title><fmt:message key="title" /> Setup</title>
+	<title><fmt:message key="title" /> <fmt:message key="setup.env.check.setup" /></title>
 	<link rel="stylesheet" type="text/css" href="setup-style.css">
 </head>
 
@@ -18,7 +18,7 @@
 <table cellpadding="8" cellspacing="0" border="0" width="100%">
 <tr>
     <td>
-        <fmt:message key="title" /> Setup
+        <fmt:message key="title" /> <fmt:message key="setup.env.check.setup" />
     </td>
 </tr>
 </table>

src/web/setup-host-settings.jsp

@@ -13,7 +13,7 @@
                  java.net.InetAddress" %>
 
 <%@ include file="setup-global.jspf" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  // Get parameters
     String domain = ParamUtils.getParameter(request,"domain");
     int embeddedPort = ParamUtils.getIntParameter(request,"embeddedPort",-1);
@@ -67,12 +67,11 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Server Settings
+<fmt:message key="setup.host.settings.title" />
 </p>
 
 <p>
-Below are host settings for this server. Note: the suggested value for the
-domain is based on the network settings of this machine.
+<fmt:message key="setup.host.settings.info" />
 </p>
 
 <style type="text/css">
@@ -84,11 +83,11 @@ LABEL { font-weight : normal; }
 <table cellpadding="3" cellspacing="0" border="0" width="100%">
 <tr valign="top">
     <td width="1%" nowrap>
-        Domain:
+        <fmt:message key="setup.host.settings.domain" />
         <%  if (errors.get("domain") != null) { %>
 
             <span class="jive-error-text"><br>
-            Invalid domain.
+            <fmt:message key="setup.host.settings.invalid_domain" />
             </span>
 
         <%  } %>
@@ -98,17 +97,17 @@ LABEL { font-weight : normal; }
          value="<%= ((domain != null) ? domain : "") %>">
         <span class="jive-description">
         <br>
-        Hostname or IP address of this server.
+        <fmt:message key="setup.host.settings.hostname" />
         </span>
     </td>
 </tr>
 <tr valign="top">
     <td width="1%" nowrap>
-        Admin Console Port:
+        <fmt:message key="setup.host.settings.port" />
         <%  if (errors.get("embeddedPort") != null) { %>
 
             <span class="jive-error-text"><br>
-            Invalid port number.
+            <fmt:message key="setup.host.settings.invalid_port" />
             </span>
 
         <%  } %>
@@ -118,25 +117,25 @@ LABEL { font-weight : normal; }
          value="<%= ((embeddedPort != -1) ? ""+embeddedPort : "9090") %>">
         <span class="jive-description">
         <br>
-        Port number for the web-based admin console (default is 9090).
+        <fmt:message key="setup.host.settings.port_number" />
         </span>
     </td>
 </tr>
 <tr valign="middle">
     <td width="1%" nowrap>
-        SSL Connections Enabled:
+        <fmt:message key="setup.host.settings.ssl" />
     </td>
     <td width="99%">
         <input type="radio" name="sslEnabled" value="true" id="rb01"
             <%= ((sslEnabled) ? " checked" : "") %>>
-        <label for="rb01">Yes</label>
+        <label for="rb01"><fmt:message key="setup.host.settings.yes" /></label>
         &nbsp;
         <input type="radio" name="sslEnabled" value="false" id="rb02"
             <%= ((!sslEnabled) ? " checked" : "") %>>
-        <label for="rb02">No</label>
+        <label for="rb02"><fmt:message key="setup.host.settings.no" /></label>
         <span class="jive-description">
         <br>
-        Enables or disables secure XMPP connections.
+        <fmt:message key="setup.host.settings.secure" />
         </span>
     </td>
 </tr>

src/web/setup-index.jsp

@@ -57,15 +57,14 @@
 <%@ include file="setup-header.jspf" %>
 
 <p class="jive-setup-page-header">
-Setup Checklist
+<fmt:message key="setup.index.title" />
 </p>
 
 <p>
 
 
-Welcome to <fmt:message key="title" />  Setup. This tool will lead you through the initial setup or
-upgrade process. Before continuing, verify that your environment meets all the requirements
-below.
+<fmt:message key="setup.index.info" /><fmt:message key="title" />  
+<fmt:message key="setup.index.info1" />
 </p>
 
 <%  if (errors.size() > 0) { %>
@@ -77,20 +76,20 @@ below.
 <table cellpadding="3" cellspacing="2" border="0" width="100%">
 <tr>
     <th width="98%">&nbsp;</th>
-    <th width="1%" nowrap class="jive-setup-checklist-box">Success</th>
-    <th width="1%" nowrap class="jive-setup-checklist-box">Error</th>
+    <th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.success" /> </th>
+    <th width="1%" nowrap class="jive-setup-checklist-box"><fmt:message key="setup.index.error" /></th>
 </tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
-        Java VM Support
+        <fmt:message key="setup.index.vm" />
     </td>
 </tr>
 <tr>
     <td class="jive-setup-category">
-        At least JDK 1.5
+        <fmt:message key="setup.index.jdk" />
         <br>
         <span class="jive-info">
-        Found: JVM <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %>
+        <fmt:message key="setup.index.found" /> <%= System.getProperty("java.version") %> - <%= System.getProperty("java.vendor") %>
         </span>
     </td>
     <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
@@ -98,7 +97,7 @@ below.
 </tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
-        <fmt:message key="title" /> Classes
+        <fmt:message key="title" /> <fmt:message key="setup.index.class" />
     </td>
 </tr>
 <tr>
@@ -106,7 +105,7 @@ below.
         messenger.jar
         <br>
         <span class="jive-info">
-        <fmt:message key="title" /> classes.
+        <fmt:message key="title" /> <fmt:message key="setup.index.class" />.
         </span>
     </td>
     <td align="center" class="jive-setup-checklist-box"><img src="images/check.gif" width="13" height="13" border="0"></td>
@@ -114,19 +113,19 @@ below.
 </tr>
 <tr>
     <td colspan="3" class="jive-setup-category-header">
-        <fmt:message key="title" /> Configuration Files
+        <fmt:message key="title" /> <fmt:message key="setup.index.con_file" />
     </td>
 </tr>
 <tr>
     <td class="jive-setup-category">
-        conf Directory
+        <fmt:message key="setup.index.dir" />
         <br>
         <span class="jive-info">
         <%  boolean messengerHomeOK = true;
             if (messengerHomeErrors.size() == 0) {
         %>
 
-            Valid conf directory.
+            <fmt:message key="setup.index.valid_conf" />
 
         <%  } else {
                 messengerHomeOK = false;
@@ -134,18 +133,15 @@ below.
 
             <%  if (messengerHomeErrors.get("exists") != null) { %>
 
-                Unable to locate valid conf directory. Please refer to the installation
-                documentation for the correct way to set the conf directory.
+                <fmt:message key="setup.index.unable_locate_dir" />
 
             <%  } else if (messengerHomeErrors.get("read") != null) { %>
 
-                Setup was able to find your conf directory but does not have read
-                permission on it. Please alter the directory permissions.
+                <fmt:message key="setup.index.not_permission" />
 
             <%  } else if (messengerHomeErrors.get("write") != null) { %>
 
-                Setup was able to find your conf directory but does not have write permission
-                on it. Please alter the directory permissions.
+                <fmt:message key="setup.index.not_write_permission" />
 
            
 

src/web/setup-pause.jsp

@@ -18,10 +18,10 @@
 <div align=center>
 
 <p>
-Please restart your server and close this window. Launch the admin using either the launcher or start as a service to enter the admin tool.
+<fmt:message key="setup.pause.title" />
 </p>
 
-<a href="javascript:window.close();">Close Window</a>
+<a href="javascript:window.close();"><fmt:message key="setup.pause.close" /></a>
 </div>
 
 <%@ include file="setup-footer.jsp" %>

src/web/setup-sidebar.jsp

@@ -5,7 +5,7 @@
 --%>
 
 <%@ page import="org.jivesoftware.util.*" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%!
     final String INCOMPLETE = "incomplete";
     final String IN_PROGRESS = "in_progress";
@@ -42,7 +42,7 @@
 <tr bgcolor="#eeeeee">
     <td align="center">
         <span style="padding:6px">
-        <b>Setup Progress</b>
+        <b><fmt:message key="setup.sidebar.title" /></b>
         </span>
     </td>
 </tr>

src/web/ssl-settings.jsp

@@ -24,7 +24,7 @@
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
 <%  try { %>
 
 <%-- Define Administration Bean --%>
@@ -91,7 +91,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = "SSL Security Settings";
+    String title = LocaleUtils.getLocalizedString("ssl.settings.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "ssl-settings.jsp"));
@@ -107,7 +107,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Settings updated successfully.
+        <fmt:message key="ssl.settings.update" />
         </td></tr>
     </tbody>
     </table>
@@ -120,7 +120,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Certificate uninstalled successfully.
+        <fmt:message key="ssl.settings.uninstalled" />
         </td></tr>
     </tbody>
     </table>
@@ -135,9 +135,9 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error uninstalling the certificate.
+        <fmt:message key="ssl.settings.error" />
         <%  if (e != null && e.getMessage() != null) { %>
-            Error message: <%= e.getMessage() %>
+            <fmt:message key="ssl.settings.error_messenge" />: <%= e.getMessage() %>
         <%  } %>
         </td></tr>
     </tbody>
@@ -151,7 +151,7 @@
     <tbody>
         <tr><td class="jive-icon"><img src="images/error-16x16.gif" width="16" height="16" border="0"></td>
         <td class="jive-icon-label">
-        Error installing the certificate, please see the form below.
+        <fmt:message key="ssl.settings.error_certificate" />
         </td></tr>
     </tbody>
     </table>
@@ -160,12 +160,10 @@
 <%  } %>
 
 <p>
-SSL/TLS allows secure connections to be made between the server and clients.
-This page displays installed certificates. Use the form at the bottom of the page to
-install a new certificate.
+<fmt:message key="ssl.settings.info" />
 </p>
 
-<p><b>Installed Certificates</b></p>
+<p><b><fmt:message key="ssl.settings.certificate" /></b></p>
 
 <div class="jive-table">
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -173,13 +171,13 @@ install a new certificate.
     <tr>
         <th width="1%">&nbsp;</th>
         <th>
-            Alias (host)
+            <fmt:message key="ssl.settings.alias" />
         </th>
         <th>
-            Certificate Type
+            <fmt:message key="ssl.settings.type" />
         </th>
         <th width="1%">
-            Uninstall
+            <fmt:message key="ssl.settings.uninstall" />
         </th>
     </tr>
 </thead>
@@ -201,15 +199,15 @@ install a new certificate.
         </td>
         <td width="1" align="center">
             <a href="ssl-settings.jsp?alias=<%= a %>&type=server&uninstall=true"
-             title="Click to uninstall..."
-             onclick="return confirm('Are you sure you want to uninstall this certificate?');"
+             title="<fmt:message key="ssl.settings.click_uninstall" />"
+             onclick="return confirm('<fmt:message key="ssl.settings.confirm_uninstall" />');"
              ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
     <tr>
         <td colspan="3">
             <span class="jive-description">
-            Public Key:
+            <fmt:message key="ssl.settings.key" />
             </span>
 <textarea cols="40" rows="3" style="width:100%;font-size:8pt;" wrap="virtual">
 <%= c.getPublicKey() %></textarea>
@@ -223,7 +221,7 @@ install a new certificate.
     <tr>
         <td colspan="4">
             <p>
-            No certificates installed. Use the form below to install one.
+            <fmt:message key="ssl.settings.no_installed" />
             </p>
         </td>
     </tr>
@@ -239,12 +237,10 @@ install a new certificate.
 <form action="ssl-settings.jsp" method="post">
 
 <fieldset>
-    <legend>Install Certificate</legend>
+    <legend><fmt:message key="ssl.settings.install_certificate" /></legend>
     <div>
     <p>
-    New X.509 certificates can be added to the system by pasting in the certificate
-    data sent to you by a Certificate Authority (e.g. Verisign) or you can
-    generate your own self-signed certificates.
+      <fmt:message key="ssl.settings.install_certificate_info" />
     </p>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
@@ -252,7 +248,7 @@ install a new certificate.
             <tr><td>&nbsp;</td>
                 <td>
                     <span class="jive-error-text">
-                    Please enter a valid alias.
+                    <fmt:message key="ssl.settings.enter_alias" />
                     </span>
                 </td>
             </tr>
@@ -260,7 +256,7 @@ install a new certificate.
             <tr><td>&nbsp;</td>
                 <td>
                     <span class="jive-error-text">
-                    Please enter a valid certificate.
+                    <fmt:message key="ssl.settings.enter_certificate" />
                     </span>
                 </td>
             </tr>
@@ -270,34 +266,34 @@ install a new certificate.
             <tr><td>&nbsp;</td>
                 <td>
                     <span class="jive-error-text">
-                    Error installing the certificate.
+                    <fmt:message key="ssl.settings.error_installing" />
                     <%  if (error != null && !"".equals(error.trim())) { %>
-                        Error reported: <%= error %>.
+                        <fmt:message key="ssl.settings.error_reported" />: <%= error %>.
                     <%  } %>
                     </span>
                 </td>
             </tr>
         <%  } %>
         <tr>
-            <td nowrap>Certificate Type:</td>
+            <td nowrap><fmt:message key="ssl.settings.type" />:</td>
             <td>
                 <select name="type" size="1">
-                    <option value="server">Server Certificate</option>
-                    <option value="client">Client Certificate</option>
+                    <option value="server"><fmt:message key="ssl.settings.server" /></option>
+                    <option value="client"><fmt:message key="ssl.settings.client" /></option>
                 </select>
             </td>
         </tr>
         <tr>
-            <td nowrap>Alias:</td>
+            <td nowrap><fmt:message key="ssl.settings.alias" />:</td>
             <td>
                 <input name="alias" type="text" size="50" maxlength="255" value="<%= (alias != null ? alias : "") %>">
             </td>
         </tr>
         <tr valign="top">
-            <td nowrap>Certificate:</td>
+            <td nowrap><fmt:message key="ssl.settings.a_certificate" />:</td>
             <td>
                 <span class="jive-description">
-                Paste in the certificate sent to you by the CA or the self-signed certificate generated via the keytool.<br>
+                <fmt:message key="ssl.settings.paste_certificate" /><br>
                 </span>
                 <textarea name="cert" cols="55" rows="7" wrap="virtual" style="font-size:8pt;"></textarea>
             </td>