diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index b8a50da8c6b..eb8e8dd0295 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -635,4 +635,7 @@ public interface StringMessages extends Messages {
     String freemode();
     String whatIfCourse();
     /*End of simulator related messages*/
+    
+    String courseAreaOverview();
+    String courseDesignOverview();
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
index ddd1bf4341e..fd71f69be23 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
@@ -630,3 +630,5 @@ raceLabel=Race
 competitorLabel=Competitor
 freemode=Keep Bearings
 whatIfCourse=What-If Course
+courseAreaOverview=Area overview
+courseDesignOverview=Course design overview
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
index dcd3cfd9014..8e2037112a4 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
@@ -628,4 +628,6 @@ legLabel=Leg
 raceLabel=Race
 competitorLabel=Competitor
 freemode=Winkel erhalten
-whatIfCourse=What-If Course
+whatIfCourse=What-If Course
+courseAreaOverview=Rennbahnübersicht
+courseDesignOverview=Kursübersicht
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java
index 129efcf5c89..54590396fe2 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewPanel.java
@@ -75,12 +75,10 @@ public class RegattaOverviewPanel extends SimplePanel implements RegattaOverview
         Grid grid = new Grid(2, 2);
         grid.setWidth("100%");
         
-        //TODO: i8n
-        Label raceOverviewLabel = new Label("Area overview");
+        Label raceOverviewLabel = new Label(stringMessages.courseAreaOverview());
         raceOverviewLabel.addStyleName(STYLE_TITLE_LABEL);
         
-        //TODO: i8n
-        Label courseDesignOverviewLabel = new Label("Course design overview");
+        Label courseDesignOverviewLabel = new Label(stringMessages.courseDesignOverview());
         courseDesignOverviewLabel.addStyleName(STYLE_TITLE_LABEL);
         
         grid.setWidget(0, 0, raceOverviewLabel);