--- a/artifacts/src/main/resources/messages.properties	Thu Mar 01 13:42:39 2018 +0100
+++ b/artifacts/src/main/resources/messages.properties	Thu Mar 01 17:43:16 2018 +0100
@@ -67,11 +67,11 @@
 state.minfo.sediment.load.epochs = Epochs
 state.minfo.sediment.load.period = Years
 state.minfo.sediment.load.off_epochs = off. Epochs
-state.minfo.sediment.load.unit = Unit
+state.minfo.sediment.load.sq_interval = Load-Discharge Relation
+state.minfo.off_epoch = off. Epochs
 state.minfo.sediment.load.t_per_a = (t/a)
 state.minfo.sediment.load.m3_per_a = (m\u00b3/a)
-state.minfo.sediment.load.sq_interval = Load-Discharge Relation
-state.minfo.off_epoch = off. Epochs
+state.minfo.sediment.load.unit = Unit
 state.minfo.t_per_a = t/a
 state.minfo.m3_per_a = m\u00b3/a
 
@@ -199,22 +199,18 @@
 chart.reference.curve.title = Reference Curve
 chart.reference.curve.subtitle = {0}
 
-chart.fixings.analysis.title = Longitudinal section at km {0}
-chart.fixings.wq.subtitle=River: {0}; Range: {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short}
-chart.fixings.wq.subtitle1={0,date,short} to {1,date,short}
+chart.reference.curve.x.axis.in.cm = Reference Gauge(s) [cm]
+chart.reference.curve.x.axis.in.m = Reference Station [NN + m]
+chart.reference.curve.y.axis.in.cm = Target Gauge(s) [cm]
+chart.reference.curve.y.axis.in.m = Target Station(s) [NN + m]
 
 chart.fixings.derivedcurve.title = Derived curve
-chart.fixings.deltawt.title = Differences from fitted curve at km {0}
+chart.fixings.analysis.title = Longitudinal section at km {0}
 chart.fixings.wq.title = Fixings Analysis at km {0}
 chart.fixings.wq.yaxis.label = W [{0}]
 
 chart.extreme.wq.yaxis.label = W [{0}]
 
-chart.reference.curve.x.axis.in.cm = Reference Gauge(s) [cm]
-chart.reference.curve.x.axis.in.m = Reference Station [NN + m]
-chart.reference.curve.y.axis.in.cm = Target Gauge(s) [cm]
-chart.reference.curve.y.axis.in.m = Target Station(s) [NN + m]
-
 chart.normalized.reference.curve.title = Reduced Reference Curve
 
 chart.w_differences.title = Differences
@@ -261,12 +257,12 @@
 facet.sq_relation.outlier.measurement = bed load data pass {0}
 
 sedimentdensity = sediment density
-coarse = Coarse gravel
 sand = Sand
 fine_middle = Fine/Mid. gravel
 susp_sand = Susp. Sand
 susp_sand_bed = Bed. part Susp.Sand
 suspended_sediment = Sediment
+coarse = Coarse gravel
 total = Total load
 
 chart.sedimentload.ls.title = Sediment load
@@ -402,8 +398,8 @@
 export.discharge.longitudinal.section.csv.header.w = W [NN + m]
 export.discharge.longitudinal.section.csv.header.cw = W corr. [NN + m]
 export.discharge.longitudinal.section.csv.header.q = Q [m\u00b3/s]
+export.discharge.curve.at.gauge.header = Dischargetable for {1}/{0} since {2} datum[{4}] = {3}
 export.discharge.curve.at.header = Computed discharge curve for {0} {0}-km: {1}
-export.discharge.curve.at.gauge.header = Dischargetable for {1}/{0} since {2} datum[{4}] = {3}
 export.historical.discharge.csv.header.timerange = Timerange
 export.historical.discharge.csv.header.waterlevel = Waterlevel [cm]
 export.historical.discharge.csv.header.discharge = Discharge [m\u00b3/s]
@@ -669,9 +665,13 @@
 chart.fix.deltawt.xaxis.label=Date
 chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
 
+chart.fixings.wq.subtitle=River: {0}; Range: {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short}
+chart.fixings.wq.subtitle1={0,date,short} to {1,date,short}
 
 chart.fixings.longitudinalsection.title=Longitudinal section
 
+chart.fixings.deltawt.title = Differences from fitted curve at km {0}
+
 export.fixings.deltawt.csv.header.km=km
 export.fixings.deltawt.csv.header.deltaw=\u0394 W [cm]
 export.fixings.deltawt.csv.header.q=Discharge [m\u00b3/s]
@@ -726,6 +726,7 @@
 static.sq.station = Station
 
 module.winfo = W-INFO
+module.sinfo = S-INFO
 module.minfo = M-INFO
 module.fixanalysis = Fix Analysis
 module.new_map = New Map
@@ -734,7 +735,7 @@
 load_diameter = Bedload Diameter
 bed_diameter = Bed Diameter
 
-area.label.template = Area = %s m\u00b3
+area.label.template = Area = %s m\u00b2
 
 gauge.discharge.service.chart.title = Discharge Tables at Gauge {0}
 gauge.discharge.service.chart.x.title = Q [m\u00b3/s]
@@ -835,10 +836,6 @@
 sinfo.export.flow_depth.csv.meta.range.label = Range (km)
 sinfo.export.flow_depth.csv.meta.height_unit.river = # H\u00f6henbezugssystem des Flusses: {0} 
 
-#export.export.flow_depth.csv.meta.gauge = # Gauge: {0}
-#export.export.flow_depth.csv.meta.q = # Q (m\u00b3/s): {0}
-#export.export.flow_depth.csv.meta.w = # W (NN + m): {0} - {1}
-
 sinfo.export.flow_depth.csv.header.km = Fluss-km
 sinfo.export.flow_depth.csv.header.flowdepth = Flie\u00dftiefe
 sinfo.export.flow_depth.csv.header.flowdepthTkh = Flie\u00dftiefe mit TKH