Mercurial > dive4elements > river
changeset 6638:f4872350b50f
Backed out changeset 1a7f5d09b9d8
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Sat, 29 Jun 2013 00:06:35 +0200 |
| parents | 1a7f5d09b9d8 |
| children | 769d9ec8abac |
| files | artifacts/doc/conf/artifacts/minfo.xml artifacts/doc/conf/artifacts/winfo.xml artifacts/doc/conf/conf.xml artifacts/doc/conf/meta-data.xml gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties |
| diffstat | 8 files changed, 64 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/minfo.xml Sat Jun 29 00:06:35 2013 +0200 @@ -142,7 +142,7 @@ <state id="state.minfo.flow_velocity" description="state.minfo.flow_velocity" state="org.dive4elements.river.artifacts.states.FlowVelocityState" helpText="help.state.minfo.flow_velocity"> <outputmodes> - <outputmode name="flow_velocity_longitudinal_section" description="output.flow_velocity" mime-type="image/png" type="chart"> + <outputmode name="flow_velocity" description="output.flow_velocity" mime-type="image/png" type="chart"> <facets> <facet name="flow_velocity.totalchannel" description="A facet for total channels"/> <facet name="flow_velocity.mainchannel" description="A facet for main channels"/> @@ -172,7 +172,7 @@ <state id="state.minfo.bedheight_middle" description="state.minfo.bedheight_middle" state="org.dive4elements.river.artifacts.states.MiddleBedHeight" helpText="help.state.minfo.bedheight_middle"> <outputmodes> - <outputmode name="bedheight_middle_longitudinal_section" description="output.bedheight_middle" mime-type="image/png" type="chart"> + <outputmode name="bedheight_middle" description="output.bedheight_middle" mime-type="image/png" type="chart"> <facets> <facet name="bedheight_middle.single" description="A facet for total channels"/> <facet name="bedheight_middle.epoch" description="A facet for total channels"/> @@ -205,7 +205,7 @@ <state id="state.minfo.bed.differences" description="state.minfo.bed.differences" state="org.dive4elements.river.artifacts.states.minfo.DifferencesState" helpText="help.state.minfo.bed.differences"> <outputmodes> - <outputmode name="bed_difference_height_year_longitudinal_section" description="output.absolute_height" mime-type="image/png" type="chart"> + <outputmode name="bed_difference_height_year" description="output.absolute_height" mime-type="image/png" type="chart"> <facets> <facet name="bedheight_difference.height_year" description="A facet for absolute heights"/> <facet name="bedheight_difference.height_year.filtered" description="A facet for absolute heights"/> @@ -219,7 +219,7 @@ <facet name="fix_reference_events_ls" description="Datacage facet"/> </facets> </outputmode> - <outputmode name="bed_difference_year_longitudinal_section" description="output.difference_year" mime-type="img/png" type="chart"> + <outputmode name="bed_difference_year" description="output.difference_year" mime-type="img/png" type="chart"> <facets> <facet name="bedheight_difference.year" description="A facet for bed height differences"/> <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/> @@ -250,7 +250,7 @@ <facet name="morph-width" description="morphologic width, not sounding width!"/> </facets> </outputmode> - <outputmode name="bed_difference_epoch_longitudinal_section" description="output.difference_epoch" mime-type="img/png" type="chart"> + <outputmode name="bed_difference_epoch" description="output.difference_epoch" mime-type="img/png" type="chart"> <facets> <facet name="bedheight_difference.epoch" description="A facet for bed height differences"/> <facet name="bed_difference_epoch.manualpoints" /> @@ -499,7 +499,7 @@ <state id="state.minfo.sediment.load.calculate" description="state.minfo.sediment.load.calculate" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadCalculate"> <outputmodes> - <outputmode name="sedimentload_longitudinal_section" description="output.sedimentload.ls" mime-type="image/png" type="chart"> + <outputmode name="sedimentload_ls" description="output.sedimentload.ls" mime-type="image/png" type="chart"> <facets> <facet name="sedimentload.coarse"/> <facet name="sedimentload.sand"/>
--- a/artifacts/doc/conf/artifacts/winfo.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/winfo.xml Sat Jun 29 00:06:35 2013 +0200 @@ -259,7 +259,7 @@ <state id="state.winfo.w_differences" description="state.winfo.w_differences" state="org.dive4elements.river.artifacts.states.WDifferencesState" helpText="help.state.winfo.w_differences"> <outputmodes> - <outputmode name="w_differences_longitudinal_section" description="output.w_differences" mime-type="image/png" type="chart"> + <outputmode name="w_differences" description="output.w_differences" mime-type="image/png" type="chart"> <facets> <facet name="longitudinal_section.q" description="facet.longitudinal_section.q"/> <facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/>
--- a/artifacts/doc/conf/conf.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/conf.xml Sat Jun 29 00:06:35 2013 +0200 @@ -306,7 +306,7 @@ <output-generator name="durationcurve_export">org.dive4elements.river.exports.DurationCurveExporter</output-generator> <output-generator name="computed_dischargecurve_export">org.dive4elements.river.exports.ComputedDischargeCurveExporter</output-generator> <output-generator name="discharge_longitudinal_section_export">org.dive4elements.river.exports.DischargeLongitudinalSectionExporter</output-generator> - <output-generator name="w_differences_longitudinal_section">org.dive4elements.river.exports.WDifferencesCurveGenerator</output-generator> + <output-generator name="w_differences">org.dive4elements.river.exports.WDifferencesCurveGenerator</output-generator> <output-generator name="w_differences_chartinfo">org.dive4elements.river.exports.WDifferencesCurveInfoGenerator</output-generator> <output-generator name="w_differences_export">org.dive4elements.river.exports.WDifferencesExporter</output-generator> <output-generator name="floodmap">org.dive4elements.river.exports.MapGenerator</output-generator> @@ -321,20 +321,20 @@ <output-generator name="historical_discharge_wq">org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator</output-generator> <output-generator name="historical_discharge_wq_chartinfo">org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator</output-generator> <output-generator name="historical_discharge_export">org.dive4elements.river.exports.HistoricalDischargeCurveExporter</output-generator> - <output-generator name="flow_velocity_longitudinal_section">org.dive4elements.river.exports.FlowVelocityGenerator</output-generator> + <output-generator name="flow_velocity">org.dive4elements.river.exports.FlowVelocityGenerator</output-generator> <output-generator name="flow_velocity_chartinfo">org.dive4elements.river.exports.FlowVelocityInfoGenerator</output-generator> <output-generator name="flow_velocity_export">org.dive4elements.river.exports.FlowVelocityExporter</output-generator> - <output-generator name="bedheight_middle_longitudinal_section">org.dive4elements.river.exports.MiddleBedHeightGenerator</output-generator> + <output-generator name="bedheight_middle">org.dive4elements.river.exports.MiddleBedHeightGenerator</output-generator> <output-generator name="bedheight_middle_chartinfo">org.dive4elements.river.exports.MiddleBedHeightInfoGenerator</output-generator> <output-generator name="bedheight_middle_export">org.dive4elements.river.exports.MiddleBedHeightExporter</output-generator> <output-generator name="bed_longitudinal_section">org.dive4elements.river.exports.minfo.BedQualityGenerator</output-generator> <output-generator name="bed_longitudinal_section_chartinfo">org.dive4elements.river.exports.minfo.BedQualityInfoGenerator</output-generator> <output-generator name="bed_quality_export">org.dive4elements.river.exports.minfo.BedQualityExporter</output-generator> - <output-generator name="bed_difference_year_longitudinal_section">org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator</output-generator> + <output-generator name="bed_difference_year">org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator</output-generator> <output-generator name="bed_difference_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator</output-generator> - <output-generator name="bed_difference_epoch_longitudinal_section">org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator</output-generator> + <output-generator name="bed_difference_epoch">org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator</output-generator> <output-generator name="bed_difference_epoch_chartinfo">org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator</output-generator> - <output-generator name="bed_difference_height_year_longitudinal_section">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator> + <output-generator name="bed_difference_height_year">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator> <output-generator name="bed_difference_height_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator</output-generator> <output-generator name="bedheight_difference_export">org.dive4elements.river.exports.minfo.BedDifferenceExporter</output-generator> <output-generator name="sq_relation_a">org.dive4elements.river.exports.sq.SQRelationGeneratorA</output-generator> @@ -362,7 +362,7 @@ <output-generator name="fix_waterlevel_export">org.dive4elements.river.exports.WaterlevelExporter</output-generator> <output-generator name="fix_vollmer_wq_curve">org.dive4elements.river.exports.fixings.FixWQCurveGenerator</output-generator> <output-generator name="fix_vollmer_wq_curve_chartinfo">org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator</output-generator> - <output-generator name="sedimentload_longitudinal_section">org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator</output-generator> + <output-generator name="sedimentload_ls">org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator</output-generator> <output-generator name="sedimentload_ls_chartinfo">org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator</output-generator> <!-- Error report generators. --> <output-generator name="discharge_longitudinal_section_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
--- a/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Sat Jun 29 00:06:35 2013 +0200 @@ -45,7 +45,10 @@ </dc:comment> <dc:iterate var="out" container="artifact-outs"> <dc:choose> - <dc:when test="dc:contains($out, 'longitudinal_section')"> + <dc:when test="$out = 'w_differences'"> + <dc:call-macro name="annotations"/> + </dc:when> + <dc:when test="$out = 'discharge_longitudinal_section'"> <dc:call-macro name="annotations"/> <dc:call-macro name="officiallines_user"/> </dc:when> @@ -105,6 +108,9 @@ <dc:call-macro name="bed-heights-epoch"/> </bedheights> </dc:when> + <dc:when test="$out = 'sedimentload_ls'"> + <dc:call-macro name="annotations"/> + </dc:when> </dc:choose> </dc:iterate> </dc:when> @@ -127,7 +133,7 @@ <dc:when test="$out = 'longitudinal_section'"> <dc:call-macro name="longitudinal-section-prototype"/> </dc:when> - <dc:when test="$out = 'w_differences_longitudinal_section'"> + <dc:when test="$out = 'w_differences'"> <dc:call-macro name="longitudinal-section-prototype"/> </dc:when> <dc:when test="$out = 'discharge_longitudinal_section'"> @@ -166,18 +172,18 @@ <dc:when test="$out = 'map'"> <dc:call-macro name="flood-map-complete"/> </dc:when> - <dc:when test="$out = 'flow_velocity_longitudinal_section'"> + <dc:when test="$out = 'flow_velocity'"> <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="flow_velocity_measurements"/> </dc:when> <dc:when test="$out = 'bed_longitudinal_section'"> <dc:call-macro name="annotations_per_type"/> </dc:when> - <dc:when test="$out = 'sedimentload_longitudinal_section'"> + <dc:when test="$out = 'sedimentload_ls'"> <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bedheight_middle_longitudinal_section'"> + <dc:when test="$out = 'bedheight_middle'"> <dc:call-macro name="sounding-width"/> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> @@ -185,7 +191,7 @@ <dc:call-macro name="basedata_3_officials"/> <dc:call-macro name="annotations_per_type"/> </dc:when> - <dc:when test="$out = 'bed_difference_height_year_longitudinal_section'"> + <dc:when test="$out = 'bed_difference_height_year'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -194,7 +200,7 @@ <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bed_difference_year_longitudinal_section'"> + <dc:when test="$out = 'bed_difference_year'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -203,7 +209,7 @@ <dc:call-macro name="annotations_per_type"/> <dc:call-macro name="morph_width"/> </dc:when> - <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'"> + <dc:when test="$out = 'bed_difference_epoch'"> <dc:call-macro name="basedata_0"/> <dc:call-macro name="basedata_1_additionals"/> <dc:call-macro name="basedata_2_fixations"/> @@ -310,7 +316,7 @@ <dc:call-macro name="longitudinal"/> <dc:call-macro name="differences"/> </dc:when> - <dc:when test="$out = 'w_differences_longitudinal_section'"> + <dc:when test="$out = 'w_differences'"> <dc:call-macro name="longitudinal"/> <dc:call-macro name="differences"/> </dc:when> @@ -350,14 +356,14 @@ <dc:when test="$out = 'map'"> <dc:call-macro name="flood-map"/> </dc:when> - <dc:when test="$out = 'bedheight_middle_longitudinal_section'"> + <dc:when test="$out = 'bedheight_middle'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="waterlevels-fix"/> </dc:when> <dc:when test="$out = 'floodmap-hws'"> <dc:call-macro name="floodmap-hws-user"/> </dc:when> - <dc:when test="$out = 'flow_velocity_longitudinal_section'"> + <dc:when test="$out = 'flow_velocity'"> <dc:call-macro name="bedquality-bed"/> <dc:call-macro name="bedquality-load"/> </dc:when> @@ -367,20 +373,20 @@ <dc:call-macro name="bedquality-density"/> <dc:call-macro name="bedquality-porosity"/> </dc:when> - <dc:when test="$out = 'sedimentload_longitudinal_section'"> + <dc:when test="$out = 'sedimentload_ls'"> <dc:call-macro name="differences"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="flow-velocity"/> <dc:call-macro name="sediment-load"/> </dc:when> - <dc:when test="$out = 'bed_difference_year_longitudinal_section'"> + <dc:when test="$out = 'bed_difference_year'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="differences"/> <dc:call-macro name="waterlevels-fix"/> <dc:call-macro name="delta-wt-ls"/> </dc:when> - <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'"> + <dc:when test="$out = 'bed_difference_epoch'"> <dc:call-macro name="waterlevels-discharge"/> <dc:call-macro name="bedheight-differences"/> <dc:call-macro name="differences"/> @@ -408,7 +414,7 @@ factory="winfo" target_out="{$out}" artifact-id="{$aid}" ids="{$aid}" - out="w_differences_longitudinal_section"/> + out="w_differences"/> </dc:for-each> </differences> </dc:if> @@ -822,7 +828,7 @@ </dc:macro> <dc:macro name="flow-velocity"> - <dc:filter expr="$out_name = 'flow_velocity_longitudinal_section' and + <dc:filter expr="$out_name = 'flow_velocity' and ($facet_name = 'flow_velocity.totalchannel' or $facet_name = 'flow_velocity.mainchannel' or $facet_name = 'flow_velocity.totalchannel.filtered' or @@ -838,7 +844,7 @@ <dc:attribute name="description" value="${facet_description}"/> <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="out" value="flow_velocity_longitudinal_section"/> + <dc:attribute name="out" value="flow_velocity"/> </dc:element> </dc:for-each> </flow> @@ -849,7 +855,7 @@ </dc:macro> <dc:macro name="sediment-load"> - <dc:filter expr="$out_name = 'sedimentload_longitudinal_section' and starts-with($facet_name, 'sedimentload')"> + <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')"> <dc:if test="dc:has-result()"> <sediment-load> <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:m:s', $a_creation), ' ', $collection_name)"> @@ -861,7 +867,7 @@ <dc:attribute name="description" value="${facet_description}"/> <dc:attribute name="ids" value="${facet_num}-${facet_name}"/> <dc:attribute name="artifact-id" value="${a_id}"/> - <dc:attribute name="out" value="sedimentload_longitudinal_section"/> + <dc:attribute name="out" value="sedimentload_ls"/> </dc:element> </dc:for-each> </load> @@ -872,7 +878,7 @@ </dc:macro> <dc:macro name="bedheight-differences"> - <dc:filter expr="($out_name = 'bed_difference_year_longitudinal_section' or $out_name = 'bed_difference_epoch_longitudinal_section') and + <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))"> <dc:if test="dc:has-result()"> <bedheight-differences>
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Fri Jun 28 21:08:23 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Sat Jun 29 00:06:35 2013 +0200 @@ -404,7 +404,7 @@ String year(); - String sedimentload_longitudinal_section(); + String sedimentload_ls(); // Gauges @@ -486,8 +486,6 @@ String w_differences(); - String w_differences_longitudinal_section(); - String historical_discharge(); String historical_discharge_wq(); @@ -564,11 +562,11 @@ String discharge(); - String flow_velocity_longitudinal_section(); + String flow_velocity(); String flow_velocity_export(); - String bedheight_middle_longitudinal_section(); + String bedheight_middle(); String bedheight_middle_export(); @@ -600,11 +598,11 @@ String soundings_width(); - String bed_difference_year_longitudinal_section(); + String bed_difference_year(); - String bed_difference_epoch_longitudinal_section(); + String bed_difference_epoch(); - String bed_difference_height_year_longitudinal_section(); + String bed_difference_height_year(); String bedheight_difference_export();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Fri Jun 28 21:08:23 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Sat Jun 29 00:06:35 2013 +0200 @@ -87,7 +87,7 @@ end_year = End period = Period year = Year -sedimentload_longitudinal_section = Sediment Load +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 @@ -224,9 +224,9 @@ floodmap = Floodmap historical_discharge = Time-Chart historical_discharge_wq = W/Q-Chart -flow_velocity_longitudinal_section = Flow Velocity +flow_velocity = Flow Velocity flow_velocity_export = Flow Velocity Export -bedheight_middle_longitudinal_section = Middle Bed Height +bedheight_middle = Middle Bed Height bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export @@ -240,7 +240,6 @@ cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences -w_differences_longitudinal_section = Differences w_differences_export = Differences Export reference_curve_export = Reference Curve Export historical_discharge_export = Historical Discharge Curve Export @@ -256,9 +255,9 @@ bed_diameter = Bed Diameter soundings = Soundings soundings_width = Soundings Width -bed_difference_year_longitudinal_section = Bedheight Differences -bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences -bed_difference_height_year_longitudinal_section = Bedheight Differences per year +bed_difference_year = Bedheight Differences +bed_difference_epoch = Epoch Bedheight Differences +bed_difference_height_year = Bedheight Differences per year bedheight_difference_export = Bedheight Differences Export exportATTooltip = Export as AT file
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Fri Jun 28 21:08:23 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Sat Jun 29 00:06:35 2013 +0200 @@ -87,7 +87,7 @@ end_year = Ende period = Zeitraum year = Jahr -sedimentload_longitudinal_section = Sediment Fracht +sedimentload_ls = Sediment Fracht welcome = Willkommen bei der Flusshydrologischen Software welcome_open_or_create = Bitte \u00f6ffnen Sie ein bestehendes Projekt aus der Projektliste oder erstellen Sie ein @@ -224,9 +224,9 @@ floodmap = \u00dcberschwemmungsfl\u00e4che historical_discharge = Zeit-Diagramm historical_discharge_wq = W/Q-Diagramm -flow_velocity_longitudinal_section = Flie\u00dfgeschwindigkeiten +flow_velocity = Flie\u00dfgeschwindigkeiten flow_velocity_export = Flie\u00dfgeschwindigkeiten Export -bedheight_middle_longitudinal_section = Mittlere Sohlh\u00f6he +bedheight_middle = Mittlere Sohlh\u00f6he bedheight_middle_export = Mittlere Sohlh\u00f6he Export bed_longitudinal_section = Sohlbeschaffenheit bed_longitudinal_section_export = Sohlbeschaffenheit Export @@ -240,7 +240,6 @@ cross_section = Querprofil cross_sections = Querprofile w_differences = Differenzen -w_differences_longitudinal_section = Differenzen w_differences_export = Differenzen Export reference_curve_export = Bezugslinien Export historical_discharge_export = Historische Abflusskurven Export @@ -256,9 +255,9 @@ bed_diameter = Sohldurchmesser soundings = Peilungen soundings_width = Gepeilte Breite -bed_difference_year_longitudinal_section = Sohlh\u00f6hendifferenz -bed_difference_epoch_longitudinal_section = Sohlh\u00f6hendifferenz (Epoche) -bed_difference_height_year_longitudinal_section = Sohlh\u00f6hendifferenz pro Jahr +bed_difference_year = Sohlh\u00f6hendifferenz +bed_difference_epoch = Sohlh\u00f6hendifferenz (Epoche) +bed_difference_height_year = Sohlh\u00f6hendifferenz pro Jahr bedheight_difference_export = Sohlh\u00f6hendifferenz Export waterlevel_export = Wasserstand/Wasserspiegellagen Export
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Fri Jun 28 21:08:23 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Sat Jun 29 00:06:35 2013 +0200 @@ -87,7 +87,7 @@ end_year = end period = Period year = Year -sedimentload_longitudinal_section = Sediment Load +sedimentload_ls = Sediment Load welcome = Welcome to Flusshydrologische Software welcome_open_or_create = Please open a project from the project list or create a @@ -222,9 +222,9 @@ floodmap = Floodmap historical_discharge = Time Chart historical_discharge_wq = W/Q Chart -flow_velocity_longitudinal_section = Flow Velocity +flow_velocity = Flow Velocity flow_velocity_export = Flow Velocity Export -bedheight_middle_longitudinal_section = Middle Bed Height +bedheight_middle = Middle Bed Height bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export @@ -238,7 +238,6 @@ cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences -w_differences_longitudinal_section = Differences w_differences_export = Differences Export reference_curve_export = Reference Curve Export historical_discharge_export = Historical Discharge Curve Export @@ -254,9 +253,9 @@ bed_diameter = Bed Diameter soundings = Soundings soundings_width = Soundings Width -bed_difference_year_longitudinal_section = Bedheight Differences -bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences -bed_difference_height_year_longitudinal_section = Bedheight Difference per year +bed_difference_year = Bedheight Differences +bed_difference_epoch = Epoch Bedheight Differences +bed_difference_height_year = Bedheight Difference per year bedheight_difference_export = Bedheight Differences Export exportATTooltip = Export as AT file