diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
index 3595d148d97..81e1c1aa238 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/place/start/DesktopStartView.java
@@ -32,6 +32,7 @@ import com.sap.sailing.gwt.autoplay.client.place.player.AutoPlayerConfiguration;
 import com.sap.sailing.gwt.autoplay.client.shared.header.SAPHeader;
 import com.sap.sailing.gwt.common.client.SharedResources;
 import com.sap.sailing.gwt.ui.client.StringMessages;
+import com.sap.sailing.gwt.common.client.i18n.TextMessages;
 import com.sap.sailing.gwt.ui.client.shared.charts.AbstractCompetitorRaceChart;
 import com.sap.sailing.gwt.ui.client.shared.charts.ChartSettings;
 import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorRaceChartSettings;
@@ -89,7 +90,7 @@ public class DesktopStartView extends Composite implements StartView {
         this.eventBus = eventBus;
         this.events = new ArrayList<EventDTO>();
         
-        sapHeader = new SAPHeader("Auto player configuration", false);
+        sapHeader = new SAPHeader(TextMessages.INSTANCE.autoPlayerConfiguration(), false);
         eventSelectionBox = new ListBox();
         eventSelectionBox.setMultipleSelect(false);
         leaderboardSelectionBox = new ListBox();
@@ -102,16 +103,16 @@ public class DesktopStartView extends Composite implements StartView {
         LocaleInfo currentLocale = LocaleInfo.getCurrentLocale();
         int i = 0;
         for (String localeName : LocaleInfo.getAvailableLocaleNames()) {
-            if(!localeName.equals("default")) {
+            if (!localeName.equals("default")) {
                 String displayName = LocaleInfo.getLocaleNativeDisplayName(localeName);
                 localeSelectionBox.addItem(displayName);
-                if(currentLocale.getLocaleName().equals(localeName)) {
+                if (currentLocale.getLocaleName().equals(localeName)) {
                     localeSelectionBox.setSelectedIndex(i);
                 }
                 i++;
             }
-         }
-        
+        }
+
         initWidget(uiBinder.createAndBindUi(this));
         this.ensureDebugId("AutoPlayStartView");
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java
index 52ebec1c989..c4c2c4e258b 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.java
@@ -209,6 +209,7 @@ public interface TextMessages extends Messages {
     String solutionsTrainingText();
     String solutionsSimulatorText();
     String sapSailingAnalytics();
+    String autoPlayerConfiguration();
     String contentSapSailingAnalytics1();
     String contentSapSailingAnalytics2();
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
index deb9bb5855e..863307a284d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
@@ -200,6 +200,7 @@ solutionsPostText=Access to data collected at sailing events gives sailors the o
 solutionsTrainingText=The STG Training Diary supports the daily documentation and analysis of an athlete\u2019s physical condition and training efforts in the areas of water training, physical training, boat work, mental, theory as well as other activities like education or travel.
 solutionsSimulatorText=Choosing the right strategy can provide great competitive advantage during a race. The Strategy Simulator simplifies determining the best sailing strategy for various wind conditions and water currents. Since wind and current can be changed in the simulation right away, the robustness of a strategy can be easily evaluated even for uncertain weather conditions.
 
+autoPlayerConfiguration=Auto Player Configuration
 
 sapSailingAnalytics=SAP Sailing Analytics
 contentSapSailingAnalytics1=By delivering real time analytics around race rankings, speeds, maneuvers, bearings etc., SAP is helping to simplify and demystify the complex sport of sailing.
@@ -220,4 +221,4 @@ i18nDeSolutionsTrainingText=The STG Training Diary supports the daily documentat
 strategySimulator=Strategy Simulator
 contentStrategySimulator=Choosing the right strategy can provide great competitive advantage during a race. The Strategy Simulator simplifies determining the best sailing strategy for various wind conditions and water currents. Since wind and current can be changed in the simulation right away, the robustness of a strategy can be easily evaluated even for uncertain weather conditions.
 
-strategySimulatorReadMore=Learn More
+strategySimulatorReadMore=Learn More
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
index 65b4c391adf..5d719b6e198 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
@@ -189,6 +189,7 @@ contentSapInSailing6=Offizieller Technologiepartner der Travemünder Woche
 contentSapInSailing7=Technischer Partner der Europäischen Segelligen
 contentSapInSailing8=Titelsponsor des SAP Extreme Sailing Teams
 contentSapInSailing9=Offizieller technischer Partner der Extreme Sailing Series
+autoPlayerConfiguration=Auto Player Konfiguration
 contentSapInSailing10=Premium-Partner der deutschen Segel-Nationalmannschaft Audi Sailing Team Germany
 contentSapInSailing11=Premium-Partner der Kieler Woche, der größten Regatta der Welt
 contentSapInSailing12=Titelsponsor der SAP 5O5 World Championships
@@ -220,4 +221,4 @@ i18nDeSolutionsTrainingText=Das STG Trainingstagebuch unterstützt die tägliche
 strategySimulator=Strategie-Simulator
 contentStrategySimulator=Während eines Rennens hängt viel von der Wahl der richtigen Strategie ab. Der Strategie-Simulator vereinfacht die Ermittlung der besten Segelstrategie für diverse Wind- und Strömungsbedingungen. Da Wind und Strömung sofort in der Simulation geändert werden können, lässt sich die Robustheit einer Strategie selbst für unsichere Wetterbedingungen problemlos bewerten.
 
-strategySimulatorReadMore=Mehr erfahren
+strategySimulatorReadMore=Mehr erfahren
\ No newline at end of file