--- a/artifacts/src/main/resources/messages.properties	Wed Aug 08 15:49:36 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Thu Aug 09 09:52:04 2018 +0200
@@ -79,10 +79,10 @@
 state.uinfo.vegetation_zones.table = Einteilung der Vegetationszonen und \u00dcberflutungsdauern (\u00dcFD)
 state.uinfo.salix.supraregional = \u00dcberregional wirkende Eingriffe
 
-state.uinfo.year_totalepoch = Year/Gesamter Zeitraum
-state.uinfo.year_epoch = Year/Epoch
+state.uinfo.inundation.year_totalepoch  = Year/Gesamter Zeitraum
+state.uinfo.salix.year_epoch = Year/Epoch
 state.uinfo.load.year_with_soundings = Year
-state.uinfo.load.year= Year 
+state.uinfo.inundation.load.year= Year 
 state.uinfo.load.epoch=Epoch
 state.uinfo.year=Year
 state.uinfo.epoch=Epoch
@@ -852,6 +852,7 @@
 help.state.sinfo.flowdepthdevlopment_historical_select = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.flowdepthdevlopment_historical_select
 help.state.sinfo.collisions.year_epoch_choice = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.year_epoch_choice
 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 = Auswahl der Uferseite
 state.sinfo.riverside.option1 = Linke Uferseite
@@ -863,8 +864,8 @@
 state.sinfo.wqinput = Eingabe f\u00fcr W/Q Daten
 state.sinfo.wqinput.option = wqinput-option
 help.state.sinfo.wqinput = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wqinput
-help.state.sinfo.inundation_duration.wq = ${help.url}/OnlineHilfe/SINFO#state.sinfo.inundation_duration.wq
-state.sinfo.inundation_duration.wq = Input for W/Q data
+help.state.sinfo.flood_duration.wq = ${help.url}/OnlineHilfe/SINFO#state.sinfo.flood_duration.wq
+state.sinfo.flood_duration.wq = Input for W/Q data
 
 state.sinfo.wspl = Wasserspiegellagen
 state.sinfo.wspl.option = Wasserspiegellagen zus\u00e4tzlich darstellen?
@@ -1078,40 +1079,51 @@
 state.uinfo.inundation.load.scenario.regional = \u00c4nderungen der MW-Spiegellage 
 state.uinfo.inundation.scenario.regional = Eingabe der \u00c4nderung der Mittelwasserspiegellage (bis zu 5 Werte m\u00f6glich)
 state.uinfo.inundation.scenario = Werte f\u00fcr \u00c4nderung der Sohl- bzw. Mittelwasserlage eingeben
-state.uinfo.use_scenario=Szenariobetrachtung
+state.uinfo.salix.use_scenario=Szenariobetrachtung
 useScenario.option = Zus\u00e4tzlich Szenariobetrachtung miteinbeziehen?
 useScenario.active = Active
 useScenario.inactive = Inactive
-help.state.uinfo.use_scenario=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.use_scenario
+help.state.uinfo.salix.use_scenario=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.use_scenario
 help.state.uinfo.river=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.river
 help.state.uinfo.calculation_mode=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.calculation_mode
 
-state.uinfo.scenario_type = Szenariotyp
+state.uinfo.salix.scenario_type = Szenariotyp
 state.uinfo.load.scenario_type=Auswahl des Szenariotyps
 scenarioType.option1 = Regional wirkende Eingriffe
 scenarioType.option2 = \u00dcberregional wirkende Eingriffe
 scenarioType.option3 = Historische Betrachtung 
-help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type
+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
-help.state.uinfo.salix.use_scenario${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.use_scenario
+help.state.uinfo.salix.use_scenario = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.use_scenario
 help.state.uinfo.salix.scenario_type = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.scenario_type
 help.state.uinfo.salix.supraregional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.supraregional
 help.state.uinfo.salix.regional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.regional
 help.state.uinfo.salix.historical = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical
+help.state.uinfo.salix.historical.year_choice = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical.year_choice
+help.state.uinfo.salix.historical.year = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical.year
+help.state.uinfo.salix.historical.epoch = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical.epoch
+help.state.uinfo.salix.historical.distance_only_part = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical.distance_only_part
 help.state.uinfo.inundation_duration = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration
 help.state.uinfo.inundation_duration.location = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration.location
 help.state.uinfo.vegetation_zones = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetation_zones
+help.state.uinfo.inundation.use_scenario = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.use_scenario
+help.state.uinfo.inundation.scenario = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.scenario
+help.state.uinfo.inundation.vegetation = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetation
+help.state.uinfo.inundation.load.year = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation.load.year
 
 state.bundu.wst.load.distance_only_part = Fehltiefenermittlung
 state.uinfo.distance_only_part.historical= Teilabschnitt
 state.uinfo.distance_only_part.from_regional= Teilabschnitt
 state.uinfo.distance_only_part = Teilabschnitt
-help.state.uinfo.distance_only_part = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only_part 
+help.state.uinfo.vegetationzone.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetationzone.distance_only
 
 state.uinfo.salix.distance_only = Wahl der Berechnungsstrecke
 state.uinfo.distance_only = Choose calculation range [km]
 state.uinfo.inundationduration.distance_only = Wahl des Darstellungsbereichs
 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 = Salix-Linie
 uinfo_inundation_duration = \u00dcberflutungsdauern Aue
 uinfo_vegetation_zones = Vegetationszonen
@@ -1123,8 +1135,8 @@
 mainvalue.w.description = Wasserstand/Wasserspiegellage ({0})
 mainvalue.duration = \u00dcberflutungsdauer
 mainvalue.duration.description = \u00dcberflutungsdauer ({0})
+
 state.uinfo.salix.historical.km_range_part = Ausgewertete Strecke
-
 uinfo.salix.sounding= Peilung
 uinfo.salix.soundings= Soundings
 uinfo.export.salix_line.csv.header.scenario_deltaw = \u0394MW [cm]