# HG changeset patch
# User gernotbelger
# Date 1533801124 -7200
# Node ID 0a1d8c1817b5f4e8212aefd589ad031ff3df8454
# Parent  6a98fe930274141163e53b0be6205140e2779494
little fixes on links (uinfo, sinfo)

diff -r 6a98fe930274 -r 0a1d8c1817b5 artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml	Wed Aug 08 15:49:36 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Thu Aug 09 09:52:04 2018 +0200
@@ -327,7 +327,7 @@
       <data name="riverside" type="String" />
     </state>
 
-    <state id="state.sinfo.wspl" description="state.sinfo.wspl" state="org.dive4elements.river.artifacts.sinfo.flood_duration.WsplChoice" helpText="help.state.sinfo.wspl">
+    <state id="state.sinfo.wspl" description="state.sinfo.wspl" state="org.dive4elements.river.artifacts.sinfo.flood_duration.WsplChoice" helpText="help.state.sinfo.flood_duration.wspl">
       <data name="wspl" type="Boolean" />
     </state>
 
@@ -339,7 +339,7 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wspl" />
-      <to state="state.sinfo.inundation_duration.wq" />
+      <to state="state.sinfo.flood_duration.wq" />
       <condition data="wspl" value="true" operator="equal" />
     </transition>
 
@@ -350,7 +350,7 @@
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.sinfo.inundation_duration.wq" />
+      <from state="state.sinfo.flood_duration.wq" />
       <to state="state.sinfo.flood_duration" />
       <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" />
     </transition>
@@ -429,7 +429,7 @@
       <data name="wq_single" type="Double[]" />
     </state>
     
-     <state id="state.sinfo.inundation_duration.wq" description="state.sinfo.inundation_duration.wq" state="org.dive4elements.river.artifacts.states.WQSelect" helpText="help.state.sinfo.inundation_duration.wq">
+     <state id="state.sinfo.flood_duration.wq" description="state.sinfo.flood_duration.wq" state="org.dive4elements.river.artifacts.states.WQSelect" helpText="help.state.sinfo.flood_duration.wq">
       <data name="wq_isq" type="Boolean" />
       <data name="wq_isfree" type="Boolean" />
       <data name="wq_isrange" type="Boolean" />
diff -r 6a98fe930274 -r 0a1d8c1817b5 artifacts/doc/conf/artifacts/uinfo.xml
--- a/artifacts/doc/conf/artifacts/uinfo.xml	Wed Aug 08 15:49:36 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Thu Aug 09 09:52:04 2018 +0200
@@ -15,7 +15,7 @@
       <data name="calculation_mode" type="String" />
     </state>
 
-    <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.distance_only">
+    <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.vegetationzone.distance_only">
       <data name="ld_from" type="Double" />
       <data name="ld_to" type="Double" />
     </state>
@@ -43,39 +43,39 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.salix.distance_only" />
-      <to state="state.uinfo.use_scenario" />
+      <to state="state.uinfo.salix.use_scenario" />
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
 
-    <state id="state.uinfo.use_scenario" description="state.uinfo.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.salix.use_scenario" description="state.uinfo.salix.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.salix.use_scenario">
       <data name="use_scenario" type="Boolean" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.use_scenario" />
-      <to state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.use_scenario" />
+      <to state="state.uinfo.salix.scenario_type" />
       <condition data="use_scenario" value="true" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.use_scenario" />
+      <from state="state.uinfo.salix.use_scenario" />
       <to state="state.uinfo.salix_line" />
       <condition data="use_scenario" value="false" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
+    <state id="state.uinfo.salix.scenario_type" description="state.uinfo.salix.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
       <data name="scenario_selection" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.scenario_type" />
       <to state="state.uinfo.distance_only_part.from_regional" />
       <condition data="scenario_selection" value="scenarioType.option1" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.scenario_type" />
       <to state="state.uinfo.salix.supraregional" />
       <condition data="scenario_selection" value="scenarioType.option2" operator="equal" />
     </transition>
@@ -87,12 +87,12 @@
     </transition>
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
-      <to state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.scenario_type" />
+      <to state="state.uinfo.salix.year_epoch" />
       <condition data="scenario_selection" value="scenarioType.option3" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.year_epoch" description="state.uinfo.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.salix.year_epoch" description="state.uinfo.salix.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.salix.historical.year_choice">
       <data name="ye_select" type="String" />
     </state>
     <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix.supraregional">
@@ -100,22 +100,22 @@
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.year_epoch" />
       <to state="state.uinfo.load.year_with_soundings" />
       <condition data="ye_select" value="state.uinfo.year" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.year_epoch" />
       <to state="state.uinfo.load.epoch" />
       <condition data="ye_select" value="state.uinfo.epoch" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical.year">
       <data name="singleyear" type="String" />
     </state>
 
-    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.salix.historical.epoch">
       <data name="singleepoch" type="Integer" />
     </state>
 
@@ -130,7 +130,7 @@
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical.distance_only_part">
       <data name="ld_from_part" type="Double" />
       <data name="ld_to_part" type="Double" />
        <data name="bedheights_for_part" type="Double" />
@@ -210,42 +210,42 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.inundationduration.distance_only" />
-      <to state="state.uinfo.year_totalepoch" />
+      <to state="state.uinfo.inundation.year_totalepoch" />
       <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_totalepoch" />
-      <to state="state.uinfo.load.year" />
+      <from state="state.uinfo.inundation.year_totalepoch" />
+      <to state="state.uinfo.inundation.load.year" />
       <condition data="ye_select" value="state.uinfo.year" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_totalepoch" />
+      <from state="state.uinfo.inundation.year_totalepoch" />
       <to state="state.uinfo.inundation.use_scenario" />
       <condition data="ye_select" value="state.uinfo.totalepoch" operator="equal" />
     </transition>
 
 
-    <state id="state.uinfo.year_totalepoch" description="state.uinfo.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.inundation.year_totalepoch" description="state.uinfo.inundation.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.inundation.year_totalepoch">
       <data name="ye_select" type="String" />
     </state>
 
 
-    <state id="state.uinfo.load.year" description="state.uinfo.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.inundation.load.year" description="state.uinfo.inundation.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.inundation.load.year">
       <data name="singleyear" type="String" />
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.load.year" />
+      <from state="state.uinfo.inundation.load.year" />
       <to state="state.uinfo.inundation.use_scenario" />
       <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <!-- Doppelter State, andere ID, damit keine Mehrfach-Condition benötigt wird -->
-    <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.inundation.use_scenario">
       <data name="use_scenario" type="Boolean" />
     </state>
 
@@ -263,11 +263,11 @@
     </transition>
 
 
-    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.inundation.scenario">
       <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm! -->
     </state>
 
-    <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableState" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableState" helpText="help.state.uinfo.vegetation">
       <data name="vegzones" type="String" />
     </state>
 
diff -r 6a98fe930274 -r 0a1d8c1817b5 artifacts/src/main/resources/messages.properties
--- 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]
diff -r 6a98fe930274 -r 0a1d8c1817b5 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Wed Aug 08 15:49:36 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.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 = Jahr/Gesamter Zeitraum
-state.uinfo.year_epoch = Jahr/Epoche
+state.uinfo.inundation.year_totalepoch  = Jahr/Gesamter Zeitraum
+state.uinfo.salix.year_epoch = Jahr/Epoche
 state.uinfo.load.year_with_soundings = Jahr
-state.uinfo.load.year= Jahr 
+state.uinfo.inundation.load.year= Jahr 
 state.uinfo.load.epoch=Epoche
 state.uinfo.year=Einzeljahr
 state.uinfo.epoch=Epoche
@@ -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 = Eingabe f\u00fcr W/Q Daten
+help.state.sinfo.flood_duration.wq = ${help.url}/OnlineHilfe/SINFO#state.sinfo.flood_duration.wq
+state.sinfo.flood_duration.wq = Eingabe f\u00fcr W/Q Daten
 
 state.sinfo.wspl = Wasserspiegellagen
 state.sinfo.wspl.option = Wasserspiegellagen zus\u00e4tzlich darstellen?
@@ -1078,40 +1079,50 @@
 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 = Ja
 useScenario.inactive = Nein
-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
 help.state.uinfo.salix.suprarregional 
-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.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= Berechnungsstrecke Fehltiefen
 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 = Wahl der Berechnungsstrecke
 state.uinfo.inundationduration.distance_only = Wahl des Darstellungsbereichs
 help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.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