restored StringMessages after massive merge problems

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorPanel.java

@@ -295,7 +295,7 @@ public class CompetitorPanel extends SimplePanel {
 
                             @Override
                             public void onSuccess(Void result) {
-                                Window.alert(stringMessages.sendingMailsSuccessfull());
+                                Window.alert(stringMessages.sendingMailsSuccessful());
                             }
                         });
             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceLogTrackingEventManagementPanel.java

@@ -495,7 +495,7 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf
 
                             @Override
                             public void onSuccess(Void result) {
-                                Window.alert(stringMessages.sendingMailsSuccessfull());
+                                Window.alert(stringMessages.sendingMailsSuccessful());
                             }
                         });
             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java

@@ -1164,7 +1164,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
     String inviteCompetitors();
     String notAllCompetitorsProvideEmail();
     String sendingMailsFailed();
-    String sendingMailsSuccessfull();
+    String sendingMailsSuccessful();
     String selectEventForInvitation();
     String imageURL();
     String upload();
@@ -1208,4 +1208,4 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
     String dashboardTeam();
     String dashboardDistanceToLineInM();
     String dashboardSpeedInKts();
-    }
+}

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

@@ -1127,21 +1127,21 @@ active=Active
 scoringSchemeHighPointEssOverallDescription=Score in points. Winner of an act scores 10 points, 2nd - 9 points, .... Any tie in the overall Extreme Sailing Series is broken in favour of the competitor with the most Act wins. If that does not break the tie, the result in the last Act will  be used.
 timeBetweenRaceStartAndCompetitorStartInSeconds=Start delay
 timeBetweenRaceStartAndCompetitorStartInSecondsTooltip=Time between the start of the race and the time the competitor passed the start waypoint. Negative time suggests OCS.
-useInternalAlgorithm=Use internal mark passing algorithm
-editMarkPassings=Edit Mark Passings
-removeFixedPassings=Remove fixed mark passing
-setFixedPassing=Set time as mark passing
-setSuppressedPassing=Suppress mark passing starting with current
-removeSuppressedPassing=Remove suppressed mark passing
-errorRemovingFixedPassing=Error removing fixed mark passing: {0}
-errorSettingFixedPassing=Error setting fixed mark passing: {0}
-errorSuppressingPassing=Error suppressing mark passings: {0}
-errorRemovingSupressedPassing=Error removing suppressed mark passings: {0}
-errorTryingToObtainMarkPassing=Error trying to obtain mark passings: {0}
-errorTryingToObtainRaceLogMarkPassingData=Error trying to obtain race log mark passing data: {0}
-
+email=E-Mail
+pleaseEnterAnEmail=Please enter an E-Mail.
+inviteCompetitors=Invite competitors
+notAllCompetitorsProvideEmail=Not all competitors provide an E-Mail
+sendingMailsFailed=Sending Mails failed
+sendingMailsSuccessful=Successfully sent E-Mails
+selectEventForInvitation=Select Event for Invitation
+imageURL=Image URL
+upload=Upload
+removeResult=Remove operation: {0} {1}
+uploadSuccessful=Upload successful
+fileUploadResult=File upload: {0} {1}.\nIn case of error please check that your File Storage service is properly configured.
+showCompetitorSailIdColumn=Show Competitor Sail Id
 showCompetitorFullNameColumn=Show Competitor Full Name
-loadingDimensionValues=Loading dimension values
+loadingDimensionValues=Loading dimension values
 runningQuery=Running Query
 inviteBuoyTenders=Invite Buoy Tenders
 orMultipleEmails=or multiple E-Mails separated by comma
@@ -1172,4 +1172,4 @@ dashboardStartlineAdvantageByGeometry=Startline advantage by geometry
 dashboardRankAtFirstMark=Rank at first mark
 dashboardTeam=Team
 dashboardDistanceToLineInM=Distance to line in m
-dashboardSpeedInKts=Speed in kts
+dashboardSpeedInKts=Speed in kts

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties

@@ -1129,9 +1129,21 @@ errorSuppressingPassing=Fehler beim Unterdrücken von Umrundungen: {0}
 errorRemovingSupressedPassing=Fehler beim Entfernen von unterdrückten Umrundungen: {0}
 errorTryingToObtainMarkPassing=Fehler beim Laden der Umrundungszeiten: {0}
 errorTryingToObtainRaceLogMarkPassingData=Fehler beim Laden der Umrundungsinformation aus dem RaceLog: {0}
-
+email=E-Mail
+pleaseEnterAnEmail=Bitte geben Sie eine E-Mail ein.
+inviteCompetitors=Teilnehmer einladen
+notAllCompetitorsProvideEmail=Nicht alle Teilnehmer haben eine E-Mail angegeben
+sendingMailsFailed=Versenden der E-Mails fehlgeschlagen
+sendingMailsSuccessful=Versenden der E-Mails war erfolgreich!
+selectEventForInvitation=Event für Einladung auswählen
+imageURL=Bild-URL
+upload=Hochladen
+removeResult=Löschergebnis: {0} {1}
+uploadSuccessful=Hochladen erfolgreich
+fileUploadResult=Ergebnis des Hochladens: {0} {1}\nIm Fehlerfall bitte die Konfiguration für "Datei Speicherung" prüfen.
+showCompetitorSailIdColumn=Sail Id anzeigen
 showCompetitorFullNameColumn=Vollen Namen anzeigen
-loadingDimensionValues=Lade Dimensionswerte
+loadingDimensionValues=Lade Dimensionswerte
 runningQuery=Datenabfrage läuft
 inviteBuoyTenders=Tonnenleger einladen
 orMultipleEmails=oder mehrere E-Mails (Komma-separiert)
@@ -1162,4 +1174,4 @@ dashboardStartlineAdvantageByGeometry=Startlininien Vorteil nach Geometrie
 dashboardRankAtFirstMark=Position an erster Bahnmarke
 dashboardTeam=Team
 dashboardDistanceToLineInM=Distanz zur Linie in m
-dashboardSpeedInKts=Geschwindigkeit in kts
+dashboardSpeedInKts=Geschwindigkeit in kts