Merge remote-tracking branch 'server/master'

Conflicts: java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs
2026-10-11 23:00:59 +00:00 · 2015-04-30 09:30:54 +02:00
commit 50073115db
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+encoding//src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties=UTF-8
+encoding//src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_cn.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties=UTF-8
 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties=UTF-8
@@ -0,0 +1,183 @@
+socialFooterShare=Share this on 
+home=主页
+aboutUs=关于我们
+contact=联络
+sponsoring=赞助商
+solutions=解决方案
+events=比赛
+german=德语
+english=英语
+officalEventWebsite=官方活动网站
+leg=站
+races=赛事
+moreInfo=更多信息
+viewAnalysis=观看分析
+overallLeaderboard=总排行榜
+pleaseEnterASearchTerm=请输入搜索词
+pleaseTryAgain=请再试一次
+reloadPage=重新载入页面
+errorMessageLoadingData=加载该页的数据时出错
+errorMessageNoSuchLeaderboard=无法利用这词寻找排行榜
+raceNotScheduled=没有确认时间
+regattaDetails=帆船赛细节
+regatta=帆船赛
+competitorsAnalytics=队伍分析
+chooseChart=选择图标类型
+series=系列
+regattaLeaderboards=帆船赛排行榜
+features=功能
+releaseNotes=软件更新发布
+whatsNew=最新信息
+overview=概览
+sapSailing=ＳＡＰ帆船
+search=搜索
+startSimulator=启动模拟器
+live=实时
+finished=结束
+watchNow=马上观看
+lastUpdate=最后更新
+leaderboard=排行榜
+eventHeaderMedia=媒体
+eventHeaderOverview=概览
+eventHeaderRaces=赛程
+eventHeaderRegattas=帆船赛
+seriesHeaderOverview=关于比赛系列
+seriesHeaderUpcoming=未来赛事
+seriesHeaderRecent=最近赛事
+seriesHeaderLeaderboard=排行榜
+eventsOverviewRecentEvents=赛事
+eventsOverviewRecentCountries=国家
+eventsOverviewRecentSailors=运动员
+eventsOverviewRecentTrackedRaces=赛事（含比赛分析）
+eventResultsHeadline=比赛结果
+eventResultsBoatClassesDropDown=所有帆船级别
+eventOverviewMoreEvents=更多赛事
+eventOverviewRecentEvents=最近赛事
+eventOverviewUpcomingDate=日期
+eventOverviewUpcomingEvent=赛事
+eventOverviewUpcomingLocation=地点
+eventOverviewUpcomingSchedule=未来赛程
+eventOverviewUpcomingSeries=系列
+eventOverviewUpcomingTeaser=更多赛事即将公布
+eventQuickfinderTitle=赛事快速查找
+eventRegattaHeaderLeaderboard=排行榜
+eventRegattaHeaderRaceRaces=赛事
+eventRegattaListAllBoatClasses=所有帆船级别
+eventRegattaLeaderboardCompetitor=比赛队伍
+eventRegattaLeaderboardExtendLeaderboard=详细排行榜
+eventRegattaLeaderboardFinishedMessage=没有更多比赛
+eventRegattaLeaderboardLastScoreUpdate=最后积分更新
+eventRegattaLeaderboardName=队伍名称
+eventRegattaLeaderboardRegattaRank=帆船赛排名
+eventRegattaLeaderboardTotalPoints=总积分
+eventRegattaRaceWatch=实时观看
+eventRegattaRaceAnalyse=赛事分析
+eventRegattaRaceNotTracked=不含比赛分析
+mainEventShowAll=显示所有赛事
+mainEventTitle=最新帆船赛事
+mainMediaSubtitle=
+mainMediaTitle=照片
+mainMediaVideosSubtitle=
+mainMediaVideosTitle=最新视频
+mainSponsorsReadMore=阅读更多
+mediaTeaserPhotosTitle=照片
+mediaTeaserVideosTitle=视频
+regattaCompetitors=比赛队伍＼竞争对手
+regattaRaces=赛事
+regattaTracked=Tracked　
+regattaRegattaStarts=帆船比赛即将开始
+regattaPts=积分
+regattaCourse=帆船赛程
+regattaArea=地点
+regattaFinishedAt=结束时间为
+regattaScheduledAt=开始时间为
+regattaStartedAt=开始时间为
+regattasResultsTitle=比赛结果
+searchResultHeaderButton=搜寻
+searchResultHeaderLabel=您的搜寻
+searchResultsFound=搜寻结果
+searchResultHeaderPlaceholder=输入您的搜寻关键词
+searchResultMore=更多
+searchResultSearch=搜寻
+searchResultSearchAgain=重新搜寻
+searchResultSortLabel=排序方式
+searchResultSortNewest=最近
+searchResultSortOldest=最旧
+searchResultSortRelevance=相关性
+solutionsSAPNav=ＳＡＰ帆船比赛分析
+solutionsSAPHeadline=ＳＡＰ帆船比赛分析
+countdownDays=Days
+countdownHours=Hrs
+countdownMinutes=Min
+countdownSeconds=Sec
+countdownDay=Day
+countdownHour=Hour
+countdownMinute=Min
+countdownSecond=Sec
+boxNewsUpdateMoreLink=Report news
+boxNewsUpdateTitle=News Update
+boxUpcomingRacesCountdownStarted1=Started
+boxUpcomingRacesCountdownStarted2=hrs and
+boxUpcomingRacesCountdownStarted3=minutes ago
+boxUpcomingRacesCountdownStarting1=Starting in
+boxUpcomingRacesCountdownStarting2=hrs and
+boxUpcomingRacesCountdownStarting3=minutes
+boxUpcomingRacesMoreLink=Event Schedule
+boxUpcomingRacesTitle=Upcoming Races Today
+boxWeather=Weather
+boxWeatherUnit=KTS
+defaultTitle=ＳＡＰ帆船
+seriesOverviewHeaderRecent=Latest Series Events
+seriesOverviewReadMore=More
+eventRegattaRaceFinished=Finished at:
+eventRegattaRaceStarted=Started at:
+eventRegattaRaceScheduled=Scheduled for:
+eventRegattaRaceRace=Race
+eventRegattaRaceWind=Wind Strength:
+eventRegattaRaceWinner=Winner
+eventRegattaRaceLeader=Leader
+eventRegattaRacesLegendGps=Tracking
+eventRegattaRacesLegendWind=Wind Data
+eventRegattaRacesLegendVideo=Video Stream
+eventRegattaRacesLegendAudio=Audio Stream
+eventSponsorsTitle=Event Sponsorships
+footerJobs=Jobs
+footerCopyright=\u00A9 2015 ＳＡＰ帆船
+footerLanguage=SAP Sailing offered in
+footerLegal=Legal Disclosure
+footerPrivacy=Privacy
+footerFeedback=Feedback
+headerEvents=比赛
+headerHome=主页
+headerLogo=ＳＡＰ帆船
+headerSearch=搜索
+headerSearchPlaceholder=搜索
+headerSolutions=Solutions
+headerSponsoring=Sponsoring
+latestRaceResultsHeadline=Latest Official Race Results
+latestRaceResultsIsNew=New
+latestRaceResultsIsUpdated=Updated
+latestRaceResultsRaceCountLabel=Result after
+latestRaceResultsRaceCountUnit=races
+latestRaceResultsRefresh=refresh
+leaderboardQuickAccessLabel=Leaderboard Quick Access
+searchResultCount=About 2,450 results where found for 'Schnitzel'
+sharingEmail=Send an email
+sharingFacebook=Share on Facebook
+sharingTwitter=Tweet about it
+socialFooterTitle=Recommend SAP Sailing Analytics
+solutionsSAPText1=By delivering real time analytics around race rankings, speeds, maneuvers, bearings etc., SAP is helping to simplify and demystify the complex sport of sailing.
+solutionsSAPText2=SAP Sailing Analytics provide insights and transparency to the world of sailing by utilizing Cloud and In-Memory Technology, processing GPS and wind measurement data in real time and visualizing contents in various frontends accessible from anywhere.
+solutionsRaceNav=Race Committee App
+solutionsRaceHeadline=Race Committee App
+solutionsRaceText=The SAP Race Committee App delivers greater efficiency and control to race organizers by automating and simplifying their manual tasks and communication during running sailing regattas. The Race Committee App helps simplify the operation of running and managing race events to help race committees operate smarter.
+solutionsPostNav=Post-Race Analytics
+solutionsPostHeadline=Post-Race Analytics
+solutionsPostText=Access to data collected at sailing events gives sailors the opportunity to assess and analyse their performances to help develop strategies and sail better.<br> SAP Business Analytics solutions provide sailors, coaches, fans and media with tools to browse and analyse historical data across many regattas and races. SAP HANA allows them to learn about performance patterns, tendencies and sailor profiles in a simple, fast and efficient way in order to optimize their own performance and develop successful strategies for future regattas.
+solutionsTrainingNav=Training Diary
+solutionsTrainingHeadline=SAP Sail Better \u2013 STG Training Diary
+solutionsTrainingText=The STG Training Diary supports the daily documentation and analysis of an athlete\u2019s physical condition and training efforts in the areas of water training, physical training, boat work, mental, theory as well as other activities like education or travel.
+solutionsSimulatorNav=Strategy Simulator
+solutionsSimulatorHeadline=Strategy Simulator
+solutionsSimulatorText=Choosing the right strategy can provide great competitive advantage during a race. The Strategy Simulator simplifies determining the best sailing strategy for various wind conditions and water currents. Since wind and current can be changed in the simulation right away, the robustness of a strategy can be easily evaluated even for uncertain weather conditions.
+
@@ -816,7 +816,7 @@ windwardDistanceToLeaderInMeters=迎风航段时离开上风第一名的平行
 hostname=Hostname
 distanceIncludingGateStartInMeters=距离（起航门标） 
 valueForCompetitorAt={0} at {1}: {2}
-refreshIntervalMustBeGreaterThanXSeconds=刷新间隔必须大于0秒
+refreshIntervalMustBeGreaterThanXSeconds=刷新间隔必须大于0秒 {0}
 authorName=Author name
 raceIsInStartphase=开始阶段
 pleaseSelectAScoringResult=Please select a scoring result...
@@ -56,6 +56,7 @@

 	<!-- Specify the paths for translatable code -->
 	<extend-property name="locale" values="de" />
+	<extend-property name="locale" values="cn" />

 	<!-- Uncomment this to get clear-text CSS style/class names in generated output -->
 	<!-- 
@@ -33,6 +33,7 @@
 	<!-- Specify the paths for translatable code                    -->
 	<extend-property name="locale" values="de"/>
 	<extend-property name="locale" values="ru"/>
+	<extend-property name="locale" values="cn"/>
 	
 	<source path='common'/>
 	<source path='client'/>
@@ -157,6 +157,22 @@ load_from_release_file ()
    fi
 }

+load_from_local_release_file ()
+{
+    if [[ $INSTALL_FROM_RELEASE != "" ]]; then
+        cd $SERVER_HOME
+        rm -f $SERVER_HOME/$INSTALL_FROM_RELEASE.tar.gz*
+        rm -rf plugins start stop status native-libraries org.eclipse.osgi *.tar.gz
+        echo "Loading from release file $INSTALL_FROM_RELEASE.tar.gz"
+        mv env.sh env.sh.preserved
+        tar xvzf $INSTALL_FROM_RELEASE.tar.gz
+        mv env.sh.preserved env.sh
+        echo "Configuration for this server is unchanged - just binaries have been changed."
+    else
+        echo "The variable INSTALL_FROM_RELEASE has not been set therefore no release file will be installed!"
+    fi
+}
+
 checkout_code ()
 {
    cd $PROJECT_HOME
@@ -277,6 +293,21 @@ elif [[ $OPERATION == "install-release" ]]; then
        echo "ATTENTION: This new release code is not active yet. Make sure to restart the server if it is running!"
    fi

+elif [[ $OPERATION == "install-local-release" ]]; then
+    INSTALL_FROM_RELEASE=$PARAM
+    if [[ $INSTALL_FROM_RELEASE == "" ]]; then
+        echo "You need to provide the file of a release without tar.gz"
+        exit 1
+    fi
+
+    # Honor the no-overrite setting if there is one
+    if [ -f $SERVER_HOME/no-overwrite ]; then
+        echo "Found a no-overwrite file in the servers directory. Please remove it to complete this operation!"
+    else
+        load_from_local_release_file
+        echo "ATTENTION: This new release code is not active yet. Make sure to restart the server if it is running!"
+    fi
+
 elif [[ $OPERATION == "install-env" ]]; then
    USE_ENVIRONMENT=$PARAM
    if [[ $USE_ENVIRONMENT == "" ]]; then