[PATCH] i18n cleanup

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1413566020 -7200
# Node ID e54641c44d6dde8821640360b059f40862dc6d91
# Parent  f1bc081210ea6d829a7dd955e95b11c4953d787a
i18n cleanup.

diff -r f1bc081210ea -r e54641c44d6d artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Fri Oct 17 18:20:33 2014 +0200
+++ b/artifacts/src/main/resources/messages.properties	Fri Oct 17 19:13:40 2014 +0200
@@ -181,7 +181,8 @@
 chart.duration.curve.title = Duration Curve
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Duration of Non-Exceedence [Days]
-chart.duration.curve.yaxis.label = W [NN + m]
+chart.duration.curve.yaxis.label.w = W [{0}]
+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
@@ -442,7 +443,7 @@
 export.sedimentload.csv.header.suspended_sediment = Suspended sediment [{0}]
 export.sedimentload.csv.header.total = Total load [{0}]
 export.sedimentload.csv.header.bed_load = Bed load [{0}]
-export.sedimentload.csv.header.suspended_load = Suspended load [{0}]
+export.sedimentload.csv.header.bed_load_susp_sand = Bed building load [{0}]
 
 export.sqrelation.csv.info.coeff.a = a: coefficient of transport curve
 export.sqrelation.csv.info.coeff.b = b: exponent of transport curve
@@ -490,8 +491,6 @@
 export.minfo.beddifference.pdf.file = /jasper/beddifference_en.jasper
 export.minfo.beddifference.pdf.title = Bedheight Difference
 export.minfo.beddifference.pdf.mode = Bedheight Difference
-export.minfo.beddifference.morph1 = Morph. active width minuend [m]
-export.minfo.beddifference.morph2 = Morph. active width subtrahend [m]
 export.minfo.beddifference.sounding1 = Sounding width minuend [m]
 export.minfo.beddifference.sounding2 = Sounding width subtrahend [m]
 export.minfo.beddifference.gap1 = Data gap minuend [%]
diff -r f1bc081210ea -r e54641c44d6d artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Fri Oct 17 18:20:33 2014 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Fri Oct 17 19:13:40 2014 +0200
@@ -181,7 +181,8 @@
 chart.duration.curve.title = Dauerlinie
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Unterschreitungsdauer [Tage]
-chart.duration.curve.yaxis.label = W [NN + m]
+chart.duration.curve.yaxis.label.w = W [{0}]
+chart.duration.curve.yaxis.label.q = Q [m\u00b3/s]
 chart.duration.curve.curve.w = Wasserstandsdauerline f\u00fcr {0} (km:{1})
 chart.duration.curve.curve.q = Abflussdauerline f\u00fcr {0} (km:{1})
 chart.historical.discharge.title = Historische Abflusskurven
@@ -492,8 +493,6 @@
 export.minfo.beddifference.pdf.file = /jasper/beddifference.jasper
 export.minfo.beddifference.pdf.title = Sohlh\u00f6hendifferenz
 export.minfo.beddifference.pdf.mode = Sohlh\u00f6hendifferenz
-export.minfo.beddifference.morph1 = Morph. aktive Breite Minuend [m]
-export.minfo.beddifference.morph2 = Morph. aktive Breite Subtrahend [m]
 export.minfo.beddifference.sounding1 = gepeilte Breite Minuend [m]
 export.minfo.beddifference.sounding2 = gepeilte Breite Subtrahend [m]
 export.minfo.beddifference.gap1 = Datenl\u00fccke Minuend [%]
diff -r f1bc081210ea -r e54641c44d6d artifacts/src/main/resources/messages_de_DE.properties
--- a/artifacts/src/main/resources/messages_de_DE.properties	Fri Oct 17 18:20:33 2014 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Fri Oct 17 19:13:40 2014 +0200
@@ -489,8 +489,6 @@
 export.minfo.beddifference.pdf.file = /jasper/beddifference.jasper
 export.minfo.beddifference.pdf.title = Sohlh\u00f6hendifferenz
 export.minfo.beddifference.pdf.mode = Sohlh\u00f6hendifferenz
-export.minfo.beddifference.morph1 = Morph. aktive Breite Minuend [m]
-export.minfo.beddifference.morph2 = Morph. aktive Breite Subtrahend [m]
 export.minfo.beddifference.sounding1 = gepeilte Breite Minuend [m]
 export.minfo.beddifference.sounding2 = gepeilte Breite Subtrahend [m]
 export.minfo.beddifference.gap1 = Datenl\u00fccke Minuend [%]
diff -r f1bc081210ea -r e54641c44d6d artifacts/src/main/resources/messages_en.properties
--- a/artifacts/src/main/resources/messages_en.properties	Fri Oct 17 18:20:33 2014 +0200
+++ b/artifacts/src/main/resources/messages_en.properties	Fri Oct 17 19:13:40 2014 +0200
@@ -180,7 +180,8 @@
 chart.duration.curve.title = Duration Curve
 chart.duration.curve.subtitle = {0}-km: {1,number,#.###}
 chart.duration.curve.xaxis.label = Duration of Non-Exceedence [Days]
-chart.duration.curve.yaxis.label = W [NN + m]
+chart.duration.curve.yaxis.label.w = W [{0}]
+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 for Gauge {0}
@@ -282,7 +283,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}
@@ -444,7 +445,7 @@
 export.sedimentload.csv.header.suspended_sediment = Suspended sediment [{0}]
 export.sedimentload.csv.header.total = Total load [{0}]
 export.sedimentload.csv.header.bed_load = Bed load [{0}]
-export.sedimentload.csv.header.suspended_load = Suspended load [{0}]
+export.sedimentload.csv.header.bed_load_susp_sand = Bed building load [{0}]
 
 export.sqrelation.csv.info.coeff.a = a: coefficient of transport curve
 export.sqrelation.csv.info.coeff.b = b: exponent of transport curve
@@ -492,8 +493,6 @@
 export.minfo.beddifference.pdf.file = /jasper/beddifference_en.jasper
 export.minfo.beddifference.pdf.title = Bedheight Difference
 export.minfo.beddifference.pdf.mode = Bedheight Difference
-export.minfo.beddifference.morph1 = Morph. active width minuend [m]
-export.minfo.beddifference.morph2 = Morph. active width subtrahend [m]
 export.minfo.beddifference.sounding1 = Sounding width minuend [m]
 export.minfo.beddifference.sounding2 = Sounding width subtrahend [m]
 export.minfo.beddifference.gap1 = Data gap minuend [%]