Merge branch 'master' of ssh://sapsailing.com/home/trac/git

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

@@ -1,5 +1,5 @@
 manage2Sail=Manage2Sail
-raceCommitteeApp=Race Committee App
+raceCommitteeApp=Race Manager App
 tracTracEvents=TracTrac Events
 swissTimingEvents=SwissTiming Events
 trackedBefore=History of tracked events

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

@@ -1,5 +1,5 @@
 manage2Sail=Manage2Sail
-raceCommitteeApp=Wettfahrtleiter App
+raceCommitteeApp=Race Manager App
 createNewEvent=Create New EventtracTracEvents=TracTrac Events
 swissTimingEvents=SwissTiming Events
 trackedBefore=Historie verfolgter Events

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

@@ -1,6 +1,6 @@
 # If you want new properties translated then sent this over GMR (Mark Angell <mangell@gmr.com>)
 manage2Sail=Manage2Sail
-raceCommitteeApp=Race Committee App
+raceCommitteeApp=Race Manager App
 tracTracEvents=События Трак Трак
 swissTimingEvents=События Swiss Timing
 trackedBefore=Ранее Отслеженные 

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

@@ -1,5 +1,5 @@
 manage2Sail=Manage2Sail
-raceCommitteeApp=Race Committee App
+raceCommitteeApp=Race Manager App
 enableRaceFilter=Enable filter
 finishLine=终点线
 raceLabel=比赛轮次

java/com.tractrac.clientmodule/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TracTrac Client module
 Bundle-SymbolicName: com.tractrac.clientmodule
-Bundle-Version: 3.1.2
+Bundle-Version: 3.1.3
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/TracAPI.jar

java/com.tractrac.clientmodule/README.txt

@@ -16,6 +16,33 @@ It contains also some files:
  - test.sh -> script that compiles the code in the src folder, creates the test.jar library and execute the code of the example.
  - Manifest.txt -> manifest used to create the test.jar file
 
+********************************************
+************* TracAPI 3.1.3 ****************
+********************************************
+This is a final version. Only fixes bugs in the implementation
+
+Release date: 25/01/2016
+Build number: 11888
+
+ 1) Bugs
+ 
+ - The bug of the previous release (3.1.3) was not fixed.
+
+********************************************
+************* TracAPI 3.1.2 ****************
+********************************************
+This is a final version. Only fixes bugs in the implementation
+
+Release date: 21/01/2016
+Build number: 11864 
+
+ 1) Bugs
+ 
+ - The ISubscriber.stop() method never finishes due to a deadlock (it happens sometimes).
+ There is a deadlock between one of the internal threads responsible to update the progress 
+ and the thread that calls the stop method. The release 3.1.1 fixed a part of the bug but
+ it continues happening due to a new deadlock (Reported by Axel Uhl, 20/01/2016) 
+
 ********************************************
 ************* TracAPI 3.1.1 ****************
 ********************************************

java/com.tractrac.clientmodule/pom.xml

@@ -8,6 +8,6 @@
     <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>com.tractrac.clientmodule</artifactId>
-  <version>3.1.2</version>
+  <version>3.1.3</version>
   <packaging>eclipse-plugin</packaging>
 </project>