From ea4c29574d32f720238251a9148d6b7298d7d42f Mon Sep 17 00:00:00 2001
From: xierz <aa1343211992@163.com>
Date: Mon, 23 Nov 2020 17:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/resources/resources.properties        | 36 ----------
 .../cms/resources/resources_en_US.properties  | 70 +++++++++----------
 2 files changed, 35 insertions(+), 71 deletions(-)
 delete mode 100644 src/main/java/net/mingsoft/cms/resources/resources.properties

diff --git a/src/main/java/net/mingsoft/cms/resources/resources.properties b/src/main/java/net/mingsoft/cms/resources/resources.properties
deleted file mode 100644
index 4bf15c7b..00000000
--- a/src/main/java/net/mingsoft/cms/resources/resources.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#Thu Nov 28 15:12:32 CST 2019
-category.img=\u7F29\u7565\u56FE
-appid=\u6587\u7AE0\u7BA1\u7406\u7684\u5E94\u7528id
-content.datetime=\u53D1\u5E03\u65F6\u95F4
-category.manager.id=\u53D1\u5E03\u7528\u6237id
-category.title=\u680F\u76EE\u7BA1\u7406\u540D\u79F0
-category.keyword=\u680F\u76EE\u7BA1\u7406\u5173\u952E\u5B57
-content.img=\u6587\u7AE0\u7F29\u7565\u56FE
-category.path=\u680F\u76EE\u8DEF\u5F84
-content.type=\u6587\u7AE0\u7C7B\u578B
-category.url=\u5185\u5BB9\u6A21\u677F
-dict.id=\u5B57\u5178\u5BF9\u5E94\u7F16\u53F7
-content.author=\u6587\u7AE0\u4F5C\u8005
-category.parent.id=\u7236\u7C7B\u578B\u7F16\u53F7
-category.datetime=\u7C7B\u522B\u53D1\u5E03\u65F6\u95F4
-category.flag=\u680F\u76EE\u5C5E\u6027
-content.description=\u63CF\u8FF0
-content.url=\u6587\u7AE0\u8DF3\u8F6C\u94FE\u63A5\u5730\u5740
-category.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
-content.title=\u6587\u7AE0\u6807\u9898
-content.category.id=\u6240\u5C5E\u680F\u76EE
-id=\u7F16\u53F7
-app.id=\u5E94\u7528\u7F16\u53F7
-category.list.url=\u5217\u8868\u6A21\u677F
-mdiy.model.id=\u680F\u76EE\u7BA1\u7406\u7684\u5185\u5BB9\u6A21\u578Bid
-content.source=\u6587\u7AE0\u6765\u6E90
-content.display=\u662F\u5426\u663E\u793A
-category.type=\u680F\u76EE\u7BA1\u7406\u5C5E\u6027
-category.descrip=\u680F\u76EE\u7BA1\u7406\u63CF\u8FF0
-content.details=\u6587\u7AE0\u5185\u5BB9
-category.id=\u6240\u5C5E\u680F\u76EE
-content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
-category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
-content.keyword=\u5173\u952E\u5B57
-templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
diff --git a/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties b/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties
index 6ebd4bd5..f9fb573c 100644
--- a/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties
+++ b/src/main/java/net/mingsoft/cms/resources/resources_en_US.properties
@@ -1,37 +1,37 @@
 #
 #Thu Nov 28 15:12:32 CST 2019
-category.img=\u7F29\u7565\u56FE
-appid=\u6587\u7AE0\u7BA1\u7406\u7684\u5E94\u7528id
-content.datetime=\u53D1\u5E03\u65F6\u95F4
-category.manager.id=\u53D1\u5E03\u7528\u6237id
-category.title=\u680F\u76EE\u7BA1\u7406\u540D\u79F0
-category.keyword=\u680F\u76EE\u7BA1\u7406\u5173\u952E\u5B57
-content.img=\u6587\u7AE0\u7F29\u7565\u56FE
-category.path=\u680F\u76EE\u8DEF\u5F84
-content.type=\u6587\u7AE0\u7C7B\u578B
-category.url=\u5185\u5BB9\u6A21\u677F
-dict.id=\u5B57\u5178\u5BF9\u5E94\u7F16\u53F7
-content.author=\u6587\u7AE0\u4F5C\u8005
-category.parent.id=\u7236\u7C7B\u578B\u7F16\u53F7
-category.datetime=\u7C7B\u522B\u53D1\u5E03\u65F6\u95F4
-category.flag=\u680F\u76EE\u5C5E\u6027
-content.description=\u63CF\u8FF0
-content.url=\u6587\u7AE0\u8DF3\u8F6C\u94FE\u63A5\u5730\u5740
-category.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
-content.title=\u6587\u7AE0\u6807\u9898
-content.category.id=\u6240\u5C5E\u680F\u76EE
-id=\u7F16\u53F7
-app.id=\u5E94\u7528\u7F16\u53F7
-category.list.url=\u5217\u8868\u6A21\u677F
-mdiy.model.id=\u680F\u76EE\u7BA1\u7406\u7684\u5185\u5BB9\u6A21\u578Bid
-content.source=\u6587\u7AE0\u6765\u6E90
-content.display=\u662F\u5426\u663E\u793A
-category.type=\u680F\u76EE\u7BA1\u7406\u5C5E\u6027
-category.descrip=\u680F\u76EE\u7BA1\u7406\u63CF\u8FF0
-content.details=\u6587\u7AE0\u5185\u5BB9
-category.id=\u6240\u5C5E\u680F\u76EE
-content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
-category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
-content.keyword=\u5173\u952E\u5B57
-templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
-category.pinyin=\u62FC\u97F3
+category.img=Thumbnail
+appid=The application id of article management
+content.datetime=Publishing time
+category.manager.id=Posting user id
+category.title=Column management name
+category.keyword=Column management keyword
+content.img=Article thumbnail
+category.path=Column path
+content.type=Article type
+category.url=Content template
+dict.id=Dictionary corresponding number
+content.author=Article author
+category.parent.id=Parent type number
+category.datetime=Category publication time
+category.flag =Column attribute
+content.description=Description
+content.url=Article jump link address
+category.sort=Custom order
+content.title=Article title
+content.category.id=belongingcolumn
+id=number
+app.id=application number
+category.list.url=List template
+mdiy.model.id=Content model id for column management
+content.source=The source of the article
+content.display=Whether to display
+category.type=Column management attribute
+category.descrip=Column management description
+content.details=Article content
+category.id=belonging to the column
+content.sort=custom order
+category.diy.url=custom link
+content.keyword=keyword
+templet.file=template file not found
+category.pinyin=pinyin