--- a/artifacts/src/main/resources/messages.properties	Thu Jul 26 11:16:06 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Thu Jul 26 15:54:20 2018 +0200
@@ -191,10 +191,8 @@
 chart.longitudinal.section.locsubtitle = {0} km {1,number,#.###}
 chart.longitudinal.section.xaxis.label = {0}-km
 chart.longitudinal.section.yaxis.label = W [{0}]
-chart.longitudinal.section.yaxis.second.label = Q [m\u00b3/s]
 chart.longitudinal.annotations.label = {0}.km
 chart.discharge.curve.title = Discharge Curve
-chart.discharge.curve.xaxis.label = Q [m\u00b3/s]
 chart.discharge.curve.yaxis.label = W [{0}]
 chart.discharge.curve.yaxis.cm.label = W [cm]
 chart.discharge.curve.curve.valid.from = {0} (valid from {1,date,short})
@@ -209,16 +207,13 @@
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Duration of Non-Exceedence [Days]
 chart.duration.curve.yaxis.label.w = W [{0}]
-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 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]
+chart.historical.discharge.xaxis.label = Time 
 chart.historical.discharge.yaxis.label = W [cm]
 chart.historical.discharge.wq.title = Discharge Curves
-chart.historical.discharge.wq.xaxis.label = Q [m\u00b3/s]
 chart.historical.discharge.wq.yaxis.label = W [cm]
 
 chart.reference.curve.title = Reference Curve
@@ -402,7 +397,7 @@
 
 export.waterlevel.csv.header.km = River-Km
 export.waterlevel.csv.header.w = W [{0}]
-export.waterlevel.csv.header.q = Q [m\u00b3/s]
+common.export.csv.header.q = Q [m\u00b3/s]
 export.waterlevel.csv.header.q.desc = Description
 export.waterlevel.csv.header.location = Location
 export.waterlevel.csv.header.gauge = Reference Gauge
@@ -416,14 +411,11 @@
 export.waterlevel.csv.meta.w = # W (NN + m): {0} - {1}
 export.waterlevel.csv.not.in.gauge.range = Outside selected gauge
 export.computed.discharge.curve.csv.header.w = W [{0}]
-export.computed.discharge.curve.csv.header.q = Q [m\u00b3/s]
 export.duration.curve.csv.header.duration = D [Days]
 export.duration.curve.csv.header.w = W [{0}]
-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.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.historical.discharge.csv.header.timerange = Timerange
@@ -457,7 +449,6 @@
 export.flow_velocity.csv.header.v_total = v Total Channel
 export.flow_velocity.csv.header.v_main = v Main Channel
 export.flow_velocity.csv.header.tau_main = Bottom shear stress Main Channel
-export.flow_velocity.csv.header.q = Q [m\u00b3/s]
 export.flow_velocity.csv.header.locations = Location
 export.bedheight_middle.csv.header.km = River km
 export.bedheight_middle.csv.header.sounding = Sounding / Epoch
@@ -511,7 +502,6 @@
 export.sqrelation.csv.header.sd = Standard error
 export.sqrelation.csv.header.qmax = Q max, measured [m\u00b3/s]
 export.sqrelation.csv.header.s_kg = S [kg/s]
-export.sqrelation.csv.header.q = Q [m\u00b3/s]
 export.sqrelation.csv.header.date = Measurement date
 export.sqrelation.pdf.file = /jasper/sqrelation_en.jasper
 export.sqrelation.measurements.pdf.file = /jasper/sqmeasurements_en.jasper
@@ -736,7 +726,6 @@
 fix.km.chart.q.sector.border2=HQ5
 fix.km.chart.label.date=yyyy/MM/dd
 fix.km.chart.title=Fixings {0} km {1,number,#.###}
-fix.km.chart.q.axis=Q [m\u00b3/s]
 fix.km.chart.w.axis=W [NN + m]
 fix.km.chart.measured=measured
 fix.km.chart.interpolated=interpolated
@@ -765,7 +754,6 @@
 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]
 gauge.discharge.service.chart.y.title = W [cm]
 gauge.discharge.service.chart.series.title = Discharge Curve {0,date,short} - {1,date,short}
 gauge.discharge.service.chart.series.title.master = Current Discharge Curve since {0,date,short}
@@ -895,17 +883,17 @@
 sinfo.export.flow_depth.csv.meta.creation.label = Time of creation
 sinfo.export.flow_depth.csv.meta.river = # {0}: {1}
 sinfo.export.flow_depth.csv.meta.river.label = Gew\u00e4sser
-sinfo.export.flow_depth.csv.meta.header.sounding = ##METADATEN PEILUNG
-sinfo.export.flow_depth.csv.meta.header.sounding.year = # Jahr der Peilung: {0}
-sinfo.export.flow_depth.csv.meta.header.sounding.type = # Aufnahmeart: {0}
-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.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}
-sinfo.export.flow_depth.csv.meta.header.waterlevel.year = # Jahr/Zeitraum der Wasserspiegellage: {0}
+common.export.flow_depth.csv.meta.header.sounding = ##METADATEN PEILUNG
+common.export.csv.meta.header.sounding.year = # Jahr der Peilung: {0}
+common.export.csv.meta.header.sounding.type = # Aufnahmeart: {0}
+common.export.csv.meta.header.sounding.evaluator = # Auswerter: {0}
+common.export.csv.meta.header.sounding.prj = # Lagesystem: {0}
+common.export.csv.meta.header.sounding.elevationmodel = # H\u00f6hensystem: {0} 
+common.export.csv.meta.header.sounding.elevationmodel.original = # urspr\u00fcngliches H\u00f6hensystem: {0}
+common.export.csv.meta.header.waterlevel = ##METADATEN WASSERSPIEGELLAGE
+common.export.csv.meta.header.waterlevel.name = # Bezeichnung der Wasserspiegellage: {0} 
+common.export.csv.meta.header.waterlevel.gauge = # Bezugspegel: {0}
+common.export.csv.meta.header.waterlevel.year = # Jahr/Zeitraum der Wasserspiegellage: {0}
 sinfo.export.flow_depth.csv.meta.range = # {0}: {1} - {2}
 sinfo.export.flow_depth.csv.meta.range.label = Range (km)
 sinfo.export.flow_depth.pdf.meta.calculation.label = Angewandte Gleichung
@@ -924,7 +912,7 @@
 sinfo.export.flow_depth.csv.header.mean_bed_height = Mittlere Sohlh\u00f6he
 sinfo.export.flow_depth.csv.header.mean_bed_height.short = Mittlere Sohl-
 sinfo.export.flow_depth.csv.header.sounding = Peilung/Epoche
-sinfo.export.flow_depth.csv.header.location = Lage
+common.export.csv.header.location = Lage
 
 sinfo.export.flood_duration.csv.header.riverside = Uferseite
 sinfo.export.flood_duration.csv.header.infrastructure.height = H\u00f6he der Infrastruktur
@@ -1228,6 +1216,8 @@
 state.bundu.wst.load.function = Ausgleichsfunktion
 state.bundu.wst.function = Auswahl der Ausgleichsfunktion
 
+bundu.wst.export.csv.meta.header.bezugswst = Bezugswasserstand
+
 common.client.ui.selection = Selection
 common.client.ui.from = from
 common.client.ui.to = to