--- a/artifacts/src/main/resources/messages.properties	Mon Jul 02 17:40:39 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Mon Jul 02 19:01:09 2018 +0200
@@ -1003,6 +1003,7 @@
 
 sinfo.flood_duration.header.bezeichnung_index = Bezeichnung{0}
 sinfo.flood_duration.header.pdf.bezeichnung_index = Bezeich-nung{0}
+sinfo.flood_duration.header.duration_index = \u00dcberflutungsdauer WSPL{0} [d/a]
 sinfo.flood_duration.header.fd_per_year_index = \u00dcberflutungsdauer WSPL{0} [d/a]
 sinfo.flood_duration.header.pdf.fd_per_year_index = \u00dcberflu-tungs-dauer WSPL{0} [d/a]
 sinfo.flood_duration.header.w_index = Wasser-stand/Wasser-spiegel-lage{0}
@@ -1078,6 +1079,10 @@
 state.uinfo.river = Gew\u00e4sser
 state.uinfo.calculation_mode=Berechnungsart
 
+mainvalue.w = Wasserstand/Wasserspiegellage
+mainvalue.w.description = Wasserstand/Wasserspiegel-lage ({0})
+mainvalue.duration = \u00dcberflutungsdauer
+mainvalue.duration.description = \u00dcberflutungsdauer ({0})
 uinfo.export.salix_line.csv.header.salix_line = Salix-Linie [m]
 uinfo.export.salix_line.csv.header.delta_mw =  (MW-MNW)x(-1) [m]
 uinfo.export.salix_line.csv.header.scen =  Salix-Linie [m] Szenario dMW={0} cm
@@ -1136,32 +1141,6 @@
 gauge_discharge_table.missing = No discharge 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
-mainvalue.1.duration = \u00dcberflutungsdauer-1
-mainvalue.duration.description = \u00dcberflutungsdauer ({0})
-mainvalue.2.duration = \u00dcberflutungsdauer-2
-mainvalue.3.duration = \u00dcberflutungsdauer-3
-mainvalue.1.w = W-1
-mainvalue.w.description = W ({0})
-mainvalue.2.w = W-2
-mainvalue.3.w = W-3
-sinfo.flood_duration.header.mainvalue.1.duration = \u00dcberflutungsdauer WSPL-1 [d/a]
-sinfo.flood_duration.header.pdf.mainvalue.1.duration = \u00dcberflu-tungs-dauer WSPL-1 [d/a]
-sinfo.flood_duration.header.mainvalue.1.w = Wasserstand/Wasserspiegel-lage-1
-sinfo.flood_duration.header.pdf.mainvalue.1.w = Wasser-stand/Wasser-spiegel-lage-1
-sinfo.flood_duration.header.mainvalue.1.q =  Q-1
-sinfo.flood_duration.header.pdf.mainvalue.1.q =  Q-1 [m\u00b3/s]
-sinfo.flood_duration.header.mainvalue.2.duration = \u00dcberflutungsdauer WSPL-2 [d/a]
-sinfo.flood_duration.header.pdf.mainvalue.2.duration = \u00dcberflu-tungs-dauer WSPL-2 [d/a]
-sinfo.flood_duration.header.mainvalue.2.w = Wasserstand/Wasserspiegel-lage-2
-sinfo.flood_duration.header.pdf.mainvalue.2.w = Wasser-stand/Wasser-spiegel-lage-2
-sinfo.flood_duration.header.mainvalue.2.q =  Q-2
-sinfo.flood_duration.header.pdf.mainvalue.2.q =  Q-2 [m\u00b3/s]
-sinfo.flood_duration.header.mainvalue.3.duration = \u00dcberflutungsdauer WSPL-3 [d/a]
-sinfo.flood_duration.header.pdf.mainvalue.3.duration = \u00dcberflu-tungs-dauer WSPL-3 [d/a]
-sinfo.flood_duration.header.mainvalue.3.w = Wasserstand/Wasserspiegel-lage-3
-sinfo.flood_duration.header.pdf.mainvalue.3.w = Wasser-stand/Wasser-spiegel-lage-3
-sinfo.flood_duration.header.mainvalue.3.q =  Q-3
-sinfo.flood_duration.header.pdf.mainvalue.3.q =  Q-3 [m\u00b3/s]
 sinfo.chart.flood_duration.height.section.title = H\u00f6he Infrastrukturen BWaStr
 sinfo_facet_flood_height = Geod\u00e4tische H\u00f6he Infrastrukturen BWaStr
 sinfo_facet_flood_height.description = Geod\u00e4tische H\u00f6he Infrastrukturen BWaStr ({0})