# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1349337516 -7200
# Node ID cc9b6f23eaf846e7d24546cba9a011c5c6d25078
# Parent  e249bd8fe72e40001a71c43993bb612b1d5da637# Parent  d8f8eaf85154d45535f3371f1d1848a9bd10d415
Merged.

diff -r d8f8eaf85154 -r cc9b6f23eaf8 flys-client/ChangeLog
--- 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,
diff -r d8f8eaf85154 -r cc9b6f23eaf8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.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();
diff -r d8f8eaf85154 -r cc9b6f23eaf8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties
--- 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
diff -r d8f8eaf85154 -r cc9b6f23eaf8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties
--- 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
diff -r d8f8eaf85154 -r cc9b6f23eaf8 flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties
--- 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