From c26cec9ebc2cd2a2220aaa33a2975c12d1adc3e4 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期一, 15 五月 2023 16:06:09 +0800
Subject: [PATCH] Merge branch 'master' into v13-20230413

---
 src/lang/en.js |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 6326ddb..c470454 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -2,6 +2,7 @@
   start: 'Continue testing',
   submission: 'submit',
   down: 'download report',
+  view: 'view report',
   lastQuestion: 'Last',
   nextQuestion: 'Next',
   recommendedTime: 'Recommended Time:',
@@ -26,7 +27,7 @@
   unfinishSubmit: 'The data has been successfully uploaded to the server and has been saved. Thank you.',
   finishSubmit: 'You have completed the work behavior questionnaire, and the data has been successfully uploaded to the server and saved. Thank you.',
   selectData: 'Date',
-  startDo: 'Start the Test',
+  startDo: 'Next',
   second: ' second ',
   min: ' minute ',
   hour: ' hour ',
@@ -51,27 +52,40 @@
   partRemailTime: 'Remaining Time:',
   finishIntelligenceInfo: 'You have completed the cognitive ability test questionnaire, the data has been successfully uploaded to the server, and has been saved. Thank you.',
   finishPersonalityInfo: 'You have completed the personality quetionnaire, and the data has been successfully uploaded to the server and saved. ',
+  finishCareerInterestsInfo: 'You have completed the Career Interests quetionnaire, and the data has been successfully uploaded to the server and saved. ',
   finishPersonalityDownInfo: 'You may click the red button below to download your test report.',
+  finishViewReportInfo: 'You can click on the red button below to view your result report.',
   langWelcomeThai: '喔⑧复喔權笖喔掂笗喔笝喔`副喔氞釜喔灌箞喙�喔о箛喔氞箘喔嬥涪喙屶釜喔赤斧喔`副喔氞笚喔赤箒喔氞笟喔椸笖喔腑喔氞競喔竾',
   langOptionThai: '喔佮福喔膏笓喔侧箑喔ム阜喔竵喔犩覆喔┼覆 喙佮弗喔班竸喔ム复喔� 鈥溹笖喔赤箑喔權复喔權竵喔侧福喔曕箞喔�.',
 	values_finishValuesInfo:'Thank you! Your responses have been submitted. You can close this page now.',
 	values_nextStepTips_del_unnecessary:'Please delete redundant selections',
 	values_nextStepTips_add_enough:'Please add enough choices',
 	values_nextStepTips_choices_all:'Please make all choices',
-	values_title:'For each statement,click the pictures that aligns most with your view.',
-	values_title_description:'For each statement, click the icon that aligns most with your view.',
+	values_title:'Pre-Sort Your Response',
+	values_title_description:'This is the pre-sorting section of the test. <br/>During this section, you will choose the pictures in which the character is most like you. <br/>All of these pictures will be shown again in later sections for the final sorting process.',
 	values_title_description_1:'If you think the main character is like you, click ',
+	values_title_description_1_2:' .',
 	values_title_description_2:'If you think the main character is not like you, click ',
+	values_title_description_2_2:' .',
 	values_title_description_3:'If you are not sure, click ',
+	values_title_description_3_2:' .',
 	values_title_description_4:'Click ',
-	values_title_description_4_2:' to zoom in the picture',
+	values_title_description_4_2:' to zoom in the picture.',
 	next:'Next',
 	pre:'Back',
 	commit:'Submit',
 	values_cur_step:'Current step',
-	values_step_tips_for_1:'Select %N pictures in which the main character is most like you',
-	values_step_tips_for_2:'Select %N pictures in which the main character is most unlike you',
-	values_step_tips_for_3:'Select %N pictures',
+	values_step_0_title:'Instructions',
+	values_step_0_content:'The goal of the test is to evaluate how much the main character is or is not like you in each picture.<br/>By the end of this test, you will rank the pictures from most like you to most unlike you.<br/><br/><br/>The first task is the pre-sort, where you will decide if the character in the picture is like you, unlike you, or you are unsure.<br/><br/><br/>Next, you will place the pictures you sorted into categories.',
+	values_step_2_title:'Categorize Your Response',
+	values_step_2_content:'In the next step, you will categorize the images into nine separate categories. The number of images allowed in each category is fixed. All images must be categorized, and you will have the opportunity to go back and make changes to the categories if you feel you placed an image somewhere that you would like to change. Importantly, the order in which the chosen images in each category are arranged from left to right does not matter. Additionally, please pay attention to the prompts themselves; you will be asked about pictures that are like you and are unlike you.',
+	values_step_names:'Most like,Most unlike,Very like,Very unlike,Like,Unlike,Somewhat like,Somewhat unlike,Neutral',
+	values_step_names_unit_pre:'',
+	values_step_names_unit:'you',
+	values_step_tips_for_1:'Select %N pictures in which the main character is %C you',
+	values_step_tips_for_2:'Select %N pictures in which the main character is %C you',
+	values_step_tips_for_3:'Here are the remaining %N pictures. For now, they will be assigned to the "%C" category.',
+	values_step_tips:'The order of the images you place in this category from left to right does not matter.',
 	values_select_tips:'Select from the following pictures',
 	values_select:'Select',
 	values_select_exchange:'exchange',
@@ -79,6 +93,6 @@
 	values_mostUnLikeMe:'Most unlike me',
 	values_no_select:'No picture left',
 	values_pic_tmpArea:'Picture Staging Area',
-	values_pic_tmpArea_desc:'Note: <br>&nbsp;&nbsp;All pictures in the same row are in the same category.<br>&nbsp;&nbsp;You do not need to order them in a row. <br>&nbsp;&nbsp;You only need to pay attention to the vertical order.',
+	values_pic_tmpArea_desc:'This is your opportunity to review the categories in which you have created based on your picture selections. As a reminder, the order of the images you place in each category from left to right does not matter. If you feel that you would like to move pictures around, you must drag them to the staging area before placing them into a new category. In order to replace one picture in a category with another, both pictures must be dragged into the staging area. Once you are satisfied with your choices, click "Submit," and your choices will be finalized.',
 	values_nextStepTips_tips:'Please refine the sort and rank the images by selecting them into the nine categories. Please note that the number of images you can put in each of the categories is fixed.'
 }

--
Gitblit v1.9.1