--- 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