diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationDialog.java
index c3086a15f4b..5f031f8a02d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationDialog.java
@@ -47,9 +47,9 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
         this.sailingService = sailingService;
         this.leaderboardDTO = leaderboardDTO;
         this.ensureDebugId("PairingListCreationDialog");
-        applyToRacelogButton = new Button(stringMessages.applyToRacelogs());
+        applyToRacelogButton = new Button(stringMessages.insertIntoRegatta());
         printPreViewButton = new Button(stringMessages.printView());
-        refreshButton = new Button(stringMessages.reload());
+        refreshButton = new Button(stringMessages.recalculate());
         cSVExportAnchor = new Anchor(stringMessages.csvExport());
         cSVExportAnchor.ensureDebugId("CSVExportAnchor");
         cSVExportAnchor.getElement().setAttribute("href",
@@ -80,8 +80,8 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
         /* DATA PANEL */
 
         CaptionPanel dataPanel = new CaptionPanel();
-        dataPanel.setCaptionText(stringMessages.dataOfPairingList());
-        Grid formGrid = new Grid(5, 2);
+        dataPanel.setCaptionText(stringMessages.parameters());
+        Grid formGrid = new Grid(6, 2);
         dataPanel.add(formGrid);
         Label flights = new Label(String.valueOf(this.template.getFlightCount()));
         flights.ensureDebugId("FlightCountLabel");
@@ -91,10 +91,12 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
         competitors.ensureDebugId("CompetitorCountLabel");
         formGrid.setWidget(0, 0, new Label(stringMessages.numberOfFlights()));
         formGrid.setWidget(0, 1, flights);
-        formGrid.setWidget(1, 0, new Label(stringMessages.numberOfGroups()));
+        formGrid.setWidget(1, 0, new Label(stringMessages.numberOfFleets()));
         formGrid.setWidget(1, 1, groups);
-        formGrid.setWidget(2, 0, new Label(stringMessages.numberOfCompetitors()));
-        formGrid.setWidget(2, 1, competitors);
+        formGrid.setWidget(2, 0, new Label(stringMessages.numberOfRaces()));
+        formGrid.setWidget(2, 1, new Label(String.valueOf((template.getFlightCount()*template.getGroupCount()))));
+        formGrid.setWidget(3, 0, new Label(stringMessages.numberOfCompetitors()));
+        formGrid.setWidget(3, 1, competitors);
         HorizontalPanel qualityPanel = new HorizontalPanel();
         qualityPanel.add(new Label(stringMessages.quality()));
         Image qualityHelpImage = new Image(resources.help());
@@ -106,12 +108,12 @@ public class PairingListCreationDialog extends DataEntryDialog<PairingListTempla
                 Window.open("https://wiki.sapsailing.com/wiki/howto/eventmanagers/Pairing-Lists", "", "");
             }
         });
-        formGrid.setWidget(3, 0, qualityPanel);
-        formGrid.setWidget(3, 1, new Label(String.valueOf(Math.floor(this.template.getQuality() * 1000) / 1000)));
+        formGrid.setWidget(4, 0, qualityPanel);
+        formGrid.setWidget(4, 1, new Label(String.valueOf(Math.floor(this.template.getQuality() * 1000) / 1000)));
         if (this.template.getFlightMultiplier() > 1) {
             Label flightMultiplierLabel = new Label(String.valueOf(this.template.getFlightMultiplier()));
-            formGrid.setWidget(4, 0, new Label(stringMessages.flightMultiplier()));
-            formGrid.setWidget(4, 1, flightMultiplierLabel);
+            formGrid.setWidget(5, 0, new Label(stringMessages.amountOfFlightRepeats()));
+            formGrid.setWidget(5, 1, flightMultiplierLabel);
             flightMultiplierLabel.ensureDebugId("FlightMultiplierCountLabel");
         }
         formGrid.setCellSpacing(10);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java
index 72a1aa864aa..36d9928b135 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/PairingListCreationSetupDialog.java
@@ -45,7 +45,7 @@ public class PairingListCreationSetupDialog extends AbstractPairingListCreationS
         this.flightMultiplierTextBox.setEnabled(false);
         this.flightMultiplierTextBox.setValue(1);
         this.flightMultiplierTextBox.ensureDebugId("FlightMultiplierIntegerBox");
-        this.flightMultiplierCheckBox = createCheckbox(this.stringMessages.flightMultiplier());
+        this.flightMultiplierCheckBox = createCheckbox(this.stringMessages.amountOfFlightRepeats());
         this.flightMultiplierCheckBox.setTitle(this.stringMessages.multiplierInfo());
         this.ensureDebugId("PairingListCreationSetupDialog");
 
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 68254d3c637..352567f0e93 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
@@ -237,8 +237,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
     String pairingListCreationInfo();
     String setCompetitors();
     String seriesHint();
-    String flightMultiplier();
-    String applyToRacelogs();
+    String amountOfFlightRepeats();
+    String insertIntoRegatta();
+    String recalculate();
     String csvExport();
     String printView();
     String print();
@@ -246,9 +247,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
     String invalidFlightMultiplier();
     String invalidSeriesSelection();
     String flightsMustBeAMultipleOfMultiplier();
-    String dataOfPairingList();
+    String parameters();
     String numberOfFlights();
-    String numberOfGroups();
+    String numberOfFleets();
     String numberOfCompetitors();
     String quality();
     String pairingListTemplate();
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 1747d4ff507..e510f533887 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
@@ -233,32 +233,34 @@ hoverOverAPoint=Hover over a point for details
 noSelection=No selection
 raceIsKnownToStartUpwind=Race starts with upwind leg
 events=Events
-pairingList=Pairing List
-pairingLists=Pairing Lists
+pairingList=Pairing list
+pairingLists=Pairing lists
 pairingListCreationInfo=First of all a template will be calculated that contains only the competitor numbers and can be applied to other leaderboards. If the competitor count is not divisible by the boat count without remainder, empty placeholders will be entered into the pairing list. \
 \ In addition if the competitor count is unequal to the registered competitor count in the actual leaderboard, the pairing list cannot be applied to Race logs. \
 \ The count of the flights, that is used to generate a pairing list, is set by all flights of the leaderboard that are not medal races.
 setCompetitors=Please set the competitors count:
 seriesHint=Please select one or more series that should be in a PairingList:
-flightMultiplier=Flight Multiplier
-applyToRacelogs=Apply to Racelogs
+amountOfFlightRepeats=Number of flight repeats
+insertIntoRegatta=Insert into regatta
+recalculate=Recalculate
 csvExport=Export as CSV
 printView=Print preview
 print=Print
 invalidCompetitorCount=Invalid competitor count
-invalidFlightMultiplier=Invalid flight multiplier
+invalidFlightMultiplier=Invalid flight repeats
 invalidSeriesSelection=Invalid series selection
 flightsMustBeAMultipleOfMultiplier=Flights has to be a multiple of flight multiplier
-dataOfPairingList=Data of Pairinglist
-numberOfFlights=Number of Flights
-numberOfGroups=Number of Groups
-numberOfCompetitors=Number of Competiors
+parameters=Parameters
+numberOfFlights=Number of flights
+numberOfFleets=Number of races per flight
+numberOfCompetitors=Number of competiors
+numberOfRaces=Number of races
 quality=Quality
-pairingListTemplate=Pairinglist Template
+pairingListTemplate=Pairing list template
 printHint=Prints the applied version
 blockedApplyButton=Registered Competitors are unequal to Competitors from Pairinglist!
 multiplierInfo=Multipes flights and create them next to each other so that a competition with less boatchanges is possible
-noPairingListAvailable=The print function is only available when a pairing list has already been created for the selected leaderboard.
+noPairingListAvailable=The print function is only available when a pairing list has already been applied to the selected leaderboards race logs.
 settingsForComponent=Settings for {0}
 noEventsFound=No events were found
 noEventSelected=No event selected
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 787e28852ec..634016aa3bf 100644
--- 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
@@ -242,25 +242,27 @@ pairingListCreationInfo=Es wird zunächst ein Template berechnet, das nur aus Za
 \ Es wird eine Vereinigungsmenge aus allen Rennen, die keine Medallien Rennen sind, als Rennenanzahl für die Pairing List gebildet.
 setCompetitors=Anzahl der Teilnehmer:
 seriesHint=Bitte wählen Sie eine oder mehr Serien für die eine Paarungsliste aus:
-flightMultiplier= Wiederholungsfaktor
-applyToRacelogs=Anwenden auf Racelogs
+amountOfFlightRepeats=Anzahl der Flight Wiederholungen
+insertIntoRegatta=In Regatta einfügen
+recalculate=Neu berechnen
 csvExport=Export als CSV
 printView=Druckvorschau
 print=Drucken
 invalidCompetitorCount=Ungültige Teilnehmeranzahl
-invalidFlightMultiplier=Ungültiger Wiederholungsfaktor
+invalidFlightMultiplier=Ungültige Flight Wiederholungen
 invalidSeriesSelection=Ungültige Serienauswahl
 flightsMustBeAMultipleOfMultiplier=Anzahl der Wettfahren muss ein Vielfaches vom Wiederholungsfaktor sein
-dataOfPairingList=Daten der Paarungsliste
-numberOfFlights=Anzahl der Wettfahrten
-numberOfGroups=Anzahl der Rennen pro Wettfahrt
+parameters=Parameter
+numberOfFlights=Anzahl der Flights
+numberOfFleets=Anzahl der Wettfahrten pro Flight
 numberOfCompetitors=Anzahl der Teilnehmer
+numberOfRaces=Anzahl der Wettfahrten
 quality=Qualität
 pairingListTemplate=Paarungsliste
 printHint=Druckt die aktuell angewendete Version!
 blockedApplyButton=Die Anzahl der Teilnehmer der Paarungliste ist ungleich den registrierten Teilnehmern!
 multiplierInfo=Vervielfacht die WEttfahrten und schreibt gleiche hintereinader um möglichst wenig Bootswechsel zu ermöglichen
-noPairingListAvailable=Die Druckfunktion ist erst möglich, wenn bereits eine Gegner Paarungsliste für die ausgewählte Rangliste erstellt wurde.
+noPairingListAvailable=Die Druckfunktion ist erst möglich, wenn bereits eine Gegner Paarungsliste auf die Race Logs des ausgewählten Leaderbaord angewendet wurde.
 settingsForComponent=Einstellungen für {0}
 noEventsFound=Es wurden keine Rennen gefunden
 noEventSelected=Kein Rennen ausgewählt