# HG changeset patch
# User Bettina Gruenbauer <bettina@intevation.de>
# Date 1365431048 -7200
# Node ID 85fd42e308e78e0d0d19a77d877a8b7a57f44fae
# Parent  7277bdacc4a931aac94db699445ffce23c23f732# Parent  cf4cc385e7c66b17378d524d86f85bc2b064cbe1
merge

diff -r cf4cc385e7c6 -r 85fd42e308e7 flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Mon Apr 08 15:23:01 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Mon Apr 08 16:24:08 2013 +0200
@@ -35,10 +35,10 @@
 state.fix.eventselect = Ereignisauswahl
 state.fix.analysis.referenceperiod = Bezugszeitraum
 state.fix.analysis.analysisperiods = Analysezeitr\u00e4ume
-state.fix.analysis.function = Funktion
+state.fix.analysis.function = Ausgleichsfunktion
 state.fix.analysis.preprocessing = Ausrei\u00DFer
 state.fix.preprocess=beim Berechnen einbeziehen
-state.fix.vollmer.function=Funktion
+state.fix.vollmer.function= Ausgleichsfunktion
 state.fix.vollmer.preprocessing = Ausrei\u00DFer
 state.fix.vollmer.qs = Eingabe f\u00fcr W/Q Daten
 
diff -r cf4cc385e7c6 -r 85fd42e308e7 flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Apr 08 15:23:01 2013 +0200
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Mon Apr 08 16:24:08 2013 +0200
@@ -35,10 +35,10 @@
 state.fix.eventselect = Ereignisauswahl
 state.fix.analysis.referenceperiod = Bezugszeitraum
 state.fix.analysis.analysisperiods = Analysezeitr\u00e4ume
-state.fix.analysis.function = Funktion
+state.fix.analysis.function = Ausgleichsfunktion
 state.fix.analysis.preprocessing = Ausrei\u00DFer
 state.fix.preprocess=beim Berechnen einbeziehen
-state.fix.vollmer.function=Funktion
+state.fix.vollmer.function= Ausgleichsfunktion
 state.fix.vollmer.preprocessing = Ausrei\u00DFer
 state.fix.vollmer.qs = Eingabe f\u00fcr W/Q Daten