[PATCH] Move MINFO-fixation-stuff to MINFO-datacage and give specified names

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1380205056 -7200
# Node ID e1c875583a940eaa1439814c99a1af46ba6c30f7
# Parent  200ae084909aaba5584e9a429c9ea307ca4b0b28
Move MINFO-fixation-stuff to MINFO-datacage and give specified names.

diff -r 200ae084909a -r e1c875583a94 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Sep 26 13:56:54 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Sep 26 16:17:36 2013 +0200
@@ -1209,9 +1209,9 @@
       <dc:call-macro name="basedata_3_officials"/>
       <dc:call-macro name="basedata_5_flood-protections"/>
       <dc:call-macro name="annotations_per_type"/>
-      <dc:call-macro name="basedata_6_delta_w"/>
-      <dc:call-macro name="basedata_7_waterlevels"/>
       <minfo>
+          <dc:call-macro name="basedata_6_delta_w"/>
+          <dc:call-macro name="basedata_7_waterlevels"/>
           <dc:call-macro name="minfo-heights"/>
           <dc:call-macro name="sounding-width"/>
       </minfo>
diff -r 200ae084909a -r e1c875583a94 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Sep 26 13:56:54 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Sep 26 16:17:36 2013 +0200
@@ -934,6 +934,8 @@
 
     String delta_w();
 
+    String wlevel();
+
     // Capabilities Information Panel
 
     String addwmsInputTitle();
diff -r 200ae084909a -r e1c875583a94 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 26 13:56:54 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 26 16:17:36 2013 +0200
@@ -496,7 +496,8 @@
 measurements = Measurements
 floodmarks = Flood Marks
 pegel_had_measurement_points = HAD Discharge-Measurement points
-delta_w = Delta W
+delta_w = Waterleveldifferences
+wlevel = Waterlevels
 # No translation for the pegelonline wms service layer names.
 gauge_points = Pegelpunkte (WSV)
 gauge_level = Aktueller Wasserstand (WSV)
diff -r 200ae084909a -r e1c875583a94 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 26 13:56:54 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Sep 26 16:17:36 2013 +0200
@@ -501,7 +501,8 @@
 measurements = Messungen
 floodmarks = HW-Marken
 pegel_had_measurement_points = HAD Abflussmessstellen (WMS)
-delta_w = W Differenzen
+delta_w = Wasserspiegeldifferenzen
+wlevel = Wasserspiegellagen
 gauge_points = Pegelmessstelle (WMS)
 gauge_level = Wasserstand (WMS)
 gauge_names = Pegelname (WMS)