Mercurial > dive4elements > river
changeset 4020:cc9b6f23eaf8
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 04 Oct 2012 09:58:36 +0200 |
| parents | e249bd8fe72e (diff) d8f8eaf85154 (current diff) |
| children | 7cc05da7e35c 017e3d8526e0 |
| files | |
| diffstat | 5 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Oct 02 18:12:04 2012 +0200 +++ b/flys-client/ChangeLog Thu Oct 04 09:58:36 2012 +0200 @@ -1,3 +1,11 @@ +2012-10-02 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * 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: + i18n for annotations. + 2012-10-01 Christian Lins <christian.lins@intevation.de> * flys-client/src/main/java/de/intevation/flys/client/client/ui/Toolbar.java,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Tue Oct 02 18:12:04 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Oct 04 09:58:36 2012 +0200 @@ -778,6 +778,8 @@ String annotation(); + String annotations(); + String additionals(); String differences();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Tue Oct 02 18:12:04 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Oct 04 09:58:36 2012 +0200 @@ -396,6 +396,7 @@ flood_protections = Flood Protections columns = Columns annotation = Annotations +annotations = Annotations additionals = Additional Longitudinal Section Curves differences = Differences kilometrage = Kilometrage
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Oct 02 18:12:04 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Oct 04 09:58:36 2012 +0200 @@ -395,6 +395,7 @@ flood_protections = HW-Schutzanlagen columns = Spalten annotation = Streckenfavoriten +annotation = Streckenfavoriten - Typen additionals = Zus\u00e4tzliche L\u00e4ngsschnitte differences = Differenzen kilometrage = Kilometrierung
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Tue Oct 02 18:12:04 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Oct 04 09:58:36 2012 +0200 @@ -396,6 +396,7 @@ flood_protections = Flood Protections columns = Columns annotation = Annotations +annotations = Annotations additionals = Additional Longitudinal Section Curves differences = Differences kilometrage = Kilometrage