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 | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/locales/en-US/main.js b/src/locales/en-US/main.js
index 404b8bf..2a9103e 100644
--- a/src/locales/en-US/main.js
+++ b/src/locales/en-US/main.js
@@ -1,13 +1,23 @@
export default {
'main.search': 'Search',
'main.reset': 'Reset',
+ 'main.edit': 'Edit',
'main.confirm': 'OK',
- 'main.return': 'Cancel',
- 'main.all': 'All',
+ 'main.submit': 'Submit',
+ 'main.return': 'Return',
+ 'main.close': 'Close',
+ 'main.cancel': 'Cancel',
+ 'main.logout': 'Logout',
+ 'main.doc': '鏂囨。涓績',
+ 'main.logout.hint': 'Are you sure you want to log out?',
+ 'main.password': 'Change the password',
+ 'main.login.develop': 'Login developer',
+ 'main.revert.default': 'Restore default Settings',
'main.copy.success': 'Copy success',
'main.pagination.of': 'of',
'main.pagination.items': 'items',
'main.page.settingerror': '椤甸潰閰嶇疆閿欒锛�',
+ 'main.datasource.settingerror': '鏁版嵁婧愰厤缃敊璇紒',
'main.action.settingerror': 'Button setting error!',
'main.action.confirm.tip': 'Do you want to execute?',
'main.action.confirm.success': 'Execute successfully!',
@@ -16,7 +26,24 @@
'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.column.operation': '鎿嶄綔',
- 'form.required.input': 'Please input ',
- 'form.required.select': 'Please select '
+ 'main.view.unenabled': '鎶辨瓑锛屾偍璁块棶鐨勯〉闈㈡湭鍚敤锛岃鑱旂郴绠＄悊鍛樸��',
+ 'main.excel.line': 'line',
+ 'main.excel.column': 'column',
+ 'main.excel.includekey': ' Contain keywords ',
+ 'main.excel.content.emptyerror': '鍐呭涓嶅彲涓虹┖',
+ 'main.excel.content.typeerror': '鍐呭搴斾负鏁板��',
+ 'main.excel.content.interror': '鍐呭搴斾负鏁存暟',
+ 'main.excel.content.floaterror': '鍐呭搴斾负娴偣鏁�',
+ 'main.excel.content.floatIntover': '鏁存暟浣嶈秴鍑鸿寖鍥�',
+ 'main.excel.content.floatPointover': '灏忔暟浣嶈秴鍑鸿寖鍥�',
+ 'main.excel.content.date.over': '鏃堕棿涓鸿礋鍊兼垨澶ぇ',
+ 'main.excel.content.date.formatError': '鏃堕棿鏍煎紡閿欒',
+ 'main.excel.content.maxlimit': '鍐呭瓒呴暱',
+ 'main.excel.content.limitmin': '灏忎簬鏈�灏忓��',
+ 'main.excel.content.limitmax': '澶т簬鏈�澶у��',
+ 'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
+ 'main.form.picture.check': '鏌ョ湅鍥剧墖',
+ 'main.role.title': 'The role list',
+ 'form.required.input': 'Please enter the ',
+ 'form.required.select': 'Please select a '
}
\ No newline at end of file
--
Gitblit v1.8.0