Merge remote-tracking branch 'origin/master' into design2015

Conflicts:
	java/com.sap.sailing.dashboards.gwt/src/main/java/com/sap/sailing/dashboards/gwt/client/RibDashboardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
This commit is contained in:
Steffen Schaefer committed 2015-04-29 18:01:38 +02:00
commit 0f916696a8
44 files changed
+449 -144

No files matched your search

@@ -1229,7 +1229,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, c
String valueDescending();
String sortBy();
String dashboardWindBotLoading();
String dashboardWindBotLoadingText();
String dashboardWindBotLoadingMessage();
String dashboardWindBotNotAvailable();
String dashboardWindBot();
String dashboardTrueWindSpeed();
@@ -1194,7 +1194,8 @@ group=Group
valueAscending=Value (Ascending)
valueDescending=Value (Descending)
sortBy=Sort by
dashboardWindBotLoading=Loading wind bot data ...
dashboardWindBotLoadingText=Loading wind bot data ...
dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time.
dashboardWindBotNotAvailable=Wind bot not available.
dashboardWindBot=Wind Bot
dashboardTrueWindSpeed=TWS
@@ -509,7 +509,6 @@ mimeType=MIME Type
hideMap=髫占酪蝨ー蝗セ
scoringSchemeLowPointWinnerGetsZero=Low Point System, Winner Gets Zero
averageAbsoluteCrossTrackErrorInMeters=u2205 XTE
dashboardWindBotLoading=Loading wind bot data ...
showOnlyRacesOfSameDay=Show only races of same day
waypoints=闊ェ霍ッ轤ケ
startPostponed=蟒カ霑�
@@ -1223,4 +1222,6 @@ trackedRacesCount[one]={0,number} tracked race
eventsCount={0,number} events
eventsCount[one]={0,number} event
competitorsCount={0,number} competitors
competitorsCount[one]={0,number} competitor
competitorsCount[one]={0,number} competitor�
dashboardWindBotLoadingText=Loading wind bot data ...
dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time.
@@ -1184,7 +1184,8 @@ group=Gruppe
valueAscending=Wert (Aufsteigend)
valueDescending=Wert (Absteigend)
sortBy=Sortiert nach
dashboardWindBotLoading=Lade Windmesser Daten ...
dashboardWindBotLoadingText=Lade Windmesser Daten ...
dashboardWindBotLoadingMessage=Je nach Qualität Ihrer Verbindung kann dieser Vorgang ein paar Minuten dauern.
dashboardWindBotNotAvailable=Keine Verbindung zu Windmesser.
dashboardWindBot=Windmesser
dashboardTrueWindSpeed=Wind Geschwindigkeit
@@ -1212,7 +1213,6 @@ serverUrl=Server URL
rotatedFromTrueNorthClickToToggleWindUp={0}° gegenüber rechtweisend Nord rotiert.\nKlick wechselt zwischen Kartenanzeige "Wind oben" und "Nord oben"
startLineToFirstMarkTriangle=Vom Start zur nächsten Bahnmarke ({0}m)
noDataForEvent=Es existieren noch keine Daten für dieses Event.
countriesCount={0,number} Länder
countriesCount[one]={0,number} Land
racesCount={0,number} Rennen
@@ -1133,7 +1133,8 @@ group=Group
valueAscending=Value (Ascending)
valueDescending=Value (Descending)
sortBy=Sort by
dashboardWindBotLoading=Loading wind bot data ...
dashboardWindBotLoadingText=Loading wind bot data ...
dashboardWindBotLoadingMessage=Depending on your connection this operation might take some minutes to complete the first time.
dashboardWindBotNotAvailable=Wind bot not available.
dashboardWindBot=Wind Bot
dashboardTrueWindSpeed=TWS
@@ -1161,7 +1162,6 @@ serverUrl=Server URL
rotatedFromTrueNorthClickToToggleWindUp=Rotated {0} degrees from true north.\nTap/click to toggle between wind-up and north-up map display
startLineToFirstMarkTriangle=Start to first mark ({0}m)
noDataForEvent=There isn''t any data for the event yet.
countriesCount={0,number} countries
countriesCount[one]={0,number} country
racesCount={0,number} races