[PATCH 2 of 2] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1400225571 -7200
# Node ID 5951d6430ade0c264995c34db7ec8d4d407a201d
# Parent  b320826b118336879a9abb3fc4c9f846a9e012f3
# Parent  553829e7666a6efeb496f93779961a35d1d5bab4
merged.

diff -r b320826b1183 -r 5951d6430ade artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Fri May 16 09:32:19 2014 +0200
+++ b/artifacts/src/main/resources/messages.properties	Fri May 16 09:32:51 2014 +0200
@@ -343,8 +343,7 @@
 chart.beddifference.year.title = Bedheight Difference
 chart.beddifference.yaxis.label.morph = Width [m]
 chart.beddifference.yaxis.label.heights = Absolute Height [{0}]
-chart.beddifference.subtitle.radius = Fensterbreite für gewichtete Mittel: {0}km
-chart.subtitle.radius = Radius for weighted Average: {0}km
+chart.subtitle.radius = Width of sample window for moving average: {0}km
 
 export.waterlevel.csv.header.km = River-Km
 export.waterlevel.csv.header.w = W [{0}]
diff -r b320826b1183 -r 5951d6430ade artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Fri May 16 09:32:19 2014 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Fri May 16 09:32:51 2014 +0200
@@ -344,7 +344,7 @@
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
 chart.beddifference.yaxis.label.morph = Breite [m]
 chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m]
-chart.subtitle.radius = Fensterbreite f\u00fcr gewichtete Mittel: {0}km
+chart.subtitle.radius = Fensterbreite f\u00fcr gleitenden Mittelwert: {0}km
 
 export.waterlevel.csv.header.km = Fluss-Km
 export.waterlevel.csv.header.w = W [{0}]
diff -r b320826b1183 -r 5951d6430ade artifacts/src/main/resources/messages_de_DE.properties
--- a/artifacts/src/main/resources/messages_de_DE.properties	Fri May 16 09:32:19 2014 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Fri May 16 09:32:51 2014 +0200
@@ -341,7 +341,7 @@
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
 chart.beddifference.yaxis.label.morph = Breite [m]
 chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [{0}]
-chart.subtitle.radius = Fensterbreite f\u00fcr gewichtete Mittel: {0}km
+chart.subtitle.radius = Fensterbreite f\u00fcr gleitenden Mittelwert: {0}km
 
 export.waterlevel.csv.header.km = Fluss-Km
 export.waterlevel.csv.header.w = W [{0}]
diff -r b320826b1183 -r 5951d6430ade doc/INSTALL_DE
--- a/doc/INSTALL_DE	Fri May 16 09:32:19 2014 +0200
+++ b/doc/INSTALL_DE	Fri May 16 09:32:51 2014 +0200
@@ -56,10 +56,22 @@
 Installation von D4E-river aus Binärpaket
 =========================================
 
-Entpacken des Dive4Elements-river Installer-Pakets
---------------------------------------------------
-    $ tar -xzf d4e-river.tar.gz
-    @TODO: eventuell anpassen
+    Herunterladen von
+    - d4e-river-3.1.2.tar.bz2
+    - d4river-3.1.2.war
+
+    Als root-User:
+    # cd /opt/
+    # tar xvjf d4e-river-3.1.2.tar.bz2
+    # chown -R d4e d4e-river
+
+    In das Verzeichnis /opt/d4e-river/dgm/ müssen noch die DGMs der
+    Demo-Daten kopiert werden. (s.u.)
+
+    # mv d4river-3.1.2.war /var/lib/tomcat6/webapps/d4e-river.war
+
+    Der Tomcat muss wie unten dokumentiert konfiguriert werden.
+    Gleiches gilt für die MapServer-Installation.
 
 Erfolgt die Installation von D4E-river aus den Binärpaketen, können die
 folgenden Schritte übersprungen werden.
diff -r b320826b1183 -r 5951d6430ade gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Fri May 16 09:32:19 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Fri May 16 09:32:51 2014 +0200
@@ -38,8 +38,8 @@
         ListGridField sfield = new ListGridField("kmstart", "Start [km]", 60);
         ListGridField efield = new ListGridField("kmend", "Ende [km]", 60);
         ListGridField stfield = new ListGridField("station", "Station [km]");
-        ListGridField lfield = new ListGridField("infolink", "Link");
-        ListGridField cfield = new ListGridField("curvelink", "SQ");
+        ListGridField lfield = new ListGridField("infolink", "Info");
+        ListGridField cfield = new ListGridField("curvelink", "Feststofftransport-Abfluss-Beziehung");
         cfield.addRecordClickHandler(this);
 
         this.setShowRecordComponents(true);