Merge branch 'master' into feature_m/#721_State_last_of_refresh_data

SCADA-LTS · Oct 17, 2018 · 8ee2882 · 8ee2882
2 parents 3a66599 + c614a69
commit 8ee2882
Show file tree

Hide file tree

Showing 29 changed files with 3,249 additions and 2,921 deletions.
diff --git a/WebContent/WEB-INF/classes/messages_de.properties b/WebContent/WEB-INF/classes/messages_de.properties
@@ -3154,5 +3154,14 @@ menu.point_hierarchy.refresh.tooltip=Refresh
 menu.point_hierarchy.info.tooltip=Info
 menu.point_hierarchy.info.tooltip=Info
 header.changeTheme=
+ds.state.migrationOrErrorSerializeChangeEnableState=During data read/migration/error the on/off status of datasource has been changed
+ds.state.stopChangeEnableStateDs=Due to the non-response of an external server and the properties stop enabled, datasource has been stopped
+ds.state.userChangeEnableStateDs=The user has changed the on/off status of datasource
+ds.state.apiChangeEnableStateDs=With the use of the API, the on/off status of DataSource has been changed
+ds.state.importChangeEnableStateDs=During the import, the on/off status of DataSource was changed
+ds.state.scryptChangeEnable=The script has changed the on/off status of datasource
+ds.state.userCpChangeEnableStateDs=The user has copied datasource. The datasource is off by default
+dsList.statusDescribe=Status description
+
 
 
diff --git a/WebContent/WEB-INF/classes/messages_en.properties b/WebContent/WEB-INF/classes/messages_en.properties
@@ -3157,4 +3157,12 @@ menu.point_hierarchy.info.tooltip=Info
 
 
 error.view_hierarchy.add.error1=Name is not validat
-header.changeTheme=Change ScadaLTS application theme
+header.changeTheme=Change ScadaLTS application theme
+ds.state.migrationOrErrorSerializeChangeEnableState=During data read/migration/error the on/off status of datasource has been changed
+ds.state.stopChangeEnableStateDs=Due to the non-response of an external server and the properties stop enabled, datasource has been stopped
+ds.state.userChangeEnableStateDs=The user has changed the on/off status of datasource
+ds.state.apiChangeEnableStateDs=\ With the use of the API, the on/off status of DataSource has been changed
+ds.state.importChangeEnableStateDs=During the import, the on/off status of DataSource was changed
+ds.state.scryptChangeEnable=The script has changed the on/off status of datasource
+ds.state.userCpChangeEnableStateDs=The user has copied datasource. The datasource is off by default
+dsList.statusDescribe=Status description
diff --git a/WebContent/WEB-INF/classes/messages_es.properties b/WebContent/WEB-INF/classes/messages_es.properties
@@ -3083,4 +3083,11 @@ menu.point_hierarchy.add.tooltip=Add folder
 menu.point_hierarchy.delete.tooltip=Delete folder / Move point to root
 menu.point_hierarchy.refresh.tooltip=Refresh
 menu.point_hierarchy.info.tooltip=Info
-
+ds.state.migrationOrErrorSerializeChangeEnableState=During data read/migration/error the on/off status of datasource has been changed
+ds.state.stopChangeEnableStateDs=Due to the non-response of an external server and the properties stop enabled, datasource has been stopped
+ds.state.userChangeEnableStateDs=The user has changed the on/off status of datasource
+ds.state.apiChangeEnableStateDs=With the use of the API, the on/off status of DataSource has been changed
+ds.state.importChangeEnableStateDs=During the import, the on/off status of DataSource was changed
+ds.state.scryptChangeEnable=The script has changed the on/off status of datasource
+ds.state.userCpChangeEnableStateDs=The user has copied datasource. The datasource is off by default
+dsList.statusDescribe=Status description