Merge pull request #2950 from SCADA-LTS/fix/#2828_Fixed_event_audit_m…

…essage_2

#2828 Fixed event audit message

WebContent/WEB-INF/jsp/pointEdit/buttons.jsp

@@ -43,6 +43,6 @@
   </tr>
 
   <tr>
-    <td colspan="2"><fmt:message key="pointEdit.buttons.note"/></td>
+    <td colspan="2"><span class="smallTitle"><fmt:message key="pointEdit.buttons.note.prefix"/></span> <fmt:message key="pointEdit.buttons.note"/></td>
   </tr>
 </table>

WebContent/WEB-INF/jsp/sql.jsp

@@ -31,7 +31,7 @@
         <form action="sql.shtm" method="post">
           <table>
             <tr>
-              <td colspan="2"><fmt:message key="sql.warning"/></td>
+              <td colspan="2"><span class="formError"><fmt:message key="sql.warning.prefix"/></span> <fmt:message key="sql.warning"/></td>
             </tr>
             <spring:bind path="form.sqlString">
               <tr>

WebContent/WEB-INF/tags/displayView.tag

@@ -30,7 +30,7 @@
 <div id="viewContainer">
 <div id="viewContent" width="${view.width}" height="${view.height}">
   <c:choose>
-    <c:when test="${empty view}"><fmt:message key="${emptyMessageKey}"/></c:when>
+    <c:when test="${empty view}"><fmt:message key="${emptyMessageKey}"/> <a href="view_edit.shtm"><fmt:message key="views.noViews.prefix"/></a></c:when>
     <c:when test="${empty view.backgroundFilename}">
       <img id="viewBackground" src="images/spacer.gif" alt="" width="${view.width}" height="${view.height}"/>
     </c:when>

webapp-resources/messages_de.properties

@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife Label
 dsEdit.mbus.vifeTypes=Vife Typen
 dsEdit.meta=Meta Datenquelle
-dsEdit.meta.delay=Berechnungsverz\u00f6gerung</br>
+dsEdit.meta.delay=Berechnungsverz\u00f6gerung
 dsEdit.meta.desc=Meta Datenquelle Konfiguration
 dsEdit.meta.event=Aktualisierungsereignis
 dsEdit.meta.event.context=\u00c4nderung der Eingangsvariablen
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtuelle Datenquelle
 dsEdit.virtual.attractionPoint=Datenpunkt Attraktor
 dsEdit.virtual.change=\u00c4nderung
@@ -1334,7 +1334,7 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Einr\u00fcckung
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein <a href="www.json.org">JSON</a> object.
+emport.invalidImportData=Zu importierende Daten sind ung\u00fctig: kein JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
 emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=H\u00f6chste Alarmpriorit\u00e4t verringerte sich von {0
 event.alarmMaxIncreased=H\u00f6chste Alarmpriorit\u00e4t erh\u00f6te sich von {0} auf {1}
 event.audit.added=Benutzer "{0}" erzeugte {1} mit id {2}: {3}
 event.audit.changed=Benutzer "{0}" \u00e4nderte {1} mit id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" zu "{2}"
+event.audit.changedProperty={0}: "{1}" zu "{2}"
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Datenpunkt
 event.audit.dataSource=Datenquelle
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property={0}="{1}"
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2103,8 +2103,8 @@ eventHandlers.invalidInactiveSourceType=Invalid inactive source point data type
 eventHandlers.invalidInactiveValue=Invalid inactive value to set
 eventHandlers.invalidScripts=Selecione ao menos um script
 eventHandlers.maintenanceEvents=Maintenance events
-eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
-eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger!<br>Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEmailRecips=Keine Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Email Empf\u00e4nger hinzuf\u00fcgen
+eventHandlers.noEscalRecips=Kein Eskalations Email Empf\u00e4nger! Sie m\u00fcssen mindestens einen Eskalations Email Empf\u00e4nger hinzuf\u00fcgen
 eventHandlers.noInactiveRecips=You must add inactive recipients
 eventHandlers.noSetPointAction=No set point action has been defined
 eventHandlers.noTargetPoint=No target point selected. You may not have any settable points defined.
@@ -2294,7 +2294,7 @@ login.nag=Hinweis: Sie k\u00f6nnten Probleme mit ScadaLTS haben, da dierser Brow
 login.password=Kennwort
 login.supportedBrowser=Dieser Browser wird unterst\u00fctzt
 login.unknownBrowser=Unbekannter Browser
-login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, oder  Internet Explorer 7.
+login.unsupportedBrowser=Dieser Browser wird offiziell nicht von Serotonin Software unterst\u00fctzt. Wir empfehlen Mozilla Firefox, Google Chrome.
 login.userId=Benutzername
 login.validation.accountDisabled=Ihr Account wurde gesperrt, bitte wenden Sie sich an Ihren Administrator
 login.validation.invalidLogin=Login gescheitert, bitte versuchen Sie es noch einmal
@@ -2412,7 +2412,7 @@ pointDetails.username=Benutzername
 pointDetails.views=Ansichten
 pointEdit.buttons.disable=Ausschalten
 pointEdit.buttons.enable=Einschalten
-pointEdit.buttons.note=<span class="smallTitle">Hinweis:</span> speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
+pointEdit.buttons.note=speichern, deaktivieren oder neu starten setzen alle aktiven Ereignisse zur\u00fcck.
 pointEdit.buttons.restart=Neustart
 pointEdit.chart.includeSum=Summe berechnen
 pointEdit.chart.invalidLimit=Tabelle: Anzahl muss zwischen 2 und 50 liegen
@@ -2801,7 +2801,7 @@ sql.query=SQL-Abfrage starten
 sql.rowsUpdated=Datens\u00e4tze aktualisiert
 sql.sql=SQL
 sql.update=SQL-Update ausf\u00fchren
-sql.warning=<span class="formError">Achtung:</span> Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren..
+sql.warning=Benutzen Sie die SQL Abfragen mit Vorsicht. Benutzerfehler k\u00f6nnen zu Datenverlust und/oder Fehlfunktionen des Systems f\u00fcren.
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Server erfordert Legitimation
@@ -3065,7 +3065,7 @@ viewEdit.viewDelete=L\u00f6schen:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Gr\u00f6\u00dfe
 views.newView=Neue Prozessansicht
-views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie <a href="view_edit.shtm">jetzt</a> eins.
+views.noViews=Sie haben noch kein Prozessbild. Erstellen Sie
 views.title=Prozessbild
 watchlist.addNewList=Neue Beobachtungsliste
 watchlist.addToWatchlist=Zur Beobachtungsliste hinzuf\u00fcgen
@@ -3335,6 +3335,9 @@ systemsettings.webresource.uploads.path=Uploads images path
 systemsettings.webresource.graphics.path=Graphics images path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+pointEdit.buttons.note.prefix=Hinweis:
+sql.warning.prefix=Achtung:
+views.noViews.prefix=jetzt.
 annotation.api=REST API
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?

webapp-resources/messages_en.properties

@@ -756,7 +756,7 @@ dsEdit.mbus.vifeLabel=Vifes
 dsEdit.mbus.vifeLabels=Vife labels
 dsEdit.mbus.vifeTypes=Vife types
 dsEdit.meta=Meta Data Source
-dsEdit.meta.delay=Execution delay<br/>
+dsEdit.meta.delay=Execution delay
 dsEdit.meta.desc=Meta data source properties
 dsEdit.meta.event=Update event
 dsEdit.meta.event.context=Context update
@@ -1160,8 +1160,8 @@ dsEdit.validate.required=Required value
 dsEdit.viconics=Viconics Wireless Thermostats
 dsEdit.viconics.channel=Channel
 dsEdit.viconics.chipRevision=Chip revision
-dsEdit.viconics.chipRevisionBr=Chip<br/>revision
-dsEdit.viconics.commAddress=Comm<br/>address
+dsEdit.viconics.chipRevisionBr=Chip revision
+dsEdit.viconics.commAddress=Comm address
 dsEdit.viconics.convertCelsius=Convert temperatures to celsius
 dsEdit.viconics.crss=CRSS
 dsEdit.viconics.dataSourceNotStarted=Data source is not started
@@ -1170,9 +1170,9 @@ dsEdit.viconics.deviceRemove=Device remove (s)
 dsEdit.viconics.deviceWarning=Device offline timeone (s)
 dsEdit.viconics.devices=Devices
 dsEdit.viconics.dpconn=Port: {0}, PAN ID: {1}, Channel: {2}
-dsEdit.viconics.firmwareRevision=Firmware<br/>revision
+dsEdit.viconics.firmwareRevision=Firmware revision
 dsEdit.viconics.ieee=IEEE
-dsEdit.viconics.modelNumber=Model<br/>number
+dsEdit.viconics.modelNumber=Model number
 dsEdit.viconics.networkIdentifyFailure=Network identify failed: {0}
 dsEdit.viconics.networkInfo=Network information
 dsEdit.viconics.networkTimeout=Network offline timeout (s)
@@ -1186,9 +1186,9 @@ dsEdit.viconics.timeout=Message timeout
 dsEdit.viconics.trss=TRSS
 dsEdit.viconics.unreliable=Point value may not be reliable
 dsEdit.viconics.zigbeeFirmwareRevision=Zigbee firmware revision
-dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee<br/>firmware<br/>revision
+dsEdit.viconics.zigbeeFirmwareRevisionBr=Zigbee firmware revision
 dsEdit.viconics.zigbeeNetworkAddress=Zigbee network address
-dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee<br/>network<br/>address
+dsEdit.viconics.zigbeeNetworkAddressBr=Zigbee network address
 dsEdit.virtual=Virtual Data Source
 dsEdit.virtual.attractionPoint=Attraction point
 dsEdit.virtual.change=Change
@@ -1334,7 +1334,7 @@ emport.importProjectTitle=Import Project (Upload)
 emport.includePointValues=Include point values
 emport.indent=Indent level
 emport.invalidFile=File reading failed ({0})
-emport.invalidImportData=Import data is invalid: not a JSON object
+emport.invalidImportData=Import data is invalid: not a JSON object. (www.json.org)
 emport.invalidProjectName=Invalid name
 emport.mailingList.prefix=Mailing list ''{0}'': {1}
 emport.mailingList.xid=A mailing list does not have an ’xid’ value. Ignored.
@@ -1567,8 +1567,8 @@ engUnit.98=percent
 engUnit.99=percent per second
 engUnit.190=kilometers
 engUnit.abbr.190=km
-engUnit.abbr.0=m<sup>2</sup>
-engUnit.abbr.1=f<sup>2</sup>
+engUnit.abbr.0=m\u00b2
+engUnit.abbr.1=ft\u00b2
 engUnit.abbr.10=megavolt amperes
 engUnit.abbr.100=per minute
 engUnit.abbr.101=per second
@@ -1789,7 +1789,7 @@ event.alarmMaxDecreased=Maximum alarm level has decreased from {0} to {1}
 event.alarmMaxIncreased=Maximum alarm level has increased from {0} to {1}
 event.audit.added=User "{0}" created {1} with id {2}: {3}
 event.audit.changed=User "{0}" changed {1} with id {2}: {3}
-event.audit.changedProperty=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}: "{1}" to "{2}"
+event.audit.changedProperty= {0}: "{1}" to "{2}", 
 event.audit.compoundEventDetector=Compound event detector
 event.audit.dataPoint=Data point
 event.audit.dataSource=Data source
@@ -1798,7 +1798,7 @@ event.audit.eventHandler=Event handler
 event.audit.maintenanceEvent=Maintenance event
 event.audit.pointEventDetector=Point event detector
 event.audit.pointLink=Point link
-event.audit.property=<br/>&nbsp;&nbsp;&nbsp;&nbsp;{0}="{1}"
+event.audit.property= {0}="{1}", 
 event.audit.propertyList.0=
 event.audit.propertyList.1={0}
 event.audit.propertyList.10={0}{1}{2}{3}{4}{5}{6}{7}{8}{9}
@@ -2295,7 +2295,7 @@ login.nag=NOTE: you may have problems with ScadaLTS because your browser is not
 login.password=Password
 login.supportedBrowser=This browser is supported.
 login.unknownBrowser=Checking your browser for compatibility...
-login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of <a href="http://www.mozilla.com/" target="_blank">Firefox</a>, Chrome, or Internet Explorer 7
+login.unsupportedBrowser=Your browser may work with this product, but is not officially supported by Serotonin Software. We instead recommend the use of Mozilla Firefox, Google Chrome.
 login.userId=User id
 login.validation.accountDisabled=Your account has been disabled. Please contact your administrator
 login.validation.invalidLogin=Invalid login, please try again
@@ -2413,7 +2413,7 @@ pointDetails.username=Username
 pointDetails.views=Views
 pointEdit.buttons.disable=Disable
 pointEdit.buttons.enable=Enable
-pointEdit.buttons.note=<span class="smallTitle">Note:</span> saving, disabling, or restarting a point causes all active events to be returned to normal.
+pointEdit.buttons.note=saving, disabling, or restarting a point causes all active events to be returned to normal.
 pointEdit.buttons.restart=Restart
 pointEdit.chart.includeSum=Include sum
 pointEdit.chart.invalidLimit=Chart renderer: limit must be between 2 and 50
@@ -2804,7 +2804,7 @@ sql.query=Submit query
 sql.rowsUpdated=records(s) updated.      
 sql.sql=SQL
 sql.update=Submit update
-sql.warning=<span class="formError">Warning:</span> use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
+sql.warning=use this facility at your own risk. Incorrect usage may result in corrupted data and/or system failures. 
 systemSettings.auditAlarmLevels=Audit event alarm levels
 systemSettings.auditAlarmLevelsSaved=Audit event alarm levels have been saved
 systemSettings.auth=Use authorization
@@ -3072,7 +3072,7 @@ viewEdit.viewDelete=Delete view:
 viewEdit.viewDeleteConfirm=Confirm
 viedEdit.viewSize=Size
 views.newView=New view
-views.noViews=You have not created any graphical views. Create one <a href="view_edit.shtm">now</a>.
+views.noViews=You have not created any graphical views. Create one 
 views.title=Graphic views
 watchlist.addNewList=Add new watch list
 watchlist.addToWatchlist=Add to watch list
@@ -3338,6 +3338,9 @@ systemsettings.webresource.uploads.path=Uploads images path
 systemsettings.webresource.graphics.path=Graphics images path
 systemsettings.webresource.uploads.path.wrong=Uploaded images save path must end with "uploads" or "uploads{0}"
 systemsettings.webresource.graphics.path.wrong=Graphics images path must end with "graphics" or "graphics{0}"
+pointEdit.buttons.note.prefix=Note:
+sql.warning.prefix=Warning:
+views.noViews.prefix=now.
 annotation.api=REST API
 dsEdit.sql.statementLimit=Statement limit
 dsEdit.sql.statementLimit.warning=Setting the value 0 in the Statement limit field means there is no limit for the select query, which may lead to a serious application failure due to filling up the memory needed for the application to run. Do you confirm setting Statement limit equals 0?