From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/locales/en-US/main.js |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/locales/en-US/main.js b/src/locales/en-US/main.js
index 173c4bb..2a9103e 100644
--- a/src/locales/en-US/main.js
+++ b/src/locales/en-US/main.js
@@ -6,12 +6,10 @@
   'main.submit': 'Submit',
   'main.return': 'Return',
   'main.close': 'Close',
-  'main.all': 'All',
   'main.cancel': 'Cancel',
   'main.logout': 'Logout',
   'main.doc': '鏂囨。涓績',
   'main.logout.hint': 'Are you sure you want to log out?',
-  'main.verup': 'Version upgrade',
   'main.password': 'Change the password',
   'main.login.develop': 'Login developer',
   'main.revert.default': 'Restore default Settings',
@@ -28,7 +26,7 @@
   'main.action.primarykey.required': 'Primary key not set!',
   'main.action.primarykey.repetition': 'There are multiple primary keys!',
   'main.action.primarykey.repetitionbid': 'There are multiple BID!',
-  'main.view.unenabled': '鎶辨瓑锛屼綘璁块棶鐨勯〉闈㈡湭鍚敤锛岃鑱旂郴绠＄悊鍛樸��',
+  'main.view.unenabled': '鎶辨瓑锛屾偍璁块棶鐨勯〉闈㈡湭鍚敤锛岃鑱旂郴绠＄悊鍛樸��',
   'main.excel.line': 'line',
   'main.excel.column': 'column',
   'main.excel.includekey': ' Contain keywords ',
@@ -46,7 +44,6 @@
   'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
   'main.form.picture.check': '鏌ョ湅鍥剧墖',
   'main.role.title': 'The role list',
-  'main.view.notFound': '鎶辨瓑锛屼綘璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠＄悊鍛樸��',
   'form.required.input': 'Please enter the ',
   'form.required.select': 'Please select a '
 }
\ No newline at end of file

--
Gitblit v1.8.0