chronojump r348 - in trunk: . build/data build/data/locale/ca/LC_MESSAGES build/data/locale/es/LC_MESSAGES build/data/locale/oc/LC_MESSAGES po src src/stats src/stats/graphs web/data web/data/langs/_ca/Pages web/data/langs/_de/Pages web/data/langs/_en/Pages web/data/langs/_es/Pages web/data/langs/_fr/Pages web/data/langs/_gl/Pages web/data/langs/_it/Pages web/data/langs/_pt/Pages web/html_created_no_edit web/html_created_no_edit/print

From: xaviblas svn gnome org
To: svn-commits-list gnome org
Subject: chronojump r348 - in trunk: . build/data build/data/locale/ca/LC_MESSAGES build/data/locale/es/LC_MESSAGES build/data/locale/oc/LC_MESSAGES po src src/stats src/stats/graphs web/data web/data/langs/_ca/Pages web/data/langs/_de/Pages web/data/langs/_en/Pages web/data/langs/_es/Pages web/data/langs/_fr/Pages web/data/langs/_gl/Pages web/data/langs/_it/Pages web/data/langs/_pt/Pages web/html_created_no_edit web/html_created_no_edit/print
Date: Tue, 22 Jan 2008 22:21:28 +0000 (GMT)
Author: xaviblas
Date: Tue Jan 22 22:21:28 2008
New Revision: 348
URL: http://svn.gnome.org/viewvc/chronojump?rev=348&view=rev

Log:
0.62-svn2
graphs:
-All graphs have now clearer labels (with units) on left and right axis
-Graphs now have a soft grid
-Grid never overrides now a graph avg
-currentGraphData can record integer axis (done for Reactive AVG SD)
-Improvements on graphs: rjPotencyBosco, rjEvolution (bottom label)
-Reactive AVG SD indexes, now plot jumps.

export session and report now with decimals selected in preferences

updated translations: ca, es, oc


Modified:
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
   trunk/build/data/locale/es/LC_MESSAGES/chronojump.mo
   trunk/build/data/locale/oc/LC_MESSAGES/chronojump.mo
   trunk/build/data/version.txt
   trunk/changelog.txt
   trunk/po/ca.po
   trunk/src/exportSession.cs
   trunk/src/report.cs
   trunk/src/stats/graphs/djIndex.cs
   trunk/src/stats/graphs/djQ.cs
   trunk/src/stats/graphs/fv.cs
   trunk/src/stats/graphs/global.cs
   trunk/src/stats/graphs/graphData.cs
   trunk/src/stats/graphs/ieIub.cs
   trunk/src/stats/graphs/potency.cs
   trunk/src/stats/graphs/rjAVGSD.cs
   trunk/src/stats/graphs/rjEvolution.cs
   trunk/src/stats/graphs/rjIndex.cs
   trunk/src/stats/graphs/rjPotencyBosco.cs
   trunk/src/stats/graphs/sjCmjAbk.cs
   trunk/src/stats/graphs/sjCmjAbkPlus.cs
   trunk/src/stats/main.cs
   trunk/src/stats/rjAVGSD.cs
   trunk/version.txt
   trunk/web/data/authors.txt
   trunk/web/data/langs/_ca/Pages/index
   trunk/web/data/langs/_de/Pages/index
   trunk/web/data/langs/_en/Pages/index
   trunk/web/data/langs/_es/Pages/index
   trunk/web/data/langs/_fr/Pages/index
   trunk/web/data/langs/_gl/Pages/index
   trunk/web/data/langs/_it/Pages/index
   trunk/web/data/langs/_pt/Pages/index
   trunk/web/html_created_no_edit/faq_es.html
   trunk/web/html_created_no_edit/photocells_es.html
   trunk/web/html_created_no_edit/print/index_ca.html
   trunk/web/html_created_no_edit/print/index_de.html
   trunk/web/html_created_no_edit/print/index_es.html
   trunk/web/html_created_no_edit/print/index_fr.html
   trunk/web/html_created_no_edit/print/index_gl.html
   trunk/web/html_created_no_edit/print/index_it.html
   trunk/web/html_created_no_edit/print/index_pt.html

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/es/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/oc/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/version.txt
==============================================================================
--- trunk/build/data/version.txt	(original)
+++ trunk/build/data/version.txt	Tue Jan 22 22:21:28 2008
@@ -1 +1 @@
-0.62
+0.62-svn2

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Tue Jan 22 22:21:28 2008
@@ -1,8 +1,23 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+22 jan 2007
+	0.62-svn2
+	graphs:
+	-All graphs have now clearer labels (with units) on left and right axis
+	-Graphs now have a soft grid
+	-Grid never overrides now a graph avg
+	-currentGraphData can record integer axis (done for Reactive AVG SD)
+	-Improvements on graphs: rjPotencyBosco, rjEvolution (bottom label)
+	-Reactive AVG SD indexes, now plot jumps.
+
+	export session and report now with decimals selected in preferences
+
+	updated translations: ca, es, oc
+
 18 dec 2007
 	fixed: 504069 "Create two new RJ evo with AVG and SD stats and
-	graph". Done stats & graphs
+	graph". Done stats & graphs. Called "Reactive AVG SD (RJ Index)" and
+	"Reactive AVG SD (Q Index)"
 
 7 dec 2007 (Major RELEASE 0.62 for Linux and windows)
 	avg works on all graphs simple session & multisession (obvioulsy if they have

Modified: trunk/src/exportSession.cs
==============================================================================
--- trunk/src/exportSession.cs	(original)
+++ trunk/src/exportSession.cs	Tue Jan 22 22:21:28 2008
@@ -242,7 +242,7 @@
 
 	protected void printJumps()
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
 		
 		string weightName = Catalog.GetString("Weight");
 		if(weightStatsPercent)
@@ -284,7 +284,7 @@
 						myStr[4] + ":" +  Util.TrimDecimals(myStr[6], dec) + ":" + 	//jump.type, jump.tc
 						Util.TrimDecimals(myStr[5], dec) + ":" +  myStr[7] + ":" + 	//jump.tv, jump.fall
 						//myStr[8] + ":" + 		//jump.weight,
-						myWeight + ":" +
+						Util.TrimDecimals(myWeight, dec) + ":" +
 						Util.TrimDecimals(Util.GetHeightInCentimeters(myStr[5]), dec) + ":" +  
 						Util.TrimDecimals(Util.GetInitialSpeed(myStr[5], true), dec) + ":" +  //true: m/s
 						myStr[9]		//jump.description
@@ -297,7 +297,8 @@
 
 	protected void printJumpsRj(bool showSubjumps)
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
+
 		ArrayList myData = new ArrayList(1);
 		bool isFirstHeader = true;
 		
@@ -364,7 +365,7 @@
 					Util.TrimDecimals(Util.GetInitialSpeed(myStr[10], true), dec) + ":" +  	//Avg Initial speed (true:m/s)
 					myStr[7] + ":" + 	 	//jumpRj.Fall
 					//myStr[8] + ":" +  myStr[14] + ":" + 	//jumpRj.Weight, jumpRj.Jumps
-					myWeight + ":" +  myStr[14] + ":" + 	//jumpRj.Weight, jumpRj.Jumps
+					Util.TrimDecimals(myWeight,dec) + ":" +  myStr[14] + ":" + 	//jumpRj.Weight, jumpRj.Jumps
 					Util.TrimDecimals(myStr[15], dec) + ":" +  Util.GetLimitedRounded(myStr[16],dec) + ":" + 	//jumpRj.Time, jumpRj.Limited
 					myStr[9]		//jumpRj.Description
 					);
@@ -417,7 +418,7 @@
 	
 	protected void printRuns()
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
 		
 		if(myRuns.Length > 0) {
 			ArrayList myData = new ArrayList(1);
@@ -448,7 +449,8 @@
 	
 	protected void printRunsInterval(bool showSubruns)
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
+
 		ArrayList myData = new ArrayList(1);
 		bool isFirstHeader = true;
 		
@@ -530,7 +532,7 @@
 	
 	protected void printReactionTimes()
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
 		
 		if(myReactionTimes.Length > 0) {
 			ArrayList myData = new ArrayList(1);
@@ -560,7 +562,8 @@
 	//no need of bool because all the info is in the sub values
 	protected void printPulses()
 	{
-		int dec=4; //decimals
+		int dec=prefsDigitsNumber; //decimals
+		
 		ArrayList myData = new ArrayList(1);
 		bool isFirstHeader = true;
 		

Modified: trunk/src/report.cs
==============================================================================
--- trunk/src/report.cs	(original)
+++ trunk/src/report.cs	Tue Jan 22 22:21:28 2008
@@ -43,12 +43,6 @@
 	public bool ShowReactionTimes;
 	public bool ShowPulses;
 	
-/*	
-	private int prefsDigitsNumber;
-	private bool heightPreferred;
-	private bool weightStatsPercent;
-*/
-
 	bool toReport = true;
 
 	public ArrayList StatisticsData;
@@ -454,19 +448,6 @@
 		}
 	}
 
-/*	
-	public int PrefsDigitsNumber {
-		set { prefsDigitsNumber = value; }
-	}
-	
-	public bool HeightPreferred {
-		set { heightPreferred = value; }
-	}
-	
-	public bool WeightStatsPercent {
-		set { weightStatsPercent = value; }
-	}
-*/	
 	public string Progversion {
 		set { progversion = value; }
 	}

Modified: trunk/src/stats/graphs/djIndex.cs
==============================================================================
--- trunk/src/stats/graphs/djIndex.cs	(original)
+++ trunk/src/stats/graphs/djIndex.cs	Tue Jan 22 22:21:28 2008
@@ -104,14 +104,19 @@
 			serieTv.SerieColor = Color.FromName("Blue");
 			serieFall.SerieColor = Color.FromName("Chocolate");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			CurrentGraphData.LabelRight = "%, cm";
+			CurrentGraphData.LabelLeft = 
+				Catalog.GetString("TC") + "(s), " +
+				Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = 
+				Catalog.GetString("Index") + "(%), " +
+				Catalog.GetString("Height") + "(cm), " +
+				Catalog.GetString("Fall") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 	}
@@ -164,10 +169,10 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
-						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieTc);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieIndex);
+						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieFall);
 					}
 					return;

Modified: trunk/src/stats/graphs/djQ.cs
==============================================================================
--- trunk/src/stats/graphs/djQ.cs	(original)
+++ trunk/src/stats/graphs/djQ.cs	Tue Jan 22 22:21:28 2008
@@ -104,14 +104,19 @@
 			serieTv.SerieColor = Color.FromName("Blue");
 			serieFall.SerieColor = Color.FromName("Chocolate");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			CurrentGraphData.LabelRight = "%, cm";
+			CurrentGraphData.LabelLeft = 
+				Catalog.GetString("TC") + "(s), " +
+				Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = 
+				Catalog.GetString("Index") + "(%), " +
+				Catalog.GetString("Height") + "(cm), " +
+				Catalog.GetString("Fall") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 	}
@@ -165,10 +170,10 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
-						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieTc);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieIndex);
+						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieFall);
 					}
 					return;

Modified: trunk/src/stats/graphs/fv.cs
==============================================================================
--- trunk/src/stats/graphs/fv.cs	(original)
+++ trunk/src/stats/graphs/fv.cs	Tue Jan 22 22:21:28 2008
@@ -99,14 +99,16 @@
 			serieJump2.SerieColor = Color.FromName("Blue");
 		
 			//this index is measured in height of CdG (not in tv)
-			CurrentGraphData.LabelLeft = "cm";
-			CurrentGraphData.LabelRight = "%";
+			CurrentGraphData.LabelLeft = 
+				jump1 + " " + Catalog.GetString("Height") + "(cm), " + 
+				jump2 + " " + Catalog.GetString("Height") + "(cm)";
+			CurrentGraphData.LabelRight = Catalog.GetString("Index") + "(%)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 	}
@@ -149,9 +151,9 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieJump1);
 						GraphSeries.Add(serieJump2);
+						GraphSeries.Add(serieIndex);
 					}
 					return;
 				}

Modified: trunk/src/stats/graphs/global.cs
==============================================================================
--- trunk/src/stats/graphs/global.cs	(original)
+++ trunk/src/stats/graphs/global.cs	Tue Jan 22 22:21:28 2008
@@ -91,20 +91,20 @@
 			serieTv.SerieColor = Color.FromName("Blue");
 		
 			if(heightPreferred) {
-				CurrentGraphData.LabelLeft = Catalog.GetString("centimeters");
+				CurrentGraphData.LabelLeft = Catalog.GetString("Height") + "(cm)";
 			} else {
-				CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+				CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
 			}
-			CurrentGraphData.LabelRight = "%";
+			CurrentGraphData.LabelRight = Catalog.GetString("Index") + "(%)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
 			if(heightPreferred) {
-				CurrentGraphData.LabelLeft = Catalog.GetString("centimeters");
+				CurrentGraphData.LabelLeft = Catalog.GetString("Height") + "(cm)";
 			} else {
-				CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+				CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
 			}
 			CurrentGraphData.LabelRight = "";
 		}
@@ -127,8 +127,8 @@
 
 					//global is nicer and cleaner  without the AVG and SD
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieIndex);
 					}
 					
 					/*

Modified: trunk/src/stats/graphs/graphData.cs
==============================================================================
--- trunk/src/stats/graphs/graphData.cs	(original)
+++ trunk/src/stats/graphs/graphData.cs	Tue Jan 22 22:21:28 2008
@@ -30,8 +30,14 @@
 	public ArrayList XAxisNames;
 	public string LabelLeft;
 	public string LabelRight;
+	public string LabelBottom;
+	public bool IsLeftAxisInteger;
+	public bool IsRightAxisInteger;
 	
 	public GraphData() {
 		XAxisNames = new ArrayList();
+		IsLeftAxisInteger = false;
+		IsRightAxisInteger = false;
+		LabelBottom = "";
 	}
 }	

Modified: trunk/src/stats/graphs/ieIub.cs
==============================================================================
--- trunk/src/stats/graphs/ieIub.cs	(original)
+++ trunk/src/stats/graphs/ieIub.cs	Tue Jan 22 22:21:28 2008
@@ -106,14 +106,16 @@
 			serieJump1.SerieColor = Color.FromName("Green");
 			serieJump2.SerieColor = Color.FromName("Blue");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			CurrentGraphData.LabelRight = "%";
+			CurrentGraphData.LabelLeft = 
+				jump1 + " " + Catalog.GetString("TF") + "(s), " + 
+				jump2 + " " + Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = Catalog.GetString("Index") + "(%)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 	}
@@ -155,9 +157,9 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-							GraphSeries.Add(serieIndex);
 							GraphSeries.Add(serieJump1);
 							GraphSeries.Add(serieJump2);
+							GraphSeries.Add(serieIndex);
 					}
 					return;
 				}

Modified: trunk/src/stats/graphs/potency.cs
==============================================================================
--- trunk/src/stats/graphs/potency.cs	(original)
+++ trunk/src/stats/graphs/potency.cs	Tue Jan 22 22:21:28 2008
@@ -99,14 +99,18 @@
 			serieExtraWeight.SerieColor = Color.FromName("Blue");
 			serieHeight.SerieColor = Color.FromName("Black");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("watts");
-			CurrentGraphData.LabelRight = "kg, cm";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Peak Power") + 
+				"(" + Catalog.GetString("watts") + ")";
+			CurrentGraphData.LabelRight = 
+				Catalog.GetString("Weight") + "(kg), " + 
+				Catalog.GetString("Height") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = Catalog.GetString("watts");
+			CurrentGraphData.LabelLeft = Catalog.GetString("Peak Power") + 
+				"(" + Catalog.GetString("watts") + ")";
 			CurrentGraphData.LabelRight = "";
 		}
 	}

Modified: trunk/src/stats/graphs/rjAVGSD.cs
==============================================================================
--- trunk/src/stats/graphs/rjAVGSD.cs	(original)
+++ trunk/src/stats/graphs/rjAVGSD.cs	Tue Jan 22 22:21:28 2008
@@ -39,6 +39,7 @@
 	//for simplesession
 	GraphSerie serieAVG;
 	GraphSerie serieSD;
+	GraphSerie serieJumps;
 
 	public GraphRjAVGSD (StatTypeStruct myStatTypeStruct, string indexType) 
 	{
@@ -46,7 +47,7 @@
 
 		completeConstruction (myStatTypeStruct, treeview);
 
-		this.dataColumns = 2; //for Simplesession (avg, sd)
+		this.dataColumns = 3; //for Simplesession (avg, sd, jumps)
 
 		//no average for this stat
 		//if (statsJumpsType == 2) {
@@ -69,24 +70,34 @@
 
 		serieAVG = new GraphSerie();
 		serieSD = new GraphSerie();
+		serieJumps = new GraphSerie();
 
-		serieAVG.Title = Catalog.GetString("Average");
-		serieSD.Title = Catalog.GetString("SD");
+		serieAVG.Title = Catalog.GetString("Index") + " " + Catalog.GetString("Average");
+		serieSD.Title = Catalog.GetString("Index") + " " + Catalog.GetString("SD");
+		serieJumps.Title = Catalog.GetString("Jumps");
 
 		serieAVG.IsLeftAxis = true;
 		serieSD.IsLeftAxis = true;
+		serieJumps.IsLeftAxis = false;
 
 		serieAVG.SerieMarker = new Marker (Marker.MarkerType.FilledCircle, 
 				6, new Pen (Color.FromName("Red"), 2.0F));
 		serieSD.SerieMarker = new Marker (Marker.MarkerType.Cross1, 
 				6, new Pen (Color.FromName("Black"), 2.0F));
+		serieJumps.SerieMarker = new Marker (Marker.MarkerType.Cross2, 
+				8, new Pen (Color.FromName("Blue"), 2.0F));
 
 		//for the line between markers
 		serieAVG.SerieColor = Color.FromName("Red");
 		serieSD.SerieColor = Color.FromName("Black");
+		//serieJumps.SerieColor = Color.FromName("Blue");
 
-		CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-		CurrentGraphData.LabelRight = "";
+		CurrentGraphData.LabelLeft = 
+			Catalog.GetString("Average") + ", " +
+			Catalog.GetString("SD");
+		CurrentGraphData.LabelRight = Catalog.GetString("Jumps");
+
+		CurrentGraphData.IsRightAxisInteger = true;
 	}
 
 	protected override void printData (string [] statValues) 
@@ -106,8 +117,10 @@
 				serieAVG.SerieData.Add(myValue);
 			else if(i == 2)
 				serieSD.SerieData.Add(myValue);
+			else if(i == 3)
+				serieJumps.SerieData.Add(myValue);
 
-			if (i == 2)
+			if (i == 3)
 				i = 0;
 			else
 				i++;
@@ -118,23 +131,29 @@
 		if(GraphSeries.Count == 0) {
 			GraphSeries.Add(serieAVG);
 			GraphSeries.Add(serieSD);
+			GraphSeries.Add(serieJumps);
 		}
 	}
-	
+
+	//overrided because SD have to be plot different (just in the top and down of AVG)	
 	protected override int plotGraphGraphSeries (IPlotSurface2D plot, int xtics, ArrayList allSeries)
 	{
-		double[] lineData = new double[ xtics ];
+		double[] lineData = new double[ xtics-( (xtics-2)-(markedRows.Count) ) ];
+		double[] lineDataJumps = new double[ xtics-( (xtics-2)-(markedRows.Count) ) ];
 
 		Marker m = serieAVG.SerieMarker;
 		Marker mSDUp = new Marker (Marker.MarkerType.TriangleUp, 
 				6, new Pen (Color.FromName("Black"), 1.0F));
 		Marker mSDDown = new Marker (Marker.MarkerType.TriangleDown, 
 				6, new Pen (Color.FromName("Black"), 1.0F));
+		Marker mJumps = serieJumps.SerieMarker;
 
 		PointPlot pp;
 		LinePlot lp;
 		PointPlot ppSDUp;
 		PointPlot ppSDDown;
+		PointPlot ppJumps;
+		//LinePlot lpJumps;
 
 		pp = new PointPlot( m );
 		pp.Label = serieAVG.Title; 
@@ -144,9 +163,15 @@
 		ppSDUp = new PointPlot( mSDUp );
 		ppSDDown = new PointPlot( mSDDown );
 		ppSDUp.Label = serieSD.Title; 
+		ppJumps = new PointPlot( mJumps );
+		ppJumps.Label = serieJumps.Title; 
+		//lpJumps = new LinePlot();
+		//lpJumps.Label = serieJumps.Title; 
+		//lpJumps.Color = serieJumps.SerieColor;
 
 		//left margin
 		lineData[0] = double.NaN;
+		lineDataJumps[0] = double.NaN;
 
 		int added=1;
 		int counter=0;
@@ -158,26 +183,37 @@
 				continue;
 			}
 
-			if(myValue == "-") 
-				lineData[added++] = double.NaN;
-			else 
-				lineData[added++] = Convert.ToDouble(myValue);
+			if(myValue == "-") {
+				lineData[added] = double.NaN;
+				lineDataJumps[added] = double.NaN;
+			} else {
+				lineData[added] = Convert.ToDouble(myValue);
+				lineDataJumps[added] = Convert.ToDouble(serieJumps.SerieData[counter]);
+			}
 
+			added++;
 			counter++;
 		}
 
 		//right margin
 		lineData[added] = double.NaN;
+		lineDataJumps[added] = double.NaN;
+
 
 		lp.DataSource = lineData;
 		pp.OrdinateData = lineData;
 		ppSDUp.OrdinateData = convertLineDataToSDData(lineData, serieSD.SerieData, true);
 		ppSDDown.OrdinateData = convertLineDataToSDData(lineData, serieSD.SerieData, false);
+		//lpJumps.DataSource = lineDataJumps;
+		ppJumps.OrdinateData = lineDataJumps;
 
-		pp.AbscissaData = new StartStep( 0, 1 ); //ini 0, step 1 (ini 0 because in lineData we start with blank value)
+	       	//ini 0, step 1 (ini 0 because in lineData we start with blank value)
+		pp.AbscissaData = new StartStep( 0, 1 );
+		ppJumps.AbscissaData = new StartStep( 0, 1 );
 		ppSDUp.AbscissaData = new StartStep( 0, 1 );
 		ppSDDown.AbscissaData = new StartStep( 0, 1 );
 		pp.ShowInLegend = false;
+		ppJumps.ShowInLegend = true;
 		ppSDUp.ShowInLegend = true; //only need to show it one time
 		ppSDDown.ShowInLegend = false;
 
@@ -185,8 +221,10 @@
 		plot.Add( pp );
 		plot.Add( ppSDUp );
 		plot.Add( ppSDDown );
+		//plot.Add( lpJumps, NPlot.PlotSurface2D.XAxisPosition.Bottom, NPlot.PlotSurface2D.YAxisPosition.Right );
+		plot.Add( ppJumps, NPlot.PlotSurface2D.XAxisPosition.Bottom, NPlot.PlotSurface2D.YAxisPosition.Right );
 
-		int acceptedSerie = 1;
+		int acceptedSerie = 2;
 
 		return acceptedSerie; //for knowing if a serie was accepted, and then createAxisGraphSeries
 	}

Modified: trunk/src/stats/graphs/rjEvolution.cs
==============================================================================
--- trunk/src/stats/graphs/rjEvolution.cs	(original)
+++ trunk/src/stats/graphs/rjEvolution.cs	Tue Jan 22 22:21:28 2008
@@ -78,8 +78,9 @@
 		}
 		
 		
-		CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+		CurrentGraphData.LabelLeft = Catalog.GetString("Time") + "(s)";
 		CurrentGraphData.LabelRight = "";
+		CurrentGraphData.LabelBottom = Catalog.GetString("Jumps");
 	}
 
 	protected override void printData (string [] statValues) 

Modified: trunk/src/stats/graphs/rjIndex.cs
==============================================================================
--- trunk/src/stats/graphs/rjIndex.cs	(original)
+++ trunk/src/stats/graphs/rjIndex.cs	Tue Jan 22 22:21:28 2008
@@ -100,14 +100,18 @@
 			serieTv.SerieColor = Color.FromName("Blue");
 			serieFall.SerieColor = Color.FromName("Chocolate");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			CurrentGraphData.LabelRight = "%, cm";
+			CurrentGraphData.LabelLeft = 
+				Catalog.GetString("TC") + "(s), " +
+				Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = 
+				Catalog.GetString("Index") + "(%), " +
+				Catalog.GetString("Fall") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 
@@ -156,9 +160,9 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieTc);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieFall);
 					}
 					return;

Modified: trunk/src/stats/graphs/rjPotencyBosco.cs
==============================================================================
--- trunk/src/stats/graphs/rjPotencyBosco.cs	(original)
+++ trunk/src/stats/graphs/rjPotencyBosco.cs	Tue Jan 22 22:21:28 2008
@@ -78,10 +78,10 @@
 			serieFall = new GraphSerie();
 				
 			serieIndex.Title = Catalog.GetString("Index");
-			serieTc.Title = Catalog.GetString("TC");
-			serieTv.Title = Catalog.GetString("TF");
-			serieJumps.Title = Catalog.GetString("Jumps") + "*10";
-			serieTime.Title = Catalog.GetString("Time") + "*10";
+			serieTc.Title = Catalog.GetString("TC") + " (" + Catalog.GetString("AVG") + ")";
+			serieTv.Title = Catalog.GetString("TF") + " (" + Catalog.GetString("AVG") + ")";
+			serieJumps.Title = Catalog.GetString("Jumps") + " *10";
+			serieTime.Title = Catalog.GetString("Time") + " *10";
 			serieFall.Title = Catalog.GetString("Fall");
 			
 			serieIndex.IsLeftAxis = false;
@@ -114,18 +114,20 @@
 			serieTime.SerieColor = Color.FromName("Black");
 			serieFall.SerieColor = Color.FromName("Chocolate");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+			CurrentGraphData.LabelLeft = 
+				Catalog.GetString("TC") + "(s), " +
+				Catalog.GetString("TF") + "(s)";
 			CurrentGraphData.LabelRight = 
-				"%, " +
-				Catalog.GetString("jumps") + ", " + 
-				"seconds" + ", " + 
-				"cm";
+				Catalog.GetString("Index") + "(%), " +
+				Catalog.GetString("Jumps") + ", " + 
+				Catalog.GetString("Time") + "(s), " + 
+				Catalog.GetString("Fall") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
-			CurrentGraphData.LabelLeft = "%";
+			CurrentGraphData.LabelLeft = Catalog.GetString("Index") + "(%)";
 			CurrentGraphData.LabelRight = "";
 		}
 	}
@@ -185,9 +187,9 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieTc);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieIndex);
 						GraphSeries.Add(serieJumps);
 						GraphSeries.Add(serieTime);
 						GraphSeries.Add(serieFall);

Modified: trunk/src/stats/graphs/sjCmjAbk.cs
==============================================================================
--- trunk/src/stats/graphs/sjCmjAbk.cs	(original)
+++ trunk/src/stats/graphs/sjCmjAbk.cs	Tue Jan 22 22:21:28 2008
@@ -83,17 +83,17 @@
 			serieTv.SerieColor = Color.FromName("Blue");
 			serieHeight.SerieColor = Color.FromName("Red");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			CurrentGraphData.LabelRight = Catalog.GetString("centimeters");
+			CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = Catalog.GetString("Height") + "(cm)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
 			if(heightPreferred) {
-				CurrentGraphData.LabelLeft = Catalog.GetString("centimeters");
+				CurrentGraphData.LabelLeft = Catalog.GetString("Height") + "(cm)";
 			} else {
-				CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+				CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
 			}
 			CurrentGraphData.LabelRight = "";
 		}
@@ -131,8 +131,8 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieHeight);
 					}
 					return;
 				}

Modified: trunk/src/stats/graphs/sjCmjAbkPlus.cs
==============================================================================
--- trunk/src/stats/graphs/sjCmjAbkPlus.cs	(original)
+++ trunk/src/stats/graphs/sjCmjAbkPlus.cs	Tue Jan 22 22:21:28 2008
@@ -70,8 +70,8 @@
 			serieWeight = new GraphSerie();
 				
 			serieTv.Title = Catalog.GetString("TF");
-			serieHeight.Title = "Height";
-			serieWeight.Title = "Weight";
+			serieHeight.Title = Catalog.GetString("Height");
+			serieWeight.Title = Catalog.GetString("Weight");
 			
 			serieTv.IsLeftAxis = true;
 			serieHeight.IsLeftAxis = false;
@@ -90,21 +90,19 @@
 			serieHeight.SerieColor = Color.FromName("Green");
 			serieWeight.SerieColor = Color.FromName("Chocolate");
 		
-			CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
-			//if(percent) {
-				CurrentGraphData.LabelRight = "%, cm";
-			//} else {
-			//	CurrentGraphData.LabelRight = "Kg, cm";
-			//}
+			CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
+			CurrentGraphData.LabelRight = 
+				Catalog.GetString("Height") + "(cm), " +
+				Catalog.GetString("Weight") + "(Kg)";
 		} else {
 			for(int i=0; i < sessions.Count ; i++) {
 				string [] stringFullResults = sessions[i].ToString().Split(new char[] {':'});
 				CurrentGraphData.XAxisNames.Add(stringFullResults[1].ToString());
 			}
 			if(heightPreferred) {
-				CurrentGraphData.LabelLeft = Catalog.GetString("centimeters");
+				CurrentGraphData.LabelLeft = Catalog.GetString("Height") + "(cm)";
 			} else {
-				CurrentGraphData.LabelLeft = Catalog.GetString("seconds");
+				CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
 			}
 			CurrentGraphData.LabelRight = "";
 		}
@@ -147,8 +145,8 @@
 					//add created series to GraphSeries ArrayList
 					//check don't do it two times
 					if(GraphSeries.Count == 0) {
-						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieTv);
+						GraphSeries.Add(serieHeight);
 						GraphSeries.Add(serieWeight);
 					}
 					return;

Modified: trunk/src/stats/main.cs
==============================================================================
--- trunk/src/stats/main.cs	(original)
+++ trunk/src/stats/main.cs	Tue Jan 22 22:21:28 2008
@@ -867,6 +867,16 @@
 	//has to be static
 	protected static ArrayList onlyUsefulForNotBeingGarbageCollected = new ArrayList(); 
 	
+	private Grid addGrid() 
+	{
+		Grid myGrid = new Grid();
+		myGrid.VerticalGridType = Grid.GridType.Coarse;
+		Pen majorGridPen = new Pen( Color.LightGray );
+		float[] pattern = {1.0f,2.0f};
+		majorGridPen.DashPattern = pattern;
+		myGrid.MajorGridPen = majorGridPen;
+		return myGrid;
+	}
 
 	public void CreateGraph () 
 	{
@@ -880,6 +890,9 @@
 
 		//create plot (same as below)
 		plot.Clear();
+		
+		plot.Add(addGrid());
+
 		plot.Title = CurrentGraphData.GraphTitle;
 		int acceptedSeries = plotGraphGraphSeries (plot, 
 				CurrentGraphData.XAxisNames.Count + 2, //xtics (+2 for left, right space)
@@ -889,7 +902,6 @@
 		createAxisGraphSeries (plot, CurrentGraphData);
 
 		writeLegend(plot);
-		plot.Add( new Grid() );
 
 		//put in window
 		//fixes a gtk# garbage collecting bug
@@ -921,7 +933,11 @@
 
 		//create plot (same as above)
 		plot.Clear();
+		
+		plot.Add(addGrid());
+
 		plot.Title = CurrentGraphData.GraphTitle;
+
 		int acceptedSeries = plotGraphGraphSeries (plot, 
 				CurrentGraphData.XAxisNames.Count + 2, //xtics (+2 for left, right space)
 				GraphSeries);
@@ -930,7 +946,6 @@
 		createAxisGraphSeries (plot, CurrentGraphData);
 
 		writeLegend(plot);
-		plot.Add( new Grid() );
 
 		int x = getSizeX();
 		int y = getSizeY(x, acceptedSeries);
@@ -1154,6 +1169,7 @@
 				//Console.WriteLine("serie.AVG: {0}", mySerie.Avg);
 				hl1.ShowInLegend = false;
 				hl1.Pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+				//hl1.Pen.Width = 2F;
 				if(mySerie.IsLeftAxis) {
 					plot.Add( hl1 );
 				} else {
@@ -1197,16 +1213,26 @@
 		plot.XAxis1 = la;
 		//plot.XAxis1.LargeTickSize = 0.0f;
 		plot.XAxis1.TicksLabelAngle = 35.0f;
+		if(graphData.LabelBottom != "")
+			la.Label = graphData.LabelBottom;
 	
-		if(graphData.LabelLeft != "") {
-			LinearAxis ly1 = (LinearAxis)plot.YAxis1;
-			ly1.Label = graphData.LabelLeft;
-		}
-		
-		if(graphData.LabelRight != "") {
-			LinearAxis ly2 = (LinearAxis)plot.YAxis2;
-			ly2.Label = graphData.LabelRight;
+		LinearAxis ly1 = new LinearAxis();
+		if(graphData.LabelLeft != "")
+			ly1 = createLinearAxis(graphData.LabelLeft, plot.YAxis1, graphData.IsLeftAxisInteger);
+		
+		LinearAxis ly2 = new LinearAxis();
+		if(graphData.LabelRight != "")
+			ly2 = createLinearAxis(graphData.LabelRight, plot.YAxis2, graphData.IsRightAxisInteger);
+	}
+
+	private LinearAxis createLinearAxis(string label, Axis myAxis, bool isInt) {
+		LinearAxis ly = (LinearAxis) myAxis;
+		ly.Label = label;
+		if(isInt) {
+			ly.LargeTickStep = 1;
+			ly.NumberOfSmallTicks = 0;
 		}
+		return ly;
 	}
 	
 	protected void writeLegend(IPlotSurface2D plot)

Modified: trunk/src/stats/rjAVGSD.cs
==============================================================================
--- trunk/src/stats/rjAVGSD.cs	(original)
+++ trunk/src/stats/rjAVGSD.cs	Tue Jan 22 22:21:28 2008
@@ -33,7 +33,8 @@
 	protected string [] columnsString = { 
 		Catalog.GetString("Jumper"), 
 		Catalog.GetString("AVG"), 
-		Catalog.GetString("SD") };
+		Catalog.GetString("SD"),
+		Catalog.GetString("Jumps") };
 	
 	//if this is not present i have problems like (No overload for method `xxx' takes `0' arguments) with some inherited classes
 	public StatRjAVGSD () 
@@ -49,7 +50,7 @@
 
 		this.indexType = indexType;
 		
-		this.dataColumns = 2;	//for simplesession (index, height, tv, tc, fall)
+		this.dataColumns = 3;
 	
 		/*
 		 * only simplesession, because it has to plot two values: AVG, and SD	
@@ -57,7 +58,7 @@
 			store = getStore(sessions.Count +3); //+3 (for jumper, the AVG horizontal and SD horizontal)
 		} else {
 		*/
-			store = getStore(dataColumns +1); //jumper, AVG, SD 
+			store = getStore(dataColumns +1); //jumper, AVG, SD, jumps
 		//}
 		
 		if(toReport) {
@@ -131,6 +132,7 @@
 			 * if both values are different than "-"
 			 * and prepare data for AVG and SD of index
 			 */
+			int numberOfJumps = 0;
 			for (int i=firstTCPos; i+1 < strFull.Length; i+=2) {
 				if(strFull[i] != "-" && strFull[i+1] != "-") {
 					double myIndex = getIndex(
@@ -144,13 +146,18 @@
 
 					sepAVG = "=";
 					sepSD = ":";
+
+					numberOfJumps ++;
 				}
 			}
 
 			double avg = Util.GetAverage(valuesListForAVG);
 			double sd = Util.CalculateSD(valuesListForSD, sumValues, count);
 
-			string rowConverted = strFull[0] + ":" + avg.ToString() + ":" + sd.ToString(); 
+			string rowConverted = 
+				strFull[0] + ":" + 
+				avg.ToString() + ":" + sd.ToString() + ":" + 
+				numberOfJumps.ToString(); 
 
 			arrayConverted.Add(rowConverted); 
 		}

Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt	(original)
+++ trunk/version.txt	Tue Jan 22 22:21:28 2008
@@ -1 +1 @@
-0.62
+0.62-svn2

Modified: trunk/web/data/authors.txt
==============================================================================
--- trunk/web/data/authors.txt	(original)
+++ trunk/web/data/authors.txt	Tue Jan 22 22:21:28 2008
@@ -2,4 +2,5 @@
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
 <li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo GÃmez</a>
 </ul>

Modified: trunk/web/data/langs/_ca/Pages/index
==============================================================================
--- trunk/web/data/langs/_ca/Pages/index	(original)
+++ trunk/web/data/langs/_ca/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 Darreres notÃcies
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstes per a principis de marÃ</a> (castellÃ) (1 gen 2008)
   <li>Darrera&nbsp;versiÃ&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_ca.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump guanya <a href=":::awards:::">premi de programari lliure</a> en la categoria d'educaciÃ. (29 nov 2007)
   <li>Actualitat&nbsp;de&nbsp;Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>castellÃ</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>anglÃs</a> (8 nov 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalista a premis internacionals de programari</a> (6 nov 2007)
   <li><a href="construction_ca.html">chronopic 2.0 USB i sÃrie</a> (Set 2007)
 </ul>
 

Modified: trunk/web/data/langs/_de/Pages/index
==============================================================================
--- trunk/web/data/langs/_de/Pages/index	(original)
+++ trunk/web/data/langs/_de/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 News
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008)
   <li>Last&nbsp;Chronojump&nbsp;Version:&nbsp; <a href="installation.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007)
   <li><a href="construction.html">chronopic 2.0 USB and serial</a> (Set 2007) (english)
 </ul>
 

Modified: trunk/web/data/langs/_en/Pages/index
==============================================================================
--- trunk/web/data/langs/_en/Pages/index	(original)
+++ trunk/web/data/langs/_en/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 News
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008)
   <li>Last&nbsp;Chronojump&nbsp;Version:&nbsp; <a href="installation.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007)
   <li><a href="construction.html">chronopic 2.0 USB and serial</a> (Sept 2007)
 </ul>
 

Modified: trunk/web/data/langs/_es/Pages/index
==============================================================================
--- trunk/web/data/langs/_es/Pages/index	(original)
+++ trunk/web/data/langs/_es/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 Ãltimas noticias
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008)
   <li>Ãltima&nbsp;versiÃn&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_es.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump gana <a href=":::awards:::">premio de software libre</a> en la categorÃa de educaciÃn (29 nov 2007)
   <li><a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>Actualidad&nbsp;de&nbsp;Chronojump</a> (8 nov 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalista en premios internacionales de software</a> (6 nov 2007)
   <li><a href="construction_es.html">chronopic 2.0 USB y serie</a> (Sept 2007)
 </ul>
 

Modified: trunk/web/data/langs/_fr/Pages/index
==============================================================================
--- trunk/web/data/langs/_fr/Pages/index	(original)
+++ trunk/web/data/langs/_fr/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 News
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008) (TRANSLATE)
   <li>DerniÃre&nbsp;version&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_fr.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
   <li><a href="construction.html">chronopic 2.0 USB et serial</a> (english) (Sept 2007)
 </ul>
 

Modified: trunk/web/data/langs/_gl/Pages/index
==============================================================================
--- trunk/web/data/langs/_gl/Pages/index	(original)
+++ trunk/web/data/langs/_gl/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 Ãltimas noticias
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008) (TRADUCIR)
   <li>Ãltima&nbsp;versiÃn&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_gl.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
-  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
+  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRADUCIR)
   <li><a href="construction_gl.html">chronopic 2.0 USB y serie</a> (Sept 2007)
 </ul>
 

Modified: trunk/web/data/langs/_it/Pages/index
==============================================================================
--- trunk/web/data/langs/_it/Pages/index	(original)
+++ trunk/web/data/langs/_it/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 Ãltimas noticias
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008)
   <li>Last&nbsp;Chronojump&nbsp;Version::&nbsp; <a href="installation.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> (english)
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
   <li><a href="construction.html">chronopic 2.0 USB y serie</a> (english) (sett 007)
 </ul>
 

Modified: trunk/web/data/langs/_pt/Pages/index
==============================================================================
--- trunk/web/data/langs/_pt/Pages/index	(original)
+++ trunk/web/data/langs/_pt/Pages/index	Tue Jan 22 22:21:28 2008
@@ -2,10 +2,10 @@
 Ãltimas noticias
 :::endTitle:::
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008) (TRADUCIR)
   <li>Ãltima&nbsp;versÃo&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_pt.html"><b>:::currentVersion:::</b>&nbsp;(:::currentVersionDate:::)</a> 
   <li>Chronojump wons <a href=":::awards:::">free software awards</a> on education category. (Nov, 29, 2007)
-  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
+  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRADUCIR)
   <li><a href="construction_pt.html">chronopic 2.0 USB Ã sÃrie</a> (set 2007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/faq_es.html
==============================================================================
--- trunk/web/html_created_no_edit/faq_es.html	(original)
+++ trunk/web/html_created_no_edit/faq_es.html	Tue Jan 22 22:21:28 2008
@@ -176,6 +176,7 @@
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
 <li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a>
 </ul>
 
 				<h3>Colaboradores</h3>

Modified: trunk/web/html_created_no_edit/photocells_es.html
==============================================================================
--- trunk/web/html_created_no_edit/photocells_es.html	(original)
+++ trunk/web/html_created_no_edit/photocells_es.html	Tue Jan 22 22:21:28 2008
@@ -180,6 +180,7 @@
 <li><a href="http://www.xdeblas.com";>Xavier de Blas</a></li>
 <li><a href="http://www.iearobotics.com/personal/juan/";>Ju&aacute;n Gonz&aacute;lez</a></li>
 <li><a href="mailto:juanfer juanfer com ar">Juan Fernando Pardo</a>
+<li><a href="http://www.iearobotics.com/personal/ricardo/index.html";>Ricardo G&oacute;mez</a>
 </ul>
 
 				<h3>Colaboradores</h3>

Modified: trunk/web/html_created_no_edit/print/index_ca.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_ca.html	(original)
+++ trunk/web/html_created_no_edit/print/index_ca.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 Darreres not&iacute;cies
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstes per a principis de mar&ccedil;</a> (castell&agrave;) (1 gen 2008)
   <li>Darrera&nbsp;versi&oacute;&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_ca.html"><b>0.62</b>&nbsp;(7-Desembre-2007)</a> 
   <li>Chronojump guanya <a href="http://tropheesdulibre.org";>premi de programari lliure</a> en la categoria d'educaci&oacute;. (29 nov 2007)
   <li>Actualitat&nbsp;de&nbsp;Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>castell&agrave;</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>angl&egrave;s</a> (8 nov 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalista a premis internacionals de programari</a> (6 nov 2007)
   <li><a href="construction_ca.html">chronopic 2.0 USB i s&egrave;rie</a> (Set 2007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_de.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_de.html	(original)
+++ trunk/web/html_created_no_edit/print/index_de.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 News
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008)
   <li>Last&nbsp;Chronojump&nbsp;Version:&nbsp; <a href="installation.html"><b>0.62</b>&nbsp;(7-Dezeember-2007)</a> 
   <li>Chronojump wons <a href="http://tropheesdulibre.org";>free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007)
   <li><a href="construction.html">chronopic 2.0 USB and serial</a> (Set 2007) (english)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_es.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_es.html	(original)
+++ trunk/web/html_created_no_edit/print/index_es.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 &Uacute;ltimas noticias
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008)
   <li>&Uacute;ltima&nbsp;versi&oacute;n&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_es.html"><b>0.62</b>&nbsp;(7-Diciembre-2007)</a> 
   <li>Chronojump gana <a href="http://tropheesdulibre.org";>premio de software libre</a> en la categor&iacute;a de educaci&oacute;n (29 nov 2007)
   <li><a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>Actualidad&nbsp;de&nbsp;Chronojump</a> (8 nov 2007)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalista en premios internacionales de software</a> (6 nov 2007)
   <li><a href="construction_es.html">chronopic 2.0 USB y serie</a> (Sept 2007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_fr.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_fr.html	(original)
+++ trunk/web/html_created_no_edit/print/index_fr.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 News
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008) (TRANSLATE)
   <li>Derni&egrave;re&nbsp;version&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_fr.html"><b>0.62</b>&nbsp;(7-D&eacute;cembre-2007)</a> 
   <li>Chronojump wons <a href="http://tropheesdulibre.org";>free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
   <li><a href="construction.html">chronopic 2.0 USB et serial</a> (english) (Sept 2007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_gl.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_gl.html	(original)
+++ trunk/web/html_created_no_edit/print/index_gl.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 &Uacute;ltimas noticias
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008) (TRADUCIR)
   <li>&Uacute;ltima&nbsp;versi&oacute;n&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_gl.html"><b>0.62</b>&nbsp;(7-Diciembre-2007)</a> 
   <li>Chronojump wons <a href="http://tropheesdulibre.org";>free software awards</a> on education category. (Nov, 29, 2007)
-  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
+  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRADUCIR)
   <li><a href="construction_gl.html">chronopic 2.0 USB y serie</a> (Sept 2007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_it.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_it.html	(original)
+++ trunk/web/html_created_no_edit/print/index_it.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 &Uacute;ltimas noticias
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 released on March</a> (spanish) (Jan 1 2008)
   <li>Last&nbsp;Chronojump&nbsp;Version::&nbsp; <a href="installation.html"><b>0.62</b>&nbsp;(7-dicembre-2007)</a> (english)
   <li>Chronojump wons <a href="http://tropheesdulibre.org";>free software awards</a> on education category. (Nov, 29, 2007)
   <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
   <li><a href="construction.html">chronopic 2.0 USB y serie</a> (english) (sett 007)
 </ul>
 

Modified: trunk/web/html_created_no_edit/print/index_pt.html
==============================================================================
--- trunk/web/html_created_no_edit/print/index_pt.html	(original)
+++ trunk/web/html_created_no_edit/print/index_pt.html	Tue Jan 22 22:21:28 2008
@@ -17,10 +17,10 @@
 &Uacute;ltimas noticias
 </h4>
 <ul>
+  <li><a href="http://mail.gnome.org/archives/chronojump-list/2008-January/msg00000.html";>Chronopics 3.0 previstas para principios de marzo</a> (1 gen 2008) (TRADUCIR)
   <li>&Uacute;ltima&nbsp;vers&atilde;o&nbsp;de&nbsp;Chronojump:&nbsp; <a href="installation_pt.html"><b>0.62</b>&nbsp;(7-dezembro-2007)</a> 
   <li>Chronojump wons <a href="http://tropheesdulibre.org";>free software awards</a> on education category. (Nov, 29, 2007)
-  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRANSLATE)
-  <li>Chronojump <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00000.html";>finalist on international software contest</a> (Nov, 6, 2007) (TRANSLATE)
+  <li>Chronojump&nbsp;nowadays <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00004.html";>english</a>, <a href="http://mail.gnome.org/archives/chronojump-list/2007-November/msg00003.html";>spanish</a> (Nov, 8, 2007) (TRADUCIR)
   <li><a href="construction_pt.html">chronopic 2.0 USB &eacute; s&eacute;rie</a> (set 2007)
 </ul>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]