changeset 5377:a5f5599f6fd5 2.9.14

merge
author Bettina Gruenbauer <bettina@intevation.de>
date Fri, 22 Mar 2013 11:02:08 +0100
parents 9b2482a3b9fe (diff) 407af2f1a364 (current diff)
children fe5fc583390d
files
diffstat 4 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/src/main/resources/messages.properties	Fri Mar 22 09:13:58 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages.properties	Fri Mar 22 11:02:08 2013 +0100
@@ -71,6 +71,8 @@
 epoch=Epoch
 off_epoch = off. Epochs
 soundings = Soundings / Epochs
+t_per_a = t/a
+m3_per_a = m\u00b3/a
 
 historical.mode.w = Waterlevel Analyse
 historical.mode.q = Discharge Analyse
@@ -297,8 +299,6 @@
 chart.beddifference.yaxis.label.diff = Difference [m]
 chart.beddifference.yaxis.label.height = Absolute Height [m]
 chart.beddifference.year.title = Bedheight Difference
-chart.beddifference.xaxis.label = River-Km [km]
-chart.beddifference.yaxis.label.diff = Difference [m]
 chart.beddifference.yaxis.label.morph = Morphologic Width [m]
 chart.beddifference.yaxis.label.heights = Absolute Height [m]
 
@@ -482,6 +482,9 @@
 help.state.winfo.uesk.floodplain=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.floodplain
 help.state.winfo.uesk.differences=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.differences
 help.state.winfo.uesk.scenario=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.dc-hws=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.user-rgd=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
+help.state.winfo.uesk.barriers=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.uesk.scenario
 help.state.winfo.historicalq.reference_gauge=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.reference_gauge
 help.state.winfo.historicalq.timerange=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.timerange
 help.state.winfo.historicalq.mode=https://flys-intern.intevation.de/Flys-3.0/OnlineHilfe/WINFO#help.state.winfo.historicalq.mode
--- a/flys-artifacts/src/main/resources/messages_de.properties	Fri Mar 22 09:13:58 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Fri Mar 22 11:02:08 2013 +0100
@@ -72,6 +72,8 @@
 epoch=Epoche
 off_epoch = Amtl. Epochen
 soundings = Peilungen / Epochen
+t_per_a = t/a
+m3_per_a = m\u00b3/a
 
 historical.mode.w = Wasserstandsanalyse
 historical.mode.q = Abflussanalyse
@@ -241,6 +243,16 @@
 facet.sedimentload.susp_sediment = Schwebstoff
 facet.sedimentload.total = Gesamt
 facet.sedimentload.total_load = Gesamt Geschiebe
+missing.fraction.coarse = Fehlende Fraktion: grober Kies
+missing.fraction.fine_middle = Fehlende Fraktion: fein/mittlerer Kies
+missing.fraction.sand = Fehlende Fraktion: Sand
+missing.fraction.susp_sand = Fehlende Fraktion: susp. Sand
+missing.fraction.susp_sediment = Fehlende Fraktion: Schwebstoffe
+missing.data.coarse = Fehlende Daten bei grobem Kies
+missing.data.fine_middle = Fehlende Daten bei fein/mittlerem Kies
+missing.data.sand = Fehlende Daten bei Sand
+missing.data.susp_sand = Fehlende Daten bei susp. Sand
+missing.data.susp_sediment = Fehlende Daten bei Schwebstoffen
 
 facet.longitudinal_section.annotations = Streckenfavoriten
 facet.discharge_curves.mainvalues.q = Q (Haupt- und Extremwerte)
@@ -288,8 +300,6 @@
 chart.beddifference.yaxis.label.diff = Differenz [m]
 chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m]
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
-chart.beddifference.xaxis.label = Fluss-Km [km]
-chart.beddifference.yaxis.label.diff = Differenz [m]
 chart.beddifference.yaxis.label.morph = Morphologische Breite [m]
 chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m]
 
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Mar 22 09:13:58 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Mar 22 11:02:08 2013 +0100
@@ -297,8 +297,6 @@
 chart.beddifference.yaxis.label.diff = Differenz [m]
 chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m]
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
-chart.beddifference.xaxis.label = Fluss-Km [km]
-chart.beddifference.yaxis.label.diff = Differenz [m]
 chart.beddifference.yaxis.label.morph = Morphologische Breite [m]
 chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m]
 
--- a/flys-artifacts/src/main/resources/messages_en.properties	Fri Mar 22 09:13:58 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Fri Mar 22 11:02:08 2013 +0100
@@ -71,6 +71,8 @@
 epoch=Epoch
 off_epoch = off. Epochs
 soundings = Soundings / Epochs
+t_per_a = t/a
+m3_per_a = m\u00b3/a
 
 historical.mode.w = Waterlevel Analyse
 historical.mode.q = Discharge Analyse
@@ -300,8 +302,6 @@
 chart.beddifference.yaxis.label.diff = Difference [m]
 chart.beddifference.yaxis.label.height = Absolute Height [m]
 chart.beddifference.year.title = Bedheight Difference
-chart.beddifference.xaxis.label = River-Km [km]
-chart.beddifference.yaxis.label.diff = Difference [m]
 chart.beddifference.yaxis.label.morph = Morphologic Width [m]
 chart.beddifference.yaxis.label.heights = Absolute Height [m]
 

http://dive4elements.wald.intevation.org