# HG changeset patch # User gernotbelger # Date 1519922627 -3600 # Node ID e07dbbd60f43bb04280628abe6a1d342e7778c33 # Parent b40e40537f4f361584162a1865c3acf8374e5885 Fixed ordering of i10n files, they should be the same for all three. diff -r b40e40537f4f -r e07dbbd60f43 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 Mar 01 17:43:16 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Mar 01 17:43:47 2018 +0100 @@ -91,6 +91,7 @@ sedimentload_ls = Sediment Load welcome = Welcome to Flusshydrologische Software welcome_open_or_create = Please open a project from the project list or create a + # Header images flysLogo = images/flys_logo.gif bfgLogo = images/bfg_logo.gif @@ -165,6 +166,7 @@ wq_value_q = Q [m\u00b3/s] river_km = River-Km uesk_profile_distance = Distance [m] + minfo_type = Type analyzed_range = Analyzed Range @@ -747,12 +749,8 @@ river=River -bandwidthcolot = Band width color - ld_locations=Station(s) -potentiel = Potential - lower_time = from upper_time = to diff -r b40e40537f4f -r e07dbbd60f43 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 Mar 01 17:43:16 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Mar 01 17:43:47 2018 +0100 @@ -33,8 +33,8 @@ river_selection = Gew\u00e4sser winfo = W-INFO minfo = M-INFO +new_map = Neue Karte map = Karte -new_map = Neue Karte new_chart = Neues Diagramm diagram = Diagramm axes = Achsen @@ -82,7 +82,6 @@ cancelCalculationLabel = Aktuelle Berechnung abbrechen. calculationCanceled = Die Berechnung wurde abgebrochen. range = Bereich -analyzed_range = ausgewertete Strecke resultCount = Treffer bfg_id = BfG-ID start_year = Start @@ -136,25 +135,41 @@ missingInput = Sie m\u00fcssen einen Wert eingeben. too_many_values = Nur ein Eingabewert erlaubt +addPointsTooltip = Manuelle Punkte hinzuf\u00fcgen +addWSPTooltip = Manuelle WSP hinzuf\u00fcgen +downloadPNGTooltip = Diagramm als PNG herunterladen +downloadPDFTooltip = Diagramm als PDF herunterladen +downloadSVGTooltip = Diagramm als SVG herunterladen +downloadCSVTooltip = Daten als CSV herunterladen +zoomToMaxExtentTooltip = Auf maximale Ausdehnung zoomen +zoomOutTooltip = Herauszoomen +historyBackTooltip = Voriger Zoom +panControlTooltip = Verschieben +zoomboxTooltip = Ausschnitt vergr\u00f6\u00dfern +chartPropertiesTooltip = Diagrammeigenschaften +printTooltip = Drucken + description = Beschreibung from = von to = bis +riverside = Flussseite bottom_edge = Unterkante top_edge = Oberkante -riverside = Flussseite name = Name type = Typ -minfo_type = Aufnahmeart starttime = Reihe von stoptime = Reihe bis +wq_table_w = Kennzeichnende Wasserst\u00e4nde wq_waterlevel_label = Kennzeichnender Wassterstand -wq_table_w = Kennzeichnende Wasserst\u00e4nde wq_table_q = Kennzeichnende Abfl\u00fcsse / Dauerzahlen wq_value_w = W [cm am Pegel] wq_value_q = Q [m\u00b3/s] river_km = Fluss-Km uesk_profile_distance = Abstand [m] +minfo_type = Aufnahmeart +analyzed_range = ausgewertete Strecke + wqTitle = Eingabe f\u00fcr W/Q Daten wqadaptedTitle = Eingabe f\u00fcr W/Q Daten noMainValueAtGauge = Ausgew\u00e4hlter Wert nicht f\u00fcr alle Pegel vorhanden @@ -205,30 +220,15 @@ askThemeRemove = Sind Sie sicher, dass sie die gew\u00e4hlten / das gew\u00e4lte Thema l\u00f6schen wollen? add = Hinzuf\u00fcgen -addPointsTooltip = Manuelle Punkte hinzuf\u00fcgen -addWSPTooltip = Manuelle WSP hinzuf\u00fcgen -downloadPNGTooltip = Diagramm als PNG herunterladen -downloadPDFTooltip = Diagramm als PDF herunterladen -downloadSVGTooltip = Diagramm als SVG herunterladen -downloadCSVTooltip = Daten als CSV herunterladen -zoomToMaxExtentTooltip = Auf maximale Ausdehnung zoomen -zoomOutTooltip = Herauszoomen -historyBackTooltip = Voriger Zoom -panControlTooltip = Verschieben -zoomboxTooltip = Ausschnitt vergr\u00f6\u00dfern -chartPropertiesTooltip = Diagrammeigenschaften -printTooltip = Drucken - static_sqrelation = Transport-Abfluss Beziehung discharge_curve = Abflusskurve am Pegel discharge_curve_gaugeless = Abflusskurve gauge_discharge_curve = Abflusstafel am Pegel -current_gauge = Modell-Abflusskurve am Pegel computed_discharge_curve = Abflusskurve computed_discharge_curves = Abflusskurven -historical_discharge_curves = Historische Abflusskurven longitudinal_section = L\u00e4ngsschnitt duration_curve = Dauerlinie +historical_discharge_curves = Historische Abflusskurven discharge_longitudinal_section = W f\u00fcr benutzerdefinierten Abflussl\u00e4ngsschnitt floodmap = \u00dcberschwemmungsfl\u00e4che historical_discharge = Zeit-Diagramm @@ -274,6 +274,8 @@ bed_difference_height_year = Sohlh\u00f6hendifferenz pro Jahr bedheight_difference_export = Sohlh\u00f6hendifferenz Export +exportATTooltip = Export as AT file + waterlevel_export = Wasserstand/Wasserspiegellagen Export waterlevel_report = Wasserstand/Wasserspiegellagen Bericht computed_dischargecurve_export = Abflusskurven Export @@ -289,14 +291,13 @@ pdf = PDF computed_dischargecurve_at_export = Abflusskurven Export gauge_discharge_curve_at_export = Abflusskurve am Pegel +current_gauge = Modell-Abflusskurve am Pegel gauge_class = Abflussklasse eventselect = Ereignisauswahl events = Ereignisse kmchart = W/Q-Vorschau fix_waterlevel_export = Fixierungsanalysen Export -exportATTooltip = Daten als AT Datei exportieren - chart_themepanel_header_themes = Thema chart_themepanel_header_actions = Aktionen chart_themepanel_synchron = Synchron navigieren @@ -435,10 +436,6 @@ requireDGM = Sie m\u00fcssen ein DGM ausw\u00e4hlen. upload_file = hochladen shape_file_upload = Shapedatei hochladen -attribution = ©Intevation GmbH 2013
Data ©OpenStreetMap -wmsURLMenuItem = WMS URL -wmsURLBoxTitle = WMS URL der Kartenebene -requireTheme = Sie m\u00fcssen ein Thema ausw\u00e4hlen. # data cage historical_discharges = Historische Abflusskurven @@ -545,6 +542,7 @@ bed_load = Geschiebefracht suspended_load = Suspensionsfracht +# No translation for the pegelonline wms service layer names. gauge_points = Pegelmessstelle (WMS) gauge_level = Wasserstand (WMS) gauge_names = Pegelname (WMS) @@ -571,7 +569,7 @@ capabilitiesEmail = Email capabilitiesPhone = Telefon -#Property dialog +#Properties dialog chart = Diagramm export = Export width = Breite @@ -650,6 +648,10 @@ wsplgen_cat3 = F\u00fcllfarbe 2.0 <= DIFF < 3 wsplgen_cat4 = F\u00fcllfarbe 3.0 <= DIFF < 4 wsplgen_cat5 = F\u00fcllfarbe 4.0 <= DIFF +attribution = ©Intevation GmbH 2013
Data ©OpenStreetMap +wmsURLMenuItem = WMS URL +wmsURLBoxTitle = WMS URL der Kartenebene +requireTheme = Sie m\u00fcssen ein Thema ausw\u00e4hlen. # Manual Points Editor addpoints = Punkte hinzuf\u00fcgen @@ -659,8 +661,8 @@ standby = Erstelle Parameterisierung ... bitte warten. points = Punktthema editpoints = Eintr\u00e4ge editieren +addWSPButton = WSP Thema addWSP = Neues WSP Thema anlegen -addWSPButton = WSP Thema selection = Auswahl manual_date_points_y = Y ([m\u00b3/s]/[cm]) @@ -676,6 +678,7 @@ fix_parameters_export = Angepasste Koeffizienten fix_parameters = CSV + sq_overview=\u00dcbersicht sq_relations=Feststofftransport-Abfluss-Beziehung @@ -733,17 +736,20 @@ SOURCE = Quelle WATERBODY = Gew\u00e4sser FEDSTATE_KM = Landes-Stationierung + official_regulation = amtl. Festlegung negative_values_not_allowed_for_to=Keine negativen Werte bei 'bis' erlaubt. -river=Fluss -ld_locations=Ort + +reference_gauge=Pegelnummer gauge_name=Pegel -reference_gauge=Pegelnummer + station=Messstellennummer + station_name=Messstelle -potentiel = Potentiell -bandwidthcolot = Bandbreitenfarbe +river=Fluss + +ld_locations=Ort lower_time = von upper_time = bis diff -r b40e40537f4f -r e07dbbd60f43 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Mar 01 17:43:16 2018 +0100 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Mar 01 17:43:47 2018 +0100 @@ -33,8 +33,8 @@ river_selection = Rivers winfo = WINFO minfo = MINFO +new_map = New Map map = Map -new_map = New Map new_chart = New Chart diagram = Chart axes = Axes @@ -147,6 +147,7 @@ panControlTooltip = Pan zoomboxTooltip = Zoombox chartPropertiesTooltip = Chartproperties +printTooltip = Print description = Description from = From @@ -158,8 +159,8 @@ type = Type starttime = Start Time stoptime = Stop Time +wq_table_w = Characteristic Waterlevels wq_waterlevel_label = Characteristic Waterlevel -wq_table_w = Characteristic Waterlevels wq_table_q = Characteristic Discharges / Durations wq_value_w = W [cm at Gauge] wq_value_q = Q [m\u00b3/s] @@ -199,6 +200,8 @@ footerHome = Home footerContact = Contact footerImpressum = Legal info +print = Print +printWindowTitle = PDF-Print Settings projectListMin = format-indent-less.png projectListAdd = list-add.png @@ -220,16 +223,15 @@ static_sqrelation = SQ relation discharge_curve = Discharge Curve at Gauge discharge_curve_gaugeless = Discharge Curve -current_gauge = Current Gauge Discharge Curve gauge_discharge_curve = Discharge Table at Gauge computed_discharge_curve = Discharge Curve computed_discharge_curves = Discharge Curves longitudinal_section = Longitudinal Section Curve duration_curve = Duration Curve +historical_discharge_curves = Historical Discharge Curve discharge_longitudinal_section = Discharge Longitudinal Section floodmap = Floodmap historical_discharge = Time Chart -historical_discharge_curves = Historical Discharge Curve historical_discharge_wq = W/Q Chart flow_velocity = Flow Velocity flow_velocities = Flow Velocities @@ -289,6 +291,7 @@ pdf = PDF 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 eventselect = Eventselection events = Events @@ -433,10 +436,6 @@ requireDGM = You need to choose a DEM. upload_file = upload shape_file_upload = Upload shapefile -attribution = ©Intevation GmbH 2013
Data ©OpenStreetMap -wmsURLMenuItem = WMS URL -wmsURLBoxTitle = Layer WMS URL -requireTheme = You need to choose a Layer. # data cage historical_discharges = Historical discharge curves @@ -480,7 +479,7 @@ uesk = Floodmaps calculations = Calculations current = Current -potentiel = Potential +potential = Potential bfg = BfG land = Land rastermap = Rastermap @@ -501,6 +500,24 @@ bedheights = Bedheights morph_width = morphologic Width datacage = Datacage +official = official +inofficial = Inofficial +custom_lines = Own red lining +hws_lines = Line data +hws_points = Point data +hws_fed_unknown = Unknown federal state +jetties = Jetties +route_data = Route data +other = Other +axis = Axis +bfg_model = BfG model +federal = Federal state +areas = Display type: Areas +sobek_flooded = SOBEK border-Grenzlinie with or without flow through +sobek_areas = SOBEK areas +measurements = Measurements +floodmarks = Flood markings +pegel_had_measurement_points = HAD discharge stations (WMS) delta_w = Waterleveldifferences delta_w_cm = cm delta_w_cma = cm/a @@ -525,6 +542,12 @@ bed_load = Bed load suspended_load = Suspended load +# No translation for the pegelonline wms service layer names. +gauge_points = Gauge measurement station (WMS) +gauge_level = Water levels (WMS) +gauge_names = Names of gauges (WMS) +gauge_tendency = Tendency of water level (WMS) + startcolor = Colorrange start color endcolor = Colorrange end color numclasses = Number of classes @@ -585,7 +608,7 @@ showbackground = Show background textshowbg = Show background backgroundcolor = Backgroundcolor -bandwidthcolot = Bandwidthcolor +bandwidthcolor = Band width color textbgcolor = Backgroundcolor textorientation = Textorientation linesize = Linesize @@ -625,6 +648,10 @@ wsplgen_cat3 = Fill Color 2.0 <= DIFF < 3 wsplgen_cat4 = Fill Color 3.0 <= DIFF < 4 wsplgen_cat5 = Fill Color 4.0 <= DIFF +attribution = ©Intevation GmbH 2013
Data ©OpenStreetMap +wmsURLMenuItem = WMS URL +wmsURLBoxTitle = Layer WMS URL +requireTheme = You need to choose a Layer. # Manual Points Editor addpoints = Add points @@ -634,8 +661,8 @@ standby = Creating Artifact ... please wait. points = Points editpoints = Edit Points +addWSPButton = Add Manual LS addWSP = Add Manual LS -addWSPButton = Add Manual LS selection = Selection manual_date_points_y = Y ([m\u00b3/s]/[cm]) @@ -651,6 +678,7 @@ fix_parameters_export = Adjusted coefficient fix_parameters = CSV + sq_overview=Overview sq_relations=SQ Relations @@ -672,16 +700,11 @@ measurement_station_gauge_name = Reference Gauge measurement_station_comment = Comment -# Get Feature Info Window -PATH = Path -official_regulation = Official Regulation -negative_values_not_allowed_for_to=Negative are not allowed for 'to'. -river=River -ld_locations=Location -gauge_name=Gauge -reference_gauge=Gaugenumber -station=Measurementstationnumber -station_name=Measurementstation +# The prefix is used to classify them and will be stripped +# If the payload part sarts with a number it will be sorted +# By this number and the number will be stripped. +# Number must be a single digit 0-9. This hack was made necessary +# by the usage of an attribute table in mapfish mapfish_data_range = mapfish_data_3Bereich mapfish_data_subtitle = mapfish_data_0Untertitel @@ -692,95 +715,41 @@ mapfish_data_dateplace = mapfish_data_7Ort, Datum mapfish_data_river = mapfish_data_1Gew\u00e4sser -custom_lines = Own red lining - -mapSource = Data source - -printWindowTitle = PDF print settings - -LOCATION = Location - +mapTitle = Title +mapSubtitle = Subtitle +mapRange = Range +mapStretch = Map extent mapCreator = Issuer - -gauge_points = Gauge measurement station (WMS) - -axis = Axis - -hws_points = Point data - -gauge_level = Water levels (WMS) - -print = Print - -bandwidthcolor = Band width color - -pegel_had_measurement_points = HAD discharge stations (WMS) - -hws_lines = Line data +mapInstitution = Institutions +mapSource = Data source +mapDate = Place and time +mapLogo = Logo -printTooltip = Print - -mapTitle = Title - -potential = Potential - +# Get Feature Info Window +PATH = Path +DESCRIPTION = Description +KM = Station Z = Height - -mapStretch = Map extent - -areas = Display type: Areas - -inofficial = Inofficial - -KM = Station - +LOCATION = Location +HPGP = HP/GP DIFF = DIFF - -federal = Federal state - -gauge_tendency = Tendency of water level (WMS) - -jetties = Jetties - -gauge_names = Names of gauges (WMS) - +SOURCE = Source WATERBODY = Water body - FEDSTATE_KM = Station of federal states -SOURCE = Source - -sobek_flooded = SOBEK border-Grenzlinie with or without flow through - -route_data = Route data - -mapLogo = Logo - -bfg_model = BfG model - -measurements = Measurements - -floodmarks = Flood markings - -mapSubtitle = Subtitle +official_regulation = Official Regulation +negative_values_not_allowed_for_to=Negative are not allowed for 'to'. -mapDate = Place and time - -HPGP = HP/GP - -mapRange = Range - -official = official +reference_gauge=Gaugenumber +gauge_name=Gauge -hws_fed_unknown = Unknown federal state - -mapInstitution = Institutions +station=Measurementstationnumber -other = Other +station_name=Measurementstation -sobek_areas = SOBEK areas +river=River -DESCRIPTION = Description +ld_locations=Location lower_time = from upper_time = to