--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java	Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java	Thu Sep 06 18:02:02 2018 +0200
@@ -69,12 +69,12 @@
 
     public GaugeListGrid(final FLYS flys) {
         super(flys);
-        // TODO i18n!!!
-        final ListGridField nfield = new ListGridField("name", "Pegel");
-        final ListGridField sfield = new ListGridField("kmstart", "Start [km]", 60);
-        final ListGridField efield = new ListGridField("kmend", "Ende [km]", 60);
-        final ListGridField stfield = new ListGridField("station", "Station [km]");
-        final ListGridField lfield = new ListGridField("infolink", "Info");
+
+        final ListGridField nfield = new ListGridField("name", this.MSG.gauge_list_grid_gauge());
+        final ListGridField sfield = new ListGridField("kmstart", this.MSG.gauge_list_grid_start(), 60);
+        final ListGridField efield = new ListGridField("kmend", this.MSG.gauge_list_grid_end(), 60);
+        final ListGridField stfield = new ListGridField("station", this.MSG.gauge_list_grid_station());
+        final ListGridField lfield = new ListGridField("infolink", this.MSG.gauge_list_grid_info());
         final ListGridField cfield = new ListGridField("curvelink", this.MSG.gauge_curve_link());
         cfield.addRecordClickHandler(this);
 
@@ -210,11 +210,10 @@
         }
         if (!locations.isEmpty()) {
             openOnLocations(locations);
-        } else if( this.data != null && this.data.length == 1 ){
+        } else if (this.data != null && this.data.length == 1) {
             // During selection of calc-mode: all gauges should be collapsed
             collapseAll();
-        }
-        else {
+        } else {
             openAll();
         }
     }
@@ -231,9 +230,9 @@
     }
 
     private void collapseAll() {
-        
+
         GWT.log("InfoListGrid - openAll");
-        
+
         setData(new ListGridRecord[] {});
         for (final GaugeInfo gauge : this.gauges) {
             addCollapsedRecord(gauge);
@@ -295,29 +294,29 @@
 
         setData(new ListGridRecord[] {});
 
-        double to = end == null ? Double.MAX_VALUE: end;
+        double to = end == null ? Double.MAX_VALUE : end;
 
-        double from = Math.min(start, to);
+        final double from = Math.min(start, to);
         to = Math.max(start, to);
-        
+
         for (final GaugeInfo gauge : this.gauges) {
 
             /* in earlier version, it was assumed that gaugeEnd may be null, but start not. */
             final Double gaugeStart = gauge.getKmStart();
             final Double gaugeEnd = gauge.getKmEnd() == null ? gaugeStart : gauge.getKmEnd();
-            
+
             boolean expand;
-            if( gaugeStart == null )
+            if (gaugeStart == null)
                 expand = false;
             else {
-                
+
                 final double gaugeFrom = Math.min(gaugeStart, gaugeEnd);
                 final double gaugeTo = Math.max(gaugeStart, gaugeEnd);
-                
+
                 expand = (from >= gaugeFrom && from <= gaugeTo) || (to >= gaugeFrom && to <= gaugeTo) || (from <= gaugeFrom && to >= gaugeEnd);
             }
 
-            if( expand )
+            if (expand)
                 addExpandedRecord(gauge);
             else
                 removeOrCollapse(gauge, type);