From 6ec40dc71bdce4dd21ee8c6436a43b7fc20c422c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 12 May 2021 14:34:00 +0800
Subject: [PATCH] conflect

---
 src/main/resources/i18n/messages_en_US.properties |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index add0045..b3ce513 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -140,6 +140,7 @@
 member_service_0096=Transfer fail
 member_service_0097=Payment method already exists
 member_service_0098=Please select another account
+member_service_0099=The nickname can only be modified once
 
 order_service_0001=Wrong parameter value
 order_service_0002=Not logged in
@@ -230,6 +231,14 @@
 documentary_service_0016=The trader has been set not to follow orders
 documentary_service_0017=Please change the contract to separate margin mode
 documentary_service_0018=In documentary, cannot adjust to full position margin mode
+documentary_service_0019=The follower has a documentary contract and cannot kick out
+
+activity_service_0001=Please pass the real name authentication first
+activity_service_0002=Currently invalid
+activity_service_0003=Cannot activate repeatedly
+activity_service_0004=The activity has ended
+activity_service_0005=Can't get it if you don't meet the conditions
+activity_service_0006=Received successfully, it has been issued to currency account
 
 uploadFile_controller_0001=Upload failed
 
@@ -252,3 +261,5 @@
 
 unknown_type=Unknown type
 
+loading_type=loading
+

--
Gitblit v1.9.1