# HG changeset patch # User "Tom Gottfried " # Date 1408550052 -7200 # Node ID 9a8ddd37a1a78d5ad836f188ff250067e0f9af06 # Parent 84f42caeea2a57d61f4001a2e66808987fb3810f i18n for sediment loads. diff -r 84f42caeea2a -r 9a8ddd37a1a7 artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Wed Aug 20 17:47:58 2014 +0200 +++ b/artifacts/src/main/resources/messages.properties Wed Aug 20 17:54:12 2014 +0200 @@ -261,24 +261,28 @@ chart.sedimentload.ls.title = Sediment load chart.sedimentload.ls.xaxis.label = km chart.sedimentload.ls.yaxis.label.diff = [t/a] -facet.sedimentload.coarse = Coarse gravel -facet.sedimentload.sand = Sand -facet.sedimentload.fine_middle = Fine/Mid. gravel -facet.sedimentload.susp_sand = Susp. Sand -facet.sedimentload.susp_sand_bed = Bed. part Susp.Sand -facet.sedimentload.susp_sediment = Sediment -facet.sedimentload.total = Total -facet.sedimentload.total_load = Total bed load -facet.sedimentload.ls.susp_sand_bed = Susp.Sand - {0} -facet.sedimentload.ls.total = Total - {0} -facet.sedimentload.ls.bed_load = TODO tom total bed load - {0} -facet.sedimentload.ls.fine_middle = Fine/Mid. gravel - {0} -facet.sedimentload.ls.sand = Sand - {0} -facet.sedimentload.ls.coarse = Coarse gravel - {0} -facet.sedimentload.ls.unknown = Unknown - {0} -facet.sedimentload.ls.susp_sand = Susp. Sand - {0} -facet.sedimentload.ls.suspended_sediment = Sediment - {0} -facet.sedimentload.ls.suspended_load = TODO Tom suspended load - {0} + +facet.sedimentload.ls.coarse = Coarse gravel - {0} [{1}] +facet.sedimentload.ls.fine_middle = Fine/Mid. gravel - {0} [{1}] +facet.sedimentload.ls.sand = Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand = Suspended sand - {0} [{1}] +facet.sedimentload.ls.susp_sand_bed = Bed. part suspended sand - {0} [{1}] +facet.sedimentload.ls.suspended_sediment = Suspended sediment - {0} [{1}] +facet.sedimentload.ls.total = Total load - {0} [{1}] +facet.sedimentload.ls.bed_load = Bed load - {0} [{1}] +facet.sedimentload.ls.suspended_load = Suspended load - {0} [{1}] +facet.sedimentload.ls.unknown = Unknown - {0} [{1}] + +facet.sedimentload.coarse = Coarse gravel{0} [t/a] +facet.sedimentload.fine_middle = Fine/Mid. gravel{0} [t/a] +facet.sedimentload.sand = Sand{0} [t/a] +facet.sedimentload.susp_sand = Suspended sand{0} [t/a] +facet.sedimentload.susp_sand_bed = Bed. part suspended sand{0} [t/a] +facet.sedimentload.suspended_sediment = Suspended sediment{0} [t/a] +facet.sedimentload.total = Total load{0} [t/a] +facet.sedimentload.bed_load = Bed load{0} [t/a] +facet.sedimentload.suspended_load = Suspended load{0} [t/a] + missing.fraction.coarse = Year {0}: Missing coarse fraction missing.fraction.fine_middle = Year {0}: Missing fine/middle fraction missing.fraction.sand = Year {0}: Missing sand fraction diff -r 84f42caeea2a -r 9a8ddd37a1a7 artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Wed Aug 20 17:47:58 2014 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Wed Aug 20 17:54:12 2014 +0200 @@ -250,6 +250,7 @@ facet.sq_relation.outlier.measurement = Geschiebedaten Durchgang {0} sedimentdensity = Sedimentdichte + coarse = Grober Kies sand = Sand fine_middle = Feine/Mittl. Kies @@ -261,24 +262,28 @@ chart.sedimentload.ls.title = Sedimentfracht chart.sedimentload.ls.xaxis.label = km chart.sedimentload.ls.yaxis.label.diff = [t/a] -facet.sedimentload.ls.susp_sand_bed = Bettbild. Anteil Susp.Sand - {0} -facet.sedimentload.ls.total = Gesamt - {0} -facet.sedimentload.ls.bed_load = TODO Tom Bettladung - {0} -facet.sedimentload.ls.fine_middle = Fein/Mittlerer Kies - {0} -facet.sedimentload.ls.sand = Sand - {0} -facet.sedimentload.ls.coarse = Grober Kies - {0} -facet.sedimentload.ls.unknown = Unbekannt - {0} -facet.sedimentload.ls.susp_sand = Susp. Sand - {0} -facet.sedimentload.ls.suspended_sediment = Schwebstoff - {0} -facet.sedimentload.ls.suspended_load = TODO Tom Schwebladung - {0} -facet.sedimentload.coarse = Grober Kies -facet.sedimentload.sand = Sand -facet.sedimentload.fine_middle = Fein/Mittlerer Kies -facet.sedimentload.susp_sand = Susp. Sand -facet.sedimentload.susp_sand_bed = Bettbild. Anteil Susp.Sand -facet.sedimentload.susp_sediment = Schwebstoff -facet.sedimentload.total = Gesamt -facet.sedimentload.total_load = Gesamt Geschiebe + +facet.sedimentload.ls.coarse = Grober Kies/Steine - {0} [{1}] +facet.sedimentload.ls.fine_middle = Fein/Mittlerer Kies - {0} [{1}] +facet.sedimentload.ls.sand = Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand = suspendierter Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand_bed = bettbildender Anteil suspendierter Sand - {0} [{1}] +facet.sedimentload.ls.suspended_sediment = Schwebstoff - {0} [{1}] +facet.sedimentload.ls.total = Gesamtfracht - {0} [{1}] +facet.sedimentload.ls.bed_load = Geschiebefracht - {0} [{1}] +facet.sedimentload.ls.suspended_load = Suspensionsfracht - {0} [{1}] +facet.sedimentload.ls.unknown = Unbekannt - {0} [{1}] + +facet.sedimentload.coarse = Grober Kies/Steine{0} [t/a] +facet.sedimentload.fine_middle = Fein/Mittlerer Kies{0} [t/a] +facet.sedimentload.sand = Sand{0} [t/a] +facet.sedimentload.susp_sand = suspendierter Sand{0} [t/a] +facet.sedimentload.susp_sand_bed = bettbildender Anteil suspendierter Sand{0} [t/a] +facet.sedimentload.suspended_sediment = Schwebstoff{0} [t/a] +facet.sedimentload.total = Gesamtfracht{0} [t/a] +facet.sedimentload.bed_load = Geschiebefracht{0} [t/a] +facet.sedimentload.suspended_load = Suspensionsfracht{0} [t/a] + missing.fraction.coarse = Jahr {0}: Fehlende Fraktion: grober Kies missing.fraction.fine_middle = Jahr {0}: Fehlende Fraktion: fein/mittlerer Kies missing.fraction.sand = Jahr {0}: Fehlende Fraktion: Sand diff -r 84f42caeea2a -r 9a8ddd37a1a7 artifacts/src/main/resources/messages_de_DE.properties --- a/artifacts/src/main/resources/messages_de_DE.properties Wed Aug 20 17:47:58 2014 +0200 +++ b/artifacts/src/main/resources/messages_de_DE.properties Wed Aug 20 17:54:12 2014 +0200 @@ -259,24 +259,28 @@ chart.sedimentload.ls.title = Sedimentfracht chart.sedimentload.ls.xaxis.label = km chart.sedimentload.ls.yaxis.label.diff = [t/a] -facet.sedimentload.coarse = Grober Kies -facet.sedimentload.sand = Sand -facet.sedimentload.fine_middle = Fein/Mittlerer Kies -facet.sedimentload.susp_sand = Susp. Sand -facet.sedimentload.susp_sand_bed = Bettbild. Anteil Susp.Sand -facet.sedimentload.susp_sediment = Schwebstoff -facet.sedimentload.total = Gesamt -facet.sedimentload.total_load = Gesamt Geschiebe -facet.sedimentload.ls.susp_sand_bed = Bettbild. Anteil Susp.Sand - {0} -facet.sedimentload.ls.total = Gesamt - {0} -facet.sedimentload.ls.bed_load = TODO Tom Bettladung - {0} -facet.sedimentload.ls.fine_middle = Fein/Mittlerer Kies - {0} -facet.sedimentload.ls.sand = Sand - {0} -facet.sedimentload.ls.coarse = Grober Kies - {0} -facet.sedimentload.ls.unknown = Unbekannt - {0} -facet.sedimentload.ls.susp_sand = Susp. Sand - {0} -facet.sedimentload.ls.suspended_sediment = Schwebstoff - {0} -facet.sedimentload.ls.suspended_load = TODO Tom Schwebladung - {0} + +facet.sedimentload.ls.coarse = Grober Kies/Steine - {0} [{1}] +facet.sedimentload.ls.fine_middle = Fein/Mittlerer Kies - {0} [{1}] +facet.sedimentload.ls.sand = Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand = suspendierter Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand_bed = bettbildender Anteil suspendierter Sand - {0} [{1}] +facet.sedimentload.ls.suspended_sediment = Schwebstoff - {0} [{1}] +facet.sedimentload.ls.total = Gesamtfracht (Berechnung BfG) - {0} [{1}] +facet.sedimentload.ls.bed_load = Geschiebefracht (Berechnung BfG) - {0} [{1}] +facet.sedimentload.ls.suspended_load = Suspensionsfracht (Berechnung BfG) - {0} [{1}] +facet.sedimentload.ls.unknown = Unbekannt - {0} [{1}] + +facet.sedimentload.coarse = Grober Kies/Steine{0} [t/a] +facet.sedimentload.fine_middle = Fein/Mittlerer Kies{0} [t/a] +facet.sedimentload.sand = Sand{0} [t/a] +facet.sedimentload.susp_sand = suspendierter Sand{0} [t/a] +facet.sedimentload.susp_sand_bed = bettbildender Anteil suspendierter Sand{0} [t/a] +facet.sedimentload.suspended_sediment = Schwebstoff{0} [t/a] +facet.sedimentload.total = Gesamtfracht (Berechnung BfG){0} [t/a] +facet.sedimentload.bed_load = Geschiebefracht (Berechnung BfG){0} [t/a] +facet.sedimentload.suspended_load = Suspensionsfracht (Berechnung BfG){0} [t/a] + missing.fraction.coarse = Jahr {0}: Fehlende Fraktion: grober Kies missing.fraction.fine_middle = Jahr {0}: Fehlende Fraktion: fein/mittlerer Kies missing.fraction.sand = Jahr {0}: Fehlende Fraktion: Sand diff -r 84f42caeea2a -r 9a8ddd37a1a7 artifacts/src/main/resources/messages_en.properties --- a/artifacts/src/main/resources/messages_en.properties Wed Aug 20 17:47:58 2014 +0200 +++ b/artifacts/src/main/resources/messages_en.properties Wed Aug 20 17:54:12 2014 +0200 @@ -263,24 +263,28 @@ chart.sedimentload.ls.title = Sediment load chart.sedimentload.ls.xaxis.label = km chart.sedimentload.ls.yaxis.label.diff = [t/a] -facet.sedimentload.coarse = Coarse gravel -facet.sedimentload.sand = Sand -facet.sedimentload.fine_middle = Fine/Mid. gravel -facet.sedimentload.susp_sand = Susp. Sand -facet.sedimentload.susp_sand_bed = Bed. part Susp.Sand -facet.sedimentload.susp_sediment = Sediement -facet.sedimentload.total = Total -facet.sedimentload.total_load = Total bed load -facet.sedimentload.ls.susp_sand_bed = Susp.Sand - {0} -facet.sedimentload.ls.total = Total - {0} -facet.sedimentload.ls.bed_load = TODO tom total bed load - {0} -facet.sedimentload.ls.fine_middle = Fine/Mid. gravel - {0} -facet.sedimentload.ls.sand = Sand - {0} -facet.sedimentload.ls.coarse = Coarse gravel - {0} -facet.sedimentload.ls.unknown = Unknown - {0} -facet.sedimentload.ls.susp_sand = Susp. Sand - {0} -facet.sedimentload.ls.suspended_sediment = Sediment - {0} -facet.sedimentload.ls.suspended_load = TODO Tom suspended load - {0} + +facet.sedimentload.ls.coarse = Coarse gravel - {0} [{1}] +facet.sedimentload.ls.fine_middle = Fine/Mid. gravel - {0} [{1}] +facet.sedimentload.ls.sand = Sand - {0} [{1}] +facet.sedimentload.ls.susp_sand = Suspended sand - {0} [{1}] +facet.sedimentload.ls.susp_sand_bed = Bed. part suspended sand - {0} [{1}] +facet.sedimentload.ls.suspended_sediment = Suspended sediment - {0} [{1}] +facet.sedimentload.ls.total = Total load - {0} [{1}] +facet.sedimentload.ls.bed_load = Bed load - {0} [{1}] +facet.sedimentload.ls.suspended_load = Suspended load - {0} [{1}] +facet.sedimentload.ls.unknown = Unknown - {0} [{1}] + +facet.sedimentload.coarse = Coarse gravel{0} [t/a] +facet.sedimentload.fine_middle = Fine/Mid. gravel{0} [t/a] +facet.sedimentload.sand = Sand{0} [t/a] +facet.sedimentload.susp_sand = Suspended sand{0} [t/a] +facet.sedimentload.susp_sand_bed = Bed. part suspended sand{0} [t/a] +facet.sedimentload.suspended_sediment = Suspended sediment{0} [t/a] +facet.sedimentload.total = Total load{0} [t/a] +facet.sedimentload.bed_load = Bed load{0} [t/a] +facet.sedimentload.suspended_load = Suspended load{0} [t/a] + missing.fraction.coarse = Year {0}: Missing coarse fraction missing.fraction.fine_middle = Year {0}: Missing fine/middle fraction missing.fraction.sand = Year {0}: Missing sand fraction diff -r 84f42caeea2a -r 9a8ddd37a1a7 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Wed Aug 20 17:47:58 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java Wed Aug 20 17:54:12 2014 +0200 @@ -968,7 +968,7 @@ String wlevel(); - String yields(); + String sedimentloads(); String sources_sinks(); diff -r 84f42caeea2a -r 9a8ddd37a1a7 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 Wed Aug 20 17:47:58 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Wed Aug 20 17:54:12 2014 +0200 @@ -529,12 +529,12 @@ sediment_load = Sedimentfracht sediment_load_ls = L\u00e4ngsschnitte measurement_stations = Messstellen -coarse = Geschiebe Grobkorn -fine_middle = Geschiebe Fein Mittel Kies -sand = Geschiebe Sand -susp_sand = Susp. Sand -susp_sand_bed = Bettb. Anteil susp. Sand -suspended_sediment = Susp. Sediment +coarse = Grober Kies/Steine +fine_middle = Fein/Mittlerer Kies +sand = Sand +susp_sand = suspendierter Sand +susp_sand_bed = bettbildender Anteil suspendierter Sand +suspended_sediment = Schwebstoff total = Gesamtfracht bed_load = Geschiebefracht suspended_load = Suspensionsfracht