Mercurial > dive4elements > river
changeset 2548:ada02bbd3b7f
Merged revisions 4541,4544 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-client/trunk
........
r4541 | ingo | 2012-05-28 18:25:36 +0200 (Mo, 28 Mai 2012) | 1 line
Added i18n string for floodmap datacage.
........
r4544 | teichmann | 2012-05-28 20:49:35 +0200 (Mo, 28 Mai 2012) | 1 line
Added i18n strings used by Delta W/t export of the fixing analysis.
........
flys-client/tags/2.7@4548 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 29 May 2012 05:08:18 +0000 |
| parents | 250dda4bed82 |
| children | 6310b1582f2d |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties |
| diffstat | 5 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Mon May 28 16:38:24 2012 +0000 +++ b/flys-client/ChangeLog Tue May 29 05:08:18 2012 +0000 @@ -1,3 +1,11 @@ +2012-05-28 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Added i18n strings used by Delta W/t export of the fixing analysis. + 2012-05-28 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, @@ -9,6 +17,14 @@ 2012-05-27 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Added more i18n strings used in the floodmap datacage. + +2012-05-27 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: Corrected image path to add_wms.png.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Mon May 28 16:38:24 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue May 29 05:08:18 2012 +0000 @@ -886,5 +886,7 @@ String editpoints(); String selection(); + + String fix_deltawt_export(); } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Mon May 28 16:38:24 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue May 29 05:08:18 2012 +0000 @@ -460,3 +460,5 @@ reference_curve_normalized = Reduced Reference Curve reference_startpoint = Point of reference reference_endpoint = Point(s) of projection + +fix_deltawt_export = \u0394 W/t
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Mon May 28 16:38:24 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue May 29 05:08:18 2012 +0000 @@ -461,3 +461,5 @@ reference_startpoint = Bezugsort/pegel reference_endpoint = Zielort/pegel +fix_deltawt_export = \u0394 W/t +
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Mon May 28 16:38:24 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue May 29 05:08:18 2012 +0000 @@ -462,3 +462,4 @@ reference_startpoint = Point of reference reference_endpoint = Point(s) of projection +fix_deltawt_export = \u0394 W/t