Added translation for buttons and some missing texts.

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

src/i18n/messenger_i18n_en.properties

@@ -261,6 +261,15 @@ muc.form.conf.owner_roomowners=Room Owners
 
 global.restart=restart
 global.server_status=Server Status
+global.save_settings=Save Settings
+global.cancel=Cancel
+global.save_changes=Save Changes
+global.save_property=Save Property
+global.save_properties=Save Properties
+global.edit_properties=Edit Properties
+global.stop=Stop
+global.restore_defaults=Restore Defaults
+global.add=Add
 
 # Group Chat Service Properties Page
 
@@ -390,12 +399,14 @@ group.create.show_group_in_all_users=Show group in all users' rosters.
 group.create.show_group_in_group_members=Show group in group members' rosters
 group.create.show_group_in_roster_group=Show group to members' rosters of these groups:
 group.create.required_fields=Required fields
+group.create.create=Create Group
 
 # Group delete Page
 
 group.delete.title=Delete Group
 group.delete.hint_info=Are you sure you want to delete the group
 group.delete.hint_info1=from the system?
+group.delete.delete=Delete Group
 
 # Group edit Page
 
@@ -475,6 +486,8 @@ locale.title=Server Locale
 locale.title.info=Use the form below to set the system locale. By default, the locale is the system \
         default locale and the language is English.
 locale.system.set=Set System Locale
+locale.current=Current Locale
+locale.choose=Choose new locale
 
 # License details Page
 
@@ -587,6 +600,7 @@ muc.room.delete.destructon_title=Destruction Details
 muc.room.delete.room_id=Room ID:
 muc.room.delete.reason=Reason:
 muc.room.delete.alternate_address=Alternate Room Address:
+muc.room.delete.destroy_room=Destroy Room
 
 # Muc room edit form Page
 
@@ -1088,6 +1102,7 @@ ssl.settings.client=Client Certificate
 ssl.settings.a_certificate=Certificate
 ssl.settings.paste_certificate=Paste in the certificate sent to you by the CA or the self-signed \
         certificate generated via the keytool.
+ssl.settings.add_certificate=Add Certificate
 
 # User create Page
 
@@ -1109,6 +1124,8 @@ user.create.email=Email
 user.create.pwd=Password
 user.create.confirm_pwd=Confirm Password
 user.create.requied=Required fields
+user.create.create=Create User
+user.create.create_another=Create & Create Another
 
 # User delete Page
 
@@ -1119,6 +1136,7 @@ user.delete.warning=Warning! You are about to delete your
 user.delete.warning2=own
 user.delete.warning3=user account. Are you sure you want to do this? Doing so will log you out of \
         the system immediately.
+user.delete.delete=Delete User
 
 # User edit form Page
 
@@ -1144,6 +1162,7 @@ user.message.send_session=Send to all user sessions
 user.message.valid_address=Please choose a valid address.
 user.message.message=Message
 user.message.valid_message=Please enter a valid message.
+user.message.send_message=Send Message
 
 # User password Page
 
@@ -1155,6 +1174,7 @@ user.password.info=Use the form below to change the user's password.
 user.password.change=Change Password
 user.password.new_pwd=New Password
 user.password.confirm_new_pwd=Confirm New Password
+user.password.update_pwd=Update Password
 
 # User properties Page
 
@@ -1173,22 +1193,24 @@ user.properties.registered=Registered
 user.search.title=User Search
 user.search.not_found=User not found. Please try a different search.
 user.search.search_user=Search For User
+user.search.search=Search!
 
 # User Summary Page
 
-User.Summary.title=User Summary
-User.Summary.info=Below is a list of users in the system.
-User.Summary.deleted=User deleted successfully.
-User.Summary.total_user=Total Users
-User.Summary.showing=Showing
-User.Summary.sorted=Sorted by Username
-User.Summary.pages=Pages
-User.Summary.created=Created
-User.Summary.edit=Edit
-User.Summary.delete=Delete
-User.Summary.not_user=No users in the system.
-User.Summary.click_edit=Click to edit...
-User.Summary.click_delete=Click to delete...
+user.summary.title=User Summary
+user.summary.info=Below is a list of users in the system.
+user.summary.deleted=User deleted successfully.
+user.summary.total_user=Total Users
+user.summary.showing=Showing
+user.summary.sorted=Sorted by Username
+user.summary.users_per_page=Users per page
+user.summary.pages=Pages
+user.summary.created=Created
+user.summary.edit=Edit
+user.summary.delete=Delete
+user.summary.not_user=No users in the system.
+user.summary.click_edit=Click to edit...
+user.summary.click_delete=Click to delete...
 
 # User tabs Page
 

src/i18n/messenger_i18n_zh_CN.properties

@@ -230,6 +230,15 @@ muc.form.conf.owner_roomowners=\u623f\u95f4\u62e5\u6709\u8005
 
 global.restart=\u91cd\u65b0\u542f\u52a8
 global.server_status=\u670d\u52a1\u5668\u72b6\u6001
+global.save_settings=Save Settings
+global.cancel=Cancel
+global.save_changes=Save Changes
+global.save_property=Save Property
+global.save_properties=Save Properties
+global.edit_properties=Edit Properties
+global.stop=Stop
+global.restore_defaults=Restore Defaults
+global.add=Add
 
 # Group Chat Service Properties Page
 
@@ -346,12 +355,14 @@ group.create.show_group_in_all_users=\u5728\u6240\u6709\u7528\u6237\u7684\u540d\
 group.create.show_group_in_group_members=\u5728\u7ec4\u6210\u5458\u7684\u540d\u5355\u4e2d\u663e\u793a\u7ec4\u3002
 group.create.show_group_in_roster_group=\u5728\u8fd9\u4e9b\u7ec4\u7684\u6210\u5458\u7684\u540d\u5355\u4e2d\u663e\u793a\u7ec4\uff1a
 group.create.required_fields=\u5fc5\u586b\u5b57\u6bb5
+group.create.create=Create Group
 
 # Group delete Page
 
 group.delete.title=\u5220\u9664\u7ec4
 group.delete.hint_info=\u786e\u5b9e\u8981\u4ece\u7cfb\u7edf\u4e2d\u5220\u9664\u7ec4
 group.delete.hint_info1=\u5417\uff1f
+group.delete.delete=Delete Group
 
 # Group edit Page
 
@@ -427,6 +438,8 @@ index.local=\u8bed\u8a00\u73af\u5883\uff0f\u65f6\u533a\uff1a
 locale.title=\u670d\u52a1\u5668\u8bed\u8a00\u73af\u5883
 locale.title.info=\u8bf7\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u8bbe\u7f6e\u7cfb\u7edf\u8bed\u8a00\u73af\u5883\u3002\u7f3a\u7701\u60c5\u51b5\u4e0b\uff0c\u8bed\u8a00\u73af\u5883\u662f\u7cfb\u7edf\u7f3a\u7701\u8bed\u8a00\u73af\u5883\uff0c\u800c\u8bed\u8a00\u662f\u82f1\u8bed\u3002
 locale.system.set=\u8bbe\u7f6e\u7cfb\u7edf\u8bed\u8a00\u73af\u5883
+locale.current=Current Locale
+locale.choose=Choose new locale
 
 # License details Page
 
@@ -530,6 +543,7 @@ muc.room.delete.destructon_title=\u9500\u6bc1\u8be6\u7ec6\u4fe1\u606f
 muc.room.delete.room_id=\u623f\u95f4\u6807\u8bc6\uff1a
 muc.room.delete.reason=\u539f\u56e0\uff1a
 muc.room.delete.alternate_address=\u5907\u7528\u623f\u95f4\u5730\u5740\uff1a
+muc.room.delete.destroy_room=Destroy Room
 
 # Muc room edit form Page
 
@@ -700,7 +714,8 @@ server.properties.max_character=\u6700\u591a 1000 \u4e2a\u5b57\u7b26\u3002
 server.props.title=\u7f16\u8f91\u670d\u52a1\u5668\u5c5e\u6027
 server.props.info=\u8bf7\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u7f16\u8f91\u670d\u52a1\u5668\u5c5e\u6027\u3002
 server.props.update=\u5df2\u6210\u529f\u66f4\u65b0\u670d\u52a1\u5668\u5c5e\u6027\u3002\u60a8\u5c06\u9700\u8981
-server.props.update2=\u670d\u52a1\u5668\u4ee5\u4f7f\u66f4\u6539\u751f\u6548\uff08\u8bf7\u53c2\u9605server.props.property=\u670d\u52a1\u5668\u5c5e\u6027
+server.props.update2=\u670d\u52a1\u5668\u4ee5\u4f7f\u66f4\u6539\u751f\u6548\uff08\u8bf7\u53c2\u9605
+server.props.property=\u670d\u52a1\u5668\u5c5e\u6027
 server.props.name=\u670d\u52a1\u5668\u540d\u79f0\uff1a
 server.props.valid_hostname=\u8bf7\u8f93\u5165\u6709\u6548\u7684\u670d\u52a1\u5668\u4e3b\u673a\u540d\u6216
 server.props.valid_hostname1=\u6062\u590d\u7f3a\u7701\u503c
@@ -965,6 +980,7 @@ ssl.settings.server=\u670d\u52a1\u5668\u8bc1\u4e66
 ssl.settings.client=\u5ba2\u6237\u673a\u8bc1\u4e66
 ssl.settings.a_certificate=\u8bc1\u4e66
 ssl.settings.paste_certificate=\u7c98\u8d34 CA \u53d1\u9001\u7ed9\u60a8\u7684\u8bc1\u4e66\u6216\u7531 keytool \u751f\u6210\u7684\u81ea\u7b7e\u7f72\u8bc1\u4e66\u3002
+ssl.settings.add_certificate=Add Certificate
 
 # User create Page
 
@@ -986,6 +1002,8 @@ user.create.email=\u7535\u5b50\u90ae\u4ef6
 user.create.pwd=\u5bc6\u7801
 user.create.confirm_pwd=\u786e\u8ba4\u5bc6\u7801
 user.create.requied=\u5fc5\u586b\u5b57\u6bb5
+user.create.create=Create User
+user.create.create_another=Create & Create Another
 
 # User delete Page
 
@@ -995,6 +1013,7 @@ user.delete.info1=\u5417\uff1f
 user.delete.warning=\u8b66\u544a\uff01\u60a8\u6b63\u8981\u5220\u9664\u60a8
 user.delete.warning2=\u81ea\u5df1\u7684
 user.delete.warning3=\u7528\u6237\u5e10\u6237\u3002\u786e\u5b9e\u8981\u5220\u9664\u5417\uff1f\u6267\u884c\u8be5\u64cd\u4f5c\u5c06\u4f7f\u60a8\u7acb\u5373\u4ece\u7cfb\u7edf\u6ce8\u9500\u3002
+user.delete.delete=Delete User
 
 # User edit form Page
 
@@ -1018,6 +1037,7 @@ user.message.send_session=\u53d1\u9001\u81f3\u6240\u6709\u7528\u6237\u4f1a\u8bdd
 user.message.valid_address=\u8bf7\u9009\u62e9\u6709\u6548\u5730\u5740\u3002
 user.message.message=\u6d88\u606f
 user.message.valid_message=\u8bf7\u8f93\u5165\u6709\u6548\u6d88\u606f\u3002
+user.message.send_message=Send Message
 
 # User password Page
 
@@ -1028,6 +1048,7 @@ user.password.info=\u8bf7\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u66f4\u6539\
 user.password.change=\u66f4\u6539\u5bc6\u7801
 user.password.new_pwd=\u65b0\u5bc6\u7801
 user.password.confirm_new_pwd=\u786e\u8ba4\u65b0\u5bc6\u7801
+user.password.update_pwd=Update Password
 
 # User properties Page
 
@@ -1045,22 +1066,24 @@ user.properties.registered=\u5df2\u6ce8\u518c
 user.search.title=\u7528\u6237\u641c\u7d22
 user.search.not_found=\u672a\u627e\u5230\u7528\u6237\u3002\u8bf7\u5c1d\u8bd5\u522b\u7684\u641c\u7d22\u3002
 user.search.search_user=\u641c\u7d22\u7528\u6237
+user.search.search=Search!
 
 # User Summary Page
 
-User.Summary.title=\u7528\u6237\u6458\u8981
-User.Summary.info=\u4e0b\u9762\u662f\u7cfb\u7edf\u4e2d\u7684\u7528\u6237\u5217\u8868\u3002
-User.Summary.deleted=\u5df2\u6210\u529f\u5220\u9664\u7528\u6237\u3002
-User.Summary.total_user=\u7528\u6237\u603b\u6570
-User.Summary.showing=\u663e\u793a
-User.Summary.sorted=\u6309\u7528\u6237\u540d\u6392\u5e8f
-User.Summary.pages=\u9875
-User.Summary.created=\u5df2\u521b\u5efa
-User.Summary.edit=\u7f16\u8f91
-User.Summary.delete=\u5220\u9664
-User.Summary.not_user=\u7cfb\u7edf\u4e2d\u65e0\u7528\u6237\u3002
-User.Summary.click_edit=\u5355\u51fb\u53ef\u7f16\u8f91...
-User.Summary.click_delete=\u5355\u51fb\u53ef\u5220\u9664...
+user.summary.title=\u7528\u6237\u6458\u8981
+user.summary.info=\u4e0b\u9762\u662f\u7cfb\u7edf\u4e2d\u7684\u7528\u6237\u5217\u8868\u3002
+user.summary.deleted=\u5df2\u6210\u529f\u5220\u9664\u7528\u6237\u3002
+user.summary.total_user=\u7528\u6237\u603b\u6570
+user.summary.showing=\u663e\u793a
+user.summary.sorted=\u6309\u7528\u6237\u540d\u6392\u5e8f
+user.summary.users_per_page=Users per page
+user.summary.pages=\u9875
+user.summary.created=\u5df2\u521b\u5efa
+user.summary.edit=\u7f16\u8f91
+user.summary.delete=\u5220\u9664
+user.summary.not_user=\u7cfb\u7edf\u4e2d\u65e0\u7528\u6237\u3002
+user.summary.click_edit=\u5355\u51fb\u53ef\u7f16\u8f91...
+user.summary.click_delete=\u5355\u51fb\u53ef\u5220\u9664...
 
 # User tabs Page
 

src/java/org/jivesoftware/messenger/roster/RosterItemProvider.java

@@ -336,7 +336,12 @@ public class RosterItemProvider {
             for (int i = 0; iter.hasNext(); i++) {
                 pstmt.setInt(2, i);
                 pstmt.setString(3, (String)iter.next());
-                pstmt.executeUpdate();
+                try {
+                    pstmt.executeUpdate();
+                }
+                catch (SQLException e) {
+                    e.printStackTrace();
+                }
             }
         }
         finally {

src/web/audit-policy.jsp

@@ -270,7 +270,7 @@
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings">
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/chatroom-history-settings.jsp

@@ -159,7 +159,7 @@
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings">
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/group-create.jsp

@@ -351,8 +351,8 @@
 
 <br><br>
 
-<input type="submit" name="create" value="Create Group">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" name="create" value="<fmt:message key="group.create.create" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 
 </form>
 

src/web/group-delete.jsp

@@ -66,8 +66,8 @@
 
 <form action="group-delete.jsp">
 <input type="hidden" name="group" value="<%= groupName %>">
-<input type="submit" name="delete" value="Delete Group">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" name="delete" value="<fmt:message key="group.delete.delete" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 </form>
 
 <jsp:include page="bottom.jsp" flush="true" />

src/web/group-edit.jsp

@@ -422,8 +422,8 @@
     <br>
 
     <%  if (edit) { %>
-        <input type="submit" name="save" value="Save Settings">
-        <input type="submit" name="cancel" value="Cancel">
+        <input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
+        <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
     <%  } %>
 
                     </form>
@@ -440,7 +440,7 @@
                 </td>
                 <td nowrap class="c1" align="left">
                     <input type="text" size="40" name="users"/>
-                    &nbsp;<input type="submit" name="addbutton" value="Add">
+                    &nbsp;<input type="submit" name="addbutton" value="<fmt:message key="global.add" />">
                 </td>
             </tr>
         </table>

src/web/index.jsp

@@ -118,9 +118,9 @@
                 started <%= formatter.format(webManager.getXMPPServer().getServerInfo().getLastStarted()) %>
 
                 <% if (webManager.getXMPPServer().isStandAlone()){ %>
-                        &nbsp;&nbsp;<input type="submit" value="Stop" name="stop" <%= ((serverOn) ? "" : "disabled") %>>
+                        &nbsp;&nbsp;<input type="submit" value="<fmt:message key="global.stop" />" name="stop" <%= ((serverOn) ? "" : "disabled") %>>
                     <% if (webManager.getXMPPServer().isRestartable()){ %>
-                        &nbsp;&nbsp;<input type="submit" value="Restart" name="restart" <%= ((serverOn) ? "" : "disabled") %>>
+                        &nbsp;&nbsp;<input type="submit" value="<fmt:message key="global.restart" />" name="restart" <%= ((serverOn) ? "" : "disabled") %>>
                     <% } %>
                 <% } %>
 
@@ -235,7 +235,7 @@
 <br>
 
 <form action="server-props.jsp">
-<input type="submit" value="Edit Properties">
+<input type="submit" value="<fmt:message key="global.edit_properties" />">
 </form>
 
 <jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/muc-create-permission.jsp

@@ -166,7 +166,7 @@
         </tbody>
         </table>
         <br>
-        <input type="submit" value="Save Settings">
+        <input type="submit" value="<fmt:message key="global.save_settings" />">
     </div>
 </fieldset>
 

src/web/muc-room-affiliations.jsp

@@ -185,7 +185,7 @@
         <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">
+    <input type="submit" value="<fmt:message key="global.add" />">
     </p>
 
     <div class="jive-table" style="width:400px;">

src/web/muc-room-delete.jsp

@@ -106,8 +106,8 @@
 
 <br><br>
 
-<input type="submit" name="delete" value="Destroy Room">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" name="delete" value="<fmt:message key="muc.room.delete.destroy_room" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 </form>
 
 <jsp:include page="bottom.jsp" flush="true" />

src/web/muc-room-edit-form.jsp

@@ -524,8 +524,8 @@
         </fieldset>
         </tr>
          <tr align="center">
-            <td colspan="2"><input type="submit" name="Submit" value="Save changes">
-            <input type="submit" name="cancel" value="Cancel"></td>
+            <td colspan="2"><input type="submit" name="Submit" value="<fmt:message key="global.save_changes" />">
+            <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"></td>
         </tr>
     </tbody>
     </table>

src/web/muc-tasks.jsp

@@ -201,7 +201,7 @@
 
 <br><br>
 
-<input type="submit" value="Save Settings">
+<input type="submit" value="<fmt:message key="global.save_settings" />">
 
 </form>
 
@@ -237,7 +237,7 @@
 
 <br><br>
 
-<input type="submit" value="Save Settings">
+<input type="submit" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/offline-messages.jsp

@@ -283,7 +283,7 @@
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings">
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/private-data-settings.jsp

@@ -105,7 +105,7 @@
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings">
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/reg-settings.jsp

@@ -146,7 +146,7 @@
 
 <br><br>
 
-<input type="submit" name="save" value="Save Settings">
+<input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/server-locale.jsp

@@ -82,7 +82,7 @@
     <div style="padding-top:0.5em;">
 
         <p>
-        Current Locale: <%= locale.getDisplayName() %> (<%= locale %>)
+        <fmt:message key="locale.current" />: <%= locale.getDisplayName() %> (<%= locale %>)
         </p>
 
         <%  boolean usingPreset = false;
@@ -93,7 +93,7 @@
             }
         %>
 
-        <label for="sel01">Choose new locale:</label>
+        <label for="sel01"><fmt:message key="locale.choose" />:</label>
 
         <select size="1" name="localeCode" style="font-family:courier new; font-size:9pt;"
          id="sel01" onchange="this.form.localeChoice[0].checked=true;">
@@ -121,7 +121,7 @@
 
 <br><br>
 
-<input type="submit" name="save" value="Save Settings">
+<input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/server-properties.jsp

@@ -351,8 +351,8 @@ function dodelete(propName) {
 <tfoot>
     <tr>
         <td colspan="2">
-            <input type="submit" name="save" value="Save Property">
-            <input type="submit" name="cancel" value="Cancel">
+            <input type="submit" name="save" value="<fmt:message key="global.save_property" />">
+            <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
         </td>
     </tr>
 </tfoot>

src/web/server-props.jsp

@@ -243,9 +243,9 @@
 <tfoot>
     <tr>
         <td colspan="2">
-            <input type="submit" name="save" value="Save">
-            <input type="submit" name="defaults" value="Restore Defaults">
-            <input type="submit" name="cancel" value="Cancel">
+            <input type="submit" name="save" value="<fmt:message key="global.save_properties" />">
+            <input type="submit" name="defaults" value="<fmt:message key="global.restore_defaults" />">
+            <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
         </td>
     </tr>
 </tfoot>

src/web/session-conflict.jsp

@@ -168,7 +168,7 @@
 
 <br><br>
 
-<input type="submit" name="update" value="Save Settings">
+<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 
 </form>
 

src/web/session-filter.jsp

@@ -120,7 +120,7 @@
 <br>
 
 <input type="submit" value="Save and Return">
-<input type="submit" value="Cancel" onclick="location.href='session-summary.jsp';">
+<input type="submit" value="<fmt:message key="global.cancel" />" onclick="location.href='session-summary.jsp';">
 
 </form>
 

src/web/ssl-settings.jsp

@@ -301,7 +301,7 @@
         <tr>
             <td colspan="2">
                 <br>
-                <input type="submit" name="install" value="Add Certificate">
+                <input type="submit" name="install" value="<fmt:message key="ssl.settings.add_certificate" />e">
             </td>
         </tr>
     </tbody>

src/web/user-create.jsp

@@ -216,9 +216,9 @@
 
 <br><br>
 
-<input type="submit" name="create" value="Create User">
-<input type="submit" name="another" value="Create &amp; Create Another">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" name="create" value="<fmt:message key="user.create.create" />">
+<input type="submit" name="another" value="<fmt:message key="user.create.create_another" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 
 </form>
 

src/web/user-delete.jsp

@@ -87,8 +87,8 @@
 
 <form action="user-delete.jsp">
 <input type="hidden" name="username" value="<%= username %>">
-<input type="submit" name="delete" value="Delete User">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" name="delete" value="<fmt:message key="user.delete.delete" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 </form>
 
 <jsp:include page="bottom.jsp" flush="true" />

src/web/user-edit-form.jsp

@@ -153,8 +153,8 @@
 
 <br><br>
 
-<input type="submit" value="Save User Properties">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" value="<fmt:message key="global.save_properties" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 
 </form>
 

src/web/user-message.jsp

@@ -253,8 +253,8 @@ function updateSelect(el) {
 
 <br>
 
-<input type="submit" value="Send Message">
-<input type="submit" name="cancel" value="Cancel">
+<input type="submit" value="<fmt:message key="user.message.send_message" />">
+<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
 
 </form>
 

src/web/user-password.jsp

@@ -139,8 +139,8 @@
 
 <br><br>
 
-<input type="submit" value="Update Password" name="update">
-<input type="submit" value="Cancel" name="cancel">
+<input type="submit" value="<fmt:message key="user.password.update_pwd" />" name="update">
+<input type="submit" value="<fmt:message key="global.cancel" />" name="cancel">
 </form>
 
 <script lang="JavaScript" type="text/javascript">

src/web/user-properties.jsp

@@ -213,7 +213,7 @@
 
 <form action="user-edit-form.jsp">
 <input type="hidden" name="username" value="<%= user.getUsername() %>">
-<input type="submit" value="Edit Properties">
+<input type="submit" value="<fmt:message key="global.edit_properties" />">
 </form>
 
 <jsp:include page="bottom.jsp" flush="true" />
\ No newline at end of file

src/web/user-search.jsp

@@ -70,7 +70,7 @@
           <input type="text" name="username" value="<%= ((username!=null) ? username : "") %>" size="30" maxlength="75"/>
         </td>
       </tr>
-     <tr><td colspan="2" nowrap><input type="submit" name="search" value="Search!"/><input type="submit" name="cancel" value="Cancel"/></td>
+     <tr><td colspan="2" nowrap><input type="submit" name="search" value="<fmt:message key="user.search.search" />"/><input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"/></td>
      </tr>
     </table>
   </fieldset>

src/web/user-summary.jsp

@@ -34,7 +34,7 @@
 
 <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
 <%  // Title of this page and breadcrumbs
-    String title = LocaleUtils.getLocalizedString("User.Summary.title");
+    String title = LocaleUtils.getLocalizedString("user.summary.title");
     pageinfo.setTitle(title);
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "index.jsp"));
     pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-summary.jsp"));
@@ -86,7 +86,7 @@
 %>
 
 <p>
-<fmt:message key="User.Summary.info" />
+<fmt:message key="user.summary.info" />
 </p>
 
 <%  if (request.getParameter("deletesuccess") != null) { %>
@@ -96,7 +96,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="User.Summary.deleted" />
+        <fmt:message key="user.summary.deleted" />
         </td></tr>
     </tbody>
     </table>
@@ -105,15 +105,15 @@
 <%  } %>
 
 <p>
-<fmt:message key="User.Summary.total_user" />: <%= webManager.getUserManager().getUserCount() %>,
+<fmt:message key="user.summary.total_user" />: <%= webManager.getUserManager().getUserCount() %>,
 <%  if (numPages > 1) { %>
 
-    <fmt:message key="User.Summary.showing" /> <%= (start+1) %>-<%= (start+range) %>,
+    <fmt:message key="user.summary.showing" /> <%= (start+1) %>-<%= (start+range) %>,
 
 <%  } %>
-<fmt:message key="User.Summary.sorted" />
+<fmt:message key="user.summary.sorted" />
 
-- Users per page:
+- <fmt:message key="user.summary.users_per_page" />:
 <select size="1" onchange="location.href='user-summary.jsp?start=0&range=' + this.options[this.selectedIndex].value;">
 
     <%  for (int i=0; i<RANGE_PRESETS.length; i++) { %>
@@ -129,7 +129,7 @@
 <%  if (numPages > 1) { %>
 
     <p>
-    <fmt:message key="User.Summary.pages" />:
+    <fmt:message key="user.summary.pages" />:
     [
     <%  for (int i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";
@@ -154,9 +154,9 @@
         <th nowrap><fmt:message key="session.details.online" /></th>
         <th nowrap><fmt:message key="user.create.username" /></th>
         <th nowrap><fmt:message key="user.create.name" /></th>
-        <th nowrap><fmt:message key="User.Summary.created" /></th>
-        <th nowrap><fmt:message key="User.Summary.edit" /></th>
-        <th nowrap><fmt:message key="User.Summary.delete" /></th>
+        <th nowrap><fmt:message key="user.summary.created" /></th>
+        <th nowrap><fmt:message key="user.summary.edit" /></th>
+        <th nowrap><fmt:message key="user.summary.delete" /></th>
     </tr>
 </thead>
 <tbody>
@@ -167,7 +167,7 @@
 %>
     <tr>
         <td align="center" colspan="7">
-            <fmt:message key="User.Summary.not_user" />
+            <fmt:message key="user.summary.not_user" />
         </td>
     </tr>
 
@@ -218,12 +218,12 @@
         </td>
         <td width="1%" align="center">
             <a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
-             title="<fmt:message key="User.Summary.click_edit" />"
+             title="<fmt:message key="user.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="user-delete.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
-             title="<fmt:message key="User.Summary.click_delete" />"
+             title="<fmt:message key="user.summary.click_delete" />"
              ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
         </td>
     </tr>
@@ -238,7 +238,7 @@
 <%  if (numPages > 1) { %>
 
     <p>
-    <fmt:message key="User.Summary.pages" />:
+    <fmt:message key="user.summary.pages" />:
     [
     <%  for (i=0; i<numPages; i++) {
             String sep = ((i+1)<numPages) ? " " : "";