[PATCH 2 of 2] Merge

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1539786638 -7200
# Node ID 9f20afcb98bad347ed74aca39edc07c504cc5934
# Parent  0c114309d2a0243e6a96c7952cd5cfc5ff6c3d58
# Parent  482d76aded80a82146ab6dc216b13616f0d327ea
Merge

diff -r 0c114309d2a0 -r 9f20afcb98ba artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Wed Oct 17 16:07:22 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Wed Oct 17 16:30:38 2018 +0200
@@ -1069,7 +1069,7 @@
 flowvelocitymodelkmvaluefinder.empty = No flow velocities available for the selected calculation range, calculation of transport body height not possible
 flowvelocitymodelkmvaluefinder.missing = No flow velocities available, calculation of transport body height not possible
 
-linearInterpolator.maxdistance = Spatial discretisation exceeds {0}m, interpolation does not take place
+linearInterpolator.maxdistance = Note: Spatial discretisation of waterlevels exceeds {0} m.
 
 sinfo.export.csv.meta.header.sounding.current = ##METADATA SOUNDING current
 sinfo.export.csv.meta.header.sounding.historical = ##METADATA SOUNDING historical
diff -r 0c114309d2a0 -r 9f20afcb98ba artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Wed Oct 17 16:07:22 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Wed Oct 17 16:30:38 2018 +0200
@@ -1069,7 +1069,7 @@
 flowvelocitymodelkmvaluefinder.empty = Keine Flie\u00dfgeschwindigkeiten f\u00fcr die gew\u00e4hlte Berechnungsstrecke vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich
 flowvelocitymodelkmvaluefinder.missing = Keine Flie\u00dfgeschwindigkeiten vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich
 
-linearInterpolator.maxdistance = R\u00e4umliche Aufl\u00f6sung gr\u00f6\u00dfer als {0}m, es findet keine Interpolation statt
+linearInterpolator.maxdistance = Hinweis: R\u00e4umliche Aufl\u00f6sung der Wasserst\u00e4nde gr\u00f6\u00dfer als {0} m.
 
 sinfo.export.csv.meta.header.sounding.current = ##METADATEN PEILUNG aktuell
 sinfo.export.csv.meta.header.sounding.historical = ##METADATEN PEILUNG historisch