[gbrainy] Fixes issue #620640

[Jordi Mas <jmas src gnome org>]

commit 949d8ea1513577002be2ac1d30062cb51bb1efc8
Author: Jordi Mas <jmas softcatala org>
Date:   Thu Jun 17 22:39:32 2010 +0200

    Fixes issue #620640

 src/Games/GameList.cs                              |    2 +-
 ...eCirclesRectangle.cs => PuzzleCirclesSquare.cs} |    4 ++--
 src/Games/Logic/PuzzleFigureLetter.cs              |   15 +++++++--------
 src/Games/Makefile.am                              |    2 +-
 src/Games/Memory/MemoryFiguresAndText.cs           |   10 +++++-----
 5 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/src/Games/GameList.cs b/src/Games/GameList.cs
index 99db23b..c9be72e 100644
--- a/src/Games/GameList.cs
+++ b/src/Games/GameList.cs
@@ -36,7 +36,7 @@ namespace gbrainy.Games
 			typeof (PuzzleSquares),
 			typeof (PuzzleFigures),
 			typeof (PuzzleMoveFigure),
-			typeof (PuzzleCirclesRectangle),
+			typeof (PuzzleCirclesSquare),
 			typeof (PuzzlePencil),
 			typeof (PuzzleTriangles),
 			typeof (PuzzleCoverPercentage),
diff --git a/src/Games/Logic/PuzzleCirclesRectangle.cs b/src/Games/Logic/PuzzleCirclesSquare.cs
similarity index 97%
rename from src/Games/Logic/PuzzleCirclesRectangle.cs
rename to src/Games/Logic/PuzzleCirclesSquare.cs
index 334fdd1..412aa1e 100644
--- a/src/Games/Logic/PuzzleCirclesRectangle.cs
+++ b/src/Games/Logic/PuzzleCirclesSquare.cs
@@ -26,10 +26,10 @@ using gbrainy.Core.Libraries;
 
 namespace gbrainy.Games.Logic
 {
-	public class PuzzleCirclesRectangle : Game
+	public class PuzzleCirclesSquare : Game
 	{
 		public override string Name {
-			get {return Catalog.GetString ("Circles in a rectangle");}
+			get {return Catalog.GetString ("Circles in a square");}
 		}
 
 		public override string Question {
diff --git a/src/Games/Logic/PuzzleFigureLetter.cs b/src/Games/Logic/PuzzleFigureLetter.cs
index ede90e9..57d6a84 100644
--- a/src/Games/Logic/PuzzleFigureLetter.cs
+++ b/src/Games/Logic/PuzzleFigureLetter.cs
@@ -32,7 +32,7 @@ namespace gbrainy.Games.Logic
 	
 		enum QuestionType
 		{
-			TwoRectangles	= 0,
+			TwoSquares	= 0,
 			TwoCercles,
 			ThreeCercles,
 			Length		
@@ -52,7 +52,7 @@ namespace gbrainy.Games.Logic
 
 		public override string Rationale {
 			get {
-				return Catalog.GetString ("'A' indicates that the figures overlap, 'B' that are rectangles, 'C' that are circles, 'D' that the figures are separated, 'E' that there are three figures and 'F' that there are two figures.");
+				return Catalog.GetString ("'A' indicates that the figures overlap, 'B' that are squares, 'C' that are circles, 'D' that the figures are separated, 'E' that there are three figures and 'F' that there are two figures.");
 			}
 		}
 
@@ -67,7 +67,7 @@ namespace gbrainy.Games.Logic
 		public override string AnswerValue {
 			get {
 				switch (question) {
-				case QuestionType.TwoRectangles:
+				case QuestionType.TwoSquares:
 					return "ABF";
 				case QuestionType.TwoCercles:
 					return "CDF";
@@ -84,7 +84,7 @@ namespace gbrainy.Games.Logic
 			question = (QuestionType) random.Next ((int) QuestionType.Length);
 
 			switch (question) {
-			case QuestionType.TwoRectangles:
+			case QuestionType.TwoSquares:
 				right_answer = "A | B | F";
 				break;
 			case QuestionType.TwoCercles:
@@ -125,16 +125,15 @@ namespace gbrainy.Games.Logic
 			gr.ShowPangoText ("ACF");
 			gr.Stroke ();
 
-			// Two rectangles
+			// Two squares
 			gr.Rectangle (x + 0.5, y, 0.1, 0.1);
 			gr.Rectangle (x + 0.62, y, 0.1, 0.1);
 			gr.Stroke ();
 			gr.MoveTo (x + 0.58, y + 0.18);
 			gr.ShowPangoText ("BDF");
 			gr.Stroke ();
-
 	
-			// Tree rectangles
+			// Tree squares
 			gr.Rectangle (x - 0.05, y + 0.35, 0.1, 0.1);
 			gr.Rectangle (x + 0.06 - 0.05, y + 0.37, 0.1, 0.1);
 			gr.Rectangle (x + 0.12 - 0.05, y + 0.39, 0.1, 0.1);
@@ -147,7 +146,7 @@ namespace gbrainy.Games.Logic
 			y += 0.35;
 
 			switch (question) {
-			case QuestionType.TwoRectangles:
+			case QuestionType.TwoSquares:
 				gr.Rectangle (x, y, 0.1, 0.1);
 				gr.Rectangle (x + 0.05, y + 0.03, 0.1, 0.1);
 				gr.Stroke ();
diff --git a/src/Games/Makefile.am b/src/Games/Makefile.am
index ef03af9..a909916 100644
--- a/src/Games/Makefile.am
+++ b/src/Games/Makefile.am
@@ -7,7 +7,7 @@ CSDISTFILES =  \
 		$(srcdir)/Logic/Puzzle3DCube.cs				\
 		$(srcdir)/Logic/PuzzleBalance.cs				\
 		$(srcdir)/Logic/PuzzleBuildTriangle.cs			\
-		$(srcdir)/Logic/PuzzleCirclesRectangle.cs			\
+		$(srcdir)/Logic/PuzzleCirclesSquare.cs			\
 		$(srcdir)/Logic/PuzzleClocks.cs				\
 		$(srcdir)/Logic/PuzzleCountCircles.cs			\
 		$(srcdir)/Logic/PuzzleCounting.cs				\
diff --git a/src/Games/Memory/MemoryFiguresAndText.cs b/src/Games/Memory/MemoryFiguresAndText.cs
index 81d3101..8f37e87 100644
--- a/src/Games/Memory/MemoryFiguresAndText.cs
+++ b/src/Games/Memory/MemoryFiguresAndText.cs
@@ -40,7 +40,7 @@ namespace gbrainy.Games.Memory
 		static internal class FigureType
 		{
 			internal const int Triangle = 0;
-			internal const int Rectangle = 1;
+			internal const int Square = 1;
 			internal const int Pentagon = 2;
 			internal const int Circle = 3;
 			internal const int Total = Circle + 1;
@@ -50,8 +50,8 @@ namespace gbrainy.Games.Memory
 				switch (type) {
 				case Triangle:
 					return Catalog.GetString ("Triangle");
-				case Rectangle:
-					return Catalog.GetString ("Rectangle");
+				case Square:
+					return Catalog.GetString ("Square");
 				case Pentagon:
 					return Catalog.GetString ("Pentagon");
 				case Circle:
@@ -67,7 +67,7 @@ namespace gbrainy.Games.Memory
 		}
 
 		public override string MemoryQuestion {
-			get {return Catalog.GetString ("The list below enumerates the figures shown in the previous image except for one. Which is the missing figure? Possible answers are triangle, rectangle, pentagon and circle." );}
+			get {return Catalog.GetString ("The list below enumerates the figures shown in the previous image except for one. Which is the missing figure? Possible answers are triangle, square, pentagon and circle." );}
 		}
 
 		protected override void Initialize ()
@@ -186,7 +186,7 @@ namespace gbrainy.Games.Memory
 			case FigureType.Triangle:
 				gr.DrawEquilateralTriangle (x + space_x, y + space_y, figure_size);
 				break;
-			case FigureType.Rectangle:
+			case FigureType.Square:
 				gr.Rectangle (x + space_x, y + space_y, figure_size, figure_size);
 				gr.Stroke ();
 				break;