--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 06 15:25:01 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Sep 06 18:02:02 2018 +0200
@@ -9,7 +9,7 @@
 clone_project = Clone Project
 copy_of = Copy
 manage_projects = Manage Projects
-projectlist_creationTime = Creation time
+projectlist_creationTime = Creation Time
 projectlist_title = Title
 projectlist_favorite = Permanent
 projectlist_close = Close
@@ -26,7 +26,7 @@
 datetime_format = yyyy-MM-dd HH:mm
 new_project = New Project
 module_selection = Module
-river_selection = Rivers
+river_selection = River
 winfo = W-INFO
 minfo = M-INFO
 new_map = New Map
@@ -51,7 +51,7 @@
 show_legend = Show
 aggregation_threshold = Threshold for aggregation of legend entries
 scale = Scale
-databasket = Databasket
+databasket = Data Cage
 databasket_loading = Loading Databasket content
 databasket_empty = Databasket is empty
 fix = Fixing
@@ -70,7 +70,7 @@
 activateTheme = Activate
 deactivateTheme = Deactivate
 removeTheme = Remove
-manageThemes = Manage themes
+manageThemes = Manage Themes
 label_ok = Ok
 label_cancel = Cancel
 cancelCalculationLabel = Stop the current calculation.
@@ -133,21 +133,21 @@
 
 addPointsTooltip = Add manual points
 addWSPTooltip = Add manual LS
-downloadPNGTooltip = Download chart as PNG
-downloadPDFTooltip = Download chart as PDF
-downloadSVGTooltip = Download chart as SVG
-downloadCSVTooltip = Download data as CSV
-zoomToMaxExtentTooltip = Zoom to max extent
-zoomOutTooltip = Zoom out
-historyBackTooltip = Previous zoom
+downloadPNGTooltip = Download Chart as PNG
+downloadPDFTooltip = Download Chart as PDF
+downloadSVGTooltip = Download Chart as SVG
+downloadCSVTooltip = Download Data as CSV
+zoomToMaxExtentTooltip = Zoom to Max Extent
+zoomOutTooltip = Zoom Out
+historyBackTooltip = Previous Zoom
 panControlTooltip = Pan
-zoomboxTooltip = Zoombox
-chartPropertiesTooltip = Chartproperties
+zoomboxTooltip = Zoom Box
+chartPropertiesTooltip = Chart Properties
 printTooltip = Print
 
 description = Description
-from = From
-to = To
+from = from
+to = to
 riverside = Riverside
 bottom_edge = Bottom edge
 top_edge = Top edge
@@ -157,7 +157,7 @@
 stoptime = Stop Time
 wq_table_w = Characteristic Waterlevels
 wq_waterlevel_label = Characteristic Waterlevel
-wq_table_q = Characteristic Discharges / Durations
+wq_table_q = Characteristic Discharges/Durations
 wq_value_w = W [cm at Gauge]
 wq_value_q = Q [m\u00b3/s]
 river_km = River-Km
@@ -178,9 +178,9 @@
 wqW = W at Gauge [cm]
 wqQ = Q [m\u00b3/s]
 wqQatGauge = Q at Gauge [m\u00b3/s]
-wqWFree = W free position [m+NHN]
+wqWFree = W Free Position [m+NHN]
 wqQGauge = Discharge at Gauge
-wqSingle = Single values
+wqSingle = Single Values
 wqRange = Range
 unitWNN = W [NN+m]
 unitWSingle = cm
@@ -214,7 +214,7 @@
 zoom_out = images/mag_zoom_minus.png
 zoom_back = images/mag_zoom_back.png
 pan = images/hand.png
-askThemeRemove = Are you sure that you want to remove the selected theme / themes?
+askThemeRemove = Are you sure that you want to remove the selected theme/themes?
 add = Add
 
 static_sqrelation = SQ relation
@@ -260,7 +260,7 @@
 fix_longitudinal_section_curve = \u0394W Longitudinal Section
 fix_derivate_curve = Derivate
 fix_vollmer_wq_curve = W/Q-Diagram
-datacage_add_pair = Add difference pair
+datacage_add_pair = Add Difference Pair
 load_diameter = Bedload Diameter
 bed_diameter = Bed Diameter
 soundings = Soundings
@@ -289,7 +289,7 @@
 computed_dischargecurve_at_export = Discharge Curve Export
 gauge_discharge_curve_at_export = Gauge Discharge Curve
 current_gauge = Current Gauge Discharge Curve
-gauge_class = Gauge Class
+gauge_class = Discharge Class
 eventselect = Event Selection
 events = Events
 kmchart = W/Q-Preview
@@ -519,7 +519,7 @@
 bfg_model = BfG-Model
 federal = Federal States
 areas = Areas
-sobek_flooded = SOBEK-Boundary flooded / not flooded
+sobek_flooded = SOBEK-Boundary flooded/not flooded
 sobek_areas = SOBEK-Areas
 measurements = Measurements
 floodmarks = Flood Marks
@@ -530,9 +530,9 @@
 wlevel = Waterlevels
 sedimentloads = Sedimentloads
 sources_sinks = sources_sinks
-years = years
-epochs = epochs
-off_epochs = official epochs
+years = Years
+epochs = Epochs
+off_epochs = Official Epochs
 densities = Sediment Densities
 years_general = years
 
@@ -692,13 +692,14 @@
 
 gauge_zero = GZG
 gauge_q_unit = m\u00b3/s
+#Links are also form-names and must not contain whitespaces!
 gauge_river_info_link = Riverinfo
 gauge_info_link = Gaugeinfo
 gauge_url = /PegelInfo/
 gauge_river_url = /GewaesserInfo/
-gauge_curve_link = model dischargecurve/-table
-discharge_timeranges = DC-Timeranges
-discharge_chart = W/Q-Preview
+gauge_curve_link = Model Discharge Curve/Table
+discharge_timeranges = DC Time Series
+discharge_chart = W/Q Preview
 
 measurement_station_type = Type of Measurement Station
 measurement_station_operator = Operator
@@ -745,15 +746,15 @@
 WATERBODY = Waterbody
 FEDSTATE_KM = Station (Federal State)
 
-official_regulation = official Regulation
+official_regulation = Official Regulation
 negative_values_not_allowed_for_to=No negative numbers allowed for 'to'.
 
 reference_gauge=Reference gauge
 gauge_name=Gauge
 
-station=Number of measurement station
+station=Number of Measurement Station
 
-station_name=Measurement station
+station_name=Measurement Station
 
 river=River
 
@@ -848,7 +849,7 @@
 
 bundu = Operation and Maintenance
 bundu_bezugswst_fix_choice_title= Fixation Choice
-bundu_bezugswst_auto_event_choice = Automatic Event choice
+bundu_bezugswst_auto_event_choice = Automatic Event Choice
 bundu_bezugswst_mode_ud = DNE at Gauge [d/a] 
 bundu_bezugswst_validation_range = Input must be an integer between 0 and 364.
 bundu_wst_export = Reference Waterlevels Export
@@ -859,9 +860,14 @@
 chart_settings_export_metadata = Show Metadata
 export_csv_title = Title: 
 
-sinfo_columnlabel_soundings = Sounding choice
-sinfo_columnlabel_waterlevels = Waterlevel choice
+sinfo_columnlabel_soundings = Sounding Choice
+sinfo_columnlabel_waterlevels = Waterlevel Choice
 sinfo_sounding_waterlevel_select_waterlevel = Please choose a sounding first.
-sinfo_deactivate_intelligent_datacage = Disable intelligent data cage
+sinfo_deactivate_intelligent_datacage = Disable Intelligent Data Cage
 
-naviThemeOutOfRange = out of range
\ No newline at end of file
+naviThemeOutOfRange = out of range
+gauge_list_grid_gauge = Gauge
+gauge_list_grid_station = Station [km]
+gauge_list_grid_info = Info
+gauge_list_grid_start = Start [km]
+gauge_list_grid_end = End [km]
\ No newline at end of file