# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1320407100 0
# Node ID 4bb2736ee9bb16dcf89f713e9622f000e4a6cc76
# Parent  a09b7ff5c630a15ae95673424dd63e3bcfa61f8b
Tagged flys-client as 'pre2.6-2011-11-04'

flys-client/tags/pre2.6-2011-11-04@3165 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r a09b7ff5c630 -r 4bb2736ee9bb flys-client/ChangeLog
--- a/flys-client/ChangeLog	Fri Nov 04 09:17:05 2011 +0000
+++ b/flys-client/ChangeLog	Fri Nov 04 11:45:00 2011 +0000
@@ -1,3 +1,12 @@
+2011-11-04  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants.properties:
+	  Bugfix: Added a missing string that prevented packaging the client.
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties:
+	  Synced with FLYSConstants.properties.
+
+
 2011-11-04	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Added translations for datacage-element- strings.
diff -r a09b7ff5c630 -r 4bb2736ee9bb 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	Fri Nov 04 09:17:05 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Fri Nov 04 11:45:00 2011 +0000
@@ -75,6 +75,7 @@
 unitLocation = km
 wrongFormat = Wrong format
 too_many_values = Only one value allowed
+
 description = Description
 from = From
 to = To
@@ -238,4 +239,5 @@
 heightmarks = Height Marks
 basedata = Basis-Daten
 fixations = Fixierungen
+additionals = Additional Longitudinal Section Curves
 differences = Differenzen
diff -r a09b7ff5c630 -r 4bb2736ee9bb 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	Fri Nov 04 09:17:05 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Fri Nov 04 11:45:00 2011 +0000
@@ -7,7 +7,7 @@
 open_project = Open Project
 delete_project = Delete Project
 rename_project = Rename Project
-clone_project = Copy Project
+clone_project = Clone Project
 copy_of = Copy
 manage_projects = Manage Projects
 favorite_tooltip = Permanently store?
@@ -69,13 +69,19 @@
 wgLabelStep = a
 wgUnitStep = m
 
+unitFromInM = From [m]:
+unitToInM = To [m]:
+unitDiffInM = Diff [m]:
 unitLocation = km
 wrongFormat = Wrong format
 too_many_values = Only one value allowed
+
 description = Description
 from = From
 to = To
 riverside = Riverside
+bottom_edge = Bottom edge
+top_edge = Top edge
 name = Name
 type = Type
 wq_value = Q/D
@@ -87,7 +93,7 @@
 calcTableTitle = Calculated Output
 helperPanelTitle = Input Support
 wqW = W at Gauge [cm]
-wqQ = Q [m³/s]
+wqQ = Q [m\u00b3/s]
 wqQGauge = Discharge at Gauge
 wqSingle = Single values
 wqRange = Range
@@ -135,7 +141,7 @@
 discharge_longitudinal_section_export = Discharge Longitudinal Section Export
 discharge_longitudinal_section_report = Discharge Longitudinal Section Report
 durationcurve_export = Duration Curve Export
-durationcurve_report = Duration Curve Bericht
+durationcurve_report = Duration Curve Report
 dataexport = Datenexport
 csv = CSV
 wst = WST
@@ -171,9 +177,9 @@
 error_create_collection = Error while creating a new collection.
 error_describe_collection = Error while fetching the projects state.
 error_no_rivers_found = Error while reading supported rivers.
-error_same_waterlevels_in_pair = Error - minuend and subtrahend have to differ.
 error_no_such_user = Error - no such user found.
 error_no_waterlevel_pair_selected = Error - no waterlevel pair for building differences selected.
+error_same_waterlevels_in_pair = Error - minuend and subtrahend have to differ.
 error_not_logged_in = You need to log in before you are allowed to start your work.
 error_load_parameterization = Could not load the parameterization.
 
@@ -228,9 +234,10 @@
 zoomToLayer = Layer-Zoom
 
 # data cage
-old_calculations = Former calculations
-datacageAdd = Add data
-heightmarks = Heightmarks
-basedata = Base Data
-fixations = Fixations
-differences = Differences
+old_calculations = Fr\u00fchere Berechnungen
+datacageAdd = Daten laden
+heightmarks = Height Marks
+basedata = Basis-Daten
+fixations = Fixierungen
+additionals = Additional Longitudinal Section Curves
+differences = Differenzen