CanadaMes.git - Gitblit

			@@ -1,17 +1,16 @@

			{
			"systemTitle": "登录系统",
			"usernamePlaceholder": "请输入用户名",
			"passwordPlaceholder": "请输入密码",
			"loginButton": "登录",
			"registerButton": "注册",
			"resetButton": "重置",
			"usernameRequired": "请输入用户名",
			"usernameLength": "用户名长度在5-15个字符之间",
			"passwordRequired": "请输入密码",
			"passwordLength": "密码长度在5-15个字符之间",
			"loginSuccess": "登录成功",
			"langBtnCN": "中文",
			{
			"systemTitle": "登录系统",
			"usernamePlaceholder": "请输入用户名",
			"passwordPlaceholder": "请输入密码",
			"loginButton": "登录",
			"registerButton": "注册",
			"resetButton": "重置",
			"usernameRequired": "请输入用户名",
			"usernameLength": "用户名长度在5-15个字符之间",
			"passwordRequired": "请输入密码",
			"passwordLength": "密码长度在5-15个字符之间",
			"loginSuccess": "登录成功",
			"langBtnCN": "中文",
			"langBtnEN": "English",
			"langHome": "首页",
			"langUserManagement": "用户管理",
			@@ -31,13 +30,12 @@
			"langPassword": "密码",
			"langState": "状态",
			"langSelect": "请选择",


			"langEditUserTitle": "修改用户",
			"northglassMESsystem":"北玻MES系统",
			"exit":"退出",
			"changePassword":"修改密码",
			"northglassMESsystem": "北玻MES系统",
			"exit": "退出",
			"changePassword": "修改密码",
			"resetPassword": "重置密码",
			<<<<<<< HEAD
			"home":"主页",
			"role":"角色",
			"langRoleManagement": "角色管理",
			@@ -130,4 +128,142 @@

			}
			}


			=======
			"home": "主页",
			"role": "角色",
			"langRoleManagement": "角色管理",
			"langRoleList": "角色列表",
			"langEnterRoleName": "请输入角色名称",
			"langAddRole": "添加角色",
			"langName": "名称",
			"langIsValid": "是否有效",
			"langOperation": "操作",
			"langPleaseSelect": "请选择",
			"langValid": "有效",
			"langInvalid": "无效",
			"langConfirm": "确定",
			"langCancel": "取消",
			"langAddRoleSuccess": "添加角色成功",
			"langEnterName": "请输入名称",
			"langLengthBetween": "长度在",
			"langAnd": "和",
			"langCharacters": "个字符之间",
			"langEnterState": "请输入状态",
			"langUpdateState": "状态更新成功",
			"langEditRole": "编辑角色",
			"langEditRoleSuccess": "编辑角色成功",
			"langDeleteRoleConfirm": "确定要删除该角色吗？",
			"langPrompt": "提示",
			"langDeleteRoleSuccess": "删除角色成功",
			"langCancelDelete": "已取消删除",
			"langRoleName": "角色名称",
			"updateSuccessMessage": "更新成功",
			"paginationTotal": "共 {total} 条",
			"paginationSizes": "每页显示",
			"paginationPrev": "上一页",
			"paginationPager": "{currentPage}/{pageCount}",
			"paginationNext": "下一页",
			"paginationJumper": "跳至",
			"breadcrumb": {
			"home": "首页",
			"permissionManagement": "权限管理",
			"permissionList": "权限列表"
			},
			"search": {
			"placeholder": "请输入关键字"
			},
			"button": {
			"addPermission": "添加权限",
			"cancel": "取消",
			"confirm": "确认"
			},
			"table": {
			"role": "角色",
			"permissionDescription": "权限描述",
			"permissionValue": "权限值",
			"createTime": "创建时间",
			"isActive": "是否激活",
			"operation": "操作"
			},
			"tooltip": {
			"edit": "修改",
			"delete": "删除"
			},
			"dialog": {
			"addPermission": "添加权限",
			"editPermission": "编辑权限"
			},
			"form": {
			"role": "角色",
			"select": "请选择",
			"permission": "权限",
			"isActive": "是否激活"
			},
			"操作": "操作",
			"有效": "有效",
			"无效": "无效",
			"请输入名称": "请输入名称",
			"长度在 2 到 15 个字符": "长度在 2 到 15 个字符",
			"请输入状态": "请输入状态",
			"添加角色": "添加角色",
			"修改角色": "修改角色",
			"删除角色": "删除角色",
			"此操作将永久删除该角色, 是否继续?": "此操作将永久删除该角色, 是否继续?",
			"提示": "提示",
			"确定": "确定",
			"取消": "取消",
			"添加角色成功": "添加角色成功",
			"更新状态成功": "更新状态成功",
			"修改角色成功": "修改角色成功",
			"删除角色成功": "删除角色成功",
			"translation": {
			"D01 VFD error": "D01 VFD 错误",
			"D02 VFD error": "D02 VFD 错误",
			"D03 VFD error": "D03 VFD 错误",
			"D04 VFD error": "D04 VFD 错误",
			"D05 VFD error": "D05 VFD 错误",
			"D06 VFD error": "D06 VFD 错误",
			"B01 VFD error": "B01 VFD 错误",
			"B02 VFD error": "B02 VFD 错误",
			"A01 VFD error": "A01 VFD 错误",
			"A02 VFD error": "A02 VFD 错误",
			"A01 servo turn error": "A01 servo turn 错误",
			"A02 servo turn error": "A02 servo turn 错误",
			"A01 servo travel error": "A01 servo travel 错误",
			"A02 servo travel error": "A02 servo travel 错误",
			"B01 servo travel error": "B01 servo travel 错误",
			"B02 servo travel error": "B02 servo travel 错误",
			"D01 DEC error": "D01 DEC 错误",
			"D01 pos error": "D01 pos 错误",
			"D02 DEC error": "D02 DEC 错误",
			"D02 pos error": "D02 pos 错误",
			"D03 DEC error": "D03 DEC 错误",
			"D03 pos error": "D03 pos 错误",
			"D04 DEC error": "D04 DEC 错误",
			"D04 pos error": "D04 pos 错误",
			"D05 DEC error": "D05 DEC 错误",
			"D05 pos error": "D05 pos 错误",
			"D06 DEC error": "D06 DEC 错误",
			"D06 pos error": "D06 pos 错误",
			"A01 DEC error": "A01 DEC 错误",
			"A01 pos error": "A01 pos 错误",
			"A02 DEC error": "A02 DEC 错误",
			"A02 pos error": "A02 pos 错误",
			"B01 IN DEC error": "B01 IN DEC 错误",
			"B01 IN pos error": "B01 IN pos 错误",
			"B01 OUT DEC error": "B01 OUT DEC 错误",
			"B01 OUT pos error": "B01 OUT pos 错误",
			"B02 IN DEC error": "B02 IN DEC 错误",
			"B02 IN pos error": "B02 IN pos 错误",
			"B02 OUT DEC error": "B02 OUT DEC 错误",
			"B02 OUT pos error": "B02 OUT pos 错误"
			},
			"Parameter": "参数下发",
			"Action": "开关控制",
			"Sign": "IO状态",
			"State": "State",
			"Alarm": "报警信息",
			"Distribute": "下发"
			}
			>>>>>>> 36acd690614dd276428530a59f448c543bac52d4