--- a/artifacts/src/main/resources/messages.properties	Thu Mar 01 09:04:39 2018 +0100
+++ b/artifacts/src/main/resources/messages.properties	Thu Mar 01 13:42:39 2018 +0100
@@ -13,12 +13,12 @@
 state.winfo.uesk.dgm = Digital Terrain Model
 state.winfo.uesk.profiles = Interpolated Profiles
 state.winfo.uesk.floodplain = Lateral Boundary
-state.winfo.uesk.differences = Differenzen between waterlevel and terrain
+state.winfo.uesk.differences = Differences between waterlevel and terrain
 state.winfo.uesk.scenario = Flood Plain / Scenario
 state.winfo.uesk.dc-hws = HWS
 state.winfo.uesk.user-rgd = User defined shapefiles
 state.winfo.uesk.barriers = Digitized HWS
-state.winfo.waterlevel_pair_select = Chosen differences
+state.winfo.waterlevel_pair_select = Chosen Differences
 state.winfo.historicalq.reference_gauge = Selection of Gauge
 state.winfo.historicalq.timerange = Selection of Evaluation time
 state.winfo.historicalq.mode = Selecion of analyses
@@ -37,7 +37,7 @@
 state.fix.analysis.analysisperiods = Analysis period
 state.fix.analysis.function = Function
 state.fix.analysis.preprocessing = Outliers
-state.fix.preprocess=incorporate in calculation
+state.fix.preprocess=use outlier test
 state.fix.vollmer.function=Function
 state.fix.vollmer.preprocessing = Outliers
 state.fix.vollmer.qs = Input for W/Q data
@@ -55,8 +55,8 @@
 state.minfo.bed.difference_select=Differences
 state.minfo.year=Year
 state.minfo.epoch=Epoch
+state.minfo.bed.location = Location/Distance
 state.minfo.bed.distance = Range selection
-state.minfo.bed.location = Location/Distance
 state.minfo.bed.periods = Periods
 state.minfo.bed.char_diameter = Characteristic Diameter
 state.minfo.bed.error.no_data = No data found for selected range.
@@ -94,8 +94,8 @@
 calc.historical.discharge.curve = Historical Discharge Curve
 calc.reference.curve = Reference Curve
 calc.extreme.curve = Extreme Curves
-calc.fixation.default = Fixingg
-calc.fixation.vollmer = Generative Waterlevel
+calc.fixation.default = Fixation
+calc.fixation.vollmer = Balanced Waterlevel
 calc.bed.middle = Middle Bed Height
 calc.bed.diff = Bed Height Difference
 calc.bed.quality = Bed Quality
@@ -155,6 +155,11 @@
 main_channel = Main channel
 total_channel = Total channel
 
+chart.cross_section.title = Cross Section for river {0}
+chart.cross_section.subtitle = {0}-km: {1,number,#.###}
+chart.cross_section.xaxis.label = Distance [m]
+chart.cross_section.yaxis.label = W [{0}]
+
 chart.longitudinal.section.title = W-Longitudinal Section
 chart.longitudinal.section.subtitle = Range: {0}-km {1,number,#.###} - {2,number,#.###}
 chart.longitudinal.section.shortsubtitle = {0}
@@ -163,12 +168,6 @@
 chart.longitudinal.section.yaxis.label = W [{0}]
 chart.longitudinal.section.yaxis.second.label = Q [m\u00b3/s]
 chart.longitudinal.annotations.label = {0}.km
-
-chart.cross_section.title = Cross Section for river {0}
-chart.cross_section.subtitle = {0}-km: {1,number,#.###}
-chart.cross_section.xaxis.label = Distance [m]
-chart.cross_section.yaxis.label = W [{0}]
-
 chart.discharge.curve.title = Discharge Curve
 chart.discharge.curve.xaxis.label = Q [m\u00b3/s]
 chart.discharge.curve.yaxis.label = W [{0}]
@@ -188,7 +187,7 @@
 chart.duration.curve.yaxis.label.q = Q [m\u00b3/s]
 chart.duration.curve.curve.w = Waterlevel duration curve for {0} (km: {1})
 chart.duration.curve.curve.q = Discharge duration curve for {0} (km: {1})
-chart.historical.discharge.title = Historical Discharge Curves
+chart.historical.discharge.title = Historical Discharge Curves for Gauge {0}
 chart.historical.discharge.subtitle = Gauge {0} {1,date,medium} - {2,date,medium}
 chart.historical.discharge.xaxis.label = Time
 chart.historical.discharge.yaxis.second.label = Q [m\u00b3/s]
@@ -200,26 +199,29 @@
 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.fixings.derivedcurve.title = Derived curve
+chart.fixings.deltawt.title = Differences from fitted curve 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
 chart.w_differences.subtitle = {0}
 chart.w_differences.yaxis.label = m
 chart.w_differences.yaxis.second.label = W [NN + m]
 
-chart.normalized.reference.curve.title = Reduced Reference Curve
-
-chart.fixings.wq.title = Fixings Analysis 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.fixings.analysis.title = Longitudinal section at km {0}
-chart.fixings.wq.yaxis.label = W [{0}]
-
-chart.extreme.wq.yaxis.label = W [{0}]
-
 chart.bedquality.title=Bed Longitudinal Section
 chart.bedquality.xaxis.label={0}-km
 chart.bedquality.yaxis.label.diameter = Diameter [mm]
@@ -283,7 +285,7 @@
 facet.sedimentload.suspended_load = Suspended load (from database) - {0} [{1}]
 facet.sedimentload.calc.total = Total load (calculated) - {0} [{1}]
 facet.sedimentload.calc.bed_load = Bed load (calculated) - {0} [{1}]
-facet.sedimentload.calc.bed_load_susp_sand = bed building load (calculated) - {0} [{1}]
+facet.sedimentload.calc.bed_load_susp_sand = Bed building load (calculated) - {0} [{1}]
 
 minfo.sedimentload.no.data = No sediment load data available
 sedimentload.missing.fraction.coarse = Missing fraction coarse gravel - {0}
@@ -305,17 +307,17 @@
 historical_discharge.mainvalues.w = W Main Values
 facet.flow_velocity.model.mainchannel = Mainchannel {0}
 facet.flow_velocity.model.totalchannel = Totalchannel {0}
-facet.flow_velocity.model.tau = bottom shear stress {0}
+facet.flow_velocity.model.tau = Bottom shear stress {0}
 facet.flow_velocity.model.q = Q {0}
 facet.flow_velocity.mainchannel = v Mainchannel at {0}
+facet.flow_velocity.discharge = Discharge at {0}
 facet.flow_velocity.totalchannel = v Totalchannel at {0}
 facet.flow_velocity.tauchannel = Bottom shear stress Mainchannel at {0}
 facet.flow_velocity.mainchannel.raw = v Mainchannel at {0} (raw)
 facet.flow_velocity.totalchannel.raw = v Totalchannel at {0} (raw)
 facet.flow_velocity.tauchannel.raw = Bottom shear stress Mainchannel at {0} (raw)
-facet.flow_velocity.discharge = Discharge at {0}
+facet.flow_velocity.velocity = V {0}
 facet.flow_velocity.waterlevel = Waterlevel {0}
-facet.flow_velocity.velocity = V {0}
 facet.bedheight_middle.single = Bed Height {0,number,####}
 facet.bedheight_middle.epoch = Bed Height Epoch {0,number,####} - {1,number,####}
 facet.bedquality.bed.porosity.toplayer = Porosity ({0,date} - {1,date}) ({2})
@@ -367,10 +369,10 @@
 chart.beddifference.epoch.title = Bedheight Difference
 chart.beddifference.xaxis.label = {0}-km
 chart.beddifference.yaxis.label.diff = Difference [cm]
-chart.beddifference.yaxis.label.height = Absolute Height [{0}]
+chart.beddifference.yaxis.label.height = Absolute Height [m]
 chart.beddifference.year.title = Bedheight Difference
 chart.beddifference.yaxis.label.morph = Width [m]
-chart.beddifference.yaxis.label.heights = Absolute Height [{0}]
+chart.beddifference.yaxis.label.heights = Absolute Height [m]
 chart.subtitle.radius = Width of sample window for moving average
 
 export.csv.header.km = km
@@ -398,10 +400,10 @@
 export.duration.curve.csv.header.q = Q [m\u00b3/s]
 export.discharge.longitudinal.section.csv.header.km = River-Km
 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.cw = W corr. [NN + m]
 export.discharge.longitudinal.section.csv.header.q = Q [m\u00b3/s]
-export.discharge.curve.at.header = Computed Discharge Curve for {0} {0}-km: {1}
-export.discharge.curve.at.gauge.header = Discharge Table for {1}/{0} since {2} PNP[{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]
@@ -470,7 +472,7 @@
 export.sqrelation.csv.info.param.f = Parameter F: transport of bed load (0.063-125 mm)
 export.sqrelation.csv.info.q = Q: Discharge in [m\u00b3/s] as measured on measurement date
 export.sqrelation.csv.info.s_kg = S: Transport in [kg/s] as measured on measurement date
-export.sqrelation.csv.info.date = Mesurement Date: The date this measurment was made
+export.sqrelation.csv.info.date = Measurement Date: The date this measurment was made
 export.sqrelation.csv.header.parameter = Parameter
 export.sqrelation.csv.header.station = Station
 export.sqrelation.csv.header.km = River-Km
@@ -493,13 +495,13 @@
 export.sqrelation.measurements.pdf.file = /jasper/sqmeasurements_en.jasper
 export.sqrelation.pdf.mode = Load Discharge Relation
 export.minfo.bedquality.km = km
-export.minfo.bedquality.density.toplayer = Density Toplayer
-export.minfo.bedquality.density.sublayer = Density Sublayer
-export.minfo.bedquality.porosity.toplayer = Porosity Toplayer
-export.minfo.bedquality.porosity.sublayer = Porosity Sublayer
-export.minfo.bedquality.diameter.bedload = Bedload Diameter
-export.minfo.bedquality.diameter.toplayer = Bed Diameter Toplayer
-export.minfo.bedquality.diameter.sublayer = Bed Diameter Sublayer
+export.minfo.bedquality.density.toplayer = Density Toplayer [t/m\u00b3]
+export.minfo.bedquality.density.sublayer = Density Sublayer [t/m\u00b3]
+export.minfo.bedquality.porosity.toplayer = Porosity Toplayer [%]
+export.minfo.bedquality.porosity.sublayer = Porosity Sublayer [%]
+export.minfo.bedquality.diameter.bedload = Bedload Diameter [mm]
+export.minfo.bedquality.diameter.toplayer = Bed Diameter Toplayer [mm]
+export.minfo.bedquality.diameter.sublayer = Bed Diameter Sublayer [mm]
 export.minfo.beddifference.km = km
 export.minfo.beddifference.diff = Bedheight Difference [cm]
 export.minfo.beddifference.diff.pair = Difference pair
@@ -584,6 +586,7 @@
 no.segments.found = No segments found.
 no.values.given = No values given.
 cannot.interpolate.w.q = Cannot interpolate W/Q.
+
 manualpoints = Manual Points
 
 no.reference.start.km = No reference start station given.
@@ -666,8 +669,6 @@
 chart.fix.deltawt.xaxis.label=Date
 chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
 
-chart.fixings.derivedcurve.title = Derived curve
-chart.fixings.deltawt.title = Differences from fitted curve at km {0}
 
 chart.fixings.longitudinalsection.title=Longitudinal section
 
@@ -733,7 +734,7 @@
 load_diameter = Bedload Diameter
 bed_diameter = Bed Diameter
 
-area.label.template = Area = %s m\u00b2
+area.label.template = Area = %s m\u00b3
 
 gauge.discharge.service.chart.title = Discharge Tables at Gauge {0}
 gauge.discharge.service.chart.x.title = Q [m\u00b3/s]
@@ -825,7 +826,7 @@
 sinfo.export.flow_depth.csv.meta.header.sounding.evaluator = # Auswerter: {0}
 sinfo.export.flow_depth.csv.meta.header.sounding.prj = # Lagesystem: {0}
 sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel = # H\u00f6hensystem: {0} 
-sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel.original = # urspr\u00fcngliches H\u00f6hensystem: {0} 
+sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel.original = # urspr\u00fcngliches H\u00f6hensystem: {0}
 sinfo.export.flow_depth.csv.meta.header.waterlevel = ##METADATEN WASSERSPIEGELLAGE
 sinfo.export.flow_depth.csv.meta.header.waterlevel.name = # Bezeichnung der Wasserspiegellage: {0} 
 sinfo.export.flow_depth.csv.meta.header.waterlevel.gauge = # Bezugspegel: {0}