--- a/artifacts/src/main/resources/messages.properties	Mon Oct 29 17:57:30 2018 +0100
+++ b/artifacts/src/main/resources/messages.properties	Tue Oct 30 17:46:52 2018 +0100
@@ -6,12 +6,12 @@
 
 state.winfo.river = River
 state.winfo.calculation_mode = Calculation Mode
-state.winfo.location_distance = Location or distance selection
+state.winfo.location_distance = Location or Stretch Selection
 state.winfo.wq = Input for W/Q data
 state.winfo.wq_adapted = Input for W/Q data
-state.winfo.location = Choose the location
-state.winfo.distance = Choose the range
-state.winfo.distance_only = Range selection
+state.winfo.location = Choose the Location
+state.winfo.distance = Choose the Stretch
+state.winfo.distance_only = Stretch Selection
 state.winfo.uesk.wsp = Choose the waterlevel
 state.winfo.uesk.dgm = Digital Terrain Model
 state.winfo.uesk.profiles = Interpolated Profiles
@@ -32,9 +32,9 @@
 state.winfo.extreme.qinput = Input of Q data
 state.fix.river = River
 state.fix.calculation.mode = Calculation Mode
-state.fix.location = Distance
+state.fix.location = Stretch
 state.fix.period = Period
-state.fix.gaugerange = Discharge Class
+state.fix.gaugerange = Discharge Sectors
 state.fix.eventselect = Event selection
 state.fix.analysis.referenceperiod = Reference period
 state.fix.analysis.analysisperiods = Analysis period
@@ -47,8 +47,8 @@
 
 state.minfo.river = River
 state.minfo.calculation_mode = Calculation Mode
-state.minfo.distance = Range selection
-state.minfo.distance_only = Range selection
+state.minfo.distance = Stretch Selection
+state.minfo.distance_only = Stretch Selection
 state.minfo.dischargestate = Selection of discharge state and channel
 state.minfo.sq.location=Location
 state.minfo.sq.period=Periods
@@ -58,16 +58,16 @@
 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/Stretch
+state.minfo.bed.distance = Stretch Selection
 state.minfo.bed.periods = Periods
 state.minfo.bed.char_diameter = Characteristic Diameter
-state.minfo.bed.error.no_data = No data found for selected range.
+state.minfo.bed.error.no_data = No data found for selected stretch.
 state.minfo.bed.error.no_data_for_period = No data found for period: {0} - {1}.
 state.minfo.soundings = Choose Soundings
-state.uinfo.salix.historical.soundings=Sounding-Based Selection of a Historical State
+state.uinfo.salix.historical.soundings=Selection of historic bed levels based on echosoundings
 state.bundu.wst.soundings = Choose Sounding
-state.minfo.sediment.load.location = Range
+state.minfo.sediment.load.location = Stretch
 state.minfo.sediment.load.year_epoch = Year/Epoch
 state.minfo.sediment.load.epochs = Epochs
 state.minfo.sediment.load.period = Years
@@ -80,8 +80,8 @@
 state.minfo.t_per_a = t/a
 state.minfo.m3_per_a = m\u00b3/a
 
-state.uinfo.vegetation_zones.table = Classification of Vegetation Zones and Flooding Durations (FD)
-state.uinfo.salix.supraregional = Supraregional Effects
+state.uinfo.vegetation_zones.table = Classification of Vegetation Zones and Flood Duration (FD)
+state.uinfo.salix.supraregional = Large Scale impacts
 
 state.uinfo.inundation.scenario.table_header  = Change [cm]
 state.uinfo.inundation.year_totalepoch  = Year/Epoch
@@ -100,9 +100,9 @@
 state.sinfo.year=Year
 state.sinfo.epoch=Epoch
 
-state.sinfo.riverside.left = Left Riverside
-state.sinfo.riverside.right = Right Riverside
-state.sinfo.riverside.both = Both Riversides
+state.sinfo.riverside.left = Left Bank
+state.sinfo.riverside.right = Right Bank
+state.sinfo.riverside.both = Both Bank
 riverside.left = left
 riverside.right = right
 
@@ -116,13 +116,13 @@
 historical.mode.w = Waterlevel Analysis
 historical.mode.q = Discharge Analysis
 
-calc.surface.curve = Water Level/Surface Curve
+calc.surface.curve = Waterlevel/Surface Curve
 calc.flood.map = Flood Plain
-calc.discharge.curve = State Discharge Curve/Stage Discharge Relation
+calc.discharge.curve = Discharge Rating Curve/Table
 calc.duration.curve = Duration Curve
 calc.discharge.longitudinal.section = W for userdefined Discharge
 calc.w.differences = Differences
-calc.historical.discharge.curve = Historical Discharge Curve
+calc.historical.discharge.curve = Historical Discharge Rating Curve
 calc.reference.curve = Reference Curve
 calc.extreme.curve = Extreme Curves
 calc.fixation.default = Fixation
@@ -158,7 +158,7 @@
 state.chart.km = Kilometer
 
 chart.new.durationcurve = Duration Curve
-chart.new.computeddischargecurve = Discharge Curve
+chart.new.computeddischargecurve = Discharge Rating Curve
 chart.new.longitudinal_section = Longitudinal Section
 chart.new.w_differences = Differences
 chart.new.crosssection = Cross Section
@@ -197,24 +197,24 @@
 chart.longitudinal.section.xaxis.label = {0}-km
 chart.longitudinal.section.yaxis.label = W [{0}]
 chart.longitudinal.annotations.label = {0}.km
-chart.discharge.curve.title = Discharge Curve
+chart.discharge.curve.title = Discharge Rating Curve
 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})
 chart.discharge.curve.curve.valid.range = {0} (valid from {1,date,short} - {2,date,short})
-chart.computed.discharge.curve.title = Discharge Curve
+chart.computed.discharge.curve.title = Discharge Rating Curve
 chart.discharge.curve.subtitle = {0}-km: $KM
-chart.discharge.curve.model = Model discharge curve {0} {1,date,medium} - {2,date,medium}
-chart.discharge.curve.model.nostop = Model discharge curve {0} {1,date,medium} -
+chart.discharge.curve.model = Model discharge rating curve {0} {1,date,medium} - {2,date,medium}
+chart.discharge.curve.model.nostop = Model discharge rating curve {0} {1,date,medium} -
 chart.computed.discharge.curve.yaxis.label = W [{0}]
-chart.computed.discharge.curve.curve.label = Discharge Curve {0} km {1}
+chart.computed.discharge.curve.curve.label = Discharge Rating Curve {0} km {1}
 chart.duration.curve.title = Duration Curve
 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.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.title = Historical Discharge Rating 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.label = W [cm]
@@ -256,8 +256,8 @@
 meta.bedheight.year = Year
 meta.bedheight.type = Type
 meta.bedheight.cur.elevation = Current elevation model
-meta.bedheight.old.elevation = Old elevation model
-meta.bedheight.range = Range
+meta.bedheight.old.elevation = Original elevation model
+meta.bedheight.range = Stretch
 meta.bedheight.location.system = Location system
 meta.bedheight.evalby = Evaluated by
 meta.bedheight.river.elevation = River elevation model
@@ -268,7 +268,7 @@
 
 chart.sq_relation.xaxis.label = Discharge [m\u00b3/s]
 chart.sq_relation.yaxis.label = Transport [kg/s]
-chart.sq_relation_a.title = Fine material
+chart.sq_relation_a.title = Fraction of fines
 chart.sq_relation_b.title = Sand (suspended)
 chart.sq_relation_c.title = Sand (bed load)
 chart.sq_relation_d.title = Fine/middle gravel
@@ -283,7 +283,7 @@
 
 sedimentdensity = sediment density
 sand = Sand
-fine_middle = Fine/Mid. gravel
+fine_middle = Fine/Medium Gravel
 susp_sand = Susp. Sand
 susp_sand_bed = Bed. part Susp.Sand
 suspended_sediment = Sediment
@@ -296,7 +296,7 @@
 
 facet.sedimentload.prefix.offcial = Official epoch :
 facet.sedimentload.coarse = Coarse gravel - {0} [{1}]
-facet.sedimentload.fine_middle = Fine/Mid. gravel - {0} [{1}]
+facet.sedimentload.fine_middle = Fine/Medium Gravel - {0} [{1}]
 facet.sedimentload.sand = Sand - {0} [{1}]
 facet.sedimentload.susp_sand = Suspended sand - {0} [{1}]
 facet.sedimentload.susp_sand_bed = Bed. part suspended sand - {0} [{1}]
@@ -310,7 +310,7 @@
 
 minfo.sedimentload.no.data = No sediment load data available
 sedimentload.missing.fraction.coarse = Missing fraction coarse gravel - {0}
-sedimentload.missing.fraction.fine_middle = Missing fraction fine/mid. gravel - {0}
+sedimentload.missing.fraction.fine_middle = Missing fraction fine/medium gravel - {0}
 sedimentload.missing.fraction.sand = Missing fraction sand - {0}
 sedimentload.missing.fraction.susp_sand = Missing fraction suspended sand - {0}
 sedimentload.missing.fraction.susp_sand_bed = Missing fraction bed. part suspended sand - {0}
@@ -354,16 +354,16 @@
 facet.bedquality.interpol.suffix = - interpolated
 bedquality.toplayer = 0.0m - 0.3m
 bedquality.sublayer = 0.1m - 0.5m
-bedquality.missing.diameter.bedload = Interpolating bedload diameter {0} on this range in {1,date} - {2,date} not possible.
-bedquality.missing.diameter.sublayer = Interpolating bed diameter {0} (0.0 m - 0.3 m) on this range in {1,date} - {2,date} not possible.
-bedquality.missing.diameter.toplayer = Interpolating bed diameter {0} (0.1 m - 0.5 m) on this range in {1,date} - {2,date} not possible.
-bedquality.missing.density.toplayer = Interpolating density (0.0 m - 0.3 m) on this range in {1,date} - {2,date} not possible.
-bedquality.missing.density.sublayer = Interpolating density (0.1 m - 0.5 m) on this range in {1,date} - {2,date} not possible.
-bedquality.missing.porosity.toplayer = Interpolating porosity (0.0 m - 0.3 m) on this range in {1,date} - {2,date} not possible.
-bedquality.missing.porosity.sublayer = Interpolating porosity (0.1 m - 0.5 m) on this range in {1,date} - {2,date} not possible.
+bedquality.missing.diameter.bedload = Interpolating bedload diameter {0} on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.diameter.sublayer = Interpolating bed diameter {0} (0.0 m - 0.3 m) on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.diameter.toplayer = Interpolating bed diameter {0} (0.1 m - 0.5 m) on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.density.toplayer = Interpolating density (0.0 m - 0.3 m) on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.density.sublayer = Interpolating density (0.1 m - 0.5 m) on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.porosity.toplayer = Interpolating porosity (0.0 m - 0.3 m) on this stretch in {1,date} - {2,date} not possible.
+bedquality.missing.porosity.sublayer = Interpolating porosity (0.1 m - 0.5 m) on this stretch in {1,date} - {2,date} not possible.
 facet.bedheight.diff.year = Bedheight Difference {0}
 facet.bedheight.sounding_width = Sounding Width ({0})
-facet.bedheight.diff.sounding = sounding Width
+facet.bedheight.diff.sounding = Sounding Width
 facet.bedheight.diff.height1 = Original Height Minuend {0}
 facet.bedheight.diff.height2 = Original Height Subtrahend {0}
 facet.bedheight.diff.morph1 = Morph. active width minuend
@@ -411,7 +411,7 @@
 export.waterlevel.csv.meta.creation = # Time of Creation: {0}
 export.waterlevel.csv.meta.calculationbase = # Calculation base: {0}
 export.waterlevel.csv.meta.river = # River: {0}
-export.waterlevel.csv.meta.range = # Location/Range (km): {0} - {1}
+export.waterlevel.csv.meta.range = # Location/Stretch (km): {0} - {1}
 export.waterlevel.csv.meta.gauge = # Gauge: {0}
 common.export.waterlevel.csv.meta.q = # Q (m\u00b3/s): {0}
 export.waterlevel.csv.meta.w = # W (NN + m): {0} - {1}
@@ -422,9 +422,9 @@
 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.curve.at.gauge.header = Discharge Table 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
+export.discharge.curve.at.gauge.header = Discharge Rating Table for {1}/{0} since {2} datum[{4}] = {3}
+export.discharge.curve.at.header = Computed discharge rating curve for {0} {0}-km: {1}
+export.historical.discharge.csv.header.timerange = Time Period
 export.historical.discharge.csv.header.waterlevel = Waterlevel [cm]
 export.historical.discharge.csv.header.discharge = Discharge [m\u00b3/s]
 export.historical.discharge.csv.header.diff.q = \u0394Q to reference[m\u00b3/s]
@@ -437,7 +437,7 @@
 
 export.waterlevel.pdf.mode = Waterlevel
 export.computed.discharge.pdf.mode = Dischargecurve
-export.computed.discharge.pdf.calc.mode = Computed Dischargecurve
+export.computed.discharge.pdf.calc.mode = Computed Discharge Rating Curve
 export.duration.pdf.mode = Durationcurve
 export.wdifferences.pdf.mode = W Differences
 export.historical.discharge.pdf.mode = Historical Discharge
@@ -450,12 +450,12 @@
 export.reference_curve.pdf.file.gauge = /jasper/reference_en_gauge.jasper
 export.reference_curve.pdf.file.gauge.end = /jasper/reference_en_gauge_end.jasper
 export.reference_curve.pdf.file.gauge.start.end = /jasper/reference_en_gauge_start_end.jasper
-export.flow_velocity.csv.header.km = River Km
+export.flow_velocity.csv.header.km = River-km
 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.locations = Location
-export.bedheight_middle.csv.header.km = River km
+export.bedheight_middle.csv.header.km = River-km
 export.bedheight_middle.csv.header.sounding = Sounding/Epoch
 export.bedheight_middle.csv.header.height = Mean Bed Height [{0}]
 export.bedheight_middle.csv.header.uncertainty = Uncertainty [m]
@@ -464,7 +464,7 @@
 export.bedheight_middle.csv.header.locations = Location
 
 export.sedimentload.csv.header.coarse = Coarse gravel [{0}]
-export.sedimentload.csv.header.fine_middle = Fine/Mid. gravel [{0}]
+export.sedimentload.csv.header.fine_middle = Fine/Medium Gravel [{0}]
 export.sedimentload.csv.header.sand = Sand [{0}]
 export.sedimentload.csv.header.susp_sand = Suspended sand [{0}]
 export.sedimentload.csv.header.susp_sand_bed = Bed. part suspended sand [{0}]
@@ -482,7 +482,7 @@
 export.sqrelation.csv.info.noutl = n outliers: number of outliers
 export.sqrelation.csv.info.cferguson = CFERGUSON: bias correction (Ferguson, 1986)
 export.sqrelation.csv.info.cduan = CDUAN: bias correction (Duan, 1983)
-export.sqrelation.csv.info.param.a = Parameter A: transport of fine material (< 0.063 mm)
+export.sqrelation.csv.info.param.a = Parameter A: transport of fraction of fines (< 0.063 mm)
 export.sqrelation.csv.info.param.b = Parameter B: transport of suspended sand (0.063-2 mm)
 export.sqrelation.csv.info.param.c = Parameter C: transport of sand (0.063-2 mm)
 export.sqrelation.csv.info.param.d = Parameter D: transport of fine and medium gravel (2-16 mm)
@@ -535,7 +535,7 @@
 floodmap.uesk = Floodmap: {0}-km {1,number,####} - {2,number,####} - {3}
 floodmap.barriers = Digitized Objects
 floodmap.kms = Kilometrage
-floodmap.qps = Crosssection Tracks
+floodmap.qps = Transverse Cross Sections
 floodmap.hws = Flood Control Works
 floodmap.hws.lines.official = Official Flood Control Works
 floodmap.hws.points.official = Official Flood Control Works (points)
@@ -543,7 +543,7 @@
 floodmap.floodplain = Floodplain
 floodmap.lines = Lines
 floodmap.buildings = Buildings
-floodmap.fixpoints = Fixpoints
+floodmap.fixpoints = Fixed Points
 floodmap.floodmaps = Floodmaps
 floodmap.usershape = User data
 floodmap.isobath.class = {0,number,#.#} m to {1,number,#.#} m
@@ -580,10 +580,10 @@
 w.w.wkm2.failed = Calculating W for Q = {0,number,#.##} /  WST index {1,number,#.##} failed.
 
 hist.discharge.no.value.in.ref = {0} {1} not in reference table
-cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in timerange {1, date} - {2, date}
-cannot.find.hist.w.for.q = Cannot find W for Q = {0,number,#.##} in timerange {1, date} - {2, date}
-cannot.find.hist.q.tables = Cannot find Discharge Tables for given timerange.
-cannot.find.hist.q.reftable = Cannot find reference Discharge Table for specified Gauge.
+cannot.find.hist.q.for.w = Cannot find Q for W = {0,number,#.##} in time period {1, date} - {2, date}
+cannot.find.hist.w.for.q = Cannot find W for Q = {0,number,#.##} in time period {1, date} - {2, date}
+cannot.find.hist.q.tables = Cannot find Discharge Rating Tables for given time period.
+cannot.find.hist.q.reftable = Cannot find reference Discharge Rating Table for specified Gauge.
 
 more.than.one.q.for.w = Found more Qs for W = {0,number,#.##}.
 
@@ -599,8 +599,8 @@
 no.range.found = No range found.
 no.gauge.found.for.km = No gauge found for KM {0}.
 cannot.create.segments = Cannot create segments.
-cannot.compute.discharge.curve = Cannot create discharge curve.
-cannot.find.ds = Cannot find Ds.
+cannot.compute.discharge.curve = Cannot create discharge rating curve.
+cannot.find.ds = Cannot find duration numbers.
 no.segments.found = No segments found.
 no.values.given = No values given.
 cannot.interpolate.w.q = Cannot interpolate W/Q.
@@ -672,10 +672,10 @@
 fix.interpolated = interpolated
 fix.analysis=Analysis event
 fix.deviation=Standard deviation
-fix.reference.deviation=Reference deviation
+fix.reference.deviation=Standard deviation of reference period
 fix.vollmer.wq.curve=Adjusted function
 fix.vollmer.wq.events=Events
-qsectors=Discharge Class
+qsectors=Discharge Sectors
 fix.mnq=around MNQ
 fix.mq=around MQ
 fix.mhq=around MHQ
@@ -683,8 +683,8 @@
 fix.export.csv.w_at_gauge = W a. G. (current) [cm]
 export.waterlevel.csv.header.w.desc =  W/Gauge [cm]
 
-chart.fix.deltawt.title=Difference from compensating curve at kilometer {0}
-chart.fix.deltawt.subtitle=Water: {0}; Period:  {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short}
+chart.fix.deltawt.title=Difference from Regression Curve at kilometer {0}
+chart.fix.deltawt.subtitle=River: {0}; Period:  {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short}
 chart.fix.deltawt.xaxis.label=Date
 chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm]
 
@@ -693,7 +693,7 @@
 
 chart.fixings.longitudinalsection.title=\u0394W Longitudinal section
 
-chart.fixings.deltawt.title = Differences from fitted curve at km {0}
+chart.fixings.deltawt.title = Differences from Regression Curve at km {0}
 
 export.fixings.deltawt.csv.header.km=km
 export.fixings.deltawt.csv.header.deltaw=\u0394W [cm]
@@ -715,7 +715,7 @@
 fix.missing.analysis.periods=Missing Analysis Periods
 fix.missing.qstart.sector=Missing Discharge Start Sector
 fix.missing.qend.sector=Missing Discharge End Sector
-fix.missing.prepocessing=Missing Info About Preprocessing
+fix.missing.prepocessing=Missing Info About Outlier Tests
 fix.no.overview.available=No Overview Available
 fix.invalid.function.name=Name of Function Unknown
 fix.too.less.data.colums=Too few Data Columns for Calculation
@@ -738,8 +738,8 @@
 fix.km.chart.measured=measured
 fix.km.chart.interpolated=interpolated
 
-fix.export.at.header = Exported fixings discharge curve for {0} {0}-km: {1}
-fix.export.at.gauge.header = Exported fixings discharge curve for {0}, gauge: {1} datum[{3}] = {2}
+fix.export.at.header = Exported fixings discharge rating table for {0} {0}-km: {1}
+fix.export.at.gauge.header = Exported fixings discharge rating table for {0}, gauge: {1} datum[{3}] = {2}
 sq.km.chart.label = Measuring Points
 sq.km.chart.title = Measuring Points
 sq.km.chart.km.axis = km
@@ -761,10 +761,10 @@
 
 area.label.template = Area = %s m\u00b2
 
-gauge.discharge.service.chart.title = Discharge Tables at Gauge {0}
+gauge.discharge.service.chart.title = Discharge Rating Curvs at Gauge {0}
 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}
+gauge.discharge.service.chart.series.title = Discharge Rating Curve {0,date,short} - {1,date,short}
+gauge.discharge.service.chart.series.title.master = Current Discharge Rating Curve since {0,date,short}
 
 bed.km.chart.label = Bed Data
 bed.km.chart.title = Bed Data SedDB
@@ -795,7 +795,7 @@
 state.sinfo.calculation_mode=Calculation Mode
 
 sinfo_calc_flow_depth=Flow Depths
-sinfo_calc_flow_depth.warning.missingQ = {0}: no discharge available, calculation of transport body height not possible
+sinfo_calc_flow_depth.warning.missingQ = {0}: no discharge available, calculation of dune height not possible
 sinfo_calc_flow_depth.warning.waterlevel_discretisation  = Waterlevel {0}: Spatial resolution is greater than 1000m
 sinfo_calc_flow_depth.warning.year_difference = {0}: The used difference pair is a waterlevel from the year {1} and a sounding from the year {2}. This may lead to implausible values.
 
@@ -805,13 +805,13 @@
 sinfo.bedheightsfinder.missingdescription = River {0} has no bed heights with description {1}
 sinfo.bedheightsfinder.configfile.loaderror = Failed to load config file ''{0}'': {1}
 sinfo.bedheightsfinder.notfound = Failed to access sounding with id ''{0}''
-sinfo.bedheightsfinder.empty = The bed heights do not contain any values for the selected calculation range
+sinfo.bedheightsfinder.empty = The bed heights do not contain any values for the selected calculation stretch
 sinfo.bedqualityd50config.configfile.loaderror = Failed to read config file ''{0}'' which contains period specs for D50 bed diameter calculation: {1}
 
 sinfo_calc_flow_depth_development=Flow Depth Development
 sinfo_calc_flow_depth_minmax=Minimum and Maximum Flow Depth
-sinfo_calc_collision=Collisions
-sinfo_calc_transport_bodies_heights=Transport Body Heights
+sinfo_calc_collision=Contact with River Bed
+sinfo_calc_transport_bodies_heights=Dune Heights
 sinfo_calc_flood_duration=Flooding Durations of Infrastructures in BWaStr
 
 state.sinfo.infrastructures_inundation = Flooding Durations of Infrastructures in BWaStr (Result)
@@ -821,16 +821,16 @@
 help.state.sinfo.river=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.river
 help.state.sinfo.calculation_mode=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.calculation_mode
 
-state.sinfo.distance_only = Range Selection
+state.sinfo.distance_only = Stretch Selection
 help.state.sinfo.distance_only = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only
 
-state.sinfo.distance = Range Selection
+state.sinfo.distance = Stretch Selection
 help.state.sinfo.distance = ${help.url}/OnlineHilfe/help.state.sinfo.distance
 
 state.sinfo.wq = Input for W/Q data
 help.state.sinfo.wq=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wq
 
-state.sinfo.transport_bodies_heights=Transport Body Heights
+state.sinfo.transport_bodies_heights=Dune Heights
 help.state.sinfo.transport_bodies_heights=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.transport_bodies_heights
 
 state.sinfo.waterlevel_soundings_select= Differences Choice
@@ -839,7 +839,7 @@
 state.sinfo.waterlevel_soundings_minmax_select=  Differences Choice
 help.state.sinfo.waterlevel_soundings_minmax_select=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.waterlevel_soundings_minmax_select
 
-state.sinfo.use_transport_bodies=Transport Body Heights
+state.sinfo.use_transport_bodies=Dune Heights
 help.state.sinfo.use_transport_bodies=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.use_transport_bodies
 
 state.sinfo.flow_depth_minmax = Minimum/Maximum Flow Depths
@@ -848,7 +848,7 @@
 state.sinfo.flow_depth_development = Flow Depth Development
 help.state.sinfo.flow_depth_development = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.flow_depth_development
 
-useTransportBodies.option = Include Transport Body Heights?
+useTransportBodies.option = Include Dune Heights?
 useTransportBodies.active = Active
 useTransportBodies.inactive = Inactive
 
@@ -861,10 +861,10 @@
 help.state.sinfo.collisions.epochs = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.epochs
 help.state.sinfo.collisions.years = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.years
 
-state.sinfo.riverside = Riverside Selection
-state.sinfo.riverside.option1 = Left Riverside
-state.sinfo.riverside.option2 = Right Riverside
-state.sinfo.riverside.option3 = Both Riversides
+state.sinfo.riverside = Bank Selection
+state.sinfo.riverside.option1 = Left Bank
+state.sinfo.riverside.option2 = Right Bank
+state.sinfo.riverside.option3 = Both Bank
 help.state.sinfo.riverside= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
 
 state.bundu.wst.qs = Input for DNE/Q data
@@ -895,13 +895,13 @@
 common.export.csv.meta.header.sounding.evaluator = # Evaluator: {0}
 common.export.csv.meta.header.sounding.prj = # Location System: {0}
 common.export.csv.meta.header.sounding.elevationmodel = # Elevation Model: {0} 
-common.export.csv.meta.header.sounding.elevationmodel.original = # Old Elevation Model: {0}
+common.export.csv.meta.header.sounding.elevationmodel.original = # Original Elevation Model: {0}
 common.export.csv.meta.header.waterlevel = ##METADATA WATERLEVEL
 common.export.csv.meta.header.waterlevel.name = # Designation of the Waterlevel: {0} 
 common.export.csv.meta.header.waterlevel.gauge = # Reference Gauge: {0}
 common.export.csv.meta.header.waterlevel.year = # Year/Epoch of the Waterlevel: {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.csv.meta.range.label = Stretch (km)
 sinfo.export.flow_depth.pdf.meta.calculation.label = Applied Equation
 sinfo.export.flow_depth.pdf.meta.calculation.name = Gill (1971)
 sinfo.export.flow_depth.csv.meta.height_unit.river = # Elevation Model of the River: {0} 
@@ -909,50 +909,50 @@
 bundu.export.bezugswst.csv.meta.preprocessing = # Outlier Test: {0}
 bundu.export.bezugswst.csv.meta.q_period = # Period of the Discharge Time Series: {0} - {1}
 bundu.export.bezugswst.csv.meta.ud = # DNE (d/a): {0}
-bundu.export.bezugswst.csv.meta.missing_volume_range = # Range of the Missing Depths Calculation: {0} - {1}
+bundu.export.bezugswst.csv.meta.missing_volume_range = # Stretch of the Shoals Calculation: {0} - {1}
 
 bundu.export.csv.title.bezugswst.overview = Overview
-bundu.export.csv.title.bezugswst.result1 = Missing Volume Calculation 1
-bundu.export.csv.title.bezugswst.result2 = Missing Volume Calculation 2
-bundu.export.csv.title.bezugswst.result3 = Missing Volume Summary
+bundu.export.csv.title.bezugswst.result1 = Shoal Volume Calculation 1
+bundu.export.csv.title.bezugswst.result2 = Shoal Volume Calculation 2
+bundu.export.csv.title.bezugswst.result3 = Shoal Volume Summary
 
 bundu.export.bezugswst.csv.header.mean_bed_height = Mean Bed Height
 bundu.export.bezugswst.csv.meta.miss.density = Bulk Density [t/m\u00b3]
 bundu.export.bezugswst.pdf.meta.miss.density = Bulk Density [t/m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.channel.width = Channel Width [m]
-bundu.export.bezugswst.pdf.meta.miss.channel.width = Channel Width [m]
+bundu.export.bezugswst.csv.meta.miss.channel.width = Navigation Channel Width [m]
+bundu.export.bezugswst.pdf.meta.miss.channel.width = Navigation Channel Width [m]
 bundu.export.bezugswst.csv.meta.miss.costs = Excavation Costs [\u20ac]
 bundu.export.bezugswst.pdf.meta.miss.costs = Excavation Costs [\u20ac]
 bundu.export.bezugswst.csv.meta.miss.excavation = Excavation Volume [m\u00b3]
 bundu.export.bezugswst.pdf.meta.miss.excavation = Excavation Volume [m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.mass.total = Total Missing Mass [t]
-bundu.export.bezugswst.csv.meta.miss.volume.total = Total Missing Volume [m\u00b3]
+bundu.export.bezugswst.csv.meta.miss.mass.total = Total Shoal Mass [t]
+bundu.export.bezugswst.csv.meta.miss.volume.total = Total Shoal Volume [m\u00b3]
 bundu.export.bezugswst.csv.meta.miss.coststotal = Total Excavation Costs [\u20ac]
 bundu.export.bezugswst.pdf.meta.miss.coststotal = Total Excavation Costs [\u20ac]
 bundu.export.bezugswst.csv.meta.miss.excavationtotal = Total Excavation Volume [m\u00b3]
 bundu.export.bezugswst.pdf.meta.miss.excavationtotal = Total Excavation Volume [m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.exists = Missing Depths Available?
-bundu.export.bezugswst.pdf.meta.miss.exists = Missing Depths Avail-able?
-bundu.export.bezugswst.csv.meta.miss.channel.min_depth = Channel Depths to be Provided [m]
-bundu.export.bezugswst.pdf.meta.miss.channel.min_depth = Channel Depths to be Pro-vided [m]
-bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Lower Edge of Channel
-bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Lower Edge of Channel
+bundu.export.bezugswst.csv.meta.miss.exists = Shoals Available?
+bundu.export.bezugswst.pdf.meta.miss.exists = Shoals Avail-able?
+bundu.export.bezugswst.csv.meta.miss.channel.min_depth = Navigation Channel Depths to be Provided [m]
+bundu.export.bezugswst.pdf.meta.miss.channel.min_depth = Navigation Channel Depths to be Pro-vided [m]
+bundu.export.bezugswst.csv.meta.miss.channel.lower_edge = Navigation Channel Bottom
+bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge = Navigation Channel Bottom
 bundu.export.bezugswst.csv.meta.miss.sounding = Sounding
 bundu.export.bezugswst.csv.meta.miss.bedheight.field = Field {0} Geodetic Altitude
 bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Field {0} Flow Depth [m]
-bundu.export.bezugswst.csv.meta.miss.mass.field = Field {0} Missing Mass [t]
-bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Missing Volume [m\u00b3]
+bundu.export.bezugswst.csv.meta.miss.mass.field = Field {0} Shoal Mass [t]
+bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Shoal Volume [m\u00b3]
 bundu.export.bezugswst.csv.meta.miss.height.mean_bed = Mean Bed Height Geodetic Altitude
 bundu.export.bezugswst.csv.meta.miss.flowdepth.mean_bed = Mean Bed Height Flow Depth [m]
-bundu.export.bezugswst.csv.meta.miss.mass.mean_bed = Mean Bed Height Missing Mass [t]
-bundu.export.bezugswst.csv.meta.miss.volume.mean_bed = Mean Bed Height Missing Volume [m\u00b3]
+bundu.export.bezugswst.csv.meta.miss.mass.mean_bed = Mean Bed Height Shoal Mass [t]
+bundu.export.bezugswst.csv.meta.miss.volume.mean_bed = Mean Bed Height Shoal Volume [m\u00b3]
 bundu.export.bezugswst.csv.meta.miss.km_from = River-km From
 bundu.export.bezugswst.csv.meta.miss.km_to = River-km To
 
 export.flow_depth.csv.header.km = River-km
 sinfo.export.flow_depth.csv.header.flowdepth = Flow Depth
-sinfo.export.flow_depth.csv.header.flowdepthTkh = Flow Depth incl. TBH
-sinfo.export.flow_depth.csv.header.tkh = TBH
+sinfo.export.flow_depth.csv.header.flowdepthTkh = Flow Depth incl. DH
+sinfo.export.flow_depth.csv.header.tkh = DH
 sinfo.export.flow_depth.csv.header.waterlevel = Waterlevel
 sinfo.export.flow_depth.pdf.header.waterlevel = Waterlevel
 sinfo.export.flow_depth.csv.header.discharge = Q
@@ -964,7 +964,7 @@
 sinfo.export.flow_depth.csv.header.sounding = Sounding/Epoch
 common.export.csv.header.location = Location
 
-sinfo.export.flood_duration.csv.header.riverside = Riverside
+sinfo.export.flood_duration.csv.header.riverside = Bank
 sinfo.export.flood_duration.csv.header.infrastructure.height = Infrastructure Height
 sinfo.export.flood_duration.csv.header.duration = Flooding Duration [d/a]
 sinfo.export.flood_duration.csv.header.discharge = Flooding Duration Discharge Q
@@ -991,13 +991,13 @@
 sinfo.facet.flow_depth_max.filtered.description = h-max ({0})
 sinfo.facet.flow_depth_max.raw.description = h-max ({0}) (raw)
 
-sinfo.chart.tkh.section.title=Transport Body Heights
-sinfo.chart.tkh.section.yaxis.label = Transport Body Heights [cm]
-sinfo.chart.tkh.yaxis.label = Transport Body Heights [cm]
+sinfo.chart.tkh.section.title=Dune Heights
+sinfo.chart.tkh.section.yaxis.label = Dune Heights [cm]
+sinfo.chart.tkh.yaxis.label = Dune Heights [cm]
 sinfo.facet.tkh.description = \u0394d ({0})
 
 sinfo.export.tkh.calculation.formula = # Calculation Basis: GILL Equation (1971)
-sinfo.export.tkh.csv.header.tkh = Transport Body Height
+sinfo.export.tkh.csv.header.tkh = Dune Height
 sinfo.export.tkh.csv.header.tkhkind = Classification of the River Bed
 sinfo.export.tkh.pdf.header.tkhkind = Classifica-tion of the River Bed
 sinfo.export.tkh.soilkind.mobil = mobile
@@ -1034,7 +1034,7 @@
 sinfo.facet.waterlevel_difference.filtered.description = \u0394WL ({0})
 
 sinfo_facet_bedheight_difference.filtered = \u0394WL [cm]
-sinfo.facet.bedheight_difference.filtered.description = \u0394MBH ({0})
+sinfo.facet.bedheight_difference.filtered.description = \u0394MBL ({0})
 
 sinfo_facet_flow_depth_current.filtered = h-current [m]
 sinfo.facet.flow_depth_current.filtered.description =  h-current ({0})
@@ -1057,17 +1057,17 @@
 sinfo.export.flow_depth_minmax.csv.header.max = Maximum Flow Depth
 
 waterlevelfetcher.missing = Failed to access waterlevel with id ''{0}''
-waterlevelfetcher.empty = The water level {0} does not contain any values for the selected calculation range
+waterlevelfetcher.empty = The waterlevel {0} does not contain any values for the selected calculation stretch
 
-bedqualityd50kmvaluefinder.error = Failed to access D50 data, calculation of transport body height not possible: {0}
-bedqualityd50kmvaluefinder.empty = The bed quality (D50) does not contain any values for the selected calculation range and sounding year {0}
+bedqualityd50kmvaluefinder.error = Failed to access D50 data, calculation of dune height not possible: {0}
+bedqualityd50kmvaluefinder.empty = The bed quality (D50) does not contain any values for the selected calculation stretch and sounding year {0}
 bedqualityd50kmvaluefinder.missing = Bed quality (D50) not available
 
-soilkindkmvaluefinder.empty = No soil kind available for the selected calculation range, calculation of transport body height not possible
+soilkindkmvaluefinder.empty = No soil kind available for the selected calculation stretch, calculation of dune height not possible
 soilkindkmvaluefinder.missing = No soil kind available
 
-flowvelocitymodelkmvaluefinder.empty = No flow velocities available for the selected calculation range, calculation of transport body height not possible
-flowvelocitymodelkmvaluefinder.missing = No flow velocities available, calculation of transport body height not possible
+flowvelocitymodelkmvaluefinder.empty = No flow velocities available for the selected calculation stretch, calculation of dune height not possible
+flowvelocitymodelkmvaluefinder.missing = No flow velocities available, calculation of dune height not possible
 
 linearInterpolator.maxdistance = Note: Spatial discretisation of waterlevels exceeds {0} m.
 
@@ -1075,14 +1075,14 @@
 sinfo.export.csv.meta.header.sounding.historical = ##METADATA SOUNDING historical
 sinfo.export.csv.meta.header.waterlevel.current = ##METADATA WATERLEVEL current
 sinfo.export.csv.meta.header.waterlevel.historical = ##METADATA WATERLEVEL historical																			
-sinfo.export.csv.header.channel.width = Target Channel Width
-sinfo.export.csv.header.channel.depth = Target Channel Depth
+sinfo.export.csv.header.channel.width = Design Navigation Channel Width
+sinfo.export.csv.header.channel.depth = Design Navigation Channel Depth
 sinfo.export.csv.header.flowdepth.development = Flow Depth Development
 sinfo.export.pdf.header.flowdepth.development = Flow Depth Development
 sinfo.export.csv.header.flowdepth.development.per.year = Flow Depth Development per Year
 sinfo.export.pdf.header.flowdepth.development.per.year = Flow Depth Development per Year
 sinfo.export.csv.header.waterlevel.difference = \u0394WL
-sinfo.export.csv.header.mean_bed_height.difference = \u0394MBH
+sinfo.export.csv.header.mean_bed_height.difference = \u0394MBL
 sinfo.export.csv.header.flowdepth.current = Flow Depth h-current
 sinfo.export.csv.header.flowdepth.historical = Flow Depth h-historical
 
@@ -1094,7 +1094,7 @@
 flowdepthdevelopmentcalculation.yearDifferenceCurrent = Current Difference Pair
 flowdepthdevelopmentcalculation.yearDifferenceHistorical =  Historical Difference Pair
 
-state.uinfo.inundation.vegetation=Classification of Vegetation Zones and Flooding Durations
+state.uinfo.inundation.vegetation=Classification of Vegetation Zones and Flood Duration
 state.uinfo.inundation.use_scenario=Scenario
 state.uinfo.salix.load.scenario.regional = Waterlevel Changes
 state.uinfo.inundation.scenario.regional = Waterlevel Change Input (up to 5 Input Values)
@@ -1110,8 +1110,8 @@
 
 state.uinfo.salix.scenario_type = Scenario Type
 state.uinfo.load.scenario_type= Scenario Type Choice
-scenarioType.option1 = Regional Effects
-scenarioType.option2 = Supraregional Effects
+scenarioType.option1 = Local Scale impacts
+scenarioType.option2 = Large Scale impacts
 scenarioType.option3 = Historical View 
 help.state.uinfo.salix.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.scenario_type
 help.state.uinfo.salix.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.distance_only
@@ -1132,20 +1132,20 @@
 #Erstmal dieselbe URL wie f\u00fcr year; evtl. noch \u00e4ndern!
 help.state.uinfo.inundation.load.epoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.load.year
 
-state.bundu.wst.load.distance_only_part = Missing Depths Calculation
-state.uinfo.distance_only_part.historical= Sub-range
-state.uinfo.distance_only_part.from_regional= Sub-range
-state.uinfo.distance_only_part = Sub-range
+state.bundu.wst.load.distance_only_part = Shoal Calculation
+state.uinfo.distance_only_part.historical= Segment
+state.uinfo.distance_only_part.from_regional= Segment
+state.uinfo.distance_only_part = Segment
 help.state.uinfo.vegetationzone.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetationzone.distance_only
 
-state.uinfo.salix.distance_only = Calculation Range Choice
+state.uinfo.salix.distance_only = Calculation Stretch Choice
 state.uinfo.veg.distance_only = Display Area Choice
 state.uinfo.inundationduration.distance_only = Display Area Choice
 help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.distance_only
 help.state.uinfo.inundation.year_totalepoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.year_totalepoch
 
 uinfo_salix_line = Iota (River/Floodplain Connectivity)
-uinfo_inundation_duration = Flood Duration Floodplain
+uinfo_inundation_duration = Flood Duration over Floodplain
 uinfo_vegetation_zones = Vegetation Zones
 uinfo_vegetation_type_1 = zonal forest
 uinfo_vegetation_type_2 = dry hartwood forest floodplain
@@ -1165,20 +1165,20 @@
 mainvalue.duration = Flooding Duration
 mainvalue.duration.description = Flooding Duration ({0})
 
-state.uinfo.salix.historical.km_range_part = Evaluated Sub-range
+state.uinfo.salix.historical.km_range_part = Evaluated Segment
 uinfo.salix.sounding= Sounding
 uinfo.salix.soundings= Soundings
 uinfo.export.salix_line.csv.header.scenario_deltaw = \u0394MW [cm]
 uinfo.export.salix_line.csv.header.scenario = Iota_Scenario [m]
 uinfo.export.salix_line.csv.header.salix_line = Iota [m]
 uinfo.export.salix_line.csv.header.mw_mnw =  (MW-MNW)x(-1) [m] 
-uinfo.export.csv.meta.header.salix.regional = ##Regional Effects
-uinfo.export.csv.meta.header.salix.supraregional = ##Supraregional Effects
-uinfo.export.csv.meta.header.salix.teilabschnitt = # Sub-range: {0}
-uinfo.export.csv.meta.header.salix.supraregional.teilabschnitt = # Sub-ranges: {0}
+uinfo.export.csv.meta.header.salix.regional = ##Local Scale impacts
+uinfo.export.csv.meta.header.salix.supraregional = ##Large Scale impacts
+uinfo.export.csv.meta.header.salix.teilabschnitt = # Segment: {0}
+uinfo.export.csv.meta.header.salix.supraregional.teilabschnitt = # Segments: {0}
 uinfo.export.csv.meta.header.salix.mwspiegelaenderung = # Waterlevel Changes: {0}
 uinfo.export.csv.meta.header.salix.historical = ##Historical View
-uinfo.export.csv.meta.header.salix.historical.zeitpunkt = # Historical Time: {0}
+uinfo.export.csv.meta.header.salix.historical.zeitpunkt = # Historical Time Points: {0}
 uinfo.export.csv.meta.header.veg.name = Vegetation Zone
 uinfo.export.csv.meta.header.veg.dauervon = Flooding Duration from [d/a]
 uinfo.export.csv.meta.header.veg.dauerbis = Flooding Duration to [d/a]
@@ -1201,7 +1201,7 @@
 uinfo_facet_vegetation_zones_cross_section.description = Vegetation Zones ({0})
 uinfo_facet_vegetation_default_zones_cross_section.description = Standard Vegetation Zones
 uinfo_salix_scenario_deltaw = \u0394MW={0}
-uinfo_salix_scenario_supraregional = supraregional
+uinfo_salix_scenario_supraregional = Large Scale impacts
 uinfo_salix_scenario_historical = historical
 uinfo_facet_salix_rank = Assessment Scheme
 uinfo_facet_salix_rank.description = Assessment Scheme
@@ -1223,19 +1223,19 @@
 predefineddepthevol.total.title = Total: {0}
 predefineddepthevol.peryear.title = P. a.: {0}
  
-predefinedchannel.width.title = Target Channel Width
-predefinedchannel.depth.title = Target Channel Depth
+predefinedchannel.width.title = Design Navigation Channel Width
+predefinedchannel.depth.title = Design Navigation Channel Depth
 
-sinfo.chart.channel_width.section.yaxis.label = Target Channel Width [m]
-sinfo.chart.channel_depth.section.yaxis.label = Target Channel Depth [m]
+sinfo.chart.channel_width.section.yaxis.label = Design Navigation Channel Width [m]
+sinfo.chart.channel_depth.section.yaxis.label = Design Navigation Channel Depth [m]
 
 sinfo.export.csv.header.infrastructure.height = Infrastructure Height
 infrastructure.height.title = Geod. Altitude ({0})
 
 sinfo.export.csv.title.collision.detail = Discharge/Discharge State
 sinfo.export.csv.title.collision.overview = Frequencies
-sinfo.export.csv.header.collision.count = Number of Collisions
-collision.count.title = Collisions {0}
+sinfo.export.csv.header.collision.count = Number of Contact with River Bed
+collision.count.title = Contact with River Bed {0}
 chart.collision_count.section.yaxis.label = Frequency
 sinfo.export.csv.header.collision.gaugew = Gauge Level
 collision.gaugew.title = W at Gauge {0}
@@ -1245,14 +1245,14 @@
 sinfo.export.csv.header.years = Year/Period
 sinfo.export.csv.meta.date = Date
 
-sinfo.chart.collision.section.title = Collisions
+sinfo.chart.collision.section.title = Contact with River Bed
 
 sinfo.chart.flood_duration.section.title = Flooding Durations of Infrastructures in BWaStr
 sinfo.chart.flood_duration.section.yaxis.label = Flooding Duration [d/a]
 sinfo_facet_flood_duration = Flooding Durations
 sinfo_facet_flood_duration.description = Flooding Durations of Infrastructures in BWaStr ({0})
-gauge_duration.missing = No duration values available for gauge {0}
-gauge_discharge_table.missing = No discharge table available for gauge {0}
+gauge_duration.missing = No duration numbers available for gauge {0}
+gauge_discharge_table.missing = No discharge rating table available for gauge {0}
 gauge_main_values.missing = No named main values available for gauge {0}
 wq_base_data.missing = No base waterlevel/discharge available
 sinfo.chart.flood_duration.height.section.title = Infrastructure Heights BWaStr
@@ -1277,9 +1277,9 @@
 
 state.bundu.river = River
 state.bundu.calculation.mode = Calculation Mode
-state.bundu.location = Distance
+state.bundu.location = Stretch
 state.bundu.period = Period
-state.bundu.gaugerange = Discharge Class
+state.bundu.gaugerange = Discharge Sector
 state.bundu.eventselect = Event selection
 state.bundu.analysis.referenceperiod = Reference period
 state.bundu.analysis.analysisperiods = Analysis period
@@ -1289,16 +1289,16 @@
 state.bundu.vollmer.function=Function
 state.bundu.vollmer.preprocessing = Outliers
 state.bundu.vollmer.qs = Input for W/Q data
-state.bundu.wst.gaugerange = Discharge Class
+state.bundu.wst.gaugerange = Discharge Sector
 state.bundu.wst.eventselect = Event selection
-state.bundu.wst.location = Distance
+state.bundu.wst.location = Stretch
 state.bundu.wst.yearselect = Reference Year
 state.bundu.wst.fix.auto = Automatic Choice
 state.bundu.wst.fix.manual = Manual Choice
 state.bundu.wst.fixationchoice = Fixations
 state.bundu.wst.calc.auto = Automatic Choice
 state.bundu.wst.calc.manual = Manual Choice
-state.bundu.wst.missing_volume.select = Missing Volume Calculation
+state.bundu.wst.missing_volume.select = Shoal Volume Calculation
 
 help.state.bundu.calculation_mode = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.calculation_mode
 help.state.bundu.wst.location = ${help.url}/OnlineHilfe/BUNDU#help.state.bundu.wst.location
@@ -1322,8 +1322,8 @@
 state.bundu.wst.load.calc_choice = Calculation Basis
 state.bundu.wst.preprocessing = Outlier Test Choice
 state.bundu.wst.load.preprocessing = Outlier Test
-state.bundu.wst.load.missing_volume = Missing Volume Calculation
-state.bundu.wst.missing_volume = Missing Volume Calculation?
+state.bundu.wst.load.missing_volume = Shoal Volume Calculation
+state.bundu.wst.missing_volume = Shoal Volume Calculation?
 state.bundu.wst.load.function = Function
 state.bundu.wst.function = Function Choice
 
@@ -1337,14 +1337,14 @@
 
 bundu.chart.wspl.section.title = REFWL-Longitudinal Section
 bundu_facet_bedheight.description = Mean Bed Height ({0})
-bundu_facet_channelmin.description = Bed (Target)
+bundu_facet_channelmin.description = Bed (Design)
 bundu_facet_field_bedheight.description = Bed Height Field {0}
 bundu.chart.depth.section.title = \u0394h-L\u00e4ngsschnitt
 bundu_facet_flowdepth.filtered.description = \u0394h (BZWS, {0})
-bundu_facet_channeldepth.description = \u0394h (Target depth)
+bundu_facet_channeldepth.description = \u0394h (design depth)
 bundu_facet_field_depth.description = \u0394h Field {0}
 bundu.channelfinder.empty = The database does not contain any values for the river and the reference year
-bundu.channelfinder.missing = no channel data available
+bundu.channelfinder.missing = no navigation channel data available
 
 common.client.ui.selection = Selection
 common.client.ui.from = from
@@ -1357,11 +1357,11 @@
 chart.subtitle.metadata.modulename = Module: {0}
 chart.subtitle.metadata.calcmode = Calculation: {0}
 
-state.title.distance_state = Choose Calculation Range [km]
-state.title.location_distance_state = Choose Calculation Location(s)/Range [km] 
-state.title.distance_part_state = Select Sub-range
-state.title.salix.historical.distance_part_state =  Select Sub-range
-state.title.uinfo.bezugswst.miss_vol.distance_part_state = Choose sub-range for the missing depths to be calculated [km]
+state.title.distance_state = Choose Calculation Stretch [km]
+state.title.location_distance_state = Choose Calculation Location(s)/Stretch [km] 
+state.title.distance_part_state = Select a Segment
+state.title.salix.historical.distance_part_state =  Select a Segment
+state.title.uinfo.bezugswst.miss_vol.distance_part_state = Choose segment for the shoals to be calculated [km]
 state.title.distance_only_inundationduration_veg_state = Choose Display Area [km]
 
 legend.aggregator.merged = merged

--- a/artifacts/src/main/resources/messages_de.properties	Mon Oct 29 17:57:30 2018 +0100
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Oct 30 17:46:52 2018 +0100
@@ -72,7 +72,7 @@
 state.minfo.sediment.load.epochs = Epochen
 state.minfo.sediment.load.period = Jahre
 state.minfo.sediment.load.off_epochs = Amtl. Epochen
-state.minfo.sediment.load.sq_interval = Transport-Abfluss Beziehung
+state.minfo.sediment.load.sq_interval = Transport-Abfluss-Beziehung
 state.minfo.off_epoch = Amtl. Epochen
 state.minfo.sediment.load.t_per_a = (t/a)
 state.minfo.sediment.load.m3_per_a = (m\u00b3/a)
@@ -131,7 +131,7 @@
 calc.bed.quality = Sohlbeschaffenheit
 calc.sediment.load = Sedimentfracht
 calc.flow.velocity = Flie\u00dfgeschwindigkeit
-calc.sq.relation = Transport-Abfluss Beziehung
+calc.sq.relation = Transport-Abfluss-Beziehung
 calc.bed.d90 = D90
 calc.bed.d84 = D84
 calc.bed.d80 = D80
@@ -243,7 +243,7 @@
 chart.w_differences.yaxis.label = m
 chart.w_differences.yaxis.second.label = W [NN + m]
 
-chart.bedquality.title=Sohlen L\u00e4ngsschnitt
+chart.bedquality.title=Sohlenl\u00e4ngsschnitt
 chart.bedquality.xaxis.label={0}-km
 chart.bedquality.yaxis.label.diameter = Durchmesser [mm]
 chart.bedquality.yaxis.label.porosity=Porosit\u00e4t [%]
@@ -400,7 +400,7 @@
 export.csv.header.km = km
 export.csv.header.year = Jahr
 
-export.waterlevel.csv.header.km = Fluss-Km
+export.waterlevel.csv.header.km = Fluss-km
 export.waterlevel.csv.header.w = W [{0}]
 common.export.csv.header.waterlevel = W
 common.export.csv.header.q = Q [m\u00b3/s]
@@ -419,11 +419,11 @@
 export.computed.discharge.curve.csv.header.w = W [{0}]
 export.duration.curve.csv.header.duration = D [Tage]
 export.duration.curve.csv.header.w = W [{0}]
-export.discharge.longitudinal.section.csv.header.km = Fluss-Km
+export.discharge.longitudinal.section.csv.header.km = Fluss-km
 export.discharge.longitudinal.section.csv.header.w = W [NN + m]
 export.discharge.longitudinal.section.csv.header.cw = W korr. [NN + m]
 export.discharge.curve.at.gauge.header = Abflusstafel f\u00fcr {1}/{0} ab {2} PNP[{4}] = {3}
-export.discharge.curve.at.header = Berechnete Abflusstafel f\u00fcr {0}, km {1}
+export.discharge.curve.at.header = Berechnete Abflusskurve f\u00fcr {0}, km {1}
 export.historical.discharge.csv.header.timerange = Zeitraum
 export.historical.discharge.csv.header.waterlevel = Wasserstand [cm]
 export.historical.discharge.csv.header.discharge = Abfluss [m\u00b3/s]
@@ -450,7 +450,7 @@
 export.reference_curve.pdf.file.gauge = /jasper/reference_gauge.jasper
 export.reference_curve.pdf.file.gauge.end = /jasper/reference_gauge_end.jasper
 export.reference_curve.pdf.file.gauge.start.end = /jasper/reference_gauge_start_end.jasper
-export.flow_velocity.csv.header.km = Fluss-Km
+export.flow_velocity.csv.header.km = Fluss-km
 export.flow_velocity.csv.header.v_total = v Gesamtgerinne [m/s]
 export.flow_velocity.csv.header.v_main = v Hauptgerinne [m/s]
 export.flow_velocity.csv.header.tau_main = Sohlschubspannung Hauptgerinne [N/m\u00b2]
@@ -493,7 +493,7 @@
 export.sqrelation.csv.info.date = Messdatum: Datum dieser Messung
 export.sqrelation.csv.header.parameter = Parameter
 export.sqrelation.csv.header.station = Station
-export.sqrelation.csv.header.km = Fluss-Km
+export.sqrelation.csv.header.km = Fluss-km
 export.sqrelation.csv.header.function = Funktion
 export.sqrelation.csv.header.gauge = Pegel
 export.sqrelation.csv.header.coeff.a = a
@@ -510,7 +510,7 @@
 export.sqrelation.csv.header.date = Messdatum
 export.sqrelation.pdf.file = /jasper/sqrelation.jasper
 export.sqrelation.measurements.pdf.file = /jasper/sqmeasurements.jasper
-export.sqrelation.pdf.mode = Transport-Abfluss Beziehung
+export.sqrelation.pdf.mode = Transport-Abfluss-Beziehung
 export.minfo.bedquality.km = km
 export.minfo.bedquality.density.toplayer = Sedimentdichte Deckschicht [t/m\u00b3]
 export.minfo.bedquality.density.sublayer = Sedimentdichte Unterschicht [t/m\u00b3]

--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Mon Oct 29 17:57:30 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Oct 30 17:46:52 2018 +0100
@@ -51,8 +51,8 @@
 show_legend = Show
 aggregation_threshold = Threshold for aggregation of legend entries
 scale = Scale
-databasket = Data Cage
-databasket_loading = Loading Databasket content
+databasket = Data Basket
+databasket_loading = Loading Data Basket Content
 databasket_empty = Databasket is empty
 fix = Fixing
 fixanalysis = Fixing Analysis
@@ -60,7 +60,7 @@
 location = Location(s)
 locations = Locations
 single_location = Location
-distance = Range
+distance = Stretch
 unitFrom = km
 unitTo = km a
 unitWidth = m
@@ -148,7 +148,7 @@
 description = Description
 from = from
 to = to
-riverside = Riverside
+riverside = Bank
 bottom_edge = Bottom edge
 top_edge = Top edge
 name = Name
@@ -164,7 +164,7 @@
 uesk_profile_distance = Distance [m]
 
 minfo_type = Type
-analyzed_range = Analyzed Range
+analyzed_range = Analyzed Stretch
 name_of_sounding = Name of Sounding
 
 wqTitle = Input for W/Q Data
@@ -218,14 +218,14 @@
 add = Add
 
 static_sqrelation = SQ relation
-discharge_curve = Discharge Curve at Gauge
-discharge_curve_gaugeless = Discharge Curve
-gauge_discharge_curve = Discharge Table at Gauge
-computed_discharge_curve = Discharge Curve
-computed_discharge_curves = Discharge Curves
+discharge_curve = Discharge Rating Curve at Gauge
+discharge_curve_gaugeless = Discharge Rating Curve
+gauge_discharge_curve = Discharge Rating Table at Gauge
+computed_discharge_curve = Discharge Rating Curve
+computed_discharge_curves = Discharge Rating Curves
 longitudinal_section = Longitudinal Section Curve
 duration_curve = Duration Curve
-historical_discharge_curves = Historical Discharge Curve
+historical_discharge_curves = Historical Discharge Rating Curve
 discharge_longitudinal_section = Discharge Longitudinal Section
 floodmap = Floodmap
 historical_discharge = Time-Chart
@@ -237,8 +237,7 @@
 bedheight_middle_export = Mean Bed Height Export
 bed_longitudinal_section = Bed Quality
 bed_longitudinal_section_export = Bed Quality Export
-
-sq_relation_a = A Fine material
+sq_relation_a = A Fraction of fines
 sq_relation_b = B Sand (suspended)
 sq_relation_c = C Sand (bed load)
 sq_relation_d = D Fine/middle
@@ -252,7 +251,7 @@
 w_differences = Differences
 w_differences_export = Differences Export
 reference_curve_export = Reference Curve Export
-historical_discharge_export = Historical Discharge Curve Export
+historical_discharge_export = Historical Discharge Rating Curve Export
 showextramark = Show begin of extrapolation
 extreme_wq_curve = W/Q
 fix_wq_curve = W/Q-Diagram
@@ -275,21 +274,21 @@
 
 waterlevel_export = Waterlevel Export
 waterlevel_report = Waterlevel Report
-computed_dischargecurve_export = Discharge Curve Export
-computed_dischargecurve_report = Discharge Curve Report
+computed_dischargecurve_export = Discharge Rating Curve Export
+computed_dischargecurve_report = Discharge Rating Curve Report
 discharge_longitudinal_section_export = Discharge Longitudinal Section Export
 discharge_longitudinal_section_report = Discharge Longitudinal Section Report
-durationcurve_export = Duration Curve Export
-durationcurve_report = Duration Curve Report
+durationcurve_export = Duration Numbers Export
+durationcurve_report = Duration Numbers Report
 dataexport = Data Export
 csv = CSV
 wst = WST
 at = AT
 pdf = PDF
-computed_dischargecurve_at_export = Discharge Curve Export
-gauge_discharge_curve_at_export = Gauge Discharge Curve
-current_gauge = Current Gauge Discharge Curve
-gauge_class = Discharge Class
+computed_dischargecurve_at_export = Discharge Rating Curve Export
+gauge_discharge_curve_at_export = Gauge Discharge Rating Curve
+current_gauge = Current Gauge Discharge Rating Curve
+gauge_class = Discharge Sector
 eventselect = Event Selection
 events = Events
 kmchart = W/Q-Preview
@@ -334,7 +333,7 @@
 error_read_minmax_values = Error while reading min/max values for the location input.
 error_validate_range = The value $1 needs to be smaller than $3 and bigger than $2.
 error_validate_date_range = Start date needs to be before end date.
-error_validate_date_range_invalid = The specified timerange is invalid.
+error_validate_date_range_invalid = The specified period is invalid.
 error_validate_lower_range = The lower value $1 needs to be bigger than $2.
 error_validate_upper_range = The upper value $1 needs to be smaller than $2.
 error_validate_positive = The value $1 must be positive.
@@ -389,7 +388,7 @@
 error_malformed_url = The URL you have entered is not valid.
 error_no_dgm_selected = No DEM selected.
 error_invalid_dgm_selected = An error occured while selecting the DEM.
-error_bad_dgm_range = You have selected a DEM with an invalid range.
+error_bad_dgm_range = You have selected a DEM with an invalid stretch.
 error_bad_dgm_river = You have selected a DEM for a wrong river.
 error_dialog_not_valid = One or more values are not valid.
 error_invalid_date = The entered date is not valid.
@@ -443,8 +442,8 @@
 upload_file = upload
 shape_file_upload = Upload shapefile
 
-# data cage
-historical_discharges = Historical discharge curves
+# data basket
+historical_discharges = Historical discharge rating curves
 reference_curves = Reference Curves
 waterlevels = Waterlevels
 waterlevels_ls = Longitudinal Section
@@ -481,7 +480,7 @@
 floodplain = Floodplain
 lines = Lines
 buildings = Buildings
-fixpoints = Fixpoints
+fixpoints = Fixed Points
 uesk = Floodmaps
 calculations = Calculations
 current = Current
@@ -491,8 +490,8 @@
 rastermap = Rastermap
 background = Background Map
 discharge_tables_chart = W/Q-Preview
-discharge_table_nn = Discharge Tables at Gauge
-discharge_table_gauge = Discharge Table at Gauge
+discharge_table_nn = Discharge Rating Tables at Gauge
+discharge_table_gauge = Discharge Rating Table at Gauge
 mainvalue = Mainvalue
 mainvalues = Mainvalues
 wmainvalue = Mainvalues (W)
@@ -505,7 +504,7 @@
 epoch = Epoch
 bedheights = Bedheights
 morph_width = morphologic Width
-datacage = Data Cage
+datacage = Data Basket
 official = Offical
 inofficial = Inofficial
 custom_lines = Own Digitalizations
@@ -697,7 +696,7 @@
 gauge_info_link = Gaugeinfo
 gauge_url = /PegelInfo/
 gauge_river_url = /GewaesserInfo/
-gauge_curve_link = Model Discharge Curve/Table
+gauge_curve_link = Model Discharge Rating Curve/Table
 discharge_timeranges = DC Time Series
 discharge_chart = W/Q Preview
 
@@ -768,7 +767,7 @@
 no_data_sediment_difference = Invalid value: $1
 
 sinfo = S-INFO
-sinfo_collision_export = Collisions Export
+sinfo_collision_export = Contact with River Bed Export
 sinfo_flowdepth_export = Flow Depths Export
 sinfo_flowdepth_report = Flow Depths Report
 sinfo_flow_depth = Flow Depths
@@ -780,10 +779,10 @@
 sinfo_flow_depth_development = Flow Depth Development
 sinfo_flow_depth_development_peryear = Flow Depth Development per Year
 sinfo_flow_depth_development_twin_panel_max_count_msg = Only one difference pair can be selected.
-sinfo_tkh_export = Transport Body Heights Export
-sinfo_tkh_report = Transport Body Heights Report
-sinfo_tkhs = Transport Body Heights
-sinfo_tkk = Transport Body Heights
+sinfo_tkh_export = Dune Heights Heights Export
+sinfo_tkh_report = Dune Heights Report
+sinfo_tkhs = Dune Heights
+sinfo_tkk = Dune Heights
 
 sinfo_velocities = Flow Velocities
 sinfo_taus = Bottom Shear Stress
@@ -797,15 +796,15 @@
 sinfo_additional_ls_withQ = with discharge
 sinfo_additional_ls_withoutQ = without discharge
 
-sinfo_predefined_channel = Channel properties to be provided
+sinfo_predefined_channel = Navigation channel properties to be provided
 
-sinfo_predefined_tkh = Transport Body Heights
+sinfo_predefined_tkh = Dune Heights
 predefined_tkh_berechnung = Calculation Results
 predefined_tkh_messung = Naturmessungen
 
 sinfo_predefined_depthevol = Flow Depth Development
 predefined_depthevol_aktuell = Bezug aktueller GlW
-predefined_depthevol_etappe = GlW-Sectors
+predefined_depthevol_etappe = GlW-Steps
 
 # 'Simulated Records' ist der \u00dcberordner f\u00fcr 'Flow Depths'.
 sinfo_predefined_flowdepths = Simulated Records
@@ -813,10 +812,10 @@
 
 sinfo_predefined_infrastructure = Infrastructures in BWaStr
 
-sinfo_predefined_collision = Collisions
-sinfo_collisions = Collisions
-sinfo_collision = Collisions
-sinfo_collision_report = Collisions Report
+sinfo_predefined_collision = Contact with River Bed
+sinfo_collisions = Contact with River Bed
+sinfo_collision = Contact with River Bed
+sinfo_collision_report = Contact with River Bed Report
 
 sinfo_flood_durations = Flooding Durations of Infrastructures in BWaStr
 sinfo_flood_duration = Flooding Durations of Infrastructures in BWaStr
@@ -845,11 +844,11 @@
 uinfo_vegetation_zones_validation_empty = Input box empty.
 uinfo_vegetation_zones_validation_range = Values have to be within the range of -1 and 366.
 uinfo_vegetation_zones_validation_from_greater_to = The value "FD from" must be smaller than "FD to".
-uinfo_salix_km_limit_exceed = The number is out of the valid km-range.
-uinfo_salix_km_overlap = Km-ranges are overlapping.
-uinfo_salix_km_has_gaps = The km-range is not fully covered.
+uinfo_salix_km_limit_exceed = The number is out of the valid km-stretch.
+uinfo_salix_km_overlap = Km-stretches are overlapping.
+uinfo_salix_km_has_gaps = The km-stretch is not fully covered.
 uinfo_salix_km_anschluss = The given input does not connect to the last one.
-uinfo_salix_input_complete = The whole range has been covered with values yet.
+uinfo_salix_input_complete = The whole stretch has been covered with values yet.
 uinfo_salix_lines = Iota
 uinfo_salix_line = Iota - Longitudinal Section
 
@@ -869,8 +868,8 @@
 
 sinfo_columnlabel_soundings = Sounding Choice
 sinfo_columnlabel_waterlevels = Waterlevel Choice
-sinfo_sounding_waterlevel_select_waterlevel = Please choose a sounding first.
-sinfo_deactivate_intelligent_datacage = Disable Intelligent Data Cage Filtering
+sinfo_sounding_waterlevel_select_waterlevel = Please first select an echosounding.
+sinfo_deactivate_intelligent_datacage = Disable Intelligent Data Basket Filtering
 
 naviThemeOutOfRange = out of range
 gauge_list_grid_gauge = Gauge

--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Mon Oct 29 17:57:30 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Oct 30 17:46:52 2018 +0100
@@ -160,11 +160,11 @@
 wq_table_q = Kennzeichnende Abfl\u00fcsse/Dauerzahlen
 wq_value_w = W [cm am Pegel]
 wq_value_q = Q [m\u00b3/s]
-river_km = Fluss-Km
+river_km = Fluss-km
 uesk_profile_distance = Abstand [m]
 
 minfo_type = Aufnahmeart
-analyzed_range = ausgewertete Strecke
+analyzed_range = Ausgewertete Strecke
 name_of_sounding = Name der Peilung
 
 wqTitle = Eingabe f\u00fcr W/Q Daten
@@ -217,7 +217,7 @@
 askThemeRemove = Sind Sie sicher, dass sie die gew\u00e4hlten/das gew\u00e4lte Thema l\u00f6schen wollen?
 add = Hinzuf\u00fcgen
 
-static_sqrelation = Transport-Abfluss Beziehung
+static_sqrelation = Transport-Abfluss-Beziehung
 discharge_curve = Abflusskurve am Pegel
 discharge_curve_gaugeless = Abflusskurve
 gauge_discharge_curve = Abflusstafel am Pegel
@@ -237,7 +237,6 @@
 bedheight_middle_export = Mittlere Sohlh\u00f6he Export
 bed_longitudinal_section = Sohlbeschaffenheit
 bed_longitudinal_section_export = Sohlbeschaffenheit Export
-
 sq_relation_a = A Feinkornanteil
 sq_relation_b = B Sand (Suspensionstransport)
 sq_relation_c = C Sand (Geschiebetransport)
@@ -280,7 +279,7 @@
 discharge_longitudinal_section_export = Abflussl\u00e4ngsschnitt Export
 discharge_longitudinal_section_report = Abflussl\u00e4ngsschnitt Bericht
 durationcurve_export = Dauerzahlen Export
-durationcurve_report = Dauerzahlen Bereicht
+durationcurve_report = Dauerzahlen Bericht
 dataexport = Datenexport
 csv = CSV
 wst = WST