diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 90667a1dd..067a68271 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -449,7 +449,7 @@ form_validate=form validate success
 entry=entry
 add_entry=add entry
 maintainable=maintainable
-useabel=useabel
+useable=useable
 click_add=click add
 menu_name=menu name
 unicode=unicode
@@ -489,4 +489,22 @@ area=area
 longitude=longitude
 latitude=latitude
 
+role_list=role list
+role_allot=role allot
+staff_list=staff list
+choose_and_allot=\u901a\u8fc7\u9009\u62e9\u90e8\u95e8\uff0c\u7136\u540e\u4e3a\u5217\u51fa\u7684\u4eba\u5458\u5206\u914d\u89d2\u8272\u3002
+loading=loading...
+remove=remove
+sure_remove_role= role will be removed from this user\uff1f
+system_prompt=system prompt
+old_password=old password
+new_password=new password
+sure_new_password=confirm new password
+be_selected_staff=be selected staff
+selected_staff=selected staff
+old_remove_error=old role can be removed\uff01
+selected_clear_success=selected staff clear success\uff01
+cancel_clear=cancel clear\uff01
+sure_clear=clear
+role_no_new=role dont have new staff\uff01
 #==========xitongguanli end======================
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 66a4ffd41..f3a306159 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -450,7 +450,7 @@ form_validate=\u8868\u5355\u9a8c\u8bc1\u6210\u529f\uff01
 entry=\u8bcd\u6761\u9879
 add_entry=\u6dfb\u52a0\u8bcd\u6761
 maintainable=\u53ef\u7ef4\u62a4
-useabel=\u53ef\u7528
+useable=\u53ef\u7528
 click_add=\u70b9\u51fb\u6dfb\u52a0
 menu_name=\u83dc\u5355\u540d\u79f0
 unicode=\u56fd\u9645\u5316\u7f16\u7801
@@ -488,6 +488,24 @@ area_code=\u533a\u57df\u7f16\u7801
 area_type=\u533a\u57df\u7c7b\u578b
 area=\u533a\u57df
 longitude=\u7ecf\u5ea6
-latitude=\u7ef4\u5ea6
+latitude=\u7eac\u5ea6
 
+role_list=\u89d2\u8272\u5217\u8868
+role_allot=\u89d2\u8272\u5206\u914d
+staff_list=\u4eba\u5458\u5217\u8868
+choose_and_allot=\u901a\u8fc7\u9009\u62e9\u90e8\u95e8\uff0c\u7136\u540e\u4e3a\u5217\u51fa\u7684\u4eba\u5458\u5206\u914d\u89d2\u8272\u3002
+loading=\u6b63\u5728\u63d0\u4ea4\uff0c\u8bf7\u7a0d\u7b49...
+remove=\u79fb\u9664
+sure_remove_role=\u89d2\u8272\u5c06\u4ece\u8be5\u7528\u6237\u4e2d\u79fb\u9664\uff1f
+system_prompt=\u7cfb\u7edf\u63d0\u793a
+old_password=\u65e7\u5bc6\u7801
+new_password=\u65b0\u5bc6\u7801
+sure_new_password=\u786e\u8ba4\u65b0\u5bc6\u7801
+be_selected_staff=\u5f85\u9009\u4eba\u5458
+selected_staff=\u5df2\u9009\u4eba\u5458
+old_remove_error=\u89d2\u8272\u539f\u6709\u6210\u5458\u4e0d\u80fd\u6e05\u9664\uff01
+selected_clear_success=\u5df2\u9009\u4eba\u5458\u6e05\u9664\u6210\u529f\uff01
+cancel_clear=\u53d6\u6d88\u6e05\u9664\u64cd\u4f5c\uff01
+sure_clear=\u6e05\u9664\u786e\u8ba4
+role_no_new=\u89d2\u8272\u672a\u5206\u914d\u65b0\u6210\u5458\uff01
 #==========xitongguanli end======================
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
index 0bea56bf7..7d6f32fe9 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
@@ -207,12 +207,12 @@
 	               		<spring:message code="mark"/> <input type="text"  class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
 	               		   <spring:message code="value"/> <input type="text"  class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
 	               		 <spring:message code="describe"/> <input type="text"  class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
-	               		  	<spring:message code="useabel"/>
+	               		  	<spring:message code="useable"/>
 	               		  	<select class="itemStatus noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
 	               		  		<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>><spring:message code="yes"/></option>
 	               		  		<option value="0" <c:if test="${dictItem.status==0}">selected</c:if>><spring:message code="no"/></option>
 	               		  	</select>
-						   <spring:message code="maintain"/>
+						   <spring:message code="maintainable"/>
 							<select class="itemType noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
 	               		  		<option value="1" <c:if test="${dictItem.type==1}">selected</c:if>><spring:message code="yes"/></option>
 	               		  		<option value="0" <c:if test="${dictItem.type==0}">selected</c:if>><spring:message code="no"/></option>
diff --git a/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp b/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
index 94e2aeae3..1ec19616a 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
@@ -29,7 +29,7 @@
 		<script type="text/javascript">
 			$("#assignButton").click(function(){
 				top.$.jBox.open("iframe:${ctx}/sys/role/usertorole?id=${sysRole.id}", "分配角色",810,$(top.document).height()-240,{
-					buttons:{"确定分配":"ok", "清除已选":"clear", "关闭":true}, bottomText:"通过选择部门，然后为列出的人员分配角色。",submit:function(v, h, f){
+					buttons:{"确定分配":"ok", "清除已选":"clear", "关闭":true}, bottomText:"<spring:message code='choose_and_allot'/>",submit:function(v, h, f){
 						var pre_ids = h.find("iframe")[0].contentWindow.pre_ids;
 						var ids = h.find("iframe")[0].contentWindow.ids;
 						//nodes = selectedTree.getSelectedNodes();
@@ -40,7 +40,7 @@
 								pre_ids.shift();
 							}
 							if(pre_ids.sort().toString() == ids.sort().toString()){
-								top.$.jBox.tip("未给角色【${sysRole.name}】分配新成员！", 'info');
+								top.$.jBox.tip("<spring:message code='norole'/>【${sysRole.name}】<spring:message code='allot_new'/>！", 'info');
 								return false;
 							};
 					    	// 执行保存
@@ -64,7 +64,7 @@
 		</script>
 	</div>
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead><tr><th>登录账户</th><th>姓名</th><th>归属部门</th><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+		<thead><tr><th><spring:message code="login_name"></spring:message></th><th><spring:message code="name"/></th><th><spring:message code="owner_group"/></th><shiro:hasPermission name="sys:user:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 		<tbody>
 		<c:forEach items="${userList}" var="user">
 			<tr>
@@ -73,7 +73,7 @@
 				<td>${user.office.name}</td>
 				<shiro:hasPermission name="sys:role:edit"><td>
 					<a href="${ctx}/sys/role/outrole?userId=${user.id}&roleId=${sysRole.id}" 
-						onclick="return confirmx('确认要将用户<b>[${user.name}]</b>从<b>[${sysRole.name}]</b>角色中移除吗？', this.href)">移除</a>
+						onclick="return confirmx('[${sysRole.name}]<spring:message code='sure_remove_role'/>', this.href)"><spring:message code="remove"/></a>
 				</td></shiro:hasPermission>
 			</tr>
 		</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/sys/selectUserToRole.jsp b/src/main/webapp/WEB-INF/views/sys/selectUserToRole.jsp
index fe6a2680b..37c90d62b 100644
--- a/src/main/webapp/WEB-INF/views/sys/selectUserToRole.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/selectUserToRole.jsp
@@ -70,7 +70,7 @@
 					selectedTree.removeNode(treeNode);
 					ids.splice($.inArray(String(treeNode.id), ids), 1);
 				}else{
-					top.$.jBox.tip("角色原有成员不能清除！", 'info');
+					top.$.jBox.tip("<spring:message code='old_remove_error'/>", 'info');
 				}
 			}
 		};
@@ -79,9 +79,9 @@
 			    if (v == 'ok'){
 					var tips="";
 					if(pre_ids.sort().toString() == ids.sort().toString()){
-						tips = "未给角色【${role.name}】分配新成员！";
+						tips = "【${role.name}】<spring:message code='role_no_new'/>";
 					}else{
-						tips = "已选人员清除成功！";
+						tips = "<spring:message code='selected_clear_success'/>";
 					}
 					ids=pre_ids.slice(0);
 					selectedNodes=pre_selectedNodes;
@@ -89,27 +89,27 @@
 			    	top.$.jBox.tip(tips, 'info');
 			    } else if (v == 'cancel'){
 			    	// 取消
-			    	top.$.jBox.tip("取消清除操作！", 'info');
+			    	top.$.jBox.tip("<spring:message code='cancel_clear'/>", 'info');
 			    }
 			    return true;
 			};
-			tips="确定清除角色【${role.name}】下的已选人员？";
-			top.$.jBox.confirm(tips, "清除确认", submit);
+			tips="【${role.name}】<spring:message code="sure_remove_role"/>";
+			top.$.jBox.confirm(tips, "<spring:message code='sure_clear'/>", submit);
 		};
 	</script>
 </head>
 <body>
 	<div id="assignRole" class="row-fluid span12">
 		<div class="span4" style="border-right: 1px solid #A8A8A8;">
-			<p>所在部门：</p>
+			<p><spring:message code="owner_group"/>：</p>
 			<div id="officeTree" class="ztree"></div>
 		</div>
 		<div class="span3">
-			<p>待选人员：</p>
+			<p><spring:message code="be_selected_staff"/>：</p>
 			<div id="userTree" class="ztree"></div>
 		</div>
 		<div class="span3" style="padding-left:16px;border-left: 1px solid #A8A8A8;">
-			<p>已选人员：</p>
+			<p><spring:message code="selected_staff"/>：</p>
 			<div id="selectedTree" class="ztree"></div>
 		</div>
 	</div>
diff --git a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
index b0e8fc2e6..79a83848e 100644
--- a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
@@ -34,8 +34,8 @@
 	<div class="page-content">
 		<div class="row">
 			<ul class="nav nav-tabs">
-				<li class="active"><a href="${ctx}/sys/user/info">个人信息</a></li>
-				<li><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
+				<li class="active"><a href="${ctx}/sys/user/info"><spring:message code="userInfo"/></a></li>
+				<li><a href="${ctx}/sys/user/modifyPwd"><spring:message code="updatePwd"/></a></li>
 			</ul>
 			<br />
 			<div class="col-md-12">
@@ -54,7 +54,7 @@
 							<sys:message content="${message}" />
 							<div class="form-body">
 								<div class="form-group">
-									<label class="col-md-3 control-label">头像:</label>
+									<label class="col-md-3 control-label"><spring:message code="name_image"/>:</label>
 									<div class="col-md-4">
 										<form:hidden id="nameImage" path="photo" htmlEscape="false"
 											maxlength="255" class="input-xlarge" />
@@ -65,14 +65,14 @@
 								</div>
 
 								<div class="form-group">
-									<label class="col-md-3 control-label">姓名:</label>
+									<label class="col-md-3 control-label"><spring:message code="name"/>:</label>
 									<div class="col-md-4">
 										<form:input path="name" htmlEscape="false" maxlength="50"
 											class="required form-control" readonly="true" />
 									</div>
 								</div>
 								<div class="form-group">
-									<label class="col-md-3 control-label">邮箱:</label>
+									<label class="col-md-3 control-label"><spring:message code="mail"/>:</label>
 									<div class="col-md-4">
 										<form:input path="email" htmlEscape="false" maxlength="50"
 											class="email form-control" />
@@ -80,7 +80,7 @@
 								</div>
 
 								<div class="form-group">
-									<label class="col-md-3 control-label">用户部门:</label>
+									<label class="col-md-3 control-label"><spring:message code="department"/>:</label>
 									<div class="col-md-4">
 										<label class="lbl control-label">${user.office.name}</label>
 									</div>
@@ -88,7 +88,7 @@
 
 
 								<div class="form-group">
-									<label class="col-md-3 control-label">用户角色:</label>
+									<label class="col-md-3 control-label"><spring:message code="role_name"/>:</label>
 									<div class="col-md-4">
 										<label class="lbl control-label">${user.roleNames}</label>
 									</div>
diff --git a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
index d7c63a985..95518b79d 100644
--- a/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userModifyPwd.jsp
@@ -10,15 +10,15 @@
 				rules: {
 				},
 				messages: {
-					confirmNewPassword: {equalTo: "输入与上面相同的密码"}
+					confirmNewPassword: {equalTo: "<spring:message code="equal_password"/>"}
 				},
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
+					loading('<spring:message code="loading"/>');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code="enter_error"/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -33,8 +33,8 @@
 <div class="page-content">
 		<div class="row">
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/sys/user/info">个人信息</a></li>
-		<li class="active"><a href="${ctx}/sys/user/modifyPwd">修改密码</a></li>
+		<li><a href="${ctx}/sys/user/info"><spring:message code="userInfo"/></a></li>
+		<li class="active"><a href="${ctx}/sys/user/modifyPwd"><spring:message code="updatePwd"/></a></li>
 	</ul><br/>
 	<div class="col-md-12">
 		<div class="portlet box blue">
@@ -50,21 +50,21 @@
 		<sys:message content="${message}"/>
 		<div class="form-body">
 		<div class="form-group">
-			<label class="col-md-3 control-label">旧密码:</label>
+			<label class="col-md-3 control-label"><spring:message code="old_password"/>:</label>
 			<div class="col-md-4">
 				<input id="oldPassword" name="oldPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
 				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		<div class="form-group">
-			<label class="col-md-3 control-label">新密码:</label>
+			<label class="col-md-3 control-label"><spring:message code="new_password"/>:</label>
 			<div class="col-md-4">
 				<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control"/>
 			</div>
 				<span class="help-inline"><font color="red">*</font> </span>
 		</div>
 		<div class="form-group">
-			<label class="col-md-3 control-label">确认新密码:</label>
+			<label class="col-md-3 control-label"><spring:message code="sure_new_password"/>:</label>
 			<div class="col-md-4">
 				<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" class="required form-control" equalTo="#newPassword"/>
 			</div>