# HG changeset patch # User Raimund Renkert # Date 1410949944 -7200 # Node ID 62b4f3ca99edeaa74512afad347c04a42efce15b # Parent 2c20907f8dd0494a96f17e11ad819401dabbe4f5# Parent a89ebe3f1739862856d56715e0b983bd301d1075 merged. diff -r 2c20907f8dd0 -r 62b4f3ca99ed 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 Wed Sep 17 12:32:01 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Wed Sep 17 12:32:24 2014 +0200 @@ -238,13 +238,16 @@ bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export -sq_relation_a = A Feinkornanteil -sq_relation_b = B Sand (Suspensionstransport) -sq_relation_c = C Sand (Geschiebetransport) -sq_relation_d = D Fein- und Mittelkies -sq_relation_e = E Grobkornanteil (> Mittelkies) -sq_relation_f = F Geschiebetransport Gesamt + +sq_relation_a = A Fine material +sq_relation_b = B Sand (suspended) +sq_relation_c = C Sand (bed load) +sq_relation_d = D Fine/middle +sq_relation_e = E Coarse +sq_relation_f = F Bed load total +sq_relation_g = G Bed load total (bed height-relevant) sq_relation_export = SQ Export + cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences diff -r 2c20907f8dd0 -r 62b4f3ca99ed 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 Sep 17 12:32:01 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Wed Sep 17 12:32:24 2014 +0200 @@ -239,6 +239,7 @@ bedheight_middle_export = Mittlere Sohlh\u00f6he Export bed_longitudinal_section = Sohlbeschaffenheit bed_longitudinal_section_export = Sohlbeschaffenheit Export + sq_relation_a = A Feinkornanteil sq_relation_b = B Sand (Suspensionstransport) sq_relation_c = C Sand (Geschiebetransport) @@ -247,6 +248,7 @@ sq_relation_f = F Geschiebetransport Gesamt sq_relation_g = G Geschiebetransport Gesamt (Sohlh\u00f6henrelevant) sq_relation_export = SQ Export + cross_section = Querprofil cross_sections = Querprofile w_differences = Differenzen diff -r 2c20907f8dd0 -r 62b4f3ca99ed 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 Wed Sep 17 12:32:01 2014 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Wed Sep 17 12:32:24 2014 +0200 @@ -238,14 +238,16 @@ bedheight_middle_export = Middle Bed Height Export bed_longitudinal_section = Bed Quality bed_longitudinal_section_export = Bed Quality Export -sq_relation_a = A Feinkornanteil -sq_relation_b = B Sand (Suspensionstransport) -sq_relation_c = C Sand (Geschiebetransport) -sq_relation_d = D Fein- und Mittelkies -sq_relation_e = E Grobkornanteil (> Mittelkies) -sq_relation_f = F Geschiebetransport Gesamt -sq_relation_g = G Geschiebetransport Gesamt (Sohlh\u00f6henrelevant) + +sq_relation_a = A Fine material +sq_relation_b = B Sand (suspended) +sq_relation_c = C Sand (bed load) +sq_relation_d = D Fine/middle +sq_relation_e = E Coarse +sq_relation_f = F Bed load total +sq_relation_g = G Bed load total (bed height-relevant) sq_relation_export = SQ Export + cross_section = Cross Section cross_sections = Cross Sections w_differences = Differences