Merge remote-tracking branch 'origin/master' into ftes-rltracking-app

This commit is contained in:
Fredrik Teschke committed 2014-10-14 14:17:05 +02:00
commit 25dcadd9ba
25 files changed
+421 -72

No files matched your search

@@ -388,6 +388,7 @@ public interface StringMessages extends Messages {
String scoringSchemeLowPointWinnerGetsZero();
String scoringSchemeWinnerGetsFive();
String scoringSchemeWinnerGetsSix();
String scoringSchemeWinnerGetsEight();
String scoringSystem();
String createFlexibleLeaderboard();
String createRegattaLeaderboard();
@@ -412,6 +412,7 @@ scoringSchemeHighPointLastBreaksTie=High Point System, Last Race Breaks Tie
scoringSchemeLowPointWinnerGetsZero=Low Point System, Winner Gets Zero
scoringSchemeWinnerGetsFive=High Point System, Winner Gets 5 Points
scoringSchemeWinnerGetsSix=High Point System, Winner Gets 6 Points
scoringSchemeWinnerGetsEight=High Point System, Winner Gets 8 Points
scoringSystem=Scoring system
createFlexibleLeaderboard=Create flexible leaderboard
createRegattaLeaderboard=Create regatta leaderboard
@@ -1078,4 +1079,4 @@ raceVisibilityColumn=Visibility
enterCarryValueFor=Enter carried points for competitor {0}
mappingDetails=Mapping Details
deviceMappingQrCodeExplanation=If you are using the Tracking App, you can add the device mapping also by selecting a competitor/mark, setting the from and to times, and then scanning this QRCode.
qrCode=QRCode
qrCode=QRCode
@@ -413,6 +413,7 @@ scoringSchemeHighPointLastBreaksTie=High Point System, letztes Rennen entscheide
scoringSchemeLowPointWinnerGetsZero=Low Point System, Gewinner erhält 0 Punkte
scoringSchemeWinnerGetsFive=High Point System, Gewinner erhält 5 Punkte
scoringSchemeWinnerGetsSix=High Point System, Gewinner erhält 6 Punkte
scoringSchemeWinnerGetsEight=High Point System, Gewinner erhält 8 Punkte
scoringSystem=Bepunktungssystem
createFlexibleLeaderboard=Flexible Rangliste anlegen
createRegattaLeaderboard=Rangliste für Regatta anlegen
@@ -1073,4 +1074,4 @@ raceVisibilityColumn=Sichtbarkeit
enterCarryValueFor=Punkteübertrag für Teilnehmer {0} erfassen
mappingDetails=Zuordnungsdetails
deviceMappingQrCodeExplanation=Wenn die Tracking App verwendet wird, kann die Zuordnung auch wie folgt geschehen: Wettbewerber/Tonne auswaehlen, von und bis Zeiten setzen und dann den QRCode abscannen.
qrCode=QRCode
qrCode=QRCode
@@ -402,6 +402,7 @@ scoringSchemeHighPointLastBreaksTie=Высокобальная система п
scoringSchemeLowPointWinnerGetsZero=Низкобальная система подсчета очков, победитель получает ноль очков
scoringSchemeWinnerGetsFive=Высокобальная система подсчета, победитель получает 5 очков
scoringSchemeWinnerGetsSix=Высокобальная система подсчета, победитель получает 6 очков
scoringSchemeWinnerGetsEight=Высокобальная система подсчета, победитель получает 8 очков
scoringSystem=Система подсчета очков
createFlexibleLeaderboard=Создание адаптивной таблицы лидеров
createRegattaLeaderboard=Создание таблицы лидеров регаты
@@ -24,6 +24,8 @@ public class ScoringSchemeTypeFormatter {
return stringMessages.scoringSchemeWinnerGetsFive();
case HIGH_POINT_WINNER_GETS_SIX:
return stringMessages.scoringSchemeWinnerGetsSix();
case HIGH_POINT_WINNER_GETS_EIGHT:
return stringMessages.scoringSchemeWinnerGetsEight();
case HIGH_POINT_FIRST_GETS_TEN_OR_EIGHT:
return stringMessages.scoringSchemeHighPointFirstGetsTenOrEight();
}
@@ -79,6 +79,9 @@
<source path='ui/shared' />
<source path='ui/actions' />
<source path='ui/simulator' />
<source path='ui/adminconsole' />
<source path='ui/usermanagement' />
<source path='ui/masterdataimport' />
<source path='ui/regattaoverview' />
<source path='ui/leaderboard'/>
<source path='home' />
@@ -34,6 +34,9 @@
<source path='common'/>
<source path="client" />
<source path="datamining" />
<source path="adminconsole" />
<source path="masterdataimport" />
<source path="usermanagement" />
<source path="simulator" />
<source path='shared' />
<source path='common' />
@@ -52,6 +52,9 @@
<source path='common'/>
<source path='client'/>
<source path='controls'/>
<source path='adminconsole'/>
<source path='usermanagement'/>
<source path='masterdataimport'/>
<source path='components'/>
<source path='leaderboard'/>
<source path='regattaoverview'/>
@@ -37,6 +37,8 @@
<source path='client'/>
<source path='simulator'/>
<source path='usermanagement'/>
<source path='masterdataimport'/>
<source path='adminconsole'/>
<source path='shared'/>
<source path='leaderboard'/>
</module>
@@ -10,6 +10,11 @@
<inherits name="com.sap.sse.SSECommon" />
<inherits name="com.sap.sailing.domain.SailingDomain" />
<!-- Fancy DateTimePicker (without the rest of Bootstrap!) -->
<!-- GWT-Bootstrap License: Apache License, Version 2.0 -->
<inherits name="com.github.gwtbootstrap.BootstrapNoResources" />
<inherits name='com.github.gwtbootstrap.datetimepicker.DatetimepickerNoResources' />
<!-- Highcharts API -->
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Google Maps API -->
@@ -23,7 +28,11 @@
<extend-property name="locale" values="de"/>
<source path='client' />
<source path='actions'/>
<source path='shared'/>
<source path='common'/>
<source path='adminconsole'/>
<source path='usermanagement'/>
<source path='masterdataimport'/>
<source path='simulator'/>
<source path='leaderboard'/>
</module>
@@ -11,7 +11,11 @@
<inherits name="com.sap.sailing.domain.SailingDomain" />
<!-- Highcharts API -->
<inherits name="org.moxieapps.gwt.highcharts.Highcharts" />
<!-- Google Maps API -->
<!-- Fancy DateTimePicker (without the rest of Bootstrap!) -->
<!-- GWT-Bootstrap License: Apache License, Version 2.0 -->
<inherits name="com.github.gwtbootstrap.BootstrapNoResources" />
<inherits name='com.github.gwtbootstrap.datetimepicker.DatetimepickerNoResources' />
<!-- Google Maps API -->
<inherits name='com.google.gwt.ajaxloader.AjaxLoader' />
<inherits name='com.google.gwt.maps.Maps' />
<!-- GWT JSON Support -->
@@ -25,5 +29,8 @@
<source path='actions'/>
<source path='common'/>
<source path='simulator'/>
<source path='adminconsole'/>
<source path='usermanagement'/>
<source path='masterdataimport'/>
<source path='leaderboard'/>
</module>