# HG changeset patch # User gernotbelger # Date 1519908159 -3600 # Node ID 3bdf8e0d24f7a3c5f8f1e7907a3ab503874c3063 # Parent 48d5812e8fd5542bd220e6b00885e57d2b7bcdc5 Removed diferences between en/default and de/de_DE localizations. diff -r 48d5812e8fd5 -r 3bdf8e0d24f7 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Thu Mar 01 09:04:39 2018 +0100 +++ b/artifacts/src/main/resources/messages.properties Thu Mar 01 13:42:39 2018 +0100 @@ -13,12 +13,12 @@ state.winfo.uesk.dgm = Digital Terrain Model state.winfo.uesk.profiles = Interpolated Profiles state.winfo.uesk.floodplain = Lateral Boundary -state.winfo.uesk.differences = Differenzen between waterlevel and terrain +state.winfo.uesk.differences = Differences between waterlevel and terrain state.winfo.uesk.scenario = Flood Plain / Scenario state.winfo.uesk.dc-hws = HWS state.winfo.uesk.user-rgd = User defined shapefiles state.winfo.uesk.barriers = Digitized HWS -state.winfo.waterlevel_pair_select = Chosen differences +state.winfo.waterlevel_pair_select = Chosen Differences state.winfo.historicalq.reference_gauge = Selection of Gauge state.winfo.historicalq.timerange = Selection of Evaluation time state.winfo.historicalq.mode = Selecion of analyses @@ -37,7 +37,7 @@ state.fix.analysis.analysisperiods = Analysis period state.fix.analysis.function = Function state.fix.analysis.preprocessing = Outliers -state.fix.preprocess=incorporate in calculation +state.fix.preprocess=use outlier test state.fix.vollmer.function=Function state.fix.vollmer.preprocessing = Outliers state.fix.vollmer.qs = Input for W/Q data @@ -55,8 +55,8 @@ state.minfo.bed.difference_select=Differences state.minfo.year=Year state.minfo.epoch=Epoch +state.minfo.bed.location = Location/Distance state.minfo.bed.distance = Range selection -state.minfo.bed.location = Location/Distance state.minfo.bed.periods = Periods state.minfo.bed.char_diameter = Characteristic Diameter state.minfo.bed.error.no_data = No data found for selected range. @@ -94,8 +94,8 @@ calc.historical.discharge.curve = Historical Discharge Curve calc.reference.curve = Reference Curve calc.extreme.curve = Extreme Curves -calc.fixation.default = Fixingg -calc.fixation.vollmer = Generative Waterlevel +calc.fixation.default = Fixation +calc.fixation.vollmer = Balanced Waterlevel calc.bed.middle = Middle Bed Height calc.bed.diff = Bed Height Difference calc.bed.quality = Bed Quality @@ -155,6 +155,11 @@ main_channel = Main channel total_channel = Total channel +chart.cross_section.title = Cross Section for river {0} +chart.cross_section.subtitle = {0}-km: {1,number,#.###} +chart.cross_section.xaxis.label = Distance [m] +chart.cross_section.yaxis.label = W [{0}] + chart.longitudinal.section.title = W-Longitudinal Section chart.longitudinal.section.subtitle = Range: {0}-km {1,number,#.###} - {2,number,#.###} chart.longitudinal.section.shortsubtitle = {0} @@ -163,12 +168,6 @@ chart.longitudinal.section.yaxis.label = W [{0}] chart.longitudinal.section.yaxis.second.label = Q [m\u00b3/s] chart.longitudinal.annotations.label = {0}.km - -chart.cross_section.title = Cross Section for river {0} -chart.cross_section.subtitle = {0}-km: {1,number,#.###} -chart.cross_section.xaxis.label = Distance [m] -chart.cross_section.yaxis.label = W [{0}] - chart.discharge.curve.title = Discharge Curve chart.discharge.curve.xaxis.label = Q [m\u00b3/s] chart.discharge.curve.yaxis.label = W [{0}] @@ -188,7 +187,7 @@ chart.duration.curve.yaxis.label.q = Q [m\u00b3/s] chart.duration.curve.curve.w = Waterlevel duration curve for {0} (km: {1}) chart.duration.curve.curve.q = Discharge duration curve for {0} (km: {1}) -chart.historical.discharge.title = Historical Discharge Curves +chart.historical.discharge.title = Historical Discharge Curves for Gauge {0} chart.historical.discharge.subtitle = Gauge {0} {1,date,medium} - {2,date,medium} chart.historical.discharge.xaxis.label = Time chart.historical.discharge.yaxis.second.label = Q [m\u00b3/s] @@ -200,26 +199,29 @@ chart.reference.curve.title = Reference Curve chart.reference.curve.subtitle = {0} +chart.fixings.analysis.title = Longitudinal section at km {0} +chart.fixings.wq.subtitle=River: {0}; Range: {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short} +chart.fixings.wq.subtitle1={0,date,short} to {1,date,short} + +chart.fixings.derivedcurve.title = Derived curve +chart.fixings.deltawt.title = Differences from fitted curve at km {0} +chart.fixings.wq.title = Fixings Analysis at km {0} +chart.fixings.wq.yaxis.label = W [{0}] + +chart.extreme.wq.yaxis.label = W [{0}] + chart.reference.curve.x.axis.in.cm = Reference Gauge(s) [cm] chart.reference.curve.x.axis.in.m = Reference Station [NN + m] chart.reference.curve.y.axis.in.cm = Target Gauge(s) [cm] chart.reference.curve.y.axis.in.m = Target Station(s) [NN + m] +chart.normalized.reference.curve.title = Reduced Reference Curve + chart.w_differences.title = Differences chart.w_differences.subtitle = {0} chart.w_differences.yaxis.label = m chart.w_differences.yaxis.second.label = W [NN + m] -chart.normalized.reference.curve.title = Reduced Reference Curve - -chart.fixings.wq.title = Fixings Analysis at km {0} -chart.fixings.wq.subtitle=River: {0}; Range: {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short} -chart.fixings.wq.subtitle1={0,date,short} to {1,date,short} -chart.fixings.analysis.title = Longitudinal section at km {0} -chart.fixings.wq.yaxis.label = W [{0}] - -chart.extreme.wq.yaxis.label = W [{0}] - chart.bedquality.title=Bed Longitudinal Section chart.bedquality.xaxis.label={0}-km chart.bedquality.yaxis.label.diameter = Diameter [mm] @@ -283,7 +285,7 @@ facet.sedimentload.suspended_load = Suspended load (from database) - {0} [{1}] facet.sedimentload.calc.total = Total load (calculated) - {0} [{1}] facet.sedimentload.calc.bed_load = Bed load (calculated) - {0} [{1}] -facet.sedimentload.calc.bed_load_susp_sand = bed building load (calculated) - {0} [{1}] +facet.sedimentload.calc.bed_load_susp_sand = Bed building load (calculated) - {0} [{1}] minfo.sedimentload.no.data = No sediment load data available sedimentload.missing.fraction.coarse = Missing fraction coarse gravel - {0} @@ -305,17 +307,17 @@ historical_discharge.mainvalues.w = W Main Values facet.flow_velocity.model.mainchannel = Mainchannel {0} facet.flow_velocity.model.totalchannel = Totalchannel {0} -facet.flow_velocity.model.tau = bottom shear stress {0} +facet.flow_velocity.model.tau = Bottom shear stress {0} facet.flow_velocity.model.q = Q {0} facet.flow_velocity.mainchannel = v Mainchannel at {0} +facet.flow_velocity.discharge = Discharge at {0} facet.flow_velocity.totalchannel = v Totalchannel at {0} facet.flow_velocity.tauchannel = Bottom shear stress Mainchannel at {0} facet.flow_velocity.mainchannel.raw = v Mainchannel at {0} (raw) facet.flow_velocity.totalchannel.raw = v Totalchannel at {0} (raw) facet.flow_velocity.tauchannel.raw = Bottom shear stress Mainchannel at {0} (raw) -facet.flow_velocity.discharge = Discharge at {0} +facet.flow_velocity.velocity = V {0} facet.flow_velocity.waterlevel = Waterlevel {0} -facet.flow_velocity.velocity = V {0} facet.bedheight_middle.single = Bed Height {0,number,####} facet.bedheight_middle.epoch = Bed Height Epoch {0,number,####} - {1,number,####} facet.bedquality.bed.porosity.toplayer = Porosity ({0,date} - {1,date}) ({2}) @@ -367,10 +369,10 @@ chart.beddifference.epoch.title = Bedheight Difference chart.beddifference.xaxis.label = {0}-km chart.beddifference.yaxis.label.diff = Difference [cm] -chart.beddifference.yaxis.label.height = Absolute Height [{0}] +chart.beddifference.yaxis.label.height = Absolute Height [m] chart.beddifference.year.title = Bedheight Difference chart.beddifference.yaxis.label.morph = Width [m] -chart.beddifference.yaxis.label.heights = Absolute Height [{0}] +chart.beddifference.yaxis.label.heights = Absolute Height [m] chart.subtitle.radius = Width of sample window for moving average export.csv.header.km = km @@ -398,10 +400,10 @@ export.duration.curve.csv.header.q = Q [m\u00b3/s] export.discharge.longitudinal.section.csv.header.km = River-Km export.discharge.longitudinal.section.csv.header.w = W [NN + m] -export.discharge.longitudinal.section.csv.header.cw = W corr. [NN +m] +export.discharge.longitudinal.section.csv.header.cw = W corr. [NN + m] export.discharge.longitudinal.section.csv.header.q = Q [m\u00b3/s] -export.discharge.curve.at.header = Computed Discharge Curve for {0} {0}-km: {1} -export.discharge.curve.at.gauge.header = Discharge Table for {1}/{0} since {2} PNP[{4}] = {3} +export.discharge.curve.at.header = Computed discharge curve for {0} {0}-km: {1} +export.discharge.curve.at.gauge.header = Dischargetable for {1}/{0} since {2} datum[{4}] = {3} export.historical.discharge.csv.header.timerange = Timerange export.historical.discharge.csv.header.waterlevel = Waterlevel [cm] export.historical.discharge.csv.header.discharge = Discharge [m\u00b3/s] @@ -470,7 +472,7 @@ export.sqrelation.csv.info.param.f = Parameter F: transport of bed load (0.063-125 mm) export.sqrelation.csv.info.q = Q: Discharge in [m\u00b3/s] as measured on measurement date export.sqrelation.csv.info.s_kg = S: Transport in [kg/s] as measured on measurement date -export.sqrelation.csv.info.date = Mesurement Date: The date this measurment was made +export.sqrelation.csv.info.date = Measurement Date: The date this measurment was made export.sqrelation.csv.header.parameter = Parameter export.sqrelation.csv.header.station = Station export.sqrelation.csv.header.km = River-Km @@ -493,13 +495,13 @@ export.sqrelation.measurements.pdf.file = /jasper/sqmeasurements_en.jasper export.sqrelation.pdf.mode = Load Discharge Relation export.minfo.bedquality.km = km -export.minfo.bedquality.density.toplayer = Density Toplayer -export.minfo.bedquality.density.sublayer = Density Sublayer -export.minfo.bedquality.porosity.toplayer = Porosity Toplayer -export.minfo.bedquality.porosity.sublayer = Porosity Sublayer -export.minfo.bedquality.diameter.bedload = Bedload Diameter -export.minfo.bedquality.diameter.toplayer = Bed Diameter Toplayer -export.minfo.bedquality.diameter.sublayer = Bed Diameter Sublayer +export.minfo.bedquality.density.toplayer = Density Toplayer [t/m\u00b3] +export.minfo.bedquality.density.sublayer = Density Sublayer [t/m\u00b3] +export.minfo.bedquality.porosity.toplayer = Porosity Toplayer [%] +export.minfo.bedquality.porosity.sublayer = Porosity Sublayer [%] +export.minfo.bedquality.diameter.bedload = Bedload Diameter [mm] +export.minfo.bedquality.diameter.toplayer = Bed Diameter Toplayer [mm] +export.minfo.bedquality.diameter.sublayer = Bed Diameter Sublayer [mm] export.minfo.beddifference.km = km export.minfo.beddifference.diff = Bedheight Difference [cm] export.minfo.beddifference.diff.pair = Difference pair @@ -584,6 +586,7 @@ no.segments.found = No segments found. no.values.given = No values given. cannot.interpolate.w.q = Cannot interpolate W/Q. + manualpoints = Manual Points no.reference.start.km = No reference start station given. @@ -666,8 +669,6 @@ chart.fix.deltawt.xaxis.label=Date chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] -chart.fixings.derivedcurve.title = Derived curve -chart.fixings.deltawt.title = Differences from fitted curve at km {0} chart.fixings.longitudinalsection.title=Longitudinal section @@ -733,7 +734,7 @@ load_diameter = Bedload Diameter bed_diameter = Bed Diameter -area.label.template = Area = %s m\u00b2 +area.label.template = Area = %s m\u00b3 gauge.discharge.service.chart.title = Discharge Tables at Gauge {0} gauge.discharge.service.chart.x.title = Q [m\u00b3/s] @@ -825,7 +826,7 @@ sinfo.export.flow_depth.csv.meta.header.sounding.evaluator = # Auswerter: {0} sinfo.export.flow_depth.csv.meta.header.sounding.prj = # Lagesystem: {0} sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel = # H\u00f6hensystem: {0} -sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel.original = # urspr\u00fcngliches H\u00f6hensystem: {0} +sinfo.export.flow_depth.csv.meta.header.sounding.elevationmodel.original = # urspr\u00fcngliches H\u00f6hensystem: {0} sinfo.export.flow_depth.csv.meta.header.waterlevel = ##METADATEN WASSERSPIEGELLAGE sinfo.export.flow_depth.csv.meta.header.waterlevel.name = # Bezeichnung der Wasserspiegellage: {0} sinfo.export.flow_depth.csv.meta.header.waterlevel.gauge = # Bezugspegel: {0} diff -r 48d5812e8fd5 -r 3bdf8e0d24f7 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Thu Mar 01 09:04:39 2018 +0100 +++ b/artifacts/src/main/resources/messages_de.properties Thu Mar 01 13:42:39 2018 +0100 @@ -55,8 +55,8 @@ state.minfo.bed.difference_select=Differenzen state.minfo.year=Jahr state.minfo.epoch=Epoche +state.minfo.bed.location = Ort(e)/Strecke state.minfo.bed.distance = Wahl der Berechnungsstrecke -state.minfo.bed.location = Ort(e)/Strecke state.minfo.bed.periods = Zeitraum/Zeitr\u00e4ume state.minfo.bed.char_diameter = Charakteristischer Durchmesser state.minfo.bed.error.no_data = F\u00fcr die gew\u00e4hlte Strecke liegen keine Daten vor. @@ -69,16 +69,15 @@ state.minfo.sediment.load.off_epochs = Amtl. Epochen state.minfo.sediment.load.sq_interval = Transport-Abfluss Beziehung state.minfo.off_epoch = Amtl. Epochen -state.minfo.sediment.load.unit = Einheit state.minfo.sediment.load.t_per_a = (t/a) state.minfo.sediment.load.m3_per_a = (m\u00b3/a) +state.minfo.sediment.load.unit = Einheit state.minfo.t_per_a = t/a state.minfo.m3_per_a = m\u00b3/a - year=Jahr epoch=Epoche -off_epoch = Amtl. Epochen +off_epoch = Amtl. Epoche soundings = Peilungen / Epochen t_per_a = t/a m3_per_a = m\u00b3/a @@ -95,7 +94,7 @@ calc.historical.discharge.curve = Hist. Abflusskurven calc.reference.curve = Bezugslinie calc.extreme.curve = Auslagerung extremer Wasserspiegellagen -calc.fixation.default = Fixierungsanalyse +calc.fixation.default = Fixierung calc.fixation.vollmer = Ausgelagerte Wasserspiegellage calc.bed.middle = Mittlere Sohlh\u00f6he calc.bed.diff = Sohlh\u00f6hendifferenz @@ -200,19 +199,18 @@ chart.reference.curve.title = Bezugslinie chart.reference.curve.subtitle = {0} +chart.reference.curve.x.axis.in.cm = Bezugspegel [cm] +chart.reference.curve.x.axis.in.m = Bezugsort [NN + m] +chart.reference.curve.y.axis.in.cm = Zielpegel [cm] +chart.reference.curve.y.axis.in.m = Zielort(e) [NN + m] + chart.fixings.derivedcurve.title = Ableitungskurve -chart.fixings.deltawt.title = Abweichungen von der Ausgleichskurve an Kilometer {0} chart.fixings.analysis.title = L\u00e4ngsschnitt an Kilometer {0} chart.fixings.wq.title = Fixierungsanalyse an Kilometer {0} chart.fixings.wq.yaxis.label = W [{0}] chart.extreme.wq.yaxis.label = W [{0}] -chart.reference.curve.x.axis.in.cm = Bezugspegel [cm] -chart.reference.curve.x.axis.in.m = Bezugsort [NN + m] -chart.reference.curve.y.axis.in.cm = Zielpegel [cm] -chart.reference.curve.y.axis.in.m = Zielort(e) [NN + m] - chart.normalized.reference.curve.title = Reduzierte Bezugslinie chart.w_differences.title = Differenzen @@ -259,13 +257,12 @@ facet.sq_relation.outlier.measurement = Geschiebedaten Durchgang {0} sedimentdensity = Sedimentdichte - -coarse = Grober Kies sand = Sand fine_middle = Feine/Mittl. Kies susp_sand = Susp. Sand susp_sand_bed = Bettb. Anteil Susp. Sand suspended_sediment = Schwebstoff +coarse = Grober Kies total = Gesamtfracht chart.sedimentload.ls.title = Sedimentfracht @@ -310,11 +307,11 @@ facet.flow_velocity.model.q = Q {0} facet.flow_velocity.mainchannel = v Hauptgerinne bei {0} facet.flow_velocity.totalchannel = v Gesamtgerinne bei {0} -facet.flow_velocity.discharge = Abfluss bei {0} facet.flow_velocity.tauchannel = Sohlschubspannung Hauptgerinne bei {0} facet.flow_velocity.mainchannel.raw = v Hauptgerinne bei {0} (Rohdaten) facet.flow_velocity.totalchannel.raw = v Gesamtgerinne bei {0} (Rohdaten) facet.flow_velocity.tauchannel.raw = Sohlschubspannung Hauptgerinne bei {0} (Rohdaten) +facet.flow_velocity.discharge = Abfluss bei {0} facet.flow_velocity.velocity = V ({0}) facet.flow_velocity.waterlevel = W ({0}) facet.bedheight_middle.single = Sohlh\u00f6he {0,number,####} @@ -340,19 +337,19 @@ bedquality.missing.porosity.toplayer = Interpolation der Porosit\u00e4t (0,0 m - 0,3 m) auf der Berechnungsstrecke f\u00fcr {0,date} - {1,date} nicht m\u00f6glich. bedquality.missing.porosity.sublayer = Interpolation der Porosit\u00e4t (0,1 m - 0,5 m) auf der Berechnungsstrecke f\u00fcr {0,date} - {1,date} nicht m\u00f6glich. facet.bedheight.diff.year = Sohlh\u00f6hendifferenz {0} +facet.bedheight.diff.year.raw = Sohlh\u00f6hendifferenz {0} (Rohdaten) facet.bedheight.sounding_width = gepeilte Breite ({0}) -facet.bedheight.diff.morph1 = Morph. aktive Breite Minuend -facet.bedheight.diff.morph2 = Morph. aktive Breite Subtrahend facet.bedheight.diff.sounding = gepeilte Breite facet.bedheight.diff.height1 = H\u00f6he Minuend {0} facet.bedheight.diff.height2 = H\u00f6he Subtrahend {0} +facet.bedheight.diff.morph1 = Morph. aktive Breite Minuend +facet.bedheight.diff.morph2 = Morph. aktive Breite Subtrahend facet.bedheight.diff.absolute = Sohlh\u00f6hendifferenz/Jahr {0} -facet.bedheight.diff.epoch = Sohlh\u00f6hendifferenz {0} -facet.bedheight.diff.year.raw = Sohlh\u00f6hendifferenz {0} (Rohdaten) facet.bedheight.diff.height.raw = {0} (Rohdaten) facet.bedheight.diff.height1.raw = H\u00f6he Minuend {0} (Rohdaten) facet.bedheight.diff.height2.raw = H\u00f6he Subtrahend {0} (Rohdaten) facet.bedheight.diff.absolute.raw = Sohlh\u00f6hendifferenz/Jahr {0} (Rohdaten) +facet.bedheight.diff.epoch = Sohlh\u00f6hendifferenz {0} facet.bedheight.diff.epoch.raw = Sohlh\u00f6hendifferenz {0} (Rohdaten) facet.gauge_discharge_curve.river = Gew\u00e4sser facet.gauge_discharge_curve.reference_gauge = Pegelnummer @@ -368,10 +365,10 @@ chart.beddifference.epoch.title = Sohlh\u00f6hendifferenz chart.beddifference.xaxis.label = {0}-km chart.beddifference.yaxis.label.diff = Differenz [cm] -chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m] +chart.beddifference.yaxis.label.height = Absolute H\u00f6he [{0}] chart.beddifference.year.title = Sohlh\u00f6hendifferenz chart.beddifference.yaxis.label.morph = Breite [m] -chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [m] +chart.beddifference.yaxis.label.heights = Absolute H\u00f6he [{0}] chart.subtitle.radius = Fensterbreite f\u00fcr gleitenden Mittelwert export.csv.header.km = km @@ -401,8 +398,8 @@ export.discharge.longitudinal.section.csv.header.w = W [NN + m] export.discharge.longitudinal.section.csv.header.cw = W korr. [NN + m] export.discharge.longitudinal.section.csv.header.q = Q [m\u00b3/s] +export.discharge.curve.at.gauge.header = Abflusstafel f\u00fcr {1}/{0} ab {2} PNP[{4}] = {3} export.discharge.curve.at.header = Berechnete Abflusstafel f\u00fcr {0}, km {1} -export.discharge.curve.at.gauge.header = Abflusstafel f\u00fcr {1}/{0} ab {2} PNP[{4}] = {3} export.historical.discharge.csv.header.timerange = Zeitraum export.historical.discharge.csv.header.waterlevel = Wasserstand [cm] export.historical.discharge.csv.header.discharge = Abfluss [m\u00b3/s] @@ -414,7 +411,6 @@ export.reference_curve.csv.header.w.m = W (m + NHN) export.reference_curve.csv.header.w.q = gleichw. Q (m\u00b3/s) - export.waterlevel.pdf.mode = Wasserstand export.computed.discharge.pdf.mode = Abflusskurve export.computed.discharge.pdf.calc.mode = Berechnete Abflusskurve @@ -513,7 +509,6 @@ export.minfo.beddifference.gap1 = Datenl\u00fccke Minuend [%] export.minfo.beddifference.gap2 = Datenl\u00fccke Subtrahend [%] - floodmap.wmsbackground = Hintergrundkarte floodmap.riveraxis = Flussachse floodmap.uesk = \u00dcSG: {0}-km {1,number,####} - {2,number,####} - {3} @@ -675,6 +670,8 @@ chart.fixings.longitudinalsection.title=L\u00e4ngsschnitt +chart.fixings.deltawt.title = Abweichungen von der Ausgleichskurve an Kilometer {0} + export.fixings.deltawt.csv.header.km=km export.fixings.deltawt.csv.header.deltaw=\u0394 W [cm] export.fixings.deltawt.csv.header.q=Abfluss [m\u00b3/s] @@ -685,7 +682,6 @@ export.fixings.deltawt.csv.reference=B export.fixings.deltawt.csv.analysis=A{0,number,integer} - fix.missing.river=Kein Gew\u00e4sser gew\u00e4hlt fix.missing.from=Kein Startkilometer gew\u00e4hlt fix.missing.to=Kein Endkilometer gew\u00e4hlt @@ -720,7 +716,7 @@ fix.km.chart.measured=gemessen fix.km.chart.interpolated=interpoliert -fix.export.at.header = Abflusskurve aus der Fixierungsanalyse f\u00fcr {0} {0}-km: {1} +fix.export.at.header = Abflusstafel aus der Fixierungsanalyse f\u00fcr {0} {0}-km: {1} fix.export.at.gauge.header = Abflusstafel aus der Fixierungsanalyse f\u00fcr {0}, Pegel: {1} PNP[{3}] = {2} sq.km.chart.label = Feststoffdaten sq.km.chart.title = Feststoffdatenbestand SedDB @@ -840,7 +836,6 @@ sinfo.export.flow_depth.csv.meta.range.label = Bereich (km) sinfo.export.flow_depth.csv.meta.height_unit.river = # H\u00f6henbezugssystem des Flusses: {0} -#export.export.flow_depth.csv.meta.range = # Location/Range (km): {0} - {1} export.waterlevel.csv.meta.range = # Ort/Bereich (km): {0} - {1} #export.export.flow_depth.csv.meta.gauge = # Gauge: {0} #export.export.flow_depth.csv.meta.q = # Q (m\u00b3/s): {0} diff -r 48d5812e8fd5 -r 3bdf8e0d24f7 artifacts/src/main/resources/messages_de_DE.properties --- a/artifacts/src/main/resources/messages_de_DE.properties Thu Mar 01 09:04:39 2018 +0100 +++ b/artifacts/src/main/resources/messages_de_DE.properties Thu Mar 01 13:42:39 2018 +0100 @@ -310,7 +310,7 @@ facet.flow_velocity.tauchannel = Sohlschubspannung Hauptgerinne bei {0} facet.flow_velocity.mainchannel.raw = v Hauptgerinne bei {0} (Rohdaten) facet.flow_velocity.totalchannel.raw = v Gesamtgerinne bei {0} (Rohdaten) -facet.flow_velocity.tauchannel.raw =Sohlschubspannung Hauptgerinne bei {0} (Rohdaten) +facet.flow_velocity.tauchannel.raw = Sohlschubspannung Hauptgerinne bei {0} (Rohdaten) facet.flow_velocity.discharge = Abfluss bei {0} facet.flow_velocity.velocity = V ({0}) facet.flow_velocity.waterlevel = W ({0}) @@ -414,7 +414,7 @@ export.waterlevel.pdf.mode = Wasserstand export.computed.discharge.pdf.mode = Abflusskurve export.computed.discharge.pdf.calc.mode = Berechnete Abflusskurve -export.duration.pdf.mode = Dauerline +export.duration.pdf.mode = Dauerlinie export.wdifferences.pdf.mode = W Differenzen export.historical.discharge.pdf.mode = Historischer Abfluss export.reference_curve.pdf.mode = Bezugslinie @@ -668,10 +668,9 @@ chart.fixings.wq.subtitle=Gew\u00e4sser: {0}; Darstellungszeitraum: {1,date,short} bis {2,date,short}; Bezugszeitraum: {3,date,short} bis {4,date,short} chart.fixings.wq.subtitle1={0,date,short} bis {1,date,short} - chart.fixings.longitudinalsection.title=L\u00e4ngsschnitt -chart.fixings.deltawt.title = Abweichungen von der Ausgleichskurve am Kilometer {0} +chart.fixings.deltawt.title = Abweichungen von der Ausgleichskurve an Kilometer {0} export.fixings.deltawt.csv.header.km=km export.fixings.deltawt.csv.header.deltaw=\u0394 W [cm] @@ -727,6 +726,7 @@ static.sq.station = Messstelle module.winfo = W-INFO +module.sinfo = S-INFO module.minfo = M-INFO module.fixanalysis = Fixierungsanalyse module.new_map = Neue Karte @@ -774,13 +774,11 @@ sinfo_calc_flow_depth=Flie\u00dftiefen sinfo_calc_flow_depth.warning.missingQ = {0}: keine Abflussdaten vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich sinfo_calc_flow_depth.warning.waterlevel_discretisation = Wasserspiegel {0}: r\u00e4umliche Aufl\u00f6sung betr\u00e4gt mehr als 1000m -sinfo_calc_flow_depth.warning.year_difference = {0}: Sie verwenden als Differenzenpaar eine Wasserspiegellage aus dem Jahr {1} und eine Peilung aus dem Jahr {2}. Dies kann zu unplausiblen Werten f\u00fchren. +sinfo_calc_flow_depth.warning.year_difference = {0}: Sie verwenden als Differenzenpaar eine Wasserspiegellage aus dem Jahr {1} und eine Peilung aus dem Jahr {2}. Dies kann zu unplausiblen Werten f\u00fchren. sinfo_calc_flow_depth.warning.missingSoilKind = {0}: keine Sohlart vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich sinfo_calc_flow_depth.warning.missingD50 = {0}: kein D50 vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich sinfo_calc_flow_depth.warning.missingVelocity = {0}: keine Flie\u00dfgeschwindigkeiten vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich -Zeitliche Abweichung betr\u00e4gt {1} Jahre. Dies kann zu unplausiblen Ergebnissen f\u00fchren - sinfo_calc_flow_depth_development=Flie\u00dftiefenentwicklung sinfo_calc_flow_depth_minmax=Minimale und Maximale Flie\u00dftiefe sinfo_calc_grounding=Grundber\u00fchrungen @@ -838,6 +836,7 @@ sinfo.export.flow_depth.csv.meta.range.label = Bereich (km) sinfo.export.flow_depth.csv.meta.height_unit.river = # H\u00f6henbezugssystem des Flusses: {0} +export.waterlevel.csv.meta.range = # Ort/Bereich (km): {0} - {1} #export.export.flow_depth.csv.meta.gauge = # Gauge: {0} #export.export.flow_depth.csv.meta.q = # Q (m\u00b3/s): {0} #export.export.flow_depth.csv.meta.w = # W (NN + m): {0} - {1} diff -r 48d5812e8fd5 -r 3bdf8e0d24f7 artifacts/src/main/resources/messages_en.properties --- a/artifacts/src/main/resources/messages_en.properties Thu Mar 01 09:04:39 2018 +0100 +++ b/artifacts/src/main/resources/messages_en.properties Thu Mar 01 13:42:39 2018 +0100 @@ -771,12 +771,12 @@ state.sinfo.calculation_mode=Calculation Mode sinfo_calc_flow_depth=Flie\u00dftiefen -sinfo_calc_flow_depth.warning.missingQ = {0}: keine Abflussdaten vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich +sinfo_calc_flow_depth.warning.missingQ = {0}: no discharge available, calculation of transport body height not possible sinfo_calc_flow_depth.warning.waterlevel_discretisation = Wasserspiegel {0}: r\u00e4umliche Aufl\u00f6sung betr\u00e4gt mehr als 1000m -sinfo_calc_flow_depth.warning.year_difference = {0}: Sie verwenden als Differenzenpaar eine Wasserspiegellage aus dem Jahr {1} und eine Peilung aus dem Jahr {2}. Dies kann zu unplausiblen Werten f\u00fchren. -sinfo_calc_flow_depth.warning.missingSoilKind = {0}: keine Sohlart vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich -sinfo_calc_flow_depth.warning.missingD50 = {0}: kein D50 vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich -sinfo_calc_flow_depth.warning.missingVelocity = {0}: keine Flie\u00dfgeschwindigkeiten vorhanden, Transportk\u00f6rperh\u00f6henberechnung nicht m\u00f6glich +sinfo_calc_flow_depth.warning.year_difference = {0}: Sie verwenden als Differenzenpaar eine Wasserspiegellage aus dem Jahr {1} und eine Peilung aus dem Jahr {2}. Dies kann zu unplausiblen Werten f\u00fchren. +sinfo_calc_flow_depth.warning.missingSoilKind = {0}: no soil kind available, calculation of transport body height not possible +sinfo_calc_flow_depth.warning.missingD50 = {0}: no D50 available, calculation of transport body height not possible +sinfo_calc_flow_depth.warning.missingVelocity = {0}: no flow velocities available, calculation of transport body height not possible sinfo_calc_flow_depth_development=Flie\u00dftiefenentwicklung sinfo_calc_flow_depth_minmax=Minimale und Maximale Flie\u00dftiefe @@ -860,7 +860,7 @@ sinfo.chart.flow_depth.section.yaxis.label=Flie\u00dftiefe [m] sinfo.facet.flow_depth.filtered.description = h ({0}) sinfo.facet.flow_depth.tkh.filtered.description = h + \u0394d ({0}) - + sinfo.chart.tkh.section.title=Transportk\u00f6rperh\u00f6hen sinfo.chart.tkh.section.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm] sinfo.chart.tkh.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm]