Merge pull request #662 from SCADA-LTS/develop

v0.0.9.5 with correct

.travis.yml

@@ -9,23 +9,25 @@ before_script:
 - npm -v
 - node -v
 - env
-- npm install -g @angular/cli@latest
+#- npm install -g @angular/cli@latest
 - npm install -g bower
-- npm install @angular/core@latest
+#- npm install @angular/core@latest
 - chmod +x ./get_seroUtils.sh
 - "./get_seroUtils.sh"
 - ls -l ./WebContent/WEB-INF/lib/seroUtils.jar
+# correct version base on Milestones
+- sed -i '94s/.*/        return "'$SCADA_LTS_MILESTONE'";/' ./src/com/serotonin/mango/Common.java
 - cd ./WebContent/resources/app; bower update;
 - cd ../../..
-- cd ./ScadaLTS-UI
-- npm install
-- ls -l ./src/app/media
-- ng version
-- ng build
-- cd ./war
-- ant war
-- ant
-- cd ../..
+#- cd ./ScadaLTS-UI
+#- npm install
+#- ls -l ./src/app/media
+#- ng version
+#- ng build
+#- cd ./war
+#- ant war
+#- ant
+#- cd ../..
 - cd ./ScadaLTS-UI-1
 - npm install
 - cd ../WebContent/resources/npm/
@@ -69,7 +71,7 @@ after_script:
 - rm -rf ./apache-tomcat-7.0.85
 - cp ../../ScadaBR.war ./webapps
 #- cp ../../ScadaLTS-UI/war/ScadaLTS.war ./webapps
-- ls -l ./webapps/ScadaLTS.war
+#- ls -l ./webapps/ScadaLTS.war
 - ls -l ./webapps/ScadaBR.war
 - cp ../../WebContent/WEB-INF/lib/mysql-connector-java-3.1.8-bin.jar ./lib/
 - cp ../../WebContent/WEB-INF/lib/mysql-connector-java-5.1.38-bin.jar ./lib/
@@ -86,5 +88,4 @@ after_script:
 - export IMAGE_NAME=scadalts/scadalts
 - docker build -t $IMAGE_NAME:$TRAVIS_COMMIT .
 - docker tag $IMAGE_NAME:$TRAVIS_COMMIT $IMAGE_NAME:$TAG
-- docker push $IMAGE_NAME:$TAG
-
+- docker push $IMAGE_NAME:$TAG

WebContent/WEB-INF/classes/messages_de.properties

@@ -2872,7 +2872,7 @@ systemSettings.uiPerformance.med=Normal
 systemSettings.upToDate=Diese Mangoinstallation ist aktuell
 systemSettings.useProxy=Proxy verwenden
 systemSettings.validation.invalidColour=Invalid color
-systemSettings.version=Mango version
+systemSettings.version=ScadaLTS version
 systemSettings.versionCheck1=Socket timeout during check. Please try again
 systemSettings.versionCheck2=An error occurred: {0}: {1}
 systemSettings.versionSaved=Version settings have been saved
@@ -3156,4 +3156,3 @@ menu.point_hierarchy.info.tooltip=Info
 header.changeTheme=
 
 
-

WebContent/WEB-INF/classes/messages_en.properties

@@ -2874,7 +2874,7 @@ systemSettings.uiPerformance.med=Medium
 systemSettings.upToDate=This instance of ScadaBR is up to date
 systemSettings.useProxy=Use proxy
 systemSettings.validation.invalidColour=Invalid color
-systemSettings.version=This ScadaBR version
+systemSettings.version=ScadaLTS version
 systemSettings.versionCheck1=Socket timeout during check. Please try again
 systemSettings.versionCheck2=An error occurred: {0}: {1}
 systemSettings.versionSaved=Version settings have been saved

WebContent/WEB-INF/classes/messages_es.properties

@@ -2856,7 +2856,7 @@ systemSettings.uiPerformance.med=Medio
 systemSettings.upToDate=Esta instancia del ScadaBR está actualizada
 systemSettings.useProxy=Activar proxy
 systemSettings.validation.invalidColour=Color inválido
-systemSettings.version=Esta versión de ScadaBR
+systemSettings.version=Esta versión de ScadaLTS
 systemSettings.versionCheck1=Finalizado el tiempo de espera de Socket durante la revisión. Por favor intente nuevamente
 systemSettings.versionCheck2=Ha ocurrido un error: {0}: {1}
 systemSettings.versionSaved=La configuración de la versión ha sido guardada

WebContent/WEB-INF/classes/messages_fi.properties

@@ -1771,7 +1771,7 @@ systemSettings.proxyPort=Portti
 systemSettings.proxyUsername=Käyttäjätunnus
 systemSettings.proxyPassword=Salasana
 systemSettings.systemInformation=Järjestelmän asetukset
-systemSettings.version=Mangon versio
+systemSettings.version=ScadaLTS versio
 systemSettings.notify=Ilmoita päivitysjulkaisuista
 systemSettings.notifyStable=Vain vakaat versiot
 systemSettings.notifyRC=Julkaisukanditaatti tai parempi

WebContent/WEB-INF/classes/messages_fr.properties

@@ -2706,7 +2706,7 @@ systemSettings.uiPerformance=Performance de l’UI
 systemSettings.upToDate=Cette instance de ScadaBR est à jour
 systemSettings.useProxy=Utiliser proxy
 systemSettings.validation.invalidColour=Invalid color
-systemSettings.version=Cette version de ScadaBR 
+systemSettings.version=Cette version de ScadaLTS 
 systemSettings.versionCheck1=Temps de pause du socket lors d’un contrôle. S’il vous plaît essayer à nouveau
 systemSettings.versionCheck2=Une erreur s’est produite: {0}: {1}
 systemSettings.versionSaved=Paramètres de version ont été sauvés

WebContent/WEB-INF/classes/messages_lu.properties

@@ -2927,7 +2927,7 @@ systemSettings.uiPerformance.med=Normal
 systemSettings.upToDate=Des Mangoinstallatioun ass aktuell
 systemSettings.useProxy=Proxy verwenden
 systemSettings.validation.invalidColour=Invalid color
-systemSettings.version=Mango versioun
+systemSettings.version=ScadaLTS versioun
 systemSettings.versionCheck1=Socket timeout during check. Please try again
 systemSettings.versionCheck2=An error occurred: {0}: {1}
 systemSettings.versionSaved=Version settings have been saved

WebContent/WEB-INF/classes/messages_pl.properties

@@ -1778,7 +1778,7 @@ systemSettings.systemAlarmLevelsSaved=Zapisano poziomy alarmowe zdarzeń systemo
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.httpSaved=Http settings have been saved
 systemSettings.miscSaved=Settings have been saved
-systemSettings.versionSaved=Version settings have been saved
+systemSettings.versionSaved=ScadaLTS
 systemSettings.upToDate=This instance of ScadaBR is up to date
 systemSettings.emailSettings=Ustawienia Email
 systemSettings.smtpHost=SMTP host

WebContent/WEB-INF/classes/messages_pt.properties

@@ -1883,7 +1883,7 @@ systemSettings.proxyPassword=Senha do proxy
 systemSettings.systemInformation=Informações do sistema
 systemSettings.instanceId=ID da instância
 systemSettings.instanceDescription=Descrição da instância
-systemSettings.version=Esta versão do ScadaBR
+systemSettings.version=Esta versão do ScadaLTS
 systemSettings.notify=Notificar após aprovação de
 systemSettings.notifyStable=Apenas versões estáveis
 systemSettings.notifyRC=Release candidates ou melhor

WebContent/WEB-INF/classes/messages_ru.properties

@@ -1832,7 +1832,7 @@ systemSettings.proxyUsername=Имя пользователя Proxy
 systemSettings.proxyPassword=Пароль Proxy 
 systemSettings.systemInformation=Информация о системе 
 systemSettings.instanceId=Идентификатор экземпляра 
-systemSettings.version=Текущая версия ScadaBR 
+systemSettings.version=Текущая версия ScadaLTS 
 systemSettings.notify=Уведомить о выпуске 
 systemSettings.notifyStable=Только стабильные версии
 systemSettings.notifyRC=Предвыпускные (Release candidates) версии и лучше

WebContent/WEB-INF/classes/messages_zh.properties

@@ -1456,7 +1456,7 @@ systemSettings.proxyPort=代理端口
 systemSettings.proxyUsername=代理用户名
 systemSettings.proxyPassword=代理密码
 systemSettings.systemInformation=系统信息
-systemSettings.version=本Mango系统的版本
+systemSettings.version=本ScadaLTS系统的版本
 systemSettings.notify=Notify upon release of
 systemSettings.notifyStable=仅稳定版本
 systemSettings.notifyRC=Release candidates or better