Merge branch 'master' of https://github.com/metersphere/metersphere

 Conflicts:

	frontend/src/i18n/en-US.js

	frontend/src/i18n/zh-CN.js

	frontend/src/i18n/zh-TW.js

frontend/src/i18n/en-US.js

@@ -114,15 +114,15 @@ export default {
     },
     trigger_mode: {
       name: "Trigger Mode",
-      manual: "Manual",
+      manual: "Manual trigger",
       schedule: "Scheduled Task",
       api: "API call"
     },
     adv_search: {
       title:'Advanced Search',
       combine:'Combined query',
-      test: "Test",
-      project: "Project",
+      test: "Affiliated Test",
+      project: "Affiliated Project",
       search: "Query",
       and:'All',
       or:'any one',
@@ -137,7 +137,7 @@ export default {
         le: "Less than or equal to",
         equals: "Equal",
         between: "Between",
-        current_user: "Current user"
+        current_user: "current user"
       }
     }
   },
@@ -648,7 +648,7 @@ export default {
     input_mapping: 'Please enter LDAP attribute mapping',
     input_username: 'please enter user name',
     input_url_placeholder: 'Please enter the LDAP address (eg ldap://localhost:389)',
-    input_ou_placeholder: 'Enter user OU',
+    input_ou_placeholder: 'Enter user OU (use | to separate each OU)',
     input_filter_placeholder: 'Input filter [Possible options are cn or uid or sAMAccountName={0}, eg: (uid={0})]',
     test_connect: 'Test Connection',
     test_login: 'Test Login',