Removed some hardcoded text and renamed Lotsen to Flusslotsen

src/BreCalClient/Extensions.cs

@@ -27,7 +27,7 @@ namespace BreCalClient
             BSMD = 1,
             [Description("Terminal")]
             TERMINAL = 2,
-            [Description("Lotsen")]
+            [Description("Flusslotsen")]
             PILOT = 4,
             [Description("Agentur")]
             AGENCY = 8,

src/BreCalClient/MainWindow.xaml

@@ -3,12 +3,12 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BreCalClient"        
+        xmlns:local="clr-namespace:BreCalClient"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:sets="clr-namespace:BreCalClient.Properties"
         xmlns:p = "clr-namespace:BreCalClient.Resources"
         mc:Ignorable="d"
-        Title="{DynamicResource textApplicationTitle}" Height="{local:SettingBinding Height}" Width="{local:SettingBinding Width}" 
+        Title="{DynamicResource textApplicationTitle}" Height="{local:SettingBinding Height}" Width="{local:SettingBinding Width}"
         Top="{local:SettingBinding Top}" Left="{local:SettingBinding Left}" Loaded="Window_Loaded" Closing="Window_Closing" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
@@ -42,11 +42,11 @@
                 <Button Name="buttonLogin" Content="{x:Static p:Resources.textLogin}" Grid.Row="4" Grid.Column="0" Margin="2" Click="buttonLogin_Click" IsDefault="True" />
                 <Button Name="buttonExit" Content="{x:Static p:Resources.textExit}" Grid.Row="4" Grid.Column="1" Margin="2" Click="buttonExit_Click" />
                 <TextBlock FontSize="10" TextWrapping="Wrap" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" >
-                    <Underline>Hinweis</Underline>:<LineBreak /> 
+                    <Underline>Hinweis</Underline>:<LineBreak />
                     Mit der Anmeldung in Bremen Calling akzeptieren Sie die Bedingungen<LineBreak />
                     des Systems, die Sie in der aktuell gültigen Fassung unter dem nachfolgenden Link
                     einsehen können: <Hyperlink NavigateUri="https://www.bsmd-emswe.eu/disclaimer.html" RequestNavigate="Hyperlink_RequestNavigate">Datenschutzerklärung</Hyperlink>.
-                </TextBlock> 
+                </TextBlock>
             </Grid>
         </xctk:BusyIndicator.BusyContent>
         <Grid>
@@ -89,12 +89,12 @@
                     <ColumnDefinition Width=".15*" />
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="1" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Agent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="1" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textAgency}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Festmacher" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textMooring}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Hafenamt" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPortAuthority}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="4" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Lotsen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="4" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textPilots}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="5" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Schlepper" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="5" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTug}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
-                <Label Grid.Column="6" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="Terminal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
+                <Label Grid.Column="6" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" Foreground="White" Content="{x:Static p:Resources.textTerminal}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
                 <StackPanel x:Name="stackPanel"/>

src/BreCalClient/Resources/Resources.Designer.cs

@@ -900,6 +900,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pilot.
+        /// </summary>
+        public static string textPilots {
+            get {
+                return ResourceManager.GetString("textPilots", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Port.
         /// </summary>
@@ -909,6 +918,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Port authority.
+        /// </summary>
+        public static string textPortAuthority {
+            get {
+                return ResourceManager.GetString("textPortAuthority", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rain sensitive cargo.
         /// </summary>

src/BreCalClient/Resources/Resources.de.resx

@@ -269,7 +269,7 @@
     <value>Anlegeseite</value>
   </data>
   <data name="textPilot" xml:space="preserve">
-    <value>Lotse</value>
+    <value>Flusslotse</value>
   </data>
   <data name="textPilotRequired" xml:space="preserve">
     <value>Lotsorder</value>
@@ -496,4 +496,10 @@
   <data name="textShips" xml:space="preserve">
     <value>Schiffe</value>
   </data>
+  <data name="textPilots" xml:space="preserve">
+    <value>Flusslotsen</value>
+  </data>
+  <data name="textPortAuthority" xml:space="preserve">
+    <value>Hafenamt</value>
+  </data>
 </root>

src/BreCalClient/Resources/Resources.resx

@@ -388,9 +388,15 @@
   <data name="textPilotRequired" xml:space="preserve">
     <value>Pilot required</value>
   </data>
+  <data name="textPilots" xml:space="preserve">
+    <value>Pilot</value>
+  </data>
   <data name="textPort" xml:space="preserve">
     <value>Port</value>
   </data>
+  <data name="textPortAuthority" xml:space="preserve">
+    <value>Port authority</value>
+  </data>
   <data name="textRainSensitiveCargo" xml:space="preserve">
     <value>Rain sensitive cargo</value>
   </data>

src/brecal.model/Participant.cs

@@ -10,6 +10,7 @@ namespace brecal.model
     {
         #region Enumerations
 
+        // TODO: should localize the descriptions
         [Flags]
         public enum ParticipantType
         {
@@ -19,7 +20,7 @@ namespace brecal.model
             BSMD = 1,
             [Description("Terminal")]
             TERMINAL = 2,
-            [Description("Lotsen")]
+            [Description("Flusslotsen")]
             PILOT = 4,
             [Description("Agentur")]
             AGENCY = 8,